rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix -Wreorder warnings

This commit is contained in:
Erik de Castro Lopo 2018-02-24 11:29:07 +11:00
parent ffb0a5e1ed
commit cbd742ebb5
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/core/ArgsBase.cpp
View File

@ -27,10 +27,6 @@ m_stopOnDeskSwitch(false),
#else #else
m_daemon(true), // backward compatibility for unix (daemon by default) m_daemon(true), // backward compatibility for unix (daemon by default)
#endif #endif
#if WINAPI_XWINDOWS
m_disableXInitThreads(false),
m_runAsUid(-1),
#endif
m_backend(false), m_backend(false),
m_restartable(true), m_restartable(true),
m_noHooks(false), m_noHooks(false),
@ -39,6 +35,10 @@ m_logFilter(nullptr),
m_logFile(nullptr), m_logFile(nullptr),
m_display(nullptr), m_display(nullptr),
m_enableDragDrop(false), m_enableDragDrop(false),
#if WINAPI_XWINDOWS
m_disableXInitThreads(false),
m_runAsUid(-1),
#endif
m_shouldExit(false), m_shouldExit(false),
m_profileDirectory(""), m_profileDirectory(""),
m_pluginDirectory("") m_pluginDirectory("")

4
src/lib/platform/XWindowsEventQueueBuffer.cpp
View File

@ -54,10 +54,10 @@ class EventQueueTimer { };
XWindowsEventQueueBuffer::XWindowsEventQueueBuffer( XWindowsEventQueueBuffer::XWindowsEventQueueBuffer(
Display* display, Window window, IEventQueue* events) : Display* display, Window window, IEventQueue* events) :
m_events(events),
m_display(display), m_display(display),
m_window(window), m_window(window),
m_waiting(false) m_waiting(false),
m_events(events)
{ {
assert(m_display != NULL); assert(m_display != NULL);
assert(m_window != None); assert(m_window != None);

8
src/lib/platform/XWindowsScreen.cpp
View File

@ -97,6 +97,7 @@ XWindowsScreen::XWindowsScreen(
bool disableXInitThreads, bool disableXInitThreads,
int mouseScrollDelta, int mouseScrollDelta,
IEventQueue* events) : IEventQueue* events) :
PlatformScreen(events),
m_isPrimary(isPrimary), m_isPrimary(isPrimary),
m_mouseScrollDelta(mouseScrollDelta), m_mouseScrollDelta(mouseScrollDelta),
m_display(nullptr), m_display(nullptr),
@ -121,8 +122,7 @@ XWindowsScreen::XWindowsScreen(
m_xkb(false), m_xkb(false),
m_xi2detected(false), m_xi2detected(false),
m_xrandr(false), m_xrandr(false),
m_events(events), m_events(events)
PlatformScreen(events)
{ {
assert(s_screen == NULL); assert(s_screen == NULL);
@ -1415,8 +1415,8 @@ XWindowsScreen::handleSystemEvent(const Event& event, void* /*unused*/)
#if HAVE_X11_EXTENSIONS_XRANDR_H #if HAVE_X11_EXTENSIONS_XRANDR_H
if (m_xrandr) { if (m_xrandr) {
if (xevent->type == m_xrandrEventBase + RRScreenChangeNotify if ((xevent->type == m_xrandrEventBase + RRScreenChangeNotify
|| xevent->type == m_xrandrEventBase + RRNotify || xevent->type == m_xrandrEventBase + RRNotify)
&& reinterpret_cast<XRRNotifyEvent *>(xevent)->subtype == RRNotify_CrtcChange) { && reinterpret_cast<XRRNotifyEvent *>(xevent)->subtype == RRNotify_CrtcChange) {
LOG((CLOG_INFO "XRRScreenChangeNotifyEvent or RRNotify_CrtcChange received")); LOG((CLOG_INFO "XRRScreenChangeNotifyEvent or RRNotify_CrtcChange received"));