X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Faction.h;h=d6aff3e7bb4a3a3efa84cbafe8dbb162810a752c;hb=95848fd9232d92f388e0e533adb15f6ba9d2d492;hp=8b580a28149f768914162bd48d9b7923f890014a;hpb=39328183a6a87c6eb10a9dbbffcd5d65bf154a1f;p=quassel.git

diff --git a/src/uisupport/action.h b/src/uisupport/action.h
index 8b580a28..d6aff3e7 100644
--- a/src/uisupport/action.h
+++ b/src/uisupport/action.h
@@ -24,9 +24,13 @@
 
 #include "uisupport-export.h"
 
+#include <type_traits>
+
 #include <QShortcut>
 #include <QWidgetAction>
 
+#include "util.h"
+
 /// A specialized QWidgetAction, enhanced by some KDE features
 /** This declares/implements a subset of KAction's API (notably we've left out global shortcuts
  *  for now), which should make it easy to plug in KDE support later on.
@@ -39,20 +43,38 @@ class UISUPPORT_EXPORT Action : public QWidgetAction
     Q_PROPERTY(bool shortcutConfigurable READ isShortcutConfigurable WRITE setShortcutConfigurable)
     Q_FLAGS(ShortcutType)
 
-public :
-        enum ShortcutType {
+public:
+    enum ShortcutType
+    {
         ActiveShortcut = 0x01,
         DefaultShortcut = 0x02
     };
     Q_DECLARE_FLAGS(ShortcutTypes, ShortcutType)
 
-    explicit Action(QObject *parent);
-    Action(const QString &text, QObject *parent, const QObject *receiver = nullptr, const char *slot = nullptr, const QKeySequence &shortcut = 0);
-    Action(const QIcon &icon, const QString &text, QObject *parent, const QObject *receiver = nullptr, const char *slot = nullptr, const QKeySequence &shortcut = 0);
+    explicit Action(QObject* parent);
+    Action(const QString& text, QObject* parent, const QKeySequence& shortcut = 0);
+    Action(const QIcon& icon, const QString& text, QObject* parent, const QKeySequence& shortcut = 0);
+
+    template<typename Receiver, typename Slot>
+    Action(const QString& text, QObject* parent, const Receiver* receiver, Slot slot, const QKeySequence& shortcut = 0)
+        : Action(text, parent, shortcut)
+    {
+        static_assert(!std::is_same<Slot, const char*>::value, "Old-style connects not supported");
+
+        setShortcut(shortcut);
+        connect(this, &QAction::triggered, receiver, slot);
+    }
+
+    template<typename Receiver, typename Slot>
+    Action(const QIcon& icon, const QString& text, QObject* parent, const Receiver* receiver, Slot slot, const QKeySequence& shortcut = 0)
+        : Action(text, parent, receiver, slot, shortcut)
+    {
+        setIcon(icon);
+    }
 
     QKeySequence shortcut(ShortcutTypes types = ActiveShortcut) const;
-    void setShortcut(const QShortcut &shortcut, ShortcutTypes type = ShortcutTypes(ActiveShortcut | DefaultShortcut));
-    void setShortcut(const QKeySequence &shortcut, ShortcutTypes type = ShortcutTypes(ActiveShortcut | DefaultShortcut));
+    void setShortcut(const QShortcut& shortcut, ShortcutTypes type = ShortcutTypes(ActiveShortcut | DefaultShortcut));
+    void setShortcut(const QKeySequence& shortcut, ShortcutTypes type = ShortcutTypes(ActiveShortcut | DefaultShortcut));
 
     bool isShortcutConfigurable() const;
     void setShortcutConfigurable(bool configurable);
@@ -60,12 +82,8 @@ public :
 signals:
     void triggered(Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers);
 
-private:
-    void init();
-
 private slots:
     void slotTriggered();
 };
 
-
 Q_DECLARE_OPERATORS_FOR_FLAGS(Action::ShortcutTypes)