10 changes: 5 additions & 5 deletions src/libkstmath/equation.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ void Equation::setEquation(const QString& in_fn) {
} else {
// Parse error
Debug::self()->log(i18n("Equation [%1] failed to parse. Errors follow.").arg(_equation), Debug::Warning);
for (QStringList::ConstIterator i = Equations::errorStack.begin(); i != Equations::errorStack.end(); ++i) {
for (QStringList::ConstIterator i = Equations::errorStack.constBegin(); i != Equations::errorStack.constEnd(); ++i) {
Debug::self()->log(i18n("Parse Error: %1").arg(*i), Debug::Warning);
}
delete (Equations::Node*)ParsedEquation;
Expand Down Expand Up @@ -388,7 +388,7 @@ bool Equation::FillY(bool force) {
// determine value of Interp
if (_doInterp) {
ns = _xInVector->length();
for (VectorMap::ConstIterator i = VectorsUsed.begin(); i != VectorsUsed.end(); ++i) {
for (VectorMap::ConstIterator i = VectorsUsed.constBegin(); i != VectorsUsed.constEnd(); ++i) {
if (i.value()->length() > ns) {
ns = i.value()->length();
}
Expand Down Expand Up @@ -422,7 +422,7 @@ bool Equation::FillY(bool force) {
v_shift = _xInVector->numShift();
v_new = _xInVector->numNew();

for (VectorMap::ConstIterator i = VectorsUsed.begin(); i != VectorsUsed.end(); ++i) {
for (VectorMap::ConstIterator i = VectorsUsed.constBegin(); i != VectorsUsed.constEnd(); ++i) {
if (v_shift != i.value()->numShift()) {
v_shift = _ns;
}
Expand Down Expand Up @@ -550,15 +550,15 @@ bool Equation::uses(ObjectPtr p) const {

// check VectorsUsed in addition to _input*'s
if (VectorPtr vect = kst_cast<Vector>(p)) {
for (VectorMap::ConstIterator j = VectorsUsed.begin(); j != VectorsUsed.end(); ++j) {
for (VectorMap::ConstIterator j = VectorsUsed.constBegin(); j != VectorsUsed.constEnd(); ++j) {
if (j.value() == vect) {
return true;
}
}
} else if (DataObjectPtr obj = kst_cast<DataObject>(p) ) {
// check all connections from this expression to p
for (VectorMap::Iterator j = obj->outputVectors().begin(); j != obj->outputVectors().end(); ++j) {
for (VectorMap::ConstIterator k = VectorsUsed.begin(); k != VectorsUsed.end(); ++k) {
for (VectorMap::ConstIterator k = VectorsUsed.constBegin(); k != VectorsUsed.constEnd(); ++k) {
if (j.value() == k.value()) {
return true;
}
Expand Down
8 changes: 4 additions & 4 deletions src/libkstmath/eventmonitorentry.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ bool EventMonitorEntry::reparse() {
StringMap stm;
_pExpression->collectObjects(_vectorsUsed, _inputScalars, stm);

for (ScalarMap::ConstIterator i = _inputScalars.begin(); i != _inputScalars.end(); ++i) {
for (ScalarMap::ConstIterator i = _inputScalars.constBegin(); i != _inputScalars.constEnd(); ++i) {
if ((*i)->myLockStatus() == KstRWLock::UNLOCKED) {
(*i)->readLock();
}
Expand Down Expand Up @@ -154,7 +154,7 @@ void EventMonitorEntry::internalUpdate() {
VectorPtr yv = *_yVector;
int ns = 1;

for (VectorMap::ConstIterator i = _vectorsUsed.begin(); i != _vectorsUsed.end(); ++i) {
for (VectorMap::ConstIterator i = _vectorsUsed.constBegin(); i != _vectorsUsed.constEnd(); ++i) {
ns = qMax(ns, i.value()->length());
}

Expand Down Expand Up @@ -423,8 +423,8 @@ bool EventMonitorEntry::uses(ObjectPtr p) const {
}
} else if (DataObjectPtr obj = kst_cast<DataObject>(p) ) {
// check all connections from this expression to p
for (VectorMap::ConstIterator j = obj->outputVectors().begin(); j != obj->outputVectors().end(); ++j) {
for (VectorMap::ConstIterator k = _vectorsUsed.begin(); k != _vectorsUsed.end(); ++k) {
for (VectorMap::ConstIterator j = obj->outputVectors().constBegin(); j != obj->outputVectors().constEnd(); ++j) {
for (VectorMap::ConstIterator k = _vectorsUsed.constBegin(); k != _vectorsUsed.constEnd(); ++k) {
if (j.value() == k.value()) {
return true;
}
Expand Down
48 changes: 24 additions & 24 deletions src/libkstmath/relation.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,11 +211,11 @@ void Relation::writeLockInputsAndOutputs() const {
qSort(inputs);
qSort(outputs);

QList<PrimitivePtr>::ConstIterator inputIt = inputs.begin();
QList<PrimitivePtr>::ConstIterator outputIt = outputs.begin();
QList<PrimitivePtr>::ConstIterator inputIt = inputs.constBegin();
QList<PrimitivePtr>::ConstIterator outputIt = outputs.constBegin();

while (inputIt != inputs.end() || outputIt != outputs.end()) {
if (inputIt != inputs.end() && (outputIt == outputs.end() || (void*)(*inputIt) < (void*)(*outputIt))) {
while (inputIt != inputs.constEnd() || outputIt != outputs.constEnd()) {
if (inputIt != inputs.constEnd() && (outputIt == outputs.constEnd() || (void*)(*inputIt) < (void*)(*outputIt))) {
// do input
if (!(*inputIt)) {
qWarning() << "Input for data object " << this->Name() << " is invalid." << endl;
Expand Down Expand Up @@ -247,7 +247,7 @@ void Relation::unlockInputsAndOutputs() const {
qDebug() << (void*)this << this->Name() << ") Relation::unlockInputsAndOutputs() by tid=" << (int)QThread::currentThread() << endl;
#endif

for (MatrixMap::ConstIterator i = _outputMatrices.begin(); i != _outputMatrices.end(); ++i) {
for (MatrixMap::ConstIterator i = _outputMatrices.constBegin(); i != _outputMatrices.constEnd(); ++i) {
if (!(*i)) {
qWarning() << "Output matrix for data object " << this->Name() << " is invalid." << endl;
}
Expand All @@ -257,7 +257,7 @@ void Relation::unlockInputsAndOutputs() const {
(*i)->unlock();
}

for (MatrixMap::ConstIterator i = _inputMatrices.begin(); i != _inputMatrices.end(); ++i) {
for (MatrixMap::ConstIterator i = _inputMatrices.constBegin(); i != _inputMatrices.constEnd(); ++i) {
if (!(*i)) {
qWarning() << "Input matrix for data object " << this->Name() << " is invalid." << endl;
}
Expand All @@ -267,7 +267,7 @@ void Relation::unlockInputsAndOutputs() const {
(*i)->unlock();
}

for (VectorMap::ConstIterator i = _outputVectors.begin(); i != _outputVectors.end(); ++i) {
for (VectorMap::ConstIterator i = _outputVectors.constBegin(); i != _outputVectors.constEnd(); ++i) {
if (!(*i)) {
qWarning() << "Output vector for data object " << this->Name() << " is invalid." << endl;
}
Expand All @@ -277,7 +277,7 @@ void Relation::unlockInputsAndOutputs() const {
(*i)->unlock();
}

for (VectorMap::ConstIterator i = _inputVectors.begin(); i != _inputVectors.end(); ++i) {
for (VectorMap::ConstIterator i = _inputVectors.constBegin(); i != _inputVectors.constEnd(); ++i) {
if (!(*i)) {
qWarning() << "Input vector for data object " << this->Name() << " is invalid." << endl;
}
Expand All @@ -287,7 +287,7 @@ void Relation::unlockInputsAndOutputs() const {
(*i)->unlock();
}

for (ScalarMap::ConstIterator i = _outputScalars.begin(); i != _outputScalars.end(); ++i) {
for (ScalarMap::ConstIterator i = _outputScalars.constBegin(); i != _outputScalars.constEnd(); ++i) {
if (!(*i)) {
qWarning() << "Output scalar for data object " << this->Name() << " is invalid." << endl;
}
Expand All @@ -297,7 +297,7 @@ void Relation::unlockInputsAndOutputs() const {
(*i)->unlock();
}

for (ScalarMap::ConstIterator i = _inputScalars.begin(); i != _inputScalars.end(); ++i) {
for (ScalarMap::ConstIterator i = _inputScalars.constBegin(); i != _inputScalars.constEnd(); ++i) {
if (!(*i)) {
qWarning() << "Input scalar for data object " << this->Name() << " is invalid." << endl;
}
Expand All @@ -307,7 +307,7 @@ void Relation::unlockInputsAndOutputs() const {
(*i)->unlock();
}

for (StringMap::ConstIterator i = _outputStrings.begin(); i != _outputStrings.end(); ++i) {
for (StringMap::ConstIterator i = _outputStrings.constBegin(); i != _outputStrings.constEnd(); ++i) {
if (!(*i)) {
qWarning() << "Output string for data object " << this->Name() << " is invalid." << endl;
}
Expand All @@ -317,7 +317,7 @@ void Relation::unlockInputsAndOutputs() const {
(*i)->unlock();
}

for (StringMap::ConstIterator i = _inputStrings.begin(); i != _inputStrings.end(); ++i) {
for (StringMap::ConstIterator i = _inputStrings.constBegin(); i != _inputStrings.constEnd(); ++i) {
if (!(*i)) {
qWarning() << "Input string for data object " << this->Name() << " is invalid." << endl;
}
Expand All @@ -332,13 +332,13 @@ void Relation::unlockInputsAndOutputs() const {
bool Relation::uses(ObjectPtr p) const {
VectorPtr v = kst_cast<Vector>(p);
if (v) {
for (VectorMap::ConstIterator j = _inputVectors.begin(); j != _inputVectors.end(); ++j) {
for (VectorMap::ConstIterator j = _inputVectors.constBegin(); j != _inputVectors.constEnd(); ++j) {
if (j.value() == v) {
return true;
}
}
QHashIterator<QString, ScalarPtr> scalarDictIter(v->scalars());
for (ScalarMap::ConstIterator j = _inputScalars.begin(); j != _inputScalars.end(); ++j) {
for (ScalarMap::ConstIterator j = _inputScalars.constBegin(); j != _inputScalars.constEnd(); ++j) {
while (scalarDictIter.hasNext()) {
scalarDictIter.next();
if (scalarDictIter.value() == j.value()) {
Expand All @@ -347,7 +347,7 @@ bool Relation::uses(ObjectPtr p) const {
}
}
QHashIterator<QString, StringPtr> stringDictIter(v->strings());
for (StringMap::ConstIterator j = _inputStrings.begin(); j != _inputStrings.end(); ++j) {
for (StringMap::ConstIterator j = _inputStrings.constBegin(); j != _inputStrings.constEnd(); ++j) {
while (stringDictIter.hasNext()) {
stringDictIter.next();
if (stringDictIter.value() == j.value()) {
Expand All @@ -356,13 +356,13 @@ bool Relation::uses(ObjectPtr p) const {
}
}
} else if (MatrixPtr matrix = kst_cast<Matrix>(p)) {
for (MatrixMap::ConstIterator j = _inputMatrices.begin(); j != _inputMatrices.end(); ++j) {
for (MatrixMap::ConstIterator j = _inputMatrices.constBegin(); j != _inputMatrices.constEnd(); ++j) {
if (j.value() == matrix) {
return true;
}
}
QHashIterator<QString, ScalarPtr> scalarDictIter(matrix->scalars());
for (ScalarMap::ConstIterator j = _inputScalars.begin(); j != _inputScalars.end(); ++j) {
for (ScalarMap::ConstIterator j = _inputScalars.constBegin(); j != _inputScalars.constEnd(); ++j) {
while (scalarDictIter.hasNext()) {
scalarDictIter.next();
if (scalarDictIter.value() == j.value()) {
Expand All @@ -373,14 +373,14 @@ bool Relation::uses(ObjectPtr p) const {
} else if (DataObjectPtr obj = kst_cast<DataObject>(p) ) {
// check all connections from this object to p
for (VectorMap::Iterator j = obj->outputVectors().begin(); j != obj->outputVectors().end(); ++j) {
for (VectorMap::ConstIterator k = _inputVectors.begin(); k != _inputVectors.end(); ++k) {
for (VectorMap::ConstIterator k = _inputVectors.constBegin(); k != _inputVectors.constEnd(); ++k) {
if (j.value() == k.value()) {
return true;
}
}
// also check dependencies on vector stats
QHashIterator<QString, ScalarPtr> scalarDictIter(j.value()->scalars());
for (ScalarMap::ConstIterator k = _inputScalars.begin(); k != _inputScalars.end(); ++k) {
for (ScalarMap::ConstIterator k = _inputScalars.constBegin(); k != _inputScalars.constEnd(); ++k) {
while (scalarDictIter.hasNext()) {
scalarDictIter.next();
if (scalarDictIter.value() == k.value()) {
Expand All @@ -390,7 +390,7 @@ bool Relation::uses(ObjectPtr p) const {
}
// also check dependencies on vector strings
QHashIterator<QString, StringPtr> stringDictIter(j.value()->strings());
for (StringMap::ConstIterator k = _inputStrings.begin(); k != _inputStrings.end(); ++k) {
for (StringMap::ConstIterator k = _inputStrings.constBegin(); k != _inputStrings.constEnd(); ++k) {
while (stringDictIter.hasNext()) {
stringDictIter.next();
if (stringDictIter.value() == k.value()) {
Expand All @@ -401,14 +401,14 @@ bool Relation::uses(ObjectPtr p) const {
}

for (MatrixMap::Iterator j = obj->outputMatrices().begin(); j != obj->outputMatrices().end(); ++j) {
for (MatrixMap::ConstIterator k = _inputMatrices.begin(); k != _inputMatrices.end(); ++k) {
for (MatrixMap::ConstIterator k = _inputMatrices.constBegin(); k != _inputMatrices.constEnd(); ++k) {
if (j.value() == k.value()) {
return true;
}
}
// also check dependencies on vector stats
QHashIterator<QString, ScalarPtr> scalarDictIter(j.value()->scalars());
for (ScalarMap::ConstIterator k = _inputScalars.begin(); k != _inputScalars.end(); ++k) {
for (ScalarMap::ConstIterator k = _inputScalars.constBegin(); k != _inputScalars.constEnd(); ++k) {
while (scalarDictIter.hasNext()) {
scalarDictIter.next();
if (scalarDictIter.value() == k.value()) {
Expand All @@ -419,15 +419,15 @@ bool Relation::uses(ObjectPtr p) const {
}

for (ScalarMap::Iterator j = obj->outputScalars().begin(); j != obj->outputScalars().end(); ++j) {
for (ScalarMap::ConstIterator k = _inputScalars.begin(); k != _inputScalars.end(); ++k) {
for (ScalarMap::ConstIterator k = _inputScalars.constBegin(); k != _inputScalars.constEnd(); ++k) {
if (j.value() == k.value()) {
return true;
}
}
}

for (StringMap::Iterator j = obj->outputStrings().begin(); j != obj->outputStrings().end(); ++j) {
for (StringMap::ConstIterator k = _inputStrings.begin(); k != _inputStrings.end(); ++k) {
for (StringMap::ConstIterator k = _inputStrings.constBegin(); k != _inputStrings.constEnd(); ++k) {
if (j.value() == k.value()) {
return true;
}
Expand Down
16 changes: 8 additions & 8 deletions src/widgets/cclineedit.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -623,8 +623,8 @@ void SVCCLineEdit::fillKstObjects()
_cc->_tableView->setFixedWidth(_cc->_tableView->width());
}

ScalarList::ConstIterator scalarIt = scalarList.begin();
for (; scalarIt != scalarList.end(); ++scalarIt) {
ScalarList::ConstIterator scalarIt = scalarList.constBegin();
for (; scalarIt != scalarList.constEnd(); ++scalarIt) {
ScalarPtr scalar = (*scalarIt);

scalar->readLock();
Expand All @@ -635,8 +635,8 @@ void SVCCLineEdit::fillKstObjects()
scalar->unlock();
}

VectorList::ConstIterator vectorIt = vectorList.begin();
for (; vectorIt != vectorList.end(); ++vectorIt) {
VectorList::ConstIterator vectorIt = vectorList.constBegin();
for (; vectorIt != vectorList.constEnd(); ++vectorIt) {
VectorPtr vector = (*vectorIt);

vector->readLock();
Expand Down Expand Up @@ -670,8 +670,8 @@ void SVCCTextEdit::fillKstObjects()
ScalarList scalarList = _store->getObjects<Scalar>();
StringList stringList = _store->getObjects<String>();

ScalarList::ConstIterator scalarIt = scalarList.begin();
for (; scalarIt != scalarList.end(); ++scalarIt) {
ScalarList::ConstIterator scalarIt = scalarList.constBegin();
for (; scalarIt != scalarList.constEnd(); ++scalarIt) {
ScalarPtr scalar = (*scalarIt);

scalar->readLock();
Expand All @@ -681,8 +681,8 @@ void SVCCTextEdit::fillKstObjects()

_svData->back().push_back(Category("Strings"));

StringList::ConstIterator stringIt = stringList.begin();
for (; stringIt != stringList.end(); ++stringIt) {
StringList::ConstIterator stringIt = stringList.constBegin();
for (; stringIt != stringList.constEnd(); ++stringIt) {
StringPtr string = (*stringIt);

string->readLock();
Expand Down
4 changes: 2 additions & 2 deletions src/widgets/curveselector.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ void CurveSelector::fillCurves() {

CurveList curveList = _store->getObjects<Curve>();

CurveList::ConstIterator it = curveList.begin();
for (; it != curveList.end(); ++it) {
CurveList::ConstIterator it = curveList.constBegin();
for (; it != curveList.constEnd(); ++it) {
CurvePtr curve = (*it);

curve->readLock();
Expand Down
4 changes: 2 additions & 2 deletions src/widgets/matrixselector.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ void MatrixSelector::fillMatrices() {

MatrixList matrixList = _store->getObjects<Matrix>();

MatrixList::ConstIterator it = matrixList.begin();
for (; it != matrixList.end(); ++it) {
MatrixList::ConstIterator it = matrixList.constBegin();
for (; it != matrixList.constEnd(); ++it) {
MatrixPtr matrix = (*it);

matrix->readLock();
Expand Down
4 changes: 2 additions & 2 deletions src/widgets/scalarselector.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,8 @@ void ScalarSelector::fillScalars() {

ScalarList scalarList = _store->getObjects<Scalar>();

ScalarList::ConstIterator it = scalarList.begin();
for (; it != scalarList.end(); ++it) {
ScalarList::ConstIterator it = scalarList.constBegin();
for (; it != scalarList.constEnd(); ++it) {
ScalarPtr scalar = (*it);

scalar->readLock();
Expand Down
4 changes: 2 additions & 2 deletions src/widgets/stringselector.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ void StringSelector::fillStrings() {

StringList stringList = _store->getObjects<String>();

StringList::ConstIterator it = stringList.begin();
for (; it != stringList.end(); ++it) {
StringList::ConstIterator it = stringList.constBegin();
for (; it != stringList.constEnd(); ++it) {
StringPtr string = (*it);

string->readLock();
Expand Down
4 changes: 2 additions & 2 deletions src/widgets/vectorselector.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,8 @@ void VectorSelector::fillVectors() {

VectorList vectorList = _store->getObjects<Vector>();

VectorList::ConstIterator it = vectorList.begin();
for (; it != vectorList.end(); ++it) {
VectorList::ConstIterator it = vectorList.constBegin();
for (; it != vectorList.constEnd(); ++it) {
VectorPtr vector = (*it);
if (vector->isScalarList())
continue;
Expand Down