From 4423b961a553cd6511cc3fadab9ed54d88555f09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Fri, 6 Jul 2012 18:13:39 +0200 Subject: [PATCH] Fix incorrect connects of Activities in WorkspaceWrapper Remember: a compiling connect does not mean it is correct. BUG: 303200 FIXED-IN: 4.9.0 REVIEW: 105480 --- scripting/workspace_wrapper.cpp | 4 ++-- scripting/workspace_wrapper.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scripting/workspace_wrapper.cpp b/scripting/workspace_wrapper.cpp index 83d2b17980..f610139cef 100644 --- a/scripting/workspace_wrapper.cpp +++ b/scripting/workspace_wrapper.cpp @@ -39,9 +39,9 @@ WorkspaceWrapper::WorkspaceWrapper(QObject* parent) : QObject(parent) connect(ws, SIGNAL(numberDesktopsChanged(int)), SIGNAL(numberDesktopsChanged(int))); connect(ws, SIGNAL(clientDemandsAttentionChanged(KWin::Client*,bool)), SIGNAL(clientDemandsAttentionChanged(KWin::Client*,bool))); connect(ws, SIGNAL(currentActivityChanged(QString)), SIGNAL(currentActivityChanged(QString))); - connect(ws, SIGNAL(activityAdded(QString)), SIGNAL(activitiesChanged())); + connect(ws, SIGNAL(activityAdded(QString)), SIGNAL(activitiesChanged(QString))); connect(ws, SIGNAL(activityAdded(QString)), SIGNAL(activityAdded(QString))); - connect(ws, SIGNAL(activityRemoved(QString)), SIGNAL(activitiesChanged())); + connect(ws, SIGNAL(activityRemoved(QString)), SIGNAL(activitiesChanged(QString))); connect(ws, SIGNAL(activityRemoved(QString)), SIGNAL(activityRemoved(QString))); connect(QApplication::desktop(), SIGNAL(screenCountChanged(int)), SIGNAL(numberScreensChanged(int))); connect(QApplication::desktop(), SIGNAL(resized(int)), SIGNAL(screenResized(int))); diff --git a/scripting/workspace_wrapper.h b/scripting/workspace_wrapper.h index 18fbe583cc..964453d192 100644 --- a/scripting/workspace_wrapper.h +++ b/scripting/workspace_wrapper.h @@ -107,8 +107,9 @@ signals: void screenResized(int screen); /** * Signal emitted whenever the current activity changed. + * @param id id of the new activity **/ - void currentActivityChanged(); + void currentActivityChanged(const QString &id); /** * Signal emitted whenever the list of activities changed. * @param id id of the new activity