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

3 files changed, 6 insertions, 6 deletions

diff --git a/kuiviewer/kuiviewer.cpp b/kuiviewer/kuiviewer.cpp
index f2ae01cb..99797f91 100644
--- a/kuiviewer/kuiviewer.cpp
+++ b/kuiviewer/kuiviewer.cpp
@@ -101,14 +101,14 @@ void KUIViewer::setupActions()
     KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
 }
 
-void KUIViewer::saveProperties(KConfig* /*config*/)
+void KUIViewer::saveProperties(TDEConfig* /*config*/)
 {
     // the 'config' object points to the session managed
     // config file.  anything you write here will be available
     // later when this app is restored
 }
 
-void KUIViewer::readProperties(KConfig* /*config*/)
+void KUIViewer::readProperties(TDEConfig* /*config*/)
 {
     // the 'config' object points to the session managed
     // config file.  this function is automatically called whenever
diff --git a/kuiviewer/kuiviewer.h b/kuiviewer/kuiviewer.h
index 09e43358..7ac3ed9a 100644
--- a/kuiviewer/kuiviewer.h
+++ b/kuiviewer/kuiviewer.h
@@ -79,14 +79,14 @@ protected:
      * This method is called when it is time for the app to save its
      * properties for session management purposes.
      */
-    void saveProperties(KConfig *);
+    void saveProperties(TDEConfig *);
 
     /**
-     * This method is called when this app is restored.  The KConfig
+     * This method is called when this app is restored.  The TDEConfig
      * object points to the session management config file that was saved
      * with @ref saveProperties
      */
-    void readProperties(KConfig *);
+    void readProperties(TDEConfig *);
 
 private slots:
     void fileOpen();
diff --git a/kuiviewer/kuiviewer_part.cpp b/kuiviewer/kuiviewer_part.cpp
index ef00120a..b14d2412 100644
--- a/kuiviewer/kuiviewer_part.cpp
+++ b/kuiviewer/kuiviewer_part.cpp
@@ -153,7 +153,7 @@ bool KUIViewerPart::openURL( const KURL& url)
 
     m_url = url;
     m_file = TQString();
-    if (KIO::NetAccess::download(url, m_file))
+    if (TDEIO::NetAccess::download(url, m_file))
 	return openFile();
     else
 	return false;