yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove left-over from disable global shortcuts removal

Browse source 
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.
This commit is contained in:
Martin Gräßlin 2013-09-09 09:53:39 +02:00
parent 0e24f4ead4
commit 1398f9ed04
4 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tabbox/tabbox.cpp
View file

@ -1092,7 +1092,6 @@ void TabBox::modalActionsSwitch(bool enabled)
{ {
QList<KActionCollection*> collections; QList<KActionCollection*> collections;
collections.append(Workspace::self()->actionCollection()); collections.append(Workspace::self()->actionCollection());
collections.append(Workspace::self()->disableShortcutsKeys());
collections.append(Workspace::self()->clientKeys()); collections.append(Workspace::self()->clientKeys());
foreach (KActionCollection * collection, collections) foreach (KActionCollection * collection, collections)
foreach (QAction * action, collection->actions()) foreach (QAction * action, collection->actions())

6
useractions.cpp
View file

@ -950,12 +950,6 @@ void Workspace::initShortcuts()
KActionCollection* actionCollection = keys; KActionCollection* actionCollection = keys;
QAction* a = 0L; 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 #define IN_KWIN
#include "kwinbindings.cpp" #include "kwinbindings.cpp"
#ifdef KWIN_BUILD_TABBOX #ifdef KWIN_BUILD_TABBOX

1
workspace.cpp
View file

@ -151,7 +151,6 @@ Workspace::Workspace(bool restore)
, m_userActionsMenu(new UserActionsMenu(this)) , m_userActionsMenu(new UserActionsMenu(this))
, keys(0) , keys(0)
, client_keys(NULL) , client_keys(NULL)
, disable_shortcuts_keys(NULL)
, client_keys_dialog(NULL) , client_keys_dialog(NULL)
, client_keys_client(NULL) , client_keys_client(NULL)
, global_shortcuts_disabled_for_client(false) , global_shortcuts_disabled_for_client(false)

4
workspace.h
View file

@ -194,9 +194,6 @@ public:
KActionCollection* actionCollection() const { KActionCollection* actionCollection() const {
return keys; return keys;
} }
KActionCollection* disableShortcutsKeys() const {
return disable_shortcuts_keys;
}
KActionCollection* clientKeys() const { KActionCollection* clientKeys() const {
return client_keys; return client_keys;
} }
@ -515,7 +512,6 @@ private:
KActionCollection* keys; KActionCollection* keys;
KActionCollection* client_keys; KActionCollection* client_keys;
KActionCollection* disable_shortcuts_keys;
ShortcutDialog* client_keys_dialog; ShortcutDialog* client_keys_dialog;
Client* client_keys_client; Client* client_keys_client;
bool global_shortcuts_disabled_for_client; bool global_shortcuts_disabled_for_client;