From 1398f9ed0495e683e4eb5cf0082a7ed966901592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
Date: Mon, 9 Sep 2013 09:53:39 +0200
Subject: [PATCH] Remove left-over from disable global shortcuts removal

There used to be an own action collection in KDE 3 times for the
block global shortcuts shortcut. But the code ws disabled and by
that I didn't see it during removing the global shortcuts blocking.
And it explains why the global shortcut blocking didn't work.
---
 tabbox/tabbox.cpp | 1 -
 useractions.cpp   | 6 ------
 workspace.cpp     | 1 -
 workspace.h       | 4 ----
 4 files changed, 12 deletions(-)

diff --git a/tabbox/tabbox.cpp b/tabbox/tabbox.cpp
index c82978dc20..f4c3b1b446 100644
--- a/tabbox/tabbox.cpp
+++ b/tabbox/tabbox.cpp
@@ -1092,7 +1092,6 @@ void TabBox::modalActionsSwitch(bool enabled)
 {
     QList<KActionCollection*> collections;
     collections.append(Workspace::self()->actionCollection());
-    collections.append(Workspace::self()->disableShortcutsKeys());
     collections.append(Workspace::self()->clientKeys());
     foreach (KActionCollection * collection, collections)
     foreach (QAction * action, collection->actions())
diff --git a/useractions.cpp b/useractions.cpp
index d83cf94700..d150bd1dfe 100755
--- a/useractions.cpp
+++ b/useractions.cpp
@@ -950,12 +950,6 @@ void Workspace::initShortcuts()
     KActionCollection* actionCollection = keys;
     QAction* a = 0L;
 
-    // a separate KActionCollection is needed for the shortcut for disabling global shortcuts,
-    // otherwise it would also disable itself
-    disable_shortcuts_keys = new KActionCollection(this);
-    // TODO: PORT ME (KGlobalAccel related)
-    // FIXME KAccel port... needed?
-    //disable_shortcuts_keys->disableBlocking( true );
 #define IN_KWIN
 #include "kwinbindings.cpp"
 #ifdef KWIN_BUILD_TABBOX
diff --git a/workspace.cpp b/workspace.cpp
index 9f5ebdf718..c41c1b0533 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -151,7 +151,6 @@ Workspace::Workspace(bool restore)
     , m_userActionsMenu(new UserActionsMenu(this))
     , keys(0)
     , client_keys(NULL)
-    , disable_shortcuts_keys(NULL)
     , client_keys_dialog(NULL)
     , client_keys_client(NULL)
     , global_shortcuts_disabled_for_client(false)
diff --git a/workspace.h b/workspace.h
index 7fc6d66ead..ec2dd9ad8d 100644
--- a/workspace.h
+++ b/workspace.h
@@ -194,9 +194,6 @@ public:
     KActionCollection* actionCollection() const {
         return keys;
     }
-    KActionCollection* disableShortcutsKeys() const {
-        return disable_shortcuts_keys;
-    }
     KActionCollection* clientKeys() const {
         return client_keys;
     }
@@ -515,7 +512,6 @@ private:
 
     KActionCollection* keys;
     KActionCollection* client_keys;
-    KActionCollection* disable_shortcuts_keys;
     ShortcutDialog* client_keys_dialog;
     Client* client_keys_client;
     bool global_shortcuts_disabled_for_client;