From 64df902cf71a8ee258fb85f6be26248f399aa01f Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 01:05:15 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 kmail/ChangeLog                  | 2 +-
 kmail/Makefile.am                | 2 +-
 kmail/accountdialog.cpp          | 4 ++--
 kmail/accountmanager.cpp         | 2 +-
 kmail/accountwizard.cpp          | 2 +-
 kmail/acljobs.cpp                | 2 +-
 kmail/acljobs.h                  | 2 +-
 kmail/actionscheduler.cpp        | 2 +-
 kmail/annotationjobs.cpp         | 2 +-
 kmail/annotationjobs.h           | 2 +-
 kmail/antispamconfig.cpp         | 2 +-
 kmail/antispamwizard.h           | 2 +-
 kmail/archivefolderdialog.cpp    | 2 +-
 kmail/cachedimapjob.cpp          | 4 ++--
 kmail/cachedimapjob.h            | 4 ++--
 kmail/configure.in.in            | 2 +-
 kmail/configuredialog.cpp        | 2 +-
 kmail/csshelper.cpp              | 2 +-
 kmail/editorwatcher.cpp          | 2 +-
 kmail/favoritefolderview.cpp     | 2 +-
 kmail/filterimporterexporter.cpp | 4 ++--
 kmail/filterlogdlg.cpp           | 2 +-
 kmail/folderdiaquotatab_p.cpp    | 2 +-
 kmail/folderjob.cpp              | 2 +-
 kmail/folderstorage.cpp          | 2 +-
 kmail/foldertreebase.cpp         | 2 +-
 kmail/headeritem.cpp             | 2 +-
 kmail/headerstrategy.cpp         | 2 +-
 kmail/htmlstatusbar.cpp          | 2 +-
 kmail/identitydialog.cpp         | 4 ++--
 kmail/imapaccountbase.cpp        | 8 ++++----
 kmail/imapaccountbase.h          | 4 ++--
 kmail/imapjob.cpp                | 2 +-
 kmail/imapjob.h                  | 4 ++--
 kmail/kmaccount.cpp              | 2 +-
 kmail/kmacctcachedimap.cpp       | 8 ++++----
 kmail/kmacctimap.cpp             | 4 ++--
 kmail/kmacctlocal.cpp            | 2 +-
 kmail/kmacctmaildir.cpp          | 2 +-
 kmail/kmail.upd                  | 4 ++--
 kmail/kmailicalifaceimpl.cpp     | 2 +-
 kmail/kmcommands.cpp             | 8 ++++----
 kmail/kmcommands.h               | 2 +-
 kmail/kmcomposewin.cpp           | 8 ++++----
 kmail/kmcomposewin.h             | 2 +-
 kmail/kmedit.cpp                 | 2 +-
 kmail/kmfawidgets.cpp            | 2 +-
 kmail/kmfilter.cpp               | 2 +-
 kmail/kmfilteraction.cpp         | 2 +-
 kmail/kmfilterdlg.cpp            | 2 +-
 kmail/kmfiltermgr.cpp            | 2 +-
 kmail/kmfolder.cpp               | 2 +-
 kmail/kmfoldercachedimap.cpp     | 6 +++---
 kmail/kmfolderdia.cpp            | 2 +-
 kmail/kmfolderimap.cpp           | 4 ++--
 kmail/kmfolderimap.h             | 4 ++--
 kmail/kmfoldermaildir.cpp        | 2 +-
 kmail/kmfoldermaildir.h          | 2 +-
 kmail/kmfoldermbox.cpp           | 2 +-
 kmail/kmfoldermgr.cpp            | 2 +-
 kmail/kmfoldersearch.cpp         | 2 +-
 kmail/kmfoldertree.cpp           | 2 +-
 kmail/kmheaders.cpp              | 2 +-
 kmail/kmkernel.cpp               | 6 +++---
 kmail/kmkernel.h                 | 2 +-
 kmail/kmlineeditspell.cpp        | 2 +-
 kmail/kmmainwidget.cpp           | 2 +-
 kmail/kmmainwin.cpp              | 2 +-
 kmail/kmmessage.cpp              | 2 +-
 kmail/kmmimeparttree.cpp         | 2 +-
 kmail/kmmimeparttree.h           | 2 +-
 kmail/kmmsgpart.h                | 2 +-
 kmail/kmmsgpartdlg.h             | 2 +-
 kmail/kmpopfiltercnfrmdlg.cpp    | 2 +-
 kmail/kmreaderwin.cpp            | 4 ++--
 kmail/kmsearchpattern.cpp        | 2 +-
 kmail/kmsender.cpp               | 6 +++---
 kmail/kmsender_p.h               | 2 +-
 kmail/kmservertest.cpp           | 8 ++++----
 kmail/kmtransport.cpp            | 2 +-
 kmail/listjob.cpp                | 6 +++---
 kmail/mailinglist-magic.cpp      | 2 +-
 kmail/networkaccount.cpp         | 4 ++--
 kmail/objecttreeparser.cpp       | 2 +-
 kmail/partNode.h                 | 2 +-
 kmail/popaccount.cpp             | 6 +++---
 kmail/quotajobs.cpp              | 2 +-
 kmail/quotajobs.h                | 2 +-
 kmail/renamejob.cpp              | 6 +++---
 kmail/searchjob.cpp              | 8 ++++----
 kmail/searchwindow.cpp           | 2 +-
 kmail/sieveconfig.cpp            | 2 +-
 kmail/sievejob.cpp               | 4 ++--
 kmail/sievejob.h                 | 2 +-
 kmail/snippetwidget.cpp          | 2 +-
 kmail/transportmanager.cpp       | 2 +-
 kmail/util.h                     | 2 +-
 kmail/xfaceconfigurator.cpp      | 4 ++--
 98 files changed, 143 insertions(+), 143 deletions(-)

(limited to 'kmail')

diff --git a/kmail/ChangeLog b/kmail/ChangeLog
index 1873a13d..2f263c27 100644
--- a/kmail/ChangeLog
+++ b/kmail/ChangeLog
@@ -557,7 +557,7 @@ Sun Sep  6 18:28:45 1998  Markus Wuebben  <markus@kde.org>
 	stored again.
 
 	* Composer: changed completion key from Ctrl-. to Ctrl-T
-	as kfile has.
+	as tdefile has.
 
 1998-06-18  Mario Weilguni   <mweilguni@kde.org>
 
