From 4e5bdb0bd27d07d666ad21fe203fc7f7fabd047b Mon Sep 17 00:00:00 2001
From: Eike Hein <hein@kde.org>
Date: Mon, 23 Jun 2014 21:35:50 +0200
Subject: [PATCH] Reenable activities-related code that was disabled in initial
 KF5 port.

Cf. ffdeb08a in kde-workspace.git (unfortunately plasma-workspace.git
lost libtaskmanager history) for reference.

CCMAIL:mgraesslin@kde.org
CCMAIL:bhush94@gmail.com
CCMAIL:ivan.cukic@kde.org
---
 libtaskmanager/CMakeLists.txt  |  3 +++
 libtaskmanager/taskitem.cpp    |  6 +-----
 libtaskmanager/taskmanager.cpp | 11 -----------
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/libtaskmanager/CMakeLists.txt b/libtaskmanager/CMakeLists.txt
index bf65e347c..3eb489032 100644
--- a/libtaskmanager/CMakeLists.txt
+++ b/libtaskmanager/CMakeLists.txt
@@ -1,3 +1,5 @@
+find_package(KF5Activities REQUIRED)
+
 add_definitions(-DKDE_DEFAULT_DEBUG_AREA=1204)
 add_definitions(-DTRANSLATION_DOMAIN=\"libtaskmanager\")
 remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY)
@@ -45,6 +47,7 @@ target_link_libraries(taskmanager
         Qt5::Gui
         KF5::WindowSystem # KStartupInfo
     PRIVATE
+        KF5::Activities
         KF5::ProcessCore
         KF5::ConfigCore
         KF5::ConfigWidgets
diff --git a/libtaskmanager/taskitem.cpp b/libtaskmanager/taskitem.cpp
index 04de24bbf..189244b69 100644
--- a/libtaskmanager/taskitem.cpp
+++ b/libtaskmanager/taskitem.cpp
@@ -25,9 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // Own
 #include "taskitem.h"
 
-#if 0
-#include <kactivities/info.h>
-#endif
+#include <KActivities/Info>
 #include <KConfig>
 #include <KConfigGroup>
 #include <KDesktopFile>
@@ -231,14 +229,12 @@ QStringList TaskItem::activityNames(bool includeCurrent) const
         activities.removeOne(TaskManager::self()->currentActivity());
     }
 
-#if 0
     Q_FOREACH(QString activity, activities) {
         KActivities::Info info(activity);
         if (info.state() != KActivities::Info::Invalid) {
             names << info.name();
         }
     }
-#endif
 
     return names;
 }
diff --git a/libtaskmanager/taskmanager.cpp b/libtaskmanager/taskmanager.cpp
index 6eaeeea7c..6dc241887 100644
--- a/libtaskmanager/taskmanager.cpp
+++ b/libtaskmanager/taskmanager.cpp
@@ -46,9 +46,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <windows.h>
 #endif
 
-#if 0
 #include <KActivities/Consumer>
-#endif
 
 namespace TaskManager
 {
@@ -102,9 +100,7 @@ public:
     QList<Startup *> startups;
     WindowList skiptaskbarWindows;
     QSet<QUuid> trackGeometryTokens;
-#if 0
     KActivities::Consumer activityConsumer;
-#endif
 };
 
 TaskManager::TaskManager()
@@ -121,17 +117,13 @@ TaskManager::TaskManager()
             this,       SLOT(currentDesktopChanged(int)));
     connect(KWindowSystem::self(), SIGNAL(windowChanged(WId, const ulong*)),
             this,       SLOT(windowChanged(WId, const ulong*)));
-#if 0
     connect(&d->activityConsumer, SIGNAL(currentActivityChanged(QString)),
             this,       SIGNAL(activityChanged(QString)));
-#endif
     if (QCoreApplication::instance()) {
         connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), this, SLOT(onAppExitCleanup()));
     }
 
-#if 0
     emit activityChanged(d->activityConsumer.currentActivity());
-#endif
 
     // register existing windows
     const QList<WId> windows = KWindowSystem::windows();
@@ -574,11 +566,8 @@ int TaskManager::currentDesktop() const
 
 QString TaskManager::currentActivity() const
 {
-#if 0
     return d->activityConsumer.currentActivity();
-#else
     return QString();
-#endif
 }
 
 } // TaskManager namespace