diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-05-22 17:00:50 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-06-05 07:07:13 +0000 |
| commit | 690abaac0e4bd57b5510e68730f7965c01a113da (patch) | |
| tree | 77549494ebec7314e7258b42cef0f530bbb34a7c /src/corelib/io/qsettings.cpp | |
| parent | 0c2508efb2bdeb4e96fb7726b14dea5cf2820b21 (diff) | |
Port QSettings from QStringRef to QStringView
Task-number: QTBUG-84319
Change-Id: If2b5d8eb78ab5ca78d365f137d9680b1f0646c6b
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/corelib/io/qsettings.cpp')
| -rw-r--r-- | src/corelib/io/qsettings.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index 855ba0680b..a15dbb772f 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -303,7 +303,7 @@ QSettingsPrivate *QSettingsPrivate::create(const QString &fileName, QSettings::F } #endif -void QSettingsPrivate::processChild(QStringRef key, ChildSpec spec, QStringList &result) +void QSettingsPrivate::processChild(QStringView key, ChildSpec spec, QStringList &result) { if (spec != AllKeys) { int slashPos = key.indexOf(QLatin1Char('/')); @@ -478,9 +478,9 @@ QVariant QSettingsPrivate::stringToVariant(const QString &s) if (s.startsWith(QLatin1Char('@'))) { if (s.endsWith(QLatin1Char(')'))) { if (s.startsWith(QLatin1String("@ByteArray("))) { - return QVariant(s.midRef(11, s.size() - 12).toLatin1()); + return QVariant(QStringView{s}.mid(11, s.size() - 12).toLatin1()); } else if (s.startsWith(QLatin1String("@String("))) { - return QVariant(s.midRef(8, s.size() - 9).toString()); + return QVariant(QStringView{s}.mid(8, s.size() - 9).toString()); } else if (s.startsWith(QLatin1String("@Variant(")) || s.startsWith(QLatin1String("@DateTime("))) { #ifndef QT_NO_DATASTREAM @@ -493,7 +493,7 @@ QVariant QSettingsPrivate::stringToVariant(const QString &s) version = QDataStream::Qt_4_0; offset = 9; } - QByteArray a = s.midRef(offset).toLatin1(); + QByteArray a = QStringView{s}.mid(offset).toLatin1(); QDataStream stream(&a, QIODevice::ReadOnly); stream.setVersion(version); QVariant result; @@ -1309,14 +1309,14 @@ QStringList QConfFileSettingsPrivate::children(const QString &prefix, ChildSpec &confFile->originalKeys)->lowerBound( thePrefix); while (j != confFile->originalKeys.constEnd() && j.key().startsWith(thePrefix)) { if (!confFile->removedKeys.contains(j.key())) - processChild(j.key().originalCaseKey().midRef(startPos), spec, result); + processChild(QStringView{j.key().originalCaseKey()}.mid(startPos), spec, result); ++j; } j = const_cast<const ParsedSettingsMap *>( &confFile->addedKeys)->lowerBound(thePrefix); while (j != confFile->addedKeys.constEnd() && j.key().startsWith(thePrefix)) { - processChild(j.key().originalCaseKey().midRef(startPos), spec, result); + processChild(QStringView{j.key().originalCaseKey()}.mid(startPos), spec, result); ++j; } |