projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modernize: Use auto where the type is clear from context
[quassel.git]
/
src
/
uisupport
/
actioncollection.cpp
diff --git
a/src/uisupport/actioncollection.cpp
b/src/uisupport/actioncollection.cpp
index
b862ae8
..
5000126
100644
(file)
--- a/
src/uisupport/actioncollection.cpp
+++ b/
src/uisupport/actioncollection.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
5
by the Quassel Project *
+ * Copyright (C) 2005-201
8
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-20,10
+20,11
@@
* Parts of this implementation are based on KDE's KActionCollection. *
***************************************************************************/
* Parts of this implementation are based on KDE's KActionCollection. *
***************************************************************************/
-#ifndef HAVE_KDE
4
+#ifndef HAVE_KDE
#include <QAction>
#include <QDebug>
#include <QAction>
#include <QDebug>
+#include <QMetaMethod>
#include "actioncollection.h"
#include "actioncollection.h"
@@
-36,11
+37,6
@@
ActionCollection::ActionCollection(QObject *parent) : QObject(parent)
}
}
-ActionCollection::~ActionCollection()
-{
-}
-
-
void ActionCollection::clear()
{
_actionByName.clear();
void ActionCollection::clear()
{
_actionByName.clear();
@@
-72,7
+68,7
@@
Action *ActionCollection::addAction(const QString &name, Action *action)
Action *ActionCollection::addAction(const QString &name, const QObject *receiver, const char *member)
{
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);
if (receiver && member)
connect(a, SIGNAL(triggered(bool)), receiver, member);
return addAction(name, a);
@@
-136,7
+132,7
@@
void ActionCollection::removeAction(QAction *action)
QAction *ActionCollection::takeAction(QAction *action)
{
if (!unlistAction(action))
QAction *ActionCollection::takeAction(QAction *action)
{
if (!unlistAction(action))
- return
0
;
+ return
nullptr
;
foreach(QWidget *widget, _associatedWidgets) {
widget->removeAction(action);
foreach(QWidget *widget, _associatedWidgets) {
widget->removeAction(action);
@@
-155,7
+151,7
@@
void ActionCollection::readSettings()
foreach(const QString &name, _actionByName.keys()) {
if (!savedShortcuts.contains(name))
continue;
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);
}
if (action)
action->setShortcut(s.loadShortcut(name), Action::ActiveShortcut);
}
@@
-166,7
+162,7
@@
void ActionCollection::writeSettings() const
{
ShortcutSettings s;
foreach(const QString &name, _actionByName.keys()) {
{
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())
if (!action)
continue;
if (!action->isShortcutConfigurable())
@@
-180,7
+176,7
@@
void ActionCollection::writeSettings() const
void ActionCollection::slotActionTriggered()
{
void ActionCollection::slotActionTriggered()
{
-
QAction
*action = qobject_cast<QAction *>(sender());
+
auto
*action = qobject_cast<QAction *>(sender());
if (action)
emit actionTriggered(action);
}
if (action)
emit actionTriggered(action);
}
@@
-188,7
+184,7
@@
void ActionCollection::slotActionTriggered()
void ActionCollection::slotActionHovered()
{
void ActionCollection::slotActionHovered()
{
-
QAction
*action = qobject_cast<QAction *>(sender());
+
auto
*action = qobject_cast<QAction *>(sender());
if (action)
emit actionHovered(action);
}
if (action)
emit actionHovered(action);
}
@@
-197,36
+193,24
@@
void ActionCollection::slotActionHovered()
void ActionCollection::actionDestroyed(QObject *obj)
{
// remember that this is not an QAction anymore at this point
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);
}
unlistAction(action);
}
-#if QT_VERSION >= 0x050000
void ActionCollection::connectNotify(const QMetaMethod &signal)
void ActionCollection::connectNotify(const QMetaMethod &signal)
-#else
-void ActionCollection::connectNotify(const char *signal)
-#endif
{
if (_connectHovered && _connectTriggered)
return;
{
if (_connectHovered && _connectTriggered)
return;
-#if QT_VERSION >= 0x050000
if (QMetaMethod::fromSignal(&ActionCollection::actionHovered) == signal) {
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 (!_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 if (QMetaMethod::fromSignal(&ActionCollection::actionTriggered) == signal) {
-#else
- else if (QMetaObject::normalizedSignature(SIGNAL(actionTriggered(QAction *))) == signal) {
-#endif
if (!_connectTriggered) {
_connectTriggered = true;
foreach(QAction* action, actions())
if (!_connectTriggered) {
_connectTriggered = true;
foreach(QAction* action, actions())
@@
-305,4
+289,4
@@
bool ActionCollection::unlistAction(QAction *action)
}
}
-#endif /* HAVE_KDE
4
*/
+#endif /* HAVE_KDE */