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

8 files changed, 43 insertions, 43 deletions

diff --git a/lskat/lskat/KRSocket.cpp b/lskat/lskat/KRSocket.cpp
index 0950385a..9b904ac3 100644
--- a/lskat/lskat/KRSocket.cpp
+++ b/lskat/lskat/KRSocket.cpp
@@ -345,7 +345,7 @@ void KRServerSocket::slotAccept( int )
       return;
     }
 
-    emit accepted( new KSocket( new_sock ) );
+    emit accepted( new TDESocket( new_sock ) );
   }
   else if ( domain == PF_UNIX )
   {
@@ -360,7 +360,7 @@ void KRServerSocket::slotAccept( int )
       return;
     }
 
-    emit accepted( new KSocket( new_sock ) );
+    emit accepted( new TDESocket( new_sock ) );
   }
 }
 
diff --git a/lskat/lskat/KRSocket.h b/lskat/lskat/KRSocket.h
index 522ddf61..83969a4d 100644
--- a/lskat/lskat/KRSocket.h
+++ b/lskat/lskat/KRSocket.h
@@ -59,10 +59,10 @@ class KRServerSocketPrivate;
  * Monitor a port for incoming TCP/IP connections.
  *
  * You can use a KRServerSocket to listen on a port for incoming
- * connections. When a connection arrived in the port, a KSocket
+ * connections. When a connection arrived in the port, a TDESocket
  * is created and the signal accepted is raised. Make sure you
  * always connect to this signal. If you dont the ServerSocket will
- * create new KSocket's and no one will delete them!
+ * create new TDESocket's and no one will delete them!
  *
  * If socket() is -1 or less the socket was not created properly.
  *
@@ -117,9 +117,9 @@ public slots:
 signals:
     /**
      * A connection has been accepted.
-     * It is your task to delete the KSocket if it is no longer needed.
+     * It is your task to delete the TDESocket if it is no longer needed.
      */
-    void accepted( KSocket* );
+    void accepted( TDESocket* );
 
 protected:
     bool init( short unsigned int );
diff --git a/lskat/lskat/KRemoteConnect.cpp b/lskat/lskat/KRemoteConnect.cpp
index 315d2a96..b8f0d197 100644
--- a/lskat/lskat/KRemoteConnect.cpp
+++ b/lskat/lskat/KRemoteConnect.cpp
@@ -104,19 +104,19 @@ bool tryserver;
   tryserver=false;
   if (!IP.isEmpty())
   {
-    kSocket=new KSocket(IP.latin1(),port);
+    kSocket=new TDESocket(IP.latin1(),port);
     if (!kSocket) return false;
     if (kSocket->socket()!=-1) // success
     {
       kSocket->enableRead(TRUE);
       //kSocket->enableWrite(TRUE);
-      connect(kSocket,TQT_SIGNAL(closeEvent(KSocket *)),
-            this,TQT_SLOT(socketClosed(KSocket *)));
-      connect(kSocket,TQT_SIGNAL(readEvent(KSocket *)),
-            this,TQT_SLOT(socketRead(KSocket *)));
+      connect(kSocket,TQT_SIGNAL(closeEvent(TDESocket *)),
+            this,TQT_SLOT(socketClosed(TDESocket *)));
+      connect(kSocket,TQT_SIGNAL(readEvent(TDESocket *)),
+            this,TQT_SLOT(socketRead(TDESocket *)));
       /*
-      connect(kSocket,TQT_SIGNAL(writeEvent(KSocket *)),
-            this,TQT_SLOT(socketWrite(KSocket *)));
+      connect(kSocket,TQT_SIGNAL(writeEvent(TDESocket *)),
+            this,TQT_SLOT(socketWrite(TDESocket *)));
       */
       /*
       printf("Socket(%d) %p connection built to a server\n",
@@ -187,12 +187,12 @@ bool KRemoteConnect::OfferServerSocket()
   printf("Offering socket and publishing stuff\n");
   service = new DNSSD::PublicService(Name,LSKAT_SERVICE,port);
   service->publishAsync();
-  connect(kServerSocket,TQT_SIGNAL(accepted(KSocket *)),
-        this,TQT_SLOT(socketRequest(KSocket *)));
+  connect(kServerSocket,TQT_SIGNAL(accepted(TDESocket *)),
+        this,TQT_SLOT(socketRequest(TDESocket *)));
 
   return true;
 }
-void KRemoteConnect::socketRequest(KSocket *sock)
+void KRemoteConnect::socketRequest(TDESocket *sock)
 {
   if (kSocket) // already connected
   {
@@ -206,13 +206,13 @@ void KRemoteConnect::socketRequest(KSocket *sock)
   {
     kSocket->enableRead(TRUE);
     //kSocket->enableWrite(TRUE);
-    connect(kSocket,TQT_SIGNAL(closeEvent(KSocket *)),
-          this,TQT_SLOT(socketClosed(KSocket *)));
-    connect(kSocket,TQT_SIGNAL(readEvent(KSocket *)),
-          this,TQT_SLOT(socketRead(KSocket *)));
+    connect(kSocket,TQT_SIGNAL(closeEvent(TDESocket *)),
+          this,TQT_SLOT(socketClosed(TDESocket *)));
+    connect(kSocket,TQT_SIGNAL(readEvent(TDESocket *)),
+          this,TQT_SLOT(socketRead(TDESocket *)));
     /*
-    connect(kSocket,TQT_SIGNAL(writeEvent(KSocket *)),
-          this,TQT_SLOT(socketWrite(KSocket *)));
+    connect(kSocket,TQT_SIGNAL(writeEvent(TDESocket *)),
+          this,TQT_SLOT(socketWrite(TDESocket *)));
     */
     socketStatus=KR_SERVER;
     delete kServerSocket; // no more connections
@@ -228,7 +228,7 @@ void KRemoteConnect::socketRequest(KSocket *sock)
   }
 }
 