diff --git a/kmail/Makefile.am b/kmail/Makefile.am
index 6fcc46de..5f8cc6e4 100644
--- a/kmail/Makefile.am
+++ b/kmail/Makefile.am
@@ -201,7 +201,7 @@ KDE_ICON = AUTO
 rcdir = $(kde_datadir)/kmail
 rc_DATA = kmcomposerui.rc kmmainwin.rc kmreadermainwin.rc eventsrc kmail_part.rc
 
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 update_DATA = kmail.upd
 update_SCRIPTS = upgrade-transport.pl kmail-pgpidentity.pl \
                 upgrade-signature.pl kmail-upd-identities.pl \
diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp
index 8937fb48..73c3e3f0 100644
--- a/kmail/accountdialog.cpp
+++ b/kmail/accountdialog.cpp
@@ -36,7 +36,7 @@
 #include <tqtoolbutton.h>
 #include <tqgrid.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
@@ -365,7 +365,7 @@ void AccountDialog::makeLocalAccountPage()
   groupLayout->setSpacing( 6 );
   groupLayout->setMargin( 11 );
 
-  mLocal.lockProcmail = new TQRadioButton( i18n("Procmail loc&kfile:"), group);
+  mLocal.lockProcmail = new TQRadioButton( i18n("Procmail loc&tdefile:"), group);
   groupLayout->addWidget(mLocal.lockProcmail, 0, 0);
 
   mLocal.procmailLockFileName = new TQComboBox( true, group );
diff --git a/kmail/accountmanager.cpp b/kmail/accountmanager.cpp
index a2bb384f..eeed8f66 100644
--- a/kmail/accountmanager.cpp
+++ b/kmail/accountmanager.cpp
@@ -22,7 +22,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 
 #include <tqregexp.h>
diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp
index 89861527..68ba83b9 100644
--- a/kmail/accountwizard.cpp
+++ b/kmail/accountwizard.cpp
@@ -27,7 +27,7 @@
 *******************************************************************************/
 
 #include <kdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klineedit.h>
 #include <klistbox.h>
 #include <klocale.h>
diff --git a/kmail/acljobs.cpp b/kmail/acljobs.cpp
index 2aa55b0c..4b5f54f6 100644
--- a/kmail/acljobs.cpp
+++ b/kmail/acljobs.cpp
@@ -29,7 +29,7 @@
  *  your version.
  */
 #include "acljobs.h"
-#include <kio/scheduler.h>
+#include <tdeio/scheduler.h>
 #include <kdebug.h>
 
 using namespace KMail;
diff --git a/kmail/acljobs.h b/kmail/acljobs.h
index b4bfd0df..dd988343 100644
--- a/kmail/acljobs.h
+++ b/kmail/acljobs.h
@@ -32,7 +32,7 @@
 #ifndef KMACLJOBS_H
 #define KMACLJOBS_H
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <tqvaluevector.h>
 
 namespace KMail {
diff --git a/kmail/actionscheduler.cpp b/kmail/actionscheduler.cpp
index 6f8e43b0..738d6285 100644
--- a/kmail/actionscheduler.cpp
+++ b/kmail/actionscheduler.cpp
@@ -47,7 +47,7 @@
 using KMail::AccountManager;
 
 #include <tqtimer.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 
 using namespace KMail;
diff --git a/kmail/annotationjobs.cpp b/kmail/annotationjobs.cpp
index 6aa4d932..c2fd8267 100644
--- a/kmail/annotationjobs.cpp
+++ b/kmail/annotationjobs.cpp
@@ -29,7 +29,7 @@
  *  your version.
  */
 #include "annotationjobs.h"
-#include <kio/scheduler.h>
+#include <tdeio/scheduler.h>
 #include <kdebug.h>
 
 using namespace KMail;
diff --git a/kmail/annotationjobs.h b/kmail/annotationjobs.h
index 8b50a025..2e7529f2 100644
--- a/kmail/annotationjobs.h
+++ b/kmail/annotationjobs.h
@@ -32,7 +32,7 @@
 #ifndef ANNOTATIONJOBS_H
 #define ANNOTATIONJOBS_H
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <tqvaluevector.h>
 
 namespace KMail {
diff --git a/kmail/antispamconfig.cpp b/kmail/antispamconfig.cpp
index 9a1c8347..2563e4ee 100644
--- a/kmail/antispamconfig.cpp
+++ b/kmail/antispamconfig.cpp
@@ -36,7 +36,7 @@
 #include <kasciistricmp.h>
 
 #include <kstaticdeleter.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 using namespace KMail;
 
diff --git a/kmail/antispamwizard.h b/kmail/antispamwizard.h
index ed9e4a3b..031a995a 100644
--- a/kmail/antispamwizard.h
+++ b/kmail/antispamwizard.h
@@ -31,7 +31,7 @@
 
 #include "simplefoldertree.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klistbox.h>
 #include <kwizard.h>
 
diff --git a/kmail/archivefolderdialog.cpp b/kmail/archivefolderdialog.cpp
index 4f58f56c..49c9b1c3 100644
--- a/kmail/archivefolderdialog.cpp
+++ b/kmail/archivefolderdialog.cpp
@@ -29,7 +29,7 @@
 #include <kcombobox.h>
 #include <kurlrequester.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include <tqlabel.h>
 #include <tqcheckbox.h>
diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp
index 143c18c5..7b1fd517 100644
--- a/kmail/cachedimapjob.cpp
+++ b/kmail/cachedimapjob.cpp
@@ -47,8 +47,8 @@
 #include "scalix.h"
 #include "util.h"
 
-#include <kio/scheduler.h>
-#include <kio/job.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/job.h>
 
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/kmail/cachedimapjob.h b/kmail/cachedimapjob.h
index 592ba392..bdf64541 100644
--- a/kmail/cachedimapjob.h
+++ b/kmail/cachedimapjob.h
@@ -45,8 +45,8 @@
 #define CACHEDIMAPJOB_H
 
 #include "folderjob.h"
-#include <kio/job.h>
-#include <kio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/global.h>
 
 #include <tqptrlist.h>
 #include <tqvaluelist.h>
diff --git a/kmail/configure.in.in b/kmail/configure.in.in
index 694a8359..55bf6b17 100644
--- a/kmail/configure.in.in
+++ b/kmail/configure.in.in
@@ -19,7 +19,7 @@ AM_CONDITIONAL(add_indexlib, test no = "$missing_indexlib")
 
 ])
 
