diff --git a/abstractrunner.cpp b/abstractrunner.cpp index 374f2ac12..170935de1 100644 --- a/abstractrunner.cpp +++ b/abstractrunner.cpp @@ -210,10 +210,10 @@ QMutex* AbstractRunner::bigLock() const return &Private::bigLock; } -void AbstractRunner::exec(const Plasma::SearchContext *search, const Plasma::SearchMatch *action) +void AbstractRunner::run(const Plasma::SearchContext *search, const Plasma::SearchMatch *action) { if (d->script) { - return d->script->exec(search, action); + return d->script->run(search, action); } } diff --git a/abstractrunner.h b/abstractrunner.h index 1e25e961c..635ceed82 100644 --- a/abstractrunner.h +++ b/abstractrunner.h @@ -89,8 +89,8 @@ class PLASMA_EXPORT AbstractRunner : public QObject * The match will be activated if the user selects it. * * If this runner's exact match is selected, it will be passed into - * the exec method. - * @see exec + * the run method. + * @see run * * Since each runner is executed in its own thread there is no need * to return from this method right away, nor to create all matches @@ -107,7 +107,7 @@ class PLASMA_EXPORT AbstractRunner : public QObject /** * If the runner has options that the user can interact with to modify - * what happens when exec or one of the actions created in fillMatches + * what happens when run or one of the actions created in fillMatches * is called, the runner should return true */ bool hasRunOptions(); @@ -139,7 +139,7 @@ class PLASMA_EXPORT AbstractRunner : public QObject * Called whenever an exact or possible match associated with this * runner is triggered. */ - virtual void exec(const Plasma::SearchContext *context, const Plasma::SearchMatch *action); + virtual void run(const Plasma::SearchContext *context, const Plasma::SearchMatch *action); /** * The nominal speed of the runner. diff --git a/scripting/runnerscript.cpp b/scripting/runnerscript.cpp index f500eb17c..e9762e178 100644 --- a/scripting/runnerscript.cpp +++ b/scripting/runnerscript.cpp @@ -57,7 +57,7 @@ void RunnerScript::match(Plasma::SearchContext *search) Q_UNUSED(search) } -void RunnerScript::exec(const Plasma::SearchContext *search, const Plasma::SearchMatch *action) +void RunnerScript::run(const Plasma::SearchContext *search, const Plasma::SearchMatch *action) { Q_UNUSED(search) Q_UNUSED(action) diff --git a/scripting/runnerscript.h b/scripting/runnerscript.h index 884fef9bc..970b9bb42 100644 --- a/scripting/runnerscript.h +++ b/scripting/runnerscript.h @@ -68,7 +68,7 @@ public: * Called whenever an exact or possible match associated with this * runner is triggered. */ - virtual void exec(const Plasma::SearchContext *search, const Plasma::SearchMatch *action); + virtual void run(const Plasma::SearchContext *search, const Plasma::SearchMatch *action); protected: /** diff --git a/searchmatch.cpp b/searchmatch.cpp index a8170132a..2bcde8b24 100644 --- a/searchmatch.cpp +++ b/searchmatch.cpp @@ -142,14 +142,14 @@ bool SearchMatch::operator<(const SearchMatch& other) const return d->relevance < other.d->relevance; } -void SearchMatch::exec(const SearchContext *context) const +void SearchMatch::run(const SearchContext *context) const { Q_ASSERT(context); //kDebug() << "we have" << context->searchTerm() << context->mimetype(); if (d->runner) { //TODO: this could be dangerous if the runner is deleted behind our backs. - d->runner->exec(context, this); + d->runner->run(context, this); } } diff --git a/searchmatch.h b/searchmatch.h index 14b1224b1..322860f9e 100644 --- a/searchmatch.h +++ b/searchmatch.h @@ -106,7 +106,7 @@ class PLASMA_EXPORT SearchMatch bool operator<(const SearchMatch& other) const; - void exec(const SearchContext *context) const; + void run(const SearchContext *context) const; private: class Private;