-void KRemoteConnect::socketClosed(KSocket *sock)
+void KRemoteConnect::socketClosed(TDESocket *sock)
 {
   delete sock;
   kSocket=0;
@@ -238,7 +238,7 @@ void KRemoteConnect::socketClosed(KSocket *sock)
   emit signalReceiveMsg(msg,QueryID());
   delete msg;
 }
-void KRemoteConnect::socketRead(KSocket *sock)
+void KRemoteConnect::socketRead(TDESocket *sock)
 {
   ssize_t buflen;
   TQString s;
@@ -288,7 +288,7 @@ void KRemoteConnect::socketRead(KSocket *sock)
 }
 
 
-void KRemoteConnect::socketWrite(KSocket *)
+void KRemoteConnect::socketWrite(TDESocket *)
 {
  // printf("wrtie input on socket %p\n",sock);
 }
diff --git a/lskat/lskat/KRemoteConnect.h b/lskat/lskat/KRemoteConnect.h
index 98d5c19b..99e27b12 100644
--- a/lskat/lskat/KRemoteConnect.h
+++ b/lskat/lskat/KRemoteConnect.h
@@ -33,7 +33,7 @@ class KRemoteConnect: public KChildConnect
 
   protected:
   KRServerSocket *kServerSocket;
-  KSocket *kSocket;
+  TDESocket *kSocket;
   TQString IP;
   TQString Name;
   ushort port;
@@ -60,10 +60,10 @@ class KRemoteConnect: public KChildConnect
   bool OfferServerSocket();
 
   protected slots:
-   void socketClosed(KSocket *sock);
-   void socketRead(KSocket *sock);
-   void socketWrite(KSocket *sock);
-   void socketRequest(KSocket *sock);
+   void socketClosed(TDESocket *sock);
+   void socketRead(TDESocket *sock);
+   void socketWrite(TDESocket *sock);
+   void socketRequest(TDESocket *sock);
 
 
 
diff --git a/lskat/lskat/lskat.cpp b/lskat/lskat/lskat.cpp
index 316d9f50..c2cc4392 100644
--- a/lskat/lskat/lskat.cpp
+++ b/lskat/lskat/lskat.cpp
@@ -287,7 +287,7 @@ LSkatDoc *LSkatApp::getDocument() const
   return doc;
 }
 
