whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Samuel Gaist 2014-02-01 23:45:57 +01:00 committed by The Qt Project
parent 35a29f3287
commit 6d48df83ab
2 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/platforms/xcb/qxcbsessionmanager.cpp
View File

@ -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();

7
src/plugins/platforms/xcb/qxcbsessionmanager.h
View File

@ -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: