From 3bd4f1e953031c47a440c8b84f2e33a0418afa1e Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Wed, 30 Jul 2014 19:35:37 +0200
Subject: [PATCH] port activities runner

---
 runners/CMakeLists.txt                |  2 +-
 runners/activities/CMakeLists.txt     |  2 +-
 runners/activities/activityrunner.cpp | 18 +++++++++++-------
 runners/activities/activityrunner.h   |  5 ++---
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/runners/CMakeLists.txt b/runners/CMakeLists.txt
index 79f8bd803..d12fa30a9 100644
--- a/runners/CMakeLists.txt
+++ b/runners/CMakeLists.txt
@@ -1,4 +1,4 @@
-# add_subdirectory(activities)
+add_subdirectory(activities)
 add_subdirectory(baloo)
 add_subdirectory(bookmarks)
 add_subdirectory(calculator)
diff --git a/runners/activities/CMakeLists.txt b/runners/activities/CMakeLists.txt
index 388cc0075..ce0aec5df 100644
--- a/runners/activities/CMakeLists.txt
+++ b/runners/activities/CMakeLists.txt
@@ -5,7 +5,7 @@ set(krunner_activities_SRCS
 )
 
 add_library(krunner_activities MODULE ${krunner_activities_SRCS})
-target_link_libraries(krunner_activities KF5::Plasma KF5::Activities)
+target_link_libraries(krunner_activities KF5::Runner KF5::I18n KF5::Activities)
 
 install(TARGETS krunner_activities DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES plasma-runner-activityrunner.desktop DESTINATION ${SERVICES_INSTALL_DIR})
diff --git a/runners/activities/activityrunner.cpp b/runners/activities/activityrunner.cpp
index f58d4235e..3224aa267 100644
--- a/runners/activities/activityrunner.cpp
+++ b/runners/activities/activityrunner.cpp
@@ -19,12 +19,15 @@
 #include "activityrunner.h"
 
 #include <QDebug>
-#include <KIcon>
-#include <KLocale>
+#include <QIcon>
+#include <klocalizedstring.h>
+
+K_EXPORT_PLASMA_RUNNER(activities, ActivityRunner)
 
 ActivityRunner::ActivityRunner(QObject *parent, const QVariantList &args)
     : Plasma::AbstractRunner(parent, args),
       m_activities(0),
+      m_consumer(0),
       m_keywordi18n(i18nc("KRunner keyword", "activity")),
       m_keyword("activity"),
       m_enabled(false)
@@ -36,14 +39,15 @@ ActivityRunner::ActivityRunner(QObject *parent, const QVariantList &args)
     connect(this, SIGNAL(prepare()), this, SLOT(prep()));
     connect(this, SIGNAL(teardown()), this, SLOT(down()));
 
-    serviceStatusChanged(KActivities::Consumer::FullFunctionality);
+    serviceStatusChanged(KActivities::Consumer::Running);
 }
 
 void ActivityRunner::prep()
 {
     if (!m_activities) {
         m_activities = new KActivities::Controller(this);
-        connect(m_activities, SIGNAL(serviceStatusChanged(KActivities::Consumer::ServiceStatus)),
+        m_consumer = new KActivities::Consumer(this);
+        connect(m_consumer, SIGNAL(serviceStatusChanged(KActivities::Consumer::ServiceStatus)),
                 this, SLOT(serviceStatusChanged(KActivities::Consumer::ServiceStatus)));
         serviceStatusChanged(m_activities->serviceStatus());
     }
@@ -105,7 +109,7 @@ void ActivityRunner::match(Plasma::RunnerContext &context)
     }
 
     QList<Plasma::QueryMatch> matches;
-    QStringList activities = m_activities->listActivities();
+    QStringList activities = m_consumer->activities();
     qSort(activities);
 
     const QString current = m_activities->currentActivity();
@@ -144,7 +148,7 @@ void ActivityRunner::match(Plasma::RunnerContext &context)
         }
     }
 
-    context.addMatches(context.query(), matches);
+    context.addMatches(matches);
 }
 
 void ActivityRunner::addMatch(const KActivities::Info &activity, QList<Plasma::QueryMatch> &matches)
@@ -152,7 +156,7 @@ void ActivityRunner::addMatch(const KActivities::Info &activity, QList<Plasma::Q
     Plasma::QueryMatch match(this);
     match.setData(activity.id());
     match.setType(Plasma::QueryMatch::ExactMatch);
-    match.setIcon(activity.icon().isEmpty() ? KIcon("preferences-activities") : KIcon(activity.icon()));
+    match.setIcon(activity.icon().isEmpty() ? QIcon::fromTheme("preferences-activities") : QIcon::fromTheme(activity.icon()));
     match.setText(i18n("Switch to \"%1\"", activity.name()));
     match.setRelevance(0.7 + ((activity.state() == KActivities::Info::Running ||
                                activity.state() == KActivities::Info::Starting) ? 0.1 : 0));
diff --git a/runners/activities/activityrunner.h b/runners/activities/activityrunner.h
index 7fef74928..b29557723 100644
--- a/runners/activities/activityrunner.h
+++ b/runners/activities/activityrunner.h
@@ -19,7 +19,7 @@
 #ifndef ACTIVITYRUNNER_H
 #define ACTIVITYRUNNER_H
 
-#include <Plasma/AbstractRunner>
+#include <krunner/abstractrunner.h>
 
 #include <KActivities/Controller>
 
@@ -43,11 +43,10 @@ class ActivityRunner : public Plasma::AbstractRunner
         void addMatch(const KActivities::Info &activity, QList<Plasma::QueryMatch> &matches);
 
         KActivities::Controller *m_activities;
+        KActivities::Consumer *m_consumer;
         const QString m_keywordi18n;
         const QString m_keyword;
         bool m_enabled;
 };
 
-K_EXPORT_PLASMA_RUNNER(activities, ActivityRunner)
-
 #endif