X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Faction.cpp;h=4fc2ea812304d584120970dad1824829ba44a703;hp=c222dc19f87105a0e554cb97b06a4084b520e2c9;hb=HEAD;hpb=695758015a80eb8c158a9ac4c0f1c0b547e70df3

diff --git a/src/uisupport/action.cpp b/src/uisupport/action.cpp
index c222dc19..d7727a39 100644
--- a/src/uisupport/action.cpp
+++ b/src/uisupport/action.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 by the Quassel Project                        *
+ *   Copyright (C) 2005-2022 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -24,104 +24,64 @@
 
 #include <QApplication>
 
-Action::Action(QObject *parent)
-#ifdef HAVE_KDE4
-    : KAction(parent)
-#else
+Action::Action(QObject* parent)
     : QWidgetAction(parent)
-#endif
 {
-    init();
+    setProperty("isShortcutConfigurable", true);
+    connect(this, &QAction::triggered, this, &Action::slotTriggered);
 }
 
-
-Action::Action(const QString &text, QObject *parent, const QObject *receiver, const char *slot, const QKeySequence &shortcut)
-#ifdef HAVE_KDE4
-    : KAction(parent)
-#else
-    : QWidgetAction(parent)
-#endif
+Action::Action(const QString& text, QObject* parent, const QKeySequence& shortcut)
+    : Action(parent)
 {
-    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_KDE4
-    : KAction(parent)
-#else
-    : QWidgetAction(parent)
-#endif
+Action::Action(const QIcon& icon, const QString& text, QObject* parent, const QKeySequence& shortcut)
+    : Action(text, parent, shortcut)
 {
-    init();
     setIcon(icon);
-    setText(text);
-    setShortcut(shortcut);
-    if (receiver && slot)
-        connect(this, SIGNAL(triggered()), receiver, slot);
-}
-
-
-#ifdef HAVE_KDE4
-void Action::init() {}
-#else
-void Action::init()
-{
-    connect(this, SIGNAL(triggered(bool)), this, SLOT(slotTriggered()));
-
-    setProperty("isShortcutConfigurable", true);
 }
 
-
 void Action::slotTriggered()
 {
     emit triggered(QApplication::mouseButtons(), QApplication::keyboardModifiers());
 }
 
-
 bool Action::isShortcutConfigurable() const
 {
     return property("isShortcutConfigurable").toBool();
 }
 
-
 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 (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();
 }
 
-
-void Action::setShortcut(const QShortcut &shortcut, ShortcutTypes type)
+void Action::setShortcut(const QShortcut& shortcut, ShortcutTypes type)
 {
     setShortcut(shortcut.key(), type);
 }
 
-
-void Action::setShortcut(const QKeySequence &key, ShortcutTypes type)
+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_KDE4 */