diff options
| author | Ahmad Samir <a.samirh78@gmail.com> | 2021-08-18 15:26:07 +0200 |
|---|---|---|
| committer | Ahmad Samir <a.samirh78@gmail.com> | 2021-08-18 15:41:16 +0200 |
| commit | 4f8ed9b7815584afc59a9ea73bb401d9b4006d68 (patch) | |
| tree | 5ac5cd59212c11e07fcb5574c2ed57f6af3d9281 /src/core | |
| parent | 98e74c201c760c17fd6b7143f649ae42d3e0667f (diff) | |
| download | kconfig-4f8ed9b7815584afc59a9ea73bb401d9b4006d68.tar.gz kconfig-4f8ed9b7815584afc59a9ea73bb401d9b4006d68.tar.bz2 | |
Port to QStrinView
Now that KF requires Qt 5.15.2; this basically reverts commit 2e8742e64fc0
with some trivial changes.
NO_CHANGELOG
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/kconfig.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp index b5fd9d63..0bf6cccd 100644 --- a/src/core/kconfig.cpp +++ b/src/core/kconfig.cpp @@ -186,21 +186,21 @@ QString KConfigPrivate::expandString(const QString &value) int nDollarPos = aValue.indexOf(QLatin1Char('$')); while (nDollarPos != -1 && nDollarPos + 1 < aValue.length()) { // there is at least one $ - if (aValue[nDollarPos + 1] != QLatin1Char('$')) { + if (aValue.at(nDollarPos + 1) != QLatin1Char('$')) { int nEndPos = nDollarPos + 1; // the next character is not $ - QStringRef aVarName; - if (aValue[nEndPos] == QLatin1Char('{')) { + QStringView aVarName; + if (aValue.at(nEndPos) == QLatin1Char('{')) { while ((nEndPos <= aValue.length()) && (aValue[nEndPos] != QLatin1Char('}'))) { ++nEndPos; } ++nEndPos; - aVarName = aValue.midRef(nDollarPos + 2, nEndPos - nDollarPos - 3); + aVarName = QStringView(aValue).mid(nDollarPos + 2, nEndPos - nDollarPos - 3); } else { while (nEndPos < aValue.length() && (aValue[nEndPos].isNumber() || aValue[nEndPos].isLetter() || aValue[nEndPos] == QLatin1Char('_'))) { ++nEndPos; } - aVarName = aValue.midRef(nDollarPos + 1, nEndPos - nDollarPos - 1); + aVarName = QStringView(aValue).mid(nDollarPos + 1, nEndPos - nDollarPos - 1); } QString env; if (!aVarName.isEmpty()) { |