Rename a number of libraries and executables to avoid conflicts with KDE4

23 files changed, 51 insertions, 51 deletions

diff --git a/kate/data/bash.xml b/kate/data/bash.xml
index 84c91596d..e3bc4abdd 100644
--- a/kate/data/bash.xml
+++ b/kate/data/bash.xml
@@ -439,7 +439,7 @@
       <!-- others -->
       <item> dcop </item>
       <item> kdialog </item>
-      <item> kfile </item>
+      <item> tdefile </item>
       <item> xhost </item>
       <item> xmodmap </item>
       <item> xset </item>
diff --git a/kate/data/tcsh.xml b/kate/data/tcsh.xml
index f9dffa2e4..19c94beaa 100644
--- a/kate/data/tcsh.xml
+++ b/kate/data/tcsh.xml
@@ -431,7 +431,7 @@
       <!-- others -->
       <item> dcop </item>
       <item> kdialog </item>
-      <item> kfile </item>
+      <item> tdefile </item>
       <item> xhost </item>
       <item> xmodmap </item>
       <item> xset </item>
diff --git a/kate/data/zsh.xml b/kate/data/zsh.xml
index 5d0575ab9..e69c15354 100644
--- a/kate/data/zsh.xml
+++ b/kate/data/zsh.xml
@@ -497,7 +497,7 @@
       <!-- others -->
       <item> dcop </item>
       <item> kdialog </item>
-      <item> kfile </item>
+      <item> tdefile </item>
       <item> xhost </item>
       <item> xmodmap </item>
       <item> xset </item>
diff --git a/kate/interfaces/katecmd.cpp b/kate/interfaces/katecmd.cpp
index 69263b57c..2104ef157 100644
--- a/kate/interfaces/katecmd.cpp
+++ b/kate/interfaces/katecmd.cpp
@@ -118,7 +118,7 @@ const TQString KateCmd::fromHistory( uint index ) const
 //BEGIN KateCmdShellCompletion
 /*
    A lot of the code in the below class is copied from
-   tdelibs/kio/kio/kshellcompletion.cpp
+   tdelibs/tdeio/tdeio/kshellcompletion.cpp
    Copyright (C) 2000 David Smith <dsmith@algonet.se>
    Copyright (C) 2004 Anders Lund <anders@alweb.dk>
 */
diff --git a/kate/part/CMakeLists.txt b/kate/part/CMakeLists.txt
index 72ac36f8a..dcbc0eecd 100644
--- a/kate/part/CMakeLists.txt
+++ b/kate/part/CMakeLists.txt
@@ -21,9 +21,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdefx
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
   ${CMAKE_SOURCE_DIR}/kjs
   ${CMAKE_SOURCE_DIR}/tdeutils
   ${CMAKE_SOURCE_DIR}/tdeprint
diff --git a/kate/part/kateconfig.cpp b/kate/part/kateconfig.cpp
index 81b001c3c..d1c9fd1ee 100644
--- a/kate/part/kateconfig.cpp
+++ b/kate/part/kateconfig.cpp
@@ -28,7 +28,7 @@
 #include <math.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobalsettings.h>
 #include <kcharsets.h>
 #include <klocale.h>
diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp
index 43f5977d8..5006ddd6c 100644
--- a/kate/part/katedialogs.cpp
+++ b/kate/part/katedialogs.cpp
@@ -38,9 +38,9 @@
 #include <tdetexteditor/configinterfaceextension.h>
 #include <tdetexteditor/plugin.h>
 
-#include <kio/job.h>
-#include <kio/jobclasses.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/netaccess.h>
 
 #include <kaccel.h>
 #include <kapplication.h>
@@ -50,7 +50,7 @@
 #include <kcolorcombo.h>
 #include <kcolordialog.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kfontdialog.h>
 #include <kglobal.h>
diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp
index 03c8ac638..74e5c3225 100644
--- a/kate/part/katedocument.cpp
+++ b/kate/part/katedocument.cpp
@@ -42,9 +42,9 @@
 #include "katetemplatehandler.h"
 #include <tdetexteditor/plugin.h>
 
-#include <kio/job.h>
-#include <kio/netaccess.h>
-#include <kio/kfileitem.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/tdefileitem.h>
 
 
 #include <tdeparts/event.h>
@@ -53,8 +53,8 @@
 #include <kglobal.h>
 #include <kapplication.h>
 #include <kpopupmenu.h>
-#include <kconfig.h>
-#include <kfiledialog.h>
+#include <tdeconfig.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kstdaction.h>
 #include <kiconloader.h>
@@ -1924,13 +1924,13 @@ void KateDocument::writeConfig()
   config->sync();
 }
 
