From 5844df73ad25d832701a20e2238d76e8a28e2f4e Mon Sep 17 00:00:00 2001 From: Alexander Lohnau Date: Tue, 27 Jul 2021 13:57:12 +0200 Subject: [PATCH] Remove KCM query logic from services runner It gets moved to systemsettings, see https://invent.kde.org/plasma/systemsettings/-/merge_requests/73 for the rationale This way the runner only shows applications, like it's name in the plugin selector suggests. --- runners/services/servicerunner.cpp | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/runners/services/servicerunner.cpp b/runners/services/servicerunner.cpp index eba8333af..3f3949dd1 100644 --- a/runners/services/servicerunner.cpp +++ b/runners/services/servicerunner.cpp @@ -239,11 +239,10 @@ private: query = generateQuery(queryList); } - KService::List services = KServiceTypeTrader::self()->query(QStringLiteral("Application"), query); - services += KServiceTypeTrader::self()->query(QStringLiteral("KCModule"), query); + const KService::List services = KServiceTypeTrader::self()->query(QStringLiteral("Application"), query); qCDebug(RUNNER_SERVICES) << "got " << services.count() << " services from " << query; - for (const KService::Ptr &service : qAsConst(services)) { + for (const KService::Ptr &service : services) { if (disqualify(service)) { continue; } @@ -295,23 +294,11 @@ private: } } - const bool isKCM = service->serviceTypes().contains(QLatin1String("KCModule")); - if (!isKCM && (service->categories().contains(QLatin1String("KDE")) || service->serviceTypes().contains(QLatin1String("KCModule")))) { + if (service->categories().contains(QLatin1String("KDE"))) { qCDebug(RUNNER_SERVICES) << "found a kde thing" << id << match.subtext() << relevance; relevance += .09; } - if (isKCM) { - if (service->parentApp() == QStringLiteral("kinfocenter")) { - match.setMatchCategory(i18n("System Information")); - } else { - match.setMatchCategory(i18n("System Settings")); - } - // KCMs are, on the balance, less relevant. Drop it ever so much. So they may get outscored - // by an otherwise equally applicable match. - relevance -= .001; - } - qCDebug(RUNNER_SERVICES) << service->name() << "is this relevant:" << relevance; match.setRelevance(relevance);