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

96 files changed, 190 insertions, 190 deletions

diff --git a/kdejava/koala/kdejava/AuthInfo.cpp b/kdejava/koala/kdejava/AuthInfo.cpp
index 4c495faa..a5f5d078 100644
--- a/kdejava/koala/kdejava/AuthInfo.cpp
+++ b/kdejava/koala/kdejava/AuthInfo.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kio/authinfo.h>
+#include <tdeio/authinfo.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/Connection.cpp b/kdejava/koala/kdejava/Connection.cpp
index 82025e54..92616fe2 100644
--- a/kdejava/koala/kdejava/Connection.cpp
+++ b/kdejava/koala/kdejava/Connection.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kio/connection.h>
+#include <tdeio/connection.h>
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/kdejava/koala/kdejava/CopyJob.cpp b/kdejava/koala/kdejava/CopyJob.cpp
index 516b9039..43297aff 100644
--- a/kdejava/koala/kdejava/CopyJob.cpp
+++ b/kdejava/koala/kdejava/CopyJob.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 #include <tqstring.h>
 #include <kurl.h>
 
diff --git a/kdejava/koala/kdejava/DavJob.cpp b/kdejava/koala/kdejava/DavJob.cpp
index 0c0c3184..cfa1da70 100644
--- a/kdejava/koala/kdejava/DavJob.cpp
+++ b/kdejava/koala/kdejava/DavJob.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kio/davjob.h>
+#include <tdeio/davjob.h>
 #include <tqstring.h>
 #include <tqdom.h>
 #include <kurl.h>
diff --git a/kdejava/koala/kdejava/DefaultProgress.cpp b/kdejava/koala/kdejava/DefaultProgress.cpp
index e95e14b8..3d2d4dcc 100644
--- a/kdejava/koala/kdejava/DefaultProgress.cpp
+++ b/kdejava/koala/kdejava/DefaultProgress.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kio/global.h>
-#include <kio/defaultprogress.h>
+#include <tdeio/global.h>
+#include <tdeio/defaultprogress.h>
 #include <tqstring.h>
 #include <kurl.h>
 
diff --git a/kdejava/koala/kdejava/DeleteJob.cpp b/kdejava/koala/kdejava/DeleteJob.cpp
index 53e28d9f..8c017c7c 100644
--- a/kdejava/koala/kdejava/DeleteJob.cpp
+++ b/kdejava/koala/kdejava/DeleteJob.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kio/jobclasses.h>
-#include <kio/global.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/global.h>
 #include <kurl.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/kdejava/koala/kdejava/FileCopyJob.cpp b/kdejava/koala/kdejava/FileCopyJob.cpp
index 15f8ef95..0a7520e7 100644
--- a/kdejava/koala/kdejava/FileCopyJob.cpp
+++ b/kdejava/koala/kdejava/FileCopyJob.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kio/jobclasses.h>
-#include <kio/global.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/global.h>
 #include <kurl.h>
 #include <tqcstring.h>
 
diff --git a/kdejava/koala/kdejava/Job.cpp b/kdejava/koala/kdejava/Job.cpp
index 865e89c1..a6790771 100644
--- a/kdejava/koala/kdejava/Job.cpp
+++ b/kdejava/koala/kdejava/Job.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kio/jobclasses.h>
-#include <kio/global.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/global.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 
diff --git a/kdejava/koala/kdejava/KCombiView.cpp b/kdejava/koala/kdejava/KCombiView.cpp
index 0613d6f4..74a8c9bc 100644
--- a/kdejava/koala/kdejava/KCombiView.cpp
+++ b/kdejava/koala/kdejava/KCombiView.cpp
@@ -2,10 +2,10 @@
 #include <tqdir.h>
 #include <kcombiview.h>
 #include <tqstring.h>
-#include <kio/global.h>
-#include <kfileview.h>
+#include <tdeio/global.h>
+#include <tdefileview.h>
 #include <tdeparts/browserextension.h>
-#include <kfile.h>
+#include <tdefile.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KDE.cpp b/kdejava/koala/kdejava/KDE.cpp
index 68d62183..0fcdeac5 100644
--- a/kdejava/koala/kdejava/KDE.cpp
+++ b/kdejava/koala/kdejava/KDE.cpp
@@ -2,21 +2,21 @@
 #include <ksslcertificatecache.h>
 #include <tqregion.h>
 #include <ksslpemcallback.h>
-#include <kio/slaveinterface.h>
+#include <tdeio/slaveinterface.h>
 #include <tqdatetime.h>
 #include <tqrect.h>
 #include <ksslcertificate.h>
-#include <kio/global.h>
-#include <kfilemetainfo.h>
+#include <tdeio/global.h>
+#include <tdefilemetainfo.h>
 #include <kstandarddirs.h>
 #include <dcopref.h>
 #include <kdatastream.h>
 #include <tqdatastream.h>
 #include <tqpixmap.h>
 #include <ksslcertdlg.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kapplication.h>
-#include <kconfigdata.h>
+#include <tdeconfigdata.h>
 #include <tqiconset.h>
 #include <tdeversion.h>
 #include <kicontheme.h>
diff --git a/kdejava/koala/kdejava/KDEDesktopMimeType.cpp b/kdejava/koala/kdejava/KDEDesktopMimeType.cpp
index f6dcd474..03a20300 100644
--- a/kdejava/koala/kdejava/KDEDesktopMimeType.cpp
+++ b/kdejava/koala/kdejava/KDEDesktopMimeType.cpp
@@ -6,7 +6,7 @@
 #include <tqstring.h>
 #include <ksimpleconfig.h>
 #include <kurl.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KDEJavaSlot.h b/kdejava/koala/kdejava/KDEJavaSlot.h
index f1644724..56903ba6 100644
--- a/kdejava/koala/kdejava/KDEJavaSlot.h
+++ b/kdejava/koala/kdejava/KDEJavaSlot.h
@@ -31,18 +31,18 @@
 #include <kcompletion.h>
 #include <kdockwidget.h>
 #include <kdualcolorbtn.h>
-#include <kfileview.h>
+#include <tdefileview.h>
 #include <kglobalsettings.h>
 #include <klistview.h>
 #include <kprocio.h>
 #include <kprocess.h>
 #include <tdeparts/part.h>
 #include <tdeparts/browserextension.h>
-#include <kio/slave.h>
-#include <kio/skipdlg.h>
+#include <tdeio/slave.h>
+#include <tdeio/skipdlg.h>
 #include <kbookmark.h>
 #include <kdatatool.h>
-#include <kfiletreeviewitem.h>
+#include <tdefiletreeviewitem.h>
 #include <tdemdichildfrm.h>
 
 class KDEJavaSlotFactory;
diff --git a/kdejava/koala/kdejava/KDESupport.h b/kdejava/koala/kdejava/KDESupport.h
index 4e69da17..9e012e86 100644
--- a/kdejava/koala/kdejava/KDESupport.h
+++ b/kdejava/koala/kdejava/KDESupport.h
@@ -23,8 +23,8 @@
 #include <tqptrlist.h>
 #include <ktrader.h>
 #include <kmainwindow.h>
-#include <kfile.h>
-#include <kfileview.h>
+#include <tdefile.h>
+#include <tdefileview.h>
 #include <kurl.h>
 #include <kcmdlineargs.h>
 #include <dom/dom_string.h>
diff --git a/kdejava/koala/kdejava/KDialogBase.cpp b/kdejava/koala/kdejava/KDialogBase.cpp
index 5cc330bd..9a96f981 100644
--- a/kdejava/koala/kdejava/KDialogBase.cpp
+++ b/kdejava/koala/kdejava/KDialogBase.cpp
@@ -4,7 +4,7 @@
 #include <tqpixmap.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kguiitem.h>
 #include <tqnamespace.h>
 
