diff --git a/applets/systemtray/statusnotifieritemsource.cpp b/applets/systemtray/statusnotifieritemsource.cpp index 31e60392d..a205d65f4 100644 --- a/applets/systemtray/statusnotifieritemsource.cpp +++ b/applets/systemtray/statusnotifieritemsource.cpp @@ -256,7 +256,7 @@ void StatusNotifierItemSource::refreshCallback(QDBusPendingCallWatcher *call) } // FIXME: If last part of path is not "icons", this won't work! QString appName; - auto tokens = path.splitRef('/', Qt::SkipEmptyParts); + auto tokens = QStringView(path).split('/', Qt::SkipEmptyParts); if (tokens.length() >= 3 && tokens.takeLast() == QLatin1String("icons")) appName = tokens.takeLast().toString(); diff --git a/dataengines/applicationjobs/kuiserverengine.cpp b/dataengines/applicationjobs/kuiserverengine.cpp index a6edbc10a..a54620abc 100644 --- a/dataengines/applicationjobs/kuiserverengine.cpp +++ b/dataengines/applicationjobs/kuiserverengine.cpp @@ -36,7 +36,7 @@ QString KuiserverEngine::sourceName(Job *job) uint KuiserverEngine::jobId(const QString &sourceName) { - return sourceName.midRef(4 /*length of Job + space*/).toUInt(); + return QStringView(sourceName).mid(4 /*length of Job + space*/).toUInt(); } Plasma::Service *KuiserverEngine::serviceForSource(const QString &source) diff --git a/dataengines/devicenotifications/ksolidnotify.cpp b/dataengines/devicenotifications/ksolidnotify.cpp index 5172a0ab8..f4852a268 100644 --- a/dataengines/devicenotifications/ksolidnotify.cpp +++ b/dataengines/devicenotifications/ksolidnotify.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include KSolidNotify::KSolidNotify(QObject *parent) @@ -113,9 +113,9 @@ void KSolidNotify::queryBlockingApps(const QString &devicePath) connect(p, static_cast(&QProcess::finished), [=](int, QProcess::ExitStatus) { QStringList blockApps; QString out(p->readAll()); - const QVector pidList = out.splitRef(QRegularExpression(QStringLiteral("\\s+")), Qt::SkipEmptyParts); + const auto pidList = QStringView(out).split(QRegularExpression(QStringLiteral("\\s+")), Qt::SkipEmptyParts); KSysGuard::Processes procs; - for (const QStringRef &pidStr : pidList) { + for (const QStringView &pidStr : pidList) { int pid = pidStr.toInt(); if (!pid) { continue; diff --git a/dataengines/statusnotifieritem/statusnotifieritemsource.cpp b/dataengines/statusnotifieritem/statusnotifieritemsource.cpp index ab1fdc51b..233530749 100644 --- a/dataengines/statusnotifieritem/statusnotifieritemsource.cpp +++ b/dataengines/statusnotifieritem/statusnotifieritemsource.cpp @@ -240,7 +240,7 @@ void StatusNotifierItemSource::refreshCallback(QDBusPendingCallWatcher *call) } // FIXME: If last part of path is not "icons", this won't work! QString appName; - auto tokens = path.splitRef('/', Qt::SkipEmptyParts); + auto tokens = QStringView(path).split('/', Qt::SkipEmptyParts); if (tokens.length() >= 3 && tokens.takeLast() == QLatin1String("icons")) appName = tokens.takeLast().toString(); diff --git a/dataengines/systemmonitor/systemmonitor.cpp b/dataengines/systemmonitor/systemmonitor.cpp index ecfbd629a..943fd2e2d 100644 --- a/dataengines/systemmonitor/systemmonitor.cpp +++ b/dataengines/systemmonitor/systemmonitor.cpp @@ -117,7 +117,7 @@ void SystemMonitorEngine::answerReceived(int id, const QList &answer foreach (const QByteArray &sens, answer) { const QString sensStr{QString::fromUtf8(sens)}; - const QVector newSensorInfo = sensStr.splitRef('\t'); + const auto newSensorInfo = QStringView(sensStr).split('\t'); if (newSensorInfo.count() < 2) { continue; } diff --git a/kcms/cursortheme/kcmcursortheme.cpp b/kcms/cursortheme/kcmcursortheme.cpp index 63ac9e22e..aa7bdc2c3 100644 --- a/kcms/cursortheme/kcmcursortheme.cpp +++ b/kcms/cursortheme/kcmcursortheme.cpp @@ -339,7 +339,7 @@ void CursorThemeConfig::ghnsEntryChanged(KNSCore::EntryWrapper *entry) { if (entry->entry().status() == KNS3::Entry::Deleted) { for (const QString &deleted : entry->entry().uninstalledFiles()) { - QVector list = deleted.splitRef(QLatin1Char('/')); + auto list = QStringView(deleted).split(QLatin1Char('/')); if (list.last() == QLatin1Char('*')) { list.takeLast(); } diff --git a/kcms/fonts/previewimageprovider.cpp b/kcms/fonts/previewimageprovider.cpp index dc75feac0..050b14a2d 100644 --- a/kcms/fonts/previewimageprovider.cpp +++ b/kcms/fonts/previewimageprovider.cpp @@ -65,7 +65,7 @@ QImage PreviewImageProvider::requestImage(const QString &id, QSize *size, const int subPixelIndex = 0; int hintingIndex = 0; - const auto idpart = id.splitRef(QLatin1Char('.'))[0]; + const auto idpart = QStringView(id).split(QLatin1Char('.'))[0]; const auto sections = idpart.split(QLatin1Char('_')); if (sections.size() >= 2) { diff --git a/libkworkspace/kdisplaymanager.cpp b/libkworkspace/kdisplaymanager.cpp index bbd9f96f4..57f91d4bf 100644 --- a/libkworkspace/kdisplaymanager.cpp +++ b/libkworkspace/kdisplaymanager.cpp @@ -242,7 +242,7 @@ public: se.display = tty; se.tty = true; } - se.vt = tty.midRef(strlen("/dev/tty")).toInt(); + se.vt = QStringView(tty).mid(strlen("/dev/tty")).toInt(); } }; @@ -756,7 +756,7 @@ bool KDisplayManager::localSessions(SessList &list) QStringList ts = (*it).split(QChar(',')); SessEnt se; se.display = ts[0]; - se.vt = ts[1].midRef(2).toInt(); + se.vt = QStringView(ts[1]).mid(2).toInt(); se.user = ts[2]; se.session = ts[3]; se.self = (ts[4].indexOf('*') >= 0); diff --git a/wallpapers/image/image.cpp b/wallpapers/image/image.cpp index 346e2fe3c..38030982c 100644 --- a/wallpapers/image/image.cpp +++ b/wallpapers/image/image.cpp @@ -203,7 +203,7 @@ QSize resSize(const QString &str) { int index = str.indexOf('x'); if (index != -1) { - return QSize(str.leftRef(index).toInt(), str.midRef(index + 1).toInt()); + return QSize(QStringView(str).left(index).toInt(), QStringView(str).mid(index + 1).toInt()); } return QSize();