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

2 files changed, 15 insertions, 15 deletions

diff --git a/src/kreplacements/kreplacements.cpp b/src/kreplacements/kreplacements.cpp
index 93954da..3aad865 100644
--- a/src/kreplacements/kreplacements.cpp
+++ b/src/kreplacements/kreplacements.cpp
@@ -433,11 +433,11 @@ TQString KStandardDirs::findResource(const TQString& resource, const TQString& /
    return TQString();
 }
 
-KConfig::KConfig()
+TDEConfig::TDEConfig()
 {
 }
 
-void KConfig::readConfigFile( const TQString& configFileName )
+void TDEConfig::readConfigFile( const TQString& configFileName )
 {
    if ( !configFileName.isEmpty() )
    {
@@ -457,7 +457,7 @@ void KConfig::readConfigFile( const TQString& configFileName )
    }
 }
 
-KConfig::~KConfig()
+TDEConfig::~TDEConfig()
 {
    TQFile f(m_fileName);
    if ( f.open( IO_WriteOnly | IO_Translate ) )
@@ -468,7 +468,7 @@ KConfig::~KConfig()
    }
 }
 
-void KConfig::setGroup(const TQString&)
+void TDEConfig::setGroup(const TQString&)
 {
 }
 
@@ -1109,7 +1109,7 @@ TDEApplication::TDEApplication()
    }
 }
 
-KConfig* TDEApplication::config()
+TDEConfig* TDEApplication::config()
 {
    return &m_config;
 }
@@ -1130,7 +1130,7 @@ KIconLoader* TDEApplication::iconLoader()
 }
 
 
-namespace KIO
+namespace TDEIO
 {
    SimpleJob* mkdir( KURL ){return 0;}
    SimpleJob* rmdir( KURL ){return 0;}
diff --git a/src/kreplacements/kreplacements.h b/src/kreplacements/kreplacements.h
index bebe96c..dae652f 100644
--- a/src/kreplacements/kreplacements.h
+++ b/src/kreplacements/kreplacements.h
@@ -206,12 +206,12 @@ public slots:
    void slotAbout();
 };
 
-class KConfig : public ValueMap
+class TDEConfig : public ValueMap
 {
    TQString m_fileName;
 public:
-   KConfig();
-   ~KConfig();
+   TDEConfig();
+   ~TDEConfig();
    void readConfigFile(const TQString& configFileName);
 
    void setGroup(const TQString&);
@@ -377,13 +377,13 @@ public:
 
 class TDEApplication : public TQApplication
 {
-   KConfig m_config;
+   TDEConfig m_config;
    KIconLoader m_iconLoader;
 public:
    TDEApplication();
    static TDEApplication* kApplication();
    KIconLoader* iconLoader();
-   KConfig* config();
+   TDEConfig* config();
    bool isRestored();
 };
 
@@ -413,10 +413,10 @@ public:
 class TDEGlobal
 {
 public:
-   static KConfig* config() { return 0; }
+   static TDEConfig* config() { return 0; }
 };
 
-namespace KIO
+namespace TDEIO
 {
    enum UDSEntry {};
    typedef TQValueList<UDSEntry> UDSEntryList;
@@ -464,8 +464,8 @@ namespace KParts
       MainWindow( TQWidget* parent, const char* name ) : KMainWindow(parent,name) {}
       void setXMLFile(const TQString&){}
       void setAutoSaveSettings(){}
-      void saveMainWindowSettings(KConfig*){}
-      void applyMainWindowSettings(KConfig*){}
+      void saveMainWindowSettings(TDEConfig*){}
+      void applyMainWindowSettings(TDEConfig*){}
       int factory(){return 0;}
    };