projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modernize: Reformat ALL the source... again!
[quassel.git]
/
src
/
uisupport
/
actioncollection.cpp
diff --git
a/src/uisupport/actioncollection.cpp
b/src/uisupport/actioncollection.cpp
index
af5c924
..
e34336c
100644
(file)
--- a/
src/uisupport/actioncollection.cpp
+++ b/
src/uisupport/actioncollection.cpp
@@
-20,23
+20,22
@@
* Parts of this implementation are based on KDE's KActionCollection. *
***************************************************************************/
* Parts of this implementation are based on KDE's KActionCollection. *
***************************************************************************/
+#include "actioncollection.h"
+
#include <QAction>
#include <QDebug>
#include <QMetaMethod>
#include <QAction>
#include <QDebug>
#include <QMetaMethod>
-#include "actioncollection.h"
-
#include "action.h"
#include "uisettings.h"
#include "action.h"
#include "uisettings.h"
-void ActionCollection::addActions(const std::vector<std::pair<QString, Action
*>> &
actions)
+void ActionCollection::addActions(const std::vector<std::pair<QString, Action
*>>&
actions)
{
{
- for (auto
&&
p : actions) {
+ for (auto
&&
p : actions) {
addAction(p.first, p.second);
}
}
addAction(p.first, p.second);
}
}
-
#ifndef HAVE_KDE
int ActionCollection::count() const
#ifndef HAVE_KDE
int ActionCollection::count() const
@@
-44,7
+43,6
@@
int ActionCollection::count() const
return actions().count();
}
return actions().count();
}
-
bool ActionCollection::isEmpty() const
{
return actions().count();
bool ActionCollection::isEmpty() const
{
return actions().count();
@@
-57,19
+55,17
@@
void ActionCollection::clear()
_actions.clear();
}
_actions.clear();
}
-
-QAction *ActionCollection::action(const QString &name) const
+QAction* ActionCollection::action(const QString& name) const
{
return _actionByName.value(name, 0);
}
{
return _actionByName.value(name, 0);
}
-
-QList<QAction *> ActionCollection::actions() const
+QList<QAction*> ActionCollection::actions() const
{
return _actions;
}
{
return _actions;
}
-QAction
*ActionCollection::addAction(const QString &name, QAction *
action)
+QAction
* ActionCollection::addAction(const QString& name, QAction*
action)
{
if (!action)
return action;
{
if (!action)
return action;
@@
-82,13
+78,13
@@
QAction *ActionCollection::addAction(const QString &name, QAction *action)
else
action->setObjectName(indexName);
if (indexName.isEmpty())
else
action->setObjectName(indexName);
if (indexName.isEmpty())
- indexName = indexName.sprintf("unnamed-%p", (void
*)action);
+ indexName = indexName.sprintf("unnamed-%p", (void*)action);
// do we already have this action?
if (_actionByName.value(indexName, 0) == action)
return action;
// or maybe another action under this name?
// do we already have this action?
if (_actionByName.value(indexName, 0) == action)
return action;
// or maybe another action under this name?
- if (QAction
*
oldAction = _actionByName.value(indexName))
+ if (QAction
*
oldAction = _actionByName.value(indexName))
takeAction(oldAction);
// do we already have this action under a different name?
takeAction(oldAction);
// do we already have this action under a different name?
@@
-102,7
+98,7
@@
QAction *ActionCollection::addAction(const QString &name, QAction *action)
_actionByName.insert(indexName, action);
_actions.append(action);
_actionByName.insert(indexName, action);
_actions.append(action);
- foreach
(QWidget *
widget, _associatedWidgets) {
+ foreach
(QWidget*
widget, _associatedWidgets) {
widget->addAction(action);
}
widget->addAction(action);
}
@@
-116,19
+112,17
@@
QAction *ActionCollection::addAction(const QString &name, QAction *action)
return action;
}
return action;
}
-
-void ActionCollection::removeAction(QAction *action)
+void ActionCollection::removeAction(QAction* action)
{
delete takeAction(action);
}
{
delete takeAction(action);
}
-
-QAction *ActionCollection::takeAction(QAction *action)
+QAction* ActionCollection::takeAction(QAction* action)
{
if (!unlistAction(action))
return nullptr;
{
if (!unlistAction(action))
return nullptr;
- foreach
(QWidget *
widget, _associatedWidgets) {
+ foreach
(QWidget*
widget, _associatedWidgets) {
widget->removeAction(action);
}
widget->removeAction(action);
}
@@
-136,27
+130,25
@@
QAction *ActionCollection::takeAction(QAction *action)
return action;
}
return action;
}
-
void ActionCollection::readSettings()
{
ShortcutSettings s;
QStringList savedShortcuts = s.savedShortcuts();
void ActionCollection::readSettings()
{
ShortcutSettings s;
QStringList savedShortcuts = s.savedShortcuts();
- foreach
(const QString &
name, _actionByName.keys()) {
+ foreach
(const QString&
name, _actionByName.keys()) {
if (!savedShortcuts.contains(name))
continue;
if (!savedShortcuts.contains(name))
continue;
- auto
*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);
}
}
-
void ActionCollection::writeSettings() const
{
ShortcutSettings s;
void ActionCollection::writeSettings() const
{
ShortcutSettings s;
- foreach
(const QString &
name, _actionByName.keys()) {
- auto
*action = qobject_cast<Action
*>(_actionByName.value(name));
+ foreach
(const QString&
name, _actionByName.keys()) {
+ auto
* action = qobject_cast<Action
*>(_actionByName.value(name));
if (!action)
continue;
if (!action->isShortcutConfigurable())
if (!action)
continue;
if (!action->isShortcutConfigurable())
@@
-167,32
+159,29
@@
void ActionCollection::writeSettings() const
}
}
}
}
-
void ActionCollection::slotActionTriggered()
{
void ActionCollection::slotActionTriggered()
{
- auto
*action = qobject_cast<QAction
*>(sender());
+ auto
* action = qobject_cast<QAction
*>(sender());
if (action)
emit actionTriggered(action);
}
if (action)
emit actionTriggered(action);
}
-
void ActionCollection::slotActionHovered()
{
void ActionCollection::slotActionHovered()
{
- auto
*action = qobject_cast<QAction
*>(sender());
+ auto
* action = qobject_cast<QAction
*>(sender());
if (action)
emit actionHovered(action);
}
if (action)
emit actionHovered(action);
}
-
-void ActionCollection::actionDestroyed(QObject *obj)
+void ActionCollection::actionDestroyed(QObject* obj)
{
// remember that this is not an QAction anymore at this point
{
// remember that this is not an QAction anymore at this point
- auto
*action = static_cast<QAction
*>(obj);
+ auto
* action = static_cast<QAction
*>(obj);
unlistAction(action);
}
unlistAction(action);
}
-void ActionCollection::connectNotify(const QMetaMethod
&
signal)
+void ActionCollection::connectNotify(const QMetaMethod
&
signal)
{
if (_connectHovered && _connectTriggered)
return;
{
if (_connectHovered && _connectTriggered)
return;
@@
-200,32
+189,30
@@
void ActionCollection::connectNotify(const QMetaMethod &signal)
if (QMetaMethod::fromSignal(&ActionCollection::actionHovered) == signal) {
if (!_connectHovered) {
_connectHovered = true;
if (QMetaMethod::fromSignal(&ActionCollection::actionHovered) == signal) {
if (!_connectHovered) {
_connectHovered = true;
- foreach(QAction* action, actions())
- connect(action, &QAction::hovered, this, &ActionCollection::slotActionHovered);
+ foreach
(QAction* action, actions())
+
connect(action, &QAction::hovered, this, &ActionCollection::slotActionHovered);
}
}
else if (QMetaMethod::fromSignal(&ActionCollection::actionTriggered) == signal) {
if (!_connectTriggered) {
_connectTriggered = true;
}
}
else if (QMetaMethod::fromSignal(&ActionCollection::actionTriggered) == signal) {
if (!_connectTriggered) {
_connectTriggered = true;
- foreach(QAction* action, actions())
- connect(action, &QAction::triggered, this, &ActionCollection::slotActionTriggered);
+ foreach
(QAction* action, actions())
+
connect(action, &QAction::triggered, this, &ActionCollection::slotActionTriggered);
}
}
QObject::connectNotify(signal);
}
}
}
QObject::connectNotify(signal);
}
-
-void ActionCollection::associateWidget(QWidget *widget) const
+void ActionCollection::associateWidget(QWidget* widget) const
{
{
- foreach
(QAction *
action, actions()) {
+ foreach
(QAction*
action, actions()) {
if (!widget->actions().contains(action))
widget->addAction(action);
}
}
if (!widget->actions().contains(action))
widget->addAction(action);
}
}
-
-void ActionCollection::addAssociatedWidget(QWidget *widget)
+void ActionCollection::addAssociatedWidget(QWidget* widget)
{
if (!_associatedWidgets.contains(widget)) {
widget->addActions(actions());
{
if (!_associatedWidgets.contains(widget)) {
widget->addActions(actions());
@@
-234,44
+221,40
@@
void ActionCollection::addAssociatedWidget(QWidget *widget)
}
}
}
}
-
-void ActionCollection::removeAssociatedWidget(QWidget *widget)
+void ActionCollection::removeAssociatedWidget(QWidget* widget)
{
{
- foreach
(QAction *
action, actions())
- widget->removeAction(action);
+ foreach
(QAction*
action, actions())
+
widget->removeAction(action);
_associatedWidgets.removeAll(widget);
disconnect(widget, &QObject::destroyed, this, &ActionCollection::associatedWidgetDestroyed);
}
_associatedWidgets.removeAll(widget);
disconnect(widget, &QObject::destroyed, this, &ActionCollection::associatedWidgetDestroyed);
}
-
-QList<QWidget *> ActionCollection::associatedWidgets() const
+QList<QWidget*> ActionCollection::associatedWidgets() const
{
return _associatedWidgets;
}
{
return _associatedWidgets;
}
-
void ActionCollection::clearAssociatedWidgets()
{
void ActionCollection::clearAssociatedWidgets()
{
- foreach
(QWidget *
widget, _associatedWidgets)
-
foreach(QAction *
action, actions())
- widget->removeAction(action);
+ foreach
(QWidget*
widget, _associatedWidgets)
+
foreach (QAction*
action, actions())
+
widget->removeAction(action);
_associatedWidgets.clear();
}
_associatedWidgets.clear();
}
-
-void ActionCollection::associatedWidgetDestroyed(QObject *obj)
+void ActionCollection::associatedWidgetDestroyed(QObject* obj)
{
{
- _associatedWidgets.removeAll(static_cast<QWidget
*>(obj));
+ _associatedWidgets.removeAll(static_cast<QWidget*>(obj));
}
}
-
-bool ActionCollection::unlistAction(QAction *action)
+bool ActionCollection::unlistAction(QAction* action)
{
// This might be called with a partly destroyed QAction!
int index = _actions.indexOf(action);
{
// This might be called with a partly destroyed QAction!
int index = _actions.indexOf(action);
- if (index == -1) return false;
+ if (index == -1)
+ return false;
QString name = action->objectName();
_actionByName.remove(name);
QString name = action->objectName();
_actionByName.remove(name);