projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modernize: Use raw string literals instead of escaped strings
[quassel.git]
/
src
/
uisupport
/
actioncollection.cpp
diff --git
a/src/uisupport/actioncollection.cpp
b/src/uisupport/actioncollection.cpp
index
2cc03e1
..
5000126
100644
(file)
--- a/
src/uisupport/actioncollection.cpp
+++ b/
src/uisupport/actioncollection.cpp
@@
-68,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);
@@
-151,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);
}
@@
-162,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())
@@
-176,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);
}
@@
-184,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);
}
@@
-193,7
+193,7
@@
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);
}