diff options
Diffstat (limited to 'src/gui/kernel/qkeysequence_p.h')
| -rw-r--r-- | src/gui/kernel/qkeysequence_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/kernel/qkeysequence_p.h b/src/gui/kernel/qkeysequence_p.h index 2f9a0b09aa..8b98e3778a 100644 --- a/src/gui/kernel/qkeysequence_p.h +++ b/src/gui/kernel/qkeysequence_p.h @@ -35,7 +35,7 @@ struct QKeyBinding class QKeySequencePrivate { public: - enum { MaxKeyCount = 4 }; // also used in QKeySequenceEdit + static constexpr int MaxKeyCount = 4 ; // also used in QKeySequenceEdit constexpr QKeySequencePrivate() : ref(1), key{} {} inline QKeySequencePrivate(const QKeySequencePrivate ©) : ref(1) { @@ -44,10 +44,10 @@ public: } QAtomicInt ref; int key[MaxKeyCount]; - static QString encodeString(int key, QKeySequence::SequenceFormat format); + static QString encodeString(QKeyCombination keyCombination, QKeySequence::SequenceFormat format); // used in dbusmenu - Q_GUI_EXPORT static QString keyName(int key, QKeySequence::SequenceFormat format); - static int decodeString(QString accel, QKeySequence::SequenceFormat format); + Q_GUI_EXPORT static QString keyName(Qt::Key key, QKeySequence::SequenceFormat format); + static QKeyCombination decodeString(QString accel, QKeySequence::SequenceFormat format); }; QT_END_NAMESPACE |