X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Factioncollection.h;h=c920adc5c9adf6245c569f49be1fa374528c5e57;hp=22b074856abbc2c43981e13455fcae8f0554db1b;hb=e56629542168c203cac8504085fc96c7f7b73d90;hpb=84cd3561e97167ffb98ecab0fd2b884ba1d13ada

diff --git a/src/uisupport/actioncollection.h b/src/uisupport/actioncollection.h
index 22b07485..c920adc5 100644
--- a/src/uisupport/actioncollection.h
+++ b/src/uisupport/actioncollection.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2014 by the Quassel Project                        *
+ *   Copyright (C) 2005-2015 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,8 +20,7 @@
  * This is a subset of the API of KDE's KActionCollection.                 *
  ***************************************************************************/
 
-#ifndef ACTIONCOLLECTION_H_
-#define ACTIONCOLLECTION_H_
+#pragma once
 
 #ifndef HAVE_KDE
 
@@ -97,7 +96,7 @@ signals:
 
 protected slots:
 #if QT_VERSION >= 0x050000
-    virtual void connectNotify(const QMetaMethod &method);
+    virtual void connectNotify(const QMetaMethod &signal);
 #else
     virtual void connectNotify(const char *signal);
 #endif
@@ -124,8 +123,11 @@ int ActionCollection::count() const { return actions().count(); }
 bool ActionCollection::isEmpty() const { return actions().count(); }
 
 #else /* HAVE_KDE */
-
-#include <KActionCollection>
+#  ifdef HAVE_KDE4
+#    include <KActionCollection>
+#  else
+#    include <KXmlGui/KActionCollection>
+#  endif
 
 class ActionCollection : public KActionCollection
 {
@@ -135,7 +137,4 @@ public:
     explicit ActionCollection(QObject *parent) : KActionCollection(parent) {};
 };
 
-
-#endif
-
-#endif
+#endif /* HAVE_KDE */