From cb47835d998c629570896addadb9ce2cb27a8059 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Fri, 30 Oct 2020 08:34:36 +0100 Subject: [PATCH] it depends against qt5.15 --- libkworkspace/kdisplaymanager.cpp | 16 ---------------- libtaskmanager/launchertasksmodel_p.h | 4 ---- 2 files changed, 20 deletions(-) diff --git a/libkworkspace/kdisplaymanager.cpp b/libkworkspace/kdisplaymanager.cpp index d12639383..a2b4bd04e 100644 --- a/libkworkspace/kdisplaymanager.cpp +++ b/libkworkspace/kdisplaymanager.cpp @@ -591,11 +591,7 @@ KDisplayManager::bootOptions(QStringList &opts, int &defopt, int ¤t) if (!exec("listbootoptions\n", re)) return false; -#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - opts = QString::fromLocal8Bit(re.data()).split('\t', QString::SkipEmptyParts); -#else opts = QString::fromLocal8Bit(re.data()).split('\t', Qt::SkipEmptyParts); -#endif if (opts.size() < 4) return false; @@ -607,11 +603,7 @@ KDisplayManager::bootOptions(QStringList &opts, int &defopt, int ¤t) if (!ok) return false; -#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - opts = opts[1].split(' ', QString::SkipEmptyParts); -#else opts = opts[1].split(' ', Qt::SkipEmptyParts); -#endif for (QStringList::Iterator it = opts.begin(); it != opts.end(); ++it) (*it).replace(QLatin1String("\\s"), QLatin1String(" ")); @@ -755,11 +747,7 @@ KDisplayManager::localSessions(SessList &list) if (DMType == OldGDM) { if (!exec("CONSOLE_SERVERS\n", re)) return false; -#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - const QStringList sess = QString(re.data() +3).split(QChar(';'), QString::SkipEmptyParts); -#else const QStringList sess = QString(re.data() +3).split(QChar(';'), Qt::SkipEmptyParts); -#endif for (QStringList::ConstIterator it = sess.constBegin(); it != sess.constEnd(); ++it) { QStringList ts = (*it).split(QChar(',')); SessEnt se; @@ -774,11 +762,7 @@ KDisplayManager::localSessions(SessList &list) } else { if (!exec("list\talllocal\n", re)) return false; -#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - const QStringList sess = QString(re.data() + 3).split(QChar('\t'), QString::SkipEmptyParts); -#else const QStringList sess = QString(re.data() + 3).split(QChar('\t'), Qt::SkipEmptyParts); -#endif for (QStringList::ConstIterator it = sess.constBegin(); it != sess.constEnd(); ++it) { QStringList ts = (*it).split(QChar(',')); SessEnt se; diff --git a/libtaskmanager/launchertasksmodel_p.h b/libtaskmanager/launchertasksmodel_p.h index 0ede982a5..8ad7565a0 100644 --- a/libtaskmanager/launchertasksmodel_p.h +++ b/libtaskmanager/launchertasksmodel_p.h @@ -59,11 +59,7 @@ inline static std::pair deserializeLauncher(const QString &se const auto activitiesBlockEnd = serializedLauncher.indexOf("]\n"); if (activitiesBlockEnd != -1) { -#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - activities = serializedLauncher.mid(1, activitiesBlockEnd - 1).split(",", QString::SkipEmptyParts); -#else activities = serializedLauncher.mid(1, activitiesBlockEnd - 1).split(",", Qt::SkipEmptyParts); -#endif if (!activities.isEmpty()) { url = QUrl(serializedLauncher.mid(activitiesBlockEnd + 2));