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

2 files changed, 7 insertions, 7 deletions

diff --git a/kiosktool/kcms/autostart/kcmautostart.cpp b/kiosktool/kcms/autostart/kcmautostart.cpp
index d3f6d31..5a33cef 100644
--- a/kiosktool/kcms/autostart/kcmautostart.cpp
+++ b/kiosktool/kcms/autostart/kcmautostart.cpp
@@ -48,7 +48,7 @@ typedef KGenericFactory<AutoStartConfig, TQWidget> AutoStartFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_autostart, AutoStartFactory( "kcmautostart" ) )
 
 AutoStartConfig::AutoStartConfig(TQWidget* parent, const char* name, const TQStringList &) :
-    KCModule( AutoStartFactory::instance(), parent, name )
+    TDECModule( AutoStartFactory::instance(), parent, name )
 {
     TDEGlobal::dirs()->addResourceType("autostart", "share/autostart");
     TDEAboutData *about =
@@ -78,7 +78,7 @@ AutoStartConfig::AutoStartConfig(TQWidget* parent, const char* name, const TQStr
     load();
 }
 
-void setModuleGroup(KConfig *config, const TQString &filename)
+void setModuleGroup(TDEConfig *config, const TQString &filename)
 {
     TQString module = filename;
     int i = module.findRev('/');
@@ -91,13 +91,13 @@ void setModuleGroup(KConfig *config, const TQString &filename)
     config->setGroup(TQString("Module-%1").arg(module));
 }
 
-bool AutoStartConfig::autoloadEnabled(KConfig *config, const TQString &filename)
+bool AutoStartConfig::autoloadEnabled(TDEConfig *config, const TQString &filename)
 {
     setModuleGroup(config, filename);
     return config->readBoolEntry("autoload", true);
 }
 
-void AutoStartConfig::setAutoloadEnabled(KConfig *config, const TQString &filename, bool b)
+void AutoStartConfig::setAutoloadEnabled(TDEConfig *config, const TQString &filename, bool b)
 {
     setModuleGroup(config, filename);
     return config->writeEntry("autoload", b);
diff --git a/kiosktool/kcms/autostart/kcmautostart.h b/kiosktool/kcms/autostart/kcmautostart.h
index 7970609..72bd256 100644
--- a/kiosktool/kcms/autostart/kcmautostart.h
+++ b/kiosktool/kcms/autostart/kcmautostart.h
@@ -26,7 +26,7 @@ class KListView;
 class TQStringList;
 class TQPushButton;
 
-class AutoStartConfig : public KCModule
+class AutoStartConfig : public TDECModule
 {
 Q_OBJECT
   
@@ -44,8 +44,8 @@ protected slots:
 	void slotReload();
 	void slotItemChecked(TQCheckListItem *item);
 
-        bool autoloadEnabled(KConfig *config, const TQString &filename);
-        void setAutoloadEnabled(KConfig *config, const TQString &filename, bool b);
+        bool autoloadEnabled(TDEConfig *config, const TQString &filename);
+        void setAutoloadEnabled(TDEConfig *config, const TQString &filename, bool b);
 
 private:
 	KListView *_lvStartup;