aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/coreplugin/actionmanager/command_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/coreplugin/actionmanager/command_p.h')
-rw-r--r--src/plugins/coreplugin/actionmanager/command_p.h18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/plugins/coreplugin/actionmanager/command_p.h b/src/plugins/coreplugin/actionmanager/command_p.h
index 9811c88fb6..94f72ddfa1 100644
--- a/src/plugins/coreplugin/actionmanager/command_p.h
+++ b/src/plugins/coreplugin/actionmanager/command_p.h
@@ -27,9 +27,9 @@
#include "command.h"
-#include <coreplugin/id.h>
#include <coreplugin/icontext.h>
+#include <utils/id.h>
#include <utils/proxyaction.h>
#include <QList>
@@ -47,14 +47,16 @@ class Action : public Command
{
Q_OBJECT
public:
- Action(Id id);
+ Action(Utils::Id id);
- Id id() const override;
+ Utils::Id id() const override;
void setDefaultKeySequence(const QKeySequence &key) override;
- QKeySequence defaultKeySequence() const override;
+ void setDefaultKeySequences(const QList<QKeySequence> &key) override;
+ QList<QKeySequence> defaultKeySequences() const override;
- void setKeySequence(const QKeySequence &key) override;
+ void setKeySequences(const QList<QKeySequence> &keys) override;
+ QList<QKeySequence> keySequences() const override;
QKeySequence keySequence() const override;
void setDescription(const QString &text) override;
@@ -91,8 +93,8 @@ private:
Context m_context;
CommandAttributes m_attributes;
- Id m_id;
- QKeySequence m_defaultKey;
+ Utils::Id m_id;
+ QList<QKeySequence> m_defaultKeys;
QString m_defaultText;
QString m_touchBarText;
QIcon m_touchBarIcon;
@@ -102,7 +104,7 @@ private:
mutable std::unique_ptr<Utils::ProxyAction> m_touchBarAction;
QString m_toolTip;
- QMap<Id, QPointer<QAction> > m_contextActionMap;
+ QMap<Utils::Id, QPointer<QAction> > m_contextActionMap;
QMap<QAction*, bool> m_scriptableMap;
bool m_active = false;
bool m_contextInitialized = false;