yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix threaded queryScriptsToLoad()

Browse source 
REVIEW: 104866
This commit is contained in:
Thomas Lübking 2012-05-05 17:36:30 +02:00
parent a79eacaed7
commit e274c297b9
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scripting/scripting.cpp
View file

@ -294,14 +294,13 @@ void KWin::Scripting::start()
// perform querying for the services in a thread // perform querying for the services in a thread
QFutureWatcher<LoadScriptList> *watcher = new QFutureWatcher<LoadScriptList>(this); QFutureWatcher<LoadScriptList> *watcher = new QFutureWatcher<LoadScriptList>(this);
connect(watcher, SIGNAL(finished()), this, SLOT(slotScriptsQueried())); connect(watcher, SIGNAL(finished()), this, SLOT(slotScriptsQueried()));
watcher->setFuture(QtConcurrent::run(this, &KWin::Scripting::queryScriptsToLoad));
}
LoadScriptList KWin::Scripting::queryScriptsToLoad()
{
KSharedConfig::Ptr _config = KGlobal::config(); KSharedConfig::Ptr _config = KGlobal::config();
KConfigGroup conf(_config, "Plugins"); KConfigGroup conf(_config, "Plugins");
watcher->setFuture(QtConcurrent::run(this, &KWin::Scripting::queryScriptsToLoad, conf));
}
LoadScriptList KWin::Scripting::queryScriptsToLoad(KConfigGroup &conf)
{
KService::List offers = KServiceTypeTrader::self()->query("KWin/Script"); KService::List offers = KServiceTypeTrader::self()->query("KWin/Script");
LoadScriptList scriptsToLoad; LoadScriptList scriptsToLoad;

2
scripting/scripting.h
View file

@ -185,7 +185,7 @@ private Q_SLOTS:
void slotScriptsQueried(); void slotScriptsQueried();
private: private:
LoadScriptList queryScriptsToLoad(); LoadScriptList queryScriptsToLoad(KConfigGroup &conf);
}; };
} }