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

7 files changed, 11 insertions, 11 deletions

diff --git a/src/configuredialog.cpp b/src/configuredialog.cpp
index 1ca5fea..ea9522d 100644
--- a/src/configuredialog.cpp
+++ b/src/configuredialog.cpp
@@ -54,7 +54,7 @@
  #include "configuredialog.h"
 
 /*! This is the default constructor of the class ConfigureDialog. */
-ConfigureDialog::ConfigureDialog( KConfig *_config, HardwareInfo *_hwinfo, Settings *_settings,
+ConfigureDialog::ConfigureDialog( TDEConfig *_config, HardwareInfo *_hwinfo, Settings *_settings,
 				  TQWidget *parent, const char *name)
 				 :configure_Dialog(parent, name, false, WDestructiveClose )
 {
diff --git a/src/configuredialog.h b/src/configuredialog.h
index 60e0e69..e08bf23 100644
--- a/src/configuredialog.h
+++ b/src/configuredialog.h
@@ -46,7 +46,7 @@ class ConfigureDialog: public configure_Dialog {
 
 public:
 	//! default constructor
-	ConfigureDialog( KConfig *_config, HardwareInfo *_hwinfo, Settings *_settings,
+	ConfigureDialog( TDEConfig *_config, HardwareInfo *_hwinfo, Settings *_settings,
 			 TQWidget *parent = 0, const char *name = 0);
 	//! default destructor
 	~ConfigureDialog();
@@ -59,7 +59,7 @@ private:
 	blacklistEditDialog* blacklistEDlgAD;
 
 	//! the pointer to the config of kpowersave, get from constructor
-	KConfig *kconfig;
+	TDEConfig *kconfig;
 	//! pointer to the KPowersave settings, get from constructor
 	Settings *settings;
 	//! pointer to hardware information and actions
diff --git a/src/infodialog.cpp b/src/infodialog.cpp
index cdf611f..b8c37c5 100644
--- a/src/infodialog.cpp
+++ b/src/infodialog.cpp
@@ -41,7 +41,7 @@
 #include <tqtooltip.h>
 
 /*! This is the default constructor of class infoDialog . */
-infoDialog::infoDialog( KConfig *config, TQString captionName, TQString message, 
+infoDialog::infoDialog( TDEConfig *config, TQString captionName, TQString message, 
 			TQString dontShowAgainMsg, TQString settingsEntryName, 
 			TQWidget *parent, const char *name)
 			:info_Dialog( parent, name, false, TQt::WStyle_StaysOnTop | WDestructiveClose )
diff --git a/src/infodialog.h b/src/infodialog.h
index d3a8a6e..dcb2be5 100644
--- a/src/infodialog.h
+++ b/src/infodialog.h
@@ -43,7 +43,7 @@ class infoDialog: public info_Dialog {
 public:
 	
 	//! default constructor
-	infoDialog( KConfig *config = 0, TQString captionName = TQString(), TQString message = TQString(), 
+	infoDialog( TDEConfig *config = 0, TQString captionName = TQString(), TQString message = TQString(), 
 		    TQString dontShowAgainMsg = TQString(), TQString settingsEntryName = TQString(),
 		    TQWidget *parent = 0, const char *name = 0);
 	//! default destructor
@@ -55,7 +55,7 @@ public:
 private:
 
 	//! the pointer to the settings of kpowersave, get from constructor
-	KConfig *settings;
+	TDEConfig *settings;
 
 	//! name of the entry in the settings  
         /*! TQString store the name of the settings entry to 
diff --git a/src/kpowersave.h b/src/kpowersave.h
index e3008b1..0239844 100644
--- a/src/kpowersave.h
+++ b/src/kpowersave.h
@@ -75,7 +75,7 @@ private:
 
 	// permanent pointers
 	//! to configure kpowersave
-	KConfig *config;
+	TDEConfig *config;
 	//! instance of \ref screen
 	screen *display;
 	//! instance of \ref settings
diff --git a/src/settings.cpp b/src/settings.cpp
index c756370..753d4dd 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -35,7 +35,7 @@
 /*! This is the default constructor of the class Settings. */
 Settings::Settings()
 {
-	kconfig = new KConfig("kpowersaverc", true );
+	kconfig = new TDEConfig("kpowersaverc", true );
 	kde = new KDE_Settings();
 	load_kde();
 	load_general_settings();
@@ -352,7 +352,7 @@ action Settings::mapActionToType (TQString _action) {
  * \retval false if there was a error/problem 
  */
 void Settings::load_kde(){
-	KConfig *_kconfig = new KConfig("kcmdisplayrc", true );
+	TDEConfig *_kconfig = new TDEConfig("kcmdisplayrc", true );
 	
 	/* KDE settings [DisplayEnergy] from kcmdisplayrc */
 	if(_kconfig->hasGroup("DisplayEnergy")) {
@@ -363,7 +363,7 @@ void Settings::load_kde(){
 		kde->displayPowerOff = _kconfig->readNumEntry("displayPowerOff", 19);
 	}
         delete _kconfig;	
-	_kconfig = new KConfig("kdesktoprc", true );
+	_kconfig = new TDEConfig("kdesktoprc", true );
 	/* KDE settings [ScreenSaver] from kdesktoprc */
 	if(_kconfig->hasGroup("ScreenSaver")) {
 		_kconfig->setGroup("ScreenSaver");
diff --git a/src/settings.h b/src/settings.h
index 1769ccc..dd737e7 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -488,7 +488,7 @@ public:
 private:
 	
 	//! configuration of kpowersave
-	KConfig *kconfig;
+	TDEConfig *kconfig;
 
 	//! to map a battery action string to the related type
 	action mapActionToType (TQString _action);