X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Factioncollection.cpp;h=2cc03e105504e2e58640bba7cb59003f52882798;hp=b862ae8501385685cf12eff10b27aa01b24c026e;hb=c194ed5fb3d15e14b9364f9796d3521910dc72fe;hpb=695758015a80eb8c158a9ac4c0f1c0b547e70df3

diff --git a/src/uisupport/actioncollection.cpp b/src/uisupport/actioncollection.cpp
index b862ae85..2cc03e10 100644
--- a/src/uisupport/actioncollection.cpp
+++ b/src/uisupport/actioncollection.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  *
@@ -20,10 +20,11 @@
  * Parts of this implementation are based on KDE's KActionCollection.      *
  ***************************************************************************/
 
-#ifndef HAVE_KDE4
+#ifndef HAVE_KDE
 
 #include <QAction>
 #include <QDebug>
+#include <QMetaMethod>
 
 #include "actioncollection.h"
 
@@ -36,11 +37,6 @@ ActionCollection::ActionCollection(QObject *parent) : QObject(parent)
 }
 
 
-ActionCollection::~ActionCollection()
-{
-}
-
-
 void ActionCollection::clear()
 {
     _actionByName.clear();
@@ -136,7 +132,7 @@ void ActionCollection::removeAction(QAction *action)
 QAction *ActionCollection::takeAction(QAction *action)
 {
     if (!unlistAction(action))
-        return 0;
+        return nullptr;
 
     foreach(QWidget *widget, _associatedWidgets) {
         widget->removeAction(action);
@@ -202,31 +198,19 @@ void ActionCollection::actionDestroyed(QObject *obj)
     unlistAction(action);
 }
 
-#if QT_VERSION >= 0x050000
 void ActionCollection::connectNotify(const QMetaMethod &signal)
-#else
-void ActionCollection::connectNotify(const char *signal)
-#endif
 {
     if (_connectHovered && _connectTriggered)
         return;
 
-#if QT_VERSION >= 0x050000
     if (QMetaMethod::fromSignal(&ActionCollection::actionHovered) == signal) {
-#else
-    if (QMetaObject::normalizedSignature(SIGNAL(actionHovered(QAction *))) == signal) {
-#endif
         if (!_connectHovered) {
             _connectHovered = true;
             foreach(QAction* action, actions())
             connect(action, SIGNAL(hovered()), SLOT(slotActionHovered()));
         }
     }
-#if QT_VERSION >= 0x050000
     else if (QMetaMethod::fromSignal(&ActionCollection::actionTriggered) == signal) {
-#else
-    else if (QMetaObject::normalizedSignature(SIGNAL(actionTriggered(QAction *))) == signal) {
-#endif
         if (!_connectTriggered) {
             _connectTriggered = true;
             foreach(QAction* action, actions())
@@ -305,4 +289,4 @@ bool ActionCollection::unlistAction(QAction *action)
 }
 
 
-#endif /* HAVE_KDE4 */
+#endif /* HAVE_KDE */