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

6 files changed, 18 insertions, 18 deletions

diff --git a/quanta/utility/quantabookmarks.cpp b/quanta/utility/quantabookmarks.cpp
index e5329b8a..734220b8 100644
--- a/quanta/utility/quantabookmarks.cpp
+++ b/quanta/utility/quantabookmarks.cpp
@@ -241,7 +241,7 @@ int QuantaBookmarks::insertBookmarks(TQPopupMenu& menu, Document *doc, bool inse
 
 void QuantaBookmarks::bookmarkMenuAboutToShow()
 {
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   if (config->hasGroup("Kate View Defaults"))
   {
     config->setGroup("Kate View Defaults");
diff --git a/quanta/utility/quantacommon.cpp b/quanta/utility/quantacommon.cpp
index 4a1d61f5..e29c1013 100644
--- a/quanta/utility/quantacommon.cpp
+++ b/quanta/utility/quantacommon.cpp
@@ -714,7 +714,7 @@ bool QuantaCommon::checkOverwrite(const KURL& url, TQWidget *window)
   return result;
 }
 
-TQStringList QuantaCommon::readPathListEntry(KConfig *config, const TQString &pKey)
+TQStringList QuantaCommon::readPathListEntry(TDEConfig *config, const TQString &pKey)
 {
   TQStringList list = config->readPathListEntry(pKey);
   TQStringList::Iterator end = list.end();
@@ -730,7 +730,7 @@ TQStringList QuantaCommon::readPathListEntry(KConfig *config, const TQString &pK
   return list;
 }
 
-TQString QuantaCommon::readPathEntry(KConfig *config, const TQString &pKey)
+TQString QuantaCommon::readPathEntry(TDEConfig *config, const TQString &pKey)
 {
   TQString path = config->readPathEntry(pKey);
   KURL u = KURL::fromPathOrURL(path);
diff --git a/quanta/utility/quantacommon.h b/quanta/utility/quantacommon.h
index 91e08f57..586b7e50 100644
--- a/quanta/utility/quantacommon.h
+++ b/quanta/utility/quantacommon.h
@@ -35,7 +35,7 @@ class KStandardDirs;
 class TQWidget;
 class Tag;
 
-class KConfig;
+class TDEConfig;
 class KPopupMenu;
 
 /** Describes one abbreviation group */
@@ -196,20 +196,20 @@ pointer must be deleted by the caller!! */
   static bool checkOverwrite(const KURL& url, TQWidget *window);
 
   /**
-   * Same as KConfigBase::readPathListEntry, but resolves symlinks
+   * Same as TDEConfigBase::readPathListEntry, but resolves symlinks
    * @param config
    * @param pKey
    * @return
    */
-  static TQStringList readPathListEntry(KConfig *config, const TQString &pKey);
+  static TQStringList readPathListEntry(TDEConfig *config, const TQString &pKey);
 
     /**
-   * Same as KConfigBase::readPathEntry, but resolves symlinks
+   * Same as TDEConfigBase::readPathEntry, but resolves symlinks
    * @param config
    * @param pKey
    * @return
      */
-  static TQString readPathEntry(KConfig *config, const TQString &pKey);
+  static TQString readPathEntry(TDEConfig *config, const TQString &pKey);
 
   /**
    * Returns the HTML encoding string for character with the specified code.
diff --git a/quanta/utility/quantanetaccess.cpp b/quanta/utility/quantanetaccess.cpp
index 375f6f6d..6fa248eb 100644
--- a/quanta/utility/quantanetaccess.cpp
+++ b/quanta/utility/quantanetaccess.cpp
@@ -30,7 +30,7 @@
 
 bool QuantaNetAccess::upload(const TQString& src, const KURL& target, TQWidget* window, bool confirm)
 {
-  bool ok = KIO::NetAccess::upload(src, target, window);
+  bool ok = TDEIO::NetAccess::upload(src, target, window);
   if (ok) {
     checkProjectInsert(target, window, confirm);
   } else {
@@ -44,7 +44,7 @@ bool QuantaNetAccess::upload(const TQString& src, const KURL& target, TQWidget*
 bool QuantaNetAccess::file_copy( const KURL& src, const KURL& target, int permissions,
                                  bool overwrite, bool resume, TQWidget* window, bool confirm)
 {
-  bool ok = KIO::NetAccess::file_copy( src, target, permissions, overwrite, resume, window );
+  bool ok = TDEIO::NetAccess::file_copy( src, target, permissions, overwrite, resume, window );
   if (ok) {
     checkProjectInsert(target, window, confirm);
   } else {
@@ -68,7 +68,7 @@ bool QuantaNetAccess::file_move( const KURL& src, const KURL& target, int permis
   if ( !checkProjectRemove(src, window, confirm)) {
     return false;
   }
-  bool ok = KIO::NetAccess::file_move( src, target, permissions, overwrite, resume, window );
+  bool ok = TDEIO::NetAccess::file_move( src, target, permissions, overwrite, resume, window );
   if (ok) {
     checkProjectInsert(target, window, confirm);
   } else {
@@ -81,7 +81,7 @@ bool QuantaNetAccess::file_move( const KURL& src, const KURL& target, int permis
 
 bool QuantaNetAccess::dircopy( const KURL::List & srcList, const KURL & target, TQWidget* window, bool confirm )
 {
-  bool ok = KIO::NetAccess::dircopy( srcList, target, window );
+  bool ok = TDEIO::NetAccess::dircopy( srcList, target, window );
   if (ok) {
     KURL url;
     for ( KURL::List::ConstIterator it = srcList.begin(); it != srcList.end(); ++it ) {
@@ -124,7 +124,7 @@ bool QuantaNetAccess::move( const KURL::List& srcList, const KURL& target, TQWid
     if ( Project::ref()->projectBaseURL().isParentOf(*it) )
       Project::ref()->slotRemove(*it);
   }
-  bool ok = KIO::NetAccess::move( srcList, targetURL, window );
+  bool ok = TDEIO::NetAccess::move( srcList, targetURL, window );
   if (ok) {
     KURL url;
     for ( KURL::List::ConstIterator it = srcList.begin(); it != srcList.end(); ++it ) {
@@ -147,7 +147,7 @@ bool QuantaNetAccess::del( const KURL & url, TQWidget* window, bool confirm )
   if ( !checkProjectDel(url, window, confirm)) {
     return false;
   }
-  bool ok = KIO::NetAccess::del( url, window );
+  bool ok = TDEIO::NetAccess::del( url, window );
   if (!ok && confirm)
   {
       errorMsg(window);
@@ -160,7 +160,7 @@ bool QuantaNetAccess::mkdir( const KURL & url, TQWidget* window, int permissions
 {
   KURL u = url;
   u.adjustPath(-1); //some servers refuse to create directories ending with a slash
-  bool ok = KIO::NetAccess::mkdir( u, window, permissions );
+  bool ok = TDEIO::NetAccess::mkdir( u, window, permissions );
   if (ok) {
     checkProjectInsert(url, window, confirm);
   } else {
@@ -262,7 +262,7 @@ KURL QuantaNetAccess::adjustURL(const KURL &url)
 
 void QuantaNetAccess::errorMsg(TQWidget* window)
 {
-  TQString msg = KIO::NetAccess::lastErrorString();
+  TQString msg = TDEIO::NetAccess::lastErrorString();
   if ( !msg.isEmpty())
     KMessageBox::sorry(window, msg);
 }
diff --git a/quanta/utility/quantanetaccess.h b/quanta/utility/quantanetaccess.h
index 39798354..450db7d2 100644
--- a/quanta/utility/quantanetaccess.h
+++ b/quanta/utility/quantanetaccess.h
@@ -19,7 +19,7 @@
 
 /** @short helperclass to track changes in the project
 
-    This class be used as replacement of KIO::NetAccess (look there for details).
+    This class be used as replacement of TDEIO::NetAccess (look there for details).
     Every possible impact on the project will be monitored and signaled to the project.
 
     If you don't want user interaction use the extra parameter confirm
diff --git a/quanta/utility/tagactionset.cpp b/quanta/utility/tagactionset.cpp
index 22ba46d5..58af9c65 100644
--- a/quanta/utility/tagactionset.cpp
+++ b/quanta/utility/tagactionset.cpp
@@ -186,7 +186,7 @@ void TagActionSet::slotApplySourceIndentation()
     QuantaView* view = ViewManager::ref()->activeView();
     NodeModifsSet *modifs = new NodeModifsSet();
 
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup("Kate Document Defaults");
     int indentationWidth = config->readNumEntry("Indentation Width", 4);