diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
| commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
| tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /ksmserver/startup.cpp | |
| parent | 79b21d47bce1ee428affc97534cd8b257232a871 (diff) | |
| download | tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'ksmserver/startup.cpp')
| -rw-r--r-- | ksmserver/startup.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp index 33620e79b..fd383aa54 100644 --- a/ksmserver/startup.cpp +++ b/ksmserver/startup.cpp @@ -95,8 +95,8 @@ bool trinity_startup_main_sequence_done = FALSE; */ void KSMServer::restoreSession( TQString sessionName ) { - showFancyLogin = KConfigGroup(TDEGlobal::config(), "Login").readBoolEntry("showFancyLogin", true); - KConfig ksplashcfg( "ksplashrc", true ); + showFancyLogin = TDEConfigGroup(TDEGlobal::config(), "Login").readBoolEntry("showFancyLogin", true); + TDEConfig ksplashcfg( "ksplashrc", true ); ksplashcfg.setGroup( "KSplash" ); if ( ksplashcfg.readEntry( "Theme", "Default" ) != TQString("Unified") ) showFancyLogin = false; @@ -107,7 +107,7 @@ void KSMServer::restoreSession( TQString sessionName ) kdDebug( 1218 ) << "KSMServer::restoreSession " << sessionName << endl; upAndRunning( "restore session"); - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); sessionGroup = "Session: " + sessionName; @@ -161,8 +161,8 @@ void KSMServer::restoreSession( TQString sessionName ) */ void KSMServer::startDefaultSession() { - showFancyLogin = KConfigGroup(TDEGlobal::config(), "Login").readBoolEntry("showFancyLogin", true); - KConfig ksplashcfg( "ksplashrc", true ); + showFancyLogin = TDEConfigGroup(TDEGlobal::config(), "Login").readBoolEntry("showFancyLogin", true); + TDEConfig ksplashcfg( "ksplashrc", true ); ksplashcfg.setGroup( "KSplash" ); if ( ksplashcfg.readEntry( "Theme", "Default" ) != TQString("None") ) showFancyLogin = false; @@ -286,7 +286,7 @@ void KSMServer::tryRestoreNext() if( state != Restoring ) return; restoreTimer.stop(); - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup( sessionGroup ); while ( lastAppStarted < appsToStart ) { |