/***************************************************************************
- * Copyright (C) 2005-2015 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 *
* Parts of this implementation are based on KDE's KActionCollection. *
***************************************************************************/
-#ifndef HAVE_KDE4
+#ifndef HAVE_KDE
#include <QAction>
#include <QDebug>
+#include <QMetaMethod>
#include "actioncollection.h"
}
-ActionCollection::~ActionCollection()
-{
-}
-
-
void ActionCollection::clear()
{
_actionByName.clear();
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);
QAction *ActionCollection::takeAction(QAction *action)
{
if (!unlistAction(action))
- return 0;
+ return nullptr;
foreach(QWidget *widget, _associatedWidgets) {
widget->removeAction(action);
foreach(const QString &name, _actionByName.keys()) {
if (!savedShortcuts.contains(name))
continue;
- Action *action = qobject_cast<Action *>(_actionByName.value(name));
+ auto *action = qobject_cast<Action *>(_actionByName.value(name));
if (action)
action->setShortcut(s.loadShortcut(name), Action::ActiveShortcut);
}
{
ShortcutSettings s;
foreach(const QString &name, _actionByName.keys()) {
- Action *action = qobject_cast<Action *>(_actionByName.value(name));
+ auto *action = qobject_cast<Action *>(_actionByName.value(name));
if (!action)
continue;
if (!action->isShortcutConfigurable())
void ActionCollection::slotActionTriggered()
{
- QAction *action = qobject_cast<QAction *>(sender());
+ auto *action = qobject_cast<QAction *>(sender());
if (action)
emit actionTriggered(action);
}
void ActionCollection::slotActionHovered()
{
- QAction *action = qobject_cast<QAction *>(sender());
+ auto *action = qobject_cast<QAction *>(sender());
if (action)
emit actionHovered(action);
}
void ActionCollection::actionDestroyed(QObject *obj)
{
// remember that this is not an QAction anymore at this point
- QAction *action = static_cast<QAction *>(obj);
+ auto *action = static_cast<QAction *>(obj);
unlistAction(action);
}
-#if QT_VERSION >= 0x050000
void ActionCollection::connectNotify(const QMetaMethod &signal)
-#else
-void ActionCollection::connectNotify(const char *signal)
-#endif
{
if (_connectHovered && _connectTriggered)
return;
-#if QT_VERSION >= 0x050000
if (QMetaMethod::fromSignal(&ActionCollection::actionHovered) == signal) {
-#else
- if (QMetaObject::normalizedSignature(SIGNAL(actionHovered(QAction *))) == signal) {
-#endif
if (!_connectHovered) {
_connectHovered = true;
foreach(QAction* action, actions())
connect(action, SIGNAL(hovered()), SLOT(slotActionHovered()));
}
}
-#if QT_VERSION >= 0x050000
else if (QMetaMethod::fromSignal(&ActionCollection::actionTriggered) == signal) {
-#else
- else if (QMetaObject::normalizedSignature(SIGNAL(actionTriggered(QAction *))) == signal) {
-#endif
if (!_connectTriggered) {
_connectTriggered = true;
foreach(QAction* action, actions())
}
-#endif /* HAVE_KDE4 */
+#endif /* HAVE_KDE */