AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drop usages of Q_COMPILER_CLASS_ENUM

Browse Source 
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>
This commit is contained in:
Gatis Paeglis 2018-08-14 11:29:31 +02:00
parent 109af99261
commit 1ae3db46e8
4 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/corelib/io/qurl.cpp
View File

@ -472,16 +472,10 @@ static inline QString webDavSslTag()
return QStringLiteral("@SSL");
}
#ifdef Q_COMPILER_CLASS_ENUM
# define colon_uchar : uchar
#else
# define colon_uchar
#endif
class QUrlPrivate
{
public:
enum Section colon_uchar {
enum Section : uchar {
Scheme = 0x01,
UserName = 0x02,
Password = 0x04,
@ -496,7 +490,7 @@ public:
FullUrl = 0xff
};
enum Flags colon_uchar {
enum Flags : uchar {
IsLocalFile = 0x01
};
@ -616,7 +610,6 @@ public:
// 32-bit: 2 bytes tail padding available
// 64-bit: 6 bytes tail padding available
};
#undef colon_uchar
inline QUrlPrivate::QUrlPrivate()
: ref(1), port(-1),

5
src/plugins/platforms/windows/qwindowsmousehandler.cpp
View File

@ -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);

5
src/plugins/platforms/windows/qwindowsscreen.cpp
View File

@ -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,

4
src/plugins/platforms/xcb/qxcbwindow.cpp
View File

@ -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,