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

8 files changed, 41 insertions, 41 deletions

diff --git a/kpersonalizer/kcountrypage.cpp b/kpersonalizer/kcountrypage.cpp
index eb4b5da91..e3efd2f85 100644
--- a/kpersonalizer/kcountrypage.cpp
+++ b/kpersonalizer/kcountrypage.cpp
@@ -149,7 +149,7 @@ void KCountryPage::fillLanguageMenu(KLanguageButton *combo) {
 /** No descriptions */
 bool KCountryPage::save(KLanguageButton *comboCountry, KLanguageButton *comboLang) {
 	kdDebug() << "KCountryPage::save()" << endl;
-	KConfigBase *config = TDEGlobal::config();
+	TDEConfigBase *config = TDEGlobal::config();
 
 	config->setGroup(TQString::fromLatin1("Locale"));
 	config->writeEntry(TQString::fromLatin1("Country"), comboCountry->current(), true, true);
diff --git a/kpersonalizer/keyecandypage.cpp b/kpersonalizer/keyecandypage.cpp
index 4aecabc6e..6faea6540 100644
--- a/kpersonalizer/keyecandypage.cpp
+++ b/kpersonalizer/keyecandypage.cpp
@@ -49,12 +49,12 @@
 
 KEyeCandyPage::KEyeCandyPage(TQWidget *parent, const char *name ) : KEyeCandyPageDlg(parent,name) {
 
-	twinconf = new KConfig("twinrc", false, true);
-	twineventconf = new KConfig("twin.eventsrc", false, false);
-	kickerconf =  new KConfig("kickerrc",false, false);
-	konquerorconf =  new KConfig("konquerorrc",false, false);
-	konqiconconf = new KConfig("konqiconviewrc",false,false);
-	kdesktopconf = new KConfig("kdesktoprc", false, false);
+	twinconf = new TDEConfig("twinrc", false, true);
+	twineventconf = new TDEConfig("twin.eventsrc", false, false);
+	kickerconf =  new TDEConfig("kickerrc",false, false);
+	konquerorconf =  new TDEConfig("konquerorrc",false, false);
+	konqiconconf = new TDEConfig("konqiconviewrc",false,false);
+	kdesktopconf = new TDEConfig("kdesktoprc", false, false);
 
 	sys = new KSysInfo();
 
@@ -614,7 +614,7 @@ void KEyeCandyPage::save(bool currSettings){
 	kdDebug() << "KEyeCandyPage::save()" << endl;
 	// currSettings==true: save selections. currSettings==false: save user-def.
 	saveCheckState(currSettings);
-	// save all the KConfig-objects to their respective files
+	// save all the TDEConfig-objects to their respective files
 	twinconf->sync();
 	twineventconf->sync();
 	konquerorconf->sync();
diff --git a/kpersonalizer/keyecandypage.h b/kpersonalizer/keyecandypage.h
index 016502e2f..63889a67c 100644
--- a/kpersonalizer/keyecandypage.h
+++ b/kpersonalizer/keyecandypage.h
@@ -179,13 +179,13 @@ private:
 	} st_UserSnd;
   // DEFAULT VALLUES SET BY USER (END)
 
-	KConfig* twinconf;
-	KConfig* twineventconf;
-	KConfig* kickerconf;
-	KConfig* konquerorconf;
-	KConfig* konqiconconf;
-	KConfig* kdesktopconf;
-	KConfig* kdeglobals;
+	TDEConfig* twinconf;
+	TDEConfig* twineventconf;
+	TDEConfig* kickerconf;
+	TDEConfig* konquerorconf;
+	TDEConfig* konqiconconf;
+	TDEConfig* kdesktopconf;
+	TDEConfig* kdeglobals;
 
 	KSysInfo* sys;
 
diff --git a/kpersonalizer/kfindlanguage.cpp b/kpersonalizer/kfindlanguage.cpp
index b0c390395..83d1c1614 100644
--- a/kpersonalizer/kfindlanguage.cpp
+++ b/kpersonalizer/kfindlanguage.cpp
@@ -29,7 +29,7 @@
 #include "kfindlanguage.h"
 
 KFindLanguage::KFindLanguage() {
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup("Locale");
 
 	m_oldlang = config->readEntry("Language");
diff --git a/kpersonalizer/kospage.cpp b/kpersonalizer/kospage.cpp
index 401016d24..bc514d9c8 100644
--- a/kpersonalizer/kospage.cpp
+++ b/kpersonalizer/kospage.cpp
@@ -41,15 +41,15 @@ KOSPage::KOSPage(TQWidget *parent, const char *name ) : KOSPageDlg(parent,name)
 	// initialize the textview with the default description - Trinity of course
 	slotKDEDescription();
 	// Set the configfiles
-	cglobal = new KConfig("kdeglobals");
-	claunch = new KConfig("klaunchrc", false, false);
-	cwin = new KConfig("twinrc");
-	cdesktop = new KConfig("kdesktoprc");
-	ckcminput = new KConfig("kcminputrc");
-	ckcmdisplay = new KConfig("kcmdisplayrc");
-	ckonqueror = new KConfig("konquerorrc");
-	cklipper = new KConfig("klipperrc", false, false);
-	ckaccess = new KConfig("kaccessrc");
+	cglobal = new TDEConfig("kdeglobals");
+	claunch = new TDEConfig("klaunchrc", false, false);
+	cwin = new TDEConfig("twinrc");
+	cdesktop = new TDEConfig("kdesktoprc");
+	ckcminput = new TDEConfig("kcminputrc");
+	ckcmdisplay = new TDEConfig("kcmdisplayrc");
+	ckonqueror = new TDEConfig("konquerorrc");
+	cklipper = new TDEConfig("klipperrc", false, false);
+	ckaccess = new TDEConfig("kaccessrc");
 	// Save the current user defaults
 	getUserDefaults();
 	// set default-selections for this page
diff --git a/kpersonalizer/kospage.h b/kpersonalizer/kospage.h
index 69bd2d959..2797f4572 100644
--- a/kpersonalizer/kospage.h
+++ b/kpersonalizer/kospage.h
@@ -52,15 +52,15 @@ signals: // Signals
 	on the selection made by the user. */
 	void selectedOS(const TQString&);
 private:
-	KConfig* cglobal;
-	KConfig* claunch;
-	KConfig* cwin;
-	KConfig* cdesktop;
-	KConfig* ckcminput;
-	KConfig* ckcmdisplay;
-	KConfig* ckonqueror;
-	KConfig* cklipper;
-	KConfig* ckaccess;
+	TDEConfig* cglobal;
+	TDEConfig* claunch;
+	TDEConfig* cwin;
+	TDEConfig* cdesktop;
+	TDEConfig* ckcminput;
+	TDEConfig* ckcmdisplay;
+	TDEConfig* ckonqueror;
+	TDEConfig* cklipper;
+	TDEConfig* ckaccess;
 	// DEFAULT VALUES SET BY USER
 	bool b_Gestures, b_MacMenuBar, b_SingleClick, b_BusyCursor, b_ShowMenuBar,
 		 b_DesktopUnderline, b_KonqUnderline, b_ChangeCursor, b_syncClipboards;
diff --git a/kpersonalizer/kstylepage.cpp b/kpersonalizer/kstylepage.cpp
index 1c48dd6c9..1b10d3082 100644
--- a/kpersonalizer/kstylepage.cpp
+++ b/kpersonalizer/kstylepage.cpp
@@ -106,7 +106,7 @@ void KStylePage::save(bool curSettings){
 /** save the widget-style */
 void KStylePage::saveStyle(bool curSettings){
 	TQString style = curSettings ? currentStyle : origStyle;
-	KConfig cfg( "kdeglobals" );
+	TDEConfig cfg( "kdeglobals" );
 	cfg.setGroup("General");
 	cfg.writeEntry( "widgetStyle", style, true, true );
 	cfg.sync();
@@ -160,7 +160,7 @@ void KStylePage::saveColors(bool curSettings){
 
 	// the GLOBAL config entries must be taken from the kcsrc file and written to it. Use the default values
 	// equals that the file is <default> which is no file. TODO: use the default values in that case (kde selected)
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup( "General" );
 	config->writeEntry("foreground", toSave->foreground, true, true);
 	config->writeEntry("background", toSave->background, true, true);
@@ -206,7 +206,7 @@ void KStylePage::saveColors(bool curSettings){
 	config->sync();
 
 	// background color changes
-	KConfig kdesktop("kdesktoprc");
+	TDEConfig kdesktop("kdesktoprc");
 	kdesktop.setGroup("Desktop0"); // we only need to set one desktop
 
 	kdesktop.writeEntry("BackgroundMode", toSave->bgMode);
@@ -320,7 +320,7 @@ void KStylePage::setDefaults(){
 
 /** Fill a colorSet with a colorfile, or the default. */
 void KStylePage::getColors(colorSet *set, bool colorfile ){
-	KConfig* config;
+	TDEConfig* config;
 	bool deleteConfig = false;
 	// get the color scheme file and go to the color scheme group
 	if(colorfile){
@@ -369,7 +369,7 @@ void KStylePage::getColors(colorSet *set, bool colorfile ){
                 deleteConfig = true;
 	}
 	else {
-		KConfig kdesktop("kdesktoprc");
+		TDEConfig kdesktop("kdesktoprc");
 		kdesktop.setGroup("Desktop0");
 		// set Background (userSettings if available, else default)
 		set->bgMode=kdesktop.readEntry("BackgroundMode", "Flat");
@@ -473,7 +473,7 @@ void KStylePage::getUserDefaults() {
 	origStyle = TDEGlobal::config()->readEntry( "widgetStyle", KStyle::defaultStyle() );
 
 	// get the user's current KWin-style
-	ctwin = new KConfig("twinrc");
+	ctwin = new TDEConfig("twinrc");
 	ctwin->setGroup("Style");
 	origKWinStyle = ctwin->readEntry("PluginLib", defaultKWinStyle);
 
diff --git a/kpersonalizer/kstylepage.h b/kpersonalizer/kstylepage.h
index a82168768..2a3f554e0 100644
--- a/kpersonalizer/kstylepage.h
+++ b/kpersonalizer/kstylepage.h
@@ -44,7 +44,7 @@ private:
 	TQString origIcons;
 	TQString defaultKWinStyle;
 	TQString currentStyle;
-	KConfig* ctwin;
+	TDEConfig* ctwin;
 	struct colorSet {
 		TQString colorFile, bgMode;
 		int contrast;