diff --git a/backends/xcbeventlistener.h b/backends/xcbeventlistener.h --- a/backends/xcbeventlistener.h +++ b/backends/xcbeventlistener.h @@ -64,12 +64,11 @@ protected: bool m_isRandrPresent; bool m_event11; - int m_randrBase; - int m_randrErrorBase; - int m_majorOpcode; - int m_eventType; - int m_versionMajor; - int m_versionMinor; + uint8_t m_randrBase; + uint8_t m_randrErrorBase; + uint8_t m_majorOpcode; + uint32_t m_versionMajor; + uint32_t m_versionMinor; uint32_t m_window; }; diff --git a/backends/xcbeventlistener.cpp b/backends/xcbeventlistener.cpp --- a/backends/xcbeventlistener.cpp +++ b/backends/xcbeventlistener.cpp @@ -26,12 +26,10 @@ Q_LOGGING_CATEGORY(KSCREEN_XCB_HELPER, "kscreen.xcb.helper") XCBEventListener::XCBEventListener(): - QObject(), m_isRandrPresent(false), m_randrBase(0), m_randrErrorBase(0), m_majorOpcode(0), - m_eventType(0), m_versionMajor(0), m_versionMinor(0), m_window(0) @@ -134,7 +132,7 @@ return false; } - xcb_generic_event_t* e = static_cast(message); + auto e = static_cast(message); const uint8_t xEventType = e->response_type & ~0x80; //If this event is not xcb_randr_notify, we don't want it @@ -150,8 +148,7 @@ void XCBEventListener::handleScreenChange(xcb_generic_event_t* e) { - xcb_randr_screen_change_notify_event_t *e2 = - (xcb_randr_screen_change_notify_event_t *) e; + auto e2 = reinterpret_cast(e); // Only accept notifications for our window if (e2->request_window != m_window) { @@ -172,8 +169,7 @@ void XCBEventListener::handleXRandRNotify(xcb_generic_event_t* e) { - xcb_randr_notify_event_t* - randrEvent = reinterpret_cast(e); + auto randrEvent = reinterpret_cast(e); if (randrEvent->subCode == XCB_RANDR_NOTIFY_CRTC_CHANGE) { xcb_randr_crtc_change_t crtc = randrEvent->u.cc;