1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QKeyCombination: code tidies

Browse Source 
* Use the new QFlags::toInt() instead of an explicit cast.

* Don't apply ~ to an enumerator and then convert the result to an
int; instead, convert the enumerator to int and then bitwise negate it.
The former is going to break in an upcoming commit.

Change-Id: I3a798d61452891d2f61f84e2d8e17237f47c5659
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Giuseppe D'Angelo 2021-05-02 01:43:32 +02:00
parent d95e39a9b8
commit 9c89743d72
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/global/qnamespace.h
View File

@ -1874,11 +1874,11 @@ public:
{} {}
constexpr explicit QKeyCombination(Qt::Modifiers modifiers, Qt::Key key = Qt::Key_unknown) noexcept constexpr explicit QKeyCombination(Qt::Modifiers modifiers, Qt::Key key = Qt::Key_unknown) noexcept
: combination(int(modifiers) | int(key)) : combination(modifiers.toInt() | int(key))
{} {}
constexpr explicit QKeyCombination(Qt::KeyboardModifiers modifiers, Qt::Key key = Qt::Key_unknown) noexcept constexpr explicit QKeyCombination(Qt::KeyboardModifiers modifiers, Qt::Key key = Qt::Key_unknown) noexcept
: combination(int(modifiers) | int(key)) : combination(modifiers.toInt() | int(key))
{} {}
constexpr Qt::KeyboardModifiers keyboardModifiers() const noexcept constexpr Qt::KeyboardModifiers keyboardModifiers() const noexcept
@ -1888,7 +1888,7 @@ public:
constexpr Qt::Key key() const noexcept constexpr Qt::Key key() const noexcept
{ {
return Qt::Key(combination & ~Qt::KeyboardModifierMask); return Qt::Key(combination & ~int(Qt::KeyboardModifierMask));
} }
static constexpr QKeyCombination fromCombined(int combined) static constexpr QKeyCombination fromCombined(int combined)