Check global shortcuts in Workspace::shortcutAvailable

One TODO less.
2013-02-13 13:53:45 +01:00 · 2013-02-13 13:53:45 +01:00 · dc649d1dc6
parent a3faf455b9
commit dc649d1dc6
1 changed files with 6 additions and 1 deletions
--- a/useractions.cpp
+++ b/useractions.cpp
@ -1861,7 +1861,12 @@ void Client::delayedSetShortcut()

 bool Workspace::shortcutAvailable(const KShortcut& cut, Client* ignore) const
 {
-    // TODO check global shortcuts etc.
+
+    Q_FOREACH (const QKeySequence &seq, cut.toList()) {
+        if (!KGlobalAccel::getGlobalShortcutsByKey(seq).isEmpty()) {
+            return false;
+        }
+    }
    for (ClientList::ConstIterator it = clients.constBegin();
            it != clients.constEnd();
            ++it) {