X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Faction.cpp;h=2d54af3caa94f15a6386a41dbea2622637cb75d1;hp=9bd56edab118c4973ce1bf38f156c40159463dec;hb=f9efdde7f3a6004af8f834c409cfa6ae1d877692;hpb=0a43227b8cd44625f4881cc1545d42c8c8a4876c

diff --git a/src/uisupport/action.cpp b/src/uisupport/action.cpp
index 9bd56eda..2d54af3c 100644
--- a/src/uisupport/action.cpp
+++ b/src/uisupport/action.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2016 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  *
@@ -25,55 +25,25 @@
 #include <QApplication>
 
 Action::Action(QObject *parent)
-#ifdef HAVE_KDE4
-    : KAction(parent)
-#else
     : 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);
 }
 
 
@@ -99,12 +69,8 @@ QKeySequence Action::shortcut(ShortcutTypes type) const
 {
     Q_ASSERT(type);
     if (type == DefaultShortcut) {
-#if QT_VERSION < 0x050000
-        return property("defaultShortcut").value<QKeySequence>();
-#else
         auto sequence = property("defaultShortcuts").value<QList<QKeySequence>>();
         return sequence.isEmpty() ? QKeySequence() : sequence.first();
-#endif
     }
 
     return shortcuts().isEmpty() ? QKeySequence() : shortcuts().first();
@@ -122,15 +88,8 @@ void Action::setShortcut(const QKeySequence &key, ShortcutTypes type)
     Q_ASSERT(type);
 
     if (type & DefaultShortcut) {
-#if QT_VERSION < 0x050000
-        setProperty("defaultShortcut", key);
-#else
         setProperty("defaultShortcuts", QVariant::fromValue(QList<QKeySequence>() << key));
-#endif
     }
     if (type & ActiveShortcut)
         QAction::setShortcut(key);
 }
-
-
-#endif /* HAVE_KDE4 */