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

diff --git a/src/uisupport/action.cpp b/src/uisupport/action.cpp
index f160ac4c..d7727a39 100644
--- a/src/uisupport/action.cpp
+++ b/src/uisupport/action.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 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  *
@@ -15,75 +15,73 @@
  *   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           *
  ***************************************************************************/
 
-#include <QApplication>
-
 #include "action.h"
 
-Action::Action(QObject *parent) : QWidgetAction(parent) {
-  init();
-}
+#include <QApplication>
 
-Action::Action(const QString &text, QObject *parent, const QObject *receiver, const char *slot, const QKeySequence &shortcut)
-: QWidgetAction(parent) {
-  init();
-  setText(text);
-  setShortcut(shortcut);
-  if(receiver && slot)
-    connect(this, SIGNAL(triggered()), receiver, slot);
+Action::Action(QObject* parent)
+    : QWidgetAction(parent)
+{
+    setProperty("isShortcutConfigurable", true);
+    connect(this, &QAction::triggered, this, &Action::slotTriggered);
 }
 
-Action::Action(const QIcon &icon, const QString &text, QObject *parent, const QObject *receiver, const char *slot, const QKeySequence &shortcut)
-: QWidgetAction(parent) {
-  init();
-  setIcon(icon);
-  setText(text);
-  setShortcut(shortcut);
-  if(receiver && slot)
-    connect(this, SIGNAL(triggered()), receiver, slot);
+Action::Action(const QString& text, QObject* parent, const QKeySequence& shortcut)
+    : Action(parent)
+{
+    setText(text);
+    setShortcut(shortcut);
 }
 
-void Action::init() {
-  connect(this, SIGNAL(triggered(bool)), this, SLOT(slotTriggered()));
-
-  setProperty("isShortcutConfigurable", true);
+Action::Action(const QIcon& icon, const QString& text, QObject* parent, const QKeySequence& shortcut)
+    : Action(text, parent, shortcut)
+{
+    setIcon(icon);
 }
 
-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>();
+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();
+    }
 
-  if(shortcuts().count()) return shortcuts().value(0);
-  return QKeySequence();
+    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);
 }