-dnl The following test is taken from tdelibs/kio/kio
+dnl The following test is taken from tdelibs/tdeio/tdeio
 dnl ------------------------------------------------------------------------
 dnl Try to find if we have Linux Inode based Dir Notification
 dnl ------------------------------------------------------------------------
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
index 7b24e228..61e131b2 100644
--- a/kmail/configuredialog.cpp
+++ b/kmail/configuredialog.cpp
@@ -96,7 +96,7 @@ using KMime::DateFormatter;
 #include <kstandarddirs.h>
 #include <twin.h>
 #include <knotifydialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kactivelabel.h>
 #include <kcmultidialog.h>
 #include <kcombobox.h>
diff --git a/kmail/csshelper.cpp b/kmail/csshelper.cpp
index 61bdbdd1..e5bfb7bf 100644
--- a/kmail/csshelper.cpp
+++ b/kmail/csshelper.cpp
@@ -34,7 +34,7 @@
 
 #include "globalsettings.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqcolor.h>
 #include <tqfont.h>
diff --git a/kmail/editorwatcher.cpp b/kmail/editorwatcher.cpp
index 06368967..da78a64d 100644
--- a/kmail/editorwatcher.cpp
+++ b/kmail/editorwatcher.cpp
@@ -31,7 +31,7 @@
 
 #include <cassert>
 
-// inotify stuff taken from tdelibs/kio/kio/kdirwatch.cpp
+// inotify stuff taken from tdelibs/tdeio/tdeio/kdirwatch.cpp
 #ifdef HAVE_SYS_INOTIFY
 #include <sys/ioctl.h>
 #include <sys/inotify.h>
diff --git a/kmail/favoritefolderview.cpp b/kmail/favoritefolderview.cpp
index 8b629f83..24a32bb0 100644
--- a/kmail/favoritefolderview.cpp
+++ b/kmail/favoritefolderview.cpp
@@ -40,7 +40,7 @@
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kpopupmenu.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 #include <tqheader.h>
 #include <tqtimer.h>
diff --git a/kmail/filterimporterexporter.cpp b/kmail/filterimporterexporter.cpp
index 3f6208d6..1aee8fa9 100644
--- a/kmail/filterimporterexporter.cpp
+++ b/kmail/filterimporterexporter.cpp
@@ -33,9 +33,9 @@
 #include "kmfilteraction.h"
 #include "util.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdialogbase.h>
 #include <klistview.h>
 #include <kpushbutton.h>
diff --git a/kmail/filterlogdlg.cpp b/kmail/filterlogdlg.cpp
index 911f85a4..25fb7d5c 100644
--- a/kmail/filterlogdlg.cpp
+++ b/kmail/filterlogdlg.cpp
@@ -32,7 +32,7 @@
 
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
diff --git a/kmail/folderdiaquotatab_p.cpp b/kmail/folderdiaquotatab_p.cpp
index 1faf61a1..103d961e 100644
--- a/kmail/folderdiaquotatab_p.cpp
+++ b/kmail/folderdiaquotatab_p.cpp
@@ -41,7 +41,7 @@
 
 #include "kmkernel.h"
 #include "klocale.h"
-#include "kconfig.h"
+#include "tdeconfig.h"
 #include "kdebug.h"
 #include "kdialog.h"
 #include "globalsettings.h"
diff --git a/kmail/folderjob.cpp b/kmail/folderjob.cpp
index 852082a9..657d1a9b 100644
--- a/kmail/folderjob.cpp
+++ b/kmail/folderjob.cpp
@@ -38,7 +38,7 @@
 #include "folderstorage.h"
 
 #include <kdebug.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 namespace KMail {
 
diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp
index 00368e6d..7be5c26a 100644
--- a/kmail/folderstorage.cpp
+++ b/kmail/folderstorage.cpp
@@ -49,7 +49,7 @@ using KMail::ListJob;
 #include "globalsettings.h"
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <tqfile.h>
diff --git a/kmail/foldertreebase.cpp b/kmail/foldertreebase.cpp
index b2f82ad9..e51eaecf 100644
--- a/kmail/foldertreebase.cpp
+++ b/kmail/foldertreebase.cpp
@@ -31,7 +31,7 @@
 using KPIM::MailList;
 using KPIM::MailListDrag;
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kpopupmenu.h>
 
diff --git a/kmail/headeritem.cpp b/kmail/headeritem.cpp
index 3dbb2b9f..26f5957c 100644
--- a/kmail/headeritem.cpp
+++ b/kmail/headeritem.cpp
@@ -32,7 +32,7 @@
 #include <tqbitmap.h>
 #include <tqpainter.h>
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include "headeritem.h"
 #include "kmheaders.h"
