From 0695439fe1ad61795972025f27d1666cea0418dd Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Fri, 18 Nov 2005 21:05:14 +0000 Subject: [PATCH] Replace sessionConfig() svn path=/trunk/KDE/kdebase/workspace/; revision=481342 --- sm.cpp | 8 ++++---- workspace.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sm.cpp b/sm.cpp index 05681a4452..6adc49e20b 100644 --- a/sm.cpp +++ b/sm.cpp @@ -42,13 +42,13 @@ bool SessionManaged::saveState( QSessionManager& sm ) { Workspace::self()->sessionSaveStarted(); if( ksmserver ) // save stacking order etc. before "save file?" etc. dialogs change it - Workspace::self()->storeSession( kapp->sessionConfig(), SMSavePhase0 ); + Workspace::self()->storeSession( KGlobal::config(), SMSavePhase0 ); sm.release(); // Qt doesn't automatically release in this case (bug?) sm.requestPhase2(); return true; } - Workspace::self()->storeSession( kapp->sessionConfig(), ksmserver ? SMSavePhase2 : SMSavePhase2Full ); - kapp->sessionConfig()->sync(); + Workspace::self()->storeSession( KGlobal::config(), ksmserver ? SMSavePhase2 : SMSavePhase2Full ); + KGlobal::config()->sync(); return true; } @@ -148,7 +148,7 @@ void Workspace::storeSession( KConfig* config, SMSavePhase phase ) void Workspace::loadSessionInfo() { session.clear(); - KConfig* config = kapp->sessionConfig(); + KConfig* config = KGlobal::config(); config->setGroup("Session" ); int count = config->readNumEntry( "count" ); int active_client = config->readNumEntry( "active" ); diff --git a/workspace.cpp b/workspace.cpp index 1bb83aa438..4079b61dd9 100644 --- a/workspace.cpp +++ b/workspace.cpp @@ -316,7 +316,7 @@ void Workspace::init() initial_desktop = client_info.currentDesktop(); else { - KConfigGroup group( kapp->sessionConfig(), "Session" ); + KConfigGroup group( KGlobal::config() , "Session" ); initial_desktop = group.readNumEntry( "desktop", 1 ); } if( !setCurrentDesktop( initial_desktop ))