From 38b7daf1afffa515cf4880847c0d985f3c6ee753 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 14 Feb 2013 17:18:40 -0600
Subject: Rename common header files for consistency with class renaming

---
 kmail/aboutdata.h                  | 2 +-
 kmail/accountdialog.cpp            | 2 +-
 kmail/accountmanager.cpp           | 2 +-
 kmail/antispamwizard.cpp           | 2 +-
 kmail/configuredialog.cpp          | 2 +-
 kmail/dcoptest.cpp                 | 4 ++--
 kmail/folderIface.cpp              | 2 +-
 kmail/htmlstatusbar.cpp            | 2 +-
 kmail/imapaccountbase.cpp          | 2 +-
 kmail/index.cpp                    | 2 +-
 kmail/kmaccount.cpp                | 2 +-
 kmail/kmacctcachedimap.cpp         | 2 +-
 kmail/kmacctlocal.cpp              | 2 +-
 kmail/kmacctmaildir.cpp            | 2 +-
 kmail/kmaddrbook.cpp               | 2 +-
 kmail/kmail.kcfg                   | 2 +-
 kmail/kmail_options.h              | 2 +-
 kmail/kmail_part.cpp               | 2 +-
 kmail/kmcommands.cpp               | 2 +-
 kmail/kmcomposewin.cpp             | 2 +-
 kmail/kmedit.cpp                   | 2 +-
 kmail/kmfilterdlg.cpp              | 2 +-
 kmail/kmfoldercachedimap.cpp       | 2 +-
 kmail/kmfolderindex.cpp            | 2 +-
 kmail/kmfoldermaildir.cpp          | 2 +-
 kmail/kmfoldermgr.cpp              | 2 +-
 kmail/kmfoldertree.cpp             | 2 +-
 kmail/kmheaders.cpp                | 2 +-
 kmail/kmkernel.cpp                 | 4 ++--
 kmail/kmmainwidget.cpp             | 2 +-
 kmail/kmmainwin.cpp                | 2 +-
 kmail/kmmessage.cpp                | 2 +-
 kmail/kmmsgpartdlg.cpp             | 4 ++--
 kmail/kmreadermainwin.cpp          | 2 +-
 kmail/kmreaderwin.cpp              | 2 +-
 kmail/kmsender.cpp                 | 2 +-
 kmail/kmservertest.cpp             | 2 +-
 kmail/kmstartup.cpp                | 4 ++--
 kmail/kmsystemtray.cpp             | 2 +-
 kmail/korghelper.cpp               | 2 +-
 kmail/maildirjob.cpp               | 2 +-
 kmail/mailsourceviewer.cpp         | 2 +-
 kmail/managesievescriptsdialog.cpp | 2 +-
 kmail/mboxjob.cpp                  | 2 +-
 kmail/objecttreeparser.cpp         | 4 ++--
 kmail/recipientseditor.cpp         | 2 +-
 kmail/recipientseditortest.cpp     | 4 ++--
 kmail/searchwindow.cpp             | 2 +-
 kmail/secondarywindow.cpp          | 2 +-
 kmail/transportmanager.cpp         | 2 +-
 kmail/vacationdialog.cpp           | 2 +-
 51 files changed, 57 insertions(+), 57 deletions(-)

(limited to 'kmail')

