Fix shortcut saving on KDE, and use the system dialog for Frameworks

[quassel.git] / src / uisupport / actioncollection.h

diff --git a/src/uisupport/actioncollection.h b/src/uisupport/actioncollection.h
index 22b0748..c920adc 100644 (file)
--- 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  *
  *   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.                 *
  ***************************************************************************/
 
  * This is a subset of the API of KDE's KActionCollection.                 *
  ***************************************************************************/
 

-#ifndef ACTIONCOLLECTION_H_
-#define ACTIONCOLLECTION_H_
+#pragma once

 
 #ifndef HAVE_KDE
 
 
 #ifndef HAVE_KDE
 


@@ -97,7 +96,7 @@ signals:
 
 protected slots:
 #if QT_VERSION >= 0x050000
 
 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
 #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 */
 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
 {
 
 class ActionCollection : public KActionCollection
 {


@@ -135,7 +137,4 @@ public:
     explicit ActionCollection(QObject *parent) : KActionCollection(parent) {};
 };
 
     explicit ActionCollection(QObject *parent) : KActionCollection(parent) {};
 };
 

-
-#endif
-
-#endif
+#endif /* HAVE_KDE */