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

27 files changed, 31 insertions, 31 deletions

diff --git a/cervisia/ChangeLog b/cervisia/ChangeLog
index 7c378f87..fdecfd90 100644
--- a/cervisia/ChangeLog
+++ b/cervisia/ChangeLog
@@ -643,7 +643,7 @@
 	* Extract AddRepositoryDialog from repositorydlg.cpp
 	* Save and read repository configuration to/from the
 	  configuration file of the cvs DCOP service
-	* Added kconf_update script to copy repository configuration
+	* Added tdeconf_update script to copy repository configuration
 	  to cvsservicerc
 
 2002-12-28  Christian Loose <[email protected]>
@@ -656,7 +656,7 @@
 	  uses the new cvs DCOP service
 	* Save and read cvs client and global compression level configuration
 	  to/from the configuration file of the cvs DCOP service
-	* Added kconf_update script
+	* Added tdeconf_update script
 
 2002-12-26  André Wöbbeking <[email protected]>
 
diff --git a/cervisia/Makefile.am b/cervisia/Makefile.am
index 8d2b87a4..9131ac3b 100644
--- a/cervisia/Makefile.am
+++ b/cervisia/Makefile.am
@@ -54,7 +54,7 @@ shellrc_DATA = cervisiashellui.rc eventsrc
 
 update_DATA = cervisia.upd
 update_SCRIPTS = move_repositories.pl change_colors.pl cervisia-normalize_cvsroot.pl cervisia-change_repos_list.pl
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 
 messages: rc.cpp
 	$(EXTRACTRC) *.rc >> rc.cpp
diff --git a/cervisia/addrepositorydlg.cpp b/cervisia/addrepositorydlg.cpp
index 342f52b2..32a38c77 100644
--- a/cervisia/addrepositorydlg.cpp
+++ b/cervisia/addrepositorydlg.cpp
@@ -26,7 +26,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <knuminput.h>
diff --git a/cervisia/annotateview.cpp b/cervisia/annotateview.cpp
index 174ade20..a46e52b1 100644
--- a/cervisia/annotateview.cpp
+++ b/cervisia/annotateview.cpp
@@ -21,7 +21,7 @@
 
 #include <tqheader.h>
 #include <tqpainter.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobalsettings.h>
 
 #include "loginfo.h"
diff --git a/cervisia/cervisiapart.cpp b/cervisia/cervisiapart.cpp
index e3eb4e95..34d4bfc6 100644
--- a/cervisia/cervisiapart.cpp
+++ b/cervisia/cervisiapart.cpp
@@ -27,7 +27,7 @@
 #include <kaboutdata.h>
 #include <kaction.h>
 #include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kinputdialog.h>
 #include <kinstance.h>
 #include <klocale.h>
@@ -41,7 +41,7 @@
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <kglobal.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include "progressdlg.h"
 #include "logdlg.h"
diff --git a/cervisia/cervisiashell.cpp b/cervisia/cervisiashell.cpp
index 0805d8dc..b3f1539b 100644
--- a/cervisia/cervisiashell.cpp
+++ b/cervisia/cervisiashell.cpp
@@ -22,7 +22,7 @@
 #include "cervisiashell.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kedittoolbar.h>
 #include <khelpmenu.h>
 #include <kkeydialog.h>
diff --git a/cervisia/changelogdlg.cpp b/cervisia/changelogdlg.cpp
index 943d7dd0..80a3c729 100644
--- a/cervisia/changelogdlg.cpp
+++ b/cervisia/changelogdlg.cpp
@@ -23,7 +23,7 @@
 
 #include <tqfile.h>
 #include <tqtextstream.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/cervisia/checkoutdlg.cpp b/cervisia/checkoutdlg.cpp
index 0fe06352..2f63dcd5 100644
--- a/cervisia/checkoutdlg.cpp
+++ b/cervisia/checkoutdlg.cpp
@@ -28,7 +28,7 @@
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <kprocess.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/cervisia/commitdlg.cpp b/cervisia/commitdlg.cpp
index 485547fc..e1fb43f0 100644
--- a/cervisia/commitdlg.cpp
+++ b/cervisia/commitdlg.cpp
@@ -28,7 +28,7 @@
 #include <tqlayout.h>
 #include <tqheader.h>
 #include <klistview.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 #include "cvsservice_stub.h"
diff --git a/cervisia/cvsinitdlg.cpp b/cervisia/cvsinitdlg.cpp
index cf0b4641..e29f0615 100644
--- a/cervisia/cvsinitdlg.cpp
+++ b/cervisia/cvsinitdlg.cpp
@@ -23,7 +23,7 @@
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kurlcompletion.h>
diff --git a/cervisia/cvsservice/CMakeLists.txt b/cervisia/cvsservice/CMakeLists.txt
index cfb739cf..f3181c04 100644
--- a/cervisia/cvsservice/CMakeLists.txt
+++ b/cervisia/cvsservice/CMakeLists.txt
@@ -55,7 +55,7 @@ tde_add_tdeinit_executable( cvsservice AUTOMOC
     cvsjob.skel cvsjob.stub repository.cpp repository.skel
     repository.stub sshagent.cpp cvsserviceutils.cpp cvsloginjob.cpp
     cvsloginjob.skel cvsloginjob.stub
-  LINK kio-shared
+  LINK tdeio-shared
 )
 
 
diff --git a/cervisia/cvsservice/cvsservice.cpp b/cervisia/cvsservice/cvsservice.cpp
index 70cb283d..8aa5c2a6 100644
--- a/cervisia/cvsservice/cvsservice.cpp
+++ b/cervisia/cvsservice/cvsservice.cpp
@@ -26,7 +26,7 @@
 #include <dcopref.h>
 #include <dcopclient.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
