summaryrefslogtreecommitdiffstats
path: root/ksmserver/startup.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
commit79b21d47bce1ee428affc97534cd8b257232a871 (patch)
tree0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /ksmserver/startup.cpp
parent9a898d493f493adbc404f7223043c85f3817472b (diff)
downloadtdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz
tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'ksmserver/startup.cpp')
-rw-r--r--ksmserver/startup.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp
index 7ef0fcc5f..33620e79b 100644
--- a/ksmserver/startup.cpp
+++ b/ksmserver/startup.cpp
@@ -95,7 +95,7 @@ bool trinity_startup_main_sequence_done = FALSE;
*/
void KSMServer::restoreSession( TQString sessionName )
{
- showFancyLogin = KConfigGroup(KGlobal::config(), "Login").readBoolEntry("showFancyLogin", true);
+ showFancyLogin = KConfigGroup(TDEGlobal::config(), "Login").readBoolEntry("showFancyLogin", true);
KConfig ksplashcfg( "ksplashrc", true );
ksplashcfg.setGroup( "KSplash" );
if ( ksplashcfg.readEntry( "Theme", "Default" ) != TQString("Unified") )
@@ -107,7 +107,7 @@ void KSMServer::restoreSession( TQString sessionName )
kdDebug( 1218 ) << "KSMServer::restoreSession " << sessionName << endl;
upAndRunning( "restore session");
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
sessionGroup = "Session: " + sessionName;
@@ -161,7 +161,7 @@ void KSMServer::restoreSession( TQString sessionName )
*/
void KSMServer::startDefaultSession()
{
- showFancyLogin = KConfigGroup(KGlobal::config(), "Login").readBoolEntry("showFancyLogin", true);
+ showFancyLogin = KConfigGroup(TDEGlobal::config(), "Login").readBoolEntry("showFancyLogin", true);
KConfig ksplashcfg( "ksplashrc", true );
ksplashcfg.setGroup( "KSplash" );
if ( ksplashcfg.readEntry( "Theme", "Default" ) != TQString("None") )
@@ -286,7 +286,7 @@ void KSMServer::tryRestoreNext()
if( state != Restoring )
return;
restoreTimer.stop();
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup( sessionGroup );
while ( lastAppStarted < appsToStart ) {
@@ -336,7 +336,7 @@ void KSMServer::autoStart2()
TQTimer::singleShot( 10000, this, TQT_SLOT( kcmPhase2Timeout())); // protection
DCOPRef( "kcminit", "kcminit" ).send( "runPhase2" );
if( !defaultSession())
- restoreLegacySession( KGlobal::config());
+ restoreLegacySession( TDEGlobal::config());
KNotifyClient::event( 0, "starttde" ); // this is the time KDE is up, more or less
}