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

25 files changed, 47 insertions, 47 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9587a94..3a949b4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -54,7 +54,7 @@ tde_add_executable( tdesvnaskpass AUTOMOC
 
 tde_add_executable( tdesvn AUTOMOC
   SOURCES main.cpp tdesvn.cpp urldlg.cpp commandline.cpp
-  LINK tdecore-shared tdeui-shared tdeparts-shared DCOP-shared kio-shared
+  LINK tdecore-shared tdeui-shared tdeparts-shared DCOP-shared tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
@@ -84,7 +84,7 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK tdecore-shared kio-shared tdeparts-shared tdeui-shared svnqt tdesvnhelpers tdesvnevents tdesvncfgreader ksvnwidgets svnfrontend
+  LINK tdecore-shared tdeio-shared tdeparts-shared tdeui-shared svnqt tdesvnhelpers tdesvnevents tdesvncfgreader ksvnwidgets svnfrontend
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
@@ -96,7 +96,7 @@ ADD_DEPENDENCIES(tdesvnpart-module svnfrontend-shared)
 
 tde_add_kpart( kded_tdesvnd AUTOMOC
   SOURCES tdesvnd/tdesvnd_dcop.cpp tdesvnd/tdesvnd_dcop.skel tdesvnd/tdesvnd_dcop.h
-  LINK svnqt ksvnwidgets tdesvnhelpers tdesvncfgreader tdecore-shared tdeui-shared DCOP-shared kio-shared tdeinit_kded-shared
+  LINK svnqt ksvnwidgets tdesvnhelpers tdesvncfgreader tdecore-shared tdeui-shared DCOP-shared tdeio-shared tdeinit_kded-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
@@ -180,7 +180,7 @@ tde_add_library( svnfrontend SHARED AUTOMOC
     commandline_part.cpp
     tdesvnview.cpp
     tdesvn_part.cpp
-  LINK svnqt tdecore-shared tdesvnhelpers tdesvnevents tdesvncfgreader tdeui-shared ksvnwidgets kio-shared tdeparts-shared
+  LINK svnqt tdecore-shared tdesvnhelpers tdesvnevents tdesvncfgreader tdeui-shared ksvnwidgets tdeio-shared tdeparts-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
@@ -197,7 +197,7 @@ tde_add_library( ksvnwidgets SHARED AUTOMOC
     ksvnwidgets/depthselector.cpp ksvnwidgets/revertform_impl.cpp
     ksvnwidgets/logmessage.ui ksvnwidgets/ssltrustprompt.ui ksvnwidgets/authdlg.ui
     ksvnwidgets/encodingselector.ui ksvnwidgets/depthform.ui ksvnwidgets/revertform.ui
-  LINK tdesvnhelpers tdesvncfgreader svnqt tdecore-shared tdeui-shared kio-shared
+  LINK tdesvnhelpers tdesvncfgreader svnqt tdecore-shared tdeui-shared tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
@@ -208,8 +208,8 @@ ADD_DEPENDENCIES(ksvnwidgets-shared tdesvnhelpers-shared)
 ##### kio_ksvn ##################################
 
 tde_add_kpart( kio_ksvn AUTOMOC
-  SOURCES kiosvn/kiosvn.cpp kiosvn/kiolistener.cpp kiosvn/kiobytestream.cpp ksvnwidgets/pwstorage.cpp
-  LINK svnqt tdesvnhelpers tdesvncfgreader tdecore-shared tdeui-shared DCOP-shared kio-shared
+  SOURCES kiosvn/tdeiosvn.cpp kiosvn/tdeiolistener.cpp kiosvn/tdeiobytestream.cpp ksvnwidgets/pwstorage.cpp
+  LINK svnqt tdesvnhelpers tdesvncfgreader tdecore-shared tdeui-shared DCOP-shared tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/src/README b/src/README
index f7d3506..39de8b2 100644
--- a/src/README
+++ b/src/README
@@ -46,7 +46,7 @@ http://developer.kde.org/documentation/tutorials/xmlui/preface.html
 them more maintainable.
 
 For more details, consult :
-http://developer.kde.org/documentation/tutorials/kconfigxt/kconfigxt.html
+http://developer.kde.org/documentation/tutorials/tdeconfigxt/tdeconfigxt.html
 
 * With KParts, you can embed other kde components in your program, or make your program
 embeddable in other apps. For example, the kmplayer kpart can be called to play videos
diff --git a/src/helpers/ktranslateurl.cpp b/src/helpers/ktranslateurl.cpp
index 037de88..35fd314 100644
--- a/src/helpers/ktranslateurl.cpp
+++ b/src/helpers/ktranslateurl.cpp
@@ -22,7 +22,7 @@
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kdesktopfile.h>
 
 #include <tqstringlist.h>
diff --git a/src/kiosvn/kiobytestream.h b/src/kiosvn/kiobytestream.h
index ce22af5..48addfe 100644
--- a/src/kiosvn/kiobytestream.h
+++ b/src/kiosvn/kiobytestream.h
@@ -22,7 +22,7 @@
 
 #include "svnstream.hpp"
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kmimetype.h>
 #include <kmimemagic.h>
 #include <tqbuffer.h>
diff --git a/src/kiosvn/kiosvn.h b/src/kiosvn/kiosvn.h
index 413a6a5..4766c60 100644
--- a/src/kiosvn/kiosvn.h
+++ b/src/kiosvn/kiosvn.h
@@ -26,8 +26,8 @@
 #include <tqcstring.h>
 #include <kurl.h>
 
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
 
 
 #include <sys/stat.h>
diff --git a/src/ksvnwidgets/diffbrowser.cpp b/src/ksvnwidgets/diffbrowser.cpp
index 0c6c9a5..068165d 100644
--- a/src/ksvnwidgets/diffbrowser.cpp
+++ b/src/ksvnwidgets/diffbrowser.cpp
@@ -25,7 +25,7 @@
 #include <kglobalsettings.h>
 #include <kglobal.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kapplication.h>
 #include <klocale.h>
diff --git a/src/ksvnwidgets/logmsg_impl.cpp b/src/ksvnwidgets/logmsg_impl.cpp
index f93cbec..41a197b 100644
--- a/src/ksvnwidgets/logmsg_impl.cpp
+++ b/src/ksvnwidgets/logmsg_impl.cpp
@@ -28,12 +28,12 @@
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kapp.h>
-#include <kconfigbase.h>
-#include <kconfig.h>
+#include <tdeconfigbase.h>
+#include <tdeconfig.h>
 #include <kurlrequesterdlg.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
-#include <kfile.h>
+#include <tdefile.h>
 #include <kurlrequester.h>
 
 #include <tqvbox.h>
diff --git a/src/ksvnwidgets/ssltrustprompt_impl.cpp b/src/ksvnwidgets/ssltrustprompt_impl.cpp
index 2aca6b9..d55080b 100644
--- a/src/ksvnwidgets/ssltrustprompt_impl.cpp
+++ b/src/ksvnwidgets/ssltrustprompt_impl.cpp
@@ -27,8 +27,8 @@
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kapp.h>
-#include <kconfigbase.h>
-#include <kconfig.h>
+#include <tdeconfigbase.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <ktextbrowser.h>
 
diff --git a/src/settings/CMakeLists.txt b/src/settings/CMakeLists.txt
index 8eb48e7..17a8899 100644
--- a/src/settings/CMakeLists.txt
+++ b/src/settings/CMakeLists.txt
@@ -27,8 +27,8 @@ link_directories(
 ##### data files ################################
 
 install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/tdesvn_part.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
-install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/tdesvnpartrc-use-external.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
+install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/tdesvnpartrc-use-external.upd DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update )
 install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/tdesvn-use-external-update.sh
-  DESTINATION ${DATA_INSTALL_DIR}/kconf_update
+  DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update
   PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
 )
diff --git a/src/settings/tdesvnsettings.kcfgc b/src/settings/tdesvnsettings.kcfgc
index 4c60cf0..9eef7fb 100644
--- a/src/settings/tdesvnsettings.kcfgc
+++ b/src/settings/tdesvnsettings.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=tdesvn_part.kcfg
 ClassName=Kdesvnsettings
 Singleton=true
diff --git a/src/svnfrontend/ccontextlistener.cpp b/src/svnfrontend/ccontextlistener.cpp
index 296a3bf..ab0090c 100644
--- a/src/svnfrontend/ccontextlistener.cpp
+++ b/src/svnfrontend/ccontextlistener.cpp
@@ -29,7 +29,7 @@
 #include <kinputdialog.h>
 #include <kpassdlg.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include <tqmap.h>
 #include <tqtextstream.h>
diff --git a/src/svnfrontend/filelistviewitem.cpp b/src/svnfrontend/filelistviewitem.cpp
index ba13f27..a7b3cf0 100644
--- a/src/svnfrontend/filelistviewitem.cpp
+++ b/src/svnfrontend/filelistviewitem.cpp
@@ -29,9 +29,9 @@
 
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqfileinfo.h>
 #include <tqpainter.h>
diff --git a/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp b/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp
index e157153..534d0b9 100644
--- a/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp
+++ b/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp
@@ -23,7 +23,7 @@
 
 #include <kpushbutton.h>
 #include <kdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kapplication.h>
 #include <klocale.h>
 
diff --git a/src/svnfrontend/graphtree/drawparams.cpp b/src/svnfrontend/graphtree/drawparams.cpp
index 7a43dd5..afa9cb3 100644
--- a/src/svnfrontend/graphtree/drawparams.cpp
+++ b/src/svnfrontend/graphtree/drawparams.cpp
@@ -31,7 +31,7 @@
 #include <tqpopupmenu.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include "drawparams.h"
diff --git a/src/svnfrontend/graphtree/revgraphview.cpp b/src/svnfrontend/graphtree/revgraphview.cpp
index fec18ba..a9fb8f5 100644
--- a/src/svnfrontend/graphtree/revgraphview.cpp
+++ b/src/svnfrontend/graphtree/revgraphview.cpp
@@ -31,7 +31,7 @@
 #include <ktempdir.h>
 #include <kprocess.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 
 #include <tqtooltip.h>
diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp
index a36b9ef..ab64aa2 100644
--- a/src/svnfrontend/svnactions.cpp
+++ b/src/svnfrontend/svnactions.cpp
@@ -64,12 +64,12 @@
 #include <ktempfile.h>
 #include <kdialogbase.h>
 #include <kapplication.h>
-#include <kio/jobclasses.h>
-#include <kio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/job.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klistview.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kstandarddirs.h>
 #include <ktrader.h>
 #include <krun.h>
diff --git a/src/svnfrontend/svnfiletip.cpp b/src/svnfrontend/svnfiletip.cpp
index cc99182..acf7121 100644
--- a/src/svnfrontend/svnfiletip.cpp
+++ b/src/svnfrontend/svnfiletip.cpp
@@ -20,7 +20,7 @@
 #include "svnfiletip.h"
 #include "svnitem.h"
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kglobalsettings.h>
 #include <kstandarddirs.h>
 #include <kapplication.h>
diff --git a/src/svnfrontend/svnfiletip.h b/src/svnfrontend/svnfiletip.h
index 2c20dcd..2b71b2d 100644
--- a/src/svnfrontend/svnfiletip.h
+++ b/src/svnfrontend/svnfiletip.h
@@ -26,7 +26,7 @@
 #define SVNFILETIP_H
 #include <tqframe.h>
 #include <tqpixmap.h>
-#include <kio/previewjob.h>
+#include <tdeio/previewjob.h>
 
 class KFileItem;
 class TQLabel;
diff --git a/src/svnfrontend/svnitem.cpp b/src/svnfrontend/svnitem.cpp
index dee0435..b207ca1 100644
--- a/src/svnfrontend/svnitem.cpp
+++ b/src/svnfrontend/svnitem.cpp
@@ -33,7 +33,7 @@
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kiconeffect.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kdebug.h>
 
 #include <tqstring.h>
diff --git a/src/svnfrontend/svnlogdlgimp.cpp b/src/svnfrontend/svnlogdlgimp.cpp
index d3a7910..5bbf229 100644
--- a/src/svnfrontend/svnlogdlgimp.cpp
+++ b/src/svnfrontend/svnlogdlgimp.cpp
@@ -30,8 +30,8 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <kapp.h>
-#include <kconfigbase.h>
-#include <kconfig.h>
+#include <tdeconfigbase.h>
+#include <tdeconfig.h>
 #include <ktabwidget.h>
 #include <kdebug.h>
 
diff --git a/src/svnfrontend/tdesvnfilelist.cpp b/src/svnfrontend/tdesvnfilelist.cpp
index 17deee8..4d6a301 100644
--- a/src/svnfrontend/tdesvnfilelist.cpp
+++ b/src/svnfrontend/tdesvnfilelist.cpp
@@ -50,13 +50,13 @@
 #include <kmessagebox.h>
 #include <kdirselectdialog.h>
 #include <klineedit.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdebug.h>
 #include <kurldrag.h>
 #include <ktempfile.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <krun.h>
 #include <kurldrag.h>
 #include <ktrader.h>
diff --git a/src/tdesvn.cpp b/src/tdesvn.cpp
index 0b2a6cd..3bbb7fa 100644
--- a/src/tdesvn.cpp
+++ b/src/tdesvn.cpp
@@ -35,9 +35,9 @@
 #include <tdeversion.h>
 #include <kstatusbar.h>
 #include <kaccel.h>
-#include <kio/netaccess.h>
-#include <kfiledialog.h>
-#include <kconfig.h>
+#include <tdeio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 #include <kurldrag.h>
 #include <kurlrequesterdlg.h>
diff --git a/src/tdesvn_part.cpp b/src/tdesvn_part.cpp
index ded660f..c8f1e11 100644
--- a/src/tdesvn_part.cpp
+++ b/src/tdesvn_part.cpp
@@ -36,13 +36,13 @@
 #include <kinstance.h>
 #include <kaction.h>
 #include <kstdaction.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdebug.h>
 #include <kbugreport.h>
 #include <kxmlguifactory.h>
 #include <kaboutapplication.h>
 #include <kapp.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 #include <kaboutdata.h>
 #include <klocale.h>
 
diff --git a/src/tdesvnd/tdesvnd_dcop.cpp b/src/tdesvnd/tdesvnd_dcop.cpp
index 9b4d598..13a852e 100644
--- a/src/tdesvnd/tdesvnd_dcop.cpp
+++ b/src/tdesvnd/tdesvnd_dcop.cpp
@@ -37,7 +37,7 @@
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kpassdlg.h>
 
 #include <tqdir.h>
diff --git a/src/urldlg.cpp b/src/urldlg.cpp
index e7cc60d..537a634 100644
--- a/src/urldlg.cpp
+++ b/src/urldlg.cpp
@@ -21,7 +21,7 @@
 #include <kcombobox.h>
 #include <kurlrequester.h>
 #include <tqlayout.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <klineedit.h>