diff --git a/kdejava/koala/kdejava/KDirLister.cpp b/kdejava/koala/kdejava/KDirLister.cpp
index ddf550ca..b7b8f6f0 100644
--- a/kdejava/koala/kdejava/KDirLister.cpp
+++ b/kdejava/koala/kdejava/KDirLister.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <tdeparts/browserextension.h>
 #include <kdirlister.h>
 #include <tqstring.h>
diff --git a/kdejava/koala/kdejava/KDirOperator.cpp b/kdejava/koala/kdejava/KDirOperator.cpp
index 94036ad3..73c616fc 100644
--- a/kdejava/koala/kdejava/KDirOperator.cpp
+++ b/kdejava/koala/kdejava/KDirOperator.cpp
@@ -7,7 +7,7 @@
 #include <tqpoint.h>
 #include <tqstringlist.h>
 #include <kurl.h>
-#include <kfile.h>
+#include <tdefile.h>
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/kdejava/koala/kdejava/KDirSize.cpp b/kdejava/koala/kdejava/KDirSize.cpp
index fbf1027d..5f347338 100644
--- a/kdejava/koala/kdejava/KDirSize.cpp
+++ b/kdejava/koala/kdejava/KDirSize.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <tdeparts/browserextension.h>
 #include <kdirsize.h>
 #include <kurl.h>
diff --git a/kdejava/koala/kdejava/KEntry.cpp b/kdejava/koala/kdejava/KEntry.cpp
index c7158192..4b613e5c 100644
--- a/kdejava/koala/kdejava/KEntry.cpp
+++ b/kdejava/koala/kdejava/KEntry.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kconfigdata.h>
+#include <tdeconfigdata.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KEntryKey.cpp b/kdejava/koala/kdejava/KEntryKey.cpp
index e4c74e50..94c493d9 100644
--- a/kdejava/koala/kdejava/KEntryKey.cpp
+++ b/kdejava/koala/kdejava/KEntryKey.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kconfigdata.h>
+#include <tdeconfigdata.h>
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/kdejava/koala/kdejava/KFile.cpp b/kdejava/koala/kdejava/KFile.cpp
index 21d132fa..9ec7fb63 100644
--- a/kdejava/koala/kdejava/KFile.cpp
+++ b/kdejava/koala/kdejava/KFile.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqdir.h>
-#include <kfile.h>
+#include <tdefile.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KFileDetailView.cpp b/kdejava/koala/kdejava/KFileDetailView.cpp
index c6888d7e..f7e0f52d 100644
--- a/kdejava/koala/kdejava/KFileDetailView.cpp
+++ b/kdejava/koala/kdejava/KFileDetailView.cpp
@@ -1,12 +1,12 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqdir.h>
-#include <kio/global.h>
-#include <kfileview.h>
+#include <tdeio/global.h>
+#include <tdefileview.h>
 #include <tdeparts/browserextension.h>
 #include <tqstring.h>
-#include <kfiledetailview.h>
+#include <tdefiledetailview.h>
 #include <kurl.h>
-#include <kfile.h>
+#include <tdefile.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KFileDialog.cpp b/kdejava/koala/kdejava/KFileDialog.cpp
index 2bf54f2b..85605210 100644
--- a/kdejava/koala/kdejava/KFileDialog.cpp
+++ b/kdejava/koala/kdejava/KFileDialog.cpp
@@ -1,10 +1,10 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmimetype.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <kurl.h>
-#include <kfile.h>
+#include <tdefile.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KFileFilter.cpp b/kdejava/koala/kdejava/KFileFilter.cpp
index 6d1f3980..6398f9ee 100644
--- a/kdejava/koala/kdejava/KFileFilter.cpp
+++ b/kdejava/koala/kdejava/KFileFilter.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kfilefilter.h>
+#include <tdefilefilter.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KFileFilterCombo.cpp b/kdejava/koala/kdejava/KFileFilterCombo.cpp
index 9a9279d9..53fa3278 100644
--- a/kdejava/koala/kdejava/KFileFilterCombo.cpp
+++ b/kdejava/koala/kdejava/KFileFilterCombo.cpp
@@ -1,7 +1,7 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <kfilefiltercombo.h>
+#include <tdefilefiltercombo.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KFileIconView.cpp b/kdejava/koala/kdejava/KFileIconView.cpp
index cb0e9b51..09158b5a 100644
--- a/kdejava/koala/kdejava/KFileIconView.cpp
+++ b/kdejava/koala/kdejava/KFileIconView.cpp
@@ -1,12 +1,12 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqdir.h>
-#include <kio/global.h>
-#include <kfileview.h>
+#include <tdeio/global.h>
+#include <tdefileview.h>
 #include <tdeparts/browserextension.h>
-#include <kfileiconview.h>
+#include <tdefileiconview.h>
 #include <tqstring.h>
 #include <kurl.h>
-#include <kfile.h>
+#include <tdefile.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KFileIconViewItem.cpp b/kdejava/koala/kdejava/KFileIconViewItem.cpp
index 5fb2b97e..fd76934c 100644
--- a/kdejava/koala/kdejava/KFileIconViewItem.cpp
+++ b/kdejava/koala/kdejava/KFileIconViewItem.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqpixmap.h>
-#include <kfileiconview.h>
+#include <tdefileiconview.h>
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/kdejava/koala/kdejava/KFileItem.cpp b/kdejava/koala/kdejava/KFileItem.cpp
index 73beaa90..f95b67b6 100644
--- a/kdejava/koala/kdejava/KFileItem.cpp
+++ b/kdejava/koala/kdejava/KFileItem.cpp
@@ -1,8 +1,8 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kio/global.h>
-#include <kfilemetainfo.h>
+#include <tdeio/global.h>
+#include <tdefilemetainfo.h>
 #include <tqpixmap.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kmimetype.h>
 #include <tqstring.h>
 #include <kurl.h>
diff --git a/kdejava/koala/kdejava/KFileListViewItem.cpp b/kdejava/koala/kdejava/KFileListViewItem.cpp
index 23c88fd4..43747d56 100644
--- a/kdejava/koala/kdejava/KFileListViewItem.cpp
+++ b/kdejava/koala/kdejava/KFileListViewItem.cpp
@@ -2,7 +2,7 @@
 #include <tqrect.h>
 #include <tqpixmap.h>
 #include <tqstring.h>
-#include <kfiledetailview.h>
+#include <tdefiledetailview.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KFileMetaInfo.cpp b/kdejava/koala/kdejava/KFileMetaInfo.cpp
index 18e3881c..37d51373 100644
--- a/kdejava/koala/kdejava/KFileMetaInfo.cpp
+++ b/kdejava/koala/kdejava/KFileMetaInfo.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <tqstring.h>
 #include <tqvariant.h>
 #include <tqstringlist.h>
diff --git a/kdejava/koala/kdejava/KFileMetaInfoGroup.cpp b/kdejava/koala/kdejava/KFileMetaInfoGroup.cpp
index 0a397228..ec132d28 100644
--- a/kdejava/koala/kdejava/KFileMetaInfoGroup.cpp
+++ b/kdejava/koala/kdejava/KFileMetaInfoGroup.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqvariant.h>
diff --git a/kdejava/koala/kdejava/KFileMetaInfoItem.cpp b/kdejava/koala/kdejava/KFileMetaInfoItem.cpp
index a21ed3e3..160c3eb2 100644
--- a/kdejava/koala/kdejava/KFileMetaInfoItem.cpp
+++ b/kdejava/koala/kdejava/KFileMetaInfoItem.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <tqstring.h>
 #include <tqvariant.h>
 