diff --git a/kmail/aboutdata.h b/kmail/aboutdata.h
index 39fe5662..5c5b08ae 100644
--- a/kmail/aboutdata.h
+++ b/kmail/aboutdata.h
@@ -32,7 +32,7 @@
 #ifndef __KMAIL_ABOUTDATA_H__
 #define __KMAIL_ABOUTDATA_H__
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdepimmacros.h>
 
 namespace KMail {
diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp
index 47184b73..3cac88d4 100644
--- a/kmail/accountdialog.cpp
+++ b/kmail/accountdialog.cpp
@@ -42,7 +42,7 @@
 #include <kmessagebox.h>
 #include <knuminput.h>
 #include <kseparator.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kprotocolinfo.h>
 #include <kiconloader.h>
diff --git a/kmail/accountmanager.cpp b/kmail/accountmanager.cpp
index eeed8f66..b65de83a 100644
--- a/kmail/accountmanager.cpp
+++ b/kmail/accountmanager.cpp
@@ -23,7 +23,7 @@
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqregexp.h>
 #include <tqvaluelist.h>
diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp
index 19d543b3..8b450f44 100644
--- a/kmail/antispamwizard.cpp
+++ b/kmail/antispamwizard.cpp
@@ -40,7 +40,7 @@
 #include "folderrequester.h"
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kiconloader.h>
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
index c89f58b9..434ddac1 100644
--- a/kmail/configuredialog.cpp
+++ b/kmail/configuredialog.cpp
@@ -83,7 +83,7 @@ using KMime::DateFormatter;
 
 // other KDE headers:
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcharsets.h>
 #include <kasciistringtools.h>
 #include <kdebug.h>
diff --git a/kmail/dcoptest.cpp b/kmail/dcoptest.cpp
index b960b55c..7501cc45 100644
--- a/kmail/dcoptest.cpp
+++ b/kmail/dcoptest.cpp
@@ -3,9 +3,9 @@
 #endif
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include "aboutdata.h"
 
 #include <kmailIface_stub.h>
diff --git a/kmail/folderIface.cpp b/kmail/folderIface.cpp
index d6dd6daa..981e1b37 100644
--- a/kmail/folderIface.cpp
+++ b/kmail/folderIface.cpp
@@ -38,7 +38,7 @@
 #include "kmfoldermgr.h"
 #include "kmfolder.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include <stdlib.h>
diff --git a/kmail/htmlstatusbar.cpp b/kmail/htmlstatusbar.cpp
index fb382e15..9a26dfcd 100644
--- a/kmail/htmlstatusbar.cpp
+++ b/kmail/htmlstatusbar.cpp
@@ -39,7 +39,7 @@
 #ifndef KMAIL_TESTING
 #include "kmkernel.h"
 #else
-#include <kapplication.h>
+#include <tdeapplication.h>
 #endif
 
 #include <klocale.h>
diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp
index f464f087..28a73cc9 100644
--- a/kmail/imapaccountbase.cpp
+++ b/kmail/imapaccountbase.cpp
@@ -50,7 +50,7 @@ using KPIM::ProgressManager;
 #include "kmfoldermgr.h"
 #include "listjob.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <klocale.h>
diff --git a/kmail/index.cpp b/kmail/index.cpp
index 17de11d7..af4f4cb5 100644
--- a/kmail/index.cpp
+++ b/kmail/index.cpp
@@ -36,7 +36,7 @@
 #include "kmfoldersearch.h"
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqfile.h>
 #include <tqtimer.h>
 #include <tqvaluestack.h>
diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp
index f89b7870..ad500791 100644
--- a/kmail/kmaccount.cpp
+++ b/kmail/kmaccount.cpp
@@ -24,7 +24,7 @@ using KPIM::ProgressManager;
 
 using KMail::FolderJob;
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
diff --git a/kmail/kmacctcachedimap.cpp b/kmail/kmacctcachedimap.cpp
index de22e7f6..9de08019 100644
--- a/kmail/kmacctcachedimap.cpp
+++ b/kmail/kmacctcachedimap.cpp
@@ -50,7 +50,7 @@ using KMail::AccountManager;
 #include <tdeio/slave.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 
 #include <tqstylesheet.h>
diff --git a/kmail/kmacctlocal.cpp b/kmail/kmacctlocal.cpp
index 0e941b42..93ba3a16 100644
--- a/kmail/kmacctlocal.cpp
+++ b/kmail/kmacctlocal.cpp
@@ -14,7 +14,7 @@ using KPIM::ProgressManager;
 
 #include "kmfoldermgr.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
diff --git a/kmail/kmacctmaildir.cpp b/kmail/kmacctmaildir.cpp
index 226d99a5..f3e69d2b 100644
--- a/kmail/kmacctmaildir.cpp
+++ b/kmail/kmacctmaildir.cpp
@@ -13,7 +13,7 @@ using KPIM::BroadcastStatus;
 #include "progressmanager.h"
 using KPIM::ProgressManager;
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
diff --git a/kmail/kmaddrbook.cpp b/kmail/kmaddrbook.cpp
index adc888a4..84715a6f 100644
--- a/kmail/kmaddrbook.cpp
+++ b/kmail/kmaddrbook.cpp
@@ -23,7 +23,7 @@
 #include "kmaddrbook.h"
 #include "kcursorsaver.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kmail/kmail.kcfg b/kmail/kmail.kcfg
index 91d2e51e..c6080eb4 100644
--- a/kmail/kmail.kcfg
+++ b/kmail/kmail.kcfg
@@ -4,7 +4,7 @@
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
   <include>tqtextcodec.h</include>
-  <include>kapplication.h</include>
+  <include>tdeapplication.h</include>
   <kcfgfile name="kmailrc"/>
     <group name="Behaviour">
       <entry name="DelayedMarkAsRead"  type="Bool">
diff --git a/kmail/kmail_options.h b/kmail/kmail_options.h
index 62c1c311..a8830c41 100644
--- a/kmail/kmail_options.h
+++ b/kmail/kmail_options.h
@@ -2,7 +2,7 @@
 #ifndef KMAIL_OPTIONS_H
 #define KMAIL_OPTIONS_H
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 TDECmdLineOptions kmail_options[] =
diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp
index ff0e0f0c..69ccfc9b 100644
--- a/kmail/kmail_part.cpp
+++ b/kmail/kmail_part.cpp
@@ -43,7 +43,7 @@ using KMail::AccountManager;
 #include "recentaddresses.h"
 using TDERecentAddress::RecentAddresses;
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeparts/mainwindow.h>
 #include <tdeparts/genericfactory.h>
 #include <knotifyclient.h>
diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp
index 34c99400..9faa35e5 100644
--- a/kmail/kmcommands.cpp
+++ b/kmail/kmcommands.cpp
@@ -51,7 +51,7 @@
 #include <mimelib/field.h>
 #include <mimelib/mimepp.h>
 #include <mimelib/string.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 
 #include <tqtextcodec.h>
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index 84a74493..6031254a 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -93,7 +93,7 @@ using TDERecentAddress::RecentAddresses;
 #include <tdeio/scheduler.h>
 #include <ktempfile.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstatusbar.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp
index cfe3ff5e..15889f12 100644
--- a/kmail/kmedit.cpp
+++ b/kmail/kmedit.cpp
@@ -31,7 +31,7 @@ using KPIM::MailListDrag;
 
 #include <ktempfile.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdirwatch.h>
 #include <kiconloader.h>
 
diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp
index 9441b63d..2185ccf8 100644
--- a/kmail/kmfilterdlg.cpp
+++ b/kmail/kmfilterdlg.cpp
@@ -24,7 +24,7 @@ using KMail::FilterImporterExporter;
 #include <klocale.h>
 #include <kinputdialog.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <twin.h>
 #include <tdeconfig.h>
 #include <kicondialog.h>
diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp
index ab66c95f..25abffe8 100644
--- a/kmail/kmfoldercachedimap.cpp
+++ b/kmail/kmfoldercachedimap.cpp
@@ -62,7 +62,7 @@ using KMail::ListJob;
 #include "kmcommands.h"
 #include "kmmainwidget.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/kmail/kmfolderindex.cpp b/kmail/kmfolderindex.cpp
index e1c1b811..39839e32 100644
--- a/kmail/kmfolderindex.cpp
+++ b/kmail/kmfolderindex.cpp
@@ -51,7 +51,7 @@
 #ifdef HAVE_BYTESWAP_H
 #include <byteswap.h>
 #endif
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp
index 6f291f41..669bd6e1 100644
--- a/kmail/kmfoldermaildir.cpp
+++ b/kmail/kmfoldermaildir.cpp
@@ -22,7 +22,7 @@ using KMail::MaildirJob;
 #include "kmmsgdict.h"
 #include "util.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstaticdeleter.h>
diff --git a/kmail/kmfoldermgr.cpp b/kmail/kmfoldermgr.cpp
index 321ed315..2513258c 100644
--- a/kmail/kmfoldermgr.cpp
+++ b/kmail/kmfoldermgr.cpp
@@ -22,7 +22,7 @@
 #include <kmessagebox.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "kmmainwin.h"
 #include "kmfiltermgr.h"
diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp
index ae340e7f..0b13f07b 100644
--- a/kmail/kmfoldertree.cpp
+++ b/kmail/kmfoldertree.cpp
@@ -30,7 +30,7 @@ using KMail::FolderViewToolTip;
 #include <maillistdrag.h>
 using namespace KPIM;
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp
index 432c0213..a768513f 100644
--- a/kmail/kmheaders.cpp
+++ b/kmail/kmheaders.cpp
@@ -31,7 +31,7 @@ using KPIM::ProgressItem;
 using namespace KPIM;
 #include "messageactions.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaccelmanager.h>
 #include <kglobalsettings.h>
 #include <kmessagebox.h>
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index 05571bf3..e748c550 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -56,7 +56,7 @@ using KMail::FolderIface;
 #include "jobscheduler.h"
 #include "templateparser.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <knotifyclient.h>
 #include <kstaticdeleter.h>
@@ -89,7 +89,7 @@ using KWallet::Wallet;
 
 #include <X11/Xlib.h>
 #include <fixx11h.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kstartupinfo.h>
 
 KMKernel *KMKernel::mySelf = 0;
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index 155e00be..6675149c 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -33,7 +33,7 @@
 #include <kcharsets.h>
 #include <knotifyclient.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 #include <ktip.h>
 #include <knotifydialog.h>
diff --git a/kmail/kmmainwin.cpp b/kmail/kmmainwin.cpp
index 9f6f497a..1a3a6cb9 100644
--- a/kmail/kmmainwin.cpp
+++ b/kmail/kmmainwin.cpp
@@ -14,7 +14,7 @@
 #include "accountmanager.h"
 #include "kmtransport.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kedittoolbar.h>
 #include <tdeconfig.h>
diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp
index da63f203..201416b2 100644
--- a/kmail/kmmessage.cpp
+++ b/kmail/kmmessage.cpp
@@ -34,7 +34,7 @@ using KMail::HeaderStrategy;
 #include <kpgpblock.h>
 #include <kaddrbook.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
diff --git a/kmail/kmmsgpartdlg.cpp b/kmail/kmmsgpartdlg.cpp
index dd92e863..869ee015 100644
--- a/kmail/kmmsgpartdlg.cpp
+++ b/kmail/kmmsgpartdlg.cpp
@@ -14,9 +14,9 @@
 
 // other KDE includes:
 #include <kmimetype.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kstringvalidator.h>
 #include <kcombobox.h>
 #include <kdebug.h>
diff --git a/kmail/kmreadermainwin.cpp b/kmail/kmreadermainwin.cpp
index 37534cbd..fdf965ae 100644
--- a/kmail/kmreadermainwin.cpp
+++ b/kmail/kmreadermainwin.cpp
@@ -27,7 +27,7 @@
 #endif
 
 #include <tqaccel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kedittoolbar.h>
 #include <klocale.h>
 #include <tdestdaccel.h>
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index b3220b1f..9d8db6c9 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -89,7 +89,7 @@ using KMail::TeeHtmlWriter;
 #include <dom/dom_string.h>
 #include <dom/dom_exception.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 // for the click on attachment stuff (dnaber):
 #include <kuserprofile.h>
 #include <kcharsets.h>
diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp
index bf9a819c..64c56cb1 100644
--- a/kmail/kmsender.cpp
+++ b/kmail/kmsender.cpp
@@ -12,7 +12,7 @@ using namespace KMime::Types;
 
 #include <tdeio/passdlg.h>
 #include <tdeio/scheduler.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <tdeversion.h>
 #include <klocale.h>
diff --git a/kmail/kmservertest.cpp b/kmail/kmservertest.cpp
index d2326394..6b4848f0 100644
--- a/kmail/kmservertest.cpp
+++ b/kmail/kmservertest.cpp
@@ -38,7 +38,7 @@
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeio/scheduler.h>
 #include <tdeio/slave.h>
 #include <tdeio/job.h>
diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp
index bb484e86..9cf1b905 100644
--- a/kmail/kmstartup.cpp
+++ b/kmail/kmstartup.cpp
@@ -30,8 +30,8 @@
 #include <dcopclient.h>
 #include <kcrash.h>
 #include <kglobal.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <kiconloader.h>
 
 #include <errno.h>
diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp
index 2a3bd975..f4e1d432 100644
--- a/kmail/kmsystemtray.cpp
+++ b/kmail/kmsystemtray.cpp
@@ -28,7 +28,7 @@
 using KMail::AccountManager;
 #include "globalsettings.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
diff --git a/kmail/korghelper.cpp b/kmail/korghelper.cpp
index 4c17f234..17097126 100644
--- a/kmail/korghelper.cpp
+++ b/kmail/korghelper.cpp
@@ -21,7 +21,7 @@
 
 #include <dcopclient.h>
 #include <dcopref.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdcopservicestarter.h>
 
diff --git a/kmail/maildirjob.cpp b/kmail/maildirjob.cpp
index ac595900..b507d927 100644
--- a/kmail/maildirjob.cpp
+++ b/kmail/maildirjob.cpp
@@ -36,7 +36,7 @@
 #include "kmfoldermaildir.h"
 #include "kmfolder.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include <tqtimer.h>
diff --git a/kmail/mailsourceviewer.cpp b/kmail/mailsourceviewer.cpp
index d2469348..eff69cce 100644
--- a/kmail/mailsourceviewer.cpp
+++ b/kmail/mailsourceviewer.cpp
@@ -35,7 +35,7 @@
 
 #include "mailsourceviewer.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <twin.h>
 
 #include <tqregexp.h>
diff --git a/kmail/managesievescriptsdialog.cpp b/kmail/managesievescriptsdialog.cpp
index 0c972130..269c5870 100644
--- a/kmail/managesievescriptsdialog.cpp
+++ b/kmail/managesievescriptsdialog.cpp
@@ -10,7 +10,7 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <twin.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kinputdialog.h>
 #include <kglobalsettings.h>
 #include <kmessagebox.h>
diff --git a/kmail/mboxjob.cpp b/kmail/mboxjob.cpp
index 2205e86f..7fb22ddb 100644
--- a/kmail/mboxjob.cpp
+++ b/kmail/mboxjob.cpp
@@ -37,7 +37,7 @@
 #include "kmfoldermbox.h"
 #include "kmfolder.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tqtimer.h>
 #include <tqdatetime.h>
diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp
index a5c862b9..295b7601 100644
--- a/kmail/objecttreeparser.cpp
+++ b/kmail/objecttreeparser.cpp
@@ -92,7 +92,7 @@
 #include <tdehtml_part.h>
 #include <ktempfile.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
 #include <kmdcodec.h>
@@ -102,7 +102,7 @@
 #include <tqdir.h>
 #include <tqfile.h>
 #include <tqapplication.h>
-#include <kstyle.h>
+#include <tdestyle.h>
 #include <tqbuffer.h>
 #include <tqpixmap.h>
 #include <tqpainter.h>
diff --git a/kmail/recipientseditor.cpp b/kmail/recipientseditor.cpp
index 01529b81..c16fdf01 100644
--- a/kmail/recipientseditor.cpp
+++ b/kmail/recipientseditor.cpp
@@ -31,7 +31,7 @@
 
 #include <libemailfunctions/email.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdecompletionbox.h>
 #include <kdebug.h>
 #include <kinputdialog.h>
diff --git a/kmail/recipientseditortest.cpp b/kmail/recipientseditortest.cpp
index 22140e85..d5c5b3a1 100644
--- a/kmail/recipientseditortest.cpp
+++ b/kmail/recipientseditortest.cpp
@@ -26,10 +26,10 @@
 
 #include "recipientseditor.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kmessagebox.h>
 #include "aboutdata.h"
 
diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp
index 796cc8c0..52f4647e 100644
--- a/kmail/searchwindow.cpp
+++ b/kmail/searchwindow.cpp
@@ -35,7 +35,7 @@
 #include "messagecopyhelper.h"
 #include "textsource.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kstatusbar.h>
 #include <twin.h>
diff --git a/kmail/secondarywindow.cpp b/kmail/secondarywindow.cpp
index 38f6b32d..5a689633 100644
--- a/kmail/secondarywindow.cpp
+++ b/kmail/secondarywindow.cpp
@@ -33,7 +33,7 @@
 
 #include "kmkernel.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 namespace KMail {
 
diff --git a/kmail/transportmanager.cpp b/kmail/transportmanager.cpp
index 158d9abb..7cb9d9ac 100644
--- a/kmail/transportmanager.cpp
+++ b/kmail/transportmanager.cpp
@@ -20,7 +20,7 @@
 
 #include "kmtransport.h"
 #include "kmkernel.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 
 namespace KMail {
diff --git a/kmail/vacationdialog.cpp b/kmail/vacationdialog.cpp
index e214a46c..da5648c7 100644
--- a/kmail/vacationdialog.cpp
+++ b/kmail/vacationdialog.cpp
@@ -28,7 +28,7 @@ using KMime::HeaderParsing::parseAddressList;
 #include <klocale.h>
 #include <kdebug.h>
 #include <twin.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqlayout.h>
 #include <tqlabel.h>
-- 
cgit v1.2.3