diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-22 15:50:18 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-22 16:06:38 +0100 |
commit | 13363248cfb0bab60e4d25f4bc2da692a9b51a50 (patch) | |
tree | 0f0eda7eb074d9cc96c1c38ab67f06861fad3695 | |
parent | 622841e9271fb8f649a2290aaf1505f34aae88b3 (diff) |
Avoid initializing QFlags with 0 or nullptr
It is being deprecated.
Change-Id: I976030e99b35a1cd15ca42210b7e40fde39df9ff
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r-- | src/activeqt/container/qaxwidget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/activeqt/container/qaxwidget.cpp b/src/activeqt/container/qaxwidget.cpp index 34dbe11..69875d2 100644 --- a/src/activeqt/container/qaxwidget.cpp +++ b/src/activeqt/container/qaxwidget.cpp @@ -449,7 +449,7 @@ static const ushort mouseTbl[] = { static Qt::MouseButtons translateMouseButtonState(int s) { - Qt::MouseButtons bst = nullptr; + Qt::MouseButtons bst; if (s & MK_LBUTTON) bst |= Qt::LeftButton; if (s & MK_MBUTTON) @@ -462,7 +462,7 @@ static Qt::MouseButtons translateMouseButtonState(int s) static Qt::KeyboardModifiers translateModifierState(int s) { - Qt::KeyboardModifiers bst = nullptr; + Qt::KeyboardModifiers bst; if (s & MK_SHIFT) bst |= Qt::ShiftModifier; if (s & MK_CONTROL) |