diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-29 11:58:43 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-06 09:41:31 +0200 |
| commit | 00807f1fe5a20f5c23fbac104212c4a983837db9 (patch) | |
| tree | 0cb576aadc7d6eef4687b2f027266663658d95cd /src/gui/kernel/qaction_p.h | |
| parent | 45a0c68c8c0b373152f4aec511bc150f431ad9e3 (diff) | |
Simplify QAction privates
List primary and alternative key sequences and ids together, making the
logic cleaner.
Change-Id: I4eb07f9828f2b15dc66c34ceb2c4f800df73e800
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/gui/kernel/qaction_p.h')
| -rw-r--r-- | src/gui/kernel/qaction_p.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gui/kernel/qaction_p.h b/src/gui/kernel/qaction_p.h index 28418c054e..77dc450a9f 100644 --- a/src/gui/kernel/qaction_p.h +++ b/src/gui/kernel/qaction_p.h @@ -94,8 +94,7 @@ public: QString statustip; QString whatsthis; #if QT_CONFIG(shortcut) - QKeySequence shortcut; - QList<QKeySequence> alternateShortcuts; + QList<QKeySequence> shortcuts; #endif QVariant userData; @@ -104,8 +103,7 @@ public: virtual void setMenu(QObject *menu); #if QT_CONFIG(shortcut) - int shortcutId = 0; - QList<int> alternateShortcutIds; + QList<int> shortcutIds; Qt::ShortcutContext shortcutContext = Qt::WindowShortcut; uint autorepeat : 1; #endif |