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

15 files changed, 18 insertions, 18 deletions

diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp
index 6dbde4a7e..d170f6c76 100644
--- a/kate/app/kateapp.cpp
+++ b/kate/app/kateapp.cpp
@@ -32,7 +32,7 @@
 #include <tdeversion.h>
 #include <kcmdlineargs.h>
 #include <dcopclient.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <twin.h>
 #include <ktip.h>
 #include <kdebug.h>
diff --git a/kate/app/katedocmanager.cpp b/kate/app/katedocmanager.cpp
index 9b9a223d0..178e63d07 100644
--- a/kate/app/katedocmanager.cpp
+++ b/kate/app/katedocmanager.cpp
@@ -34,12 +34,12 @@
 
 #include <klocale.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klibloader.h>
 #include <kmdcodec.h>
 #include <kmessagebox.h>
 #include <kencodingfiledialog.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <twin.h>
 
 #include <tqdatetime.h>
diff --git a/kate/app/kateexternaltools.cpp b/kate/app/kateexternaltools.cpp
index 1ceab8a23..78cf6b6fd 100644
--- a/kate/app/kateexternaltools.cpp
+++ b/kate/app/kateexternaltools.cpp
@@ -38,7 +38,7 @@
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <kmimetypechooser.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <krun.h>
 #include <kicondialog.h>
 #include <kpopupmenu.h>
diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp
index f956c9ea5..7ddd1b7b1 100644
--- a/kate/app/katefilelist.cpp
+++ b/kate/app/katefilelist.cpp
@@ -39,7 +39,7 @@
 #include <tqwhatsthis.h>
 
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kglobalsettings.h>
 #include <kpassivepopup.h>
diff --git a/kate/app/katefileselector.cpp b/kate/app/katefileselector.cpp
index 0482b2739..beeed2082 100644
--- a/kate/app/katefileselector.cpp
+++ b/kate/app/katefileselector.cpp
@@ -53,7 +53,7 @@
 #include <kurlcompletion.h>
 #include <kprotocolinfo.h>
 #include <kdiroperator.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kcombobox.h>
 #include <kaction.h>
@@ -66,7 +66,7 @@
 //END Includes
 
 //BEGIN Toolbar
- // from kfiledialog.cpp - avoid qt warning in STDERR (~/.xsessionerrors)
+ // from tdefiledialog.cpp - avoid qt warning in STDERR (~/.xsessionerrors)
 static void silenceQToolBar(TQtMsgType, const char *){}
 
 // helper classes to be able to have a toolbar without move handle
diff --git a/kate/app/katefileselector.h b/kate/app/katefileselector.h
index 7a6f9c728..8028b3ede 100644
--- a/kate/app/katefileselector.h
+++ b/kate/app/katefileselector.h
@@ -26,7 +26,7 @@
 #include <kate/document.h>
 
 #include <tqvbox.h>
-#include <kfile.h>
+#include <tdefile.h>
 #include <kurl.h>
 #include <ktoolbar.h>
 #include <tqframe.h>
diff --git a/kate/app/kategrepdialog.cpp b/kate/app/kategrepdialog.cpp
index 627fe47dd..bd2e82749 100644
--- a/kate/app/kategrepdialog.cpp
+++ b/kate/app/kategrepdialog.cpp
@@ -34,7 +34,7 @@
 #include <kapplication.h>
 #include <kaccelmanager.h>
 #include <kbuttonbox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kprocess.h>
 #include <kapplication.h>
 #include <klocale.h>
diff --git a/kate/app/katemain.cpp b/kate/app/katemain.cpp
index f5dd1ea5c..e53c07910 100644
--- a/kate/app/katemain.cpp
+++ b/kate/app/katemain.cpp
@@ -24,7 +24,7 @@
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kinstance.h>
 #include <kstartupinfo.h>
 #include <dcopclient.h>
diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp
index 953a5f313..aa8aaedb9 100644
--- a/kate/app/katemainwindow.cpp
+++ b/kate/app/katemainwindow.cpp
@@ -53,7 +53,7 @@
 #include <kdiroperator.h>
 #include <kdockwidget.h>
 #include <kedittoolbar.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobalaccel.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp
index 874639652..8a001cdeb 100644
--- a/kate/app/katemdi.cpp
+++ b/kate/app/katemdi.cpp
@@ -29,7 +29,7 @@
 #include <kglobalsettings.h>
 #include <kapplication.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kpopupmenu.h>
 #include <kmessagebox.h>
diff --git a/kate/app/katepluginmanager.cpp b/kate/app/katepluginmanager.cpp
index 044cb73aa..4fe15d4f4 100644
--- a/kate/app/katepluginmanager.cpp
+++ b/kate/app/katepluginmanager.cpp
@@ -26,7 +26,7 @@
 
 #include "../interfaces/application.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqstringlist.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
diff --git a/kate/app/kateviewspace.cpp b/kate/app/kateviewspace.cpp
index e8ba58ee5..1d37c6f1d 100644
--- a/kate/app/kateviewspace.cpp
+++ b/kate/app/kateviewspace.cpp
@@ -30,7 +30,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <ksqueezedtextlabel.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <tqwidgetstack.h>
diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp
index 6fca303bb..e9854c081 100644
--- a/kate/app/kwritemain.cpp
+++ b/kate/app/kwritemain.cpp
@@ -32,7 +32,7 @@
 #include <tdetexteditor/editorchooser.h>
 #include <tdetexteditor/popupmenuinterface.h>
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <tdeversion.h>
 #include <dcopclient.h>
@@ -49,7 +49,7 @@
 #include <kapplication.h>
 #include <klocale.h>
 #include <kurl.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcmdlineargs.h>
 #include <kmessagebox.h>
 #include <kkeydialog.h>
diff --git a/kate/data/CMakeLists.txt b/kate/data/CMakeLists.txt
index fb4b28d03..b81ead948 100644
--- a/kate/data/CMakeLists.txt
+++ b/kate/data/CMakeLists.txt
@@ -15,5 +15,5 @@ install( FILES kateplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 install( FILES kate.desktop kwrite.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 install( FILES kateui.rc externaltools tips DESTINATION ${DATA_INSTALL_DIR}/kate )
 install( FILES kwriteui.rc DESTINATION ${DATA_INSTALL_DIR}/kwrite )
-install( FILES kate-2.4.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
+install( FILES kate-2.4.upd DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update )
 install( FILES katerc DESTINATION ${CONFIG_INSTALL_DIR} )
diff --git a/kate/data/Makefile.am b/kate/data/Makefile.am
index 77bba0d1d..149406426 100644
--- a/kate/data/Makefile.am
+++ b/kate/data/Makefile.am
@@ -12,7 +12,7 @@ rckwrite_DATA = kwriteui.rc
 tipdir = $(kde_datadir)/kate
 tip_DATA = tips
 
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 update_DATA = kate-2.4.upd
 
 kde_conf_DATA = katerc