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

35 files changed, 48 insertions, 48 deletions

diff --git a/korn/CMakeLists.txt b/korn/CMakeLists.txt
index 12d4e3730..f3dd942bf 100644
--- a/korn/CMakeLists.txt
+++ b/korn/CMakeLists.txt
@@ -13,7 +13,7 @@
 
 tde_import( libkmime )
 
-add_subdirectory( kconf_update )
+add_subdirectory( tdeconf_update )
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
@@ -50,6 +50,6 @@ tde_add_executable( korn AUTOMOC
     sortedmailsubject.cpp korncfgimpl.cpp kornaccountcfgimpl.cpp kornboxcfgimpl.cpp
     kornaccountcfg.ui kornboxcfg.ui korncfg.ui password.cpp pop3_proto.cpp
     systemtray.cpp process_proto.cpp progress_dialog.ui qmail_proto.cpp label.cpp
-  LINK kmime-shared kio-shared
+  LINK kmime-shared tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/korn/Makefile.am b/korn/Makefile.am
index 39cc8ae5a..91bde6721 100644
--- a/korn/Makefile.am
+++ b/korn/Makefile.am
@@ -121,4 +121,4 @@ KDE_ICON = korn
 
 xdg_apps_DATA = KOrn.desktop
 
-SUBDIRS = kconf_update
+SUBDIRS = tdeconf_update
diff --git a/korn/accountmanager.cpp b/korn/accountmanager.cpp
index 477bab2ae..a31dd4c10 100644
--- a/korn/accountmanager.cpp
+++ b/korn/accountmanager.cpp
@@ -27,7 +27,7 @@
 #include "subjectsdlg.h"
 
 #include <kaudioplayer.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <tqptrlist.h>
diff --git a/korn/boxcontainer.cpp b/korn/boxcontainer.cpp
index 5e17c9479..d881b6c8f 100644
--- a/korn/boxcontainer.cpp
+++ b/korn/boxcontainer.cpp
@@ -19,7 +19,7 @@
 #include "boxcontainer.h"
 #include "boxcontaineritem.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <tqptrlist.h>
diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp
index 3fea65f3e..50daf1d0c 100644
--- a/korn/boxcontaineritem.cpp
+++ b/korn/boxcontaineritem.cpp
@@ -24,7 +24,7 @@
 #include <kactioncollection.h>
 #include <kapplication.h>
 #include <kbugreport.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconeffect.h>
diff --git a/korn/dcop_proto.cpp b/korn/dcop_proto.cpp
index 41ab8c9d1..d4a8bd3b0 100644
--- a/korn/dcop_proto.cpp
+++ b/korn/dcop_proto.cpp
@@ -22,7 +22,7 @@
 #include "account_input.h"
 #include "dcopdrop.h"
 
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <klocale.h>
 
 #include <tqmap.h>
diff --git a/korn/dcopdrop.cpp b/korn/dcopdrop.cpp
index cdeccd6b1..660bc8497 100644
--- a/korn/dcopdrop.cpp
+++ b/korn/dcopdrop.cpp
@@ -23,7 +23,7 @@
 #include "mailid.h"
 #include "mailsubject.h"
 
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <kdebug.h>
 
 #include <tqdatetime.h>
diff --git a/korn/dockeditem.cpp b/korn/dockeditem.cpp
index fac1cc479..474ffb289 100644
--- a/korn/dockeditem.cpp
+++ b/korn/dockeditem.cpp
@@ -21,7 +21,7 @@
 #include "systemtray.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/korn/imap_proto.h b/korn/imap_proto.h
index 3310da1b8..f34f32a83 100644
--- a/korn/imap_proto.h
+++ b/korn/imap_proto.h
@@ -54,7 +54,7 @@ public:
 	virtual bool connectionBased() const { return true; }
 	
 	/**
-	 * This gives the two names for a kioslave: imaps if ssl is selected, imap if not.
+	 * This gives the two names for a tdeioslave: imaps if ssl is selected, imap if not.
 	 *
 	 * @param ssl true if ssl is selected.
 	 * @return "imaps" if ssl is true, "imap" otherwise
diff --git a/korn/keditlistboxman.cpp b/korn/keditlistboxman.cpp
index 83b402031..440b2c832 100644
--- a/korn/keditlistboxman.cpp
+++ b/korn/keditlistboxman.cpp
@@ -18,7 +18,7 @@
 
 #include "keditlistboxman.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <tqmap.h>
diff --git a/korn/kio.cpp b/korn/kio.cpp
index 63a9dc683..f2ff37fa5 100644
--- a/korn/kio.cpp
+++ b/korn/kio.cpp
@@ -40,8 +40,8 @@
 //#include"dropdlg.h"
 #include "mailsubject.h"
 
-#include<kconfig.h>
-#include<kconfigbase.h>
+#include<tdeconfig.h>
+#include<tdeconfigbase.h>
 #include<kdebug.h>
 #include<klocale.h>
 #include<kprocess.h>
@@ -70,7 +70,7 @@
 
 /*
  * The 'process' maildrop is a lot different than the other protocols:
- * it haven't a kioslave and could not result in file list. To prevent
+ * it haven't a tdeioslave and could not result in file list. To prevent
  * trowing it away, that functionality is hacked in this file.
  */
 
diff --git a/korn/kio_count.cpp b/korn/kio_count.cpp
index bea6bf196..1531a9b9e 100644
--- a/korn/kio_count.cpp
+++ b/korn/kio_count.cpp
@@ -25,10 +25,10 @@
 #include "sortedmailsubject.h"
 
 #include <kdebug.h>
-#include <kio/jobclasses.h>
-#include <kio/scheduler.h>
-#include <kio/slave.h>
-#include <kio/global.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/slave.h>
+#include <tdeio/global.h>
 #include <kurl.h>
 #include <tqvaluelist.h>
 
@@ -275,7 +275,7 @@ void KIO_Count::entries( TDEIO::Job* job, const TDEIO::UDSEntryList &list )
 			else if( (*it2).m_uds == TDEIO::UDS_URL )
 				fileinfo.name = (*it2).m_str;
 			else if( (*it2).m_uds == TDEIO::UDS_NAME )
-			{ //The file kioslave doesn't return UDS_URL.
+			{ //The file tdeioslave doesn't return UDS_URL.
 				kurl = *_kurl;
 				metadata = *_metadata;
 				_protocol->recheckKURL( kurl, metadata );
diff --git a/korn/kio_count.h b/korn/kio_count.h
index 9b44e1ca9..e575864e4 100644
--- a/korn/kio_count.h
+++ b/korn/kio_count.h
@@ -25,7 +25,7 @@
 
 #include "kio.h" //Alsewise, no access to KKioDrop::FileInfo (needed in template)
 
-#include <kio/global.h> //FIXME: without this, moc-compiler fails.
+#include <tdeio/global.h> //FIXME: without this, moc-compiler fails.
 
 class KIO_Protocol;
 class KIO_Single_Subject;
diff --git a/korn/kio_delete.cpp b/korn/kio_delete.cpp
index 17eec2f53..a73b0dd40 100644
--- a/korn/kio_delete.cpp
+++ b/korn/kio_delete.cpp
@@ -26,9 +26,9 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kurl.h>
-#include <kio/global.h>
-#include <kio/jobclasses.h>
-#include <kio/scheduler.h>
+#include <tdeio/global.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/scheduler.h>
 
 #include <tqptrlist.h>
 
diff --git a/korn/kio_proto.cpp b/korn/kio_proto.cpp
index c6d2184df..e63a71666 100644
--- a/korn/kio_proto.cpp
+++ b/korn/kio_proto.cpp
@@ -19,7 +19,7 @@
 
 #include "kio_proto.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <tqmap.h>
diff --git a/korn/kio_proto.h b/korn/kio_proto.h
index e97b01128..510e97d37 100644
--- a/korn/kio_proto.h
+++ b/korn/kio_proto.h
@@ -27,7 +27,7 @@
  */
 
 class TQString;
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <klocale.h>
 #include <tqstringlist.h>
 #include "protocol.h"
diff --git a/korn/kio_read.cpp b/korn/kio_read.cpp
index 0e77e1a71..f98669d8d 100644
--- a/korn/kio_read.cpp
+++ b/korn/kio_read.cpp
@@ -26,9 +26,9 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kurl.h>
-#include <kio/global.h>
-#include <kio/jobclasses.h>
-#include <kio/scheduler.h>
+#include <tdeio/global.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/scheduler.h>
 
 #include <tqcstring.h>
 #include <tqstring.h>
diff --git a/korn/kio_single_subject.cpp b/korn/kio_single_subject.cpp
index 45ca047fc..0c20b1ab4 100644
--- a/korn/kio_single_subject.cpp
+++ b/korn/kio_single_subject.cpp
@@ -25,10 +25,10 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kurl.h>
-#include <kio/global.h>
-#include <kio/scheduler.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/global.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <krfcdate.h>
 
 #include <tqregexp.h>
diff --git a/korn/kio_subjects.cpp b/korn/kio_subjects.cpp
index 3fda7e4c8..f40a86f64 100644
--- a/korn/kio_subjects.cpp
+++ b/korn/kio_subjects.cpp
@@ -23,8 +23,8 @@
 #include "kio_proto.h"
 #include "mailsubject.h"
 
-#include <kio/global.h>
-#include <kio/scheduler.h>
+#include <tdeio/global.h>
+#include <tdeio/scheduler.h>
 #include <kdebug.h>
 
 #include <tqptrlist.h>
diff --git a/korn/kmail_proto.cpp b/korn/kmail_proto.cpp
index 8f740c80a..7be0555d4 100644
--- a/korn/kmail_proto.cpp
+++ b/korn/kmail_proto.cpp
@@ -24,7 +24,7 @@
 #include "password.h"
 #include "protocols.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 
diff --git a/korn/kornaccountcfgimpl.cpp b/korn/kornaccountcfgimpl.cpp
index a68ccefb6..df6a0e504 100644
--- a/korn/kornaccountcfgimpl.cpp
+++ b/korn/kornaccountcfgimpl.cpp
@@ -24,7 +24,7 @@
 #include "protocol.h"
 #include "protocols.h"
 
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <kdebug.h>
 #include <klineedit.h>
 #include <kurlrequester.h>
diff --git a/korn/kornboxcfgimpl.cpp b/korn/kornboxcfgimpl.cpp
index fc699c10f..f7904b590 100644
--- a/korn/kornboxcfgimpl.cpp
+++ b/korn/kornboxcfgimpl.cpp
@@ -23,10 +23,10 @@ class TDEConfig;
 #include "kornaccountcfgimpl.h"
 #include "password.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcolorbutton.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kfontdialog.h>
 #include <klocale.h>
 #include <kicondialog.h>
diff --git a/korn/korncfgimpl.cpp b/korn/korncfgimpl.cpp
index b944087f1..1d3ba7360 100644
--- a/korn/korncfgimpl.cpp
+++ b/korn/korncfgimpl.cpp
@@ -22,7 +22,7 @@
 #include "kornboxcfgimpl.h"
 #include "password.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <klocale.h>
diff --git a/korn/kornshell.cpp b/korn/kornshell.cpp
index 2e0cc091d..5d075b65f 100644
--- a/korn/kornshell.cpp
+++ b/korn/kornshell.cpp
@@ -25,7 +25,7 @@
 #include "password.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <klocale.h>
diff --git a/korn/maildrop.cpp b/korn/maildrop.cpp
index 20b6dfe9d..2224c74e9 100644
--- a/korn/maildrop.cpp
+++ b/korn/maildrop.cpp
@@ -8,7 +8,7 @@
 #include<assert.h>
 #include<tqapplication.h>
 
-#include<kconfigbase.h>
+#include<tdeconfigbase.h>
 #include<kdebug.h>
 
 #include"utils.h"
diff --git a/korn/password.cpp b/korn/password.cpp
index 50f31e8d9..f93183193 100644
--- a/korn/password.cpp
+++ b/korn/password.cpp
@@ -19,7 +19,7 @@
 
 #include "password.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdewallet.h>
 
diff --git a/korn/polldrop.cpp b/korn/polldrop.cpp
index bc4422caf..54d4eb628 100644
--- a/korn/polldrop.cpp
+++ b/korn/polldrop.cpp
@@ -6,7 +6,7 @@
 */
 
 
-#include<kconfigbase.h>
+#include<tdeconfigbase.h>
 
 #include"utils.h"
 #include"polldrop.h"
diff --git a/korn/systemtray.cpp b/korn/systemtray.cpp
index e7ca45f73..a0bd191d5 100644
--- a/korn/systemtray.cpp
+++ b/korn/systemtray.cpp
@@ -19,7 +19,7 @@
 #include "systemtray.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <tqmovie.h>
diff --git a/korn/kconf_update/CMakeLists.txt b/korn/tdeconf_update/CMakeLists.txt
index 88c06088c..22d4b6a85 100644
--- a/korn/kconf_update/CMakeLists.txt
+++ b/korn/tdeconf_update/CMakeLists.txt
@@ -34,5 +34,5 @@ install( PROGRAMS
 tde_add_executable( korn-3-4-config_change
   SOURCES korn-3-4-config_change.cpp
   LINK ${TQT_LIBRARIES}
-  DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin
+  DESTINATION ${LIB_INSTALL_DIR}/tdeconf_update_bin
 )
diff --git a/korn/kconf_update/Makefile.am b/korn/tdeconf_update/Makefile.am
index 74991a930..214f0c81b 100644
--- a/korn/kconf_update/Makefile.am
+++ b/korn/tdeconf_update/Makefile.am
@@ -2,10 +2,10 @@ INCLUDES=$(all_includes)
 
 update_DATA = korn-3-4-config_change.upd korn-3-5-update.upd
 update_SCRIPTS = korn-3-5-ssl-update.pl korn-3-5-metadata-update.pl
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 
-kconf_PROGRAMS = korn-3-4-config_change
-kconfdir = $(libdir)/kconf_update_bin
+tdeconf_PROGRAMS = korn-3-4-config_change
+tdeconfdir = $(libdir)/tdeconf_update_bin
 
 korn_3_4_config_change_SOURCES = korn-3-4-config_change.cpp
 korn_3_4_config_change_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
diff --git a/korn/kconf_update/korn-3-4-config_change.cpp b/korn/tdeconf_update/korn-3-4-config_change.cpp
index 7eff3ad38..7eff3ad38 100644
--- a/korn/kconf_update/korn-3-4-config_change.cpp
+++ b/korn/tdeconf_update/korn-3-4-config_change.cpp
diff --git a/korn/kconf_update/korn-3-4-config_change.upd b/korn/tdeconf_update/korn-3-4-config_change.upd
index 530304fad..530304fad 100644
--- a/korn/kconf_update/korn-3-4-config_change.upd
+++ b/korn/tdeconf_update/korn-3-4-config_change.upd
diff --git a/korn/kconf_update/korn-3-5-metadata-update.pl b/korn/tdeconf_update/korn-3-5-metadata-update.pl
index 95723c4ee..95723c4ee 100644
--- a/korn/kconf_update/korn-3-5-metadata-update.pl
+++ b/korn/tdeconf_update/korn-3-5-metadata-update.pl
diff --git a/korn/kconf_update/korn-3-5-ssl-update.pl b/korn/tdeconf_update/korn-3-5-ssl-update.pl
index b44ce10ff..b44ce10ff 100644
--- a/korn/kconf_update/korn-3-5-ssl-update.pl
+++ b/korn/tdeconf_update/korn-3-5-ssl-update.pl
diff --git a/korn/kconf_update/korn-3-5-update.upd b/korn/tdeconf_update/korn-3-5-update.upd
index d954d7826..d954d7826 100644
--- a/korn/kconf_update/korn-3-5-update.upd
+++ b/korn/tdeconf_update/korn-3-5-update.upd