From 4cef894e87ff9c36f76130af8a0d97fac6335d9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Fl=C3=B6ser?= <mgraesslin@kde.org>
Date: Sun, 24 Sep 2017 10:15:13 +0200
Subject: [PATCH] Drop delegating Workspace::slotToggleCompositing

Instead connect global shortcut directly to method in Compositor.
---
 kwinbindings.cpp | 2 +-
 useractions.cpp  | 1 +
 workspace.cpp    | 7 -------
 workspace.h      | 1 -
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/kwinbindings.cpp b/kwinbindings.cpp
index 0d517c8cb..bbdd75a5e 100644
--- a/kwinbindings.cpp
+++ b/kwinbindings.cpp
@@ -159,7 +159,7 @@ DEF(I18N_NOOP("Switch to Next Screen"),            0, slotSwitchToNextScreen);
 DEF(I18N_NOOP("Switch to Previous Screen"),        0, slotSwitchToPrevScreen);
 
 DEF(I18N_NOOP("Kill Window"),                      Qt::CTRL + Qt::ALT + Qt::Key_Escape, slotKillWindow);
-DEF(I18N_NOOP("Suspend Compositing"),              Qt::SHIFT + Qt::ALT + Qt::Key_F12, slotToggleCompositing);
+DEF6(I18N_NOOP("Suspend Compositing"),             Qt::SHIFT + Qt::ALT + Qt::Key_F12, Compositor::self(), Compositor::slotToggleCompositing);
 DEF6(I18N_NOOP("Invert Screen Colors"),            0, kwinApp()->platform(), Platform::invertScreen);
 
 #undef DEF
diff --git a/useractions.cpp b/useractions.cpp
index 232882aa0..dc5670793 100644
--- a/useractions.cpp
+++ b/useractions.cpp
@@ -34,6 +34,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "useractions.h"
 #include "cursor.h"
 #include "client.h"
+#include "composite.h"
 #include "input.h"
 #include "workspace.h"
 #include "effects.h"
diff --git a/workspace.cpp b/workspace.cpp
index 40bb0b566..c38c6029c 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -1654,13 +1654,6 @@ QString Workspace::supportInformation() const
     return support;
 }
 
-void Workspace::slotToggleCompositing()
-{
-    if (m_compositor) {
-        m_compositor->slotToggleCompositing();
-    }
-}
-
 Client *Workspace::findClient(std::function<bool (const Client*)> func) const
 {
     if (Client *ret = Toplevel::findInList(clients, func)) {
diff --git a/workspace.h b/workspace.h
index f27100e75..7b55c7593 100644
--- a/workspace.h
+++ b/workspace.h
@@ -443,7 +443,6 @@ public Q_SLOTS:
 
     void slotSetupWindowShortcut();
     void setupWindowShortcutDone(bool);
-    void slotToggleCompositing();
 
     void updateClientArea();
 
-- 
GitLab