X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Factioncollection.h;h=5de038ff2da4478caaf63345c8f6b7e016c27d42;hb=1e40fc6bc04df8f658f677ca5be4c970f150dc10;hp=a76fc04a0329dda815dbcf26ac121da3ce855ce3;hpb=1cb02004ee5973b89368bd84f234d4652794690d;p=quassel.git

diff --git a/src/uisupport/actioncollection.h b/src/uisupport/actioncollection.h
index a76fc04a..5de038ff 100644
--- a/src/uisupport/actioncollection.h
+++ b/src/uisupport/actioncollection.h
@@ -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,9 @@
  * This is a subset of the API of KDE's KActionCollection.                 *
  ***************************************************************************/
 
-#ifndef ACTIONCOLLECTION_H_
-#define ACTIONCOLLECTION_H_
+#pragma once
 
-#ifndef HAVE_KDE4
+#ifndef HAVE_KDE
 
 #include <QDebug>
 #include <QList>
@@ -96,11 +95,7 @@ signals:
     void actionTriggered(QAction *action);
 
 protected slots:
-#if QT_VERSION >= 0x050000
     virtual void connectNotify(const QMetaMethod &signal);
-#else
-    virtual void connectNotify(const char *signal);
-#endif
     virtual void slotActionTriggered();
 
 private slots:
@@ -123,9 +118,8 @@ private:
 int ActionCollection::count() const { return actions().count(); }
 bool ActionCollection::isEmpty() const { return actions().count(); }
 
-#else /* HAVE_KDE4 */
-
-#include <KActionCollection>
+#else /* HAVE_KDE */
+#  include <KXmlGui/KActionCollection>
 
 class ActionCollection : public KActionCollection
 {
@@ -135,7 +129,4 @@ public:
     explicit ActionCollection(QObject *parent) : KActionCollection(parent) {};
 };
 
-
-#endif
-
-#endif
+#endif /* HAVE_KDE */