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

4 files changed, 10 insertions, 10 deletions

diff --git a/kcontrol/performance/kcmperformance.cpp b/kcontrol/performance/kcmperformance.cpp
index 11ea51438..3795cc39a 100644
--- a/kcontrol/performance/kcmperformance.cpp
+++ b/kcontrol/performance/kcmperformance.cpp
@@ -28,12 +28,12 @@
 
 extern "C"
 {
-    KDE_EXPORT KCModule* create_performance( TQWidget* parent_P, const char* name_P )
+    KDE_EXPORT TDECModule* create_performance( TQWidget* parent_P, const char* name_P )
     {
     return new KCMPerformance::Config( parent_P, name_P );
     }
 
-    KDE_EXPORT KCModule* create_konqueror( TQWidget* parent_P, const char* name_P )
+    KDE_EXPORT TDECModule* create_konqueror( TQWidget* parent_P, const char* name_P )
     {
     return new KCMPerformance::KonquerorConfig( parent_P, name_P );
     }
@@ -43,7 +43,7 @@ namespace KCMPerformance
 {
 
 Config::Config( TQWidget* parent_P, const char* )
-    : KCModule( parent_P, "kcmperformance" )
+    : TDECModule( parent_P, "kcmperformance" )
     {
     setQuickHelp( i18n( "<h1>TDE Performance</h1>"
         " You can configure settings that improve TDE performance here." ));
@@ -86,7 +86,7 @@ void Config::defaults()
     }
 
 KonquerorConfig::KonquerorConfig( TQWidget* parent_P, const char* )
-    : KCModule( parent_P, "kcmperformance" )
+    : TDECModule( parent_P, "kcmperformance" )
     {
     setQuickHelp( i18n( "<h1>Konqueror Performance</h1>"
         " You can configure several settings that improve Konqueror performance here."
diff --git a/kcontrol/performance/kcmperformance.h b/kcontrol/performance/kcmperformance.h
index bb924b880..2ae868093 100644
--- a/kcontrol/performance/kcmperformance.h
+++ b/kcontrol/performance/kcmperformance.h
@@ -28,7 +28,7 @@ class Konqueror;
 class SystemWidget;
 
 class Config
-    : public KCModule
+    : public TDECModule
     {
     Q_OBJECT
     public:
@@ -43,7 +43,7 @@ class Config
     };
 
 class KonquerorConfig
-    : public KCModule
+    : public TDECModule
     {
     Q_OBJECT
     public:
diff --git a/kcontrol/performance/konqueror.cpp b/kcontrol/performance/konqueror.cpp
index b9edc46f0..3c8bb6db3 100644
--- a/kcontrol/performance/konqueror.cpp
+++ b/kcontrol/performance/konqueror.cpp
@@ -96,7 +96,7 @@ void Konqueror::preload_count_changed( int count )
 
 void Konqueror::load( bool useDefaults )
     {
-    KConfig cfg( "konquerorrc", true );
+    TDEConfig cfg( "konquerorrc", true );
 	 cfg.setReadDefaults( useDefaults );
     cfg.setGroup( "Reusing" );
     allowed_parts = cfg.readEntry( "SafeParts", "SAFE" );
@@ -113,7 +113,7 @@ void Konqueror::load( bool useDefaults )
 
 void Konqueror::save()
     {
-    KConfig cfg( "konquerorrc" );
+    TDEConfig cfg( "konquerorrc" );
     cfg.setGroup( "Reusing" );
     if( rb_always_reuse->isChecked())
         allowed_parts = "ALL";
diff --git a/kcontrol/performance/system.cpp b/kcontrol/performance/system.cpp
index 001e00abf..500178002 100644
--- a/kcontrol/performance/system.cpp
+++ b/kcontrol/performance/system.cpp
@@ -57,7 +57,7 @@ SystemWidget::SystemWidget( TQWidget* parent_P )
 
 void SystemWidget::load(bool useDefaults )
     {
-    KConfig cfg( "kdedrc", true );
+    TDEConfig cfg( "kdedrc", true );
 	 cfg.setReadDefaults( useDefaults );
     cfg.setGroup( "General" );
     cb_disable_kbuildsycoca->setChecked( cfg.readBoolEntry( "DelayedCheck", false ));
@@ -65,7 +65,7 @@ void SystemWidget::load(bool useDefaults )
 
 void SystemWidget::save()
     {
-    KConfig cfg( "kdedrc" );
+    TDEConfig cfg( "kdedrc" );
     cfg.setGroup( "General" );
     cfg.writeEntry( "DelayedCheck", cb_disable_kbuildsycoca->isChecked());
     }