GIT_SILENT Revert "Remove "Plasma" namespace from KRunner plugins"

This reverts commit 391beb17.

runners/CMakeLists.txt

-add_definitions(-DKRUNNER_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055b00)
-
 if(KF5Baloo_FOUND)
  add_subdirectory(baloo)
 endif()

runners/appstream/appstreamrunner.cpp

@@ -23,13 +23,13 @@
 K_PLUGIN_CLASS_WITH_JSON(InstallerRunner, "plasma-runner-appstream.json")
 
 InstallerRunner::InstallerRunner(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args)
-    : AbstractRunner(parent, metaData, args)
+    : Plasma::AbstractRunner(parent, metaData, args)
 {
     setObjectName(QStringLiteral("Installation Suggestions"));
     // We want to give the other runners time to check if there are matching applications already installed
     setPriority(AbstractRunner::LowestPriority);
 
-    addSyntax(RunnerSyntax(":q:", i18n("Looks for non-installed components according to :q:")));
+    addSyntax(Plasma::RunnerSyntax(":q:", i18n("Looks for non-installed components according to :q:")));
     setMinLetterCount(3);
 }
 
@@ -66,7 +66,7 @@ static QIcon componentIcon(const AppStream::Component &comp)
     return ret;
 }
 
-void InstallerRunner::match(RunnerContext &context)
+void InstallerRunner::match(Plasma::RunnerContext &context)
 {
     // Give the other runners a bit of time to produce results
     QEventLoop loop;
@@ -80,7 +80,7 @@ void InstallerRunner::match(RunnerContext &context)
 
     // Check if other plugins have already found an executable, if that is the case we do
     // not want to ask the user to install anything else
-    const QList<QueryMatch> matches = context.matches();
+    const QList<Plasma::QueryMatch> matches = context.matches();
     for (const auto &match : matches) {
         if (match.id().startsWith(QLatin1String("exec://"))) {
             return;
@@ -119,8 +119,8 @@ void InstallerRunner::match(RunnerContext &context)
         if (!servicesFound.isEmpty())
             continue;
 
-        QueryMatch match(this);
-        match.setType(QueryMatch::PossibleMatch);
+        Plasma::QueryMatch match(this);
+        match.setType(Plasma::QueryMatch::PossibleMatch);
         match.setId(componentId);
         match.setIcon(componentIcon(component));
         match.setText(i18n("Get %1…", component.name()));
@@ -131,7 +131,7 @@ void InstallerRunner::match(RunnerContext &context)
     }
 }
 
-void InstallerRunner::run(const RunnerContext & /*context*/, const QueryMatch &match)
+void InstallerRunner::run(const Plasma::RunnerContext & /*context*/, const Plasma::QueryMatch &match)
 {
     const QUrl appstreamUrl = match.data().toUrl();
     if (!QDesktopServices::openUrl(appstreamUrl))

runners/appstream/appstreamrunner.h

@@ -10,7 +10,7 @@
 #include <KRunner/AbstractRunner>
 #include <QMutex>
 
-class InstallerRunner : public AbstractRunner
+class InstallerRunner : public Plasma::AbstractRunner
 {
     Q_OBJECT
 
@@ -18,8 +18,8 @@ public:
     InstallerRunner(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args);
     ~InstallerRunner() override;
 
-    void match(RunnerContext &context) override;
-    void run(const RunnerContext &context, const QueryMatch &action) override;
+    void match(Plasma::RunnerContext &context) override;
+    void run(const Plasma::RunnerContext &context, const Plasma::QueryMatch &action) override;
 
 private:
     QList<AppStream::Component> findComponentsByString(const QString &query);

runners/bookmarks/autotests/bookmarksmatchtest.cpp

@@ -9,6 +9,7 @@
 
 #include "browsers/firefox.h"
 
+using namespace Plasma;
 class TestBookmarksMatch : public QObject
 {
     Q_OBJECT

runners/bookmarks/autotests/chrome/testchromebookmarks.cpp

@@ -12,6 +12,8 @@
 #include "favicon.h"
 #include <QTest>
 
+using namespace Plasma;
+
 void TestChromeBookmarks::initTestCase()
 {
     m_configHome = QFINDTESTDATA("chrome-config-home");

runners/bookmarks/bookmarkmatch.cpp

@@ -19,33 +19,33 @@ BookmarkMatch::BookmarkMatch(const QIcon &icon, const QString &searchTerm, const
 {
 }
 
-QueryMatch BookmarkMatch::asQueryMatch(AbstractRunner *runner)
+Plasma::QueryMatch BookmarkMatch::asQueryMatch(Plasma::AbstractRunner *runner)
 {
-    QueryMatch::Type type;
+    Plasma::QueryMatch::Type type;
     qreal relevance = 0;
 
     if (m_bookmarkTitle.compare(m_searchTerm, Qt::CaseInsensitive) == 0
         || (!m_description.isEmpty() && m_description.compare(m_searchTerm, Qt::CaseInsensitive) == 0)) {
-        type = QueryMatch::ExactMatch;
+        type = Plasma::QueryMatch::ExactMatch;
         relevance = 1.0;
     } else if (m_bookmarkTitle.contains(m_searchTerm, Qt::CaseInsensitive)) {
-        type = QueryMatch::PossibleMatch;
+        type = Plasma::QueryMatch::PossibleMatch;
         relevance = 0.45;
     } else if (!m_description.isEmpty() && m_description.contains(m_searchTerm, Qt::CaseInsensitive)) {
-        type = QueryMatch::PossibleMatch;
+        type = Plasma::QueryMatch::PossibleMatch;
         relevance = 0.3;
     } else if (m_bookmarkURL.contains(m_searchTerm, Qt::CaseInsensitive)) {
-        type = QueryMatch::PossibleMatch;
+        type = Plasma::QueryMatch::PossibleMatch;
         relevance = 0.2;
     } else {
-        type = QueryMatch::PossibleMatch;
+        type = Plasma::QueryMatch::PossibleMatch;
         relevance = 0.18;
     }
 
     bool isNameEmpty = m_bookmarkTitle.isEmpty();
     bool isDescriptionEmpty = m_description.isEmpty();
 
-    QueryMatch match(runner);
+    Plasma::QueryMatch match(runner);
     match.setType(type);
     match.setRelevance(relevance);
     match.setIcon(m_icon);

runners/bookmarks/bookmarkmatch.h

@@ -21,7 +21,7 @@ public:
                   const QString &bookmarkURL,
                   const QString &description = QString());
     void addTo(QList<BookmarkMatch> &listOfResults, bool addEvenOnNoMatch);
-    QueryMatch asQueryMatch(AbstractRunner *runner);
+    Plasma::QueryMatch asQueryMatch(Plasma::AbstractRunner *runner);
 
     Q_REQUIRED_RESULT QString bookmarkTitle() const
     {

runners/bookmarks/bookmarksrunner.cpp

@@ -26,15 +26,15 @@
 K_PLUGIN_CLASS_WITH_JSON(BookmarksRunner, "plasma-runner-bookmarks.json")
 
 BookmarksRunner::BookmarksRunner(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args)
-    : AbstractRunner(parent, metaData, args)
+    : Plasma::AbstractRunner(parent, metaData, args)
     , m_browser(nullptr)
     , m_browserFactory(new BrowserFactory(this))
 {
     setObjectName(QStringLiteral("Bookmarks"));
-    addSyntax(RunnerSyntax(QStringLiteral(":q:"), i18n("Finds web browser bookmarks matching :q:.")));
-    addSyntax(RunnerSyntax(i18nc("list of all web browser bookmarks", "bookmarks"), i18n("List all web browser bookmarks")));
+    addSyntax(Plasma::RunnerSyntax(QStringLiteral(":q:"), i18n("Finds web browser bookmarks matching :q:.")));
+    addSyntax(Plasma::RunnerSyntax(i18nc("list of all web browser bookmarks", "bookmarks"), i18n("List all web browser bookmarks")));
 
-    connect(this, &AbstractRunner::prepare, this, &BookmarksRunner::prep);
+    connect(this, &Plasma::AbstractRunner::prepare, this, &BookmarksRunner::prep);
     setMinLetterCount(3);
 }
 
@@ -45,14 +45,14 @@ void BookmarksRunner::prep()
     auto browser = m_browserFactory->find(findBrowserName(), this);
     if (m_browser != browser) {
         m_browser = browser;
-        connect(this, &AbstractRunner::teardown, dynamic_cast<QObject *>(m_browser), [this]() {
+        connect(this, &Plasma::AbstractRunner::teardown, dynamic_cast<QObject *>(m_browser), [this]() {
             m_browser->teardown();
         });
     }
     m_browser->prepare();
 }
 
-void BookmarksRunner::match(RunnerContext &context)
+void BookmarksRunner::match(Plasma::RunnerContext &context)
 {
     const QString term = context.query();
     bool allBookmarks = term.compare(i18nc("list of all konqueror bookmarks", "bookmarks"), Qt::CaseInsensitive) == 0;
@@ -82,7 +82,7 @@ QString BookmarksRunner::findBrowserName()
     return exec;
 }
 
-void BookmarksRunner::run(const RunnerContext &context, const QueryMatch &action)
+void BookmarksRunner::run(const Plasma::RunnerContext &context, const Plasma::QueryMatch &action)
 {
     Q_UNUSED(context);
     const QString term = action.data().toString();

runners/bookmarks/bookmarksrunner.h

@@ -14,7 +14,7 @@ class Browser;
 class BrowserFactory;
 
 /** This runner searchs for bookmarks in browsers like Konqueror, Firefox and Opera */
-class BookmarksRunner : public AbstractRunner
+class BookmarksRunner : public Plasma::AbstractRunner
 {
     Q_OBJECT
 
@@ -22,8 +22,8 @@ public:
     BookmarksRunner(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args);
     ~BookmarksRunner() override;
 
-    void match(RunnerContext &context) override;
-    void run(const RunnerContext &context, const QueryMatch &action) override;
+    void match(Plasma::RunnerContext &context) override;
+    void run(const Plasma::RunnerContext &context, const Plasma::QueryMatch &action) override;
 
 private:
     /** @returns the browser to get the bookmarks from

runners/calculator/autotests/calculatorrunnertest.cpp

@@ -31,7 +31,7 @@ void CalculatorRunnerTest::testQuery()
     QFETCH(QString, result);
 
     launchQuery(query);
-    const QList<QueryMatch> matches = manager->matches();
+    const QList<Plasma::QueryMatch> matches = manager->matches();
     QCOMPARE(matches.size(), 1);
     QCOMPARE(matches.first().text(), result);
 }

runners/calculator/calculatorrunner.cpp

@@ -22,7 +22,7 @@
 K_PLUGIN_CLASS_WITH_JSON(CalculatorRunner, "plasma-runner-calculator.json")
 
 CalculatorRunner::CalculatorRunner(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args)
-    : AbstractRunner(parent, metaData, args)
+    : Plasma::AbstractRunner(parent, metaData, args)
 {
     m_engine = new QalculateEngine;
 
@@ -31,9 +31,9 @@ CalculatorRunner::CalculatorRunner(QObject *parent, const KPluginMetaData &metaD
     QString description = i18n(
         "Calculates the value of :q: when :q: is made up of numbers and "
         "mathematical symbols such as +, -, /, *, ! and ^.");
-    addSyntax(RunnerSyntax(QStringLiteral(":q:"), description));
-    addSyntax(RunnerSyntax(QStringLiteral("=:q:"), description));
-    addSyntax(RunnerSyntax(QStringLiteral(":q:="), description));
+    addSyntax(Plasma::RunnerSyntax(QStringLiteral(":q:"), description));
+    addSyntax(Plasma::RunnerSyntax(QStringLiteral("=:q:"), description));
+    addSyntax(Plasma::RunnerSyntax(QStringLiteral(":q:="), description));
 
     m_actions = {new QAction(QIcon::fromTheme(QStringLiteral("edit-copy")), i18n("Copy to Clipboard"), this)};
     setMinLetterCount(2);
@@ -56,7 +56,7 @@ void CalculatorRunner::userFriendlySubstitutions(QString &cmd)
     }
 }
 
-void CalculatorRunner::match(RunnerContext &context)
+void CalculatorRunner::match(Plasma::RunnerContext &context)
 {
     const QString term = context.query();
     QString cmd = term;
@@ -69,8 +69,8 @@ void CalculatorRunner::match(RunnerContext &context)
     }
 
     if (cmd.toLower() == QLatin1String("universe") || cmd.toLower() == QLatin1String("life")) {
-        QueryMatch match(this);
-        match.setType(QueryMatch::InformationalMatch);
+        Plasma::QueryMatch match(this);
+        match.setType(Plasma::QueryMatch::InformationalMatch);
         match.setIconName(QStringLiteral("accessories-calculator"));
         match.setText(QStringLiteral("42"));
         match.setData(QStringLiteral("42"));
@@ -121,8 +121,8 @@ void CalculatorRunner::match(RunnerContext &context)
             result = QLatin1String("0x") + QString::number(result.toInt(), 16).toUpper();
         }
 
-        QueryMatch match(this);
-        match.setType(QueryMatch::InformationalMatch);
+        Plasma::QueryMatch match(this);
+        match.setType(Plasma::QueryMatch::InformationalMatch);
         match.setIconName(QStringLiteral("accessories-calculator"));
         match.setText(result);
         if (isApproximate) {
@@ -148,7 +148,7 @@ QString CalculatorRunner::calculate(const QString &term, bool *isApproximate)
     return result.replace(QLatin1Char('.'), QLocale().decimalPoint(), Qt::CaseInsensitive);
 }
 
-void CalculatorRunner::run(const RunnerContext &context, const QueryMatch &match)
+void CalculatorRunner::run(const Plasma::RunnerContext &context, const Plasma::QueryMatch &match)
 {
     Q_UNUSED(context)
     if (match.selectedAction()) {
@@ -156,7 +156,7 @@ void CalculatorRunner::run(const RunnerContext &context, const QueryMatch &match
     }
 }
 
-QMimeData *CalculatorRunner::mimeDataForMatch(const QueryMatch &match)
+QMimeData *CalculatorRunner::mimeDataForMatch(const Plasma::QueryMatch &match)
 {
     QMimeData *result = new QMimeData();
     result->setText(match.text());

runners/calculator/calculatorrunner.h

@@ -18,7 +18,7 @@ class QalculateEngine;
 /**
  * This class evaluates the basic expressions given in the interface.
  */
-class CalculatorRunner : public AbstractRunner
+class CalculatorRunner : public Plasma::AbstractRunner
 {
     Q_OBJECT
 
@@ -26,11 +26,11 @@ public:
     CalculatorRunner(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args);
     ~CalculatorRunner() override;
 
-    void match(RunnerContext &context) override;
+    void match(Plasma::RunnerContext &context) override;
 
 protected Q_SLOTS:
-    void run(const RunnerContext &context, const QueryMatch &match) override;
-    QMimeData *mimeDataForMatch(const QueryMatch &match) override;
+    void run(const Plasma::RunnerContext &context, const Plasma::QueryMatch &match) override;
+    QMimeData *mimeDataForMatch(const Plasma::QueryMatch &match) override;
 
 private:
     QString calculate(const QString &term, bool *isApproximate);

runners/helprunner/helprunner.h

@@ -12,6 +12,8 @@
 #include <QAction>
 #include <QObject>
 
+using namespace Plasma;
+
 class HelpRunner : public AbstractRunner
 {
 public:

runners/kill/killrunner.cpp

@@ -21,7 +21,7 @@
 K_PLUGIN_CLASS_WITH_JSON(KillRunner, "plasma-runner-kill.json")
 
 KillRunner::KillRunner(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args)
-    : AbstractRunner(parent, metaData, args)
+    : Plasma::AbstractRunner(parent, metaData, args)
     , m_processes(nullptr)
 {
     setObjectName(QStringLiteral("Kill Runner"));
@@ -32,8 +32,8 @@ KillRunner::KillRunner(QObject *parent, const KPluginMetaData &metaData, const Q
     sigkill->setData(9);
     m_actionList = {sigterm, sigkill};
 
-    connect(this, &AbstractRunner::prepare, this, &KillRunner::prep);
-    connect(this, &AbstractRunner::teardown, this, &KillRunner::cleanup);
+    connect(this, &Plasma::AbstractRunner::prepare, this, &KillRunner::prep);
+    connect(this, &Plasma::AbstractRunner::teardown, this, &KillRunner::cleanup);
 
     m_delayedCleanupTimer.setInterval(50);
     m_delayedCleanupTimer.setSingleShot(true);
@@ -52,8 +52,8 @@ void KillRunner::reloadConfiguration()
     m_hasTrigger = !m_triggerWord.isEmpty();
 
     m_sorting = (Sort)grp.readEntry(CONFIG_SORTING, static_cast<int>(Sort::NONE));
-    QList<RunnerSyntax> syntaxes;
-    syntaxes << RunnerSyntax(m_triggerWord + QStringLiteral(":q:"), i18n("Terminate running applications whose names match the query."));
+    QList<Plasma::RunnerSyntax> syntaxes;
+    syntaxes << Plasma::RunnerSyntax(m_triggerWord + QStringLiteral(":q:"), i18n("Terminate running applications whose names match the query."));
     setSyntaxes(syntaxes);
     if (m_hasTrigger) {
         setTriggerWords({m_triggerWord});
@@ -85,7 +85,7 @@ void KillRunner::cleanup()
     }
 }
 
-void KillRunner::match(RunnerContext &context)
+void KillRunner::match(Plasma::RunnerContext &context)
 {
     QString term = context.query();
     m_prepLock.lockForRead();
@@ -103,7 +103,7 @@ void KillRunner::match(RunnerContext &context)
 
     term = term.right(term.length() - m_triggerWord.length());
 
-    QList<QueryMatch> matches;
+    QList<Plasma::QueryMatch> matches;
     const QList<KSysGuard::Process *> processlist = m_processes->getAllProcesses();
     for (const KSysGuard::Process *process : processlist) {
         if (!context.isValid()) {
@@ -115,7 +115,7 @@ void KillRunner::match(RunnerContext &context)
         }
 
         const quint64 pid = process->pid();
-        QueryMatch match(this);
+        Plasma::QueryMatch match(this);
         match.setText(i18n("Terminate %1", name));
         match.setSubtext(i18n("Process ID: %1", QString::number(pid)));
         match.setIconName(QStringLiteral("application-exit"));
@@ -142,7 +142,7 @@ void KillRunner::match(RunnerContext &context)
     context.addMatches(matches);
 }
 
-void KillRunner::run(const RunnerContext &context, const QueryMatch &match)
+void KillRunner::run(const Plasma::RunnerContext &context, const Plasma::QueryMatch &match)
 {
     Q_UNUSED(context)
 

runners/kill/killrunner.h

@@ -21,7 +21,7 @@ class Processes;
 class Process;
 }
 
-class KillRunner : public AbstractRunner
+class KillRunner : public Plasma::AbstractRunner
 {
     Q_OBJECT
 
@@ -29,8 +29,8 @@ public:
     KillRunner(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args);
     ~KillRunner() override;
 
-    void match(RunnerContext &context) override;
-    void run(const RunnerContext &context, const QueryMatch &match) override;
+    void match(Plasma::RunnerContext &context) override;
+    void run(const Plasma::RunnerContext &context, const Plasma::QueryMatch &match) override;
     void reloadConfiguration() override;
 
 private Q_SLOTS:

runners/locations/autotests/locationsrunnertest.cpp

@@ -53,7 +53,7 @@ void LocationsRunnerTest::shouldProduceResult()
     QFETCH(QString, query);
     QFETCH(QVariant, data);
     launchQuery(query);
-    const QList<QueryMatch> matches = manager->matches();
+    const QList<Plasma::QueryMatch> matches = manager->matches();
     QCOMPARE(1, matches.size());
     QCOMPARE(matches.first().data(), data);
 }

runners/locations/locationrunner.cpp

@@ -25,18 +25,19 @@
 K_PLUGIN_CLASS_WITH_JSON(LocationsRunner, "plasma-runner-locations.json")
 
 LocationsRunner::LocationsRunner(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args)
-    : AbstractRunner(parent, metaData, args)
+    : Plasma::AbstractRunner(parent, metaData, args)
 {
     // set the name shown after the result in krunner window
     setObjectName(QStringLiteral("Locations"));
-    addSyntax(RunnerSyntax(QStringLiteral(":q:"), i18n("Finds local directories and files, network locations and Internet sites with paths matching :q:.")));
+    addSyntax(
+        Plasma::RunnerSyntax(QStringLiteral(":q:"), i18n("Finds local directories and files, network locations and Internet sites with paths matching :q:.")));
 }
 
 LocationsRunner::~LocationsRunner()
 {
 }
 
-void LocationsRunner::match(RunnerContext &context)
+void LocationsRunner::match(Plasma::RunnerContext &context)
 {
     QString term = context.query();
     // If we have a query with an executable and optionally arguments, BUG: 433053
@@ -54,19 +55,19 @@ void LocationsRunner::match(RunnerContext &context)
     const QFileInfo fileInfo = QFileInfo(url.toLocalFile());
 
     if (fileInfo.exists()) {
-        QueryMatch match(this);
-        match.setType(QueryMatch::ExactMatch);
+        Plasma::QueryMatch match(this);
+        match.setType(Plasma::QueryMatch::ExactMatch);
         match.setText(i18n("Open %1", context.query()));
         match.setIconName(fileInfo.isFile() ? KIO::iconNameForUrl(url) : QStringLiteral("system-file-manager"));
 
         match.setRelevance(1);
         match.setData(url);
         match.setUrls({url});
-        match.setType(QueryMatch::ExactMatch);
+        match.setType(Plasma::QueryMatch::ExactMatch);
         context.addMatch(match);
     } else if (!url.isLocalFile() && !url.isEmpty() && !url.scheme().isEmpty()) {
         const QString protocol = url.scheme();
-        QueryMatch match(this);
+        Plasma::QueryMatch match(this);
         match.setData(url);
         match.setUrls({url});
 
@@ -98,7 +99,7 @@ void LocationsRunner::match(RunnerContext &context)
     }
 }
 
-void LocationsRunner::run(const RunnerContext &context, const QueryMatch &match)
+void LocationsRunner::run(const Plasma::RunnerContext &context, const Plasma::QueryMatch &match)
 {
     Q_UNUSED(context)
 

runners/locations/locationrunner.h

@@ -8,7 +8,7 @@
 
 #include <krunner/abstractrunner.h>
 
-class LocationsRunner : public AbstractRunner
+class LocationsRunner : public Plasma::AbstractRunner
 {
     Q_OBJECT
 
@@ -16,6 +16,6 @@ public:
     LocationsRunner(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args);
     ~LocationsRunner() override;
 
-    void match(RunnerContext &context) override;
-    void run(const RunnerContext &context, const QueryMatch &action) override;
+    void match(Plasma::RunnerContext &context) override;
+    void run(const Plasma::RunnerContext &context, const Plasma::QueryMatch &action) override;
 };

runners/places/placesrunner.cpp

@@ -21,13 +21,14 @@
 
 K_PLUGIN_CLASS_WITH_JSON(PlacesRunner, "plasma-runner-places.json")
 
+// Q_DECLARE_METATYPE(Plasma::RunnerContext)
 PlacesRunner::PlacesRunner(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args)
-    : AbstractRunner(parent, metaData, args)
+    : Plasma::AbstractRunner(parent, metaData, args)
 {
     setObjectName(QStringLiteral("Places"));
-    RunnerSyntax defaultSyntax(i18n("places"), i18n("Lists all file manager locations"));
+    Plasma::RunnerSyntax defaultSyntax(i18n("places"), i18n("Lists all file manager locations"));
     addSyntax(defaultSyntax);
-    addSyntax(RunnerSyntax(QStringLiteral(":q:"), i18n("Finds file manager locations that match :q:")));
+    addSyntax(Plasma::RunnerSyntax(QStringLiteral(":q:"), i18n("Finds file manager locations that match :q:")));
 
     // ensure the bookmarkmanager, etc. in the places model gets creates created in the main thread
     // otherwise crashes ensue
@@ -39,7 +40,7 @@ PlacesRunner::~PlacesRunner()
 {
 }
 
-void PlacesRunner::match(RunnerContext &context)
+void PlacesRunner::match(Plasma::RunnerContext &context)
 {
     if (QThread::currentThread() == QCoreApplication::instance()->thread()) {
         // from the main thread
@@ -70,32 +71,32 @@ PlacesRunnerHelper::PlacesRunnerHelper(PlacesRunner *runner)
     });
 }
 
-void PlacesRunnerHelper::match(RunnerContext *c)
+void PlacesRunnerHelper::match(Plasma::RunnerContext *c)
 {
-    RunnerContext &context = *c;
+    Plasma::RunnerContext &context = *c;
     if (!context.isValid()) {
         return;
     }
 
     const QString term = context.query();
-    QList<QueryMatch> matches;
+    QList<Plasma::QueryMatch> matches;
     const bool all = term.compare(i18n("places"), Qt::CaseInsensitive) == 0;
     for (int i = 0; i <= m_places.rowCount(); i++) {
         QModelIndex current_index = m_places.index(i, 0);
-        QueryMatch::Type type = QueryMatch::NoMatch;
+        Plasma::QueryMatch::Type type = Plasma::QueryMatch::NoMatch;
         qreal relevance = 0;
 
         const QString text = m_places.text(current_index);
         if ((all && !text.isEmpty()) || text.compare(term, Qt::CaseInsensitive) == 0) {
-            type = QueryMatch::ExactMatch;
+            type = Plasma::QueryMatch::ExactMatch;
             relevance = all ? 0.9 : 1.0;
         } else if (text.contains(term, Qt::CaseInsensitive)) {
-            type = QueryMatch::PossibleMatch;
+            type = Plasma::QueryMatch::PossibleMatch;
             relevance = 0.7;
         }
 
-        if (type != QueryMatch::NoMatch) {
-            QueryMatch match(static_cast<PlacesRunner *>(parent()));
+        if (type != Plasma::QueryMatch::NoMatch) {
+            Plasma::QueryMatch match(static_cast<PlacesRunner *>(parent()));
             match.setType(type);
             match.setRelevance(relevance);
             match.setIcon(m_places.icon(current_index));
@@ -141,7 +142,7 @@ void PlacesRunnerHelper::openDevice(const QString &udi)
     }
 }
 
-void PlacesRunner::run(const RunnerContext &context, const QueryMatch &action)
+void PlacesRunner::run(const Plasma::RunnerContext &context, const Plasma::QueryMatch &action)
 {
     Q_UNUSED(context);
     // I don't just pass the model index because the list could change before the user clicks on it, which would make everything go wrong. Ideally we don't want

runners/places/placesrunner.h

@@ -19,7 +19,7 @@ public:
     explicit PlacesRunnerHelper(PlacesRunner *runner);
 
 public Q_SLOTS:
-    void match(RunnerContext *context);
+    void match(Plasma::RunnerContext *context);
     void openDevice(const QString &udi);
 
 private:
@@ -27,7 +27,7 @@ private:
     QString m_pendingUdi;
 };
 
-class PlacesRunner : public AbstractRunner
+class PlacesRunner : public Plasma::AbstractRunner
 {
     Q_OBJECT