diff --git a/kdejava/koala/kdejava/KFilePlugin.cpp b/kdejava/koala/kdejava/KFilePlugin.cpp
index a60945de..378aaee4 100644
--- a/kdejava/koala/kdejava/KFilePlugin.cpp
+++ b/kdejava/koala/kdejava/KFilePlugin.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 
diff --git a/kdejava/koala/kdejava/KFilePreview.cpp b/kdejava/koala/kdejava/KFilePreview.cpp
index 217d290c..8b20aaa0 100644
--- a/kdejava/koala/kdejava/KFilePreview.cpp
+++ b/kdejava/koala/kdejava/KFilePreview.cpp
@@ -1,12 +1,12 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqdir.h>
-#include <kio/global.h>
-#include <kfileview.h>
+#include <tdeio/global.h>
+#include <tdefileview.h>
 #include <tdeparts/browserextension.h>
-#include <kfilepreview.h>
+#include <tdefilepreview.h>
 #include <tqstring.h>
 #include <kurl.h>
-#include <kfile.h>
+#include <tdefile.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KFileShare.cpp b/kdejava/koala/kdejava/KFileShare.cpp
index 5519f012..03740be9 100644
--- a/kdejava/koala/kdejava/KFileShare.cpp
+++ b/kdejava/koala/kdejava/KFileShare.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kfileshare.h>
+#include <tdefileshare.h>
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/kdejava/koala/kdejava/KFileTreeBranch.cpp b/kdejava/koala/kdejava/KFileTreeBranch.cpp
index 658175bf..7fb78266 100644
--- a/kdejava/koala/kdejava/KFileTreeBranch.cpp
+++ b/kdejava/koala/kdejava/KFileTreeBranch.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kfiletreebranch.h>
-#include <kfiletreeviewitem.h>
+#include <tdefiletreebranch.h>
+#include <tdefiletreeviewitem.h>
 #include <tqpixmap.h>
 #include <tqstring.h>
 #include <kurl.h>
diff --git a/kdejava/koala/kdejava/KFileTreeView.cpp b/kdejava/koala/kdejava/KFileTreeView.cpp
index 0ecc224d..6267d007 100644
--- a/kdejava/koala/kdejava/KFileTreeView.cpp
+++ b/kdejava/koala/kdejava/KFileTreeView.cpp
@@ -1,7 +1,7 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kfiletreebranch.h>
-#include <kfiletreeview.h>
-#include <kfiletreeviewitem.h>
+#include <tdefiletreebranch.h>
+#include <tdefiletreeview.h>
+#include <tdefiletreeviewitem.h>
 #include <tqpixmap.h>
 #include <tqstring.h>
 #include <kurl.h>
diff --git a/kdejava/koala/kdejava/KFileTreeViewItem.cpp b/kdejava/koala/kdejava/KFileTreeViewItem.cpp
index e0db5d48..f68ddf34 100644
--- a/kdejava/koala/kdejava/KFileTreeViewItem.cpp
+++ b/kdejava/koala/kdejava/KFileTreeViewItem.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kfiletreeviewitem.h>
+#include <tdefiletreeviewitem.h>
 #include <tqstring.h>
 #include <kurl.h>
 
diff --git a/kdejava/koala/kdejava/KFileTreeViewToolTip.cpp b/kdejava/koala/kdejava/KFileTreeViewToolTip.cpp
index 4826268f..3e119137 100644
--- a/kdejava/koala/kdejava/KFileTreeViewToolTip.cpp
+++ b/kdejava/koala/kdejava/KFileTreeViewToolTip.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kfiletreeview.h>
+#include <tdefiletreeview.h>
 #include <tqpoint.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/kdejava/koala/kdejava/KFileView.cpp b/kdejava/koala/kdejava/KFileView.cpp
index 2cbaa8e0..b77cd9fe 100644
--- a/kdejava/koala/kdejava/KFileView.cpp
+++ b/kdejava/koala/kdejava/KFileView.cpp
@@ -1,10 +1,10 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqdir.h>
-#include <kio/global.h>
-#include <kfileview.h>
+#include <tdeio/global.h>
+#include <tdefileview.h>
 #include <tdeparts/browserextension.h>
 #include <tqstring.h>
-#include <kfile.h>
+#include <tdefile.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KFileViewSignaler.cpp b/kdejava/koala/kdejava/KFileViewSignaler.cpp
index 64fe3974..bbb0146a 100644
--- a/kdejava/koala/kdejava/KFileViewSignaler.cpp
+++ b/kdejava/koala/kdejava/KFileViewSignaler.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqdir.h>
-#include <kfileview.h>
+#include <tdefileview.h>
 #include <tqpoint.h>
 #include <kurl.h>
 
diff --git a/kdejava/koala/kdejava/KPanelApplet.cpp b/kdejava/koala/kdejava/KPanelApplet.cpp
index 494b069e..4846aa11 100644
--- a/kdejava/koala/kdejava/KPanelApplet.cpp
+++ b/kdejava/koala/kdejava/KPanelApplet.cpp
@@ -1,7 +1,7 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <kpanelapplet.h>
 #include <tqstring.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/kdejava/koala/kdejava/KProtocolManager.cpp b/kdejava/koala/kdejava/KProtocolManager.cpp
index 4b1494ff..ba0bb159 100644
--- a/kdejava/koala/kdejava/KProtocolManager.cpp
+++ b/kdejava/koala/kdejava/KProtocolManager.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <kprotocolmanager.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <tqstring.h>
 #include <kurl.h>
 
diff --git a/kdejava/koala/kdejava/KSharedConfig.cpp b/kdejava/koala/kdejava/KSharedConfig.cpp
index 9d7797c7..3f75edce 100644
--- a/kdejava/koala/kdejava/KSharedConfig.cpp
+++ b/kdejava/koala/kdejava/KSharedConfig.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KShred.cpp b/kdejava/koala/kdejava/KShred.cpp
index f84bc534..9e2f3e9c 100644
--- a/kdejava/koala/kdejava/KShred.cpp
+++ b/kdejava/koala/kdejava/KShred.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <tqstring.h>
 #include <kshred.h>
 
diff --git a/kdejava/koala/kdejava/KSimpleFileFilter.cpp b/kdejava/koala/kdejava/KSimpleFileFilter.cpp
index 30968cff..82b08f00 100644
--- a/kdejava/koala/kdejava/KSimpleFileFilter.cpp
+++ b/kdejava/koala/kdejava/KSimpleFileFilter.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kfilefilter.h>
+#include <tdefilefilter.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 
diff --git a/kdejava/koala/kdejava/KURLCompletion.cpp b/kdejava/koala/kdejava/KURLCompletion.cpp
index 28fe31b8..6d51855c 100644
--- a/kdejava/koala/kdejava/KURLCompletion.cpp
+++ b/kdejava/koala/kdejava/KURLCompletion.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <tqstring.h>
 #include <kurlcompletion.h>
 
diff --git a/kdejava/koala/kdejava/ListJob.cpp b/kdejava/koala/kdejava/ListJob.cpp
index b61eb6ef..7a57245d 100644
--- a/kdejava/koala/kdejava/ListJob.cpp
+++ b/kdejava/koala/kdejava/ListJob.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kio/jobclasses.h>
-#include <kio/global.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/global.h>
 #include <tqstring.h>
 #include <kurl.h>
 
diff --git a/kdejava/koala/kdejava/MetaInfoJob.cpp b/kdejava/koala/kdejava/MetaInfoJob.cpp
index b02493ce..2c0b8ffe 100644
--- a/kdejava/koala/kdejava/MetaInfoJob.cpp
+++ b/kdejava/koala/kdejava/MetaInfoJob.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kio/metainfojob.h>
+#include <tdeio/metainfojob.h>
 #include <tdeparts/browserextension.h>
 #include <tqstringlist.h>
 
