From cbd742ebb52f4ef3e7c7f6c462dc8f4887780953 Mon Sep 17 00:00:00 2001
From: Erik de Castro Lopo <erikd@mega-nerd.com>
Date: Sat, 24 Feb 2018 11:29:07 +1100
Subject: [PATCH] Fix -Wreorder warnings

---
 src/lib/core/ArgsBase.cpp                     | 8 ++++----
 src/lib/platform/XWindowsEventQueueBuffer.cpp | 4 ++--
 src/lib/platform/XWindowsScreen.cpp           | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/lib/core/ArgsBase.cpp b/src/lib/core/ArgsBase.cpp
index 81b08f6c..d9154ad4 100644
--- a/src/lib/core/ArgsBase.cpp
+++ b/src/lib/core/ArgsBase.cpp
@@ -27,10 +27,6 @@ m_stopOnDeskSwitch(false),
 #else
 m_daemon(true), // backward compatibility for unix (daemon by default)
 #endif
-#if WINAPI_XWINDOWS
-m_disableXInitThreads(false),
-m_runAsUid(-1),
-#endif
 m_backend(false),
 m_restartable(true),
 m_noHooks(false),
@@ -39,6 +35,10 @@ m_logFilter(nullptr),
 m_logFile(nullptr),
 m_display(nullptr),
 m_enableDragDrop(false),
+#if WINAPI_XWINDOWS
+m_disableXInitThreads(false),
+m_runAsUid(-1),
+#endif
 m_shouldExit(false),
 m_profileDirectory(""),
 m_pluginDirectory("")
diff --git a/src/lib/platform/XWindowsEventQueueBuffer.cpp b/src/lib/platform/XWindowsEventQueueBuffer.cpp
index 3bdaa557..5c98f3ac 100644
--- a/src/lib/platform/XWindowsEventQueueBuffer.cpp
+++ b/src/lib/platform/XWindowsEventQueueBuffer.cpp
@@ -54,10 +54,10 @@ class EventQueueTimer { };
 
 XWindowsEventQueueBuffer::XWindowsEventQueueBuffer(
         Display* display, Window window, IEventQueue* events) :
-    m_events(events),
     m_display(display),
     m_window(window),
-    m_waiting(false)
+    m_waiting(false),
+    m_events(events)
 {
     assert(m_display != NULL);
     assert(m_window  != None);
diff --git a/src/lib/platform/XWindowsScreen.cpp b/src/lib/platform/XWindowsScreen.cpp
index 9dd0b40d..6100e3b0 100644
--- a/src/lib/platform/XWindowsScreen.cpp
+++ b/src/lib/platform/XWindowsScreen.cpp
@@ -97,6 +97,7 @@ XWindowsScreen::XWindowsScreen(
 		bool disableXInitThreads,
 		int mouseScrollDelta,
 		IEventQueue* events) :
+	PlatformScreen(events),
 	m_isPrimary(isPrimary),
 	m_mouseScrollDelta(mouseScrollDelta),
 	m_display(nullptr),
@@ -121,8 +122,7 @@ XWindowsScreen::XWindowsScreen(
 	m_xkb(false),
 	m_xi2detected(false),
 	m_xrandr(false),
-	m_events(events),
-	PlatformScreen(events)
+	m_events(events)
 {
 	assert(s_screen == NULL);
 
@@ -1415,8 +1415,8 @@ XWindowsScreen::handleSystemEvent(const Event& event, void* /*unused*/)
 
 #if HAVE_X11_EXTENSIONS_XRANDR_H
 		if (m_xrandr) {
-			if (xevent->type == m_xrandrEventBase + RRScreenChangeNotify
-			||  xevent->type == m_xrandrEventBase + RRNotify
+			if ((xevent->type == m_xrandrEventBase + RRScreenChangeNotify
+			||  xevent->type == m_xrandrEventBase + RRNotify)
 			&& reinterpret_cast<XRRNotifyEvent *>(xevent)->subtype == RRNotify_CrtcChange) {
 				LOG((CLOG_INFO "XRRScreenChangeNotifyEvent or RRNotify_CrtcChange received"));