diff --git a/kmail/headerstrategy.cpp b/kmail/headerstrategy.cpp
index 4bd06811..afa581a1 100644
--- a/kmail/headerstrategy.cpp
+++ b/kmail/headerstrategy.cpp
@@ -38,7 +38,7 @@
 #include "kmkernel.h"
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 namespace KMail {
 
diff --git a/kmail/htmlstatusbar.cpp b/kmail/htmlstatusbar.cpp
index d2c35b42..fb382e15 100644
--- a/kmail/htmlstatusbar.cpp
+++ b/kmail/htmlstatusbar.cpp
@@ -43,7 +43,7 @@
 #endif
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqcolor.h>
 #include <tqstring.h>
diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp
index f180d61d..0e4e3c14 100644
--- a/kmail/identitydialog.cpp
+++ b/kmail/identitydialog.cpp
@@ -63,8 +63,8 @@ using KMail::FolderRequester;
 // other KDE headers:
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
-#include <kfileitem.h>
+#include <tdeconfig.h>
+#include <tdefileitem.h>
 #include <kurl.h>
 #include <kdebug.h>
 #include <kpushbutton.h>
diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp
index e97a260e..f464f087 100644
--- a/kmail/imapaccountbase.cpp
+++ b/kmail/imapaccountbase.cpp
@@ -52,14 +52,14 @@ using KPIM::ProgressManager;
 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 using TDEIO::MetaData;
-#include <kio/passdlg.h>
+#include <tdeio/passdlg.h>
 using TDEIO::PasswordDialog;
-#include <kio/scheduler.h>
-#include <kio/slave.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/slave.h>
 #include <mimelib/bodypart.h>
 #include <mimelib/body.h>
 #include <mimelib/headers.h>
diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h
index ec08ea5f..f1bf03f0 100644
--- a/kmail/imapaccountbase.h
+++ b/kmail/imapaccountbase.h
@@ -30,7 +30,7 @@
 
 #include <tqtimer.h>
 #include <tqguardedptr.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 class AccountManager;
 class KMFolder;
@@ -103,7 +103,7 @@ namespace KMail {
     virtual void writeConfig( TDEConfig& config );
 
     /**
-     * The state of the kioslave connection
+     * The state of the tdeioslave connection
      */
     enum ConnectionState { Error = 0, Connected, Connecting };
 
diff --git a/kmail/imapjob.cpp b/kmail/imapjob.cpp
index 2fee6acf..52a11083 100644
--- a/kmail/imapjob.cpp
+++ b/kmail/imapjob.cpp
@@ -42,7 +42,7 @@ using KPIM::ProgressManager;
 #include "util.h"
 
 #include <tqstylesheet.h>
-#include <kio/scheduler.h>
+#include <tdeio/scheduler.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <mimelib/body.h>
diff --git a/kmail/imapjob.h b/kmail/imapjob.h
index 2f7a0401..c8e00e14 100644
--- a/kmail/imapjob.h
+++ b/kmail/imapjob.h
@@ -32,8 +32,8 @@
 #ifndef IMAPJOB_H
 #define IMAPJOB_H
 
-#include <kio/job.h>
-#include <kio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/global.h>
 
 #include "folderjob.h"
 
diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp
index 64f13d76..f89b7870 100644
--- a/kmail/kmaccount.cpp
+++ b/kmail/kmaccount.cpp
@@ -28,7 +28,7 @@ using KMail::FolderJob;
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqeventloop.h>
 
diff --git a/kmail/kmacctcachedimap.cpp b/kmail/kmacctcachedimap.cpp
index 473b0b99..de22e7f6 100644
--- a/kmail/kmacctcachedimap.cpp
+++ b/kmail/kmacctcachedimap.cpp
@@ -45,13 +45,13 @@ using KMail::SieveConfig;
 using KMail::AccountManager;
 #include "progressmanager.h"
 
-#include <kio/passdlg.h>
-#include <kio/scheduler.h>
-#include <kio/slave.h>
+#include <tdeio/passdlg.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/slave.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqstylesheet.h>
 
diff --git a/kmail/kmacctimap.cpp b/kmail/kmacctimap.cpp
index a70091e7..70a5f0ca 100644
--- a/kmail/kmacctimap.cpp
+++ b/kmail/kmacctimap.cpp
@@ -45,8 +45,8 @@ using KMail::ImapAccountBase;
 #include "progressmanager.h"
 using KPIM::ProgressItem;
 using KPIM::ProgressManager;
-#include <kio/scheduler.h>
-#include <kio/slave.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/slave.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
 
diff --git a/kmail/kmacctlocal.cpp b/kmail/kmacctlocal.cpp
index 813d180c..0e941b42 100644
--- a/kmail/kmacctlocal.cpp
+++ b/kmail/kmacctlocal.cpp
@@ -18,7 +18,7 @@ using KPIM::ProgressManager;
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqfileinfo.h>
 #include <tqstylesheet.h>
diff --git a/kmail/kmacctmaildir.cpp b/kmail/kmacctmaildir.cpp
index 5a203c2d..226d99a5 100644
--- a/kmail/kmacctmaildir.cpp
+++ b/kmail/kmacctmaildir.cpp
@@ -17,7 +17,7 @@ using KPIM::ProgressManager;
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqstylesheet.h>
 
diff --git a/kmail/kmail.upd b/kmail/kmail.upd
index 150393ba..3300b258 100644
--- a/kmail/kmail.upd
+++ b/kmail/kmail.upd
@@ -76,7 +76,7 @@ Id=3.2-misc
 ########## W A R N I N G #### W A R N I N G #### W A R N I N G #######
 # collection of small adjustments. Since updates will be added to this
 # script during the pre-3.2 development, HEAD users should regularly
-# remove the "3.2-{misc,moves}-xx" keys from their kmailrc and kconf_updaterc.
+# remove the "3.2-{misc,moves}-xx" keys from their kmailrc and tdeconf_updaterc.
 # For this to work, the script MUST be idempotent, ie. be robust
 # against being run multiple times.
 ######################################################################
@@ -124,7 +124,7 @@ Id=3.3-misc
 ########## W A R N I N G #### W A R N I N G #### W A R N I N G #######
 # collection of small adjustments. Since updates will be added to this
 # script during the pre-3.3 development, HEAD users should regularly
-# remove the "3.3-{misc,moves}-xx" keys from their kmailrc and kconf_updaterc.
+# remove the "3.3-{misc,moves}-xx" keys from their kmailrc and tdeconf_updaterc.
 # For this to work, the script MUST be idempotent, ie. be robust
 # against being run multiple times.
 ######################################################################
diff --git a/kmail/kmailicalifaceimpl.cpp b/kmail/kmailicalifaceimpl.cpp
index fbafbc1b..b747be68 100644
--- a/kmail/kmailicalifaceimpl.cpp
+++ b/kmail/kmailicalifaceimpl.cpp
@@ -70,7 +70,7 @@ using KMail::AccountManager;
 #include <kinputdialog.h>
 #include <dcopclient.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 #include <ktempfile.h>
 
diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp
index 023c887d..95d6108b 100644
--- a/kmail/kmcommands.cpp
+++ b/kmail/kmcommands.cpp
@@ -61,7 +61,7 @@
 #include <libemailfunctions/email.h>
 #include <kdcopservicestarter.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kabc/stdaddressbook.h>
 #include <kabc/addresseelist.h>
 #include <kdirselectdialog.h>
@@ -76,8 +76,8 @@
 #include <tdeimproxy.h>
 #include <kuserprofile.h>
 // KIO headers
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 
 #include <libkpimidentities/identitymanager.h>
 
@@ -120,7 +120,7 @@ using KMail::RedirectDialog;
 #include "broadcaststatus.h"
 #include "globalsettings.h"
 
-#include <libtdepim/kfileio.h>
+#include <libtdepim/tdefileio.h>
 #include "kcalendariface_stub.h"
 
 #include "progressmanager.h"
diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h
index 3bb20988..dab733cc 100644
--- a/kmail/kmcommands.h
+++ b/kmail/kmcommands.h
@@ -10,7 +10,7 @@
 #include <tqvaluevector.h>
 #include <tqtimer.h>
 #include <tqfont.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include "kmmsgbase.h" // for KMMsgStatus
 #include <mimelib/string.h>
 #include <tdepimmacros.h>
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index d635b647..fe145b82 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -58,7 +58,7 @@ using KRecentAddress::RecentAddresses;
 #include <libkpimidentities/identitymanager.h>
 #include <libkpimidentities/identitycombo.h>
 #include <libkpimidentities/identity.h>
-#include <libtdepim/kfileio.h>
+#include <libtdepim/tdefileio.h>
 #include <libemailfunctions/email.h>
 #include <kleo/cryptobackendfactory.h>
 #include <kleo/exportjob.h>
@@ -69,7 +69,7 @@ using KRecentAddress::RecentAddresses;
 #include <gpgmepp/context.h>
 #include <gpgmepp/key.h>
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include "klistboxdialog.h"
 
@@ -85,12 +85,12 @@ using KRecentAddress::RecentAddresses;
 #include <kedittoolbar.h>
 #include <kkeydialog.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <twin.h>
 #include <kinputdialog.h>
 #include <kmessagebox.h>
 #include <kurldrag.h>
-#include <kio/scheduler.h>
+#include <tdeio/scheduler.h>
 #include <ktempfile.h>
 #include <klocale.h>
 #include <kapplication.h>
diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h
index 840d3434..eb108b06 100644
--- a/kmail/kmcomposewin.h
+++ b/kmail/kmcomposewin.h
@@ -28,7 +28,7 @@
 #include <tqvaluevector.h>
 #include <tqsplitter.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kglobalsettings.h>
 #include <tdeversion.h>
 #include <keditcl.h>
diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp
index 8301a12c..6f03e87d 100644
--- a/kmail/kmedit.cpp
+++ b/kmail/kmedit.cpp
@@ -18,7 +18,7 @@
 #include <maillistdrag.h>
 using KPIM::MailListDrag;
 
-#include <libtdepim/kfileio.h>
+#include <libtdepim/tdefileio.h>
 #include <libemailfunctions/email.h>
 
 #include <kcursor.h>
diff --git a/kmail/kmfawidgets.cpp b/kmail/kmfawidgets.cpp
index 0183cf88..f5fa9f9a 100644
--- a/kmail/kmfawidgets.cpp
+++ b/kmail/kmfawidgets.cpp
@@ -13,7 +13,7 @@
 #include <klocale.h>
 #include <kaudioplayer.h>
 #include <kurlrequester.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstandarddirs.h>
 
 #include <tqlayout.h>
diff --git a/kmail/kmfilter.cpp b/kmail/kmfilter.cpp
index e9e9f379..2898990d 100644
--- a/kmail/kmfilter.cpp
+++ b/kmail/kmfilter.cpp
@@ -34,7 +34,7 @@ using KMail::FilterLog;
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <assert.h>
 
diff --git a/kmail/kmfilteraction.cpp b/kmail/kmfilteraction.cpp
index 06dbb56e..1fce0df5 100644
--- a/kmail/kmfilteraction.cpp
+++ b/kmail/kmfilteraction.cpp
@@ -21,7 +21,7 @@
 #include <libkpimidentities/identity.h>
 #include <libkpimidentities/identitymanager.h>
 #include <libkpimidentities/identitycombo.h>
-#include <libtdepim/kfileio.h>
+#include <libtdepim/tdefileio.h>
 #include <libtdepim/collectingprocess.h>
 using KPIM::CollectingProcess;
 #include <mimelib/message.h>
diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp
index fd00a3cc..b5010cc3 100644
--- a/kmail/kmfilterdlg.cpp
+++ b/kmail/kmfilterdlg.cpp
@@ -26,7 +26,7 @@ using KMail::FilterImporterExporter;
 #include <kiconloader.h>
 #include <kapplication.h>
 #include <twin.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kicondialog.h>
 #include <kkeybutton.h>
 #include <klistview.h>
diff --git a/kmail/kmfiltermgr.cpp b/kmail/kmfiltermgr.cpp
index 1f5d9ad5..ac2915e7 100644
--- a/kmail/kmfiltermgr.cpp
+++ b/kmail/kmfiltermgr.cpp
@@ -23,7 +23,7 @@ using KMail::MessageProperty;
 // other KDE headers
 #include <kdebug.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 // other TQt headers
 #include <tqregexp.h>
diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp
index 5c4af405..88338a05 100644
--- a/kmail/kmfolder.cpp
+++ b/kmail/kmfolder.cpp
@@ -715,7 +715,7 @@ TQString KMFolder::idString() const
   if (!relativePath.isEmpty())
     relativePath = relativePath.right( relativePath.length() - 1 ) + "/";
   TQString escapedName = name();
-  /* Escape [ and ] as they are disallowed for kconfig sections and that is
+  /* Escape [ and ] as they are disallowed for tdeconfig sections and that is
      what the idString is primarily used for. */
   escapedName.replace( "[", "%(" );
   escapedName.replace( "]", "%)" );
diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp
index 4ce92cb1..ab66c95f 100644
--- a/kmail/kmfoldercachedimap.cpp
+++ b/kmail/kmfoldercachedimap.cpp
@@ -66,9 +66,9 @@ using KMail::ListJob;
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kconfig.h>
-#include <kio/global.h>
-#include <kio/scheduler.h>
+#include <tdeconfig.h>
+#include <tdeio/global.h>
+#include <tdeio/scheduler.h>
 #include <tqbuffer.h>
 #include <tqbuttongroup.h>
 #include <tqcombobox.h>
diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp
index 3f7208a9..ad13ac2e 100644
--- a/kmail/kmfolderdia.cpp
+++ b/kmail/kmfolderdia.cpp
@@ -55,7 +55,7 @@
 #include <knuminput.h>
 #include <kmessagebox.h>
 #include <kicondialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klistview.h>
 #include <kpushbutton.h>
diff --git a/kmail/kmfolderimap.cpp b/kmail/kmfolderimap.cpp
index 07a52c5c..ead0a943 100644
--- a/kmail/kmfolderimap.cpp
+++ b/kmail/kmfolderimap.cpp
@@ -52,8 +52,8 @@ using KMail::RenameJob;
 #include "acljobs.h"
 
 #include <kdebug.h>
-#include <kio/scheduler.h>
-#include <kconfig.h>
+#include <tdeio/scheduler.h>
+#include <tdeconfig.h>
 
 #include <tqbuffer.h>
 #include <tqtextcodec.h>
diff --git a/kmail/kmfolderimap.h b/kmail/kmfolderimap.h
index 490b13a6..5f454c59 100644
--- a/kmail/kmfolderimap.h
+++ b/kmail/kmfolderimap.h
@@ -29,8 +29,8 @@
 #include "kmfoldermbox.h"
 #include "kmmsgbase.h"
 
-#include "kio/job.h"
-#include "kio/global.h"
+#include "tdeio/job.h"
+#include "tdeio/global.h"
 
 #include <kstandarddirs.h>
 
diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp
index c6fa7be2..6f291f41 100644
--- a/kmail/kmfoldermaildir.cpp
+++ b/kmail/kmfoldermaildir.cpp
@@ -9,7 +9,7 @@
 #include <tqdir.h>
 #include <tqregexp.h>
 
-#include <libtdepim/kfileio.h>
+#include <libtdepim/tdefileio.h>
 #include "kmfoldermaildir.h"
 #include "kmfoldermgr.h"
 #include "kmfolder.h"
diff --git a/kmail/kmfoldermaildir.h b/kmail/kmfoldermaildir.h
index fc199031..b4bdb3c5 100644
--- a/kmail/kmfoldermaildir.h
+++ b/kmail/kmfoldermaildir.h
@@ -3,7 +3,7 @@
 
 #include "kmfolderindex.h"
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 #include <tqguardedptr.h>
 
diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp
index 13799680..1579db0c 100644
--- a/kmail/kmfoldermbox.cpp
+++ b/kmail/kmfoldermbox.cpp
@@ -37,7 +37,7 @@
 #include <kmessagebox.h>
 #include <knotifyclient.h>
 #include <kprocess.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <ctype.h>
 #include <stdio.h>
diff --git a/kmail/kmfoldermgr.cpp b/kmail/kmfoldermgr.cpp
index 2c3d10a5..44d2a153 100644
--- a/kmail/kmfoldermgr.cpp
+++ b/kmail/kmfoldermgr.cpp
@@ -20,7 +20,7 @@
 
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kapplication.h>
 
diff --git a/kmail/kmfoldersearch.cpp b/kmail/kmfoldersearch.cpp
index fa34f5b9..038ddbe1 100644
--- a/kmail/kmfoldersearch.cpp
+++ b/kmail/kmfoldersearch.cpp
@@ -30,7 +30,7 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp
index 9d259f56..9a7cd477 100644
--- a/kmail/kmfoldertree.cpp
+++ b/kmail/kmfoldertree.cpp
@@ -34,7 +34,7 @@ using namespace KPIM;
 #include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kpopupmenu.h>
 #include <kdebug.h>
 
diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp
index 2ed379c9..6910ad6e 100644
--- a/kmail/kmheaders.cpp
+++ b/kmail/kmheaders.cpp
@@ -38,7 +38,7 @@ using namespace KPIM;
 #include <kiconloader.h>
 #include <kpopupmenu.h>
 #include <kimageio.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index 354fe768..1761a762 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -30,7 +30,7 @@ using KPIM::BroadcastStatus;
 #include "undostack.h"
 #include "accountmanager.h"
 using KMail::AccountManager;
-#include <libtdepim/kfileio.h>
+#include <libtdepim/tdefileio.h>
 #include "kmversion.h"
 #include "kmreaderwin.h"
 #include "kmmainwidget.h"
@@ -61,14 +61,14 @@ using KMail::FolderIface;
 #include <knotifyclient.h>
 #include <kstaticdeleter.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kprogress.h>
 #include <kpassivepopup.h>
 #include <dcopclient.h>
 #include <ksystemtray.h>
 #include <kpgp.h>
 #include <kdebug.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <tdewallet.h>
 using KWallet::Wallet;
 #include "actionscheduler.h"
diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h
index 9d2b5070..5d80d659 100644
--- a/kmail/kmkernel.h
+++ b/kmail/kmkernel.h
@@ -9,7 +9,7 @@
 #include <weaver.h>
 #include <weaverlogger.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdeversion.h>
 #include <tdeimproxy.h>
 #include <tdepimmacros.h>
diff --git a/kmail/kmlineeditspell.cpp b/kmail/kmlineeditspell.cpp
index acf0b0c0..7916c1be 100644
--- a/kmail/kmlineeditspell.cpp
+++ b/kmail/kmlineeditspell.cpp
@@ -14,7 +14,7 @@
 #include <libemailfunctions/email.h>
 
 #include <kabc/vcardconverter.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <kpopupmenu.h>
 #include <kurl.h>
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index 14ccaba0..8681ff9e 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -34,7 +34,7 @@
 #include <knotifyclient.h>
 #include <kdebug.h>
 #include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktip.h>
 #include <knotifydialog.h>
 #include <kstandarddirs.h>
diff --git a/kmail/kmmainwin.cpp b/kmail/kmmainwin.cpp
index 8e14e984..ee785801 100644
--- a/kmail/kmmainwin.cpp
+++ b/kmail/kmmainwin.cpp
@@ -17,7 +17,7 @@
 #include <kapplication.h>
 #include <klocale.h>
 #include <kedittoolbar.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kstringhandler.h>
 #include <kdebug.h>
diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp
index aabc14bc..5b4f8cf9 100644
--- a/kmail/kmmessage.cpp
+++ b/kmail/kmmessage.cpp
@@ -37,7 +37,7 @@ using KMail::HeaderStrategy;
 #include <kapplication.h>
 #include <kglobalsettings.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdehtml_part.h>
 #include <kuser.h>
 #include <kidna.h>
diff --git a/kmail/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp
index 74cbe62e..48456824 100644
--- a/kmail/kmmimeparttree.cpp
+++ b/kmail/kmmimeparttree.cpp
@@ -42,7 +42,7 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
 
diff --git a/kmail/kmmimeparttree.h b/kmail/kmmimeparttree.h
index a5634b09..606c515f 100644
--- a/kmail/kmmimeparttree.h
+++ b/kmail/kmmimeparttree.h
@@ -36,7 +36,7 @@
 #define KMMIMEPARTTREE_H
 
 #include <klistview.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 #include <tqstring.h>
 
diff --git a/kmail/kmmsgpart.h b/kmail/kmmsgpart.h
index 9d69f87c..b49b5a30 100644
--- a/kmail/kmmsgpart.h
+++ b/kmail/kmmsgpart.h
@@ -224,7 +224,7 @@ public:
   /** Set to true if the headers should be loaded */
   void setLoadHeaders( bool load ) { mLoadHeaders = load; }
 
-  /** Returns true if the part itself (as returned by kioslave) should be loaded */
+  /** Returns true if the part itself (as returned by tdeioslave) should be loaded */
   bool loadPart() { return mLoadPart; }
 
   /** Set to true if the part itself should be loaded */
diff --git a/kmail/kmmsgpartdlg.h b/kmail/kmmsgpartdlg.h
index 78588eb1..0132be01 100644
--- a/kmail/kmmsgpartdlg.h
+++ b/kmail/kmmsgpartdlg.h
@@ -21,7 +21,7 @@
 #define kmmsgpartdlg_h
 
 #include <kdialogbase.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 class KMMessagePart;
 class TQPushButton;
diff --git a/kmail/kmpopfiltercnfrmdlg.cpp b/kmail/kmpopfiltercnfrmdlg.cpp
index 5cbbacda..fa9faafb 100644
--- a/kmail/kmpopfiltercnfrmdlg.cpp
+++ b/kmail/kmpopfiltercnfrmdlg.cpp
@@ -20,7 +20,7 @@
 #include <tqtimer.h>
 
 #include <klocale.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 #include <assert.h>
 
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index 0568035b..2405a3e5 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -14,7 +14,7 @@
 #include "kmversion.h"
 #include "kmmainwidget.h"
 #include "kmreadermainwin.h"
-#include <libtdepim/kfileio.h>
+#include <libtdepim/tdefileio.h>
 #include "kmfolderindex.h"
 #include "kmcommands.h"
 #include "kmmsgpartdlg.h"
@@ -97,7 +97,7 @@ using KMail::TeeHtmlWriter;
 #include <kstandarddirs.h>  // Sven's : for access and getpid
 #include <kcursor.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kglobalsettings.h>
diff --git a/kmail/kmsearchpattern.cpp b/kmail/kmsearchpattern.cpp
index 0d94c149..1ab6381e 100644
--- a/kmail/kmsearchpattern.cpp
+++ b/kmail/kmsearchpattern.cpp
@@ -19,7 +19,7 @@ using KMail::FilterLog;
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <kabc/stdaddressbook.h>
 
diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp
index d6a2f8ad..bf9a819c 100644
--- a/kmail/kmsender.cpp
+++ b/kmail/kmsender.cpp
@@ -10,14 +10,14 @@
 #include <kmime_header_parsing.h>
 using namespace KMime::Types;
 
-#include <kio/passdlg.h>
-#include <kio/scheduler.h>
+#include <tdeio/passdlg.h>
+#include <tdeio/scheduler.h>
 #include <kapplication.h>
 #include <kmessagebox.h>
 #include <tdeversion.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/kmail/kmsender_p.h b/kmail/kmsender_p.h
index f87fd2a3..d07dcf34 100644
--- a/kmail/kmsender_p.h
+++ b/kmail/kmsender_p.h
@@ -9,7 +9,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqobject.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <tdeversion.h>
 
 class TDEProcess;
diff --git a/kmail/kmservertest.cpp b/kmail/kmservertest.cpp
index 8548670a..d2326394 100644
--- a/kmail/kmservertest.cpp
+++ b/kmail/kmservertest.cpp
@@ -39,10 +39,10 @@
 #include <kdebug.h>
 #include <kurl.h>
 #include <kapplication.h>
-#include <kio/scheduler.h>
-#include <kio/slave.h>
-#include <kio/job.h>
-#include <kio/global.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/slave.h>
+#include <tdeio/job.h>
+#include <tdeio/global.h>
 
 //-----------------------------------------------------------------------------
 KMServerTest::KMServerTest( const TQString & protocol, const TQString & host, int port )
diff --git a/kmail/kmtransport.cpp b/kmail/kmtransport.cpp
index 2092376f..2432031b 100644
--- a/kmail/kmtransport.cpp
+++ b/kmail/kmtransport.cpp
@@ -33,7 +33,7 @@
 #include <tqpushbutton.h>
 #include <tqwhatsthis.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kseparator.h>
diff --git a/kmail/listjob.cpp b/kmail/listjob.cpp
index 79efe49c..d8ee1e10 100644
--- a/kmail/listjob.cpp
+++ b/kmail/listjob.cpp
@@ -39,9 +39,9 @@ using KPIM::ProgressManager;
 
 #include <kdebug.h>
 #include <kurl.h>
-#include <kio/scheduler.h>
-#include <kio/job.h>
-#include <kio/global.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/job.h>
+#include <tdeio/global.h>
 #include <klocale.h>
 
 #include <tqstylesheet.h>
diff --git a/kmail/mailinglist-magic.cpp b/kmail/mailinglist-magic.cpp
index e199e3d0..1f927084 100644
--- a/kmail/mailinglist-magic.cpp
+++ b/kmail/mailinglist-magic.cpp
@@ -7,7 +7,7 @@
 
 #include "kmmessage.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 #include <kdebug.h>
 
diff --git a/kmail/networkaccount.cpp b/kmail/networkaccount.cpp
index 62581bf9..93693dd7 100644
--- a/kmail/networkaccount.cpp
+++ b/kmail/networkaccount.cpp
@@ -32,8 +32,8 @@
 #include "kmkernel.h"
 #include "globalsettings.h"
 
-#include <kconfig.h>
-#include <kio/global.h>
+#include <tdeconfig.h>
+#include <tdeio/global.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp
index 6ea48bf0..7051542b 100644
--- a/kmail/objecttreeparser.cpp
+++ b/kmail/objecttreeparser.cpp
@@ -40,7 +40,7 @@
 #include "kmkernel.h"
 #include "kmreaderwin.h"
 #include "partNode.h"
-#include <libtdepim/kfileio.h>
+#include <libtdepim/tdefileio.h>
 #include <libemailfunctions/email.h>
 #include "partmetadata.h"
 #include "attachmentstrategy.h"
diff --git a/kmail/partNode.h b/kmail/partNode.h
index b764c9df..20328dde 100644
--- a/kmail/partNode.h
+++ b/kmail/partNode.h
@@ -42,7 +42,7 @@
 #include <mimelib/body.h>
 #include <mimelib/utility.h>
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kdebug.h>
 
 #include <map>
diff --git a/kmail/popaccount.cpp b/kmail/popaccount.cpp
index 0d6c6e75..e20b1f13 100644
--- a/kmail/popaccount.cpp
+++ b/kmail/popaccount.cpp
@@ -42,9 +42,9 @@ using KPIM::BroadcastStatus;
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kmainwindow.h>
-#include <kio/scheduler.h>
-#include <kio/passdlg.h>
-#include <kconfig.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/passdlg.h>
+#include <tdeconfig.h>
 using TDEIO::MetaData;
 
 #include <tqstylesheet.h>
diff --git a/kmail/quotajobs.cpp b/kmail/quotajobs.cpp
index b08d7f91..f8272cac 100644
--- a/kmail/quotajobs.cpp
+++ b/kmail/quotajobs.cpp
@@ -29,7 +29,7 @@
  *  your version.
  */
 #include "quotajobs.h"
-#include <kio/scheduler.h>
+#include <tdeio/scheduler.h>
 #include <kdebug.h>
 
 using namespace KMail;
diff --git a/kmail/quotajobs.h b/kmail/quotajobs.h
index 3e453b50..1749fe0e 100644
--- a/kmail/quotajobs.h
+++ b/kmail/quotajobs.h
@@ -34,7 +34,7 @@
 
 #include <tqvariant.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 #include <tqvaluevector.h>
 
diff --git a/kmail/renamejob.cpp b/kmail/renamejob.cpp
index 5e2a43d3..7b1b80e3 100644
--- a/kmail/renamejob.cpp
+++ b/kmail/renamejob.cpp
@@ -41,9 +41,9 @@
 
 #include <kdebug.h>
 #include <kurl.h>
-#include <kio/scheduler.h>
-#include <kio/job.h>
-#include <kio/global.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/job.h>
+#include <tdeio/global.h>
 #include <klocale.h>
 #include <config.h>
 
diff --git a/kmail/searchjob.cpp b/kmail/searchjob.cpp
index 6e3040bd..f7af79c2 100644
--- a/kmail/searchjob.cpp
+++ b/kmail/searchjob.cpp
@@ -40,9 +40,9 @@ using KPIM::ProgressManager;
 
 #include <kdebug.h>
 #include <kurl.h>
-#include <kio/scheduler.h>
-#include <kio/job.h>
-#include <kio/global.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/job.h>
+#include <tdeio/global.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
@@ -98,7 +98,7 @@ void SearchJob::searchCompleteFolder()
       TQT_SLOT( slotSearchResult( TDEIO::Job * ) ) );
   }
   else
