X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Faction.h;h=89a7ace3ed2d7405d44eb6499c33b75710b18cf9;hb=3dd76d9373fb46b7be3f7f963b3d3a38ded63ae5;hp=6fa2ae245b8305b435491de026a6cfdfc7014bcd;hpb=f9efdde7f3a6004af8f834c409cfa6ae1d877692;p=quassel.git diff --git a/src/uisupport/action.h b/src/uisupport/action.h index 6fa2ae24..89a7ace3 100644 --- a/src/uisupport/action.h +++ b/src/uisupport/action.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2018 by the Quassel Project * + * Copyright (C) 2005-2019 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -43,19 +43,20 @@ class UISUPPORT_EXPORT Action : public QWidgetAction Q_PROPERTY(bool shortcutConfigurable READ isShortcutConfigurable WRITE setShortcutConfigurable) Q_FLAGS(ShortcutType) -public : - enum ShortcutType { +public: + enum ShortcutType + { ActiveShortcut = 0x01, DefaultShortcut = 0x02 }; Q_DECLARE_FLAGS(ShortcutTypes, ShortcutType) - explicit Action(QObject *parent); - Action(const QString &text, QObject *parent, const QKeySequence &shortcut = 0); - Action(const QIcon &icon, const QString &text, QObject *parent, const QKeySequence &shortcut = 0); + explicit Action(QObject* parent); + Action(const QString& text, QObject* parent, const QKeySequence& shortcut = 0); + Action(const QIcon& icon, const QString& text, QObject* parent, const QKeySequence& shortcut = 0); template - Action(const QString &text, QObject *parent, const Receiver *receiver, Slot slot, const QKeySequence &shortcut = 0) + Action(const QString& text, QObject* parent, const Receiver* receiver, Slot slot, const QKeySequence& shortcut = 0) : Action(text, parent, shortcut) { static_assert(!std::is_same::value, "Old-style connects not supported"); @@ -65,15 +66,15 @@ public : } template - Action(const QIcon &icon, const QString &text, QObject *parent, const Receiver *receiver, Slot slot, const QKeySequence &shortcut = 0) + Action(const QIcon& icon, const QString& text, QObject* parent, const Receiver* receiver, Slot slot, const QKeySequence& shortcut = 0) : Action(text, parent, receiver, slot, shortcut) { setIcon(icon); } QKeySequence shortcut(ShortcutTypes types = ActiveShortcut) const; - void setShortcut(const QShortcut &shortcut, ShortcutTypes type = ShortcutTypes(ActiveShortcut | DefaultShortcut)); - void setShortcut(const QKeySequence &shortcut, ShortcutTypes type = ShortcutTypes(ActiveShortcut | DefaultShortcut)); + void setShortcut(const QShortcut& shortcut, ShortcutTypes type = ShortcutTypes(ActiveShortcut | DefaultShortcut)); + void setShortcut(const QKeySequence& shortcut, ShortcutTypes type = ShortcutTypes(ActiveShortcut | DefaultShortcut)); bool isShortcutConfigurable() const; void setShortcutConfigurable(bool configurable); @@ -85,5 +86,4 @@ private slots: void slotTriggered(); }; - Q_DECLARE_OPERATORS_FOR_FLAGS(Action::ShortcutTypes)