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

Uff, I guess we will live with duplicates for some more time. My previous commit breaks krunner as it *only* runs stuff which is autocompleted. Will backrevert -

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=935428
This commit is contained in:
Jacopo De Simoi 2009-03-05 06:02:11 +00:00
parent 366a44bf0e
commit 0d12d6b3b8
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
abstractrunner.cpp
View File

@ -132,7 +132,7 @@ void AbstractRunner::reloadConfiguration()
{
}
void AbstractRunner::performMatch(Plasma::RunnerContext &localContext)
void AbstractRunner::performMatch(Plasma::RunnerContext &globalContext)
{
static const int reasonableRunTime = 1500;
static const int fastEnoughTime = 250;
@ -140,6 +140,8 @@ void AbstractRunner::performMatch(Plasma::RunnerContext &localContext)
d->runtime.restart();
//The local copy is already obtained in the job
RunnerContext localContext(globalContext, 0);
match(localContext);
// automatically rate limit runners that become slooow
const int runtime = d->runtime.elapsed();

4
private/runnerjobs.cpp
View File

@ -125,7 +125,7 @@ void DefaultRunnerPolicy::destructed(Job *job)
FindMatchesJob::FindMatchesJob(Plasma::AbstractRunner *runner,
Plasma::RunnerContext *context, QObject *parent)
: ThreadWeaver::Job(parent),
m_context(*context, 0),
m_context(context),
m_runner(runner),
m_timer(0),
m_stale(false)
@ -155,7 +155,7 @@ void FindMatchesJob::run()
{
// kDebug() << "Running match for " << m_runner->objectName()
// << " in Thread " << thread()->id() << endl;
m_runner->performMatch(m_context);
m_runner->performMatch(*m_context);
}
int FindMatchesJob::priority() const

2
private/runnerjobs.h
View File

@ -118,7 +118,7 @@ protected:
void run();
private:
Plasma::RunnerContext m_context;
Plasma::RunnerContext *m_context;
Plasma::AbstractRunner *m_runner;
QTimer *m_timer;
bool m_stale;

5
runnermanager.cpp
View File

@ -390,9 +390,8 @@ bool RunnerManager::execQuery(const QString &term, const QString &runnerName)
//kDebug() << "ignored!";
return false;
}
//CHECK: the match is performed in the same thread, do we really need a local copy?
RunnerContext localContext(d->context, 0);
r->performMatch(localContext);
r->performMatch(d->context);
//kDebug() << "succeeded with" << d->context.matches().count() << "results";
emit matchesChanged(d->context.matches());
return true;