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

4 files changed, 9 insertions, 9 deletions

diff --git a/kverbos/kverbos/kverbos.cpp b/kverbos/kverbos/kverbos.cpp
index 1cccb42d..1691a529 100644
--- a/kverbos/kverbos/kverbos.cpp
+++ b/kverbos/kverbos/kverbos.cpp
@@ -283,7 +283,7 @@ void KVerbosApp::readOptions()
   automaticKFeeder = config->readBoolEntry("kfeederAutomatic", true);
 }
 
-void KVerbosApp::saveProperties(KConfig *_cfg)
+void KVerbosApp::saveProperties(TDEConfig *_cfg)
 {
   if(doc->URL().fileName()!=i18n("Untitled") && !doc->isModified())
   {
@@ -303,7 +303,7 @@ void KVerbosApp::saveProperties(KConfig *_cfg)
 }
 
 
-void KVerbosApp::readProperties(KConfig* _cfg)
+void KVerbosApp::readProperties(TDEConfig* _cfg)
 {
   TQString filename = _cfg->readPathEntry("filename");
   KURL url(filename);
diff --git a/kverbos/kverbos/kverbos.h b/kverbos/kverbos/kverbos.h
index 9b92f056..2325d482 100644
--- a/kverbos/kverbos/kverbos.h
+++ b/kverbos/kverbos/kverbos.h
@@ -49,7 +49,7 @@ class KFeederControl;
   * full session management as well as using KActions.
   * @see KMainWindow
   * @see TDEApplication
-  * @see KConfig
+  * @see TDEConfig
   *
   * @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team.
   * @version KDevelop version 1.2 code generation
@@ -116,12 +116,12 @@ class KVerbosApp : public KMainWindow
      * opened file by a temporary filename provided by TDEApplication.
      * @see KTMainWindow#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 KTMainWindow#readProperties
      */
-    virtual void readProperties(KConfig *_cfg);
+    virtual void readProperties(TDEConfig *_cfg);
 
   signals:
     /** Dieses Signal zeigt dem Dokument an, dass die Statuszeile mit der richtigen
@@ -194,7 +194,7 @@ class KVerbosApp : public KMainWindow
 
   private:
     /** the configuration object of the application */
-    KConfig *config;
+    TDEConfig *config;
     /** in this array are the times stored that should be learned
      */
     bool timeOptions[MAX_TIEMPOS][MAX_SUBTYPES];
diff --git a/kverbos/kverbos/kverbos.kcfg b/kverbos/kverbos/kverbos.kcfg
index 94b2cffc..3c28c9d8 100644
--- a/kverbos/kverbos/kverbos.kcfg
+++ b/kverbos/kverbos/kverbos.kcfg
@@ -8,7 +8,7 @@
     <entry name="UserLanguage" type="String">
       <label>The language selected by the user</label>
             <code>
-          	KConfigBase *globalConf = TDEGlobal::config();
+          	TDEConfigBase *globalConf = TDEGlobal::config();
     		globalConf->setGroup("Locale");
     		TQString m_language = globalConf->readEntry("Language", "en");
     		//keep only the first 2 characters
diff --git a/kverbos/kverbos/kverbosdoc.cpp b/kverbos/kverbos/kverbosdoc.cpp
index 3670b7db..2d820741 100644
--- a/kverbos/kverbos/kverbosdoc.cpp
+++ b/kverbos/kverbos/kverbosdoc.cpp
@@ -160,7 +160,7 @@ bool KVerbosDoc::openDocument(const KURL& url, const char *format /*=0*/)
 {
 	bool b = false;
 	TQString tmpfile;
-	KIO::NetAccess::download( url, tmpfile );
+	TDEIO::NetAccess::download( url, tmpfile );
 
 	TQFile file(url.path());
 	if ( file.open(IO_ReadOnly) ) {    // file opened successfully
@@ -205,7 +205,7 @@ bool KVerbosDoc::openDocument(const KURL& url, const char *format /*=0*/)
     emit changeView();
   };
 
-  KIO::NetAccess::removeTempFile( tmpfile );
+  TDEIO::NetAccess::removeTempFile( tmpfile );
 
   modified=false;
   emit anzahlVerbenGeaendert(getAnzahl());