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

6 files changed, 16 insertions, 16 deletions

diff --git a/kinit/autostart.cpp b/kinit/autostart.cpp
index 4e8b6c784..3fe0825a4 100644
--- a/kinit/autostart.cpp
+++ b/kinit/autostart.cpp
@@ -102,7 +102,7 @@ static bool startCondition(const TQString &condition)
   if (list[0].isEmpty() || list[2].isEmpty()) 
      return true;
 
-  KConfig config(list[0], true, false);
+  TDEConfig config(list[0], true, false);
   if (!list[1].isEmpty())
      config.setGroup(list[1]);
 
diff --git a/kinit/kdostartupconfig.cpp b/kinit/kdostartupconfig.cpp
index 470e7faba..b74417c3f 100644
--- a/kinit/kdostartupconfig.cpp
+++ b/kinit/kdostartupconfig.cpp
@@ -95,7 +95,7 @@ int main()
             return 6;
         if( group.left( 1 ) == "[" && group.right( 1 ) == "]" )
             { // whole config group
-            KConfig cfg( file );
+            TDEConfig cfg( file );
             group = group.mid( 1, group.length() - 2 );
             TQMap< TQString, TQString > entries = cfg.entryMap( group );
             startupconfig << "# " << line << "\n";
@@ -115,7 +115,7 @@ int main()
             { // a single key
             if( key.isEmpty())
                 return 7;
-            KConfig cfg( file );
+            TDEConfig cfg( file );
             cfg.setGroup( group );
             TQString value = cfg.readEntry( key, def );
             startupconfig << "# " << line << "\n";
diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp
index d7e7c7e1c..1f65658d9 100644
--- a/kinit/kinit.cpp
+++ b/kinit/kinit.cpp
@@ -171,7 +171,7 @@ int tdeinit_x_errhandler( Display *, XErrorEvent *err );
 extern "C" KParts::Plugin* _kinit_init_kparts() { return new KParts::Plugin(); }
 /* These are to link libkio even if 'smart' linker is used */
 #include <kio/authinfo.h>
-extern "C" KIO::AuthInfo* _kioslave_init_kio() { return new KIO::AuthInfo(); }
+extern "C" TDEIO::AuthInfo* _kioslave_init_kio() { return new TDEIO::AuthInfo(); }
 
 /*
  * Close fd's which are only useful for the parent process.
@@ -1758,7 +1758,7 @@ int main(int argc, char **argv, char **envp)
    tdeinit_initsetproctitle(argc, argv, envp);
    tdeinit_library_path();
    // Don't make our instance the global instance
-   // (do it only after tdeinit_library_path, that one indirectly uses KConfig,
+   // (do it only after tdeinit_library_path, that one indirectly uses TDEConfig,
    // which seems to be buggy and always use TDEGlobal instead of the maching TDEInstance)
    TDEGlobal::_instance = 0L;
    // don't change envvars before tdeinit_initsetproctitle()
diff --git a/kinit/kioslave.cpp b/kinit/kioslave.cpp
index f132abb0d..0cb77db02 100644
--- a/kinit/kioslave.cpp
+++ b/kinit/kioslave.cpp
@@ -49,7 +49,7 @@
 
 /* These are to link libkio even if 'smart' linker is used */
 #include <kio/authinfo.h>
-extern "C" KIO::AuthInfo* _kioslave_init_kio() { return new KIO::AuthInfo(); }
+extern "C" TDEIO::AuthInfo* _kioslave_init_kio() { return new TDEIO::AuthInfo(); }
 
 int main(int argc, char **argv)
 {
diff --git a/kinit/klauncher.cpp b/kinit/klauncher.cpp
index 3f5510ea0..8c66789e7 100644
--- a/kinit/klauncher.cpp
+++ b/kinit/klauncher.cpp
@@ -61,12 +61,12 @@
 // Dispose slaves after being idle for SLAVE_MAX_IDLE seconds
 #define SLAVE_MAX_IDLE	30
 
-using namespace KIO;
+using namespace TDEIO;
 
 template class TQPtrList<KLaunchRequest>;
 template class TQPtrList<IdleSlave>;
 
-IdleSlave::IdleSlave(KSocket *socket)
+IdleSlave::IdleSlave(TDESocket *socket)
 {
    mConn.init(socket);
    mConn.connect(this, TQT_SLOT(gotInput()));
@@ -194,9 +194,9 @@ KLauncher::KLauncher(int _tdeinitSocket, bool new_startup)
    domainname.close();
    domainname.unlink();
 #endif
-   mPoolSocket = new KServerSocket(static_cast<const char*>(TQFile::encodeName(mPoolSocketName)));
-   connect(mPoolSocket, TQT_SIGNAL(accepted( KSocket *)),
-           TQT_SLOT(acceptSlave(KSocket *)));
+   mPoolSocket = new TDEServerSocket(static_cast<const char*>(TQFile::encodeName(mPoolSocketName)));
+   connect(mPoolSocket, TQT_SIGNAL(accepted( TDESocket *)),
+           TQT_SLOT(acceptSlave(TDESocket *)));
 
    connect(&mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(idleTimeout()));
 
@@ -1353,7 +1353,7 @@ KLauncher::waitForSlave(pid_t pid)
 }
 
 void
-KLauncher::acceptSlave(KSocket *slaveSocket)
+KLauncher::acceptSlave(TDESocket *slaveSocket)
 {
     IdleSlave *slave = new IdleSlave(slaveSocket);
     // Send it a SLAVE_STATUS command.
diff --git a/kinit/klauncher.h b/kinit/klauncher.h
index 8058bb31e..37b10f059 100644
--- a/kinit/klauncher.h
+++ b/kinit/klauncher.h
@@ -43,7 +43,7 @@ class IdleSlave : public TQObject
 {
    Q_OBJECT
 public:
-   IdleSlave(KSocket *socket);
+   IdleSlave(TDESocket *socket);
    bool match( const TQString &protocol, const TQString &host, bool connected);
    void connect( const TQString &app_socket);
    pid_t pid() const { return mPid;}
@@ -59,7 +59,7 @@ protected slots:
    void gotInput();
 
 protected:
-   KIO::Connection mConn;
+   TDEIO::Connection mConn;
    TQString mProtocol;
    TQString mHost;
    bool mConnected;
@@ -169,7 +169,7 @@ public slots:
    void slotKDEInitData(int);
    void slotAppRegistered(const TQCString &appId);
    void slotSlaveStatus(IdleSlave *);
-   void acceptSlave( KSocket *);
+   void acceptSlave( TDESocket *);
    void slotSlaveGone();
    void idleTimeout();
 
@@ -182,7 +182,7 @@ protected:
    KLaunchRequest *lastRequest;
    TQPtrList<SlaveWaitRequest> mSlaveWaitRequest;
    TQString mPoolSocketName;
-   KServerSocket *mPoolSocket;
+   TDEServerSocket *mPoolSocket;
    TQPtrList<IdleSlave> mSlaveList;
    TQTimer mTimer;
    TQTimer mAutoTimer;