diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-01-15 21:53:57 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-17 14:44:30 +0100 |
| commit | bf805455d40b4445f61321439d529cd85cb6bc65 (patch) | |
| tree | eac94f650f7b04b326c9ff8d8ebf639f6fab4b18 /src/gui/kernel/qkeysequence.cpp | |
| parent | 445c4cb011fd2048e707d82c1ae6945353c6cb1d (diff) | |
Fix ### Qt5 for QKeySequence
Change-Id: I32e582d264991e4a42e4ca6678d477835d15dbce
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/gui/kernel/qkeysequence.cpp')
| -rw-r--r-- | src/gui/kernel/qkeysequence.cpp | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp index 986701bd7b..e197b974e6 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp @@ -1040,7 +1040,7 @@ void QKeySequence::setKey(int key, int index) Returns the number of keys in the key sequence. The maximum is 4. */ -uint QKeySequence::count() const +int QKeySequence::count() const { if (!d->key[0]) return 0; @@ -1478,7 +1478,8 @@ QKeySequence::SequenceMatch QKeySequence::matches(const QKeySequence &seq) const } -/*! +/*! \fn QKeySequence::operator QString() const + \obsolete Use toString() instead. @@ -1487,10 +1488,6 @@ QKeySequence::SequenceMatch QKeySequence::matches(const QKeySequence &seq) const calling toString(QKeySequence::NativeText). Note that the result is not platform independent. */ -QKeySequence::operator QString() const -{ - return QKeySequence::toString(QKeySequence::NativeText); -} /*! Returns the key sequence as a QVariant @@ -1500,18 +1497,12 @@ QKeySequence::operator QVariant() const return QVariant(QVariant::KeySequence, this); } -/*! +/*! \fn QKeySequence::operator int () const + \obsolete For backward compatibility: returns the first keycode as integer. If the key sequence is empty, 0 is returned. */ -QKeySequence::operator int () const -{ - if (1 <= count()) - return d->key[0]; - return 0; -} - /*! Returns a reference to the element at position \a index in the key |