diff options
Diffstat (limited to 'kmail')
129 files changed, 249 insertions, 249 deletions
diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp index 3cac88d4..206cbfee 100644 --- a/kmail/accountdialog.cpp +++ b/kmail/accountdialog.cpp @@ -37,13 +37,13 @@ #include <tqgrid.h> #include <tdefiledialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <knuminput.h> #include <kseparator.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kprotocolinfo.h> #include <kiconloader.h> #include <tdepopupmenu.h> diff --git a/kmail/accountmanager.cpp b/kmail/accountmanager.cpp index b65de83a..6b9f38fe 100644 --- a/kmail/accountmanager.cpp +++ b/kmail/accountmanager.cpp @@ -19,8 +19,8 @@ #include "globalsettings.h" #include <dcopclient.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <tdeconfig.h> #include <tdeapplication.h> diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp index 664b95e3..92e6a232 100644 --- a/kmail/accountwizard.cpp +++ b/kmail/accountwizard.cpp @@ -30,7 +30,7 @@ #include <tdefiledialog.h> #include <klineedit.h> #include <tdelistbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqcheckbox.h> #include <tqdir.h> diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp index 8b450f44..5552b058 100644 --- a/kmail/antispamwizard.cpp +++ b/kmail/antispamwizard.cpp @@ -44,8 +44,8 @@ #include <kdebug.h> #include <kdialog.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <tqdom.h> diff --git a/kmail/archivefolderdialog.cpp b/kmail/archivefolderdialog.cpp index 49c9b1c3..435752c6 100644 --- a/kmail/archivefolderdialog.cpp +++ b/kmail/archivefolderdialog.cpp @@ -25,10 +25,10 @@ #include "folderrequester.h" #include "util.h" -#include <klocale.h> +#include <tdelocale.h> #include <kcombobox.h> #include <kurlrequester.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdefiledialog.h> #include <tqlabel.h> diff --git a/kmail/backupjob.cpp b/kmail/backupjob.cpp index 132a8dba..bf78e68c 100644 --- a/kmail/backupjob.cpp +++ b/kmail/backupjob.cpp @@ -28,7 +28,7 @@ #include "kzip.h" #include "ktar.h" -#include "kmessagebox.h" +#include "tdemessagebox.h" #include "tqfile.h" #include "tqfileinfo.h" diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp index 7b1fd517..da362346 100644 --- a/kmail/cachedimapjob.cpp +++ b/kmail/cachedimapjob.cpp @@ -50,7 +50,7 @@ #include <tdeio/scheduler.h> #include <tdeio/job.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> diff --git a/kmail/callback.cpp b/kmail/callback.cpp index 9b6da633..b6e0e938 100644 --- a/kmail/callback.cpp +++ b/kmail/callback.cpp @@ -46,7 +46,7 @@ #include <mimelib/enum.h> #include <kinputdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> using namespace KMail; diff --git a/kmail/chiasmuskeyselector.cpp b/kmail/chiasmuskeyselector.cpp index ca5fe114..9e25743e 100644 --- a/kmail/chiasmuskeyselector.cpp +++ b/kmail/chiasmuskeyselector.cpp @@ -2,7 +2,7 @@ #include <klineedit.h> #include <tdelistbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqlabel.h> diff --git a/kmail/compactionjob.cpp b/kmail/compactionjob.cpp index fd89f458..a2ace485 100644 --- a/kmail/compactionjob.cpp +++ b/kmail/compactionjob.cpp @@ -33,7 +33,7 @@ using KPIM::BroadcastStatus; #include "kmfoldermaildir.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqfile.h> #include <tqfileinfo.h> diff --git a/kmail/composer.h b/kmail/composer.h index 3d86ec57..30cf0b28 100644 --- a/kmail/composer.h +++ b/kmail/composer.h @@ -8,7 +8,7 @@ #include "secondarywindow.h" #include <kurl.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tqstring.h> #include <tqcstring.h> diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp index 434ddac1..e740e749 100644 --- a/kmail/configuredialog.cpp +++ b/kmail/configuredialog.cpp @@ -82,14 +82,14 @@ using KMime::DateFormatter; #include <ui/keyselectiondialog.h> // other KDE headers: -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <kcharsets.h> #include <kasciistringtools.h> #include <kdebug.h> #include <knuminput.h> #include <tdefontdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kurlrequester.h> #include <kseparator.h> #include <kiconloader.h> diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp index 37819739..83c13a31 100644 --- a/kmail/configuredialog_p.cpp +++ b/kmail/configuredialog_p.cpp @@ -22,7 +22,7 @@ // other KDE headers: #include <ksimpleconfig.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> // TQt headers: diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h index 439393d3..6ba969de 100644 --- a/kmail/configuredialog_p.h +++ b/kmail/configuredialog_p.h @@ -17,7 +17,7 @@ #include <kdialogbase.h> #include <tdelistview.h> #include <tdecmodule.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepimmacros.h> class TQPushButton; diff --git a/kmail/copyfolderjob.cpp b/kmail/copyfolderjob.cpp index 21f475d6..165d9468 100644 --- a/kmail/copyfolderjob.cpp +++ b/kmail/copyfolderjob.cpp @@ -39,7 +39,7 @@ #include "undostack.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <config.h> using namespace KMail; diff --git a/kmail/customtemplates.cpp b/kmail/customtemplates.cpp index bbbd0aec..129ff756 100644 --- a/kmail/customtemplates.cpp +++ b/kmail/customtemplates.cpp @@ -31,15 +31,15 @@ #include <tqfont.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kpushbutton.h> #include <tdelistview.h> #include <klineedit.h> #include <tqcombobox.h> #include <tdeshortcut.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kkeybutton.h> #include <kactivelabel.h> diff --git a/kmail/distributionlistdialog.cpp b/kmail/distributionlistdialog.cpp index 516634ba..010fdd9b 100644 --- a/kmail/distributionlistdialog.cpp +++ b/kmail/distributionlistdialog.cpp @@ -24,9 +24,9 @@ #include "distributionlistdialog.h" #include <libemailfunctions/email.h> -#include <kabc/resource.h> -#include <kabc/stdaddressbook.h> -#include <kabc/distributionlist.h> +#include <tdeabc/resource.h> +#include <tdeabc/stdaddressbook.h> +#include <tdeabc/distributionlist.h> #ifdef TDEPIM_NEW_DISTRLISTS #include <libtdepim/distributionlist.h> @@ -34,9 +34,9 @@ #include <libtdepim/kaddrbook.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kinputdialog.h> #include <tqlayout.h> diff --git a/kmail/editorwatcher.cpp b/kmail/editorwatcher.cpp index da78a64d..a7f25c3b 100644 --- a/kmail/editorwatcher.cpp +++ b/kmail/editorwatcher.cpp @@ -21,8 +21,8 @@ #include <config.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kopenwith.h> #include <kprocess.h> #include <kuserprofile.h> diff --git a/kmail/encodingdetector.cpp b/kmail/encodingdetector.cpp index 01a60d88..fe378d73 100644 --- a/kmail/encodingdetector.cpp +++ b/kmail/encodingdetector.cpp @@ -40,10 +40,10 @@ #include <tqregexp.h> #include <tqtextcodec.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kcharsets.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <ctype.h> diff --git a/kmail/expirejob.cpp b/kmail/expirejob.cpp index 2fcc323e..a3749947 100644 --- a/kmail/expirejob.cpp +++ b/kmail/expirejob.cpp @@ -35,7 +35,7 @@ using KPIM::BroadcastStatus; #include "kmcommands.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> using namespace KMail; diff --git a/kmail/expirypropertiesdialog.cpp b/kmail/expirypropertiesdialog.cpp index b6b0f6d7..f1c3274f 100644 --- a/kmail/expirypropertiesdialog.cpp +++ b/kmail/expirypropertiesdialog.cpp @@ -17,8 +17,8 @@ #include <tqtooltip.h> #include <tqwhatsthis.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> using namespace KMail; diff --git a/kmail/favoritefolderview.cpp b/kmail/favoritefolderview.cpp index 9764e240..45c056ee 100644 --- a/kmail/favoritefolderview.cpp +++ b/kmail/favoritefolderview.cpp @@ -35,10 +35,10 @@ #include <dcopclient.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> #include <kinputdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <tdeio/global.h> diff --git a/kmail/filterlogdlg.cpp b/kmail/filterlogdlg.cpp index 25fb7d5c..eaaefd79 100644 --- a/kmail/filterlogdlg.cpp +++ b/kmail/filterlogdlg.cpp @@ -33,8 +33,8 @@ #include <kdebug.h> #include <tdeversion.h> #include <tdefiledialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tqcheckbox.h> #include <tqlabel.h> diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp index 27d2f0c7..2f86cdad 100644 --- a/kmail/folderdiaacltab.cpp +++ b/kmail/folderdiaacltab.cpp @@ -40,17 +40,17 @@ #include "kmfolder.h" #include <addressesdialog.h> -#include <kabc/addresseelist.h> +#include <tdeabc/addresseelist.h> #ifdef TDEPIM_NEW_DISTRLISTS #include <libtdepim/distributionlist.h> // libtdepim #else -#include <kabc/distributionlist.h> +#include <tdeabc/distributionlist.h> #endif -#include <kabc/stdaddressbook.h> +#include <tdeabc/stdaddressbook.h> #include <kaddrbook.h> #include <kpushbutton.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqlabel.h> @@ -61,7 +61,7 @@ #include <tqwhatsthis.h> #include <assert.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> using namespace KMail; diff --git a/kmail/folderdiaquotatab_p.cpp b/kmail/folderdiaquotatab_p.cpp index 103d961e..d11fb6a9 100644 --- a/kmail/folderdiaquotatab_p.cpp +++ b/kmail/folderdiaquotatab_p.cpp @@ -40,7 +40,7 @@ #include <math.h> #include "kmkernel.h" -#include "klocale.h" +#include "tdelocale.h" #include "tdeconfig.h" #include "kdebug.h" #include "kdialog.h" diff --git a/kmail/foldershortcutdialog.cpp b/kmail/foldershortcutdialog.cpp index 169af7aa..1c4e79cf 100644 --- a/kmail/foldershortcutdialog.cpp +++ b/kmail/foldershortcutdialog.cpp @@ -42,8 +42,8 @@ #include <tqwhatsthis.h> #include <kkeybutton.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "kmmainwidget.h" #include "foldershortcutdialog.h" diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp index 7be5c26a..f6d1a358 100644 --- a/kmail/folderstorage.cpp +++ b/kmail/folderstorage.cpp @@ -48,7 +48,7 @@ using KMail::ListJob; #include "kmsearchpattern.h" #include "globalsettings.h" -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/kmail/folderutil.cpp b/kmail/folderutil.cpp index 0c2554dc..76c12744 100644 --- a/kmail/folderutil.cpp +++ b/kmail/folderutil.cpp @@ -23,7 +23,7 @@ #include "kmfoldercachedimap.h" #include "kmfoldermgr.h" -#include <kmessagebox.h> +#include <tdemessagebox.h> using namespace KMail; using namespace FolderUtil; diff --git a/kmail/headeritem.cpp b/kmail/headeritem.cpp index 806fba35..e3d2d05c 100644 --- a/kmail/headeritem.cpp +++ b/kmail/headeritem.cpp @@ -26,7 +26,7 @@ ** your version. ** *******************************************************************************/ -#include <klocale.h> +#include <tdelocale.h> #include <tqapplication.h> #include <tqregexp.h> #include <tqbitmap.h> diff --git a/kmail/headerlistquicksearch.cpp b/kmail/headerlistquicksearch.cpp index dba0135b..93795a52 100644 --- a/kmail/headerlistquicksearch.cpp +++ b/kmail/headerlistquicksearch.cpp @@ -38,7 +38,7 @@ #include <tdeaction.h> #include <kiconloader.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdetoolbarbutton.h> #include "kmheaders.h" diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp index a762a7db..5f04982d 100644 --- a/kmail/headerstyle.cpp +++ b/kmail/headerstyle.cpp @@ -51,11 +51,11 @@ using namespace KPIM; #include <mimelib/headers.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeimproxy.h> -#include <kabc/stdaddressbook.h> -#include <kabc/addresseelist.h> +#include <tdeabc/stdaddressbook.h> +#include <tdeabc/addresseelist.h> #include <kmdcodec.h> #include <tqdatetime.h> #include <tqbuffer.h> diff --git a/kmail/htmlstatusbar.cpp b/kmail/htmlstatusbar.cpp index 9a26dfcd..fecda8de 100644 --- a/kmail/htmlstatusbar.cpp +++ b/kmail/htmlstatusbar.cpp @@ -42,7 +42,7 @@ #include <tdeapplication.h> #endif -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tqcolor.h> diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp index 0e4e3c14..90b4ffdd 100644 --- a/kmail/identitydialog.cpp +++ b/kmail/identitydialog.cpp @@ -61,8 +61,8 @@ using KMail::FolderRequester; #include <libemailfunctions/email.h> // other KDE headers: -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdeconfig.h> #include <tdefileitem.h> #include <kurl.h> diff --git a/kmail/identitylistview.cpp b/kmail/identitylistview.cpp index c5c9c059..c13b9d1f 100644 --- a/kmail/identitylistview.cpp +++ b/kmail/identitylistview.cpp @@ -39,7 +39,7 @@ #include <libkpimidentities/identitymanager.h> #include "kmkernel.h" -#include <klocale.h> // i18n +#include <tdelocale.h> // i18n #include <kiconloader.h> // SmallIcon #include <cassert> diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp index 28a73cc9..e1568b11 100644 --- a/kmail/imapaccountbase.cpp +++ b/kmail/imapaccountbase.cpp @@ -53,8 +53,8 @@ using KPIM::ProgressManager; #include <tdeapplication.h> #include <kdebug.h> #include <tdeconfig.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> using TDEIO::MetaData; #include <tdeio/passdlg.h> using TDEIO::PasswordDialog; diff --git a/kmail/imapjob.cpp b/kmail/imapjob.cpp index 52a11083..c50663ed 100644 --- a/kmail/imapjob.cpp +++ b/kmail/imapjob.cpp @@ -44,7 +44,7 @@ using KPIM::ProgressManager; #include <tqstylesheet.h> #include <tdeio/scheduler.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <mimelib/body.h> #include <mimelib/bodypart.h> #include <mimelib/string.h> diff --git a/kmail/importarchivedialog.cpp b/kmail/importarchivedialog.cpp index 0da3448c..08a6e4a4 100644 --- a/kmail/importarchivedialog.cpp +++ b/kmail/importarchivedialog.cpp @@ -24,8 +24,8 @@ #include "importjob.h" #include <kurlrequester.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tqlayout.h> #include <tqlabel.h> diff --git a/kmail/importjob.cpp b/kmail/importjob.cpp index 3a7de198..58f9d974 100644 --- a/kmail/importjob.cpp +++ b/kmail/importjob.cpp @@ -29,8 +29,8 @@ #include <kdebug.h> #include <kzip.h> #include <ktar.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kmimetype.h> #include <tqwidget.h> diff --git a/kmail/keyresolver.cpp b/kmail/keyresolver.cpp index a9f8dc6d..55459dd2 100644 --- a/kmail/keyresolver.cpp +++ b/kmail/keyresolver.cpp @@ -53,11 +53,11 @@ #include <gpgmepp/key.h> #include <gpgmepp/keylistresult.h> -#include <kabc/stdaddressbook.h> -#include <klocale.h> +#include <tdeabc/stdaddressbook.h> +#include <tdelocale.h> #include <kdebug.h> #include <kinputdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqstringlist.h> #include <tqtl.h> diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp index ad500791..825e0cef 100644 --- a/kmail/kmaccount.cpp +++ b/kmail/kmaccount.cpp @@ -25,8 +25,8 @@ using KPIM::ProgressManager; using KMail::FolderJob; #include <tdeapplication.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <tdeconfig.h> diff --git a/kmail/kmacctimap.cpp b/kmail/kmacctimap.cpp index 70a5f0ca..d6b55332 100644 --- a/kmail/kmacctimap.cpp +++ b/kmail/kmacctimap.cpp @@ -47,7 +47,7 @@ using KPIM::ProgressItem; using KPIM::ProgressManager; #include <tdeio/scheduler.h> #include <tdeio/slave.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <tqstylesheet.h> diff --git a/kmail/kmacctlocal.cpp b/kmail/kmacctlocal.cpp index 93ba3a16..e42407e6 100644 --- a/kmail/kmacctlocal.cpp +++ b/kmail/kmacctlocal.cpp @@ -15,8 +15,8 @@ using KPIM::ProgressManager; #include "kmfoldermgr.h" #include <tdeapplication.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <tdeconfig.h> diff --git a/kmail/kmacctmaildir.cpp b/kmail/kmacctmaildir.cpp index f3e69d2b..52b398e8 100644 --- a/kmail/kmacctmaildir.cpp +++ b/kmail/kmacctmaildir.cpp @@ -14,8 +14,8 @@ using KPIM::BroadcastStatus; using KPIM::ProgressManager; #include <tdeapplication.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <tdeconfig.h> diff --git a/kmail/kmacctseldlg.cpp b/kmail/kmacctseldlg.cpp index 44df37c6..35f1fc42 100644 --- a/kmail/kmacctseldlg.cpp +++ b/kmail/kmacctseldlg.cpp @@ -28,7 +28,7 @@ #include <tqlayout.h> #include <tqradiobutton.h> -#include <klocale.h> +#include <tdelocale.h> #include "kmacctseldlg.moc" diff --git a/kmail/kmaddrbook.cpp b/kmail/kmaddrbook.cpp index 84715a6f..0772ccfb 100644 --- a/kmail/kmaddrbook.cpp +++ b/kmail/kmaddrbook.cpp @@ -25,10 +25,10 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> -#include <kabc/stdaddressbook.h> -#include <kabc/distributionlist.h> +#include <tdelocale.h> +#include <tdemessagebox.h> +#include <tdeabc/stdaddressbook.h> +#include <tdeabc/distributionlist.h> #include <dcopref.h> #include <tqregexp.h> diff --git a/kmail/kmaddrbook.h b/kmail/kmaddrbook.h index 1a7c9222..26cd9c0b 100644 --- a/kmail/kmaddrbook.h +++ b/kmail/kmaddrbook.h @@ -23,7 +23,7 @@ #include <tqstringlist.h> #include <tdeversion.h> -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> class TQWidget; diff --git a/kmail/kmail_options.h b/kmail/kmail_options.h index a8830c41..c0489b7f 100644 --- a/kmail/kmail_options.h +++ b/kmail/kmail_options.h @@ -3,7 +3,7 @@ #define KMAIL_OPTIONS_H #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> TDECmdLineOptions kmail_options[] = { diff --git a/kmail/kmailicalifaceimpl.cpp b/kmail/kmailicalifaceimpl.cpp index b747be68..8f10be35 100644 --- a/kmail/kmailicalifaceimpl.cpp +++ b/kmail/kmailicalifaceimpl.cpp @@ -69,10 +69,10 @@ using KMail::AccountManager; #include <kiconloader.h> #include <kinputdialog.h> #include <dcopclient.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeconfig.h> #include <kurl.h> -#include <ktempfile.h> +#include <tdetempfile.h> using namespace KMail; diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp index 9faa35e5..c2cd8353 100644 --- a/kmail/kmcommands.cpp +++ b/kmail/kmcommands.cpp @@ -62,17 +62,17 @@ #include <kdcopservicestarter.h> #include <kdebug.h> #include <tdefiledialog.h> -#include <kabc/stdaddressbook.h> -#include <kabc/addresseelist.h> +#include <tdeabc/stdaddressbook.h> +#include <tdeabc/addresseelist.h> #include <kdirselectdialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdeparts/browserextension.h> #include <kprogress.h> #include <krun.h> #include <kbookmarkmanager.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeimproxy.h> #include <kuserprofile.h> // KIO headers diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h index 5e8bf9c3..25c0a117 100644 --- a/kmail/kmcommands.h +++ b/kmail/kmcommands.h @@ -15,7 +15,7 @@ #include <mimelib/string.h> #include <tdepimmacros.h> #include <kservice.h> -#include <ktempfile.h> +#include <tdetempfile.h> class TQPopupMenu; class TDEMainWindow; diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp index 6031254a..d7e96b26 100644 --- a/kmail/kmcomposewin.cpp +++ b/kmail/kmcomposewin.cpp @@ -88,11 +88,11 @@ using TDERecentAddress::RecentAddresses; #include <tdefiledialog.h> #include <twin.h> #include <kinputdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kurldrag.h> #include <tdeio/scheduler.h> -#include <ktempfile.h> -#include <klocale.h> +#include <tdetempfile.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <kstatusbar.h> #include <tdeaction.h> diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h index ec576bda..7e43749f 100644 --- a/kmail/kmcomposewin.h +++ b/kmail/kmcomposewin.h @@ -29,7 +29,7 @@ #include <tqsplitter.h> #include <tdeio/job.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeversion.h> #include <keditcl.h> #include <ktempdir.h> diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp index 15889f12..afe854de 100644 --- a/kmail/kmedit.cpp +++ b/kmail/kmedit.cpp @@ -26,11 +26,11 @@ using KPIM::MailListDrag; #include <tdepopupmenu.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kurldrag.h> -#include <ktempfile.h> -#include <klocale.h> +#include <tdetempfile.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <kdirwatch.h> #include <kiconloader.h> diff --git a/kmail/kmfawidgets.cpp b/kmail/kmfawidgets.cpp index 493fa6c5..80cd3fd9 100644 --- a/kmail/kmfawidgets.cpp +++ b/kmail/kmfawidgets.cpp @@ -8,9 +8,9 @@ #include "kmfawidgets.h" -#include <kabc/addresseedialog.h> // for the button in KMFilterActionWithAddress +#include <tdeabc/addresseedialog.h> // for the button in KMFilterActionWithAddress #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kaudioplayer.h> #include <kurlrequester.h> #include <tdefiledialog.h> diff --git a/kmail/kmfilter.cpp b/kmail/kmfilter.cpp index 1a98963e..d681c6a6 100644 --- a/kmail/kmfilter.cpp +++ b/kmail/kmfilter.cpp @@ -31,8 +31,8 @@ using KMail::AccountManager; #include "filterlog.h" using KMail::FilterLog; -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <tdeconfig.h> diff --git a/kmail/kmfilteraction.cpp b/kmail/kmfilteraction.cpp index 1fce0df5..d97e5fa7 100644 --- a/kmail/kmfilteraction.cpp +++ b/kmail/kmfilteraction.cpp @@ -36,9 +36,9 @@ using KMail::ActionScheduler; #include "regexplineedit.h" using KMail::RegExpLineEdit; #include <kregexp3.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprocess.h> #include <kaudioplayer.h> #include <kurlrequester.h> diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp index 2185ccf8..f81a7071 100644 --- a/kmail/kmfilterdlg.cpp +++ b/kmail/kmfilterdlg.cpp @@ -19,9 +19,9 @@ using KMail::FilterImporterExporter; #include "globalsettings.h" // other KDE headers: -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kinputdialog.h> #include <kiconloader.h> #include <tdeapplication.h> diff --git a/kmail/kmfiltermgr.cpp b/kmail/kmfiltermgr.cpp index ac2915e7..e91a44a6 100644 --- a/kmail/kmfiltermgr.cpp +++ b/kmail/kmfiltermgr.cpp @@ -22,7 +22,7 @@ using KMail::MessageProperty; // other KDE headers #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> // other TQt headers diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp index 6083ea9e..45738939 100644 --- a/kmail/kmfolder.cpp +++ b/kmail/kmfolder.cpp @@ -38,9 +38,9 @@ #include <errno.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeshortcut.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqfile.h> #include <tqfileinfo.h> diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp index 25abffe8..dcfcbe7f 100644 --- a/kmail/kmfoldercachedimap.cpp +++ b/kmail/kmfoldercachedimap.cpp @@ -63,8 +63,8 @@ using KMail::ListJob; #include "kmmainwidget.h" #include <tdeapplication.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeconfig.h> #include <tdeio/global.h> diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp index 4bbfa8e6..265b1ee9 100644 --- a/kmail/kmfolderdia.cpp +++ b/kmail/kmfolderdia.cpp @@ -51,9 +51,9 @@ #include <keditlistbox.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kicondialog.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/kmail/kmfolderdir.cpp b/kmail/kmfolderdir.cpp index 980d0b14..6d673c4b 100644 --- a/kmail/kmfolderdir.cpp +++ b/kmail/kmfolderdir.cpp @@ -10,8 +10,8 @@ #include <assert.h> #include <errno.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <kstandarddirs.h> diff --git a/kmail/kmfolderindex.cpp b/kmail/kmfolderindex.cpp index 39839e32..7bb77f0d 100644 --- a/kmail/kmfolderindex.cpp +++ b/kmail/kmfolderindex.cpp @@ -53,8 +53,8 @@ #endif #include <tdeapplication.h> #include <kcursor.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include "kmmsgdict.h" // We define functions as kmail_swap_NN so that we don't get compile errors diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp index 669bd6e1..5242060a 100644 --- a/kmail/kmfoldermaildir.cpp +++ b/kmail/kmfoldermaildir.cpp @@ -24,9 +24,9 @@ using KMail::MaildirJob; #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstaticdeleter.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdirsize.h> #include <dirent.h> diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp index 1579db0c..6692f54c 100644 --- a/kmail/kmfoldermbox.cpp +++ b/kmail/kmfoldermbox.cpp @@ -33,8 +33,8 @@ #include "util.h" #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <knotifyclient.h> #include <kprocess.h> #include <tdeconfig.h> diff --git a/kmail/kmfoldermgr.cpp b/kmail/kmfoldermgr.cpp index 2513258c..d270e710 100644 --- a/kmail/kmfoldermgr.cpp +++ b/kmail/kmfoldermgr.cpp @@ -18,8 +18,8 @@ #include <tqdir.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdeconfig.h> #include <kdebug.h> #include <tdeapplication.h> diff --git a/kmail/kmfoldersearch.cpp b/kmail/kmfoldersearch.cpp index 038ddbe1..e2a72cb2 100644 --- a/kmail/kmfoldersearch.cpp +++ b/kmail/kmfoldersearch.cpp @@ -29,7 +29,7 @@ #include "jobscheduler.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <assert.h> diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp index 0b13f07b..bf684661 100644 --- a/kmail/kmfoldertree.cpp +++ b/kmail/kmfoldertree.cpp @@ -31,9 +31,9 @@ using KMail::FolderViewToolTip; using namespace KPIM; #include <tdeapplication.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeconfig.h> #include <tdepopupmenu.h> #include <kdebug.h> diff --git a/kmail/kmfoldertree.h b/kmail/kmfoldertree.h index 1c6b6b6a..11e7584f 100644 --- a/kmail/kmfoldertree.h +++ b/kmail/kmfoldertree.h @@ -20,7 +20,7 @@ #include "foldertreebase.h" -#include <klocale.h> +#include <tdelocale.h> #include <tdepimmacros.h> #include <tqguardedptr.h> diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp index a768513f..77af8e44 100644 --- a/kmail/kmheaders.cpp +++ b/kmail/kmheaders.cpp @@ -33,13 +33,13 @@ using namespace KPIM; #include <tdeapplication.h> #include <tdeaccelmanager.h> -#include <kglobalsettings.h> -#include <kmessagebox.h> +#include <tdeglobalsettings.h> +#include <tdemessagebox.h> #include <kiconloader.h> #include <tdepopupmenu.h> #include <kimageio.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqbuffer.h> diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp index e748c550..056eaa4a 100644 --- a/kmail/kmkernel.cpp +++ b/kmail/kmkernel.cpp @@ -57,7 +57,7 @@ using KMail::FolderIface; #include "templateparser.h" #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <knotifyclient.h> #include <kstaticdeleter.h> #include <kstandarddirs.h> @@ -90,7 +90,7 @@ using KWallet::Wallet; #include <X11/Xlib.h> #include <fixx11h.h> #include <tdecmdlineargs.h> -#include <kstartupinfo.h> +#include <tdestartupinfo.h> KMKernel *KMKernel::mySelf = 0; static bool s_askingToGoOnline = false; diff --git a/kmail/kmlineeditspell.cpp b/kmail/kmlineeditspell.cpp index cc6de465..7d26495a 100644 --- a/kmail/kmlineeditspell.cpp +++ b/kmail/kmlineeditspell.cpp @@ -13,15 +13,15 @@ #include <libtdepim/kvcarddrag.h> #include <libemailfunctions/email.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/vcardconverter.h> #include <tdeio/netaccess.h> #include <tdepopupmenu.h> #include <kurl.h> #include <kurldrag.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdecompletionbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqevent.h> #include <tqfile.h> diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp index 6675149c..97f7922f 100644 --- a/kmail/kmmainwidget.cpp +++ b/kmail/kmmainwidget.cpp @@ -24,10 +24,10 @@ #include <tqstylesheet.h> #include <kopenwith.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdepopupmenu.h> #include <tdeaccelmanager.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdestdaccel.h> #include <kkeydialog.h> #include <kcharsets.h> diff --git a/kmail/kmmainwin.cpp b/kmail/kmmainwin.cpp index 1a3a6cb9..67965db5 100644 --- a/kmail/kmmainwin.cpp +++ b/kmail/kmmainwin.cpp @@ -15,10 +15,10 @@ #include "kmtransport.h" #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kedittoolbar.h> #include <tdeconfig.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstringhandler.h> #include <kdebug.h> #include <ktip.h> diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp index 201416b2..ba8fba5a 100644 --- a/kmail/kmmessage.cpp +++ b/kmail/kmmessage.cpp @@ -35,7 +35,7 @@ using KMail::HeaderStrategy; #include <kaddrbook.h> #include <tdeapplication.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kdebug.h> #include <tdeconfig.h> #include <tdehtml_part.h> @@ -60,13 +60,13 @@ using namespace KMime::Types; #include <assert.h> #include <sys/time.h> #include <time.h> -#include <klocale.h> +#include <tdelocale.h> #include <stdlib.h> #include <unistd.h> #include "util.h" #if ALLOW_GUI -#include <kmessagebox.h> +#include <tdemessagebox.h> #endif using namespace KMime; diff --git a/kmail/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp index 29d4b8f7..05307c96 100644 --- a/kmail/kmmimeparttree.cpp +++ b/kmail/kmmimeparttree.cpp @@ -41,9 +41,9 @@ #include "kmcommands.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kiconloader.h> #include <tqclipboard.h> diff --git a/kmail/kmmsgbase.cpp b/kmail/kmmsgbase.cpp index eaac2ebf..abf1ade7 100644 --- a/kmail/kmmsgbase.cpp +++ b/kmail/kmmsgbase.cpp @@ -13,7 +13,7 @@ using KMail::MessageProperty; #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kcharsets.h> #include <kasciistringtools.h> #include <kmdcodec.h> diff --git a/kmail/kmpopfiltercnfrmdlg.cpp b/kmail/kmpopfiltercnfrmdlg.cpp index e07c7708..3689e663 100644 --- a/kmail/kmpopfiltercnfrmdlg.cpp +++ b/kmail/kmpopfiltercnfrmdlg.cpp @@ -19,7 +19,7 @@ #include <tqvgroupbox.h> #include <tqtimer.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeio/global.h> #include <assert.h> diff --git a/kmail/kmreadermainwin.cpp b/kmail/kmreadermainwin.cpp index fdf965ae..3c342172 100644 --- a/kmail/kmreadermainwin.cpp +++ b/kmail/kmreadermainwin.cpp @@ -29,14 +29,14 @@ #include <tqaccel.h> #include <tdeapplication.h> #include <kedittoolbar.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdestdaccel.h> #include <twin.h> #include <tdeaction.h> #include <kiconloader.h> #include <kdebug.h> #include "kmcommands.h" -#include "kmenubar.h" +#include "tdemenubar.h" #include "tdepopupmenu.h" #include "kmreaderwin.h" #include "kmfolder.h" diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp index 9d8db6c9..fc93be5e 100644 --- a/kmail/kmreaderwin.cpp +++ b/kmail/kmreaderwin.cpp @@ -77,8 +77,8 @@ using KMail::TeeHtmlWriter; #include <kleo/cryptobackendfactory.h> // KABC includes -#include <kabc/addressee.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/addressee.h> +#include <tdeabc/vcardconverter.h> // tdehtml headers #include <tdehtml_part.h> @@ -98,11 +98,11 @@ using KMail::TeeHtmlWriter; #include <kcursor.h> #include <kdebug.h> #include <tdefiledialog.h> -#include <klocale.h> -#include <kmessagebox.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdemessagebox.h> +#include <tdeglobalsettings.h> #include <krun.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kprocess.h> #include <kdialog.h> #include <tdeaction.h> diff --git a/kmail/kmsearchpattern.cpp b/kmail/kmsearchpattern.cpp index 1ab6381e..90bc22a7 100644 --- a/kmail/kmsearchpattern.cpp +++ b/kmail/kmsearchpattern.cpp @@ -16,12 +16,12 @@ using KMail::FilterLog; #include <libemailfunctions/email.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeconfig.h> -#include <kabc/stdaddressbook.h> +#include <tdeabc/stdaddressbook.h> #include <tqregexp.h> diff --git a/kmail/kmsearchpattern.h b/kmail/kmsearchpattern.h index d532602e..9b521c1f 100644 --- a/kmail/kmsearchpattern.h +++ b/kmail/kmsearchpattern.h @@ -6,7 +6,7 @@ #ifndef _kmsearchpattern_h_ #define _kmsearchpattern_h_ -#include <klocale.h> +#include <tdelocale.h> #include <tqptrlist.h> #include <tqstring.h> #include <tqcstring.h> diff --git a/kmail/kmsearchpatternedit.cpp b/kmail/kmsearchpatternedit.cpp index ceafc27e..88f3609b 100644 --- a/kmail/kmsearchpatternedit.cpp +++ b/kmail/kmsearchpatternedit.cpp @@ -10,7 +10,7 @@ #include "rulewidgethandlermanager.h" using KMail::RuleWidgetHandlerManager; -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <kdebug.h> diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp index 64c56cb1..9a8ae5be 100644 --- a/kmail/kmsender.cpp +++ b/kmail/kmsender.cpp @@ -13,9 +13,9 @@ using namespace KMime::Types; #include <tdeio/passdlg.h> #include <tdeio/scheduler.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeversion.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeconfig.h> diff --git a/kmail/kmservertest.cpp b/kmail/kmservertest.cpp index 6b4848f0..446c739e 100644 --- a/kmail/kmservertest.cpp +++ b/kmail/kmservertest.cpp @@ -34,8 +34,8 @@ #include "kmservertest.h" -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <kurl.h> #include <tdeapplication.h> diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp index 9cf1b905..c1eb6ccb 100644 --- a/kmail/kmstartup.cpp +++ b/kmail/kmstartup.cpp @@ -23,13 +23,13 @@ #include "kmkernel.h" //control center #include "kcursorsaver.h" -#include <klocale.h> +#include <tdelocale.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <dcopclient.h> #include <kcrash.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeapplication.h> #include <tdeaboutdata.h> #include <kiconloader.h> diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp index f4e1d432..7cb2fb43 100644 --- a/kmail/kmsystemtray.cpp +++ b/kmail/kmsystemtray.cpp @@ -30,7 +30,7 @@ using KMail::AccountManager; #include <tdeapplication.h> #include <tdemainwindow.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> #include <kiconeffect.h> #include <twin.h> diff --git a/kmail/kmtransport.cpp b/kmail/kmtransport.cpp index 2432031b..e14bd772 100644 --- a/kmail/kmtransport.cpp +++ b/kmail/kmtransport.cpp @@ -34,8 +34,8 @@ #include <tqwhatsthis.h> #include <tdefiledialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kseparator.h> #include <kdebug.h> #include <tdewallet.h> diff --git a/kmail/listjob.cpp b/kmail/listjob.cpp index d8ee1e10..75e4dee5 100644 --- a/kmail/listjob.cpp +++ b/kmail/listjob.cpp @@ -27,7 +27,7 @@ */ #include "listjob.h" -#include "kmessagebox.h" +#include "tdemessagebox.h" #include "kmfolderimap.h" #include "kmfoldercachedimap.h" #include "kmacctimap.h" @@ -42,7 +42,7 @@ using KPIM::ProgressManager; #include <tdeio/scheduler.h> #include <tdeio/job.h> #include <tdeio/global.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqstylesheet.h> diff --git a/kmail/localsubscriptiondialog.cpp b/kmail/localsubscriptiondialog.cpp index 3b6f55dc..c2d4e555 100644 --- a/kmail/localsubscriptiondialog.cpp +++ b/kmail/localsubscriptiondialog.cpp @@ -34,8 +34,8 @@ #endif #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "localsubscriptiondialog.h" #include "kmkernel.h" diff --git a/kmail/mailinglistpropertiesdialog.cpp b/kmail/mailinglistpropertiesdialog.cpp index 1bb2b144..0bfb2cc1 100644 --- a/kmail/mailinglistpropertiesdialog.cpp +++ b/kmail/mailinglistpropertiesdialog.cpp @@ -32,11 +32,11 @@ #include <tqcheckbox.h> #include <tqpushbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <keditlistbox.h> #include <kdialogbase.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kmcommands.h> #include "kmfolder.h" diff --git a/kmail/main.cpp b/kmail/main.cpp index 628ae97a..bb3e0a8a 100644 --- a/kmail/main.cpp +++ b/kmail/main.cpp @@ -20,7 +20,7 @@ #include <config.h> #include <kuniqueapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <knotifyclient.h> #include <dcopclient.h> #include "kmkernel.h" //control center diff --git a/kmail/managesievescriptsdialog.cpp b/kmail/managesievescriptsdialog.cpp index 269c5870..560fac90 100644 --- a/kmail/managesievescriptsdialog.cpp +++ b/kmail/managesievescriptsdialog.cpp @@ -7,13 +7,13 @@ #include "sievejob.h" #include "kmkernel.h" -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <twin.h> #include <tdeapplication.h> #include <kinputdialog.h> -#include <kglobalsettings.h> -#include <kmessagebox.h> +#include <tdeglobalsettings.h> +#include <tdemessagebox.h> #include <tqlayout.h> #include <tqlistview.h> diff --git a/kmail/messageactions.cpp b/kmail/messageactions.cpp index 0b8c3cad..0d8c4369 100644 --- a/kmail/messageactions.cpp +++ b/kmail/messageactions.cpp @@ -26,7 +26,7 @@ #include <tdeaction.h> #include <tdeactioncollection.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqwidget.h> diff --git a/kmail/messagecomposer.cpp b/kmail/messagecomposer.cpp index 574c0838..2a82da9e 100644 --- a/kmail/messagecomposer.cpp +++ b/kmail/messagecomposer.cpp @@ -69,8 +69,8 @@ #include <mimelib/mimepp.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kinputdialog.h> #include <kdebug.h> #include <tdeaction.h> diff --git a/kmail/networkaccount.cpp b/kmail/networkaccount.cpp index 93693dd7..5e4f5b5e 100644 --- a/kmail/networkaccount.cpp +++ b/kmail/networkaccount.cpp @@ -34,8 +34,8 @@ #include <tdeconfig.h> #include <tdeio/global.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <tdewallet.h> using TDEIO::MetaData; diff --git a/kmail/newfolderdialog.cpp b/kmail/newfolderdialog.cpp index 21d39cd6..0643cbbc 100644 --- a/kmail/newfolderdialog.cpp +++ b/kmail/newfolderdialog.cpp @@ -36,9 +36,9 @@ #include <tqwhatsthis.h> #include <tqregexp.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialogbase.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "folderutil.h" #include "newfolderdialog.h" diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp index 295b7601..2b736d2c 100644 --- a/kmail/objecttreeparser.cpp +++ b/kmail/objecttreeparser.cpp @@ -86,14 +86,14 @@ // other KDE headers #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmimetype.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdehtml_part.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kstandarddirs.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kiconloader.h> #include <kmdcodec.h> diff --git a/kmail/partNode.cpp b/kmail/partNode.cpp index 576a1c17..9405544b 100644 --- a/kmail/partNode.cpp +++ b/kmail/partNode.cpp @@ -34,7 +34,7 @@ #include "partNode.h" #include "kmreaderwin.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "kmmimeparttree.h" #include <mimelib/utility.h> diff --git a/kmail/popaccount.cpp b/kmail/popaccount.cpp index ceea3a52..b455cc54 100644 --- a/kmail/popaccount.cpp +++ b/kmail/popaccount.cpp @@ -39,8 +39,8 @@ using KPIM::BroadcastStatus; #include <kdebug.h> #include <kstandarddirs.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdemainwindow.h> #include <tdeio/scheduler.h> #include <tdeio/passdlg.h> diff --git a/kmail/quotajobs.h b/kmail/quotajobs.h index 1749fe0e..4eb7ea0e 100644 --- a/kmail/quotajobs.h +++ b/kmail/quotajobs.h @@ -35,7 +35,7 @@ #include <tqvariant.h> #include <tdeio/job.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqvaluevector.h> #include <math.h> diff --git a/kmail/recipientseditor.cpp b/kmail/recipientseditor.cpp index c16fdf01..7497a460 100644 --- a/kmail/recipientseditor.cpp +++ b/kmail/recipientseditor.cpp @@ -35,9 +35,9 @@ #include <tdecompletionbox.h> #include <kdebug.h> #include <kinputdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqlayout.h> #include <tqlabel.h> diff --git a/kmail/recipientseditortest.cpp b/kmail/recipientseditortest.cpp index d5c5b3a1..50ea58a2 100644 --- a/kmail/recipientseditortest.cpp +++ b/kmail/recipientseditortest.cpp @@ -28,9 +28,9 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "aboutdata.h" #include <tqpushbutton.h> diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp index 2e851272..0b43795e 100644 --- a/kmail/recipientspicker.cpp +++ b/kmail/recipientspicker.cpp @@ -29,16 +29,16 @@ #include <libemailfunctions/email.h> #ifndef TDEPIM_NEW_DISTRLISTS -#include <kabc/distributionlist.h> +#include <tdeabc/distributionlist.h> #endif #include <tdelistview.h> -#include <klocale.h> -#include <kabc/resource.h> +#include <tdelocale.h> +#include <tdeabc/resource.h> #include <kiconloader.h> #include <kdialog.h> #include <twin.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqlayout.h> #include <tqcombobox.h> diff --git a/kmail/recipientspicker.h b/kmail/recipientspicker.h index 96401e17..38d36a98 100644 --- a/kmail/recipientspicker.h +++ b/kmail/recipientspicker.h @@ -27,8 +27,8 @@ #include <tdelistview.h> #include <tdelistviewsearchline.h> -#include <kabc/addressee.h> -#include <kabc/stdaddressbook.h> +#include <tdeabc/addressee.h> +#include <tdeabc/stdaddressbook.h> #include <tqwidget.h> #include <tqdialog.h> diff --git a/kmail/redirectdialog.cpp b/kmail/redirectdialog.cpp index c6585a5a..f29b7947 100644 --- a/kmail/redirectdialog.cpp +++ b/kmail/redirectdialog.cpp @@ -39,8 +39,8 @@ using KPIM::AddressesDialog; using TDERecentAddress::RecentAddresses; #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tqvbox.h> #include <tqhbox.h> diff --git a/kmail/regexplineedit.cpp b/kmail/regexplineedit.cpp index 3502cb17..1b14fb4f 100644 --- a/kmail/regexplineedit.cpp +++ b/kmail/regexplineedit.cpp @@ -36,7 +36,7 @@ #include "regexplineedit.h" -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <tdeparts/componentfactory.h> #include <kregexpeditorinterface.h> diff --git a/kmail/renamejob.cpp b/kmail/renamejob.cpp index 7b1b80e3..15c2778f 100644 --- a/kmail/renamejob.cpp +++ b/kmail/renamejob.cpp @@ -44,7 +44,7 @@ #include <tdeio/scheduler.h> #include <tdeio/job.h> #include <tdeio/global.h> -#include <klocale.h> +#include <tdelocale.h> #include <config.h> #include <tqmap.h> diff --git a/kmail/rulewidgethandlermanager.cpp b/kmail/rulewidgethandlermanager.cpp index fd5c811f..fac482ee 100644 --- a/kmail/rulewidgethandlermanager.cpp +++ b/kmail/rulewidgethandlermanager.cpp @@ -384,7 +384,7 @@ namespace { #include "regexplineedit.h" using KMail::RegExpLineEdit; -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <tqcombobox.h> diff --git a/kmail/searchjob.cpp b/kmail/searchjob.cpp index f7af79c2..b0b1d9de 100644 --- a/kmail/searchjob.cpp +++ b/kmail/searchjob.cpp @@ -43,8 +43,8 @@ using KPIM::ProgressManager; #include <tdeio/scheduler.h> #include <tdeio/job.h> #include <tdeio/global.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tqstylesheet.h> diff --git a/kmail/sieveconfig.cpp b/kmail/sieveconfig.cpp index 61ebc7a6..ff3e156d 100644 --- a/kmail/sieveconfig.cpp +++ b/kmail/sieveconfig.cpp @@ -19,7 +19,7 @@ #include "sieveconfig.h" #include <knuminput.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <tdeconfigbase.h> diff --git a/kmail/sievedebugdialog.cpp b/kmail/sievedebugdialog.cpp index bc5d2cca..cd3ebdfc 100644 --- a/kmail/sievedebugdialog.cpp +++ b/kmail/sievedebugdialog.cpp @@ -28,8 +28,8 @@ #include <tqdatetime.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kmime_header_parsing.h> #include <ksieve/error.h> diff --git a/kmail/signatureconfigurator.cpp b/kmail/signatureconfigurator.cpp index 3451fb48..81131956 100644 --- a/kmail/signatureconfigurator.cpp +++ b/kmail/signatureconfigurator.cpp @@ -19,7 +19,7 @@ #include "signatureconfigurator.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <klineedit.h> #include <kurlrequester.h> diff --git a/kmail/simplestringlisteditor.cpp b/kmail/simplestringlisteditor.cpp index cf58f98c..b0602428 100644 --- a/kmail/simplestringlisteditor.cpp +++ b/kmail/simplestringlisteditor.cpp @@ -37,7 +37,7 @@ #include <kinputdialog.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kpushbutton.h> diff --git a/kmail/snippetdlg.cpp b/kmail/snippetdlg.cpp index f6af1272..60bf689e 100644 --- a/kmail/snippetdlg.cpp +++ b/kmail/snippetdlg.cpp @@ -15,7 +15,7 @@ #include <kdialog.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlabel.h> #include <tqlayout.h> @@ -23,7 +23,7 @@ #include <ktextedit.h> #include "kkeybutton.h" #include "tdeactioncollection.h" -#include "kmessagebox.h" +#include "tdemessagebox.h" /* * Constructs a SnippetDlg as a child of 'parent', with the diff --git a/kmail/snippetitem.h b/kmail/snippetitem.h index 2111664e..cbc3c4eb 100644 --- a/kmail/snippetitem.h +++ b/kmail/snippetitem.h @@ -15,7 +15,7 @@ #define SNIPPETITEM_H #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqobject.h> diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp index c5ccdd9e..c08d21e2 100644 --- a/kmail/snippetwidget.cpp +++ b/kmail/snippetwidget.cpp @@ -13,14 +13,14 @@ #include <kurl.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <kpushbutton.h> #include <tdelistview.h> #include <tqheader.h> #include <klineedit.h> #include <ktextedit.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeconfig.h> #include <tqtooltip.h> #include <tdepopupmenu.h> diff --git a/kmail/subscriptiondialog.cpp b/kmail/subscriptiondialog.cpp index 992ce2c4..cf4572b2 100644 --- a/kmail/subscriptiondialog.cpp +++ b/kmail/subscriptiondialog.cpp @@ -38,9 +38,9 @@ #include "listjob.h" #include "imapaccountbase.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> namespace KMail { diff --git a/kmail/templateparser.cpp b/kmail/templateparser.cpp index 2ff9f56a..f94be954 100644 --- a/kmail/templateparser.cpp +++ b/kmail/templateparser.cpp @@ -22,14 +22,14 @@ #include <tqstring.h> #include <tqdatetime.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcalendarsystem.h> #include <kmime_util.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kprocess.h> #include <tqregexp.h> #include <tqfile.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kshell.h> #include <tqfileinfo.h> diff --git a/kmail/templatesconfiguration.cpp b/kmail/templatesconfiguration.cpp index 93e831fa..9a90ca5a 100644 --- a/kmail/templatesconfiguration.cpp +++ b/kmail/templatesconfiguration.cpp @@ -20,8 +20,8 @@ #include <config.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tqpopupmenu.h> #include <tqpushbutton.h> #include <tqtextedit.h> diff --git a/kmail/templatesinsertcommand.cpp b/kmail/templatesinsertcommand.cpp index 2bfabd93..b89fd2a1 100644 --- a/kmail/templatesinsertcommand.cpp +++ b/kmail/templatesinsertcommand.cpp @@ -24,7 +24,7 @@ #include <tdeaction.h> #include <tdeactionclasses.h> #include <tdepopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqsignalmapper.h> #include <kdebug.h> diff --git a/kmail/undostack.cpp b/kmail/undostack.cpp index c7e80e8f..24db928c 100644 --- a/kmail/undostack.cpp +++ b/kmail/undostack.cpp @@ -29,8 +29,8 @@ #include "kmfolder.h" #include "kmmsgdict.h" -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kdebug.h> namespace KMail { diff --git a/kmail/urlhandlermanager.cpp b/kmail/urlhandlermanager.cpp index 1a72cb27..78102b2b 100644 --- a/kmail/urlhandlermanager.cpp +++ b/kmail/urlhandlermanager.cpp @@ -396,9 +396,9 @@ TQString KMail::URLHandlerManager::statusBarMessage( const KURL & url, KMReaderW #include <ui/messagebox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprocess.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdehtml_part.h> #include <tqstring.h> diff --git a/kmail/util.h b/kmail/util.h index aa4aac28..3a496921 100644 --- a/kmail/util.h +++ b/kmail/util.h @@ -44,8 +44,8 @@ #include <tqcstring.h> #include <tdeio/netaccess.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> class DwString; class KURL; diff --git a/kmail/vacation.cpp b/kmail/vacation.cpp index a027c33b..3066b559 100644 --- a/kmail/vacation.cpp +++ b/kmail/vacation.cpp @@ -39,8 +39,8 @@ using KMime::Types::AddrSpecList; #include <ksieve/scriptbuilder.h> #include <ksieve/error.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <tqdatetime.h> diff --git a/kmail/vacationdialog.cpp b/kmail/vacationdialog.cpp index da5648c7..19229895 100644 --- a/kmail/vacationdialog.cpp +++ b/kmail/vacationdialog.cpp @@ -25,7 +25,7 @@ using KMime::Types::MailboxList; using KMime::HeaderParsing::parseAddressList; #include <knuminput.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <twin.h> #include <tdeapplication.h> diff --git a/kmail/vcardviewer.cpp b/kmail/vcardviewer.cpp index 0e34f72c..41d6705c 100644 --- a/kmail/vcardviewer.cpp +++ b/kmail/vcardviewer.cpp @@ -28,12 +28,12 @@ #include <addresseeview.h> using KPIM::AddresseeView; -#include <kabc/vcardconverter.h> -#include <kabc/addressee.h> +#include <tdeabc/vcardconverter.h> +#include <tdeabc/addressee.h> using KABC::VCardConverter; using KABC::Addressee; -#include <klocale.h> +#include <tdelocale.h> #include <tqstring.h> diff --git a/kmail/vcardviewer.h b/kmail/vcardviewer.h index 3ed8b213..a5460f99 100644 --- a/kmail/vcardviewer.h +++ b/kmail/vcardviewer.h @@ -21,8 +21,8 @@ #define VCARDVIEWER_H #include <kdialogbase.h> -#include <kabc/addressee.h> -#include <kabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define +#include <tdeabc/addressee.h> +#include <tdeabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define #include <tqvaluelist.h> diff --git a/kmail/xfaceconfigurator.cpp b/kmail/xfaceconfigurator.cpp index e35b2e0e..e27b192e 100644 --- a/kmail/xfaceconfigurator.cpp +++ b/kmail/xfaceconfigurator.cpp @@ -39,17 +39,17 @@ #include <kactivelabel.h> #include <kdialog.h> #include <tdefiledialog.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kimageio.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kurl.h> #include <tdeio/netaccess.h> using namespace TDEIO; #include <kxface.h> using namespace KPIM; -#include <kabc/stdaddressbook.h> -#include <kabc/addressee.h> +#include <tdeabc/stdaddressbook.h> +#include <tdeabc/addressee.h> using namespace KABC; #include <tqbitmap.h> |