diff options
Diffstat (limited to 'src/gui/kernel/qkeysequence.h')
| -rw-r--r-- | src/gui/kernel/qkeysequence.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gui/kernel/qkeysequence.h b/src/gui/kernel/qkeysequence.h index 1127e8afca..53f89bd838 100644 --- a/src/gui/kernel/qkeysequence.h +++ b/src/gui/kernel/qkeysequence.h @@ -154,7 +154,7 @@ public: QKeySequence(StandardKey key); ~QKeySequence(); - uint count() const; // ### Qt 5: return 'int' + int count() const; bool isEmpty() const; enum SequenceMatch { @@ -170,10 +170,11 @@ public: static QKeySequence mnemonic(const QString &text); static QList<QKeySequence> keyBindings(StandardKey key); - // ### Qt 5: kill 'operator QString' - it's evil - operator QString() const; +#if QT_DEPRECATED_SINCE(5, 0) + QT_DEPRECATED operator QString() const { return toString(QKeySequence::NativeText); } + QT_DEPRECATED operator int() const { if (1 <= count()) return operator [](0); return 0; } +#endif operator QVariant() const; - operator int() const; int operator[](uint i) const; QKeySequence &operator=(const QKeySequence &other); #ifdef Q_COMPILER_RVALUE_REFS |