diff options
author | Gatis Paeglis <gatis.paeglis@qt.io> | 2018-08-14 11:29:31 +0200 |
---|---|---|
committer | Gatis Paeglis <gatis.paeglis@qt.io> | 2018-08-14 19:27:30 +0000 |
commit | 1ae3db46e8e98b6c3ce07a5b35330bc75dd86bfc (patch) | |
tree | a769541abccf12bcd9530f869ebeecbb61d898bb /src/plugins/platforms | |
parent | 109af99261f3a3fd05954ba0f6e01b83c19dcf81 (diff) |
drop usages of Q_COMPILER_CLASS_ENUM
It is not relevant anymore. C++11 is a hard requirement for a while already.
Change-Id: Idb8fbdcd13398cc85fba583f40c2b5c4dc7c4943
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/plugins/platforms')
-rw-r--r-- | src/plugins/platforms/windows/qwindowsmousehandler.cpp | 5 | ||||
-rw-r--r-- | src/plugins/platforms/windows/qwindowsscreen.cpp | 5 | ||||
-rw-r--r-- | src/plugins/platforms/xcb/qxcbwindow.cpp | 4 |
3 files changed, 1 insertions, 13 deletions
diff --git a/src/plugins/platforms/windows/qwindowsmousehandler.cpp b/src/plugins/platforms/windows/qwindowsmousehandler.cpp index 87f48e0c84..c1c275144f 100644 --- a/src/plugins/platforms/windows/qwindowsmousehandler.cpp +++ b/src/plugins/platforms/windows/qwindowsmousehandler.cpp @@ -257,12 +257,7 @@ bool QWindowsMouseHandler::translateMouseEvent(QWindow *window, HWND hwnd, QtWindows::WindowsEventType et, MSG msg, LRESULT *result) { -#ifdef Q_COMPILER_CLASS_ENUM enum : quint64 { signatureMask = 0xffffff00, miWpSignature = 0xff515700 }; -#else - static const quint64 signatureMask = 0xffffff00; - static const quint64 miWpSignature = 0xff515700; -#endif // !Q_COMPILER_CLASS_ENUM if (et == QtWindows::MouseWheelEvent) return translateMouseWheelEvent(window, hwnd, msg, result); diff --git a/src/plugins/platforms/windows/qwindowsscreen.cpp b/src/plugins/platforms/windows/qwindowsscreen.cpp index 29165ef72c..2eaf386d42 100644 --- a/src/plugins/platforms/windows/qwindowsscreen.cpp +++ b/src/plugins/platforms/windows/qwindowsscreen.cpp @@ -330,10 +330,7 @@ QRect QWindowsScreen::virtualGeometry(const QPlatformScreen *screen) // cf QScre return result; } -enum OrientationPreference // matching Win32 API ORIENTATION_PREFERENCE -#if defined(Q_COMPILER_CLASS_ENUM) || defined(Q_CC_MSVC) - : DWORD -#endif +enum OrientationPreference : DWORD // matching Win32 API ORIENTATION_PREFERENCE { orientationPreferenceNone = 0, orientationPreferenceLandscape = 0x1, diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp index d42d95f890..e313e2f648 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.cpp +++ b/src/plugins/platforms/xcb/qxcbwindow.cpp @@ -275,11 +275,7 @@ QXcbWindow::QXcbWindow(QWindow *window) setConnection(xcbScreen()->connection()); } -#ifdef Q_COMPILER_CLASS_ENUM enum : quint32 { -#else -enum { -#endif baseEventMask = XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_STRUCTURE_NOTIFY | XCB_EVENT_MASK_PROPERTY_CHANGE | XCB_EVENT_MASK_FOCUS_CHANGE, |