-  { // for the "/ folder" of an imap account, searching blocks the kioslave
+  { // for the "/ folder" of an imap account, searching blocks the tdeioslave
     slotSearchData( job, TQString() );
     slotSearchResult( job );
   }
diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp
index 15bf5f07..849cba8b 100644
--- a/kmail/searchwindow.cpp
+++ b/kmail/searchwindow.cpp
@@ -39,7 +39,7 @@
 #include <kdebug.h>
 #include <kstatusbar.h>
 #include <twin.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstdaction.h>
 #include <kiconloader.h>
 
diff --git a/kmail/sieveconfig.cpp b/kmail/sieveconfig.cpp
index 8e185f3a..61ebc7a6 100644
--- a/kmail/sieveconfig.cpp
+++ b/kmail/sieveconfig.cpp
@@ -21,7 +21,7 @@
 #include <knuminput.h>
 #include <klocale.h>
 #include <kdialog.h>
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 
 #include <tqlayout.h>
 #include <tqcheckbox.h>
diff --git a/kmail/sievejob.cpp b/kmail/sievejob.cpp
index 3e823a7a..96f0a608 100644
--- a/kmail/sievejob.cpp
+++ b/kmail/sievejob.cpp
@@ -18,9 +18,9 @@
 
 #include "sievejob.h"
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 using TDEIO::Job;
-// <kio/global.h>
+// <tdeio/global.h>
 using TDEIO::UDSAtomTypes;
 using TDEIO::UDSEntryList;
 using TDEIO::UDSEntry;
diff --git a/kmail/sievejob.h b/kmail/sievejob.h
index 84e31614..fb1d3a90 100644
--- a/kmail/sievejob.h
+++ b/kmail/sievejob.h
@@ -22,7 +22,7 @@
 #include <tqcstring.h>
 
 #include <kurl.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 class TQTextDecoder;
 namespace TDEIO {
diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp
index 4997386e..b7ba16f1 100644
--- a/kmail/snippetwidget.cpp
+++ b/kmail/snippetwidget.cpp
@@ -21,7 +21,7 @@
 #include <klineedit.h>
 #include <ktextedit.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqtooltip.h>
 #include <kpopupmenu.h>
 #include <tqregexp.h>
diff --git a/kmail/transportmanager.cpp b/kmail/transportmanager.cpp
index ced8f771..158d9abb 100644
--- a/kmail/transportmanager.cpp
+++ b/kmail/transportmanager.cpp
@@ -21,7 +21,7 @@
 #include "kmtransport.h"
 #include "kmkernel.h"
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 namespace KMail {
 
diff --git a/kmail/util.h b/kmail/util.h
index 30b01cba..aa4aac28 100644
--- a/kmail/util.h
+++ b/kmail/util.h
@@ -43,7 +43,7 @@
 #include <tqobject.h>
 #include <tqcstring.h>
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 
diff --git a/kmail/xfaceconfigurator.cpp b/kmail/xfaceconfigurator.cpp
index 5a279b92..e35b2e0e 100644
--- a/kmail/xfaceconfigurator.cpp
+++ b/kmail/xfaceconfigurator.cpp
@@ -38,13 +38,13 @@
 
 #include <kactivelabel.h>
 #include <kdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobalsettings.h>
 #include <kimageio.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 using namespace TDEIO;
 #include <kxface.h>
 using namespace KPIM;
-- 
cgit v1.2.3