diff --git a/kdejava/koala/kdejava/MimetypeJob.cpp b/kdejava/koala/kdejava/MimetypeJob.cpp
index 4881c2f6..a26fbaa0 100644
--- a/kdejava/koala/kdejava/MimetypeJob.cpp
+++ b/kdejava/koala/kdejava/MimetypeJob.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 #include <tqstring.h>
 #include <kurl.h>
 #include <tqcstring.h>
diff --git a/kdejava/koala/kdejava/MultiGetJob.cpp b/kdejava/koala/kdejava/MultiGetJob.cpp
index 55a32c02..7f856c96 100644
--- a/kdejava/koala/kdejava/MultiGetJob.cpp
+++ b/kdejava/koala/kdejava/MultiGetJob.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kio/jobclasses.h>
-#include <kio/global.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/global.h>
 #include <tqstring.h>
 #include <kurl.h>
 #include <tqcstring.h>
diff --git a/kdejava/koala/kdejava/NetAccess.cpp b/kdejava/koala/kdejava/NetAccess.cpp
index e2704951..c0b49db5 100644
--- a/kdejava/koala/kdejava/NetAccess.cpp
+++ b/kdejava/koala/kdejava/NetAccess.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kio/netaccess.h>
-#include <kio/global.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/global.h>
 #include <tqstring.h>
 #include <kurl.h>
 
diff --git a/kdejava/koala/kdejava/Observer.cpp b/kdejava/koala/kdejava/Observer.cpp
index cf3e70ea..7ace02a9 100644
--- a/kdejava/koala/kdejava/Observer.cpp
+++ b/kdejava/koala/kdejava/Observer.cpp
@@ -1,13 +1,13 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kio/renamedlg.h>
-#include <kio/global.h>
-#include <kio/observer.h>
+#include <tdeio/renamedlg.h>
+#include <tdeio/global.h>
+#include <tdeio/observer.h>
 #include <dcopclient.h>
-#include <kio/authinfo.h>
+#include <tdeio/authinfo.h>
 #include <tqstring.h>
 #include <dcopobject.h>
 #include <kurl.h>
-#include <kio/skipdlg.h>
+#include <tdeio/skipdlg.h>
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/kdejava/koala/kdejava/PasswordDialog.cpp b/kdejava/koala/kdejava/PasswordDialog.cpp
index bb60d287..80791b50 100644
--- a/kdejava/koala/kdejava/PasswordDialog.cpp
+++ b/kdejava/koala/kdejava/PasswordDialog.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kio/passdlg.h>
+#include <tdeio/passdlg.h>
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/kdejava/koala/kdejava/PreviewJob.cpp b/kdejava/koala/kdejava/PreviewJob.cpp
index 7ea76580..abdfa85f 100644
--- a/kdejava/koala/kdejava/PreviewJob.cpp
+++ b/kdejava/koala/kdejava/PreviewJob.cpp
@@ -3,7 +3,7 @@
 #include <tqpixmap.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <kio/previewjob.h>
+#include <tdeio/previewjob.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/ProgressBase.cpp b/kdejava/koala/kdejava/ProgressBase.cpp
index 2df6da2a..ad277a57 100644
--- a/kdejava/koala/kdejava/ProgressBase.cpp
+++ b/kdejava/koala/kdejava/ProgressBase.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kio/global.h>
-#include <kio/progressbase.h>
+#include <tdeio/global.h>
+#include <tdeio/progressbase.h>
 #include <kurl.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/kdejava/koala/kdejava/RenameDlg.cpp b/kdejava/koala/kdejava/RenameDlg.cpp
index fc890ca7..6d8edff4 100644
--- a/kdejava/koala/kdejava/RenameDlg.cpp
+++ b/kdejava/koala/kdejava/RenameDlg.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kio/renamedlg.h>
-#include <kio/global.h>
+#include <tdeio/renamedlg.h>
+#include <tdeio/global.h>
 #include <tqstring.h>
 #include <kurl.h>
 
diff --git a/kdejava/koala/kdejava/Scheduler.cpp b/kdejava/koala/kdejava/Scheduler.cpp
index 99345997..85b27f7e 100644
--- a/kdejava/koala/kdejava/Scheduler.cpp
+++ b/kdejava/koala/kdejava/Scheduler.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kio/global.h>
-#include <kio/scheduler.h>
+#include <tdeio/global.h>
+#include <tdeio/scheduler.h>
 #include <dcopclient.h>
 #include <tqstring.h>
 #include <dcopobject.h>
diff --git a/kdejava/koala/kdejava/SessionData.cpp b/kdejava/koala/kdejava/SessionData.cpp
index 58733673..0ffa30c1 100644
--- a/kdejava/koala/kdejava/SessionData.cpp
+++ b/kdejava/koala/kdejava/SessionData.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kio/sessiondata.h>
-#include <kio/global.h>
+#include <tdeio/sessiondata.h>
+#include <tdeio/global.h>
 #include <tqstring.h>
 #include <tqcstring.h>
 
diff --git a/kdejava/koala/kdejava/SimpleJob.cpp b/kdejava/koala/kdejava/SimpleJob.cpp
index 88558cd8..10403282 100644
--- a/kdejava/koala/kdejava/SimpleJob.cpp
+++ b/kdejava/koala/kdejava/SimpleJob.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kio/jobclasses.h>
-#include <kio/global.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/global.h>
 #include <tqstring.h>
 #include <kurl.h>
 #include <tqcstring.h>
diff --git a/kdejava/koala/kdejava/SkipDlg.cpp b/kdejava/koala/kdejava/SkipDlg.cpp
index 781af808..1dc06ee3 100644
--- a/kdejava/koala/kdejava/SkipDlg.cpp
+++ b/kdejava/koala/kdejava/SkipDlg.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
-#include <kio/skipdlg.h>
+#include <tdeio/skipdlg.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/Slave.cpp b/kdejava/koala/kdejava/Slave.cpp
index 87bfc0d0..5a4c8e3e 100644
--- a/kdejava/koala/kdejava/Slave.cpp
+++ b/kdejava/koala/kdejava/Slave.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kio/slave.h>
-#include <kio/global.h>
+#include <tdeio/slave.h>
+#include <tdeio/global.h>
 #include <tqstring.h>
 #include <kurl.h>
 #include <tqcstring.h>
diff --git a/kdejava/koala/kdejava/SlaveBase.cpp b/kdejava/koala/kdejava/SlaveBase.cpp
index 9a9ca11f..4c586a86 100644
--- a/kdejava/koala/kdejava/SlaveBase.cpp
+++ b/kdejava/koala/kdejava/SlaveBase.cpp
@@ -1,7 +1,7 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kio/global.h>
-#include <kio/authinfo.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/authinfo.h>
+#include <tdeio/slavebase.h>
 #include <tqstring.h>
 #include <kurl.h>
 #include <tqcstring.h>
diff --git a/kdejava/koala/kdejava/SlaveInterface.cpp b/kdejava/koala/kdejava/SlaveInterface.cpp
index 28dae4aa..9e944a51 100644
--- a/kdejava/koala/kdejava/SlaveInterface.cpp
+++ b/kdejava/koala/kdejava/SlaveInterface.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kio/slaveinterface.h>
-#include <kio/global.h>
+#include <tdeio/slaveinterface.h>
+#include <tdeio/global.h>
 #include <tqstring.h>
 #include <kurl.h>
 #include <tqcstring.h>