-void LSkatApp::saveProperties(KConfig *_cfg)
+void LSkatApp::saveProperties(TDEConfig *_cfg)
 {
   if(doc->getTitle()!=i18n("Untitled") && !doc->isModified())
   {
@@ -305,7 +305,7 @@ void LSkatApp::saveProperties(KConfig *_cfg)
 }
 
 
-void LSkatApp::readProperties(KConfig* _cfg)
+void LSkatApp::readProperties(TDEConfig* _cfg)
 {
   TQString filename = _cfg->readPathEntry("filename");
   bool modified = _cfg->readBoolEntry("modified", false);
diff --git a/lskat/lskat/lskat.h b/lskat/lskat/lskat.h
index 85b2a4c4..1c29845c 100644
--- a/lskat/lskat/lskat.h
+++ b/lskat/lskat/lskat.h
@@ -60,7 +60,7 @@ class LSkatView;
   * full session management as well as keyboard accelerator configuration by using KAccel.
   * @see KMainWindow
   * @see TDEApplication
-  * @see KConfig
+  * @see TDEConfig
   * @see KAccel
   *
   * @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team.
@@ -139,12 +139,12 @@ class LSkatApp : public KMainWindow
      * opened file by a temporary filename provided by TDEApplication.
      * @see KMainWindow#saveProperties
      */
-    virtual void saveProperties(KConfig *_cfg);
+    virtual void saveProperties(TDEConfig *_cfg);
     /** reads the session config file and restores the application's state including the last opened files and documents by reading the
      * temporary files saved by saveProperties()
      * @see KMainWindow#readProperties
      */
-    virtual void readProperties(KConfig *_cfg);
+    virtual void readProperties(TDEConfig *_cfg);
 
   public slots:
     void slotPrepareProcessMove(KEMessage *msg);
@@ -204,7 +204,7 @@ protected: // Protected attributes
     TQStrList recentFiles;
 
     /** the configuration object of the application */
-    KConfig *config;
+    TDEConfig *config;
 
     LSkatView *view;
     /** doc represents your actual document and is created only once. It keeps
diff --git a/lskat/lskat/lskatdoc.cpp b/lskat/lskat/lskatdoc.cpp
index 03cc5b90..6862599b 100644
--- a/lskat/lskat/lskatdoc.cpp
+++ b/lskat/lskat/lskatdoc.cpp
@@ -162,7 +162,7 @@ void LSkatDoc::closeDocument()
   deleteContents();
 }
 
-bool LSkatDoc::newDocument(KConfig * /*config*/,TQString path)
+bool LSkatDoc::newDocument(TDEConfig * /*config*/,TQString path)
 {
   int res;
   modified=false;
@@ -729,9 +729,9 @@ void LSkatDoc::ClearStats()
     stat_brk[j]=0;
   }
 }
-void LSkatDoc::ReadConfig(KConfig *config)
+void LSkatDoc::ReadConfig(TDEConfig *config)
 {
-  KConfig emailCfg( "emaildefaults", true );
+  TDEConfig emailCfg( "emaildefaults", true );
   emailCfg.setGroup( "UserInfo" );
   TQString name = emailCfg.readEntry( "FullName" );
   if ( name.isEmpty() )
@@ -782,7 +782,7 @@ void LSkatDoc::ReadConfig(KConfig *config)
 }
 
 /** write config file */
-void LSkatDoc::WriteConfig(KConfig *config)
+void LSkatDoc::WriteConfig(TDEConfig *config)
 {
   config->setGroup("Parameter");
   config->writeEntry("host",host);
diff --git a/lskat/lskat/lskatdoc.h b/lskat/lskat/lskatdoc.h
index 190c0daf..48057a40 100644
--- a/lskat/lskat/lskatdoc.h
+++ b/lskat/lskat/lskatdoc.h
@@ -67,7 +67,7 @@ class LSkatDoc : public TQObject
     /** deletes the document's contents */
     void deleteContents();
     /** initializes the document generally */
-    bool newDocument(KConfig *config,TQString path);
+    bool newDocument(TDEConfig *config,TQString path);
     /** closes the acutal document */
     void closeDocument();
     /** loads the document by filename and format and emits the updateViews() signal */
@@ -134,8 +134,8 @@ class LSkatDoc : public TQObject
    int GetStatAborted(int no);
    int GetStatPoints(int no);
 
-   void WriteConfig(KConfig *config);
-   void ReadConfig(KConfig *config);
+   void WriteConfig(TDEConfig *config);
+   void ReadConfig(TDEConfig *config);
    
    void SetInputHandler(KEInput *i);
    KEInput *QueryInputHandler();