X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Faction.cpp;h=a61339a3e64959617cc4b08367e87a6b88aec02d;hp=7c2073460a26641f92e4443fe0be77779364291d;hb=900cce213a6ed000b7131a05a0dec7d04b35b023;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce

diff --git a/src/uisupport/action.cpp b/src/uisupport/action.cpp
index 7c207346..a61339a3 100644
--- a/src/uisupport/action.cpp
+++ b/src/uisupport/action.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************
  * Parts of this implementation are taken from KDE's kaction.cpp           *
  ***************************************************************************/
@@ -25,22 +25,14 @@
 #include <QApplication>
 
 Action::Action(QObject *parent)
-#ifdef HAVE_KDE
-    : KAction(parent)
-#else
     : QWidgetAction(parent)
-#endif
 {
     init();
 }
 
 
 Action::Action(const QString &text, QObject *parent, const QObject *receiver, const char *slot, const QKeySequence &shortcut)
-#ifdef HAVE_KDE
-    : KAction(parent)
-#else
     : QWidgetAction(parent)
-#endif
 {
     init();
     setText(text);
@@ -51,11 +43,7 @@ Action::Action(const QString &text, QObject *parent, const QObject *receiver, co
 
 
 Action::Action(const QIcon &icon, const QString &text, QObject *parent, const QObject *receiver, const char *slot, const QKeySequence &shortcut)
-#ifdef HAVE_KDE
-    : KAction(parent)
-#else
     : QWidgetAction(parent)
-#endif
 {
     init();
     setIcon(icon);
@@ -66,12 +54,9 @@ Action::Action(const QIcon &icon, const QString &text, QObject *parent, const QO
 }
 
 
-#ifdef HAVE_KDE
-void Action::init() {}
-#else
 void Action::init()
 {
-    connect(this, SIGNAL(triggered(bool)), this, SLOT(slotTriggered()));
+    connect(this, &QAction::triggered, this, &Action::slotTriggered);
 
     setProperty("isShortcutConfigurable", true);
 }
@@ -98,11 +83,12 @@ void Action::setShortcutConfigurable(bool b)
 QKeySequence Action::shortcut(ShortcutTypes type) const
 {
     Q_ASSERT(type);
-    if (type == DefaultShortcut)
-        return property("defaultShortcut").value<QKeySequence>();
+    if (type == DefaultShortcut) {
+        auto sequence = property("defaultShortcuts").value<QList<QKeySequence>>();
+        return sequence.isEmpty() ? QKeySequence() : sequence.first();
+    }
 
-    if (shortcuts().count()) return shortcuts().value(0);
-    return QKeySequence();
+    return shortcuts().isEmpty() ? QKeySequence() : shortcuts().first();
 }
 
 
@@ -116,12 +102,9 @@ void Action::setShortcut(const QKeySequence &key, ShortcutTypes type)
 {
     Q_ASSERT(type);
 
-    if (type & DefaultShortcut)
-        setProperty("defaultShortcut", key);
-
+    if (type & DefaultShortcut) {
+        setProperty("defaultShortcuts", QVariant::fromValue(QList<QKeySequence>() << key));
+    }
     if (type & ActiveShortcut)
         QAction::setShortcut(key);
 }
-
-
-#endif /* HAVE_KDE */