cmake: avoid de-duplication of user's CXXFLAGS

[quassel.git] / src / uisupport / action.cpp

diff --git a/src/uisupport/action.cpp b/src/uisupport/action.cpp
index 2d54af3..d7727a3 100644 (file)
--- a/src/uisupport/action.cpp
+++ b/src/uisupport/action.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
 /***************************************************************************

- *   Copyright (C) 2005-2018 by the Quassel Project                        *
+ *   Copyright (C) 2005-2022 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  *


@@ -24,47 +24,41 @@
 
 #include <QApplication>
 
 
 #include <QApplication>
 

-Action::Action(QObject *parent)
+Action::Action(QObject* parent)

     : QWidgetAction(parent)
 {
     setProperty("isShortcutConfigurable", true);
     connect(this, &QAction::triggered, this, &Action::slotTriggered);
 }
 
     : QWidgetAction(parent)
 {
     setProperty("isShortcutConfigurable", true);
     connect(this, &QAction::triggered, this, &Action::slotTriggered);
 }
 

-
-Action::Action(const QString &text, QObject *parent, const QKeySequence &shortcut)
+Action::Action(const QString& text, QObject* parent, const QKeySequence& shortcut)

     : Action(parent)
 {
     setText(text);
     setShortcut(shortcut);
 }
 
     : Action(parent)
 {
     setText(text);
     setShortcut(shortcut);
 }
 

-
-Action::Action(const QIcon &icon, const QString &text, QObject *parent, const QKeySequence &shortcut)
+Action::Action(const QIcon& icon, const QString& text, QObject* parent, const QKeySequence& shortcut)

     : Action(text, parent, shortcut)
 {
     setIcon(icon);
 }
 
     : Action(text, parent, shortcut)
 {
     setIcon(icon);
 }
 

-

 void Action::slotTriggered()
 {
     emit triggered(QApplication::mouseButtons(), QApplication::keyboardModifiers());
 }
 
 void Action::slotTriggered()
 {
     emit triggered(QApplication::mouseButtons(), QApplication::keyboardModifiers());
 }
 

-

 bool Action::isShortcutConfigurable() const
 {
     return property("isShortcutConfigurable").toBool();
 }
 
 bool Action::isShortcutConfigurable() const
 {
     return property("isShortcutConfigurable").toBool();
 }
 

-

 void Action::setShortcutConfigurable(bool b)
 {
     setProperty("isShortcutConfigurable", b);
 }
 
 void Action::setShortcutConfigurable(bool b)
 {
     setProperty("isShortcutConfigurable", b);
 }
 

-

 QKeySequence Action::shortcut(ShortcutTypes type) const
 {
     Q_ASSERT(type);
 QKeySequence Action::shortcut(ShortcutTypes type) const
 {
     Q_ASSERT(type);


@@ -76,14 +70,12 @@ QKeySequence Action::shortcut(ShortcutTypes type) const
     return shortcuts().isEmpty() ? QKeySequence() : shortcuts().first();
 }
 
     return shortcuts().isEmpty() ? QKeySequence() : shortcuts().first();
 }
 

-
-void Action::setShortcut(const QShortcut &shortcut, ShortcutTypes type)
+void Action::setShortcut(const QShortcut& shortcut, ShortcutTypes type)

 {
     setShortcut(shortcut.key(), type);
 }
 
 {
     setShortcut(shortcut.key(), type);
 }
 

-
-void Action::setShortcut(const QKeySequence &key, ShortcutTypes type)
+void Action::setShortcut(const QKeySequence& key, ShortcutTypes type)

 {
     Q_ASSERT(type);
 
 {
     Q_ASSERT(type);