From 6d48df83ab48e9d2ce4cfd2a2a223951996befbe Mon Sep 17 00:00:00 2001 From: Samuel Gaist Date: Sat, 1 Feb 2014 23:45:57 +0100 Subject: [PATCH] Clean up QXCBSessionManager Removed useless overrides and inline simple functions. Change-Id: I69df0ec8446fe2c8bb904c7d4d9cc2e1d269533b Reviewed-by: Teo Mrnjavac Reviewed-by: David Faure Reviewed-by: Friedemann Kleint --- .../platforms/xcb/qxcbsessionmanager.cpp | 20 ------------------- .../platforms/xcb/qxcbsessionmanager.h | 7 ++----- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/src/plugins/platforms/xcb/qxcbsessionmanager.cpp b/src/plugins/platforms/xcb/qxcbsessionmanager.cpp index 8c10b134bd..0098f47e33 100644 --- a/src/plugins/platforms/xcb/qxcbsessionmanager.cpp +++ b/src/plugins/platforms/xcb/qxcbsessionmanager.cpp @@ -391,16 +391,6 @@ void* QXcbSessionManager::handle() const return (void*) smcConnection; } -void QXcbSessionManager::setSessionId(const QString &id) -{ - m_sessionId = id; -} - -void QXcbSessionManager::setSessionKey(const QString &key) -{ - m_sessionKey = key; -} - bool QXcbSessionManager::allowsInteraction() { if (sm_interactionActive) @@ -496,16 +486,6 @@ void QXcbSessionManager::requestPhase2() sm_phase2 = true; } -void QXcbSessionManager::appCommitData() -{ - QPlatformSessionManager::appCommitData(); -} - -void QXcbSessionManager::appSaveState() -{ - QPlatformSessionManager::appSaveState(); -} - void QXcbSessionManager::exitEventLoop() { m_eventLoop->exit(); diff --git a/src/plugins/platforms/xcb/qxcbsessionmanager.h b/src/plugins/platforms/xcb/qxcbsessionmanager.h index 28eb287097..3c7c968890 100644 --- a/src/plugins/platforms/xcb/qxcbsessionmanager.h +++ b/src/plugins/platforms/xcb/qxcbsessionmanager.h @@ -66,8 +66,8 @@ public: void *handle() const; - void setSessionId(const QString &id); - void setSessionKey(const QString &key); + void setSessionId(const QString &id) { m_sessionId = id; } + void setSessionKey(const QString &key) { m_sessionKey = key; } bool allowsInteraction() Q_DECL_OVERRIDE; bool allowsErrorInteraction() Q_DECL_OVERRIDE; @@ -81,9 +81,6 @@ public: bool isPhase2() const Q_DECL_OVERRIDE; void requestPhase2() Q_DECL_OVERRIDE; - void appCommitData() Q_DECL_OVERRIDE; - void appSaveState() Q_DECL_OVERRIDE; - void exitEventLoop(); private: