From f38e7f4faf264c2308d8397201a68e862a3ce474 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Sun, 13 Dec 2009 14:57:06 +0000 Subject: [PATCH] enabledSingleModeRunnerIds() becomes singleModeAdvertisedRunnerIds() because all runners can be lanched alone, but only a few are accessible like that with global shortcuts svn path=/trunk/KDE/kdelibs/; revision=1062006 --- runnermanager.cpp | 14 +++++++------- runnermanager.h | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/runnermanager.cpp b/runnermanager.cpp index 13db904be..8dd9d464d 100644 --- a/runnermanager.cpp +++ b/runnermanager.cpp @@ -187,7 +187,7 @@ public: pluginConf = KConfigGroup(KGlobal::config(), "Plugins"); } - enabledSingleRunnerIds.clear(); + advertiseSingleRunnerIds.clear(); foreach (const KService::Ptr &service, offers) { //kDebug() << "Loading runner: " << service->name() << service->storageId(); @@ -206,10 +206,10 @@ public: const bool selected = loadAll || (description.isPluginEnabled() && (noWhiteList || whiteList.contains(runnerName))); - const bool singleQueryModeEnabled = service->property("X-Plasma-SingleRunnerQueryMode", QVariant::Bool).toBool(); + const bool singleQueryModeEnabled = service->property("X-Plasma-AdvertiseSingleRunnerQueryMode", QVariant::Bool).toBool(); if (singleQueryModeEnabled) { - enabledSingleRunnerIds.insert(runnerName, description.name()); + advertiseSingleRunnerIds.insert(runnerName, description.name()); } //kDebug() << loadAll << description.isPluginEnabled() << noWhiteList << whiteList.contains(runnerName); @@ -348,7 +348,7 @@ public: QTimer matchChangeTimer; QTimer delayTimer; // Timer to control when to run slow runners QHash runners; - QHash enabledSingleRunnerIds; + QHash advertiseSingleRunnerIds; AbstractRunner* currentSingleRunner; QSet searchJobs; QSet oldSearchJobs; @@ -474,9 +474,9 @@ QList RunnerManager::runners() const return d->runners.values(); } -QStringList RunnerManager::enabledSingleModeRunnerIds() const +QStringList RunnerManager::singleModeAdvertisedRunnerIds() const { - return d->enabledSingleRunnerIds.keys(); + return d->advertiseSingleRunnerIds.keys(); } QString RunnerManager::runnerName(const QString &id) const @@ -484,7 +484,7 @@ QString RunnerManager::runnerName(const QString &id) const if (runner(id)) { return runner(id)->name(); } else { - return d->enabledSingleRunnerIds.value(id, QString()); + return d->advertiseSingleRunnerIds.value(id, QString()); } } diff --git a/runnermanager.h b/runnermanager.h index 6cce5dc3c..eae016c25 100644 --- a/runnermanager.h +++ b/runnermanager.h @@ -110,10 +110,10 @@ class PLASMA_EXPORT RunnerManager : public QObject QList runners() const; /** - * @return the names of all single query mode enabled runners + * @return the names of all runners that advertise single query mode * @since 4.4 */ - QStringList enabledSingleModeRunnerIds() const; + QStringList singleModeAdvertisedRunnerIds() const; /** * Retrieves the current context