X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Factioncollection.cpp;h=50001262c67665cd75a98faa21e29fc908db3588;hb=f9cd845a9119e0abf450a91d8802f5c1822dd638;hp=a3aa6d69754463ff99067ead294fed38d9810f1c;hpb=39328183a6a87c6eb10a9dbbffcd5d65bf154a1f;p=quassel.git diff --git a/src/uisupport/actioncollection.cpp b/src/uisupport/actioncollection.cpp index a3aa6d69..50001262 100644 --- a/src/uisupport/actioncollection.cpp +++ b/src/uisupport/actioncollection.cpp @@ -37,11 +37,6 @@ ActionCollection::ActionCollection(QObject *parent) : QObject(parent) } -ActionCollection::~ActionCollection() -{ -} - - void ActionCollection::clear() { _actionByName.clear(); @@ -73,7 +68,7 @@ Action *ActionCollection::addAction(const QString &name, Action *action) Action *ActionCollection::addAction(const QString &name, const QObject *receiver, const char *member) { - Action *a = new Action(this); + auto *a = new Action(this); if (receiver && member) connect(a, SIGNAL(triggered(bool)), receiver, member); return addAction(name, a); @@ -156,7 +151,7 @@ void ActionCollection::readSettings() foreach(const QString &name, _actionByName.keys()) { if (!savedShortcuts.contains(name)) continue; - Action *action = qobject_cast(_actionByName.value(name)); + auto *action = qobject_cast(_actionByName.value(name)); if (action) action->setShortcut(s.loadShortcut(name), Action::ActiveShortcut); } @@ -167,7 +162,7 @@ void ActionCollection::writeSettings() const { ShortcutSettings s; foreach(const QString &name, _actionByName.keys()) { - Action *action = qobject_cast(_actionByName.value(name)); + auto *action = qobject_cast(_actionByName.value(name)); if (!action) continue; if (!action->isShortcutConfigurable()) @@ -181,7 +176,7 @@ void ActionCollection::writeSettings() const void ActionCollection::slotActionTriggered() { - QAction *action = qobject_cast(sender()); + auto *action = qobject_cast(sender()); if (action) emit actionTriggered(action); } @@ -189,7 +184,7 @@ void ActionCollection::slotActionTriggered() void ActionCollection::slotActionHovered() { - QAction *action = qobject_cast(sender()); + auto *action = qobject_cast(sender()); if (action) emit actionHovered(action); } @@ -198,7 +193,7 @@ void ActionCollection::slotActionHovered() void ActionCollection::actionDestroyed(QObject *obj) { // remember that this is not an QAction anymore at this point - QAction *action = static_cast(obj); + auto *action = static_cast(obj); unlistAction(action); }