diff --git a/plasma/abstractrunner.cpp b/plasma/abstractrunner.cpp index 533f5f9b..1104be2b 100644 --- a/plasma/abstractrunner.cpp +++ b/plasma/abstractrunner.cpp @@ -204,9 +204,8 @@ void AbstractRunner::setIgnoredTypes(RunnerContext::Types types) d->blackListed = types; } -void AbstractRunner::run(const Plasma::RunnerContext &search, const Plasma::QueryMatch &action) +void AbstractRunner::run(const Plasma::QueryMatch &action) { - Q_UNUSED(search) Q_UNUSED(action) } diff --git a/plasma/abstractrunner.h b/plasma/abstractrunner.h index ffc7bb26..367f59eb 100644 --- a/plasma/abstractrunner.h +++ b/plasma/abstractrunner.h @@ -139,14 +139,11 @@ class PLASMA_EXPORT AbstractRunner : public QObject void performMatch(Plasma::RunnerContext &context); /** - * Called whenever an exact or possible match associated with this - * runner is triggered. + * Called whenever a match associated with this runner is triggered. * - * @param context The context in which the match is triggered, i.e. for which - * the match was created. * @param match The actual match to run/execute. */ - virtual void run(const Plasma::RunnerContext &context, const Plasma::QueryMatch &match); + virtual void run(const Plasma::QueryMatch &match); /** * The nominal speed of the runner. diff --git a/plasma/querymatch.cpp b/plasma/querymatch.cpp index cbe11fec..9b70abb1 100644 --- a/plasma/querymatch.cpp +++ b/plasma/querymatch.cpp @@ -238,11 +238,11 @@ bool QueryMatch::operator!=(const QueryMatch &other) const return (d != other.d); } -void QueryMatch::run(const RunnerContext &context) const +void QueryMatch::run() const { //kDebug() << "we run the term" << context->query() << "whose type is" << context->mimetype(); if (d->runner) { - d->runner.data()->run(context, *this); + d->runner.data()->run(*this); } } diff --git a/plasma/querymatch.h b/plasma/querymatch.h index 69b2d79c..14ca839e 100644 --- a/plasma/querymatch.h +++ b/plasma/querymatch.h @@ -93,11 +93,9 @@ class PLASMA_EXPORT QueryMatch /** * Requests this match to activae using the given context * - * @param context the context to use in conjunction with this run - * * @sa AbstractRunner::run */ - void run(const RunnerContext &context) const; + void run() const; /** * Sets data to be used internally by the associated diff --git a/plasma/runnercontext.cpp b/plasma/runnercontext.cpp index 04c18705..9b624cad 100644 --- a/plasma/runnercontext.cpp +++ b/plasma/runnercontext.cpp @@ -498,11 +498,6 @@ QueryMatch RunnerContext::match(const QString &id) const return QueryMatch(nullptr); } -void RunnerContext::run(const QueryMatch &match) -{ - match.run(*this); -} - } // Plasma namespace #include "moc_runnercontext.cpp" diff --git a/plasma/runnercontext.h b/plasma/runnercontext.h index 782c1dd6..fe1f2d8b 100644 --- a/plasma/runnercontext.h +++ b/plasma/runnercontext.h @@ -193,16 +193,6 @@ public: */ QueryMatch match(const QString &id) const; - /** - * Run a match using the information from this context - * - * The context will also keep track of the number of times the match was - * launched to sort future matches according to user habits - * - * @param match the match to run - */ - void run(const QueryMatch &match); - Q_SIGNALS: void matchesChanged(); diff --git a/plasma/runnermanager.cpp b/plasma/runnermanager.cpp index 62c46633..40d553fd 100644 --- a/plasma/runnermanager.cpp +++ b/plasma/runnermanager.cpp @@ -275,19 +275,6 @@ QList RunnerManager::matches() const return d->context.matches(); } -void RunnerManager::run(const QString &id) -{ - run(d->context.match(id)); -} - -void RunnerManager::run(const QueryMatch &match) -{ - if (!match.isEnabled()) { - return; - } - d->context.run(match); -} - QList RunnerManager::actionsForMatch(const QueryMatch &match) { AbstractRunner *runner = match.runner(); diff --git a/plasma/runnermanager.h b/plasma/runnermanager.h index a34354cb..80071e30 100644 --- a/plasma/runnermanager.h +++ b/plasma/runnermanager.h @@ -84,18 +84,6 @@ class PLASMA_EXPORT RunnerManager : public QObject */ QList matches() const; - /** - * Runs a given match - * @param match the match to be executed - */ - void run(const QueryMatch &match); - - /** - * Runs a given match - * @param id the id of the match to run - */ - void run(const QString &id); - /** * Retrieves the list of actions, if any, for a match */