X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Faction.h;h=6fa2ae245b8305b435491de026a6cfdfc7014bcd;hp=8b580a28149f768914162bd48d9b7923f890014a;hb=f9efdde7f3a6004af8f834c409cfa6ae1d877692;hpb=900cce213a6ed000b7131a05a0dec7d04b35b023

diff --git a/src/uisupport/action.h b/src/uisupport/action.h
index 8b580a28..6fa2ae24 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.
@@ -47,8 +51,25 @@ public :
     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);
+    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));
@@ -60,9 +81,6 @@ public :
 signals:
     void triggered(Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers);
 
-private:
-    void init();
-
 private slots:
     void slotTriggered();
 };