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

diff --git a/src/uisupport/action.cpp b/src/uisupport/action.cpp
index 665a5e1b..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,86 +25,86 @@
 #include <QApplication>
 
 Action::Action(QObject *parent)
-#ifdef HAVE_KDE
-: KAction(parent)
-#else
-: QWidgetAction(parent)
-#endif
+    : QWidgetAction(parent)
 {
-  init();
+    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
+    : QWidgetAction(parent)
 {
-  init();
-  setText(text);
-  setShortcut(shortcut);
-  if(receiver && slot)
-    connect(this, SIGNAL(triggered()), receiver, slot);
+    init();
+    setText(text);
+    setShortcut(shortcut);
+    if (receiver && slot)
+        connect(this, SIGNAL(triggered()), receiver, slot);
 }
 
+
 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
+    : QWidgetAction(parent)
 {
-  init();
-  setIcon(icon);
-  setText(text);
-  setShortcut(shortcut);
-  if(receiver && slot)
-    connect(this, SIGNAL(triggered()), receiver, slot);
+    init();
+    setIcon(icon);
+    setText(text);
+    setShortcut(shortcut);
+    if (receiver && slot)
+        connect(this, SIGNAL(triggered()), receiver, slot);
 }
 
-#ifdef HAVE_KDE
-void Action::init() { }
-#else
-void Action::init() {
-  connect(this, SIGNAL(triggered(bool)), this, SLOT(slotTriggered()));
 
-  setProperty("isShortcutConfigurable", true);
+void Action::init()
+{
+    connect(this, &QAction::triggered, this, &Action::slotTriggered);
+
+    setProperty("isShortcutConfigurable", true);
 }
 
-void Action::slotTriggered() {
-  emit triggered(QApplication::mouseButtons(), QApplication::keyboardModifiers());
+
+void Action::slotTriggered()
+{
+    emit triggered(QApplication::mouseButtons(), QApplication::keyboardModifiers());
 }
 
-bool Action::isShortcutConfigurable() const {
-  return property("isShortcutConfigurable").toBool();
+
+bool Action::isShortcutConfigurable() const
+{
+    return property("isShortcutConfigurable").toBool();
 }
 
-void Action::setShortcutConfigurable(bool b) {
-  setProperty("isShortcutConfigurable", b);
+
+void Action::setShortcutConfigurable(bool b)
+{
+    setProperty("isShortcutConfigurable", b);
 }
 
-QKeySequence Action::shortcut(ShortcutTypes type) const {
-  Q_ASSERT(type);
-  if(type == DefaultShortcut)
-    return property("defaultShortcut").value<QKeySequence>();
 
-  if(shortcuts().count()) return shortcuts().value(0);
-  return QKeySequence();
+QKeySequence Action::shortcut(ShortcutTypes type) const
+{
+    Q_ASSERT(type);
+    if (type == DefaultShortcut) {
+        auto sequence = property("defaultShortcuts").value<QList<QKeySequence>>();
+        return sequence.isEmpty() ? QKeySequence() : sequence.first();
+    }
+
+    return shortcuts().isEmpty() ? QKeySequence() : shortcuts().first();
 }
 
-void Action::setShortcut(const QShortcut &shortcut, ShortcutTypes type) {
-  setShortcut(shortcut.key(), type);
+
+void Action::setShortcut(const QShortcut &shortcut, ShortcutTypes type)
+{
+    setShortcut(shortcut.key(), type);
 }
 
-void Action::setShortcut(const QKeySequence &key, ShortcutTypes type) {
-  Q_ASSERT(type);
 
-  if(type & DefaultShortcut)
-    setProperty("defaultShortcut", key);
+void Action::setShortcut(const QKeySequence &key, ShortcutTypes type)
+{
+    Q_ASSERT(type);
 
-  if(type & ActiveShortcut)
-    QAction::setShortcut(key);
+    if (type & DefaultShortcut) {
+        setProperty("defaultShortcuts", QVariant::fromValue(QList<QKeySequence>() << key));
+    }
+    if (type & ActiveShortcut)
+        QAction::setShortcut(key);
 }
-
-#endif /* HAVE_KDE */