yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use libkactivities

Browse source
This commit is contained in:
Aaron Seigo 2011-11-04 23:23:52 +01:00
parent 6698801cb5
commit dde6a17a0f
4 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -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})

2
toplevel.h
View file

@ -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"

4
useractions.cpp
View file

@ -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);

6
workspace.h
View file

@ -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().