diff options
| author | Samuel Gaist <samuel.gaist@edeltech.ch> | 2014-02-01 23:45:57 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-03 21:55:50 +0100 |
| commit | 6d48df83ab48e9d2ce4cfd2a2a223951996befbe (patch) | |
| tree | 8f60f03aefface8d80d2f9300b00594ac934f111 /src | |
| parent | 35a29f328785ef6952be23bf679e2a113e4efa2e (diff) | |
Clean up QXCBSessionManager
Removed useless overrides and inline simple functions.
Change-Id: I69df0ec8446fe2c8bb904c7d4d9cc2e1d269533b
Reviewed-by: Teo Mrnjavac <teo@kde.org>
Reviewed-by: David Faure <david.faure@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbsessionmanager.cpp | 20 | ||||
| -rw-r--r-- | src/plugins/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: |