-void KateDocument::readSessionConfig(TDEConfig *kconfig)
+void KateDocument::readSessionConfig(TDEConfig *tdeconfig)
 {
   // restore the url
-  KURL url (kconfig->readEntry("URL"));
+  KURL url (tdeconfig->readEntry("URL"));
 
   // get the encoding
-  TQString tmpenc=kconfig->readEntry("Encoding");
+  TQString tmpenc=tdeconfig->readEntry("Encoding");
   if (!tmpenc.isEmpty() && (tmpenc != encoding()))
     setEncoding(tmpenc);
 
@@ -1939,34 +1939,34 @@ void KateDocument::readSessionConfig(TDEConfig *kconfig)
     openURL (url);
 
   // restore the hl stuff
-  m_buffer->setHighlight(KateHlManager::self()->nameFind(kconfig->readEntry("Highlighting")));
+  m_buffer->setHighlight(KateHlManager::self()->nameFind(tdeconfig->readEntry("Highlighting")));
 
   if (hlMode() > 0)
     hlSetByUser = true;
 
   // indent mode
-  config()->setIndentationMode( (uint)kconfig->readNumEntry("Indentation Mode", config()->indentationMode() ) );
+  config()->setIndentationMode( (uint)tdeconfig->readNumEntry("Indentation Mode", config()->indentationMode() ) );
 
   // Restore Bookmarks
-  TQValueList<int> marks = kconfig->readIntListEntry("Bookmarks");
+  TQValueList<int> marks = tdeconfig->readIntListEntry("Bookmarks");
   for( uint i = 0; i < marks.count(); i++ )
     addMark( marks[i], KateDocument::markType01 );
 }
 
-void KateDocument::writeSessionConfig(TDEConfig *kconfig)
+void KateDocument::writeSessionConfig(TDEConfig *tdeconfig)
 {
   if ( m_url.isLocalFile() && !TDEGlobal::dirs()->relativeLocation("tmp", m_url.path()).startsWith("/"))
        return;
   // save url
-  kconfig->writeEntry("URL", m_url.prettyURL() );
+  tdeconfig->writeEntry("URL", m_url.prettyURL() );
 
   // save encoding
-  kconfig->writeEntry("Encoding",encoding());
+  tdeconfig->writeEntry("Encoding",encoding());
 
   // save hl
-  kconfig->writeEntry("Highlighting", highlight()->name());
+  tdeconfig->writeEntry("Highlighting", highlight()->name());
 
-  kconfig->writeEntry("Indentation Mode", config()->indentationMode() );
+  tdeconfig->writeEntry("Indentation Mode", config()->indentationMode() );
 
   // Save Bookmarks
   TQValueList<int> marks;
@@ -1975,7 +1975,7 @@ void KateDocument::writeSessionConfig(TDEConfig *kconfig)
        ++it )
      marks << it.current()->line;
 
-  kconfig->writeEntry( "Bookmarks", marks );
+  tdeconfig->writeEntry( "Bookmarks", marks );
 }
 
 void KateDocument::configDialog()
diff --git a/kate/part/katefiletype.cpp b/kate/part/katefiletype.cpp
index a00d39bfb..15dd7c9f6 100644
--- a/kate/part/katefiletype.cpp
+++ b/kate/part/katefiletype.cpp
@@ -25,7 +25,7 @@
 #include "kateview.h"
 #include "katefactory.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmimemagic.h>
 #include <kmimetype.h>
 #include <kmimetypechooser.h>
diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp
index 08da7e97f..f06518649 100644
--- a/kate/part/katehighlight.cpp
+++ b/kate/part/katehighlight.cpp
@@ -32,7 +32,7 @@
 #include "kateschema.h"
 #include "kateconfig.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kinstance.h>
 #include <kmimetype.h>
diff --git a/kate/part/katehighlight.h b/kate/part/katehighlight.h
index 1b71e454a..8ff5e31b2 100644
--- a/kate/part/katehighlight.h
+++ b/kate/part/katehighlight.h
@@ -26,7 +26,7 @@
 
 #include "../interfaces/document.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqptrlist.h>
 #include <tqvaluelist.h>
diff --git a/kate/part/katejscript.cpp b/kate/part/katejscript.cpp
index 28b22c74e..f3a5cd548 100644
--- a/kate/part/katejscript.cpp
+++ b/kate/part/katejscript.cpp
@@ -37,7 +37,7 @@
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <kjs/function_object.h>
 #include <kjs/interpreter.h>
@@ -688,7 +688,7 @@ void KateJScriptManager::collectScripts (bool force)
         TDEConfig df (desktopFile, true, false);
         df.setDesktopGroup ();
 
