Git commit b8b9248ed5b18830bb368af81c58ba352e53ed4e by Montel Laurent.
Committed on 31/10/2014 at 22:03.
Pushed by mlaurent into branch 'master'.

Port to new connect api. Clean forward declaration

M  +3    -3    containmentactions/contextmenu/menu.cpp
M  +1    -1    containmentactions/switchdesktop/desktop.cpp
M  +0    -3    containmentactions/switchdesktop/desktop.h
M  +0    -1    containmentactions/switchwindow/switch.h

http://commits.kde.org/plasma-workspace/b8b9248ed5b18830bb368af81c58ba352e5=
3ed4e

diff --git a/containmentactions/contextmenu/menu.cpp b/containmentactions/c=
ontextmenu/menu.cpp
index 8e0d05a..37f0153 100644
--- a/containmentactions/contextmenu/menu.cpp
+++ b/containmentactions/contextmenu/menu.cpp
@@ -94,15 +94,15 @@ void ContextMenu::restore(const KConfigGroup &config)
     if (!m_runCommandAction) {
         m_runCommandAction =3D new QAction(i18nc("plasma_containmentaction=
s_contextmenu", "Run Command..."), this);
         m_runCommandAction->setIcon(QIcon::fromTheme("system-run"));
-        connect(m_runCommandAction, SIGNAL(triggered(bool)), this, SLOT(ru=
nCommand()));
+        connect(m_runCommandAction, &QAction::triggered, this, &ContextMen=
u::runCommand);
 =

         m_lockScreenAction =3D new QAction(i18nc("plasma_containmentaction=
s_contextmenu", "Lock Screen"), this);
         m_lockScreenAction->setIcon(QIcon::fromTheme("system-lock-screen")=
);
-        connect(m_lockScreenAction, SIGNAL(triggered(bool)), this, SLOT(lo=
ckScreen()));
+        connect(m_lockScreenAction, &QAction::triggered, this, &ContextMen=
u::lockScreen);
 =

         m_logoutAction =3D new QAction(i18nc("plasma_containmentactions_co=
ntextmenu", "Leave..."), this);
         m_logoutAction->setIcon(QIcon::fromTheme("system-log-out"));
-        connect(m_logoutAction, SIGNAL(triggered(bool)), this, SLOT(startL=
ogout()));
+        connect(m_logoutAction, &QAction::triggered, this, &ContextMenu::s=
tartLogout);
 =

         m_separator1 =3D new QAction(this);
         m_separator1->setSeparator(true);
diff --git a/containmentactions/switchdesktop/desktop.cpp b/containmentacti=
ons/switchdesktop/desktop.cpp
index cf28791..ea3cbb9 100644
--- a/containmentactions/switchdesktop/desktop.cpp
+++ b/containmentactions/switchdesktop/desktop.cpp
@@ -49,7 +49,7 @@ QList<QAction*> SwitchDesktop::contextualActions()
         for (int i =3D m_actions.count() + 1; i <=3D numDesktops; ++i) {
             QString name =3D KWindowSystem::desktopName(i);
             QAction *action =3D new QAction(QString("%1: %2").arg(i).arg(n=
ame), this);
-            connect(action, SIGNAL(triggered()), this, SLOT(switchTo()));
+            connect(action, &QAction::triggered, this, &SwitchDesktop::swi=
tchTo);
             action->setData(i);
             m_actions[i] =3D action;
         }
diff --git a/containmentactions/switchdesktop/desktop.h b/containmentaction=
s/switchdesktop/desktop.h
index dd1753b..821093a 100644
--- a/containmentactions/switchdesktop/desktop.h
+++ b/containmentactions/switchdesktop/desktop.h
@@ -23,9 +23,6 @@
 #include <plasma/containmentactions.h>
 =

 class QAction;
-class QMenu;
-class QMouseEvent;
-class QWheelEvent;
 =

 class SwitchDesktop : public Plasma::ContainmentActions
 {
diff --git a/containmentactions/switchwindow/switch.h b/containmentactions/=
switchwindow/switch.h
index 30e9f18..f8fdb2f 100644
--- a/containmentactions/switchwindow/switch.h
+++ b/containmentactions/switchwindow/switch.h
@@ -33,7 +33,6 @@ class QTimer;
 =

 namespace TaskManager
 {
-    class Startup;
     class Task;
 } // namespace TaskManager
 =