diff --git a/kdejava/koala/kdejava/StatJob.cpp b/kdejava/koala/kdejava/StatJob.cpp
index f4d303ad..f1a439a2 100644
--- a/kdejava/koala/kdejava/StatJob.cpp
+++ b/kdejava/koala/kdejava/StatJob.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kio/jobclasses.h>
-#include <kio/global.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/global.h>
 #include <kurl.h>
 #include <tqcstring.h>
 
diff --git a/kdejava/koala/kdejava/StatusbarProgress.cpp b/kdejava/koala/kdejava/StatusbarProgress.cpp
index b5d40792..62065af3 100644
--- a/kdejava/koala/kdejava/StatusbarProgress.cpp
+++ b/kdejava/koala/kdejava/StatusbarProgress.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kio/statusbarprogress.h>
-#include <kio/global.h>
+#include <tdeio/statusbarprogress.h>
+#include <tdeio/global.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/StoredTransferJob.cpp b/kdejava/koala/kdejava/StoredTransferJob.cpp
index c9396d6c..cf1abfd5 100644
--- a/kdejava/koala/kdejava/StoredTransferJob.cpp
+++ b/kdejava/koala/kdejava/StoredTransferJob.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 #include <kurl.h>
 #include <tqcstring.h>
 
diff --git a/kdejava/koala/kdejava/TDEConfig.cpp b/kdejava/koala/kdejava/TDEConfig.cpp
index dc571a89..cdefbcfe 100644
--- a/kdejava/koala/kdejava/TDEConfig.cpp
+++ b/kdejava/koala/kdejava/TDEConfig.cpp
@@ -1,8 +1,8 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kconfigdata.h>
+#include <tdeconfigdata.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/kdejava/koala/kdejava/TDEConfigBackEnd.cpp b/kdejava/koala/kdejava/TDEConfigBackEnd.cpp
index 5834b960..521d96e4 100644
--- a/kdejava/koala/kdejava/TDEConfigBackEnd.cpp
+++ b/kdejava/koala/kdejava/TDEConfigBackEnd.cpp
@@ -1,8 +1,8 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <tqcstring.h>
-#include <kconfigbackend.h>
+#include <tdeconfigbackend.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/TDEConfigBase.cpp b/kdejava/koala/kdejava/TDEConfigBase.cpp
index 7ae6c398..73fcf72c 100644
--- a/kdejava/koala/kdejava/TDEConfigBase.cpp
+++ b/kdejava/koala/kdejava/TDEConfigBase.cpp
@@ -6,7 +6,7 @@
 #include <tqglobal.h>
 #include <tqstring.h>
 #include <tqstrlist.h>
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <tqpoint.h>
 #include <tqvariant.h>
 #include <tqstringlist.h>
diff --git a/kdejava/koala/kdejava/TDEConfigGroup.cpp b/kdejava/koala/kdejava/TDEConfigGroup.cpp
index 43bfa969..3ab3d917 100644
--- a/kdejava/koala/kdejava/TDEConfigGroup.cpp
+++ b/kdejava/koala/kdejava/TDEConfigGroup.cpp
@@ -1,7 +1,7 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kconfigdata.h>
+#include <tdeconfigdata.h>
 #include <tqstring.h>
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/kdejava/koala/kdejava/TDEConfigGroupSaver.cpp b/kdejava/koala/kdejava/TDEConfigGroupSaver.cpp
index 91dc2500..42f01c8c 100644
--- a/kdejava/koala/kdejava/TDEConfigGroupSaver.cpp
+++ b/kdejava/koala/kdejava/TDEConfigGroupSaver.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/kdejava/koala/kdejava/TDEConfigINIBackEnd.cpp b/kdejava/koala/kdejava/TDEConfigINIBackEnd.cpp
index 585d0e15..2a6136a1 100644
--- a/kdejava/koala/kdejava/TDEConfigINIBackEnd.cpp
+++ b/kdejava/koala/kdejava/TDEConfigINIBackEnd.cpp
@@ -1,8 +1,8 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqfile.h>
-#include <kconfigdata.h>
+#include <tdeconfigdata.h>
 #include <tqstring.h>
-#include <kconfigbackend.h>
+#include <tdeconfigbackend.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/TDEIO.cpp b/kdejava/koala/kdejava/TDEIO.cpp
index 5e94eb16..a891dd45 100644
--- a/kdejava/koala/kdejava/TDEIO.cpp
+++ b/kdejava/koala/kdejava/TDEIO.cpp
@@ -1,24 +1,24 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kio/renamedlg.h>
-#include <kio/global.h>
+#include <tdeio/renamedlg.h>
+#include <tdeio/global.h>
 #include <tdeparts/browserextension.h>
 #include <tqdatastream.h>
-#include <kio/authinfo.h>
+#include <tdeio/authinfo.h>
 #include <tqstring.h>
 #include <tqdom.h>
 #include <tdeparts/part.h>
 #include <kurl.h>
-#include <kio/skipdlg.h>
+#include <tdeio/skipdlg.h>
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
 #include <kdejava/KIO.h>
-#include <kio/job.h>
-#include <kio/davjob.h>
-#include <kio/metainfojob.h>
-#include <kio/previewjob.h>
-#include <kio/paste.h>
+#include <tdeio/job.h>
+#include <tdeio/davjob.h>
+#include <tdeio/metainfojob.h>
+#include <tdeio/previewjob.h>
+#include <tdeio/paste.h>
 
 JNIEXPORT jstring JNICALL
 Java_org_kde_koala_KIO_buildErrorString(JNIEnv* env, jclass cls, jint errorCode, jstring errorText)
diff --git a/kdejava/koala/kdejava/TransferJob.cpp b/kdejava/koala/kdejava/TransferJob.cpp
index d1f3b4b4..5c027f7c 100644
--- a/kdejava/koala/kdejava/TransferJob.cpp
+++ b/kdejava/koala/kdejava/TransferJob.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <kio/jobclasses.h>
-#include <kio/global.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/global.h>
 #include <tqstring.h>
 #include <kurl.h>
 #include <tqcstring.h>
