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/server.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/server.cpp')
| -rw-r--r-- | ksmserver/server.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp index 03a0e0b15..6f93549d9 100644 --- a/ksmserver/server.cpp +++ b/ksmserver/server.cpp @@ -592,7 +592,7 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag dialogActive = false; saveSession = false; wmPhase1WaitingCount = 0; - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup("General" ); clientInteracting = 0; xonCommand = config->readEntry( "xonCommand", "xon" ); @@ -802,12 +802,12 @@ TQString KSMServer::currentSession() { if ( sessionGroup.startsWith( "Session: " ) ) return sessionGroup.mid( 9 ); - return ""; // empty, not null, since used for KConfig::setGroup + return ""; // empty, not null, since used for TDEConfig::setGroup } void KSMServer::discardSession() { - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup( sessionGroup ); int count = config->readNumEntry( "count", 0 ); for ( KSMClient* c = clients.first(); c; c = clients.next() ) { @@ -828,7 +828,7 @@ void KSMServer::discardSession() void KSMServer::storeSession() { - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->reparseConfiguration(); // config may have changed in the KControl module config->setGroup("General" ); excludeApps = TQStringList::split( TQRegExp( "[,:]" ), config->readEntry( "excludeApps" ).lower()); @@ -895,7 +895,7 @@ void KSMServer::storeSession() TQStringList KSMServer::sessionList() { TQStringList sessions = "default"; - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); TQStringList groups = config->groupList(); for ( TQStringList::ConstIterator it = groups.begin(); it != groups.end(); it++ ) if ( (*it).startsWith( "Session: " ) ) |