yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use qApp instead of kapp in KWin

Browse source 
Preparation step for porting away from KApplication. Disables a little
bit more session management code (as it's broken anyway).
This commit is contained in:
Martin Gräßlin 2013-08-28 13:50:52 +02:00
parent c4b8f33ac7
commit 8621b4e46d
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sm.cpp
View file

@ -63,7 +63,9 @@ bool SessionManager::saveState(QSessionManager& sm)
return true;
}
Workspace::self()->storeSession(kapp->sessionConfig(), ksmserver ? SMSavePhase2 : SMSavePhase2Full);
#if KWIN_QT5_PORTING
kapp->sessionConfig()->sync();
#endif
return true;
}
@ -196,9 +198,11 @@ void Workspace::storeSubSession(const QString &name, QSet<QByteArray> sessionIds
void Workspace::loadSessionInfo()
{
session.clear();
#if KWIN_QT5_PORTING
KConfigGroup cg(kapp->sessionConfig(), "Session");
addSessionInfo(cg);
#endif
}
void Workspace::addSessionInfo(KConfigGroup &cg)

10
workspace.cpp
View file

@ -312,11 +312,15 @@ void Workspace::init()
// Extra NETRootInfo instance in Client mode is needed to get the values of the properties
NETRootInfo client_info(display(), NET::ActiveWindow | NET::CurrentDesktop);
int initial_desktop;
if (!kapp->isSessionRestored())
if (!qApp->isSessionRestored())
initial_desktop = client_info.currentDesktop();
else {
#if KWIN_QT5_PORTING
KConfigGroup group(kapp->sessionConfig(), "Session");
initial_desktop = group.readEntry("desktop", 1);
#else
initial_desktop = 1;
#endif
}
if (!VirtualDesktopManager::self()->setCurrent(initial_desktop))
VirtualDesktopManager::self()->setCurrent(1);
@ -337,7 +341,7 @@ void Workspace::init()
active_client = NULL;
rootInfo->setActiveWindow(None);
focusToNull();
if (!kapp->isSessionRestored())
if (!qApp->isSessionRestored())
++block_focus; // Because it will be set below
{
@ -404,7 +408,7 @@ void Workspace::init()
} // End updates blocker block
Client* new_active_client = NULL;
if (!kapp->isSessionRestored()) {
if (!qApp->isSessionRestored()) {
--block_focus;
new_active_client = findClient(WindowMatchPredicate(client_info.activeWindow()));
}