diff --git a/kdejava/koala/org/kde/koala/Job.java b/kdejava/koala/org/kde/koala/Job.java
index debc3f1d..697570d5 100644
--- a/kdejava/koala/org/kde/koala/Job.java
+++ b/kdejava/koala/org/kde/koala/Job.java
@@ -37,7 +37,7 @@ public class Job extends TQObject  {
 		 Abort this job.
 		 This kills all subjobs and deletes the job.
 			@param tquietly if false, Job will emit signal result
-		 and ask kio_uiserver to close the progress window.
+		 and ask tdeio_uiserver to close the progress window.
 		 <code>tquietly</code> is set to true for subjobs. Whether applications
 		 should call with true or false depends on whether they rely
 		 on result being emitted or not.
diff --git a/kdejava/koala/org/kde/koala/KBugReport.java b/kdejava/koala/org/kde/koala/KBugReport.java
index 42384963..24d4513a 100644
--- a/kdejava/koala/org/kde/koala/KBugReport.java
+++ b/kdejava/koala/org/kde/koala/KBugReport.java
@@ -64,8 +64,8 @@ public class KBugReport extends KDialogBase  {
 	*/
 	protected native boolean sendBugReport();
 	/**	
-		 "Configure email" has been clicked - this calls kcmshell System/email
-		   		@short    "Configure email" has been clicked - this calls kcmshell System/email
+		 "Configure email" has been clicked - this calls tdecmshell System/email
+		   		@short    "Configure email" has been clicked - this calls tdecmshell System/email
 	*/
 	protected native void slotConfigureEmail();
 	/**	
diff --git a/kdejava/koala/org/kde/koala/KFile.java b/kdejava/koala/org/kde/koala/KFile.java
index 96ddfa2c..9de3ff61 100644
--- a/kdejava/koala/org/kde/koala/KFile.java
+++ b/kdejava/koala/org/kde/koala/KFile.java
@@ -7,9 +7,9 @@ import org.kde.qt.QtSupport;
 /**
 
  KFile is a class which provides a namespace for some enumerated
- values associated with the kfile library.  You will never need to
+ values associated with the tdefile library.  You will never need to
  construct a KFile object itself.
- 		@short    KFile is a class which provides a namespace for some enumerated  values associated with the kfile library.
+ 		@short    KFile is a class which provides a namespace for some enumerated  values associated with the tdefile library.
 
 */
 public class KFile implements QtSupport {
diff --git a/kdejava/koala/org/kde/koala/KFileDialog.java b/kdejava/koala/org/kde/koala/KFileDialog.java
index d2ae5f6f..7f8957da 100644
--- a/kdejava/koala/org/kde/koala/KFileDialog.java
+++ b/kdejava/koala/org/kde/koala/KFileDialog.java
@@ -20,7 +20,7 @@ import org.kde.qt.TQWidget;
  The dialog has been designed to allow applications to customise it
  by subclassing. It uses geometry management to ensure that subclasses
  can easily add children that will be incorporated into the layout.
- \image html kfiledialog.png "KDE File Dialog"
+ \image html tdefiledialog.png "KDE File Dialog"
  See {@link KFileDialogSignals} for signals emitted by KFileDialog
 		@author Richard J. Moore <rich@kde.org>, Carsten Pfeiffer <pfeiffer@kde.org>
  
@@ -225,11 +225,11 @@ public class KFileDialog extends KDialogBase  {
 		 If no | is found in the expression, just the namefilter is
 		 shown. Examples:
 			 <pre>
-		 kfile.setFilter("*.cpp|C++ Source Files\n.h|Header files");
-		 kfile.setFilter("*.cpp");
-		 kfile.setFilter("*.cpp|Sources (.cpp)");
-		 kfile.setFilter("*.cpp|" + i18n("Sources (.cpp)"));
-		 kfile.setFilter("*.cpp .cc .C|C++ Source Files\n.h .H|Header files");
+		 tdefile.setFilter("*.cpp|C++ Source Files\n.h|Header files");
+		 tdefile.setFilter("*.cpp");
+		 tdefile.setFilter("*.cpp|Sources (.cpp)");
+		 tdefile.setFilter("*.cpp|" + i18n("Sources (.cpp)"));
+		 tdefile.setFilter("*.cpp .cc .C|C++ Source Files\n.h .H|Header files");
 		 </pre>
 			 Note: The text to display is not parsed in any way. So, if you
 		 want to show the suffix to select by a specific filter, you must
@@ -239,8 +239,8 @@ public class KFileDialog extends KDialogBase  {
 		 a '\'. You can specify multiple mimetypes like this (separated with
 		 space):
 			 <pre>
-		 kfile.setFilter( "image/png text/html text/plain" );
-		 kfile.setFilter( "*.cue|CUE\\/BIN Files (.cue)" );
+		 tdefile.setFilter( "image/png text/html text/plain" );
+		 tdefile.setFilter( "*.cue|CUE\\/BIN Files (.cue)" );
 		 </pre>
 				@short    Sets the filter to be used to <code>filter.</code>
 		@see #filterChanged
@@ -326,7 +326,7 @@ public class KFileDialog extends KDialogBase  {
 		      yourAction = new KAction( i18n("Your Action"), 0,
 		                                this, SLOT("yourSlot()"),
 		                                this, "action name" );
-		      yourAction.plug( kfileDialog.toolBar() );
+		      yourAction.plug( tdefileDialog.toolBar() );
 		 </pre>
 		     		@short    Returns a pointer to the toolbar.
 	*/
diff --git a/kdejava/koala/org/kde/koala/KFileItem.java b/kdejava/koala/org/kde/koala/KFileItem.java
index 29790ff6..94ee6e7e 100644
--- a/kdejava/koala/org/kde/koala/KFileItem.java
+++ b/kdejava/koala/org/kde/koala/KFileItem.java
@@ -447,11 +447,11 @@ public class KFileItem implements QtSupport {
 			 I.e. a KFileIconView that associates a KFileIconViewItem (an item suitable
 		 for use with TQIconView) does
 			 <pre>
-		 kfileItem.setExtraData( this, iconViewItem );
+		 tdefileItem.setExtraData( this, iconViewItem );
 		 </pre>
 			 and can later access the iconViewItem by doing
 			 <pre>
-		 KFileIconViewItem iconViewItem = (KFileIconViewItem)( kfileItem.extraData( this ));
+		 KFileIconViewItem iconViewItem = (KFileIconViewItem)( tdefileItem.extraData( this ));
 		 </pre>
 			 This is usually more efficient then having every view associate data to
 		 items by using a separate TQDict or TQMap.
diff --git a/kdejava/koala/org/kde/koala/KFilePlugin.java b/kdejava/koala/org/kde/koala/KFilePlugin.java
index 000c4ac4..3b00e4c9 100644
--- a/kdejava/koala/org/kde/koala/KFilePlugin.java
+++ b/kdejava/koala/org/kde/koala/KFilePlugin.java
@@ -92,7 +92,7 @@ import org.kde.qt.TQObject;
  Example:
   @code
   typedef KGenericFactory<FooPlugin> FooFactory;
-  K_EXPORT_COMPONENT_FACTORY(kfile_foo, FooFactory("kfile_foo"));
+  K_EXPORT_COMPONENT_FACTORY(tdefile_foo, FooFactory("tdefile_foo"));
   @endcode
  To make your plugin available within KDE, you also need to provide a
  <code>.desktop</code> file which describes your plugin. The required fields in the
@@ -115,7 +115,7 @@ import org.kde.qt.TQObject;
   Type=Service
   Name=Foo Info
   ServiceTypes=KFilePlugin
-  X-TDE-Library=kfile_foo
+  X-TDE-Library=tdefile_foo
   MimeType=application/x-foo
   PreferredGroups=FooInfo
   PreferredItems=Items,Size
diff --git a/kdejava/koala/org/kde/koala/KHistoryCombo.java b/kdejava/koala/org/kde/koala/KHistoryCombo.java
index 780f6a07..97e7bbee 100644
--- a/kdejava/koala/org/kde/koala/KHistoryCombo.java
+++ b/kdejava/koala/org/kde/koala/KHistoryCombo.java
@@ -147,7 +147,7 @@ public class KHistoryCombo extends KComboBox  {
 		 KPixmapProvider is just an abstract class with the one pure virtual
 		 method KPixmapProvider.pixmapFor(). This method is called whenever
 		 an item is added to the KHistoryComboBox. Implement it to return your
-		 own custom pixmaps, or use the KURLPixmapProvider from libkio,
+		 own custom pixmaps, or use the KURLPixmapProvider from libtdeio,
 		 which uses KMimeType.pixmapForURL to resolve icons.
 			 Set <code>prov</code> to null if you want to disable pixmaps. Default no pixmaps.
 				@short    Sets a pixmap provider, so that items in the combobox can have a pixmap.
diff --git a/kdejava/koala/org/kde/koala/KMainWindow.java b/kdejava/koala/org/kde/koala/KMainWindow.java
index cb852c36..7f2108a1 100644
--- a/kdejava/koala/org/kde/koala/KMainWindow.java
+++ b/kdejava/koala/org/kde/koala/KMainWindow.java
@@ -680,7 +680,7 @@ public class KMainWindow extends TQMainWindow implements KXMLGUIBuilderInterface
 		 Save your instance-specific properties. The function is
 		 invoked when the session manager requests your application
 		 to save its state.
-			 You <b>must</b> <b>not</b> change the group of the <code>kconfig</code> object, since
+			 You <b>must</b> <b>not</b> change the group of the <code>tdeconfig</code> object, since
 		 KMainWindow uses one group for each window.  Please
 		 reimplement these function in childclasses.
 			 Note: No user interaction is allowed
diff --git a/kdejava/koala/org/kde/koala/KProtocolInfo.java b/kdejava/koala/org/kde/koala/KProtocolInfo.java
index a9c35303..858bce91 100644
--- a/kdejava/koala/org/kde/koala/KProtocolInfo.java
+++ b/kdejava/koala/org/kde/koala/KProtocolInfo.java
@@ -13,7 +13,7 @@ import java.util.ArrayList;
  KDE supports. In addition you can find out lots of information
  about a certain protocol. A KProtocolInfo instance represents a
  single protocol. Most of the functionality is provided by the static
- methods that scan the .protocol files of all installed kioslaves to get
+ methods that scan the .protocol files of all installed tdeioslaves to get
  this information.
  .protocol files are installed in the "services" resource.
 		@author Torben Weis <weis@kde.org>
@@ -483,7 +483,7 @@ public class KProtocolInfo extends KSycocaEntry  {
 	*/
 	public static native int uriParseMode(String protocol);
 	/**	
-		 Returns the list of capabilities provided by the kioslave implementing
+		 Returns the list of capabilities provided by the tdeioslave implementing
 		 this protocol.
 			 This corresponds to the "Capabilities=" field in the protocol description file.
 			 The capability names are not defined globally, they are up to each
@@ -491,11 +491,11 @@ public class KProtocolInfo extends KSycocaEntry  {
 		 special command for mounting, one would add the string "Mount" to the
 		 capabilities list, and applications could check for that string
 		 before sending a special() command that would otherwise do nothing
-		 on older kioslave implementations.
+		 on older tdeioslave implementations.
 			@param protocol the protocol to check
 				@return the list of capabilities.
 
-		@short    Returns the list of capabilities provided by the kioslave implementing  this protocol.
+		@short    Returns the list of capabilities provided by the tdeioslave implementing  this protocol.
 	*/
 	public static native ArrayList capabilities(String protocol);
 	/**	
diff --git a/kdejava/koala/org/kde/koala/KProtocolManager.java b/kdejava/koala/org/kde/koala/KProtocolManager.java
index f0d02ad3..57166d56 100644
--- a/kdejava/koala/org/kde/koala/KProtocolManager.java
+++ b/kdejava/koala/org/kde/koala/KProtocolManager.java
@@ -337,8 +337,8 @@ public class KProtocolManager implements QtSupport {
 	public static native boolean persistentConnections();
 	/**	
 		 Force a reload of the general config file of
-		 io-slaves ( kioslaverc).
-		   		@short    Force a reload of the general config file of  io-slaves ( kioslaverc).
+		 io-slaves ( tdeioslaverc).
+		   		@short    Force a reload of the general config file of  io-slaves ( tdeioslaverc).
 	*/
 	public static native void reparseConfiguration();
 	/**	
diff --git a/kdejava/koala/org/kde/koala/KSycoca.java b/kdejava/koala/org/kde/koala/KSycoca.java
index 6386cafa..17aa7dba 100644
--- a/kdejava/koala/org/kde/koala/KSycoca.java
+++ b/kdejava/koala/org/kde/koala/KSycoca.java
@@ -80,8 +80,8 @@ public class KSycoca extends TQObject implements DCOPObjectInterface {
 	*/
 	public native void disableAutoRebuild();
 	/**	
-		 internal function for receiving kded/kbuildsycoca's signal, when the sycoca file changes
-		    		@short    internal function for receiving kded/kbuildsycoca's signal, when the sycoca file changes
+		 internal function for receiving kded/tdebuildsycoca's signal, when the sycoca file changes
+		    		@short    internal function for receiving kded/tdebuildsycoca's signal, when the sycoca file changes
 	*/
 	// void notifyDatabaseChanged(const TQStringList& arg1); >>>> NOT CONVERTED
 	/**	
diff --git a/kdejava/koala/org/kde/koala/KZip.java b/kdejava/koala/org/kde/koala/KZip.java
index c6c9e6ae..60a8b9cb 100644
--- a/kdejava/koala/org/kde/koala/KZip.java
+++ b/kdejava/koala/org/kde/koala/KZip.java
@@ -8,7 +8,7 @@ import org.kde.qt.TQIODeviceInterface;
 
 /**
 
-   This class implements a kioslave to access zip files from KDE.
+   This class implements a tdeioslave to access zip files from KDE.
    You can use it in IO_ReadOnly or in IO_WriteOnly mode, and it
    behaves just as expected.
    It can also be used in IO_ReadWrite mode, in this case one can
diff --git a/kdejava/koala/org/kde/koala/Observer.java b/kdejava/koala/org/kde/koala/Observer.java
index 6f879f37..951008c7 100644
--- a/kdejava/koala/org/kde/koala/Observer.java
+++ b/kdejava/koala/org/kde/koala/Observer.java
@@ -129,7 +129,7 @@ public class Observer extends TQObject implements DCOPObjectInterface {
 			@param buttonYes the text of the "Yes" button
 			@param buttonNo the text of the "No button
 			@param dontAskAgainName A checkbox is added with which further confirmation can be turned off.
-		        The string is used to lookup and store the setting in kioslaverc.
+		        The string is used to lookup and store the setting in tdeioslaverc.
 				@short    Popup a message box.
 	*/
 	public static native int messageBox(int progressId, int type, String text, String caption, String buttonYes, String buttonNo, String dontAskAgainName);
diff --git a/kdejava/koala/org/kde/koala/SimpleJob.java b/kdejava/koala/org/kde/koala/SimpleJob.java
index af7ca172..95b3a8a1 100644
--- a/kdejava/koala/org/kde/koala/SimpleJob.java
+++ b/kdejava/koala/org/kde/koala/SimpleJob.java
@@ -44,7 +44,7 @@ public class SimpleJob extends Job  {
 		 This kills all subjobs and deletes the job.
 			@param tquietly if true, Job will emit signal result
 		 Should only be set to false when the user kills the job
-		 (from kio_uiserver), not when you want to abort a job.
+		 (from tdeio_uiserver), not when you want to abort a job.
 		         		@short    Abort job.
 	*/
 	public native void kill(boolean tquietly);
diff --git a/kdejava/koala/org/kde/koala/Slave.java b/kdejava/koala/org/kde/koala/Slave.java
index 1da49223..f576294b 100644
--- a/kdejava/koala/org/kde/koala/Slave.java
+++ b/kdejava/koala/org/kde/koala/Slave.java
@@ -96,33 +96,33 @@ public class Slave extends SlaveInterface  {
 	*/
 	public native String passwd();
 	/**	
-		 Suspends the operation of the attached kioslave.
-			 		@short    Suspends the operation of the attached kioslave.
+		 Suspends the operation of the attached tdeioslave.
+			 		@short    Suspends the operation of the attached tdeioslave.
 	*/
 	public native void suspend();
 	/**	
-		 Resumes the operation of the attached kioslave.
-			 		@short    Resumes the operation of the attached kioslave.
+		 Resumes the operation of the attached tdeioslave.
+			 		@short    Resumes the operation of the attached tdeioslave.
 	*/
 	public native void resume();
 	/**	
-		 Tells wether the kioslave is suspended.
-				@return true if the kioslave is suspended.
+		 Tells wether the tdeioslave is suspended.
+				@return true if the tdeioslave is suspended.
 
-		@short    Tells wether the kioslave is suspended.
+		@short    Tells wether the tdeioslave is suspended.
 	*/
 	public native boolean suspended();
 	/**	
-		 Sends the given command to the kioslave.
+		 Sends the given command to the tdeioslave.
 			@param cmd command id
 			@param data byte array containing data
-				@short    Sends the given command to the kioslave.
+				@short    Sends the given command to the tdeioslave.
 	*/
 	public native void send(int cmd, byte[] data);
 	public native void send(int cmd);
 	/**	
-		 Puts the kioslave associated with <code>url</code> at halt.
-			 		@short    Puts the kioslave associated with <code>url</code> at halt.
+		 Puts the tdeioslave associated with <code>url</code> at halt.
+			 		@short    Puts the tdeioslave associated with <code>url</code> at halt.
 	*/
 	public native void hold(KURL url);
 	/**	
diff --git a/kdejava/koala/org/kde/koala/SlaveBase.java b/kdejava/koala/org/kde/koala/SlaveBase.java
index 9b1f96ea..0eb4012b 100644
--- a/kdejava/koala/org/kde/koala/SlaveBase.java
+++ b/kdejava/koala/org/kde/koala/SlaveBase.java
@@ -7,11 +7,11 @@ import org.kde.qt.QtSupport;
 /**
 
  There are two classes that specifies the protocol between application (job)
- and kioslave. SlaveInterface is the class to use on the application end,
+ and tdeioslave. SlaveInterface is the class to use on the application end,
  SlaveBase is the one to use on the slave end.
  Slave implementations should simply inherit SlaveBase
  A call to foo() results in a call to slotFoo() on the other end.
- 		@short    There are two classes that specifies the protocol between application (job)  and kioslave.
+ 		@short    There are two classes that specifies the protocol between application (job)  and tdeioslave.
 
 */
 public class SlaveBase implements QtSupport {
@@ -209,7 +209,7 @@ public class SlaveBase implements QtSupport {
 		 Note: for ContinueCancel, buttonYes is the continue button and buttonNo is unused.
 		       and for Information, none is used.
 			@param dontAskAgainName A checkbox is added with which further confirmation can be turned off.
-		        The string is used to lookup and store the setting in kioslaverc.
+		        The string is used to lookup and store the setting in tdeioslaverc.
 				@return a button code, as defined in KMessageBox, or 0 on communication error.
 
 		@short    Call this to show a message box from the slave
diff --git a/kdejava/koala/org/kde/koala/SlaveInterface.java b/kdejava/koala/org/kde/koala/SlaveInterface.java
index 5a092211..7c2d14a4 100644
--- a/kdejava/koala/org/kde/koala/SlaveInterface.java
+++ b/kdejava/koala/org/kde/koala/SlaveInterface.java
@@ -9,11 +9,11 @@ import org.kde.qt.TQObject;
 /**
 
  There are two classes that specifies the protocol between application
- (KIO.Job) and kioslave. SlaveInterface is the class to use on the application
+ (KIO.Job) and tdeioslave. SlaveInterface is the class to use on the application
  end, SlaveBase is the one to use on the slave end.
  A call to foo() results in a call to slotFoo() on the other end.
   See {@link SlaveInterfaceSignals} for signals emitted by SlaveInterface
-		@short    There are two classes that specifies the protocol between application  (KIO.Job) and kioslave.
+		@short    There are two classes that specifies the protocol between application  (KIO.Job) and tdeioslave.
 
 */
 public class SlaveInterface extends TQObject  {
diff --git a/kdejava/koala/org/kde/koala/StatJob.java b/kdejava/koala/org/kde/koala/StatJob.java
index b413b042..f3706896 100644
--- a/kdejava/koala/org/kde/koala/StatJob.java
+++ b/kdejava/koala/org/kde/koala/StatJob.java
@@ -33,7 +33,7 @@ public class StatJob extends SimpleJob  {
 	/**	
 		 A stat() can have two meanings. Either we want to read from this URL,
 		 or to check if we can write to it. First case is "source", second is "dest".
-		 It is necessary to know what the StatJob is for, to tune the kioslave's behavior
+		 It is necessary to know what the StatJob is for, to tune the tdeioslave's behavior
 		 (e.g. with FTP).
 			@param source true for "source" mode, false for "dest" mode
 		         		@short    A stat() can have two meanings.
diff --git a/kdejava/koala/org/kde/koala/TDECModule.java b/kdejava/koala/org/kde/koala/TDECModule.java
index 3f26535e..b82a54e7 100644
--- a/kdejava/koala/org/kde/koala/TDECModule.java
+++ b/kdejava/koala/org/kde/koala/TDECModule.java
@@ -221,8 +221,8 @@ public class TDECModule extends TQWidget  {
 			 Help: shows a "Help" button.
 		 Default: shows a "Use Defaults" button
 		 Apply: in kcontrol this will show an "Apply" and "Reset" button
-		        in kcmshell this will show an "Ok", "Apply" and "Cancel" button
-			 If Apply is not specified, kcmshell will show a "Close" button.
+		        in tdecmshell this will show an "Ok", "Apply" and "Cancel" button
+			 If Apply is not specified, tdecmshell will show a "Close" button.
 				@short    Sets the buttons to display.
 		@see TDECModule#buttons
 	*/
diff --git a/kdejava/koala/org/kde/koala/TDEConfig.java b/kdejava/koala/org/kde/koala/TDEConfig.java
index 9eedc94d..ac0d530f 100644
--- a/kdejava/koala/org/kde/koala/TDEConfig.java
+++ b/kdejava/koala/org/kde/koala/TDEConfig.java
@@ -138,7 +138,7 @@ public class TDEConfig extends TDEConfigBase  {
 	public native boolean forceGlobal();
 	/**	
 		 Checks whether the config file contains the update <code>id</code>
-		 as contained in <code>updateFile.</code> If not, it runs kconf_update
+		 as contained in <code>updateFile.</code> If not, it runs tdeconf_update
 		 to update the config file.
 			 If you install config update files with critical fixes
 		 you may wish to use this method to verify that a critical
diff --git a/kdejava/koala/org/kde/koala/TDEIO.java b/kdejava/koala/org/kde/koala/TDEIO.java
index 7fe6837d..716744ac 100644
--- a/kdejava/koala/org/kde/koala/TDEIO.java
+++ b/kdejava/koala/org/kde/koala/TDEIO.java
@@ -709,7 +709,7 @@ public class KIO {
 			@param url the URL of the file
 			@param sideIsSource is true when stating a source file (we will do a get on it if
 		 the stat works) and false when stating a destination file (target of a copy).
-		 The reason for this parameter is that in some cases the kioslave might not
+		 The reason for this parameter is that in some cases the tdeioslave might not
 		 be able to determine a file's existence (e.g. HTTP doesn't allow it, FTP
 		 has issues with case-sensitivity on some systems).
 		 When the slave can't reliably determine the existence of a file, it will:
diff --git a/kdejava/koala/test/kioslave/KioslaveTest.java b/kdejava/koala/test/tdeioslave/KioslaveTest.java
index 2cd2ba82..d8f9f683 100644
--- a/kdejava/koala/test/kioslave/KioslaveTest.java
+++ b/kdejava/koala/test/tdeioslave/KioslaveTest.java
@@ -510,7 +510,7 @@ void stopJob() {
 }
 
 static String version = "v0.0.0 0000";   // :-)
-static String description = "Test for kioslaves";
+static String description = "Test for tdeioslaves";
 static String[][] options =
 {
  { "s", null, null },
@@ -524,7 +524,7 @@ static String[][] options =
 };
 
 public static void main(String[] argv) {
-  TDECmdLineArgs.init( argv, "kioslavetest", "KIOSlaveTest", description, version );
+  TDECmdLineArgs.init( argv, "tdeioslavetest", "KIOSlaveTest", description, version );
   TDECmdLineArgs.addCmdLineOptions( options );
   TDEApplication app = new TDEApplication();