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

1 files changed, 12 insertions, 12 deletions

diff --git a/ksirc/servercontroller.cpp b/ksirc/servercontroller.cpp
index 9f979369..61495815 100644
--- a/ksirc/servercontroller.cpp
+++ b/ksirc/servercontroller.cpp
@@ -383,7 +383,7 @@ void servercontroller::font_update(const TQFont &font)
   ksopts->defaultFont = font;
 /*  configChange(); */
 
-  KConfig *kConfig = kapp->config();
+  TDEConfig *kConfig = kapp->config();
   kConfig->setGroup("GlobalOptions");
   kConfig->sync();
   TQApplication::setFont( font, true, "KSirc::TextView" );
@@ -581,7 +581,7 @@ void servercontroller::slot_filters_update()
   emit ServMessage(TQString(), ServCommand::updateFilters, TQString());
 }
 
-void servercontroller::saveGlobalProperties(KConfig *ksc)
+void servercontroller::saveGlobalProperties(TDEConfig *ksc)
 {
   // ksc hos the K Session config
   // ksp == current KSircProcess
@@ -608,9 +608,9 @@ void servercontroller::saveGlobalProperties(KConfig *ksc)
 	  desktops << TQString::number( ( *sessionInfoIt ).desktop );
       }
 
-      KConfigGroup( ksc, "KSircSession" ).writeEntry( it.key(), channels );
-      KConfigGroup( ksc, "KSircSessionPort" ).writeEntry( it.key(), port );
-      KConfigGroup( ksc, "KSircSessionDesktopNumbers" ).writeEntry( it.key(), desktops );
+      TDEConfigGroup( ksc, "KSircSession" ).writeEntry( it.key(), channels );
+      TDEConfigGroup( ksc, "KSircSessionPort" ).writeEntry( it.key(), port );
+      TDEConfigGroup( ksc, "KSircSessionDesktopNumbers" ).writeEntry( it.key(), desktops );
   }
 
   ksc->setGroup("ServerController");
@@ -619,7 +619,7 @@ void servercontroller::saveGlobalProperties(KConfig *ksc)
   ksc->setGroup(group);
 }
 
-void servercontroller::readGlobalProperties(KConfig *ksc)
+void servercontroller::readGlobalProperties(TDEConfig *ksc)
 {
     TQString group = ksc->group();
 
@@ -636,13 +636,13 @@ void servercontroller::readGlobalProperties(KConfig *ksc)
 
     while(it != keyMap.end()) {
 	TQString server = it.key();
-	TQString port = KConfigGroup( ksc, "KSircSessionPort" ).readEntry( server );
+	TQString port = TDEConfigGroup( ksc, "KSircSessionPort" ).readEntry( server );
 	//	debug("%s", it.key().latin1());
         KSircServer kss(server, port);
 	new_ksircprocess( kss ); // sets up proc_list
 	TQStringList channels = ksc->readListEntry( server );
 
-	TQStringList desktops = KConfigGroup( ksc, "KSircSessionDesktopNumbers" ).readListEntry( server );
+	TQStringList desktops = TDEConfigGroup( ksc, "KSircSessionDesktopNumbers" ).readListEntry( server );
 
 	for(uint i = 0; i < channels.count(); i++){
 
@@ -739,8 +739,8 @@ void servercontroller::saveDockingStatus()
     if ( we_are_exiting ) // we are hidden by closeEvent
 	return;
 
-//    KConfig *kConfig = kapp->config();
-//    KConfigGroupSaver s( kConfig, "ServerController" );
+//    TDEConfig *kConfig = kapp->config();
+//    TDEConfigGroupSaver s( kConfig, "ServerController" );
 //    kConfig->writeEntry("Docked", !isVisible());
 //    kConfig->sync();
 }
@@ -838,7 +838,7 @@ void servercontroller::do_autoconnect()
 
     kdDebug(5008) << "Doing AUTOCONNECT" << endl;
 
-    KConfig *conf = kapp->config();
+    TDEConfig *conf = kapp->config();
     conf->setGroup("AutoConnect");
     TQStringList servers = conf->readListEntry("Servers");
     servers.sort();
@@ -923,7 +923,7 @@ void servercontroller::start_autoconnect() {
 
 void servercontroller::start_autoconnect_check() {
 
-    KConfig *conf = kapp->config();
+    TDEConfig *conf = kapp->config();
     conf->setGroup("AutoConnect");
     TQStringList servers = conf->readListEntry("Servers");