[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [plasma-workspace] containmentactions: Port to new connect api. Clean forward declaration
From:       Montel Laurent <montel () kde ! org>
Date:       2014-10-31 22:05:54
Message-ID: E1XkKKQ-000300-Ku () scm ! kde ! org
[Download RAW message or body]

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/b8b9248ed5b18830bb368af81c58ba352e53ed4e

diff --git a/containmentactions/contextmenu/menu.cpp \
b/containmentactions/contextmenu/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 = new \
QAction(i18nc("plasma_containmentactions_contextmenu", "Run Command..."), this);  \
                m_runCommandAction->setIcon(QIcon::fromTheme("system-run"));
-        connect(m_runCommandAction, SIGNAL(triggered(bool)), this, \
SLOT(runCommand())); +        connect(m_runCommandAction, &QAction::triggered, this, \
&ContextMenu::runCommand);  
         m_lockScreenAction = new \
                QAction(i18nc("plasma_containmentactions_contextmenu", "Lock \
                Screen"), this);
         m_lockScreenAction->setIcon(QIcon::fromTheme("system-lock-screen"));
-        connect(m_lockScreenAction, SIGNAL(triggered(bool)), this, \
SLOT(lockScreen())); +        connect(m_lockScreenAction, &QAction::triggered, this, \
&ContextMenu::lockScreen);  
         m_logoutAction = new QAction(i18nc("plasma_containmentactions_contextmenu", \
"Leave..."), this);  m_logoutAction->setIcon(QIcon::fromTheme("system-log-out"));
-        connect(m_logoutAction, SIGNAL(triggered(bool)), this, SLOT(startLogout()));
+        connect(m_logoutAction, &QAction::triggered, this, \
&ContextMenu::startLogout);  
         m_separator1 = new QAction(this);
         m_separator1->setSeparator(true);
diff --git a/containmentactions/switchdesktop/desktop.cpp \
b/containmentactions/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 = m_actions.count() + 1; i <= numDesktops; ++i) {
             QString name = KWindowSystem::desktopName(i);
             QAction *action = new QAction(QString("%1: %2").arg(i).arg(name), this);
-            connect(action, SIGNAL(triggered()), this, SLOT(switchTo()));
+            connect(action, &QAction::triggered, this, &SwitchDesktop::switchTo);
             action->setData(i);
             m_actions[i] = action;
         }
diff --git a/containmentactions/switchdesktop/desktop.h \
b/containmentactions/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
 


[prev in list] [next in list] [prev in thread] [next in thread]