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/legacy.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/legacy.cpp')
-rw-r--r-- | ksmserver/legacy.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ksmserver/legacy.cpp b/ksmserver/legacy.cpp index ecef6423b..27e45611c 100644 --- a/ksmserver/legacy.cpp +++ b/ksmserver/legacy.cpp @@ -209,11 +209,11 @@ void KSMServer::performLegacySessionSave() /*! Stores legacy session management data */ -void KSMServer::storeLegacySession( KConfig* config ) +void KSMServer::storeLegacySession( TDEConfig* config ) { // Write LegacySession data config->deleteGroup( "Legacy" + sessionGroup ); - KConfigGroupSaver saver( config, "Legacy" + sessionGroup ); + TDEConfigGroupSaver saver( config, "Legacy" + sessionGroup ); int count = 0; for (WindowMap::ConstIterator it = legacyWindows.begin(); it != legacyWindows.end(); ++it) { if ( (*it).type != SM_ERROR) { @@ -234,13 +234,13 @@ void KSMServer::storeLegacySession( KConfig* config ) /*! Restores legacy session management data (i.e. restart applications) */ -void KSMServer::restoreLegacySession( KConfig* config ) +void KSMServer::restoreLegacySession( TDEConfig* config ) { if( config->hasGroup( "Legacy" + sessionGroup )) { - KConfigGroupSaver saver( config, "Legacy" + sessionGroup ); + TDEConfigGroupSaver saver( config, "Legacy" + sessionGroup ); restoreLegacySessionInternal( config ); } else if( wm == "twin" ) { // backwards comp. - get it from twinrc - KConfigGroupSaver saver( config, sessionGroup ); + TDEConfigGroupSaver saver( config, sessionGroup ); int count = config->readNumEntry( "count", 0 ); for ( int i = 1; i <= count; i++ ) { TQString n = TQString::number(i); @@ -254,7 +254,7 @@ void KSMServer::restoreLegacySession( KConfig* config ) if( (*it) == "-session" ) { ++it; if( it != restartCommand.end()) { - KConfig cfg( "session/" + wm + "_" + (*it), true ); + TDEConfig cfg( "session/" + wm + "_" + (*it), true ); cfg.setGroup( "LegacySession" ); restoreLegacySessionInternal( &cfg, ' ' ); } @@ -264,7 +264,7 @@ void KSMServer::restoreLegacySession( KConfig* config ) } } -void KSMServer::restoreLegacySessionInternal( KConfig* config, char sep ) +void KSMServer::restoreLegacySessionInternal( TDEConfig* config, char sep ) { int count = config->readNumEntry( "count" ); for ( int i = 1; i <= count; i++ ) { |