diff --git a/cervisia/cvsservice/repository.cpp b/cervisia/cvsservice/repository.cpp
index 92a56baa..7f5d54ee 100644
--- a/cervisia/cvsservice/repository.cpp
+++ b/cervisia/cvsservice/repository.cpp
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdirwatch.h>
 #include <kstandarddirs.h>
 
diff --git a/cervisia/diffdlg.cpp b/cervisia/diffdlg.cpp
index bdf34841..35615507 100644
--- a/cervisia/diffdlg.cpp
+++ b/cervisia/diffdlg.cpp
@@ -27,8 +27,8 @@
 #include <tqkeycode.h>
 #include <tqfileinfo.h>
 #include <tqregexp.h>
-#include <kconfig.h>
-#include <kfiledialog.h>
+#include <tdeconfig.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
diff --git a/cervisia/diffview.cpp b/cervisia/diffview.cpp
index c3e43862..84863bf8 100644
--- a/cervisia/diffview.cpp
+++ b/cervisia/diffview.cpp
@@ -27,7 +27,7 @@
 #include <tqstyle.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
diff --git a/cervisia/historydlg.cpp b/cervisia/historydlg.cpp
index 8f2ffee2..78d0b73b 100644
--- a/cervisia/historydlg.cpp
+++ b/cervisia/historydlg.cpp
@@ -25,7 +25,7 @@
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqregexp.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klineedit.h>
 #include <klistview.h>
 #include <klocale.h>
diff --git a/cervisia/logdlg.cpp b/cervisia/logdlg.cpp
index bb0b9223..51ef228b 100644
--- a/cervisia/logdlg.cpp
+++ b/cervisia/logdlg.cpp
@@ -30,9 +30,9 @@
 #include <tqtabwidget.h>
 #include <tqtextedit.h>
 #include <tqwhatsthis.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kfinddialog.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
diff --git a/cervisia/main.cpp b/cervisia/main.cpp
index e5aa2120..215f1320 100644
--- a/cervisia/main.cpp
+++ b/cervisia/main.cpp
@@ -24,7 +24,7 @@
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kurl.h>
 
diff --git a/cervisia/misc.cpp b/cervisia/misc.cpp
index 7a13b15c..11e60e5e 100644
--- a/cervisia/misc.cpp
+++ b/cervisia/misc.cpp
@@ -29,7 +29,7 @@
 #include <tqfileinfo.h>
 #include <tqregexp.h>
 #include <tqstringlist.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kemailsettings.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/cervisia/progressdlg.cpp b/cervisia/progressdlg.cpp
index a7e34018..d3d1d7dc 100644
--- a/cervisia/progressdlg.cpp
+++ b/cervisia/progressdlg.cpp
@@ -30,7 +30,7 @@
 #include <dcopref.h>
 #include <kanimwidget.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "cervisiasettings.h"
 
diff --git a/cervisia/protocolview.cpp b/cervisia/protocolview.cpp
index 62e15dde..a94be9f5 100644
--- a/cervisia/protocolview.cpp
+++ b/cervisia/protocolview.cpp
@@ -24,7 +24,7 @@
 #include <tqdir.h>
 #include <tqpopupmenu.h>
 #include <dcopref.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
diff --git a/cervisia/repositories.cpp b/cervisia/repositories.cpp
index 28302ce3..820d468b 100644
--- a/cervisia/repositories.cpp
+++ b/cervisia/repositories.cpp
@@ -23,7 +23,7 @@
 #include <tqdir.h>
 #include <tqtextstream.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "repositories.h"
 #include "cervisiapart.h"
diff --git a/cervisia/repositorydlg.cpp b/cervisia/repositorydlg.cpp
index 54694307..0d29cbea 100644
--- a/cervisia/repositorydlg.cpp
+++ b/cervisia/repositorydlg.cpp
@@ -24,7 +24,7 @@
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <kbuttonbox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/cervisia/resolvedlg.cpp b/cervisia/resolvedlg.cpp
index d9652bf1..93c915fc 100644
--- a/cervisia/resolvedlg.cpp
+++ b/cervisia/resolvedlg.cpp
@@ -29,7 +29,7 @@
 #include <tqtextcodec.h>
 #include <tqtextstream.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tqregexp.h>
diff --git a/cervisia/settingsdlg.cpp b/cervisia/settingsdlg.cpp
index 6e677e95..dca2730c 100644
--- a/cervisia/settingsdlg.cpp
+++ b/cervisia/settingsdlg.cpp
@@ -32,7 +32,7 @@
 #include <tqradiobutton.h>
 #include <kbuttonbox.h>
 #include <kcolorbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kfontdialog.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/cervisia/updateview.cpp b/cervisia/updateview.cpp
index c05c1c3f..19311a0e 100644
--- a/cervisia/updateview.cpp
+++ b/cervisia/updateview.cpp
@@ -25,7 +25,7 @@
 #include <tqapplication.h>
 #include <tqfileinfo.h>
 #include <tqptrstack.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 #include "cervisiasettings.h"
diff --git a/cervisia/watchersdlg.cpp b/cervisia/watchersdlg.cpp
index fec97848..a3ca17ed 100644
--- a/cervisia/watchersdlg.cpp
+++ b/cervisia/watchersdlg.cpp
@@ -21,7 +21,7 @@
 
 #include <tqlayout.h>
 #include <tqtable.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klineedit.h>
 #include <klocale.h>