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

10 files changed, 22 insertions, 22 deletions

diff --git a/kdf/disklist.cpp b/kdf/disklist.cpp
index 18a00c3..de0d213 100644
--- a/kdf/disklist.cpp
+++ b/kdf/disklist.cpp
@@ -81,7 +81,7 @@ void DiskList::setUpdatesDisabled(bool disable)
 }
 
 /***************************************************************************
-  * saves the KConfig for special mount/umount scripts
+  * saves the TDEConfig for special mount/umount scripts
 **/
 void DiskList::applySettings()
 {
@@ -110,7 +110,7 @@ void DiskList::applySettings()
 
 
 /***************************************************************************
-  * reads the KConfig for special mount/umount scripts
+  * reads the TDEConfig for special mount/umount scripts
 **/
 void DiskList::loadSettings()
 {
diff --git a/kdf/disklist.h b/kdf/disklist.h
index 821af53..9dba750 100644
--- a/kdf/disklist.h
+++ b/kdf/disklist.h
@@ -129,7 +129,7 @@ private:
   TDEProcess         *dfProc;
   TQString           dfStringErrOut;
   bool              readingDFStdErrOut;
-  KConfig           *config;
+  TDEConfig           *config;
   bool              updatesDisabled;
   
 };
diff --git a/kdf/disks.h b/kdf/disks.h
index 2b6329b..b39a9db 100644
--- a/kdf/disks.h
+++ b/kdf/disks.h
@@ -80,11 +80,11 @@ public:
   int kBSize() const { return size; }
   TQString iconName();
   TQString realIconName() { return icoName; }
-  TQString prettyKBSize() const { return KIO::convertSizeFromKB(size); }
+  TQString prettyKBSize() const { return TDEIO::convertSizeFromKB(size); }
   int kBUsed() const { return used; }
-  TQString prettyKBUsed() const { return KIO::convertSizeFromKB(used); }
+  TQString prettyKBUsed() const { return TDEIO::convertSizeFromKB(used); }
   int kBAvail() const  { return avail; }
-  TQString prettyKBAvail() const { return KIO::convertSizeFromKB(avail); }
+  TQString prettyKBAvail() const { return TDEIO::convertSizeFromKB(avail); }
   float percentFull() const;
 
 signals:
diff --git a/kdf/kcmdf.cpp b/kdf/kcmdf.cpp
index 2e26113..4daaaab 100644
--- a/kdf/kcmdf.cpp
+++ b/kdf/kcmdf.cpp
@@ -21,7 +21,7 @@
 
 //
 // 1999-12-05 Espen Sand 
-// Modified to use KCModule instead of the old and obsolete 
+// Modified to use TDECModule instead of the old and obsolete 
 // KControlApplication
 //
 
@@ -33,7 +33,7 @@
 #include "kcmdf.h"
 
 KDiskFreeWidget::KDiskFreeWidget( TQWidget *parent, const char *name )
- : KCModule( parent, name )
+ : TDECModule( parent, name )
 {
   setButtons(Help);
 
@@ -57,7 +57,7 @@ TQString KDiskFreeWidget::quickHelp() const
 
 extern "C"
 {
-  KDE_EXPORT KCModule* create_kdf( TQWidget *parent, const char * /*name*/ )
+  KDE_EXPORT TDECModule* create_kdf( TQWidget *parent, const char * /*name*/ )
   {
     return new KDiskFreeWidget( parent , "kdf" );
   }
diff --git a/kdf/kcmdf.h b/kdf/kcmdf.h
index f1a9a97..6bce3df 100644
--- a/kdf/kcmdf.h
+++ b/kdf/kcmdf.h
@@ -30,7 +30,7 @@
 #include <kcmodule.h>
 #include <tqtabwidget.h>
 
-class KDiskFreeWidget : public KCModule
+class KDiskFreeWidget : public TDECModule
 {
   Q_OBJECT
   
diff --git a/kdf/kconftest.cpp b/kdf/kconftest.cpp
index 1e913ff..2c14a5c 100644
--- a/kdf/kconftest.cpp
+++ b/kdf/kconftest.cpp
@@ -50,7 +50,7 @@ main(int argc, char ** argv)
  TDECmdLineArgs::init(argc, argv, "test", description, version);
  
  TDEApplication app;
- KConfig * cfg = kapp->config();
+ TDEConfig * cfg = kapp->config();
 
  TQDict<char> dict;
 
diff --git a/kdf/kdfconfig.cpp b/kdf/kdfconfig.cpp
index b5ea4d0..302c4b8 100644
--- a/kdf/kdfconfig.cpp
+++ b/kdf/kdfconfig.cpp
@@ -162,7 +162,7 @@ void KDFConfigWidget::closeEvent(TQCloseEvent *)
 
 void KDFConfigWidget::applySettings( void )
 {
-  KConfig &config = *kapp->config();
+  TDEConfig &config = *kapp->config();
   config.setGroup("KDFConfig");
 
   if( GUI )
@@ -196,7 +196,7 @@ void KDFConfigWidget::applySettings( void )
 
 void KDFConfigWidget::loadSettings( void )
 {
-  KConfig &config = *kapp->config();
+  TDEConfig &config = *kapp->config();
   config.setGroup("KDFConfig");
 
   if( GUI )
diff --git a/kdf/kdfwidget.cpp b/kdf/kdfwidget.cpp
index c6e05af..9b0d11a 100644
--- a/kdf/kdfwidget.cpp
+++ b/kdf/kdfwidget.cpp
@@ -198,11 +198,11 @@ void KDFWidget::settingsChanged( void )
 
 
 /***************************************************************************
-  * writes the KConfig
+  * writes the TDEConfig
 **/
 void KDFWidget::applySettings( void )
 {
-  KConfig &config = *kapp->config();
+  TDEConfig &config = *kapp->config();
 
   config.setGroup("KDiskFree");
   if( GUI )
@@ -223,7 +223,7 @@ void KDFWidget::applySettings( void )
 
 
 /***************************************************************************
-  * reads the KConfig
+  * reads the TDEConfig
 **/
 void KDFWidget::loadSettings( void )
 {
@@ -231,7 +231,7 @@ void KDFWidget::loadSettings( void )
 
   if(GUI)
   {
-    KConfig &config = *kapp->config();
+    TDEConfig &config = *kapp->config();
     config.setGroup("KDiskFree");
     for( uint i=0; i<mTabProp.size(); i++ )
     {
diff --git a/kdf/mntconfig.cpp b/kdf/mntconfig.cpp
index 8d7c1a8..bc4af51 100644
--- a/kdf/mntconfig.cpp
+++ b/kdf/mntconfig.cpp
@@ -179,7 +179,7 @@ void MntConfigWidget::applySettings( void )
 {
   mDiskList.applySettings();
 
-  KConfig &config = *kapp->config();
+  TDEConfig &config = *kapp->config();
   config.setGroup("MntConfig");
   if(GUI )
   {
@@ -192,7 +192,7 @@ void MntConfigWidget::applySettings( void )
 
 void MntConfigWidget::loadSettings( void )
 {
-  KConfig &config = *kapp->config();
+  TDEConfig &config = *kapp->config();
   if( mInitializing == false && GUI )
   {
     config.setGroup("MntConfig");
diff --git a/kdf/stdoption.cpp b/kdf/stdoption.cpp
index 04b75f5..9d7447e 100644
--- a/kdf/stdoption.cpp
+++ b/kdf/stdoption.cpp
@@ -47,7 +47,7 @@ CStdOption::~CStdOption( void )
 
 void CStdOption::updateConfiguration( void )
 {
-  KConfig &config = *kapp->config();
+  TDEConfig &config = *kapp->config();
   config.setGroup("KDFConfig");
   mFileManager = config.readPathEntry(
     "FileManagerCommand", mDefaultFileManager );
@@ -62,7 +62,7 @@ void CStdOption::updateConfiguration( void )
 
 void CStdOption::writeConfiguration( void )
 {
-  KConfig &config = *kapp->config();
+  TDEConfig &config = *kapp->config();
   config.setGroup("KDFConfig");
   config.writeEntry( "UpdateFrequency", mUpdateFrequency );
   config.writePathEntry( "FileManagerCommand", mFileManager );
@@ -74,7 +74,7 @@ void CStdOption::writeConfiguration( void )
 
 void CStdOption::writeDefaultFileManager( void )
 {
-  KConfig &config = *kapp->config();
+  TDEConfig &config = *kapp->config();
   config.setGroup("KDFConfig");
   config.writePathEntry( "FileManagerCommand", mDefaultFileManager );
   config.sync();