X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Faction.cpp;h=55427392dd58fd16e76a7c9a5ea6e49d1ddf538b;hp=2758e77005ee2fb92cd6e94720570aca620306f9;hb=158443f71d48215eea8b47b836b61afd77654b78;hpb=bd2417d2ac819a46436c4f029c880d7f26b9e2a2

diff --git a/src/uisupport/action.cpp b/src/uisupport/action.cpp
index 2758e770..55427392 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-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -25,22 +25,14 @@
 #include <QApplication>
 
 Action::Action(QObject *parent)
-#ifdef HAVE_KDE4
-    : 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_KDE4
-    : 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_KDE4
-    : KAction(parent)
-#else
     : QWidgetAction(parent)
-#endif
 {
     init();
     setIcon(icon);
@@ -66,9 +54,6 @@ Action::Action(const QIcon &icon, const QString &text, QObject *parent, const QO
 }
 
 
-#ifdef HAVE_KDE4
-void Action::init() {}
-#else
 void Action::init()
 {
     connect(this, SIGNAL(triggered(bool)), this, SLOT(slotTriggered()));
@@ -99,12 +84,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 +103,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 */