X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Faction.cpp;h=2d54af3caa94f15a6386a41dbea2622637cb75d1;hp=a61339a3e64959617cc4b08367e87a6b88aec02d;hb=f9efdde7f3a6004af8f834c409cfa6ae1d877692;hpb=6eefdfc697067d184a589fc8a231b16316c09106

diff --git a/src/uisupport/action.cpp b/src/uisupport/action.cpp
index a61339a3..2d54af3c 100644
--- a/src/uisupport/action.cpp
+++ b/src/uisupport/action.cpp
@@ -27,38 +27,23 @@
 Action::Action(QObject *parent)
     : QWidgetAction(parent)
 {
-    init();
+    setProperty("isShortcutConfigurable", true);
+    connect(this, &QAction::triggered, this, &Action::slotTriggered);
 }
 
 
-Action::Action(const QString &text, QObject *parent, const QObject *receiver, const char *slot, const QKeySequence &shortcut)
-    : QWidgetAction(parent)
+Action::Action(const QString &text, QObject *parent, const QKeySequence &shortcut)
+    : Action(parent)
 {
-    init();
     setText(text);
     setShortcut(shortcut);
-    if (receiver && slot)
-        connect(this, SIGNAL(triggered()), receiver, slot);
 }
 
 
-Action::Action(const QIcon &icon, const QString &text, QObject *parent, const QObject *receiver, const char *slot, const QKeySequence &shortcut)
-    : QWidgetAction(parent)
+Action::Action(const QIcon &icon, const QString &text, QObject *parent, const QKeySequence &shortcut)
+    : Action(text, parent, shortcut)
 {
-    init();
     setIcon(icon);
-    setText(text);
-    setShortcut(shortcut);
-    if (receiver && slot)
-        connect(this, SIGNAL(triggered()), receiver, slot);
-}
-
-
-void Action::init()
-{
-    connect(this, &QAction::triggered, this, &Action::slotTriggered);
-
-    setProperty("isShortcutConfigurable", true);
 }