diff options
| -rw-r--r-- | src/organizer/qorganizermanagerengine.cpp | 4 | ||||
| -rw-r--r-- | src/versit/qversitreader_p.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/organizer/qorganizermanagerengine.cpp b/src/organizer/qorganizermanagerengine.cpp index a4368a3e6..28183c750 100644 --- a/src/organizer/qorganizermanagerengine.cpp +++ b/src/organizer/qorganizermanagerengine.cpp @@ -959,9 +959,9 @@ bool QOrganizerManagerEngine::testFilter(const QOrganizerItemFilter &filter, con } else { /* Have to test the length of min & max */ // using refs means the parameter order is backwards, so negate the result of compare - if (testMin && -QString::compare(minVal, var.rightRef(minVal.length()), cs) < minComp) + if (testMin && -QString::compare(minVal, var.right(minVal.length()), cs) < minComp) continue; - if (testMax && -QString::compare(maxVal, var.rightRef(maxVal.length()), cs) >= maxComp) + if (testMax && -QString::compare(maxVal, var.right(maxVal.length()), cs) >= maxComp) continue; return true; } diff --git a/src/versit/qversitreader_p.cpp b/src/versit/qversitreader_p.cpp index 66203f906..b8300e705 100644 --- a/src/versit/qversitreader_p.cpp +++ b/src/versit/qversitreader_p.cpp @@ -1226,11 +1226,11 @@ QStringList QVersitReaderPrivate::splitValue(const QString& string, } else if (string.at(i) == sep) { if (isEscaped) { // we see an escaped separator - remove the backslash - segment += string.midRef(segmentStartIndex, i-segmentStartIndex-1); + segment += string.mid(segmentStartIndex, i-segmentStartIndex-1); segment += sep; } else { // we see a separator - segment += string.midRef(segmentStartIndex, i - segmentStartIndex); + segment += string.mid(segmentStartIndex, i - segmentStartIndex); if (behavior == Qt::KeepEmptyParts || !segment.isEmpty()) list.append(segment); segment.clear(); @@ -1242,7 +1242,7 @@ QStringList QVersitReaderPrivate::splitValue(const QString& string, } } // The rest of the string after the last sep. - segment += string.midRef(segmentStartIndex); + segment += string.mid(segmentStartIndex); if (behavior == Qt::KeepEmptyParts || !segment.isEmpty()) list.append(segment); return list; |