Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

7 files changed, 34 insertions, 34 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++ ) {
diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp
index 0f7d699d0..402f395e5 100644
--- a/ksmserver/main.cpp
+++ b/ksmserver/main.cpp
@@ -225,7 +225,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] )
 
     IceSetIOErrorHandler( IoErrorHandler );
 
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup( "General" );
 
     int realScreenCount = ScreenCount( tqt_xdisplay() );
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: " ) )
diff --git a/ksmserver/server.h b/ksmserver/server.h
index 79c1629bd..c2207ec95 100644
--- a/ksmserver/server.h
+++ b/ksmserver/server.h
@@ -156,9 +156,9 @@ private:
 			   TQString bootOption = TQString::null );
 
     void performLegacySessionSave();
-    void storeLegacySession( KConfig* config );
-    void restoreLegacySession( KConfig* config );
-    void restoreLegacySessionInternal( KConfig* config, char sep = ',' );
+    void storeLegacySession( TDEConfig* config );
+    void restoreLegacySession( TDEConfig* config );
+    void restoreLegacySessionInternal( TDEConfig* config, char sep = ',' );
     TQStringList windowWmCommand(WId w);
     TQString windowWmClientMachine(WId w);
     WId windowWmClientLeader(WId w);
diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp
index 87c8d37cb..08d934069 100644
--- a/ksmserver/shutdown.cpp
+++ b/ksmserver/shutdown.cpp
@@ -125,7 +125,7 @@ bool KSMServer::checkStatus( bool &logoutConfirmed, bool &maysd,
         return false;
     }
 
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->reparseConfiguration(); // config may have changed in the KControl module
 
     config->setGroup("General" );
@@ -156,7 +156,7 @@ void KSMServer::shutdownInternal( TDEApplication::ShutdownConfirm confirm,
     if ( !checkStatus( logoutConfirmed, maysd, confirm, sdtype, sdmode ) )
         return;
 
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
 
     config->setGroup("General" );
     if (!maysd) {
@@ -168,7 +168,7 @@ void KSMServer::shutdownInternal( TDEApplication::ShutdownConfirm confirm,
         sdmode = TDEApplication::ShutdownModeInteractive;
 
     // shall we show a logout status dialog box?
-    bool showLogoutStatusDlg = KConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("showLogoutStatusDlg", true);
+    bool showLogoutStatusDlg = TDEConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("showLogoutStatusDlg", true);
 
     if (showLogoutStatusDlg) {
         KSMShutdownIPFeedback::start();
@@ -188,7 +188,7 @@ void KSMServer::shutdownInternal( TDEApplication::ShutdownConfirm confirm,
         if (selection != 0) {
 		// respect lock on resume & disable suspend/hibernate settings
 		// from power-manager
-		KConfig config("power-managerrc");
+		TDEConfig config("power-managerrc");
 		bool lockOnResume = config.readBoolEntry("lockOnResume", true);
 		if (lockOnResume) {
 			DCOPRef("kdesktop", "KScreensaverIface").send("lock");
@@ -294,7 +294,7 @@ void KSMServer::logoutTimed( int sdtype, int sdmode, TQString bootOption )
 {
     int confirmDelay;
 
-    KConfig* config = TDEGlobal::config();
+    TDEConfig* config = TDEGlobal::config();
     config->setGroup( "General" );
 
     if ( sdtype == TDEApplication::ShutdownTypeHalt )
@@ -525,7 +525,7 @@ void KSMServer::completeShutdownOrCheckpoint()
     if ( waitForPhase2 )
         return;
 
-    bool showLogoutStatusDlg = KConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("showLogoutStatusDlg", true);
+    bool showLogoutStatusDlg = TDEConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("showLogoutStatusDlg", true);
     if (showLogoutStatusDlg && state != Checkpoint) {
         KSMShutdownIPFeedback::showit(); // hide the UGLY logout process from the user
         shutdownNotifierIPDlg = KSMShutdownIPDlg::showShutdownIP();
diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp
index ecc1ed5b4..254aa9966 100644
--- a/ksmserver/shutdowndlg.cpp
+++ b/ksmserver/shutdowndlg.cpp
@@ -119,14 +119,14 @@ void KSMShutdownFeedback::fadeBack( void )
 void KSMShutdownFeedback::slotPaintEffect()
 {
 	// determine which fade to use
-   if (KConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doFancyLogout", true))
+   if (TDEConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doFancyLogout", true))
 	{
 
-	float doFancyLogoutAdditionalDarkness  = (float)KConfigGroup(TDEGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutAdditionalDarkness", 0.6);
+	float doFancyLogoutAdditionalDarkness  = (float)TDEConfigGroup(TDEGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutAdditionalDarkness", 0.6);
 
-	float doFancyLogoutFadeTime = (float)KConfigGroup(TDEGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutFadeTime", 4000);
+	float doFancyLogoutFadeTime = (float)TDEConfigGroup(TDEGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutFadeTime", 4000);
 
-	float doFancyLogoutFadeBackTime = (float)KConfigGroup(TDEGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutFadeBackTime", 1000);
+	float doFancyLogoutFadeBackTime = (float)TDEConfigGroup(TDEGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutFadeBackTime", 1000);
 
 	if (kapp->isX11CompositionAvailable()) {
 		// We can do this in a different (simpler) manner because we have compositing support!
@@ -697,7 +697,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 							2 * KDialog::spacingHint() );
 
 	// default factor
-	bool doUbuntuLogout = KConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", false);
+	bool doUbuntuLogout = TDEConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", false);
 
 	// slighty more space for the new logout
 	int factor = 2;
@@ -775,7 +775,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 
 		// respect lock on resume & disable suspend/hibernate settings
 		// from power-manager
-		KConfig config("power-managerrc");
+		TDEConfig config("power-managerrc");
 		bool disableSuspend = config.readBoolEntry("disableSuspend", false);
 		bool disableHibernate = config.readBoolEntry("disableHibernate", false);
 		m_lockOnResume = config.readBoolEntry("lockOnResume", true);
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 ) {