-        // get cmdname, fallback to baseName, if it is empty, therefor not use the kconfig fallback
+        // get cmdname, fallback to baseName, if it is empty, therefor not use the tdeconfig fallback
         TQString cmdname = df.readEntry ("X-Kate-Command");
         if (cmdname.isEmpty())
         {
diff --git a/kate/part/kateluaindentscript.cpp b/kate/part/kateluaindentscript.cpp
index c06f3864e..46cf531a7 100644
--- a/kate/part/kateluaindentscript.cpp
+++ b/kate/part/kateluaindentscript.cpp
@@ -31,7 +31,7 @@
 #include <tqfileinfo.h>
 #include <kstandarddirs.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 
diff --git a/kate/part/kateschema.h b/kate/part/kateschema.h
index f6eb8ef60..2e92812de 100644
--- a/kate/part/kateschema.h
+++ b/kate/part/kateschema.h
@@ -29,7 +29,7 @@
 #include <tqlistview.h>
 #include <tqfont.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaction.h>
 
 class KateView;
@@ -53,7 +53,7 @@ class KateSchemaManager
     void update (bool readfromfile = true);
 
     /**
-     * return kconfig with right group set or set to Normal if not there
+     * return tdeconfig with right group set or set to Normal if not there
      */
     TDEConfig *schema (uint number);
 
diff --git a/kate/part/katesyntaxdocument.cpp b/kate/part/katesyntaxdocument.cpp
index 4093f8722..d90f5de73 100644
--- a/kate/part/katesyntaxdocument.cpp
+++ b/kate/part/katesyntaxdocument.cpp
@@ -27,7 +27,7 @@
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqfile.h>
 
diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp
index 193f411fd..22a4799d6 100644
--- a/kate/part/kateview.cpp
+++ b/kate/part/kateview.cpp
@@ -50,9 +50,9 @@
 
 #include <tdeparts/event.h>
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurldrag.h>
 #include <kdebug.h>
 #include <kapplication.h>
diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp
index 4f2ef26a5..1463c8bcd 100644
--- a/kate/part/test_regression.cpp
+++ b/kate/part/test_regression.cpp
@@ -42,7 +42,7 @@
 #include <kaction.h>
 #include <kcmdlineargs.h>
 #include "katefactory.h"
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kmainwindow.h>
 #include <ksimpleconfig.h>
 #include <kglobalsettings.h>
diff --git a/kate/plugins/autobookmarker/autobookmarker.cpp b/kate/plugins/autobookmarker/autobookmarker.cpp
index ceb76eedd..cf3190c4e 100644
--- a/kate/plugins/autobookmarker/autobookmarker.cpp
+++ b/kate/plugins/autobookmarker/autobookmarker.cpp
@@ -30,7 +30,7 @@
 
 #include <kaction.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kgenericfactory.h>
 #include <kiconloader.h>
 #include <klistview.h>
diff --git a/kate/plugins/insertfile/CMakeLists.txt b/kate/plugins/insertfile/CMakeLists.txt
index 0c80a1e0c..56bdfd9cd 100644
--- a/kate/plugins/insertfile/CMakeLists.txt
+++ b/kate/plugins/insertfile/CMakeLists.txt
@@ -16,9 +16,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
   ${CMAKE_SOURCE_DIR}/interfaces
 )
 
diff --git a/kate/plugins/insertfile/insertfileplugin.cpp b/kate/plugins/insertfile/insertfileplugin.cpp
index ee46a7cff..aa9f998b6 100644
--- a/kate/plugins/insertfile/insertfileplugin.cpp
+++ b/kate/plugins/insertfile/insertfileplugin.cpp
@@ -24,9 +24,9 @@
 #include <tdetexteditor/editinterface.h>
 
 #include <assert.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kaction.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kgenericfactory.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kate/plugins/isearch/ISearchPlugin.cpp b/kate/plugins/isearch/ISearchPlugin.cpp
index 26c49576d..de1c1c376 100644
--- a/kate/plugins/isearch/ISearchPlugin.cpp
+++ b/kate/plugins/isearch/ISearchPlugin.cpp
@@ -24,7 +24,7 @@
 #include <klocale.h>
 #include <kaction.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include "ISearchPlugin.h"
diff --git a/kate/plugins/kdatatool/CMakeLists.txt b/kate/plugins/kdatatool/CMakeLists.txt
index 1adced175..7ceccc10d 100644
--- a/kate/plugins/kdatatool/CMakeLists.txt
+++ b/kate/plugins/kdatatool/CMakeLists.txt
@@ -17,8 +17,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdefx
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
   ${CMAKE_SOURCE_DIR}/interfaces
 )
 
diff --git a/kate/plugins/wordcompletion/docwordcompletion.cpp b/kate/plugins/wordcompletion/docwordcompletion.cpp
index a468edd13..fbd5a4db7 100644
--- a/kate/plugins/wordcompletion/docwordcompletion.cpp
+++ b/kate/plugins/wordcompletion/docwordcompletion.cpp
@@ -34,7 +34,7 @@
 #include <tdetexteditor/variableinterface.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <kgenericfactory.h>
 #include <klocale.h>