X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Factioncollection.h;h=71e0195577af270ec69ff9ebcca11f2703580328;hp=41bc044a2f33c2f1b4a9167fee4868b022ade48c;hb=f9efdde7f3a6004af8f834c409cfa6ae1d877692;hpb=bfc967d449565c7435aecfb007e2df6fab1f9188

diff --git a/src/uisupport/actioncollection.h b/src/uisupport/actioncollection.h
index 41bc044a..71e01955 100644
--- a/src/uisupport/actioncollection.h
+++ b/src/uisupport/actioncollection.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 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  *
@@ -15,14 +15,23 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************
  * This is a subset of the API of KDE's KActionCollection.                 *
  ***************************************************************************/
 
-#ifndef ACTIONCOLLECTION_H_
-#define ACTIONCOLLECTION_H_
+#pragma once
 
+#include "uisupport-export.h"
+
+#include <utility>
+#include <vector>
+
+#ifdef HAVE_KDE
+#  include <KXmlGui/KActionCollection>
+#endif
+
+#include <QDebug>
 #include <QList>
 #include <QMap>
 #include <QObject>
@@ -33,13 +42,24 @@ class QWidget;
 class Action;
 class QAction;
 
-class ActionCollection : public QObject {
-  Q_OBJECT
+#ifdef HAVE_KDE
+using ActionCollectionParent = KActionCollection;
+#else
+using ActionCollectionParent = QObject;
+#endif
+
+class UISUPPORT_EXPORT ActionCollection : public ActionCollectionParent
+{
+    Q_OBJECT
 
-  public:
-    explicit ActionCollection(QObject *parent);
-    virtual ~ActionCollection();
+public:
+    using ActionCollectionParent::ActionCollectionParent;
 
+    // Convenience function that takes a list of Actions
+    void addActions(const std::vector<std::pair<QString, Action *>> &actions);
+
+// Everything else is defined in KActionCollection
+#ifndef HAVE_KDE
     /// Clears the entire action collection, deleting all actions.
     void clear();
 
@@ -61,56 +81,40 @@ class ActionCollection : public QObject {
     void readSettings();
     void writeSettings() const;
 
-    inline int count() const;
-    inline bool isEmpty() const;
+    int count() const;
+    bool isEmpty() const;
 
     QAction *action(int index) const;
     QAction *action(const QString &name) const;
     QList<QAction *> actions() const;
 
     QAction *addAction(const QString &name, QAction *action);
-    Action *addAction(const QString &name, Action *action);
-    Action *addAction(const QString &name, const QObject *receiver = 0, const char *member = 0);
     void removeAction(QAction *action);
     QAction *takeAction(QAction *action);
 
-    /// Create new action under the given name, add it to the collection and connect its triggered(bool) signal to the specified receiver.
-    template<class ActionType>
-    ActionType *add(const QString &name, const QObject *receiver = 0, const char *member = 0) {
-      ActionType *a = new ActionType(this);
-      if(receiver && member)
-        connect(a, SIGNAL(triggered(bool)), receiver, member);
-      addAction(name, a);
-      return a;
-    }
-
-  signals:
+signals:
     void inserted(QAction *action);
     void actionHovered(QAction *action);
     void actionTriggered(QAction *action);
 
-  protected slots:
-    virtual void connectNotify(const char *signal);
+protected slots:
+    void connectNotify(const QMetaMethod &signal) override;
     virtual void slotActionTriggered();
 
-  private slots:
+private slots:
     void slotActionHovered();
     void actionDestroyed(QObject *);
     void associatedWidgetDestroyed(QObject *);
 
-  private:
+private:
     bool unlistAction(QAction *);
 
     QMap<QString, QAction *> _actionByName;
     QList<QAction *> _actions;
     QList<QWidget *> _associatedWidgets;
 
-    bool _connectHovered;
-    bool _connectTriggered;
-};
-
-int ActionCollection::count() const { return actions().count(); }
-bool ActionCollection::isEmpty() const { return actions().count(); }
+    bool _connectHovered{false};
+    bool _connectTriggered{false};
 
-
-#endif
+#endif /* HAVE_KDE */
+};