From dde6a17a0f5dd63ba1af8d4253cd1ec4d1248799 Mon Sep 17 00:00:00 2001
From: Aaron Seigo <aseigo@kde.org>
Date: Fri, 4 Nov 2011 23:23:52 +0100
Subject: [PATCH] use libkactivities

---
 CMakeLists.txt  | 2 +-
 toplevel.h      | 2 --
 useractions.cpp | 4 ++--
 workspace.h     | 6 +++---
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24785cd6fa..feb2c90717 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -189,7 +189,7 @@ qt4_add_dbus_interface( kwin_KDEINIT_SRCS
 
 qt4_add_resources( kwin_KDEINIT_SRCS resources.qrc )
 
-set(kwinLibs ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} kephal kworkspace kdecorations kwineffects ${X11_LIBRARIES} ${X11_Xrandr_LIB} ${X11_Xcomposite_LIB} ${X11_Xdamage_LIB} ${X11_Xrender_LIB} ${X11_Xfixes_LIB})
+set(kwinLibs ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${KACTIVITIES_LIBRARY} kephal kworkspace kdecorations kwineffects ${X11_LIBRARIES} ${X11_Xrandr_LIB} ${X11_Xcomposite_LIB} ${X11_Xdamage_LIB} ${X11_Xrender_LIB} ${X11_Xfixes_LIB})
 
 if(KWIN_BUILD_SCRIPTING)
     set(kwinLibs ${kwinLibs} ${QT_QTSCRIPT_LIBRARY})
diff --git a/toplevel.h b/toplevel.h
index c7866547be..693e6f3718 100644
--- a/toplevel.h
+++ b/toplevel.h
@@ -28,8 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kdecoration.h>
 #include <kdebug.h>
 
-#include "kactivityconsumer.h"
-
 #include "utils.h"
 #include "workspace.h"
 
diff --git a/useractions.cpp b/useractions.cpp
index 59ba42ea13..60c3908c98 100644
--- a/useractions.cpp
+++ b/useractions.cpp
@@ -36,7 +36,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "tiling/tiling.h"
 #endif
 
-#include "kactivityinfo.h"
+#include <Activities/Info>
 
 #include <fixx11h.h>
 #include <QPushButton>
@@ -506,7 +506,7 @@ void Workspace::activityPopupAboutToShow()
     activity_popup->addSeparator();
 
     foreach (const QString & id, openActivityList()) {
-        KActivityInfo activity(id);
+        KActivities::Info activity(id);
         QString name = activity.name();
         name.replace('&', "&&");
         action = activity_popup->addAction(KIcon(activity.icon()), name);
diff --git a/workspace.h b/workspace.h
index e4db7e7617..616c39f85e 100644
--- a/workspace.h
+++ b/workspace.h
@@ -32,7 +32,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QElapsedTimer>
 #include <kmanagerselection.h>
 
-#include "kactivitycontroller.h"
+#include <Activities/Controller>
 
 #include "plugins.h"
 #include "utils.h"
@@ -307,7 +307,7 @@ private:
     QString activity_;
     QStringList allActivities_;
 
-    KActivityController activityController_;
+    KActivities::Controller activityController_;
 
 #ifdef KWIN_BUILD_TILING
     Tiling* m_tiling;
@@ -334,7 +334,7 @@ public:
         return allActivities_;
     }
     QStringList openActivityList() const {
-        return activityController_.listActivities(KActivityInfo::Running);
+        return activityController_.listActivities(KActivities::Info::Running);
     }
 
     // True when performing Workspace::updateClientArea().