alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

consistency

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1054451
This commit is contained in:
Aaron J. Seigo 2009-11-26 01:57:02 +00:00
parent 4d9892e0a3
commit 2e01927f69
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
runnermanager.cpp
View File

@ -129,7 +129,7 @@ public:
void loadSingleRunner() void loadSingleRunner()
{ {
if (!singleMode || singleModeRunnerId.isEmpty() || if (!singleMode || singleModeRunnerId.isEmpty() ||
!enabledSingleRunnerNames.contains(singleModeRunnerId)) { !enabledSingleRunnerIds.contains(singleModeRunnerId)) {
clearSingleRunner(); clearSingleRunner();
return; return;
} }
@ -188,7 +188,7 @@ public:
pluginConf = KConfigGroup(KGlobal::config(), "Plugins"); pluginConf = KConfigGroup(KGlobal::config(), "Plugins");
} }
enabledSingleRunnerNames.clear(); enabledSingleRunnerIds.clear();
foreach (const KService::Ptr &service, offers) { foreach (const KService::Ptr &service, offers) {
//kDebug() << "Loading runner: " << service->name() << service->storageId(); //kDebug() << "Loading runner: " << service->name() << service->storageId();
@ -210,7 +210,7 @@ public:
const bool singleQueryModeEnabled = service->property("SingleRunnerQueryMode", QVariant::Bool).toBool(); const bool singleQueryModeEnabled = service->property("SingleRunnerQueryMode", QVariant::Bool).toBool();
if (singleQueryModeEnabled) { if (singleQueryModeEnabled) {
enabledSingleRunnerNames.insert(runnerName, description.name()); enabledSingleRunnerIds.insert(runnerName, description.name());
} }
//kDebug() << loadAll << description.isPluginEnabled() << noWhiteList << whiteList.contains(runnerName); //kDebug() << loadAll << description.isPluginEnabled() << noWhiteList << whiteList.contains(runnerName);
@ -349,7 +349,7 @@ public:
QTimer matchChangeTimer; QTimer matchChangeTimer;
QTimer delayTimer; // Timer to control when to run slow runners QTimer delayTimer; // Timer to control when to run slow runners
QHash<QString, AbstractRunner*> runners; QHash<QString, AbstractRunner*> runners;
QHash<QString, QString> enabledSingleRunnerNames; QHash<QString, QString> enabledSingleRunnerIds;
AbstractRunner* currentSingleRunner; AbstractRunner* currentSingleRunner;
QSet<FindMatchesJob*> searchJobs; QSet<FindMatchesJob*> searchJobs;
QSet<FindMatchesJob*> oldSearchJobs; QSet<FindMatchesJob*> oldSearchJobs;
@ -473,7 +473,7 @@ QList<AbstractRunner *> RunnerManager::runners() const
QStringList RunnerManager::enabledSingleModeRunnerIds() const QStringList RunnerManager::enabledSingleModeRunnerIds() const
{ {
return d->enabledSingleRunnerNames.keys(); return d->enabledSingleRunnerIds.keys();
} }
QString RunnerManager::runnerName(const QString &id) const QString RunnerManager::runnerName(const QString &id) const
@ -481,7 +481,7 @@ QString RunnerManager::runnerName(const QString &id) const
if (runner(id)) { if (runner(id)) {
return runner(id)->name(); return runner(id)->name();
} else { } else {
return d->enabledSingleRunnerNames.value(id, QString()); return d->enabledSingleRunnerIds.value(id, QString());
} }
} }