diff options
1058 files changed, 1865 insertions, 1865 deletions
@@ -48,7 +48,7 @@ There is also quite an amount of infrastructure in this package: * libkcal: C++ api for the iCalendar and vCalendar formats * libkcal/libical: a basic iCalendar protocol implementation, see RFCs 2245,2246 * libkpimexchange: connecting to Exchange2000 servers -* kabc/frontend: A GUI frontend for libkabc, not intended for end users. +* tdeabc/frontend: A GUI frontend for libkabc, not intended for end users. * kgantt: lib to display and manage Gantt diagrams used by the project view plugin of KOrganizer * kdgantt: alternative lib for Gantt diagrams, used by the free/busy view of diff --git a/akregator/src/actionmanagerimpl.cpp b/akregator/src/actionmanagerimpl.cpp index 84695ce22..87b1ff19d 100644 --- a/akregator/src/actionmanagerimpl.cpp +++ b/akregator/src/actionmanagerimpl.cpp @@ -25,7 +25,7 @@ #include <tqwidget.h> #include <tdeaction.h> #include <tdeactioncollection.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <tdeshortcut.h> #include <kxmlguifactory.h> diff --git a/akregator/src/addfeeddialog.cpp b/akregator/src/addfeeddialog.cpp index 557fcd0f2..0642fa483 100644 --- a/akregator/src/addfeeddialog.cpp +++ b/akregator/src/addfeeddialog.cpp @@ -29,13 +29,13 @@ #include <tdeapplication.h> #include <kurl.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <kiconloader.h> #include <kicontheme.h> #include <kdebug.h> #include <ksqueezedtextlabel.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> namespace Akregator { diff --git a/akregator/src/akregator_options.h b/akregator/src/akregator_options.h index 1f59834de..20f29ffc6 100644 --- a/akregator/src/akregator_options.h +++ b/akregator/src/akregator_options.h @@ -26,7 +26,7 @@ #define AKREGATOR_OPTIONS_H #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> namespace Akregator { diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp index 16ae8e085..48311dcce 100644 --- a/akregator/src/akregator_part.cpp +++ b/akregator/src/akregator_part.cpp @@ -31,18 +31,18 @@ #include <tdeconfig.h> #include <tdeconfigdialog.h> #include <tdefiledialog.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdehtmldefaults.h> #include <kinstance.h> #include <tdemainwindow.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <knotifyclient.h> #include <knotifydialog.h> #include <tdepopupmenu.h> #include <kservice.h> #include <kstandarddirs.h> #include <kstdaction.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <ktrader.h> #include <tdeio/netaccess.h> #include <tdeparts/browserinterface.h> diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp index f03c23612..fa8691750 100644 --- a/akregator/src/akregator_view.cpp +++ b/akregator/src/akregator_view.cpp @@ -73,8 +73,8 @@ #include <kinputdialog.h> #include <klineedit.h> #include <tdelistview.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kpassdlg.h> #include <kprocess.h> #include <krun.h> diff --git a/akregator/src/articlelistview.cpp b/akregator/src/articlelistview.cpp index c08867b21..96a2a050c 100644 --- a/akregator/src/articlelistview.cpp +++ b/akregator/src/articlelistview.cpp @@ -34,9 +34,9 @@ #include <kstandarddirs.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcharsets.h> #include <kurl.h> diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp index e31cd3abc..96b269e6d 100644 --- a/akregator/src/articleviewer.cpp +++ b/akregator/src/articleviewer.cpp @@ -30,14 +30,14 @@ #include <tdeaction.h> #include <tdeapplication.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdehtmlview.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprocess.h> #include <krun.h> #include <kstandarddirs.h> #include <kshell.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeio/netaccess.h> #include <libtdepim/tdefileio.h> diff --git a/akregator/src/articleviewer.h b/akregator/src/articleviewer.h index ace931c8a..44443f7d6 100644 --- a/akregator/src/articleviewer.h +++ b/akregator/src/articleviewer.h @@ -26,7 +26,7 @@ #ifndef ARTICLEVIEWER_H #define ARTICLEVIEWER_H -#include <klocale.h> +#include <tdelocale.h> #include <tqcolor.h> #include <tqfont.h> diff --git a/akregator/src/configdialog.cpp b/akregator/src/configdialog.cpp index b88272b4c..5a280e1cc 100644 --- a/akregator/src/configdialog.cpp +++ b/akregator/src/configdialog.cpp @@ -25,7 +25,7 @@ #include <tqstringlist.h> #include <kcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include "configdialog.h" diff --git a/akregator/src/feed.cpp b/akregator/src/feed.cpp index a68aedbb1..3b0d81035 100644 --- a/akregator/src/feed.cpp +++ b/akregator/src/feed.cpp @@ -33,7 +33,7 @@ #include <kurl.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include "akregatorconfig.h" diff --git a/akregator/src/feedlist.cpp b/akregator/src/feedlist.cpp index e05aded8a..708b4fb7e 100644 --- a/akregator/src/feedlist.cpp +++ b/akregator/src/feedlist.cpp @@ -29,7 +29,7 @@ #include <tqvaluelist.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "article.h" #include "feed.h" diff --git a/akregator/src/feedlistview.cpp b/akregator/src/feedlistview.cpp index 6147f4d2a..d6ea394a1 100644 --- a/akregator/src/feedlistview.cpp +++ b/akregator/src/feedlistview.cpp @@ -42,7 +42,7 @@ #include <kdebug.h> #include <kiconeffect.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdemultipledrag.h> #include <kstringhandler.h> #include <kurldrag.h> diff --git a/akregator/src/frame.cpp b/akregator/src/frame.cpp index 351d35125..6e27b9155 100644 --- a/akregator/src/frame.cpp +++ b/akregator/src/frame.cpp @@ -27,7 +27,7 @@ #include <tdeactioncollection.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeparts/browserextension.h> #include <tdeparts/part.h> diff --git a/akregator/src/main.cpp b/akregator/src/main.cpp index f1726fccd..4c4b31ecf 100644 --- a/akregator/src/main.cpp +++ b/akregator/src/main.cpp @@ -26,7 +26,7 @@ #include <dcopref.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <knotifyclient.h> #include <kuniqueapplication.h> diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp index a2d0725e3..6cf6ad51f 100644 --- a/akregator/src/mainwindow.cpp +++ b/akregator/src/mainwindow.cpp @@ -36,11 +36,11 @@ #include <kdebug.h> #include <kedittoolbar.h> #include <tdefiledialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kkeydialog.h> #include <klibloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdeparts/partmanager.h> #include <ksqueezedtextlabel.h> #include <kstandarddirs.h> diff --git a/akregator/src/mk4storage/feedstoragemk4impl.cpp b/akregator/src/mk4storage/feedstoragemk4impl.cpp index 58d5e31f9..501b8b260 100644 --- a/akregator/src/mk4storage/feedstoragemk4impl.cpp +++ b/akregator/src/mk4storage/feedstoragemk4impl.cpp @@ -35,7 +35,7 @@ #include <tqfile.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> namespace Akregator { diff --git a/akregator/src/mk4storage/mk4confwidget.cpp b/akregator/src/mk4storage/mk4confwidget.cpp index 788087f87..c028b1569 100644 --- a/akregator/src/mk4storage/mk4confwidget.cpp +++ b/akregator/src/mk4storage/mk4confwidget.cpp @@ -28,8 +28,8 @@ #include <tqcheckbox.h> #include <tqlabel.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kurlrequester.h> namespace Akregator { diff --git a/akregator/src/mk4storage/mk4plugin.cpp b/akregator/src/mk4storage/mk4plugin.cpp index b3493be36..160003084 100644 --- a/akregator/src/mk4storage/mk4plugin.cpp +++ b/akregator/src/mk4storage/mk4plugin.cpp @@ -24,7 +24,7 @@ #include "mk4plugin.h" -#include <klocale.h> +#include <tdelocale.h> #include "storagefactorymk4impl.h" #include "storagefactoryregistry.h" diff --git a/akregator/src/mk4storage/storagefactorymk4impl.cpp b/akregator/src/mk4storage/storagefactorymk4impl.cpp index 7a9cd0655..6f0eec344 100644 --- a/akregator/src/mk4storage/storagefactorymk4impl.cpp +++ b/akregator/src/mk4storage/storagefactorymk4impl.cpp @@ -26,7 +26,7 @@ //#include "mk4confwidget.h" //#include "mk4config.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqstring.h> #include <tqstringlist.h> #include <tqwidget.h> diff --git a/akregator/src/notificationmanager.cpp b/akregator/src/notificationmanager.cpp index 60066c5f9..5a1446816 100644 --- a/akregator/src/notificationmanager.cpp +++ b/akregator/src/notificationmanager.cpp @@ -22,7 +22,7 @@ without including the source code for TQt in the source distribution. */ -#include <klocale.h> +#include <tdelocale.h> #include <knotifyclient.h> #include <kstaticdeleter.h> #include <kurl.h> diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp index 6bc2592ab..1408255ef 100644 --- a/akregator/src/pageviewer.cpp +++ b/akregator/src/pageviewer.cpp @@ -34,11 +34,11 @@ #include <kbookmark.h> #include <kbookmarkmanager.h> #include <tdeconfig.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdehtml_settings.h> #include <tdehtmlview.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <kstandarddirs.h> #include <tdestdaccel.h> diff --git a/akregator/src/pluginmanager.cpp b/akregator/src/pluginmanager.cpp index 87e77a3bb..8efe9c71f 100644 --- a/akregator/src/pluginmanager.cpp +++ b/akregator/src/pluginmanager.cpp @@ -23,8 +23,8 @@ email : markey@web.de #include <klibloader.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> using std::vector; using Akregator::Plugin; diff --git a/akregator/src/progressmanager.cpp b/akregator/src/progressmanager.cpp index 07290a13f..dd27fbe94 100644 --- a/akregator/src/progressmanager.cpp +++ b/akregator/src/progressmanager.cpp @@ -25,7 +25,7 @@ #include <tqmap.h> #include <tqstylesheet.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstaticdeleter.h> #include <libtdepim/progressmanager.h> diff --git a/akregator/src/propertiesdialog.cpp b/akregator/src/propertiesdialog.cpp index a0f13c479..149eb480c 100644 --- a/akregator/src/propertiesdialog.cpp +++ b/akregator/src/propertiesdialog.cpp @@ -29,7 +29,7 @@ #include <kcombobox.h> #include <klineedit.h> #include <kpassdlg.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <tqcheckbox.h> diff --git a/akregator/src/searchbar.cpp b/akregator/src/searchbar.cpp index 9d2341866..afd3b3467 100644 --- a/akregator/src/searchbar.cpp +++ b/akregator/src/searchbar.cpp @@ -30,7 +30,7 @@ #include <kcombobox.h> #include <kiconloader.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tqapplication.h> diff --git a/akregator/src/simplenodeselector.cpp b/akregator/src/simplenodeselector.cpp index 66ce00aea..4291bb453 100644 --- a/akregator/src/simplenodeselector.cpp +++ b/akregator/src/simplenodeselector.cpp @@ -29,7 +29,7 @@ #include "treenodevisitor.h" #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqmap.h> diff --git a/akregator/src/speechclient.cpp b/akregator/src/speechclient.cpp index 38f1f8bfb..1eae57407 100644 --- a/akregator/src/speechclient.cpp +++ b/akregator/src/speechclient.cpp @@ -29,7 +29,7 @@ #include <dcopclient.h> #include <tdeapplication.h> #include <kcharsets.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kstaticdeleter.h> #include <ktrader.h> diff --git a/akregator/src/storagefactorydummyimpl.cpp b/akregator/src/storagefactorydummyimpl.cpp index 45f9fc0a7..b794241c9 100644 --- a/akregator/src/storagefactorydummyimpl.cpp +++ b/akregator/src/storagefactorydummyimpl.cpp @@ -24,7 +24,7 @@ #include "storagefactorydummyimpl.h" #include "storagedummyimpl.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqstring.h> #include <tqstringlist.h> #include <tqwidget.h> diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp index da69b69e1..76c8b1980 100644 --- a/akregator/src/tabwidget.cpp +++ b/akregator/src/tabwidget.cpp @@ -40,7 +40,7 @@ #include <ktabbar.h> #include <tdepopupmenu.h> #include <krun.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdehtmlview.h> #include <tdehtml_part.h> #include <kiconloader.h> diff --git a/akregator/src/tagnodelist.cpp b/akregator/src/tagnodelist.cpp index a30e1b3df..6d60da63b 100644 --- a/akregator/src/tagnodelist.cpp +++ b/akregator/src/tagnodelist.cpp @@ -36,7 +36,7 @@ #include <tqvaluelist.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> namespace Akregator { diff --git a/akregator/src/tagpropertiesdialog.cpp b/akregator/src/tagpropertiesdialog.cpp index 531b7ff9f..4f73467e6 100644 --- a/akregator/src/tagpropertiesdialog.cpp +++ b/akregator/src/tagpropertiesdialog.cpp @@ -23,7 +23,7 @@ */ #include <kicondialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlineedit.h> diff --git a/akregator/src/trayicon.cpp b/akregator/src/trayicon.cpp index 3e87ca77f..fc26cadeb 100644 --- a/akregator/src/trayicon.cpp +++ b/akregator/src/trayicon.cpp @@ -29,8 +29,8 @@ #include <twin.h> #include <kiconeffect.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdeglobalsettings.h> #include <dcopclient.h> #include <dcopref.h> #include <tdepopupmenu.h> diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp index 0693fd219..a9c4d6fc3 100644 --- a/akregator/src/viewer.cpp +++ b/akregator/src/viewer.cpp @@ -28,8 +28,8 @@ #include <tdefiledialog.h> #include <tdehtmlview.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdepopupmenu.h> #include <kprocess.h> #include <krun.h> diff --git a/certmanager/CMakeLists.txt b/certmanager/CMakeLists.txt index 8ff147bba..51465610c 100644 --- a/certmanager/CMakeLists.txt +++ b/certmanager/CMakeLists.txt @@ -50,7 +50,7 @@ tde_add_executable( kleopatra AUTOMOC hierarchyanalyser.cpp certificatewizard.ui certificatewizardimpl.cpp certificateinfowidget.ui certificateinfowidgetimpl.cpp crlview.cpp storedtransferjob.cpp certlistview.cpp - LINK conf-static kleopatra-shared tdeutils-shared kabc-shared + LINK conf-static kleopatra-shared tdeutils-shared tdeabc-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/certmanager/aboutdata.cpp b/certmanager/aboutdata.cpp index 8941ae00d..21cae2286 100644 --- a/certmanager/aboutdata.cpp +++ b/certmanager/aboutdata.cpp @@ -36,7 +36,7 @@ #include "aboutdata.h" -#include <klocale.h> +#include <tdelocale.h> static const char kleopatra_version[] = "0.40"; static const char description[] = I18N_NOOP("TDE Key Manager"); diff --git a/certmanager/certificateinfowidgetimpl.cpp b/certmanager/certificateinfowidgetimpl.cpp index c6add9515..79b02b24c 100644 --- a/certmanager/certificateinfowidgetimpl.cpp +++ b/certmanager/certificateinfowidgetimpl.cpp @@ -47,12 +47,12 @@ #include <gpgmepp/keylistresult.h> // KDE -#include <klocale.h> +#include <tdelocale.h> #include <kdialogbase.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <kprocio.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> // TQt #include <tqlistview.h> diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp index 583470e9c..d220a10af 100644 --- a/certmanager/certificatewizardimpl.cpp +++ b/certmanager/certificatewizardimpl.cpp @@ -49,11 +49,11 @@ #include <gpgmepp/keygenerationresult.h> // KDE -#include <kabc/stdaddressbook.h> -#include <kabc/addressee.h> +#include <tdeabc/stdaddressbook.h> +#include <tdeabc/addressee.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <kdebug.h> #include <kdialog.h> diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp index bed7d94ae..044566f43 100644 --- a/certmanager/certmanager.cpp +++ b/certmanager/certmanager.cpp @@ -75,8 +75,8 @@ #include <kprocess.h> #include <tdeaction.h> #include <tdeapplication.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <dcopclient.h> #include <tdetoolbar.h> #include <kstatusbar.h> @@ -84,7 +84,7 @@ #include <kdebug.h> #include <kdialogbase.h> #include <kkeydialog.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeio/job.h> #include <tdeio/netaccess.h> #include <tdestdaccel.h> diff --git a/certmanager/conf/appearanceconfigpage.cpp b/certmanager/conf/appearanceconfigpage.cpp index 53030bbd7..c31fa9007 100644 --- a/certmanager/conf/appearanceconfigpage.cpp +++ b/certmanager/conf/appearanceconfigpage.cpp @@ -32,8 +32,8 @@ #include "appearanceconfigpage.h" #include <tqlayout.h> #include "appearanceconfigwidget.h" -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdepimmacros.h> diff --git a/certmanager/conf/appearanceconfigwidget.cpp b/certmanager/conf/appearanceconfigwidget.cpp index 19224cf9f..54c677cab 100644 --- a/certmanager/conf/appearanceconfigwidget.cpp +++ b/certmanager/conf/appearanceconfigwidget.cpp @@ -43,9 +43,9 @@ #include <tdelistview.h> #include <tdeconfig.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdefontdialog.h> #include <kcolordialog.h> diff --git a/certmanager/conf/configuredialog.cpp b/certmanager/conf/configuredialog.cpp index b1e994137..4d0d1e682 100644 --- a/certmanager/conf/configuredialog.cpp +++ b/certmanager/conf/configuredialog.cpp @@ -36,7 +36,7 @@ #include <twin.h> #include <tdeapplication.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal ) : KCMultiDialog( KDialogBase::IconList, i18n( "Configure" ), parent, name, modal ) diff --git a/certmanager/conf/dirservconfigpage.cpp b/certmanager/conf/dirservconfigpage.cpp index 769b95323..7a19d4515 100644 --- a/certmanager/conf/dirservconfigpage.cpp +++ b/certmanager/conf/dirservconfigpage.cpp @@ -34,8 +34,8 @@ #include <kleo/cryptobackendfactory.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeconfig.h> #include <knuminput.h> @@ -62,7 +62,7 @@ public: KURL::List readCurrentList() const { KURL::List lst; - // stolen from kabc/ldapclient.cpp + // stolen from tdeabc/ldapclient.cpp const uint numHosts = mConfig.readUnsignedNumEntry( "NumSelectedHosts" ); for ( uint j = 0; j < numHosts; j++ ) { const TQString num = TQString::number( j ); diff --git a/certmanager/crlview.cpp b/certmanager/crlview.cpp index 49c27d3e6..f94a45574 100644 --- a/certmanager/crlview.cpp +++ b/certmanager/crlview.cpp @@ -36,12 +36,12 @@ #include "crlview.h" -#include <klocale.h> +#include <tdelocale.h> #include <kprocess.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kpushbutton.h> #include <kstdguiitem.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tqlayout.h> #include <tqlabel.h> diff --git a/certmanager/kwatchgnupg/aboutdata.cpp b/certmanager/kwatchgnupg/aboutdata.cpp index 5727003f0..78944269c 100644 --- a/certmanager/kwatchgnupg/aboutdata.cpp +++ b/certmanager/kwatchgnupg/aboutdata.cpp @@ -32,7 +32,7 @@ #include "aboutdata.h" -#include <klocale.h> +#include <tdelocale.h> static const char kwatchgnupg_version[] = "1.0"; static const char description[] = I18N_NOOP("GnuPG log viewer"); diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp index 8b1101716..6b1861787 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp +++ b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp @@ -32,7 +32,7 @@ #include "kwatchgnupgconfig.h" -#include <klocale.h> +#include <tdelocale.h> #include <kurlrequester.h> #include <tdeconfig.h> #include <tdeapplication.h> diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp index 9ce5f6b16..3fd96db65 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp +++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp @@ -38,8 +38,8 @@ #include <kleo/cryptoconfig.h> #include <kdebug.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdeaction.h> #include <kstdaction.h> diff --git a/certmanager/kwatchgnupg/main.cpp b/certmanager/kwatchgnupg/main.cpp index 323c8b5ef..975b45c74 100644 --- a/certmanager/kwatchgnupg/main.cpp +++ b/certmanager/kwatchgnupg/main.cpp @@ -39,9 +39,9 @@ #include <kuniqueapplication.h> #include <tdecmdlineargs.h> -#include <kmessagebox.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdemessagebox.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kdebug.h> diff --git a/certmanager/kwatchgnupg/tray.cpp b/certmanager/kwatchgnupg/tray.cpp index a8d2f5872..3ce760d9f 100644 --- a/certmanager/kwatchgnupg/tray.cpp +++ b/certmanager/kwatchgnupg/tray.cpp @@ -34,8 +34,8 @@ #include "kwatchgnupgmainwin.h" #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <tqtooltip.h> diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp index 53ad316d5..7ed31197d 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp +++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp @@ -42,7 +42,7 @@ #include "kleo/cryptoconfig.h" -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kshell.h> #include <kdebug.h> diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp index 2154f7aa6..265d759b7 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp +++ b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp @@ -44,9 +44,9 @@ #include <gpg-error.h> #include <kshell.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqtimer.h> #include <tqfileinfo.h> diff --git a/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp b/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp index 002bf0182..6bb588d63 100644 --- a/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp +++ b/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp @@ -39,7 +39,7 @@ #include <klibloader.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqfile.h> diff --git a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp index 677fc6ec2..d7ae22c1f 100644 --- a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp +++ b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp @@ -40,8 +40,8 @@ #include "kleo/cryptoconfig.h" -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kshell.h> #include <tqdir.h> diff --git a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp index ec396537e..9391f023f 100644 --- a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp +++ b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp @@ -32,7 +32,7 @@ #include "symcryptrunprocessbase.h" -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kshell.h> diff --git a/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp b/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp index 2395dc6e6..b5b006b56 100644 --- a/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp +++ b/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp @@ -41,7 +41,7 @@ #include "pgp6backend.h" #include "gpg1backend.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqstring.h> diff --git a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp index 744dd1133..c38097ed1 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp @@ -42,7 +42,7 @@ #include <gpgmepp/context.h> #include <gpgmepp/engineinfo.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tqfile.h> diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp index 191ff4279..e73b4363f 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp @@ -34,11 +34,11 @@ #include <kdebug.h> #include <kprocio.h> #include <errno.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <assert.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tqfile.h> #include <stdlib.h> #include <tqtextcodec.h> diff --git a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp index 480e6c8a5..433859bd4 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp @@ -45,7 +45,7 @@ #include <gpgmepp/encryptionresult.h> #include <gpgmepp/data.h> -#include <klocale.h> +#include <tdelocale.h> #include <assert.h> diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp index 847b92f31..ee879742c 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp @@ -46,7 +46,7 @@ #include <gpgmepp/context.h> #include <gpgmepp/data.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tqstring.h> diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp index c6370674b..5561625c8 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp @@ -43,8 +43,8 @@ #include <gpgmepp/keylistresult.h> #include <gpg-error.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqstringlist.h> diff --git a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp index c2e21bb9b..bc0d232eb 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp @@ -36,7 +36,7 @@ #include "qgpgmeprogresstokenmapper.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqstring.h> diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp index 1392afd5e..70ff6b8fd 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp @@ -45,7 +45,7 @@ #include <gpgmepp/data.h> #include <gpgmepp/key.h> -#include <klocale.h> +#include <tdelocale.h> #include <assert.h> diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp index db5c225e8..032514cd3 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp @@ -46,7 +46,7 @@ #include <gpgmepp/data.h> #include <gpgmepp/key.h> -#include <klocale.h> +#include <tdelocale.h> #include <assert.h> diff --git a/certmanager/lib/cryptplugfactory.cpp b/certmanager/lib/cryptplugfactory.cpp index 6165cadda..12adac0f0 100644 --- a/certmanager/lib/cryptplugfactory.cpp +++ b/certmanager/lib/cryptplugfactory.cpp @@ -38,9 +38,9 @@ #include "cryptplugwrapperlist.h" #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> #include <assert.h> diff --git a/certmanager/lib/cryptplugwrapper.cpp b/certmanager/lib/cryptplugwrapper.cpp index b1ee42746..5bd5675b3 100644 --- a/certmanager/lib/cryptplugwrapper.cpp +++ b/certmanager/lib/cryptplugwrapper.cpp @@ -62,8 +62,8 @@ // kde #include <kdebug.h> #include <tdeapplication.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeconfig.h> // other diff --git a/certmanager/lib/kleo/cryptobackendfactory.cpp b/certmanager/lib/kleo/cryptobackendfactory.cpp index f6af5283d..ce31cc9a5 100644 --- a/certmanager/lib/kleo/cryptobackendfactory.cpp +++ b/certmanager/lib/kleo/cryptobackendfactory.cpp @@ -47,9 +47,9 @@ #include <ui/backendconfigwidget.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> #include <iterator> diff --git a/certmanager/lib/kleo/dn.cpp b/certmanager/lib/kleo/dn.cpp index b5b016447..d4ed13018 100644 --- a/certmanager/lib/kleo/dn.cpp +++ b/certmanager/lib/kleo/dn.cpp @@ -41,7 +41,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqstringlist.h> #include <tqvaluevector.h> diff --git a/certmanager/lib/kleo/enum.cpp b/certmanager/lib/kleo/enum.cpp index 1d48c6b6e..bc9011fc2 100644 --- a/certmanager/lib/kleo/enum.cpp +++ b/certmanager/lib/kleo/enum.cpp @@ -32,7 +32,7 @@ #include "enum.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqstring.h> #include <tqstringlist.h> diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp index ffd3c6db9..65b597255 100644 --- a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp +++ b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp @@ -38,7 +38,7 @@ #include "cryptobackend.h" #include "keylistjob.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqstringlist.h> #include <tqtl.h> diff --git a/certmanager/lib/kleo/multideletejob.cpp b/certmanager/lib/kleo/multideletejob.cpp index 7d1a27302..7c83c24bc 100644 --- a/certmanager/lib/kleo/multideletejob.cpp +++ b/certmanager/lib/kleo/multideletejob.cpp @@ -38,7 +38,7 @@ #include "cryptobackend.h" #include "deletejob.h" -#include <klocale.h> +#include <tdelocale.h> #include <gpgmepp/key.h> #include <gpgmepp/context.h> diff --git a/certmanager/lib/kleo/tdeconfigbasedkeyfilter.cpp b/certmanager/lib/kleo/tdeconfigbasedkeyfilter.cpp index 05c6d04d5..fd0766b9e 100644 --- a/certmanager/lib/kleo/tdeconfigbasedkeyfilter.cpp +++ b/certmanager/lib/kleo/tdeconfigbasedkeyfilter.cpp @@ -37,7 +37,7 @@ #include "tdeconfigbasedkeyfilter.h" #include <tdeconfigbase.h> -#include <klocale.h> +#include <tdelocale.h> static const struct { const char * name; diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp index ea7ccae73..01e5d1091 100644 --- a/certmanager/lib/tests/test_gnupgprocessbase.cpp +++ b/certmanager/lib/tests/test_gnupgprocessbase.cpp @@ -41,7 +41,7 @@ #include <tdeapplication.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <tqstringlist.h> diff --git a/certmanager/lib/tests/test_keygen.cpp b/certmanager/lib/tests/test_keygen.cpp index e5b4bcd92..b678e29d7 100644 --- a/certmanager/lib/tests/test_keygen.cpp +++ b/certmanager/lib/tests/test_keygen.cpp @@ -46,7 +46,7 @@ #include <tdeapplication.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <tqmessagebox.h> diff --git a/certmanager/lib/tests/test_keyselectiondialog.cpp b/certmanager/lib/tests/test_keyselectiondialog.cpp index 6e1fa7df9..f3a73d516 100644 --- a/certmanager/lib/tests/test_keyselectiondialog.cpp +++ b/certmanager/lib/tests/test_keyselectiondialog.cpp @@ -37,7 +37,7 @@ #include <tdeapplication.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kdebug.h> diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp index 7b65a538f..2589e4d62 100644 --- a/certmanager/lib/ui/backendconfigwidget.cpp +++ b/certmanager/lib/ui/backendconfigwidget.cpp @@ -43,9 +43,9 @@ #include <tdelistview.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> #include <dcopclient.h> diff --git a/certmanager/lib/ui/cryptoconfigdialog.cpp b/certmanager/lib/ui/cryptoconfigdialog.cpp index 410f4348c..52402d6da 100644 --- a/certmanager/lib/ui/cryptoconfigdialog.cpp +++ b/certmanager/lib/ui/cryptoconfigdialog.cpp @@ -31,7 +31,7 @@ #include "cryptoconfigdialog.h" #include "cryptoconfigmodule.h" -#include <klocale.h> +#include <tdelocale.h> #include <tdeaccelmanager.h> Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidget *parent, const char* name ) diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp index c1c710d2a..135958c0d 100644 --- a/certmanager/lib/ui/cryptoconfigmodule.cpp +++ b/certmanager/lib/ui/cryptoconfigmodule.cpp @@ -37,12 +37,12 @@ #include <kleo/cryptoconfig.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialogbase.h> #include <kdebug.h> #include <knuminput.h> #include <kiconloader.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kurlrequester.h> #include <tqgrid.h> diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp index 71ac8a951..262ad6c71 100644 --- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp +++ b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp @@ -38,7 +38,7 @@ #include "kleo/dn.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kdialog.h> #include <kiconloader.h> diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp index 434699d06..0ee6d8657 100644 --- a/certmanager/lib/ui/keyapprovaldialog.cpp +++ b/certmanager/lib/ui/keyapprovaldialog.cpp @@ -45,8 +45,8 @@ #include <cryptplugfactory.h> #include <kleo/cryptobackend.h> -#include <klocale.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdeglobalsettings.h> #include <kseparator.h> #include <tqstringlist.h> diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp index c3bcf0244..53db6ce9b 100644 --- a/certmanager/lib/ui/keyrequester.cpp +++ b/certmanager/lib/ui/keyrequester.cpp @@ -63,11 +63,11 @@ #include <gpgmepp/keylistresult.h> // KDE -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kdialog.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kpushbutton.h> // TQt diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp index 53d658439..9e005d583 100644 --- a/certmanager/lib/ui/keyselectiondialog.cpp +++ b/certmanager/lib/ui/keyselectiondialog.cpp @@ -52,14 +52,14 @@ #include <gpgmepp/keylistresult.h> // KDE -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kdebug.h> #include <twin.h> #include <tdeconfig.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <kactivelabel.h> #include <kurl.h> diff --git a/certmanager/lib/ui/messagebox.cpp b/certmanager/lib/ui/messagebox.cpp index 571ceccd4..935084bd6 100644 --- a/certmanager/lib/ui/messagebox.cpp +++ b/certmanager/lib/ui/messagebox.cpp @@ -43,7 +43,7 @@ #include <tdefiledialog.h> #include <kdialogbase.h> -#include <klocale.h> +#include <tdelocale.h> #include <ksavefile.h> #include <kguiitem.h> #include <kdebug.h> diff --git a/certmanager/lib/ui/messagebox.h b/certmanager/lib/ui/messagebox.h index 69dea34c5..083c16030 100644 --- a/certmanager/lib/ui/messagebox.h +++ b/certmanager/lib/ui/messagebox.h @@ -33,7 +33,7 @@ #ifndef __KLEO_UI_MESSAGEBOX_H__ #define __KLEO_UI_MESSAGEBOX_H__ -#include <kmessagebox.h> +#include <tdemessagebox.h> namespace GpgME { class SigningResult; diff --git a/certmanager/lib/ui/passphrasedialog.cpp b/certmanager/lib/ui/passphrasedialog.cpp index 5c7c44bd8..a2d0e7c36 100644 --- a/certmanager/lib/ui/passphrasedialog.cpp +++ b/certmanager/lib/ui/passphrasedialog.cpp @@ -54,7 +54,7 @@ #include <kpassdlg.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlabel.h> #include <tqlayout.h> diff --git a/certmanager/lib/ui/progressdialog.cpp b/certmanager/lib/ui/progressdialog.cpp index d6552922c..692ee4cbf 100644 --- a/certmanager/lib/ui/progressdialog.cpp +++ b/certmanager/lib/ui/progressdialog.cpp @@ -37,7 +37,7 @@ #include <kleo/job.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqtimer.h> diff --git a/certmanager/main.cpp b/certmanager/main.cpp index 8bdb346d8..bccb8d477 100644 --- a/certmanager/main.cpp +++ b/certmanager/main.cpp @@ -41,9 +41,9 @@ #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <kmessagebox.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdemessagebox.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kiconloader.h> int main( int argc, char** argv ) diff --git a/doc/kaddressbook/index.docbook b/doc/kaddressbook/index.docbook index c684dbe7a..b7156ca77 100644 --- a/doc/kaddressbook/index.docbook +++ b/doc/kaddressbook/index.docbook @@ -111,7 +111,7 @@ will be displayed:</para> <para>&kaddressbook; can use multiple resources for loading and storing its contacts. After starting &kaddressbook; for the first time you will have a default resource installed that saves all contacts in a vCard file -under $HOME/.trinity/share/apps/kabc/std.vcf; you can add more resources +under $HOME/.trinity/share/apps/tdeabc/std.vcf; you can add more resources by using the Resource Configuration dialog, which is available in <application>kcontrol</application> under <guilabel>TDE Components</guilabel>-><guilabel>TDE Resources Configuration</guilabel>:</para> diff --git a/doc/kpilot/configuration.docbook b/doc/kpilot/configuration.docbook index 1644d67b3..e0b8979a3 100644 --- a/doc/kpilot/configuration.docbook +++ b/doc/kpilot/configuration.docbook @@ -1402,7 +1402,7 @@ filename of the vCard file (this will usually be a file that ends in <literal role="extension">.vcf</literal>) to sync with, of if it uses the standard &kde; address book file, it will be under the -<filename class="directory">$TDEHOME/share/apps/kabc/</filename> +<filename class="directory">$TDEHOME/share/apps/tdeabc/</filename> folder, where the <filename class="directory">$TDEHOME</filename> environment variable (typically <filename class="directory">/home/Login Name/.trinity/</filename>) points to the folder that contains your configuration and data for the &kde; diff --git a/kabc/frontend/main.cpp b/kabc/frontend/main.cpp index 7367508be..0e941e017 100644 --- a/kabc/frontend/main.cpp +++ b/kabc/frontend/main.cpp @@ -1,7 +1,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include "mainWindow.h" diff --git a/kabc/frontend/mainWindow.ui.h b/kabc/frontend/mainWindow.ui.h index 445b5945c..1a88f1deb 100644 --- a/kabc/frontend/mainWindow.ui.h +++ b/kabc/frontend/mainWindow.ui.h @@ -10,10 +10,10 @@ #include <kinputdialog.h> #include <tqmessagebox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kabc/stdaddressbook.h> +#include <tdeabc/stdaddressbook.h> using namespace KABC; diff --git a/kabc/kabc2mutt/CMakeLists.txt b/kabc/kabc2mutt/CMakeLists.txt index f7ec8dbed..98c30f0b5 100644 --- a/kabc/kabc2mutt/CMakeLists.txt +++ b/kabc/kabc2mutt/CMakeLists.txt @@ -24,6 +24,6 @@ link_directories( tde_add_executable( kabc2mutt AUTOMOC SOURCES kabc2mutt.cpp main.cpp - LINK kabc-shared + LINK tdeabc-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kabc/kabc2mutt/kabc2mutt.cpp b/kabc/kabc2mutt/kabc2mutt.cpp index 7f346a62c..144ffe2dd 100644 --- a/kabc/kabc2mutt/kabc2mutt.cpp +++ b/kabc/kabc2mutt/kabc2mutt.cpp @@ -17,9 +17,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <kabc/distributionlist.h> +#include <tdeabc/distributionlist.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqregexp.h> diff --git a/kabc/kabc2mutt/kabc2mutt.h b/kabc/kabc2mutt/kabc2mutt.h index eb3ca733f..328f06c17 100644 --- a/kabc/kabc2mutt/kabc2mutt.h +++ b/kabc/kabc2mutt/kabc2mutt.h @@ -20,7 +20,7 @@ #ifndef KABC2MUTT_H #define KABC2MUTT_H -#include <kabc/stdaddressbook.h> +#include <tdeabc/stdaddressbook.h> class KABC2Mutt : public TQObject { diff --git a/kabc/kabc2mutt/main.cpp b/kabc/kabc2mutt/main.cpp index 3d6fad649..d1aefd6ef 100644 --- a/kabc/kabc2mutt/main.cpp +++ b/kabc/kabc2mutt/main.cpp @@ -19,7 +19,7 @@ #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <iostream> diff --git a/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp b/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp index 38fe294ab..b2e8d93b8 100644 --- a/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp +++ b/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp @@ -23,11 +23,11 @@ #include <tdecmdlineargs.h> #include <ksimpleconfig.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kstandarddirs.h> -#include <kabc/stdaddressbook.h> +#include <tdeabc/stdaddressbook.h> #include <libtdepim/distributionlist.h> static const TDECmdLineOptions options[] = @@ -38,7 +38,7 @@ static const TDECmdLineOptions options[] = void convertDistributionLists() { - KSimpleConfig cfg( locateLocal( "data", "kabc/distlists" ) ); + KSimpleConfig cfg( locateLocal( "data", "tdeabc/distlists" ) ); const TQMap<TQString, TQString> entryMap = cfg.entryMap( "DistributionLists" ); if ( entryMap.isEmpty() ) // nothing to convert diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp index 71c6ba9ea..a02092646 100644 --- a/kaddressbook/addresseditwidget.cpp +++ b/kaddressbook/addresseditwidget.cpp @@ -48,8 +48,8 @@ #include <kinputdialog.h> #include <klineedit.h> #include <tdelistview.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kseparator.h> #include "addresseditwidget.h" diff --git a/kaddressbook/addresseditwidget.h b/kaddressbook/addresseditwidget.h index c5b2f597f..5d863573c 100644 --- a/kaddressbook/addresseditwidget.h +++ b/kaddressbook/addresseditwidget.h @@ -27,8 +27,8 @@ #include <tqwidget.h> #include <kdialogbase.h> -#include <kabc/address.h> -#include <kabc/addressee.h> +#include <tdeabc/address.h> +#include <tdeabc/addressee.h> #include "addresseeconfig.h" #include "typecombo.h" diff --git a/kaddressbook/addresseeconfig.h b/kaddressbook/addresseeconfig.h index c267dce17..025663fdd 100644 --- a/kaddressbook/addresseeconfig.h +++ b/kaddressbook/addresseeconfig.h @@ -24,7 +24,7 @@ #ifndef ADDRESSEECONFIG_H #define ADDRESSEECONFIG_H -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <tdeconfig.h> using namespace KABC; diff --git a/kaddressbook/addresseeeditorbase.h b/kaddressbook/addresseeeditorbase.h index 55eea432e..d9124609b 100644 --- a/kaddressbook/addresseeeditorbase.h +++ b/kaddressbook/addresseeeditorbase.h @@ -24,7 +24,7 @@ #ifndef ADDRESSEEEDITORBASE_H #define ADDRESSEEEDITORBASE_H -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <tqwidget.h> diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp index d203e4ddc..e53b57218 100644 --- a/kaddressbook/addresseeeditordialog.cpp +++ b/kaddressbook/addresseeeditordialog.cpp @@ -25,7 +25,7 @@ #include <tqlayout.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "core.h" #include "addresseeeditorwidget.h" diff --git a/kaddressbook/addresseeeditordialog.h b/kaddressbook/addresseeeditordialog.h index 43f06c20d..9e53580b3 100644 --- a/kaddressbook/addresseeeditordialog.h +++ b/kaddressbook/addresseeeditordialog.h @@ -26,7 +26,7 @@ #include <kdialogbase.h> -#include <kabc/addressbook.h> +#include <tdeabc/addressbook.h> class AddresseeEditorBase; class TQWidget; diff --git a/kaddressbook/addresseeeditorextension.cpp b/kaddressbook/addresseeeditorextension.cpp index d13232b77..9b9aceac4 100644 --- a/kaddressbook/addresseeeditorextension.cpp +++ b/kaddressbook/addresseeeditorextension.cpp @@ -24,7 +24,7 @@ #include <tqlayout.h> #include <tqtimer.h> -#include <klocale.h> +#include <tdelocale.h> #include "kabprefs.h" diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp index faf3e4e3e..357de392a 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/kaddressbook/addresseeeditorwidget.cpp @@ -32,19 +32,19 @@ #include <tqtoolbutton.h> #include <tqtooltip.h> -#include <kabc/resource.h> -#include <kabc/stdaddressbook.h> +#include <tdeabc/resource.h> +#include <tdeabc/stdaddressbook.h> #include <tdeaccelmanager.h> #include <tdeapplication.h> #include <tdeconfig.h> #include <kcombobox.h> #include <kdebug.h> #include <kdialogbase.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kseparator.h> #include <ksqueezedtextlabel.h> #include <kstandarddirs.h> diff --git a/kaddressbook/addresseeeditorwidget.h b/kaddressbook/addresseeeditorwidget.h index 1097aafaf..30dcad3f5 100644 --- a/kaddressbook/addresseeeditorwidget.h +++ b/kaddressbook/addresseeeditorwidget.h @@ -26,7 +26,7 @@ #include <tqdatetime.h> -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <kdialogbase.h> #include <kjanuswidget.h> diff --git a/kaddressbook/addresseeutil.cpp b/kaddressbook/addresseeutil.cpp index e99677c19..1368e4782 100644 --- a/kaddressbook/addresseeutil.cpp +++ b/kaddressbook/addresseeutil.cpp @@ -21,11 +21,11 @@ without including the source code for TQt in the source distribution. */ -#include <kabc/stdaddressbook.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/stdaddressbook.h> +#include <tdeabc/vcardconverter.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "addresseeutil.h" diff --git a/kaddressbook/addresseeutil.h b/kaddressbook/addresseeutil.h index 11ccf653e..ed84512ff 100644 --- a/kaddressbook/addresseeutil.h +++ b/kaddressbook/addresseeutil.h @@ -25,8 +25,8 @@ #define ADDRESSEEUTIL_H #include <tqstring.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 /** This class provides some utility methods for transposing an diff --git a/kaddressbook/addviewdialog.cpp b/kaddressbook/addviewdialog.cpp index 2da1ad4e1..dbec842d6 100644 --- a/kaddressbook/addviewdialog.cpp +++ b/kaddressbook/addviewdialog.cpp @@ -27,7 +27,7 @@ #include <tqlineedit.h> #include <tqradiobutton.h> -#include <klocale.h> +#include <tdelocale.h> #include "kaddressbookview.h" diff --git a/kaddressbook/advancedcustomfields.h b/kaddressbook/advancedcustomfields.h index bdd7fe682..7e36faa31 100644 --- a/kaddressbook/advancedcustomfields.h +++ b/kaddressbook/advancedcustomfields.h @@ -26,7 +26,7 @@ #ifndef ADVANCEDCUSTOMFIELDS_H #define ADVANCEDCUSTOMFIELDS_H -#include <klocale.h> +#include <tdelocale.h> #include <tqmap.h> #include <tqpair.h> diff --git a/kaddressbook/common/filter.h b/kaddressbook/common/filter.h index 68df1036f..004da6425 100644 --- a/kaddressbook/common/filter.h +++ b/kaddressbook/common/filter.h @@ -28,7 +28,7 @@ #include <tqstringlist.h> #include <tqvaluelist.h> -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <tdeconfig.h> /** diff --git a/kaddressbook/common/kabprefs.cpp b/kaddressbook/common/kabprefs.cpp index 1f9e2410a..c4edf5d4d 100644 --- a/kaddressbook/common/kabprefs.cpp +++ b/kaddressbook/common/kabprefs.cpp @@ -22,7 +22,7 @@ */ #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstaticdeleter.h> #include "kabprefs.h" diff --git a/kaddressbook/common/locationmap.cpp b/kaddressbook/common/locationmap.cpp index ee6bbebe7..d4c5cb2d6 100644 --- a/kaddressbook/common/locationmap.cpp +++ b/kaddressbook/common/locationmap.cpp @@ -24,9 +24,9 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <tdeversion.h> -#include <kglobal.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstaticdeleter.h> #include <kurl.h> diff --git a/kaddressbook/common/locationmap.h b/kaddressbook/common/locationmap.h index 502aa01fe..a5a53426d 100644 --- a/kaddressbook/common/locationmap.h +++ b/kaddressbook/common/locationmap.h @@ -24,7 +24,7 @@ #ifndef LOCATIONMAP_H #define LOCATIONMAP_H -#include <kabc/address.h> +#include <tdeabc/address.h> #include <tqobject.h> #include <tqstring.h> diff --git a/kaddressbook/customfieldswidget.cpp b/kaddressbook/customfieldswidget.cpp index 867ccddb6..788b43915 100644 --- a/kaddressbook/customfieldswidget.cpp +++ b/kaddressbook/customfieldswidget.cpp @@ -34,7 +34,7 @@ #include <kcombobox.h> #include <kinputdialog.h> #include <klineedit.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "addresseeconfig.h" #include "kabprefs.h" diff --git a/kaddressbook/customfieldswidget.h b/kaddressbook/customfieldswidget.h index 414cea854..ac44521a2 100644 --- a/kaddressbook/customfieldswidget.h +++ b/kaddressbook/customfieldswidget.h @@ -24,9 +24,9 @@ #ifndef CUSTOMFIELDSWIDGET_H #define CUSTOMFIELDSWIDGET_H -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <kdialogbase.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqmap.h> #include <tqpair.h> diff --git a/kaddressbook/distributionlisteditor.cpp b/kaddressbook/distributionlisteditor.cpp index c19d31096..485a36278 100644 --- a/kaddressbook/distributionlisteditor.cpp +++ b/kaddressbook/distributionlisteditor.cpp @@ -27,16 +27,16 @@ #include <libtdepim/distributionlist.h> #include <libemailfunctions/email.h> -#include <kabc/addressbook.h> -#include <kabc/resource.h> +#include <tdeabc/addressbook.h> +#include <tdeabc/resource.h> #include <tdeapplication.h> #include <kdialogbase.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tqlabel.h> #include <tqlayout.h> diff --git a/kaddressbook/distributionlistentryview.cpp b/kaddressbook/distributionlistentryview.cpp index 3d50f730e..0290f6e27 100644 --- a/kaddressbook/distributionlistentryview.cpp +++ b/kaddressbook/distributionlistentryview.cpp @@ -4,12 +4,12 @@ #include <libtdepim/resourceabc.h> -#include <kabc/addressbook.h> -#include <kabc/resource.h> +#include <tdeabc/addressbook.h> +#include <tdeabc/resource.h> #include <kdialog.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurllabel.h> #include <tqbuttongroup.h> diff --git a/kaddressbook/distributionlistpicker.cpp b/kaddressbook/distributionlistpicker.cpp index a6d566bbe..3a54e6008 100644 --- a/kaddressbook/distributionlistpicker.cpp +++ b/kaddressbook/distributionlistpicker.cpp @@ -27,13 +27,13 @@ #include <libtdepim/distributionlist.h> #endif -#include <kabc/addressbook.h> +#include <tdeabc/addressbook.h> #include <tdeapplication.h> #include <kinputdialog.h> #include <tdelistbox.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tqlabel.h> #include <tqlayout.h> diff --git a/kaddressbook/editors/CMakeLists.txt b/kaddressbook/editors/CMakeLists.txt index 0fd3d0f8c..a2b8c898c 100644 --- a/kaddressbook/editors/CMakeLists.txt +++ b/kaddressbook/editors/CMakeLists.txt @@ -48,6 +48,6 @@ tde_add_library( kabim STATIC_PIC AUTOMOC tde_add_kpart( libkaddrbk_cryptosettings AUTOMOC SOURCES cryptowidget.cpp - LINK kabinterfaces-shared kleopatra-shared kabc-shared + LINK kabinterfaces-shared kleopatra-shared tdeabc-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kaddressbook/editors/cryptowidget.cpp b/kaddressbook/editors/cryptowidget.cpp index f89a068e6..892125852 100644 --- a/kaddressbook/editors/cryptowidget.cpp +++ b/kaddressbook/editors/cryptowidget.cpp @@ -33,7 +33,7 @@ #include <kdebug.h> #include <kdialog.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqlabel.h> diff --git a/kaddressbook/editors/imaddresswidget.cpp b/kaddressbook/editors/imaddresswidget.cpp index 4b3516ea1..0a3336d6a 100644 --- a/kaddressbook/editors/imaddresswidget.cpp +++ b/kaddressbook/editors/imaddresswidget.cpp @@ -28,7 +28,7 @@ #include <kdebug.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kplugininfo.h> #include "imaddresswidget.h" diff --git a/kaddressbook/editors/imeditorwidget.cpp b/kaddressbook/editors/imeditorwidget.cpp index 45523de54..b0f1590e7 100644 --- a/kaddressbook/editors/imeditorwidget.cpp +++ b/kaddressbook/editors/imeditorwidget.cpp @@ -32,8 +32,8 @@ #include <kdialogbase.h> #include <kdebug.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kplugininfo.h> #include <kpushbutton.h> #include <ktrader.h> diff --git a/kaddressbook/emaileditwidget.cpp b/kaddressbook/emaileditwidget.cpp index a1df16c3b..a9bdf999b 100644 --- a/kaddressbook/emaileditwidget.cpp +++ b/kaddressbook/emaileditwidget.cpp @@ -39,8 +39,8 @@ #include <kiconloader.h> #include <kinputdialog.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "emaileditwidget.h" diff --git a/kaddressbook/emaileditwidget.h b/kaddressbook/emaileditwidget.h index f584023c7..46d259a42 100644 --- a/kaddressbook/emaileditwidget.h +++ b/kaddressbook/emaileditwidget.h @@ -24,7 +24,7 @@ #ifndef EMAILEDITWIDGET_H #define EMAILEDITWIDGET_H -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <kdialogbase.h> class TQButtonGroup; diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp index 4ec33675d..7275f90cf 100644 --- a/kaddressbook/extensionmanager.cpp +++ b/kaddressbook/extensionmanager.cpp @@ -24,7 +24,7 @@ #include <tdeactionclasses.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <ktrader.h> #include <tqlayout.h> diff --git a/kaddressbook/features/CMakeLists.txt b/kaddressbook/features/CMakeLists.txt index f85bbf7e4..7317b3b4d 100644 --- a/kaddressbook/features/CMakeLists.txt +++ b/kaddressbook/features/CMakeLists.txt @@ -46,7 +46,7 @@ install( FILES tde_add_kpart( ${TARGET} AUTOMOC SOURCES ${SOURCE} - LINK kabinterfaces-shared tdepim-shared kabc-shared + LINK kabinterfaces-shared tdepim-shared tdeabc-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -55,6 +55,6 @@ tde_add_kpart( ${TARGET} AUTOMOC tde_add_kpart( libkaddrbk_resourceselection AUTOMOC SOURCES resourceselection.cpp - LINK kabinterfaces-shared tdepim-shared kabc-shared + LINK kabinterfaces-shared tdepim-shared tdeabc-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kaddressbook/features/distributionlistngwidget.cpp b/kaddressbook/features/distributionlistngwidget.cpp index 471769616..1d5acc09c 100644 --- a/kaddressbook/features/distributionlistngwidget.cpp +++ b/kaddressbook/features/distributionlistngwidget.cpp @@ -27,12 +27,12 @@ #include <libtdepim/distributionlist.h> #include <libtdepim/kvcarddrag.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/vcardconverter.h> #include <kdialog.h> #include <kiconloader.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <tqevent.h> diff --git a/kaddressbook/features/distributionlistngwidget.h b/kaddressbook/features/distributionlistngwidget.h index fdeb83864..3e5515486 100644 --- a/kaddressbook/features/distributionlistngwidget.h +++ b/kaddressbook/features/distributionlistngwidget.h @@ -25,7 +25,7 @@ #include "extensionwidget.h" -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <tdelistbox.h> diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp index 73afa2ea5..95bf46607 100644 --- a/kaddressbook/features/distributionlistwidget.cpp +++ b/kaddressbook/features/distributionlistwidget.cpp @@ -33,21 +33,21 @@ #include <tdeaccelmanager.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kinputdialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> -#include <kabc/addresseedialog.h> +#include <tdeabc/addresseedialog.h> #ifdef TDEPIM_NEW_DISTRLISTS #include <libtdepim/distributionlist.h> typedef KPIM::DistributionList DistributionList; #else -#include <kabc/distributionlist.h> +#include <tdeabc/distributionlist.h> typedef KABC::DistributionList DistributionList; #endif -#include <kabc/stdaddressbook.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/stdaddressbook.h> +#include <tdeabc/vcardconverter.h> #include <libtdepim/kvcarddrag.h> #include "core.h" diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp index d812c4803..132d0bc8a 100644 --- a/kaddressbook/features/resourceselection.cpp +++ b/kaddressbook/features/resourceselection.cpp @@ -29,13 +29,13 @@ #include <tqheader.h> #include <tqtooltip.h> -#include <kabc/resource.h> +#include <tdeabc/resource.h> #include <kdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kinputdialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tderesources/configdialog.h> #include "core.h" diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp index 57427855a..09c06ae48 100644 --- a/kaddressbook/filtereditdialog.cpp +++ b/kaddressbook/filtereditdialog.cpp @@ -40,7 +40,7 @@ #include <klineedit.h> #include <tdelistbox.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include "kabprefs.h" #include "filtereditdialog.h" diff --git a/kaddressbook/filterselectionwidget.cpp b/kaddressbook/filterselectionwidget.cpp index 32bdf7bf6..58ec7a181 100644 --- a/kaddressbook/filterselectionwidget.cpp +++ b/kaddressbook/filterselectionwidget.cpp @@ -25,7 +25,7 @@ #include <kcombobox.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include "filterselectionwidget.h" diff --git a/kaddressbook/freebusywidget.cpp b/kaddressbook/freebusywidget.cpp index 7565584d6..c325ec6fb 100644 --- a/kaddressbook/freebusywidget.cpp +++ b/kaddressbook/freebusywidget.cpp @@ -25,7 +25,7 @@ #include <tqlayout.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <libkcal/freebusyurlstore.h> diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp index 8bad2129e..f7261bf7a 100644 --- a/kaddressbook/geowidget.cpp +++ b/kaddressbook/geowidget.cpp @@ -21,12 +21,12 @@ without including the source code for TQt in the source distribution. */ -#include <kabc/geo.h> +#include <tdeabc/geo.h> #include <tdeaccelmanager.h> #include <kcombobox.h> #include <kdebug.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kstandarddirs.h> diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp index a302f1a29..b69e90bb2 100644 --- a/kaddressbook/imagewidget.cpp +++ b/kaddressbook/imagewidget.cpp @@ -21,16 +21,16 @@ without including the source code for TQt in the source distribution. */ -#include <kabc/picture.h> +#include <tdeabc/picture.h> #include <kdebug.h> #include <kdialog.h> #include <tdefiledialog.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> #include <kimageio.h> #include <tdeio/netaccess.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kurldrag.h> #include <libtdepim/kpixmapregionselectordialog.h> diff --git a/kaddressbook/imagewidget.h b/kaddressbook/imagewidget.h index 8e4db9ae9..449790e21 100644 --- a/kaddressbook/imagewidget.h +++ b/kaddressbook/imagewidget.h @@ -27,7 +27,7 @@ #include <tqlabel.h> #include <tqpushbutton.h> -#include <kabc/picture.h> +#include <tdeabc/picture.h> #include <kdialogbase.h> #include "contacteditorwidget.h" diff --git a/kaddressbook/imeditwidget.cpp b/kaddressbook/imeditwidget.cpp index d11a588ae..9a36cb77c 100644 --- a/kaddressbook/imeditwidget.cpp +++ b/kaddressbook/imeditwidget.cpp @@ -37,8 +37,8 @@ #include <kdialog.h> #include <kiconloader.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "imeditwidget.h" #include "imeditorwidget.h" diff --git a/kaddressbook/imeditwidget.h b/kaddressbook/imeditwidget.h index 52f1ec267..2ef2fb5f3 100644 --- a/kaddressbook/imeditwidget.h +++ b/kaddressbook/imeditwidget.h @@ -24,7 +24,7 @@ #ifndef IMEDITWIDGET_H #define IMEDITWIDGET_H -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <kdialogbase.h> class TQButtonGroup; diff --git a/kaddressbook/incsearchwidget.cpp b/kaddressbook/incsearchwidget.cpp index b3ee3b090..dbec4651e 100644 --- a/kaddressbook/incsearchwidget.cpp +++ b/kaddressbook/incsearchwidget.cpp @@ -33,7 +33,7 @@ #include <kdialog.h> #include <kiconloader.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include "incsearchwidget.h" diff --git a/kaddressbook/incsearchwidget.h b/kaddressbook/incsearchwidget.h index faafe94d9..9b22f75fe 100644 --- a/kaddressbook/incsearchwidget.h +++ b/kaddressbook/incsearchwidget.h @@ -26,7 +26,7 @@ #include <tqwidget.h> -#include <kabc/field.h> +#include <tdeabc/field.h> class TQComboBox; class TQTimer; diff --git a/kaddressbook/interfaces/CMakeLists.txt b/kaddressbook/interfaces/CMakeLists.txt index d6876c93c..b0511b83b 100644 --- a/kaddressbook/interfaces/CMakeLists.txt +++ b/kaddressbook/interfaces/CMakeLists.txt @@ -46,6 +46,6 @@ tde_add_library( kabinterfaces SHARED AUTOMOC configurewidget.cpp contacteditorwidget.cpp core.cpp extensionwidget.cpp xxport.cpp VERSION 1.0.0 - LINK kabc-shared + LINK tdeabc-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kaddressbook/interfaces/configurewidget.cpp b/kaddressbook/interfaces/configurewidget.cpp index c5efa60aa..bcb7a1764 100644 --- a/kaddressbook/interfaces/configurewidget.cpp +++ b/kaddressbook/interfaces/configurewidget.cpp @@ -21,7 +21,7 @@ without including the source code for TQt in the source distribution. */ -#include <kabc/addressbook.h> +#include <tdeabc/addressbook.h> #include "configurewidget.h" diff --git a/kaddressbook/interfaces/contacteditorwidget.h b/kaddressbook/interfaces/contacteditorwidget.h index 8ac5d6929..c8efa56c1 100644 --- a/kaddressbook/interfaces/contacteditorwidget.h +++ b/kaddressbook/interfaces/contacteditorwidget.h @@ -26,7 +26,7 @@ #include <tqwidget.h> -#include <kabc/addressbook.h> +#include <tdeabc/addressbook.h> #include <klibloader.h> #include <tdepimmacros.h> diff --git a/kaddressbook/interfaces/core.h b/kaddressbook/interfaces/core.h index 3a5baba92..fcf41028f 100644 --- a/kaddressbook/interfaces/core.h +++ b/kaddressbook/interfaces/core.h @@ -32,7 +32,7 @@ #include <tqobject.h> -#include <kabc/field.h> +#include <tdeabc/field.h> #include <kcommand.h> #include <kxmlguiclient.h> #include <tdepimmacros.h> diff --git a/kaddressbook/interfaces/extensionwidget.h b/kaddressbook/interfaces/extensionwidget.h index 1cca99afe..265484a4d 100644 --- a/kaddressbook/interfaces/extensionwidget.h +++ b/kaddressbook/interfaces/extensionwidget.h @@ -26,7 +26,7 @@ #include <tqwidget.h> -#include <kabc/addressbook.h> +#include <tdeabc/addressbook.h> #include <klibloader.h> #include <tdepimmacros.h> diff --git a/kaddressbook/interfaces/xxport.cpp b/kaddressbook/interfaces/xxport.cpp index fb2680677..d0790ccfa 100644 --- a/kaddressbook/interfaces/xxport.cpp +++ b/kaddressbook/interfaces/xxport.cpp @@ -26,7 +26,7 @@ #include <tdeaction.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> #include "xxport.h" diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h index f3eddebbf..515470c55 100644 --- a/kaddressbook/interfaces/xxport.h +++ b/kaddressbook/interfaces/xxport.h @@ -26,8 +26,8 @@ #include <tqobject.h> -#include <kabc/addressbook.h> -#include <kabc/addresseelist.h> +#include <tdeabc/addressbook.h> +#include <tdeabc/addresseelist.h> #include <klibloader.h> #include <kxmlguiclient.h> #include <tdepimmacros.h> diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp index 4d052fd75..b1be78eea 100644 --- a/kaddressbook/jumpbuttonbar.cpp +++ b/kaddressbook/jumpbuttonbar.cpp @@ -29,11 +29,11 @@ #include <tqstring.h> #include <tqstyle.h> -#include <kabc/addressbook.h> -#include <kabc/field.h> +#include <tdeabc/addressbook.h> +#include <tdeabc/field.h> #include <kdebug.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include "core.h" diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index c35197ed5..142f03c44 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -37,12 +37,12 @@ #include <tqtooltip.h> #include <tqwhatsthis.h> -#include <kabc/addresseelist.h> -#include <kabc/errorhandler.h> -#include <kabc/resource.h> -#include <kabc/stdaddressbook.h> -#include <kabc/vcardconverter.h> -#include <kabc/resourcefile.h> +#include <tdeabc/addresseelist.h> +#include <tdeabc/errorhandler.h> +#include <tdeabc/resource.h> +#include <tdeabc/stdaddressbook.h> +#include <tdeabc/vcardconverter.h> +#include <tdeabc/resourcefile.h> #include <tdeaboutdata.h> #include <tdeaccelmanager.h> #include <tdeapplication.h> @@ -53,8 +53,8 @@ #include <kdebug.h> #include <tdeversion.h> #include <tdeimproxy.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprinter.h> #include <kprotocolinfo.h> #include <kpushbutton.h> diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index a18692fa2..f9a7fbf10 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h @@ -26,7 +26,7 @@ #include <config.h> // FOR TDEPIM_NEW_DISTRLISTS -#include <kabc/field.h> +#include <tdeabc/field.h> #include <tqdict.h> #include <tqlabel.h> diff --git a/kaddressbook/kablock.cpp b/kaddressbook/kablock.cpp index 9444df472..8d36977fe 100644 --- a/kaddressbook/kablock.cpp +++ b/kaddressbook/kablock.cpp @@ -21,10 +21,10 @@ without including the source code for TQt in the source distribution. */ -#include <kabc/addressbook.h> -#include <kabc/resource.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeabc/addressbook.h> +#include <tdeabc/resource.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstaticdeleter.h> #include "kablock.h" diff --git a/kaddressbook/kabtools.cpp b/kaddressbook/kabtools.cpp index 779af2b59..cfa16df81 100644 --- a/kaddressbook/kabtools.cpp +++ b/kaddressbook/kabtools.cpp @@ -21,8 +21,8 @@ without including the source code for TQt in the source distribution. */ -#include <kabc/addressbook.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/addressbook.h> +#include <tdeabc/vcardconverter.h> #include <tdeapplication.h> #include <kdebug.h> #include <ktempdir.h> diff --git a/kaddressbook/kaddressbook_options.h b/kaddressbook/kaddressbook_options.h index 8aa632e4f..9ed4146e5 100644 --- a/kaddressbook/kaddressbook_options.h +++ b/kaddressbook/kaddressbook_options.h @@ -25,7 +25,7 @@ #define KADDRESSBOOK_OPTIONS_H #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> static TDECmdLineOptions kaddressbook_options[] = { diff --git a/kaddressbook/kaddressbook_part.cpp b/kaddressbook/kaddressbook_part.cpp index 259ac5ea0..566ffd713 100644 --- a/kaddressbook/kaddressbook_part.cpp +++ b/kaddressbook/kaddressbook_part.cpp @@ -28,7 +28,7 @@ #include <kdebug.h> #include <kiconloader.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeparts/genericfactory.h> #include <tdeparts/statusbarextension.h> #include <kstatusbar.h> diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp index 986686183..09b713f26 100644 --- a/kaddressbook/kaddressbookview.cpp +++ b/kaddressbook/kaddressbookview.cpp @@ -24,11 +24,11 @@ #include <tqlayout.h> #include <tqpopupmenu.h> -#include <kabc/addressbook.h> -#include <kabc/distributionlistdialog.h> +#include <tdeabc/addressbook.h> +#include <tdeabc/distributionlistdialog.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kxmlguifactory.h> #include <kxmlguiclient.h> diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h index d6ba8d6ae..44e82a572 100644 --- a/kaddressbook/kaddressbookview.h +++ b/kaddressbook/kaddressbookview.h @@ -29,7 +29,7 @@ #include <tqstringlist.h> #include <tqwidget.h> -#include <kabc/field.h> +#include <tdeabc/field.h> #include <klibloader.h> #include <tdepimmacros.h> diff --git a/kaddressbook/kaddressbootdemain.cpp b/kaddressbook/kaddressbootdemain.cpp index 60013be1f..4b8c49740 100644 --- a/kaddressbook/kaddressbootdemain.cpp +++ b/kaddressbook/kaddressbootdemain.cpp @@ -23,8 +23,8 @@ #include <kedittoolbar.h> #include <kkeydialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstatusbar.h> #include <libtdepim/statusbarprogresswidget.h> diff --git a/kaddressbook/kcmconfigs/addhostdialog.cpp b/kaddressbook/kcmconfigs/addhostdialog.cpp index 0c2484404..44a51680e 100644 --- a/kaddressbook/kcmconfigs/addhostdialog.cpp +++ b/kaddressbook/kcmconfigs/addhostdialog.cpp @@ -30,7 +30,7 @@ #include <tdeaccelmanager.h> #include <kbuttonbox.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include "addhostdialog.h" AddHostDialog::AddHostDialog( KPIM::LdapServer *server, TQWidget* parent, const char* name ) diff --git a/kaddressbook/kcmconfigs/addhostdialog.h b/kaddressbook/kcmconfigs/addhostdialog.h index da6cc392b..1ea1865fd 100644 --- a/kaddressbook/kcmconfigs/addhostdialog.h +++ b/kaddressbook/kcmconfigs/addhostdialog.h @@ -25,7 +25,7 @@ #define ADDHOSTDIALOG_H #include <kdialogbase.h> -#include <kabc/ldapconfigwidget.h> +#include <tdeabc/ldapconfigwidget.h> #include <libtdepim/ldapclient.h> class KLineEdit; diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp index ce58d2720..6d8522f6f 100644 --- a/kaddressbook/kcmconfigs/addresseewidget.cpp +++ b/kaddressbook/kcmconfigs/addresseewidget.cpp @@ -35,7 +35,7 @@ #include <tdeconfig.h> #include <kdialog.h> #include <kinputdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include "addresseewidget.h" diff --git a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp index 5bdec2f86..55eecb18a 100644 --- a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp +++ b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp @@ -23,7 +23,7 @@ #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include "configurewidget.h" #include "extensionconfigdialog.h" diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp index 6e2c4f68b..83e0bc89b 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp +++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp @@ -36,8 +36,8 @@ #include <kdebug.h> #include <kdialog.h> #include <tdelistview.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <ktrader.h> #include "addresseewidget.h" diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp index 6f1706974..db05432cf 100644 --- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp @@ -25,7 +25,7 @@ #include <tdeaboutdata.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "kabconfigwidget.h" diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp index a95fa2c84..73e8c5a22 100644 --- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp @@ -26,7 +26,7 @@ #include <tqlayout.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include "ldapoptionswidget.h" diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp index 71a41ba48..462418558 100644 --- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp +++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp @@ -33,7 +33,7 @@ #include <kbuttonbox.h> #include <tdeconfig.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include "addhostdialog.h" #include "ldapoptionswidget.h" diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp index d6f28c87a..671d07298 100644 --- a/kaddressbook/keywidget.cpp +++ b/kaddressbook/keywidget.cpp @@ -32,9 +32,9 @@ #include <tdefiledialog.h> #include <tdeio/netaccess.h> #include <kinputdialog.h> -#include <klocale.h> -#include <kmessagebox.h> -#include <ktempfile.h> +#include <tdelocale.h> +#include <tdemessagebox.h> +#include <tdetempfile.h> #include "keywidget.h" diff --git a/kaddressbook/keywidget.h b/kaddressbook/keywidget.h index 5f5153d47..3e437fa00 100644 --- a/kaddressbook/keywidget.h +++ b/kaddressbook/keywidget.h @@ -25,7 +25,7 @@ #define KEYWIDGET_H #include <tqwidget.h> -#include <kabc/key.h> +#include <tdeabc/key.h> class KComboBox; diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp index 22a79d276..3ed815046 100644 --- a/kaddressbook/ldapsearchdialog.cpp +++ b/kaddressbook/ldapsearchdialog.cpp @@ -35,8 +35,8 @@ #include <kcombobox.h> #include <tdeconfig.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "kabcore.h" #include "ldapsearchdialog.h" diff --git a/kaddressbook/ldapsearchdialog.h b/kaddressbook/ldapsearchdialog.h index 613a28b85..dde2bc955 100644 --- a/kaddressbook/ldapsearchdialog.h +++ b/kaddressbook/ldapsearchdialog.h @@ -25,7 +25,7 @@ #include <tqptrlist.h> -#include <kabc/addressbook.h> +#include <tdeabc/addressbook.h> #include <ldapclient.h> #include <kdialogbase.h> diff --git a/kaddressbook/main.cpp b/kaddressbook/main.cpp index d6322373f..90937cecd 100644 --- a/kaddressbook/main.cpp +++ b/kaddressbook/main.cpp @@ -26,13 +26,13 @@ #include <tqstring.h> -#include <kabc/stdaddressbook.h> +#include <tdeabc/stdaddressbook.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <kcrash.h> #include <kdebug.h> -#include <klocale.h> -#include <kstartupinfo.h> +#include <tdelocale.h> +#include <tdestartupinfo.h> #include <kuniqueapplication.h> #include <twin.h> diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp index aa81b2ed1..91c018a7d 100644 --- a/kaddressbook/nameeditdialog.cpp +++ b/kaddressbook/nameeditdialog.cpp @@ -38,10 +38,10 @@ #include <klineedit.h> #include <tdelistview.h> #include <kcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "nameeditdialog.h" diff --git a/kaddressbook/nameeditdialog.h b/kaddressbook/nameeditdialog.h index f43e56b01..855cd04c2 100644 --- a/kaddressbook/nameeditdialog.h +++ b/kaddressbook/nameeditdialog.h @@ -25,7 +25,7 @@ #define NAMEEDITDIALOG_H #include <kdialogbase.h> -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include "addresseeconfig.h" diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp index cd5eab785..70381d8e7 100644 --- a/kaddressbook/phoneeditwidget.cpp +++ b/kaddressbook/phoneeditwidget.cpp @@ -40,9 +40,9 @@ #include <kiconloader.h> #include <klineedit.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> -#include <kabc/phonenumber.h> +#include <tdeabc/phonenumber.h> #include "phoneeditwidget.h" diff --git a/kaddressbook/printing/detailledstyle.cpp b/kaddressbook/printing/detailledstyle.cpp index 50e767321..e1d48db56 100644 --- a/kaddressbook/printing/detailledstyle.cpp +++ b/kaddressbook/printing/detailledstyle.cpp @@ -28,9 +28,9 @@ #include <kdebug.h> #include <kdialog.h> #include <tdefontcombo.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <tqpaintdevicemetrics.h> #include <tqpainter.h> diff --git a/kaddressbook/printing/detailledstyle.h b/kaddressbook/printing/detailledstyle.h index e8600e56f..c68568aa1 100644 --- a/kaddressbook/printing/detailledstyle.h +++ b/kaddressbook/printing/detailledstyle.h @@ -24,7 +24,7 @@ #ifndef DETAILLEDSTYLE_H #define DETAILLEDSTYLE_H -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include "printstyle.h" #include "kabentrypainter.h" diff --git a/kaddressbook/printing/kabentrypainter.cpp b/kaddressbook/printing/kabentrypainter.cpp index 0bf45386b..d973f810c 100644 --- a/kaddressbook/printing/kabentrypainter.cpp +++ b/kaddressbook/printing/kabentrypainter.cpp @@ -26,8 +26,8 @@ #include <tqpainter.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <knotifyclient.h> #include <kprinter.h> #include <kurl.h> diff --git a/kaddressbook/printing/kabentrypainter.h b/kaddressbook/printing/kabentrypainter.h index 6936128fb..f8fea4912 100644 --- a/kaddressbook/printing/kabentrypainter.h +++ b/kaddressbook/printing/kabentrypainter.h @@ -24,7 +24,7 @@ #ifndef KABENTRYPAINTER_H #define KABENTRYPAINTER_H -#include <kabc/addressbook.h> +#include <tdeabc/addressbook.h> #include <tqcolor.h> #include <tqfont.h> diff --git a/kaddressbook/printing/mikesstyle.cpp b/kaddressbook/printing/mikesstyle.cpp index b17db1454..aa718dfd0 100644 --- a/kaddressbook/printing/mikesstyle.cpp +++ b/kaddressbook/printing/mikesstyle.cpp @@ -25,11 +25,11 @@ #include <tqpaintdevicemetrics.h> #include <tqpainter.h> -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <tdeapplication.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kprinter.h> #include <kprogress.h> diff --git a/kaddressbook/printing/printingwizard.cpp b/kaddressbook/printing/printingwizard.cpp index 1ee71a8c1..9ee8fe4a6 100644 --- a/kaddressbook/printing/printingwizard.cpp +++ b/kaddressbook/printing/printingwizard.cpp @@ -31,12 +31,12 @@ #include <tqpushbutton.h> #include <tqradiobutton.h> -#include <kabc/addresseelist.h> +#include <tdeabc/addresseelist.h> #include <tdeapplication.h> #include <kdebug.h> #include <kdialog.h> #include <kdialogbase.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprinter.h> // including the styles diff --git a/kaddressbook/printing/printingwizard.h b/kaddressbook/printing/printingwizard.h index 73d96bb28..359b746fe 100644 --- a/kaddressbook/printing/printingwizard.h +++ b/kaddressbook/printing/printingwizard.h @@ -31,7 +31,7 @@ #include <kwizard.h> #include "common/filter.h" -#include "kabc/addressbook.h" +#include "tdeabc/addressbook.h" #include "printstyle.h" #include "selectionpage.h" diff --git a/kaddressbook/printing/printprogress.cpp b/kaddressbook/printing/printprogress.cpp index 59ad2304c..459cfbee1 100644 --- a/kaddressbook/printing/printprogress.cpp +++ b/kaddressbook/printing/printprogress.cpp @@ -28,7 +28,7 @@ #include <tdeapplication.h> #include <kdebug.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include "printprogress.h" diff --git a/kaddressbook/printing/printsortmode.cpp b/kaddressbook/printing/printsortmode.cpp index 685a47ac0..3e1af4203 100644 --- a/kaddressbook/printing/printsortmode.cpp +++ b/kaddressbook/printing/printsortmode.cpp @@ -21,7 +21,7 @@ without including the source code for TQt in the source distribution. */ -#include <kabc/field.h> +#include <tdeabc/field.h> #include "printsortmode.h" diff --git a/kaddressbook/printing/printsortmode.h b/kaddressbook/printing/printsortmode.h index d8ec920df..a764e6c74 100644 --- a/kaddressbook/printing/printsortmode.h +++ b/kaddressbook/printing/printsortmode.h @@ -28,7 +28,7 @@ #if KDE_IS_VERSION(3,3,91) -#include <kabc/sortmode.h> +#include <tdeabc/sortmode.h> class PrintSortMode : public KABC::SortMode { diff --git a/kaddressbook/printing/printstyle.h b/kaddressbook/printing/printstyle.h index 65fea06a7..2c5ef51b5 100644 --- a/kaddressbook/printing/printstyle.h +++ b/kaddressbook/printing/printstyle.h @@ -28,7 +28,7 @@ #include <tqstringlist.h> #include <tqpixmap.h> -#include <kabc/field.h> +#include <tdeabc/field.h> namespace KABPrinting { diff --git a/kaddressbook/printing/selectionpage.cpp b/kaddressbook/printing/selectionpage.cpp index c77c00d90..39b1c4a8e 100644 --- a/kaddressbook/printing/selectionpage.cpp +++ b/kaddressbook/printing/selectionpage.cpp @@ -23,7 +23,7 @@ */ #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqbuttongroup.h> #include <tqcombobox.h> diff --git a/kaddressbook/printing/stylepage.cpp b/kaddressbook/printing/stylepage.cpp index c3fdc1e0d..0b67897d2 100644 --- a/kaddressbook/printing/stylepage.cpp +++ b/kaddressbook/printing/stylepage.cpp @@ -30,7 +30,7 @@ #include <kcombobox.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include "stylepage.h" diff --git a/kaddressbook/printing/stylepage.h b/kaddressbook/printing/stylepage.h index 8f664271d..46fbc2d6e 100644 --- a/kaddressbook/printing/stylepage.h +++ b/kaddressbook/printing/stylepage.h @@ -27,8 +27,8 @@ #include <tqwidget.h> -#include <kabc/addressbook.h> -#include <kabc/field.h> +#include <tdeabc/addressbook.h> +#include <tdeabc/field.h> class TQLabel; class TQPixmap; diff --git a/kaddressbook/searchmanager.cpp b/kaddressbook/searchmanager.cpp index 4ec8f7bb3..fef8f27db 100644 --- a/kaddressbook/searchmanager.cpp +++ b/kaddressbook/searchmanager.cpp @@ -22,7 +22,7 @@ */ #include <config.h> // FOR TDEPIM_NEW_DISTRLISTS -#include <kabc/addresseelist.h> +#include <tdeabc/addresseelist.h> #include <tdeversion.h> #include "searchmanager.h" diff --git a/kaddressbook/searchmanager.h b/kaddressbook/searchmanager.h index 539619dbe..9e1370320 100644 --- a/kaddressbook/searchmanager.h +++ b/kaddressbook/searchmanager.h @@ -27,7 +27,7 @@ #include <config.h> // for TDEPIM_NEW_DISTRLISTS #include <tqobject.h> -#include <kabc/stdaddressbook.h> +#include <tdeabc/stdaddressbook.h> #ifdef TDEPIM_NEW_DISTRLISTS #include <libtdepim/distributionlist.h> #endif diff --git a/kaddressbook/secrecywidget.cpp b/kaddressbook/secrecywidget.cpp index 5e4af7490..62360196c 100644 --- a/kaddressbook/secrecywidget.cpp +++ b/kaddressbook/secrecywidget.cpp @@ -23,7 +23,7 @@ #include <tqlayout.h> -#include <kabc/secrecy.h> +#include <tdeabc/secrecy.h> #include <kcombobox.h> #include <kdialog.h> diff --git a/kaddressbook/simpleaddresseeeditor.cpp b/kaddressbook/simpleaddresseeeditor.cpp index 3a371dc67..cabd98ba6 100644 --- a/kaddressbook/simpleaddresseeeditor.cpp +++ b/kaddressbook/simpleaddresseeeditor.cpp @@ -25,7 +25,7 @@ #include <tqlabel.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include "simpleaddresseeeditor.h" diff --git a/kaddressbook/soundwidget.cpp b/kaddressbook/soundwidget.cpp index 9a110e258..e26b3d3aa 100644 --- a/kaddressbook/soundwidget.cpp +++ b/kaddressbook/soundwidget.cpp @@ -21,14 +21,14 @@ without including the source code for TQt in the source distribution. */ -#include <kabc/sound.h> +#include <tdeabc/sound.h> #include <kaudioplayer.h> #include <kdebug.h> #include <kdialog.h> #include <kiconloader.h> #include <tdeio/netaccess.h> -#include <klocale.h> -#include <ktempfile.h> +#include <tdelocale.h> +#include <tdetempfile.h> #include <kurlrequester.h> #include <tqcheckbox.h> diff --git a/kaddressbook/soundwidget.h b/kaddressbook/soundwidget.h index 50f4a584a..f72a0181e 100644 --- a/kaddressbook/soundwidget.h +++ b/kaddressbook/soundwidget.h @@ -24,7 +24,7 @@ #ifndef SOUNDWIDGET_H #define SOUNDWIDGET_H -#include <kabc/sound.h> +#include <tdeabc/sound.h> #include "contacteditorwidget.h" diff --git a/kaddressbook/thumbnailcreator/CMakeLists.txt b/kaddressbook/thumbnailcreator/CMakeLists.txt index d8ac40f06..00173bfef 100644 --- a/kaddressbook/thumbnailcreator/CMakeLists.txt +++ b/kaddressbook/thumbnailcreator/CMakeLists.txt @@ -28,6 +28,6 @@ install( FILES ldifvcardthumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) tde_add_kpart( ldifvcardthumbnail SOURCES ldifvcardcreator.cpp - LINK kabc-shared + LINK tdeabc-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp index 4627ebd52..a0c557d1b 100644 --- a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp +++ b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp @@ -34,13 +34,13 @@ #include <tqtextstream.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> -#include <kabc/ldifconverter.h> -#include <kabc/vcardconverter.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdeabc/ldifconverter.h> +#include <tdeabc/vcardconverter.h> #include <kpixmapsplitter.h> #include <kstandarddirs.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include "ldifvcardcreator.h" diff --git a/kaddressbook/thumbnailcreator/ldifvcardcreator.h b/kaddressbook/thumbnailcreator/ldifvcardcreator.h index 04f788310..f09ad8ead 100644 --- a/kaddressbook/thumbnailcreator/ldifvcardcreator.h +++ b/kaddressbook/thumbnailcreator/ldifvcardcreator.h @@ -23,7 +23,7 @@ #include <tqpixmap.h> #include <tdeio/thumbcreator.h> -#include <kabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define +#include <tdeabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define class KPixmapSplitter; diff --git a/kaddressbook/typecombo.h b/kaddressbook/typecombo.h index e5cf64296..4b12ef867 100644 --- a/kaddressbook/typecombo.h +++ b/kaddressbook/typecombo.h @@ -24,7 +24,7 @@ #ifndef TYPECOMBO_H #define TYPECOMBO_H -#include <kabc/phonenumber.h> +#include <tdeabc/phonenumber.h> #include <kcombobox.h> /** diff --git a/kaddressbook/undocmds.cpp b/kaddressbook/undocmds.cpp index abe2bfe64..dc66696e5 100644 --- a/kaddressbook/undocmds.cpp +++ b/kaddressbook/undocmds.cpp @@ -25,10 +25,10 @@ #include <tqapplication.h> #include <tqclipboard.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> -#include <kabc/resource.h> +#include <tdeabc/resource.h> #include "addresseeutil.h" #include "addresseeconfig.h" diff --git a/kaddressbook/undocmds.h b/kaddressbook/undocmds.h index 55c437676..b9915f150 100644 --- a/kaddressbook/undocmds.h +++ b/kaddressbook/undocmds.h @@ -30,9 +30,9 @@ #include <tqstring.h> #include <tqstringlist.h> -#include <kabc/addressbook.h> -#include <kabc/addressee.h> -#include <kabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define +#include <tdeabc/addressbook.h> +#include <tdeabc/addressee.h> +#include <tdeabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define #include <kcommand.h> diff --git a/kaddressbook/viewconfigurefieldspage.cpp b/kaddressbook/viewconfigurefieldspage.cpp index e3c9a81cf..cdfb28eab 100644 --- a/kaddressbook/viewconfigurefieldspage.cpp +++ b/kaddressbook/viewconfigurefieldspage.cpp @@ -32,7 +32,7 @@ #include <kdebug.h> #include <kdialog.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include "viewconfigurefieldspage.h" diff --git a/kaddressbook/viewconfigurefieldspage.h b/kaddressbook/viewconfigurefieldspage.h index 91bf6da72..cbafec5ae 100644 --- a/kaddressbook/viewconfigurefieldspage.h +++ b/kaddressbook/viewconfigurefieldspage.h @@ -26,8 +26,8 @@ #include <tqwidget.h> -#include <kabc/field.h> -#include <kabc/addressbook.h> +#include <tdeabc/field.h> +#include <tdeabc/addressbook.h> class KComboBox; class TQListBox; diff --git a/kaddressbook/viewconfigurefilterpage.cpp b/kaddressbook/viewconfigurefilterpage.cpp index 3dd0d7d65..c0d7fa7c2 100644 --- a/kaddressbook/viewconfigurefilterpage.cpp +++ b/kaddressbook/viewconfigurefilterpage.cpp @@ -29,7 +29,7 @@ #include <tdeconfig.h> #include <kcombobox.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include "viewconfigurefilterpage.h" #include "filter.h" diff --git a/kaddressbook/viewconfigurewidget.cpp b/kaddressbook/viewconfigurewidget.cpp index 0aaceb80d..105bd6857 100644 --- a/kaddressbook/viewconfigurewidget.cpp +++ b/kaddressbook/viewconfigurewidget.cpp @@ -27,9 +27,9 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include "viewconfigurefieldspage.h" #include "viewconfigurefilterpage.h" diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index 77608225d..4a4f601ad 100644 --- a/kaddressbook/viewmanager.cpp +++ b/kaddressbook/viewmanager.cpp @@ -26,15 +26,15 @@ #include <tqwidgetstack.h> #include <libtdepim/kvcarddrag.h> -#include <kabc/addressbook.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/addressbook.h> +#include <tdeabc/vcardconverter.h> #include <tdeactionclasses.h> #include <tdeconfig.h> #include <kdebug.h> #include <tdeversion.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdemultipledrag.h> #include <ktempdir.h> #include <ktrader.h> diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp index 2979ee5d2..9b1ef52a6 100644 --- a/kaddressbook/views/cardview.cpp +++ b/kaddressbook/views/cardview.cpp @@ -33,7 +33,7 @@ #include <tqtooltip.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include "cardview.h" diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp index 2c520ce74..a386743c9 100644 --- a/kaddressbook/views/configurecardviewdialog.cpp +++ b/kaddressbook/views/configurecardviewdialog.cpp @@ -32,9 +32,9 @@ #include <tqwhatsthis.h> #include <kdebug.h> -#include <kglobal.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdeconfig.h> #include <tdefontdialog.h> diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp index 4e478e255..f14a5c451 100644 --- a/kaddressbook/views/configuretableviewdialog.cpp +++ b/kaddressbook/views/configuretableviewdialog.cpp @@ -30,8 +30,8 @@ #include <tqbuttongroup.h> #include <tdeversion.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <klineedit.h> #include <kurlrequester.h> #include <kiconloader.h> diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp index f4b98e468..0d7942f95 100644 --- a/kaddressbook/views/contactlistview.cpp +++ b/kaddressbook/views/contactlistview.cpp @@ -30,14 +30,14 @@ #include <tqbrush.h> #include <tqevent.h> -#include <klocale.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdeglobalsettings.h> #include <kdebug.h> #include <tdeconfig.h> #include <tdeapplication.h> #include <kurl.h> -#include <kabc/addressbook.h> -#include <kabc/addressee.h> +#include <tdeabc/addressbook.h> +#include <tdeabc/addressee.h> #include <tdeimproxy.h> #include "kaddressbooktableview.h" diff --git a/kaddressbook/views/contactlistview.h b/kaddressbook/views/contactlistview.h index 0ca029f64..b893cc352 100644 --- a/kaddressbook/views/contactlistview.h +++ b/kaddressbook/views/contactlistview.h @@ -31,7 +31,7 @@ #include <tdelistview.h> -#include <kabc/field.h> +#include <tdeabc/field.h> class TQDropEvent; class KAddressBookTableView; diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp index f69ce0c1a..f60d171a3 100644 --- a/kaddressbook/views/kaddressbookcardview.cpp +++ b/kaddressbook/views/kaddressbookcardview.cpp @@ -28,11 +28,11 @@ #include <tqlayout.h> #include <tqstringlist.h> -#include <kabc/addressbook.h> -#include <kabc/addressee.h> +#include <tdeabc/addressbook.h> +#include <tdeabc/addressee.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "core.h" #include "configurecardviewdialog.h" diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp index e5f4ab259..f88af5ffe 100644 --- a/kaddressbook/views/kaddressbookiconview.cpp +++ b/kaddressbook/views/kaddressbookiconview.cpp @@ -26,13 +26,13 @@ #include <tqlayout.h> #include <tqstringlist.h> -#include <kabc/addressbook.h> -#include <kabc/addressee.h> +#include <tdeabc/addressbook.h> +#include <tdeabc/addressee.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include "core.h" #include "kabprefs.h" diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp index 4c726ca30..6d8d0c971 100644 --- a/kaddressbook/views/kaddressbooktableview.cpp +++ b/kaddressbook/views/kaddressbooktableview.cpp @@ -36,16 +36,16 @@ #include <tqurl.h> #include <tqpixmap.h> -#include <kabc/addressbook.h> +#include <tdeabc/addressbook.h> #include <tdeapplication.h> #include <tdeconfig.h> #include <kcolorbutton.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kurl.h> #include <kurlrequester.h> #include <tdeimproxy.h> diff --git a/kaddressbook/xxport/bookmark_xxport.cpp b/kaddressbook/xxport/bookmark_xxport.cpp index 83cdd2b70..62357a599 100644 --- a/kaddressbook/xxport/bookmark_xxport.cpp +++ b/kaddressbook/xxport/bookmark_xxport.cpp @@ -26,7 +26,7 @@ #include <kbookmarkmanager.h> #include <kbookmarkmenu.h> #include <kbookmarkdombuilder.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include "bookmark_xxport.h" @@ -41,7 +41,7 @@ BookmarkXXPort::BookmarkXXPort( KABC::AddressBook *ab, TQWidget *parent, const c bool BookmarkXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& ) { - TQString fileName = locateLocal( "data", "kabc/bookmarks.xml" ); + TQString fileName = locateLocal( "data", "tdeabc/bookmarks.xml" ); KBookmarkManager *mgr = KBookmarkManager::managerForFile( fileName ); KBookmarkDomBuilder *builder = new KBookmarkDomBuilder( mgr->root(), mgr ); diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp index 673a0ec73..20ed9aac7 100644 --- a/kaddressbook/xxport/csv_xxport.cpp +++ b/kaddressbook/xxport/csv_xxport.cpp @@ -25,9 +25,9 @@ #include <tdefiledialog.h> #include <tdeio/netaccess.h> -#include <klocale.h> -#include <kmessagebox.h> -#include <ktempfile.h> +#include <tdelocale.h> +#include <tdemessagebox.h> +#include <tdetempfile.h> #include <kurl.h> #include "csvimportdialog.h" diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp index 700eceae8..93635d25a 100644 --- a/kaddressbook/xxport/csvimportdialog.cpp +++ b/kaddressbook/xxport/csvimportdialog.cpp @@ -37,9 +37,9 @@ #include <kdialogbase.h> #include <tdefiledialog.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kinputdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kprogress.h> #include <kstandarddirs.h> #include <kurlrequester.h> diff --git a/kaddressbook/xxport/csvimportdialog.h b/kaddressbook/xxport/csvimportdialog.h index bf0cc7746..b6b89d7ec 100644 --- a/kaddressbook/xxport/csvimportdialog.h +++ b/kaddressbook/xxport/csvimportdialog.h @@ -22,8 +22,8 @@ #ifndef CSV_IMPORT_DLG_H #define CSV_IMPORT_DLG_H -#include <kabc/addressbook.h> -#include <kabc/addresseelist.h> +#include <tdeabc/addressbook.h> +#include <tdeabc/addresseelist.h> #include <kdialogbase.h> #include <tqvaluelist.h> diff --git a/kaddressbook/xxport/eudora_xxport.cpp b/kaddressbook/xxport/eudora_xxport.cpp index c443cce3b..75f2ea24d 100644 --- a/kaddressbook/xxport/eudora_xxport.cpp +++ b/kaddressbook/xxport/eudora_xxport.cpp @@ -25,9 +25,9 @@ #include <tdefiledialog.h> #include <tdeio/netaccess.h> -#include <klocale.h> -#include <kmessagebox.h> -#include <ktempfile.h> +#include <tdelocale.h> +#include <tdemessagebox.h> +#include <tdetempfile.h> #include <kurl.h> #include <kdebug.h> diff --git a/kaddressbook/xxport/gnokii_xxport.cpp b/kaddressbook/xxport/gnokii_xxport.cpp index 0de310e9a..306fbe808 100644 --- a/kaddressbook/xxport/gnokii_xxport.cpp +++ b/kaddressbook/xxport/gnokii_xxport.cpp @@ -46,8 +46,8 @@ extern "C" { #include <tqcursor.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprogress.h> #include <kguiitem.h> diff --git a/kaddressbook/xxport/kde2_xxport.cpp b/kaddressbook/xxport/kde2_xxport.cpp index 6d8fd80e7..730de8237 100644 --- a/kaddressbook/xxport/kde2_xxport.cpp +++ b/kaddressbook/xxport/kde2_xxport.cpp @@ -26,11 +26,11 @@ #include <kdebug.h> #include <tdefiledialog.h> #include <tdeio/netaccess.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kurl.h> #include "xxportmanager.h" @@ -47,7 +47,7 @@ KDE2XXPort::KDE2XXPort( KABC::AddressBook *ab, TQWidget *parent, const char *nam KABC::AddresseeList KDE2XXPort::importContacts( const TQString& ) const { - TQString fileName = locateLocal( "data", "kabc/std.vcf" ); + TQString fileName = locateLocal( "data", "tdeabc/std.vcf" ); if ( !TQFile::exists( fileName ) ) { KMessageBox::sorry( parentWidget(), i18n( "<qt>Could not find a KDE 2 address book <b>%1</b>.</qt>" ).arg( fileName ) ); return KABC::AddresseeList(); diff --git a/kaddressbook/xxport/ldif_xxport.cpp b/kaddressbook/xxport/ldif_xxport.cpp index 67c3684d3..31d3c2936 100644 --- a/kaddressbook/xxport/ldif_xxport.cpp +++ b/kaddressbook/xxport/ldif_xxport.cpp @@ -37,12 +37,12 @@ #include <tdefiledialog.h> #include <tdeio/netaccess.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmdcodec.h> -#include <kmessagebox.h> -#include <ktempfile.h> +#include <tdemessagebox.h> +#include <tdetempfile.h> #include <kurl.h> -#include <kabc/ldifconverter.h> +#include <tdeabc/ldifconverter.h> #include <kdebug.h> diff --git a/kaddressbook/xxport/opera_xxport.cpp b/kaddressbook/xxport/opera_xxport.cpp index f1547481d..0a4ac4886 100644 --- a/kaddressbook/xxport/opera_xxport.cpp +++ b/kaddressbook/xxport/opera_xxport.cpp @@ -27,9 +27,9 @@ #include <tdefiledialog.h> #include <tdeio/netaccess.h> -#include <klocale.h> -#include <kmessagebox.h> -#include <ktempfile.h> +#include <tdelocale.h> +#include <tdemessagebox.h> +#include <tdetempfile.h> #include <kurl.h> #include <kdebug.h> diff --git a/kaddressbook/xxport/pab_pablib.h b/kaddressbook/xxport/pab_pablib.h index c26cbdf23..910688cc5 100644 --- a/kaddressbook/xxport/pab_pablib.h +++ b/kaddressbook/xxport/pab_pablib.h @@ -19,7 +19,7 @@ #ifndef PAB_LIB_HXX #define PAB_LIB_HXX -#include <klocale.h> +#include <tdelocale.h> #include <tqfile.h> #include "pab_mapihd.h" diff --git a/kaddressbook/xxport/pab_xxport.cpp b/kaddressbook/xxport/pab_xxport.cpp index c4db37a9e..894adf3d5 100644 --- a/kaddressbook/xxport/pab_xxport.cpp +++ b/kaddressbook/xxport/pab_xxport.cpp @@ -27,11 +27,11 @@ #include <kdebug.h> #include <tdefiledialog.h> #include <tdeio/netaccess.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kurl.h> #include "xxportmanager.h" diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp index b1e0b0f1d..b12779cbb 100644 --- a/kaddressbook/xxport/vcard_xxport.cpp +++ b/kaddressbook/xxport/vcard_xxport.cpp @@ -28,13 +28,13 @@ #include <tqlayout.h> #include <tqpushbutton.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/vcardconverter.h> #include <kdialogbase.h> #include <tdefiledialog.h> #include <tdeio/netaccess.h> -#include <klocale.h> -#include <kmessagebox.h> -#include <ktempfile.h> +#include <tdelocale.h> +#include <tdemessagebox.h> +#include <tdetempfile.h> #include <kurl.h> #include <tdeapplication.h> #include <libtdepim/addresseeview.h> diff --git a/kaddressbook/xxport/vcard_xxport.h b/kaddressbook/xxport/vcard_xxport.h index a2aa8be30..b4b03284f 100644 --- a/kaddressbook/xxport/vcard_xxport.h +++ b/kaddressbook/xxport/vcard_xxport.h @@ -25,7 +25,7 @@ #define VCARD_XXPORT_H #include <xxport.h> -#include <kabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define +#include <tdeabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define class VCardXXPort : public KAB::XXPort { diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp index 65414ff55..22d8a2d10 100644 --- a/kaddressbook/xxportmanager.cpp +++ b/kaddressbook/xxportmanager.cpp @@ -23,11 +23,11 @@ #include <tqlayout.h> -#include <kabc/addressbook.h> -#include <kabc/resource.h> +#include <tdeabc/addressbook.h> +#include <tdeabc/resource.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <ktrader.h> #include <tdeapplication.h> diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp index aa18bf79a..6c67c8ff5 100644 --- a/kaddressbook/xxportselectdialog.cpp +++ b/kaddressbook/xxportselectdialog.cpp @@ -22,10 +22,10 @@ without including the source code for TQt in the source distribution. */ -#include <kabc/addressbook.h> +#include <tdeabc/addressbook.h> #include <tdeapplication.h> #include <kcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqbuttongroup.h> #include <tqcombobox.h> diff --git a/kaddressbook/xxportselectdialog.h b/kaddressbook/xxportselectdialog.h index adfcfd023..5141e5d39 100644 --- a/kaddressbook/xxportselectdialog.h +++ b/kaddressbook/xxportselectdialog.h @@ -24,8 +24,8 @@ #ifndef XXPORTSELECTDIALOG_H #define XXPORTSELECTDIALOG_H -#include <kabc/addresseelist.h> -#include <kabc/field.h> +#include <tdeabc/addresseelist.h> +#include <tdeabc/field.h> #include <kdialogbase.h> #include "filter.h" diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp index c3c7b8106..8d11854bd 100644 --- a/kalarm/alarmcalendar.cpp +++ b/kalarm/alarmcalendar.cpp @@ -27,15 +27,15 @@ #include <tqregexp.h> #include <tqtimer.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kstaticdeleter.h> #include <tdeconfig.h> #include <tdeaboutdata.h> #include <tdeio/netaccess.h> #include <tdefileitem.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdefiledialog.h> #include <dcopclient.h> #include <kdebug.h> diff --git a/kalarm/alarmevent.cpp b/kalarm/alarmevent.cpp index 78e57ad1e..00edf2109 100644 --- a/kalarm/alarmevent.cpp +++ b/kalarm/alarmevent.cpp @@ -26,7 +26,7 @@ #include <tqcolor.h> #include <tqregexp.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "alarmtext.h" diff --git a/kalarm/alarmlistview.cpp b/kalarm/alarmlistview.cpp index 6f88d3e4a..6d7e5f9e2 100644 --- a/kalarm/alarmlistview.cpp +++ b/kalarm/alarmlistview.cpp @@ -26,8 +26,8 @@ #include <tqheader.h> #include <tqregexp.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include <libkcal/icaldrag.h> diff --git a/kalarm/alarmtext.cpp b/kalarm/alarmtext.cpp index c030c384f..e1194ab0d 100644 --- a/kalarm/alarmtext.cpp +++ b/kalarm/alarmtext.cpp @@ -20,7 +20,7 @@ #include "kalarm.h" #include <tqstringlist.h> -#include <klocale.h> +#include <tdelocale.h> #include "alarmevent.h" #include "editdlg.h" diff --git a/kalarm/alarmtimewidget.cpp b/kalarm/alarmtimewidget.cpp index 45abca7c6..94abd0e3e 100644 --- a/kalarm/alarmtimewidget.cpp +++ b/kalarm/alarmtimewidget.cpp @@ -27,8 +27,8 @@ #include <tqwhatsthis.h> #include <kdialog.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include "checkbox.h" #include "dateedit.h" diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp index 165e5aba7..e50723ff0 100644 --- a/kalarm/birthdaydlg.cpp +++ b/kalarm/birthdaydlg.cpp @@ -27,13 +27,13 @@ #include <tqlineedit.h> #include <tqwhatsthis.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeconfig.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeaccel.h> -#include <kabc/addressbook.h> -#include <kabc/stdaddressbook.h> +#include <tdeabc/addressbook.h> +#include <tdeabc/stdaddressbook.h> #include <kdebug.h> #include "alarmcalendar.h" diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp index 734636dd5..c5769f942 100644 --- a/kalarm/daemon.cpp +++ b/kalarm/daemon.cpp @@ -26,7 +26,7 @@ #include <kstandarddirs.h> #include <tdeconfig.h> #include <tdeaboutdata.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <dcopclient.h> #include <kdebug.h> diff --git a/kalarm/deferdlg.cpp b/kalarm/deferdlg.cpp index 7ea2f2160..c5fab8808 100644 --- a/kalarm/deferdlg.cpp +++ b/kalarm/deferdlg.cpp @@ -22,9 +22,9 @@ #include <tqlayout.h> -#include <kglobal.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <libkcal/event.h> diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp index daf4406d3..091a648a3 100644 --- a/kalarm/editdlg.cpp +++ b/kalarm/editdlg.cpp @@ -37,21 +37,21 @@ #include <tqdir.h> #include <tqstyle.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdefiledialog.h> #include <kiconloader.h> #include <tdeio/netaccess.h> #include <tdefileitem.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kurldrag.h> #include <kurlcompletion.h> #include <twin.h> #include <twinmodule.h> #include <kstandarddirs.h> #include <kstdguiitem.h> -#include <kabc/addresseedialog.h> +#include <tdeabc/addresseedialog.h> #include <kdebug.h> #include <libtdepim/maillistdrag.h> diff --git a/kalarm/find.cpp b/kalarm/find.cpp index f75d5f6f3..9a469e57a 100644 --- a/kalarm/find.cpp +++ b/kalarm/find.cpp @@ -29,8 +29,8 @@ #include <kfind.h> #include <kseparator.h> #include <twin.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> #include "alarmlistview.h" diff --git a/kalarm/fontcolour.cpp b/kalarm/fontcolour.cpp index e4b922431..74feffb67 100644 --- a/kalarm/fontcolour.cpp +++ b/kalarm/fontcolour.cpp @@ -27,8 +27,8 @@ #include <tqlayout.h> #include <tqwhatsthis.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kcolordialog.h> #include "kalarmapp.h" diff --git a/kalarm/fontcolourbutton.cpp b/kalarm/fontcolourbutton.cpp index 6299049c6..5321cdc93 100644 --- a/kalarm/fontcolourbutton.cpp +++ b/kalarm/fontcolourbutton.cpp @@ -24,7 +24,7 @@ #include <tqlayout.h> #include <tqwhatsthis.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "fontcolour.h" diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp index 9808f06ea..f7dbc256f 100644 --- a/kalarm/functions.cpp +++ b/kalarm/functions.cpp @@ -40,11 +40,11 @@ #include <tdeconfig.h> #include <tdeaction.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kstdguiitem.h> #include <tdestdaccel.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdefiledialog.h> #include <dcopclient.h> #include <dcopref.h> diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp index b2ecb86f5..7530b14ac 100644 --- a/kalarm/kalarmapp.cpp +++ b/kalarm/kalarmapp.cpp @@ -30,13 +30,13 @@ #include <tqfile.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdeconfig.h> #include <tdeaboutdata.h> #include <dcopclient.h> #include <kprocess.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdefileitem.h> #include <kstdguiitem.h> #include <ktrader.h> diff --git a/kalarm/kalarmd/adcalendar.cpp b/kalarm/kalarmd/adcalendar.cpp index e499f4814..a2cc4836a 100644 --- a/kalarm/kalarmd/adcalendar.cpp +++ b/kalarm/kalarmd/adcalendar.cpp @@ -23,7 +23,7 @@ #include <tqfile.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeio/job.h> #include <tdeio/jobclasses.h> #include <kdebug.h> diff --git a/kalarm/kalarmd/admain.cpp b/kalarm/kalarmd/admain.cpp index 314b6ad86..a5d9fd160 100644 --- a/kalarm/kalarmd/admain.cpp +++ b/kalarm/kalarmd/admain.cpp @@ -24,10 +24,10 @@ #include <stdlib.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <kstartupinfo.h> +#include <tdestartupinfo.h> #include "adapp.h" diff --git a/kalarm/kamail.cpp b/kalarm/kamail.cpp index ddcd38f35..b68f45ba5 100644 --- a/kalarm/kamail.cpp +++ b/kalarm/kamail.cpp @@ -33,14 +33,14 @@ #include <kstandarddirs.h> #include <dcopclient.h> #include <dcopref.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kprocess.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <tdefileitem.h> #include <tdeio/netaccess.h> -#include <ktempfile.h> -#include <kemailsettings.h> +#include <tdetempfile.h> +#include <tdeemailsettings.h> #include <kdebug.h> #include <libkpimidentities/identitymanager.h> diff --git a/kalarm/latecancel.cpp b/kalarm/latecancel.cpp index fa317c395..ff684a774 100644 --- a/kalarm/latecancel.cpp +++ b/kalarm/latecancel.cpp @@ -23,7 +23,7 @@ #include <tqwidgetstack.h> #include <tqlayout.h> #include <tqwhatsthis.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include "checkbox.h" diff --git a/kalarm/lib/colourcombo.cpp b/kalarm/lib/colourcombo.cpp index 4db9f37ad..625933c70 100644 --- a/kalarm/lib/colourcombo.cpp +++ b/kalarm/lib/colourcombo.cpp @@ -23,7 +23,7 @@ #include <tqpainter.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcolordialog.h> #include "kalarm/preferences.h" diff --git a/kalarm/lib/dateedit.cpp b/kalarm/lib/dateedit.cpp index 09712beda..29475f716 100644 --- a/kalarm/lib/dateedit.cpp +++ b/kalarm/lib/dateedit.cpp @@ -18,9 +18,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <kglobal.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "dateedit.moc" diff --git a/kalarm/lib/datetime.cpp b/kalarm/lib/datetime.cpp index bc6e64394..b31d629ae 100644 --- a/kalarm/lib/datetime.cpp +++ b/kalarm/lib/datetime.cpp @@ -19,8 +19,8 @@ */ #include "kalarm.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include "datetime.h" diff --git a/kalarm/lib/messagebox.h b/kalarm/lib/messagebox.h index b0cae2939..5baccca0a 100644 --- a/kalarm/lib/messagebox.h +++ b/kalarm/lib/messagebox.h @@ -22,7 +22,7 @@ #define MESSAGEBOX_H #include <kstdguiitem.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> /** diff --git a/kalarm/lib/shellprocess.cpp b/kalarm/lib/shellprocess.cpp index c3653e9b8..c8ea891c4 100644 --- a/kalarm/lib/shellprocess.cpp +++ b/kalarm/lib/shellprocess.cpp @@ -25,7 +25,7 @@ #include <stdlib.h> #include <sys/stat.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "shellprocess.moc" diff --git a/kalarm/lib/timeedit.cpp b/kalarm/lib/timeedit.cpp index 67a846d7a..51760fc49 100644 --- a/kalarm/lib/timeedit.cpp +++ b/kalarm/lib/timeedit.cpp @@ -20,8 +20,8 @@ #include "kalarm.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include "combobox.h" #include "timespinbox.h" diff --git a/kalarm/lib/timeperiod.cpp b/kalarm/lib/timeperiod.cpp index e372615a7..7f3706303 100644 --- a/kalarm/lib/timeperiod.cpp +++ b/kalarm/lib/timeperiod.cpp @@ -23,7 +23,7 @@ #include <tqwidgetstack.h> #include <tqwhatsthis.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include "combobox.h" diff --git a/kalarm/lib/timespinbox.cpp b/kalarm/lib/timespinbox.cpp index b2121072f..0ac932e69 100644 --- a/kalarm/lib/timespinbox.cpp +++ b/kalarm/lib/timespinbox.cpp @@ -22,7 +22,7 @@ #include <tqvalidator.h> #include <tqlineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include "timespinbox.moc" diff --git a/kalarm/main.cpp b/kalarm/main.cpp index b4c3f251e..4b023588d 100644 --- a/kalarm/main.cpp +++ b/kalarm/main.cpp @@ -24,7 +24,7 @@ #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "kalarmapp.h" diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp index 3cacb47ea..7487a8a2d 100644 --- a/kalarm/mainwindow.cpp +++ b/kalarm/mainwindow.cpp @@ -24,7 +24,7 @@ #include <tqdragobject.h> #include <tqheader.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <tdetoolbar.h> #include <tdepopupmenu.h> #include <tdeaccel.h> @@ -32,10 +32,10 @@ #include <tdeactionclasses.h> #include <kstdaction.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kurldrag.h> -#include <klocale.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdeglobalsettings.h> #include <tdeconfig.h> #include <kkeydialog.h> #include <kedittoolbar.h> diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp index b437fffd7..34814cbc1 100644 --- a/kalarm/messagewin.cpp +++ b/kalarm/messagewin.cpp @@ -38,14 +38,14 @@ #include <tdeaction.h> #include <kstdguiitem.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kiconloader.h> #include <kdialog.h> #include <ktextbrowser.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kmimetype.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <twin.h> #include <twinmodule.h> #include <kprocess.h> diff --git a/kalarm/prefdlg.cpp b/kalarm/prefdlg.cpp index 40b716756..2525139f7 100644 --- a/kalarm/prefdlg.cpp +++ b/kalarm/prefdlg.cpp @@ -33,11 +33,11 @@ #include <tqtooltip.h> #include <tqstyle.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kshell.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kiconloader.h> diff --git a/kalarm/preferences.cpp b/kalarm/preferences.cpp index c0d9ff6cc..8bf67957e 100644 --- a/kalarm/preferences.cpp +++ b/kalarm/preferences.cpp @@ -20,12 +20,12 @@ #include "kalarm.h" -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kstandarddirs.h> #include <tdeapplication.h> -#include <kglobalsettings.h> -#include <kmessagebox.h> +#include <tdeglobalsettings.h> +#include <tdemessagebox.h> #include <libkpimidentities/identity.h> #include <libkpimidentities/identitymanager.h> diff --git a/kalarm/recurrenceedit.cpp b/kalarm/recurrenceedit.cpp index cfda8fc27..4a39022e4 100644 --- a/kalarm/recurrenceedit.cpp +++ b/kalarm/recurrenceedit.cpp @@ -34,12 +34,12 @@ #include <tqlineedit.h> #include <tqwhatsthis.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kcalendarsystem.h> #include <kiconloader.h> #include <kdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <libkcal/event.h> diff --git a/kalarm/reminder.cpp b/kalarm/reminder.cpp index 60c603368..dd4b41510 100644 --- a/kalarm/reminder.cpp +++ b/kalarm/reminder.cpp @@ -23,8 +23,8 @@ #include <tqlayout.h> #include <tqwhatsthis.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdialog.h> #include <kdebug.h> diff --git a/kalarm/repetition.cpp b/kalarm/repetition.cpp index 45de81cbf..4305cd651 100644 --- a/kalarm/repetition.cpp +++ b/kalarm/repetition.cpp @@ -25,7 +25,7 @@ #include <kdebug.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include "buttongroup.h" #include "radiobutton.h" diff --git a/kalarm/sounddlg.cpp b/kalarm/sounddlg.cpp index d93a3b680..a63c4df86 100644 --- a/kalarm/sounddlg.cpp +++ b/kalarm/sounddlg.cpp @@ -31,7 +31,7 @@ #include <tqwhatsthis.h> #include <tqtooltip.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kiconloader.h> #ifdef WITHOUT_ARTS @@ -43,7 +43,7 @@ #include <arts/kplayobjectfactory.h> #include <arts/kplayobject.h> #endif -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeio/netaccess.h> #include <kdebug.h> diff --git a/kalarm/soundpicker.cpp b/kalarm/soundpicker.cpp index 1ae3a6a81..947e9fb91 100644 --- a/kalarm/soundpicker.cpp +++ b/kalarm/soundpicker.cpp @@ -28,8 +28,8 @@ #include <tqhbox.h> #include <tqwhatsthis.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tdefiledialog.h> #include <kstandarddirs.h> #include <kiconloader.h> diff --git a/kalarm/specialactions.cpp b/kalarm/specialactions.cpp index 465fdf510..fd4b7a7d5 100644 --- a/kalarm/specialactions.cpp +++ b/kalarm/specialactions.cpp @@ -27,7 +27,7 @@ #include <klineedit.h> #include <tdeapplication.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "functions.h" diff --git a/kalarm/templatedlg.cpp b/kalarm/templatedlg.cpp index c555ce6a0..8ee2ca387 100644 --- a/kalarm/templatedlg.cpp +++ b/kalarm/templatedlg.cpp @@ -24,9 +24,9 @@ #include <tqpushbutton.h> #include <tqwhatsthis.h> -#include <klocale.h> +#include <tdelocale.h> #include <kguiitem.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeaccel.h> #include <kdebug.h> diff --git a/kalarm/templatelistview.cpp b/kalarm/templatelistview.cpp index ac2852a7f..64d174891 100644 --- a/kalarm/templatelistview.cpp +++ b/kalarm/templatelistview.cpp @@ -20,7 +20,7 @@ #include "kalarm.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "alarmcalendar.h" diff --git a/kalarm/templatepickdlg.cpp b/kalarm/templatepickdlg.cpp index 3df2d8dd7..b3bc44886 100644 --- a/kalarm/templatepickdlg.cpp +++ b/kalarm/templatepickdlg.cpp @@ -23,7 +23,7 @@ #include <tqlayout.h> #include <tqwhatsthis.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "functions.h" diff --git a/kalarm/timeselector.cpp b/kalarm/timeselector.cpp index 9ec5c9813..de7ef828d 100644 --- a/kalarm/timeselector.cpp +++ b/kalarm/timeselector.cpp @@ -25,7 +25,7 @@ #include <tqhbox.h> #include <tqwhatsthis.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <kdebug.h> diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp index 54a043080..7eb6d2a44 100644 --- a/kalarm/traywindow.cpp +++ b/kalarm/traywindow.cpp @@ -25,10 +25,10 @@ #include <tqtooltip.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <tdepopupmenu.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kstdaction.h> #include <kstdguiitem.h> diff --git a/kalarm/undo.cpp b/kalarm/undo.cpp index 5e9b98ee2..d1d3602f2 100644 --- a/kalarm/undo.cpp +++ b/kalarm/undo.cpp @@ -24,8 +24,8 @@ #include <tqstringlist.h> #include <tdeapplication.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> #include "alarmcalendar.h" diff --git a/kandy/src/atcommand.cpp b/kandy/src/atcommand.cpp index 2fcf5f24c..755e8e664 100644 --- a/kandy/src/atcommand.cpp +++ b/kandy/src/atcommand.cpp @@ -25,7 +25,7 @@ #include "atcommand.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> ATParameter::ATParameter() { diff --git a/kandy/src/cmdpropertiesdialog.cpp b/kandy/src/cmdpropertiesdialog.cpp index 3e72754f4..9d605fda7 100644 --- a/kandy/src/cmdpropertiesdialog.cpp +++ b/kandy/src/cmdpropertiesdialog.cpp @@ -27,7 +27,7 @@ #include <tqcheckbox.h> #include <kinputdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include "atcommand.h" diff --git a/kandy/src/commandscheduler.cpp b/kandy/src/commandscheduler.cpp index 076582140..cc18a666a 100644 --- a/kandy/src/commandscheduler.cpp +++ b/kandy/src/commandscheduler.cpp @@ -23,7 +23,7 @@ */ #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "modem.h" diff --git a/kandy/src/kandy.cpp b/kandy/src/kandy.cpp index 7877cd9f8..13bd4ff6b 100644 --- a/kandy/src/kandy.cpp +++ b/kandy/src/kandy.cpp @@ -28,10 +28,10 @@ #include <tqpainter.h> #include <tqpaintdevicemetrics.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <kkeydialog.h> #include <tdeaccel.h> #include <tdeio/netaccess.h> @@ -40,7 +40,7 @@ #include <kurl.h> #include <kurlrequesterdlg.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kedittoolbar.h> #include <tdestdaccel.h> diff --git a/kandy/src/kandyprefsdialog.cpp b/kandy/src/kandyprefsdialog.cpp index 9ff0bf665..15a4eb8df 100644 --- a/kandy/src/kandyprefsdialog.cpp +++ b/kandy/src/kandyprefsdialog.cpp @@ -39,11 +39,11 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdefontdialog.h> #include <kstandarddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kcolordialog.h> #include <kiconloader.h> #include <kiconeffect.h> diff --git a/kandy/src/kandyview.cpp b/kandy/src/kandyview.cpp index fbf5deaa2..52e9de0ab 100644 --- a/kandy/src/kandyview.cpp +++ b/kandy/src/kandyview.cpp @@ -39,10 +39,10 @@ #include <tqpushbutton.h> #include <kurl.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kinputdialog.h> #include <kdialog.h> diff --git a/kandy/src/main.cpp b/kandy/src/main.cpp index d7d8e7ad0..a22229d52 100644 --- a/kandy/src/main.cpp +++ b/kandy/src/main.cpp @@ -28,9 +28,9 @@ #include <dcopclient.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "modem.h" #include "kandy.h" diff --git a/kandy/src/mobilegui.cpp b/kandy/src/mobilegui.cpp index 0408e9c6d..5b391c389 100644 --- a/kandy/src/mobilegui.cpp +++ b/kandy/src/mobilegui.cpp @@ -36,12 +36,12 @@ #include <kdebug.h> #include <tdefiledialog.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <kstatusbar.h> -#include <kabc/stdaddressbook.h> +#include <tdeabc/stdaddressbook.h> #include "modem.h" #include "atcommand.h" diff --git a/kandy/src/mobilemain.cpp b/kandy/src/mobilemain.cpp index 788fdc9bd..33da5f56e 100644 --- a/kandy/src/mobilemain.cpp +++ b/kandy/src/mobilemain.cpp @@ -22,15 +22,15 @@ without including the source code for TQt in the source distribution. */ -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <kkeydialog.h> #include <tdeaccel.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kedittoolbar.h> #include <kurldrag.h> diff --git a/kandy/src/modem.cpp b/kandy/src/modem.cpp index f77a3365c..86c36d675 100644 --- a/kandy/src/modem.cpp +++ b/kandy/src/modem.cpp @@ -42,7 +42,7 @@ #include <tqglobal.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "modem.h" diff --git a/karm/csvexportdialog.cpp b/karm/csvexportdialog.cpp index 2bf6d9e26..0dc1911a0 100644 --- a/karm/csvexportdialog.cpp +++ b/karm/csvexportdialog.cpp @@ -20,9 +20,9 @@ */ #include <kdateedit.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <kurlrequester.h> #include <tqbuttongroup.h> diff --git a/karm/edittaskdialog.cpp b/karm/edittaskdialog.cpp index bc2234867..d0040f84c 100644 --- a/karm/edittaskdialog.cpp +++ b/karm/edittaskdialog.cpp @@ -33,7 +33,7 @@ #include <tqwidget.h> #include <tqwhatsthis.h> -#include <klocale.h> // i18n +#include <tdelocale.h> // i18n #include <twinmodule.h> #include "edittaskdialog.h" diff --git a/karm/idletimedetector.cpp b/karm/idletimedetector.cpp index 911d1b2fa..74aad7da8 100644 --- a/karm/idletimedetector.cpp +++ b/karm/idletimedetector.cpp @@ -4,8 +4,8 @@ #include <tqmessagebox.h> #include <tqtimer.h> -#include <kglobal.h> -#include <klocale.h> // i18n +#include <tdeglobal.h> +#include <tdelocale.h> // i18n IdleTimeDetector::IdleTimeDetector(int maxIdle) // Trigger a warning after maxIdle minutes diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp index 8d968ed7c..b46202bfd 100644 --- a/karm/karm_part.cpp +++ b/karm/karm_part.cpp @@ -12,8 +12,8 @@ #include <tdeaction.h> #include <kstdaction.h> #include <tdefiledialog.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tqfile.h> #include <tqtextstream.h> @@ -369,7 +369,7 @@ void karmPart::fileSaveAs() // It's usually safe to leave the factory code alone.. with the // notable exception of the TDEAboutData data #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> TDEInstance* karmPartFactory::s_instance = 0L; TDEAboutData* karmPartFactory::s_about = 0L; diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp index 2f90e8f31..b9e68e651 100644 --- a/karm/karmstorage.cpp +++ b/karm/karmstorage.cpp @@ -37,11 +37,11 @@ #include "incidence.h" #include "tdeapplication.h" // kapp #include <kdebug.h> -#include <kemailsettings.h> -#include <klocale.h> // i18n -#include <kmessagebox.h> +#include <tdeemailsettings.h> +#include <tdelocale.h> // i18n +#include <tdemessagebox.h> #include <kprogress.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <resourcecalendar.h> #include <resourcelocal.h> #include <resourceremote.h> diff --git a/karm/karmutility.cpp b/karm/karmutility.cpp index 39b1865a8..994e3f8c0 100644 --- a/karm/karmutility.cpp +++ b/karm/karmutility.cpp @@ -3,8 +3,8 @@ #include <stdlib.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include "karmutility.h" TQString formatTime( long minutes, bool decimal ) diff --git a/karm/ktimewidget.cpp b/karm/ktimewidget.cpp index 112812b24..fb18e8bee 100644 --- a/karm/ktimewidget.cpp +++ b/karm/ktimewidget.cpp @@ -7,8 +7,8 @@ #include <tqvalidator.h> #include <tqwidget.h> -#include <klocale.h> // i18n -#include <kglobal.h> +#include <tdelocale.h> // i18n +#include <tdeglobal.h> #include "ktimewidget.h" enum ValidatorType { HOUR, MINUTE }; diff --git a/karm/main.cpp b/karm/main.cpp index 96f599442..ef4326dc0 100644 --- a/karm/main.cpp +++ b/karm/main.cpp @@ -1,6 +1,6 @@ #include <signal.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> #include <kdebug.h> diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp index 231cfeda1..9e530078d 100644 --- a/karm/mainwindow.cpp +++ b/karm/mainwindow.cpp @@ -12,10 +12,10 @@ #include <tdeapplication.h> // kapp #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kkeydialog.h> -#include <klocale.h> // i18n -#include <kmessagebox.h> +#include <tdelocale.h> // i18n +#include <tdemessagebox.h> #include <kstatusbar.h> // statusBar() #include <kstdaction.h> #include <tqkeycode.h> diff --git a/karm/plannerparser.h b/karm/plannerparser.h index cba672119..ee40a810a 100644 --- a/karm/plannerparser.h +++ b/karm/plannerparser.h @@ -28,7 +28,7 @@ test cases: */ #include <tqxml.h> -#include <klocale.h> +#include <tdelocale.h> #include "taskview.h" #include "task.h" #include "karmstorage.h" diff --git a/karm/preferences.cpp b/karm/preferences.cpp index d331188a7..1307bfefc 100644 --- a/karm/preferences.cpp +++ b/karm/preferences.cpp @@ -8,10 +8,10 @@ #include <tdeapplication.h> // kapp #include <tdeconfig.h> #include <kdebug.h> -#include <kemailsettings.h> +#include <tdeemailsettings.h> #include <kiconloader.h> #include <klineedit.h> // lineEdit() -#include <klocale.h> // i18n +#include <tdelocale.h> // i18n #include <kstandarddirs.h> #include <kurlrequester.h> diff --git a/karm/print.cpp b/karm/print.cpp index c540663be..08921d329 100644 --- a/karm/print.cpp +++ b/karm/print.cpp @@ -4,8 +4,8 @@ #include <tqpaintdevicemetrics.h> #include <tqpainter.h> -#include <kglobal.h> -#include <klocale.h> // i18n +#include <tdeglobal.h> +#include <tdelocale.h> // i18n #include "karmutility.h" // formatTime() #include "print.h" diff --git a/karm/printdialog.cpp b/karm/printdialog.cpp index e4dfe30eb..9b4e3b788 100644 --- a/karm/printdialog.cpp +++ b/karm/printdialog.cpp @@ -33,7 +33,7 @@ #include <tqwhatsthis.h> #include <kiconloader.h> -#include <klocale.h> // i18n +#include <tdelocale.h> // i18n #include <twinmodule.h> #include "printdialog.h" diff --git a/karm/taskview.cpp b/karm/taskview.cpp index 544593515..796e46d25 100644 --- a/karm/taskview.cpp +++ b/karm/taskview.cpp @@ -14,8 +14,8 @@ #include <tdeconfig.h> #include <kdebug.h> #include <tdefiledialog.h> -#include <klocale.h> // i18n -#include <kmessagebox.h> +#include <tdelocale.h> // i18n +#include <tdemessagebox.h> #include <kurlrequester.h> #include "csvexportdialog.h" @@ -402,7 +402,7 @@ void TaskView::startTimerFor(Task* task, TQDateTime startTime ) } } } - else KMessageBox::error(0,i18n("Saving is impossible, so timing is useless. \nSaving problems may result from a full harddisk, a directory name instead of a file name, or stale locks. Check that your harddisk has enough space, that your calendar file exists and is a file and remove stale locks, typically from ~/.trinity/share/apps/kabc/lock.")); + else KMessageBox::error(0,i18n("Saving is impossible, so timing is useless. \nSaving problems may result from a full harddisk, a directory name instead of a file name, or stale locks. Check that your harddisk has enough space, that your calendar file exists and is a file and remove stale locks, typically from ~/.trinity/share/apps/tdeabc/lock.")); } void TaskView::clearActiveTasks() @@ -518,7 +518,7 @@ void TaskView::newTask(TQString caption, Task *parent) if ( uid.isNull() ) { KMessageBox::error( 0, i18n( - "Error storing new task. Your changes were not saved. Make sure you can edit your iCalendar file. Also quit all applications using this file and remove any lock file related to its name from ~/.trinity/share/apps/kabc/lock/ " ) ); + "Error storing new task. Your changes were not saved. Make sure you can edit your iCalendar file. Also quit all applications using this file and remove any lock file related to its name from ~/.trinity/share/apps/tdeabc/lock/ " ) ); } delete dialog; diff --git a/karm/taskviewwhatsthis.cpp b/karm/taskviewwhatsthis.cpp index 1598a8519..d81b4e0d9 100644 --- a/karm/taskviewwhatsthis.cpp +++ b/karm/taskviewwhatsthis.cpp @@ -12,7 +12,7 @@ #include "taskviewwhatsthis.h" #include <kdebug.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> TaskViewWhatsThis::TaskViewWhatsThis( TQWidget* qw ) : TQWhatsThis( qw ) diff --git a/karm/timekard.cpp b/karm/timekard.cpp index 1be72b961..d0932b928 100644 --- a/karm/timekard.cpp +++ b/karm/timekard.cpp @@ -27,9 +27,9 @@ #include <tqpainter.h> #include <tqmap.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> -#include <klocale.h> // i18n +#include <tdelocale.h> // i18n #include <event.h> #include "karmutility.h" // formatTime() diff --git a/karm/tray.cpp b/karm/tray.cpp index 06d08af26..5187c7e49 100644 --- a/karm/tray.cpp +++ b/karm/tray.cpp @@ -17,10 +17,10 @@ #include <tqtooltip.h> #include <tdeaction.h> // actionPreferences() -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> // UserIcon -#include <klocale.h> // i18n +#include <tdelocale.h> // i18n #include <tdepopupmenu.h> // plug() #include <ksystemtray.h> diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp index 0abac719b..e747beec9 100644 --- a/kdgantt/KDGanttViewSubwidgets.cpp +++ b/kdgantt/KDGanttViewSubwidgets.cpp @@ -53,8 +53,8 @@ #include <tqptrlist.h> #include <tqpen.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kcalendarsystem.h> #include <kdebug.h> diff --git a/kgantt/kgantt/xQGanttBarViewPort.cpp b/kgantt/kgantt/xQGanttBarViewPort.cpp index 1a3c8a7da..2c3a348ef 100644 --- a/kgantt/kgantt/xQGanttBarViewPort.cpp +++ b/kgantt/kgantt/xQGanttBarViewPort.cpp @@ -17,7 +17,7 @@ #include <tdetoolbarbutton.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> diff --git a/kgantt/kgantt/xQGanttListView.cpp b/kgantt/kgantt/xQGanttListView.cpp index 3f5f44c28..fd5ebae74 100644 --- a/kgantt/kgantt/xQGanttListView.cpp +++ b/kgantt/kgantt/xQGanttListView.cpp @@ -8,7 +8,7 @@ #include "xQGanttListView.h" #include <tqcolor.h> -#include <klocale.h> +#include <tdelocale.h> xQGanttListView::xQGanttListView(KGanttItem* toplevelitem, TQWidget* parent, const char * name, WFlags f) diff --git a/kitchensync/src/aboutpage.cpp b/kitchensync/src/aboutpage.cpp index 726ffb148..f7dab2ac5 100644 --- a/kitchensync/src/aboutpage.cpp +++ b/kitchensync/src/aboutpage.cpp @@ -27,7 +27,7 @@ #include <tdehtml_part.h> #include <tdehtmlview.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <krun.h> #include <kstandarddirs.h> diff --git a/kitchensync/src/addresseediffalgo.cpp b/kitchensync/src/addresseediffalgo.cpp index 2ecbe02c7..f91873bb6 100644 --- a/kitchensync/src/addresseediffalgo.cpp +++ b/kitchensync/src/addresseediffalgo.cpp @@ -19,7 +19,7 @@ Boston, MA 02110-1301, USA. */ -#include <kabc/vcardconverter.h> +#include <tdeabc/vcardconverter.h> #include "addresseediffalgo.h" diff --git a/kitchensync/src/addresseediffalgo.h b/kitchensync/src/addresseediffalgo.h index 575a96e29..30154d1b0 100644 --- a/kitchensync/src/addresseediffalgo.h +++ b/kitchensync/src/addresseediffalgo.h @@ -22,7 +22,7 @@ #ifndef KSYNC_ADDRESSEEDIFFALGO_H #define KSYNC_ADDRESSEEDIFFALGO_H -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <libtdepim/diffalgo.h> using namespace KPIM; diff --git a/kitchensync/src/calendardiffalgo.cpp b/kitchensync/src/calendardiffalgo.cpp index 7d3549e5f..8d925322b 100644 --- a/kitchensync/src/calendardiffalgo.cpp +++ b/kitchensync/src/calendardiffalgo.cpp @@ -19,7 +19,7 @@ Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <libkcal/kcalversion.h> diff --git a/kitchensync/src/configgui.cpp b/kitchensync/src/configgui.cpp index 553b2f5e5..6a41032eb 100644 --- a/kitchensync/src/configgui.cpp +++ b/kitchensync/src/configgui.cpp @@ -42,7 +42,7 @@ #include "memberinfo.h" #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <tqlayout.h> diff --git a/kitchensync/src/configguiblank.cpp b/kitchensync/src/configguiblank.cpp index 3e9d47b65..b16c1f839 100644 --- a/kitchensync/src/configguiblank.cpp +++ b/kitchensync/src/configguiblank.cpp @@ -21,7 +21,7 @@ #include "configguiblank.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqlabel.h> #include <tqlayout.h> diff --git a/kitchensync/src/configguievo2.cpp b/kitchensync/src/configguievo2.cpp index 4d5c2edc9..fb7116cbc 100644 --- a/kitchensync/src/configguievo2.cpp +++ b/kitchensync/src/configguievo2.cpp @@ -30,7 +30,7 @@ #include <kurl.h> #include <tdefile.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> ConfigGuiEvo2::ConfigGuiEvo2( const QSync::Member &member, TQWidget *parent ) : ConfigGui( member, parent ) diff --git a/kitchensync/src/configguifile.cpp b/kitchensync/src/configguifile.cpp index 6a8b0402c..22767ab83 100644 --- a/kitchensync/src/configguifile.cpp +++ b/kitchensync/src/configguifile.cpp @@ -22,7 +22,7 @@ #include "configguifile.h" #include <kurlrequester.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <tqlayout.h> diff --git a/kitchensync/src/configguigcalendar.cpp b/kitchensync/src/configguigcalendar.cpp index 8e8006764..8fb4fd0e5 100644 --- a/kitchensync/src/configguigcalendar.cpp +++ b/kitchensync/src/configguigcalendar.cpp @@ -22,7 +22,7 @@ #include "configguigcalendar.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqlabel.h> diff --git a/kitchensync/src/configguignokii.cpp b/kitchensync/src/configguignokii.cpp index 38f2fbf3a..cd392cb67 100644 --- a/kitchensync/src/configguignokii.cpp +++ b/kitchensync/src/configguignokii.cpp @@ -21,7 +21,7 @@ #include "configguignokii.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <kcombobox.h> diff --git a/kitchensync/src/configguigpe.cpp b/kitchensync/src/configguigpe.cpp index 1a5cdb141..4dce7d9b1 100644 --- a/kitchensync/src/configguigpe.cpp +++ b/kitchensync/src/configguigpe.cpp @@ -30,7 +30,7 @@ #include <kcombobox.h> #include <kdialog.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> ConfigGuiGpe::ConfigGuiGpe( const QSync::Member &member, TQWidget *parent ) : ConfigGui( member, parent ) diff --git a/kitchensync/src/configguiirmc.cpp b/kitchensync/src/configguiirmc.cpp index 721c82d70..331f9daab 100644 --- a/kitchensync/src/configguiirmc.cpp +++ b/kitchensync/src/configguiirmc.cpp @@ -21,12 +21,12 @@ #include <kcombobox.h> #include <kdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kinputdialog.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> diff --git a/kitchensync/src/configguijescs.cpp b/kitchensync/src/configguijescs.cpp index 2b37ad424..c4167bb3a 100644 --- a/kitchensync/src/configguijescs.cpp +++ b/kitchensync/src/configguijescs.cpp @@ -28,7 +28,7 @@ #include <klineedit.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> ConfigGuiJescs::ConfigGuiJescs( const QSync::Member &member, TQWidget *parent ) : ConfigGui( member, parent ) diff --git a/kitchensync/src/configguildap.cpp b/kitchensync/src/configguildap.cpp index 3ef451c36..f54bb8cf9 100644 --- a/kitchensync/src/configguildap.cpp +++ b/kitchensync/src/configguildap.cpp @@ -30,7 +30,7 @@ #include <kcombobox.h> #include <kdialog.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> ConfigGuiLdap::ConfigGuiLdap( const QSync::Member &member, TQWidget *parent ) : ConfigGui( member, parent ) diff --git a/kitchensync/src/configguildap.h b/kitchensync/src/configguildap.h index eea22f023..a5a76b784 100644 --- a/kitchensync/src/configguildap.h +++ b/kitchensync/src/configguildap.h @@ -23,7 +23,7 @@ #define CONFIGGUILDAP_H #include "configgui.h" -#include "kabc/ldapconfigwidget.h" +#include "tdeabc/ldapconfigwidget.h" class TQCheckBox; class TQLabel; diff --git a/kitchensync/src/configguimoto.cpp b/kitchensync/src/configguimoto.cpp index a310692f0..bcb9bd59c 100644 --- a/kitchensync/src/configguimoto.cpp +++ b/kitchensync/src/configguimoto.cpp @@ -27,7 +27,7 @@ #include <klineedit.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> ConfigGuiMoto::ConfigGuiMoto( const QSync::Member &member, TQWidget *parent ) : ConfigGui( member, parent ) diff --git a/kitchensync/src/configguiopie.cpp b/kitchensync/src/configguiopie.cpp index 39a7ea772..33bf9e08c 100644 --- a/kitchensync/src/configguiopie.cpp +++ b/kitchensync/src/configguiopie.cpp @@ -21,7 +21,7 @@ #include "configguiopie.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqcombobox.h> #include <tqdom.h> diff --git a/kitchensync/src/configguipalm.cpp b/kitchensync/src/configguipalm.cpp index 03d87cdb4..ee85ba294 100644 --- a/kitchensync/src/configguipalm.cpp +++ b/kitchensync/src/configguipalm.cpp @@ -22,7 +22,7 @@ #include <kcombobox.h> #include <kdialog.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqbuttongroup.h> #include <tqcheckbox.h> diff --git a/kitchensync/src/configguisunbird.cpp b/kitchensync/src/configguisunbird.cpp index 6a3b9aa6a..7623e4132 100644 --- a/kitchensync/src/configguisunbird.cpp +++ b/kitchensync/src/configguisunbird.cpp @@ -37,7 +37,7 @@ #include <klineedit.h> #include <kpushbutton.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefile.h> ConfigGuiSunbird::ConfigGuiSunbird( const QSync::Member &member, TQWidget *parent ) diff --git a/kitchensync/src/configguisynce.cpp b/kitchensync/src/configguisynce.cpp index 6e521beeb..8a09c385a 100644 --- a/kitchensync/src/configguisynce.cpp +++ b/kitchensync/src/configguisynce.cpp @@ -28,7 +28,7 @@ #include <klineedit.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> ConfigGuiSynce::ConfigGuiSynce( const QSync::Member &member, TQWidget *parent ) : ConfigGui( member, parent ) diff --git a/kitchensync/src/configguisyncmlhttp.cpp b/kitchensync/src/configguisyncmlhttp.cpp index 26a8c2241..6f91d2fad 100644 --- a/kitchensync/src/configguisyncmlhttp.cpp +++ b/kitchensync/src/configguisyncmlhttp.cpp @@ -24,7 +24,7 @@ #include <kcombobox.h> #include <kdialog.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurlrequester.h> #include <tqcheckbox.h> diff --git a/kitchensync/src/configguisyncmlobex.cpp b/kitchensync/src/configguisyncmlobex.cpp index 372cf9261..4074787ae 100644 --- a/kitchensync/src/configguisyncmlobex.cpp +++ b/kitchensync/src/configguisyncmlobex.cpp @@ -25,7 +25,7 @@ #include <kcombobox.h> #include <kdialog.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurlrequester.h> #include <tqlayout.h> diff --git a/kitchensync/src/connectionwidgets.cpp b/kitchensync/src/connectionwidgets.cpp index ac5277fb7..37844be3d 100644 --- a/kitchensync/src/connectionwidgets.cpp +++ b/kitchensync/src/connectionwidgets.cpp @@ -21,12 +21,12 @@ #include <kcombobox.h> #include <kdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kinputdialog.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tqapplication.h> #include <tqeventloop.h> diff --git a/kitchensync/src/genericdiffalgo.cpp b/kitchensync/src/genericdiffalgo.cpp index 21b83f454..5255c0968 100644 --- a/kitchensync/src/genericdiffalgo.cpp +++ b/kitchensync/src/genericdiffalgo.cpp @@ -21,7 +21,7 @@ #include <tqstringlist.h> -#include <klocale.h> +#include <tdelocale.h> #include "genericdiffalgo.h" diff --git a/kitchensync/src/groupconfig.cpp b/kitchensync/src/groupconfig.cpp index 3be369642..9f961ddc1 100644 --- a/kitchensync/src/groupconfig.cpp +++ b/kitchensync/src/groupconfig.cpp @@ -33,8 +33,8 @@ #include <kdialog.h> #include <kiconloader.h> #include <kjanuswidget.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tqlabel.h> diff --git a/kitchensync/src/groupconfigcommon.cpp b/kitchensync/src/groupconfigcommon.cpp index b418af564..a3f898449 100644 --- a/kitchensync/src/groupconfigcommon.cpp +++ b/kitchensync/src/groupconfigcommon.cpp @@ -22,7 +22,7 @@ #include <kdialog.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqlabel.h> diff --git a/kitchensync/src/groupconfigdialog.cpp b/kitchensync/src/groupconfigdialog.cpp index 4d8be65d0..522e54b17 100644 --- a/kitchensync/src/groupconfigdialog.cpp +++ b/kitchensync/src/groupconfigdialog.cpp @@ -22,7 +22,7 @@ #include "groupconfig.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> diff --git a/kitchensync/src/groupitem.cpp b/kitchensync/src/groupitem.cpp index 09f6e345e..d87ac37ee 100644 --- a/kitchensync/src/groupitem.cpp +++ b/kitchensync/src/groupitem.cpp @@ -20,10 +20,10 @@ #include <tdeapplication.h> #include <kdialog.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpassivepopup.h> #include <kurllabel.h> diff --git a/kitchensync/src/htmldiffalgodisplay.cpp b/kitchensync/src/htmldiffalgodisplay.cpp index e6f23afda..d91b75909 100644 --- a/kitchensync/src/htmldiffalgodisplay.cpp +++ b/kitchensync/src/htmldiffalgodisplay.cpp @@ -19,7 +19,7 @@ Boston, MA 02110-1301, USA. */ -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include "htmldiffalgodisplay.h" diff --git a/kitchensync/src/kwidgetlist.cpp b/kitchensync/src/kwidgetlist.cpp index 0990e479f..f26f8d68e 100644 --- a/kitchensync/src/kwidgetlist.cpp +++ b/kitchensync/src/kwidgetlist.cpp @@ -21,7 +21,7 @@ #include <tqvbox.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include "kwidgetlist.h" diff --git a/kitchensync/src/mainwidget.cpp b/kitchensync/src/mainwidget.cpp index 2b71f9070..7a665608a 100644 --- a/kitchensync/src/mainwidget.cpp +++ b/kitchensync/src/mainwidget.cpp @@ -33,8 +33,8 @@ #include <kdebug.h> #include <kinputdialog.h> #include <tdelistview.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstdaction.h> #include <kxmlguiclient.h> diff --git a/kitchensync/src/mainwindow.cpp b/kitchensync/src/mainwindow.cpp index 5df9fe219..a267956d8 100644 --- a/kitchensync/src/mainwindow.cpp +++ b/kitchensync/src/mainwindow.cpp @@ -19,7 +19,7 @@ */ #include <tdeaction.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstdaction.h> #include <tdetoolbar.h> diff --git a/kitchensync/src/memberconfig.cpp b/kitchensync/src/memberconfig.cpp index 37755a504..93e5f1ff4 100644 --- a/kitchensync/src/memberconfig.cpp +++ b/kitchensync/src/memberconfig.cpp @@ -23,8 +23,8 @@ #include "configgui.h" #include "memberinfo.h" -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tqlabel.h> #include <tqlayout.h> diff --git a/kitchensync/src/memberinfo.cpp b/kitchensync/src/memberinfo.cpp index 39bb0098a..87a17ec10 100644 --- a/kitchensync/src/memberinfo.cpp +++ b/kitchensync/src/memberinfo.cpp @@ -21,9 +21,9 @@ #include "memberinfo.h" -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> MemberInfo::MemberInfo( const QSync::Member &member ) : mMember( member ) diff --git a/kitchensync/src/multiconflictdialog.cpp b/kitchensync/src/multiconflictdialog.cpp index 7d7805c42..608d33a85 100644 --- a/kitchensync/src/multiconflictdialog.cpp +++ b/kitchensync/src/multiconflictdialog.cpp @@ -19,7 +19,7 @@ */ #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kwidgetlist.h> #include <tqlabel.h> diff --git a/kitchensync/src/part.cpp b/kitchensync/src/part.cpp index 027b3bcf2..c52b28aef 100644 --- a/kitchensync/src/part.cpp +++ b/kitchensync/src/part.cpp @@ -26,7 +26,7 @@ #include <kdebug.h> #include <kiconloader.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeparts/genericfactory.h> #include "mainwidget.h" diff --git a/kitchensync/src/pluginpicker.cpp b/kitchensync/src/pluginpicker.cpp index a88689d3c..0b8692489 100644 --- a/kitchensync/src/pluginpicker.cpp +++ b/kitchensync/src/pluginpicker.cpp @@ -27,9 +27,9 @@ #include <libqopensync/environment.h> #include <kdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlabel.h> #include <tqlayout.h> diff --git a/kitchensync/src/singleconflictdialog.cpp b/kitchensync/src/singleconflictdialog.cpp index 8975b6f98..bac948351 100644 --- a/kitchensync/src/singleconflictdialog.cpp +++ b/kitchensync/src/singleconflictdialog.cpp @@ -19,7 +19,7 @@ */ #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlabel.h> #include <tqlayout.h> diff --git a/kitchensync/src/syncprocess.cpp b/kitchensync/src/syncprocess.cpp index 60310b803..4e9c46b60 100644 --- a/kitchensync/src/syncprocess.cpp +++ b/kitchensync/src/syncprocess.cpp @@ -22,7 +22,7 @@ #include <libqopensync/environment.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "syncprocess.h" #include "syncprocessmanager.h" diff --git a/kitchensync/src/syncprocessmanager.cpp b/kitchensync/src/syncprocessmanager.cpp index 95c497482..0485e156f 100644 --- a/kitchensync/src/syncprocessmanager.cpp +++ b/kitchensync/src/syncprocessmanager.cpp @@ -26,8 +26,8 @@ #include <libqopensync/environment.h> #include <kstaticdeleter.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> static KStaticDeleter<SyncProcessManager> selfDeleter; diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp index 3cac88d46..206cbfee7 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 b65de83ab..6b9f38fe9 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 664b95e3d..92e6a2321 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 8b450f44b..5552b0588 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 49c9b1c3d..435752c64 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 132a8dba1..bf78e68cd 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 7b1fd5175..da3623461 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 9b6da633a..b6e0e938b 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 ca5fe114b..9e25743e9 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 fd89f4584..a2ace4856 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 3d86ec57a..30cf0b284 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 434ddac18..e740e7491 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 37819739d..83c13a31d 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 439393d36..6ba969de1 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 21f475d63..165d94685 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 bbbd0aec7..129ff7567 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 516634ba6..010fdd9be 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 da78a64dd..a7f25c3b4 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 01a60d88c..fe378d733 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 2fcc323e2..a3749947b 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 b6b0f6d7f..f1c3274fb 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 9764e2401..45c056eea 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 25fb7d5c8..eaaefd796 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 27d2f0c7a..2f86cdad6 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 103d961e9..d11fb6a91 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 169af7aa1..1c4e79cf8 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 7be5c26a0..f6d1a358a 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 0c2554dc0..76c12744f 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 806fba35f..e3d2d05ca 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 dba0135be..93795a52c 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 a762a7dbb..5f04982d4 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 9a26dfcdd..fecda8de5 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 0e4e3c141..90b4ffdd2 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 c5c9c0597..c13b9d1fe 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 28a73cc9d..e1568b118 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 52a110837..c50663ed7 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 0da3448ca..08a6e4a4a 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 3a7de1981..58f9d9749 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 a9f8dc6dc..55459dd2a 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 ad5007914..825e0cef9 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 70a5f0caa..d6b553324 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 93ba3a16a..e42407e6c 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 f3e69d2b2..52b398e86 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 44df37c61..35f1fc42f 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 84715a6fe..0772ccfba 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 1a7c9222e..26cd9c0b2 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 a8830c41e..c0489b7fe 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 b747be68e..8f10be350 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 9faa35e59..c2cd83533 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 5e8bf9c3c..25c0a1173 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 6031254a4..d7e96b26a 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 ec576bda5..7e43749f0 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 15889f126..afe854dea 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 493fa6c54..80cd3fd95 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 1a98963e2..d681c6a65 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 1fce0df5e..d97e5fa7d 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 2185ccf89..f81a7071b 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 ac2915e7a..e91a44a6a 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 6083ea9e7..45738939c 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 25abffe86..dcfcbe7f1 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 4bbfa8e66..265b1ee9c 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 980d0b14b..6d673c4b0 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 39839e324..7bb77f0da 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 669bd6e1b..5242060aa 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 1579db0ca..6692f54ca 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 2513258c2..d270e710a 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 038ddbe1a..e2a72cb26 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 0b13f07b8..bf6846613 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 1c6b6b6a1..11e7584f4 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 a768513f4..77af8e447 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 e748c5507..056eaa4ae 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 cc6de4653..7d26495a9 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 6675149c7..97f7922f7 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 1a3a6cb9e..67965db5b 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 201416b25..ba8fba5af 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 29d4b8f7a..05307c960 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 eaac2ebfc..abf1ade72 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 e07c77081..3689e6639 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 fdf965ae5..3c342172e 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 9d8db6c9f..fc93be5e4 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 1ab6381e4..90bc22a72 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 d532602ea..9b521c1f1 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 ceafc27e4..88f3609b3 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 64c56cb15..9a8ae5be7 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 6b4848f00..446c739e5 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 9cf1b905a..c1eb6ccb4 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 f4e1d4328..7cb2fb432 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 2432031b8..e14bd7728 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 d8ee1e102..75e4dee5e 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 3b6f55dc8..c2d4e5551 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 1bb2b1448..0bfb2cc15 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 628ae97ad..bb3e0a8a2 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 269c5870c..560fac90e 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 0b8c3cad6..0d8c4369c 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 574c0838f..2a82da9e4 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 93693dd7d..5e4f5b5e9 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 21d39cd6b..0643cbbc2 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 295b76010..2b736d2c7 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 576a1c179..9405544b0 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 ceea3a527..b455cc54d 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 1749fe0ea..4eb7ea0e3 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 c16fdf011..7497a460d 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 d5c5b3a19..50ea58a21 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 2e851272e..0b43795e8 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 96401e17a..38d36a980 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 c6585a5a9..f29b79474 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 3502cb170..1b14fb4f3 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 7b1b80e34..15c2778fa 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 fd5c811fa..fac482ee5 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 f7af79c2a..b0b1d9def 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 61ebc7a60..ff3e156d9 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 bc5d2cca0..cd3ebdfc9 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 3451fb483..81131956f 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 cf58f98ce..b0602428f 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 f6af12728..60bf689e7 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 2111664eb..cbc3c4eba 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 c5ccdd9e6..c08d21e22 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 992ce2c48..cf4572b23 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 2ff9f56a9..f94be9549 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 93e831fab..9a90ca5ac 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 2bfabd933..b89fd2a12 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 c7e80e8f2..24db928c2 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 1a72cb27a..78102b2bb 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 aa4aac288..3a4969217 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 a027c33bc..3066b559c 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 da5648c7d..192298954 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 0e34f72cc..41d6705c9 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 3ed8b2130..a5460f992 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 e35b2e0ec..e27b192ec 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> diff --git a/kmailcvt/filter_evolution.cxx b/kmailcvt/filter_evolution.cxx index 017385d4f..b4443d143 100644 --- a/kmailcvt/filter_evolution.cxx +++ b/kmailcvt/filter_evolution.cxx @@ -21,9 +21,9 @@ #include "filter_evolution.hxx" #include <config.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> -#include <ktempfile.h> +#include <tdetempfile.h> /** Default constructor. */ diff --git a/kmailcvt/filter_evolution_v2.cxx b/kmailcvt/filter_evolution_v2.cxx index 34192f6a5..b6ee8a577 100644 --- a/kmailcvt/filter_evolution_v2.cxx +++ b/kmailcvt/filter_evolution_v2.cxx @@ -19,9 +19,9 @@ #include "filter_evolution_v2.hxx" #include <config.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> -#include <ktempfile.h> +#include <tdetempfile.h> /** Default constructor. */ diff --git a/kmailcvt/filter_kmail_archive.cxx b/kmailcvt/filter_kmail_archive.cxx index 2fca99bdc..3c7c20d00 100644 --- a/kmailcvt/filter_kmail_archive.cxx +++ b/kmailcvt/filter_kmail_archive.cxx @@ -18,7 +18,7 @@ */ #include "filter_kmail_archive.hxx" -#include <klocale.h> +#include <tdelocale.h> FilterKMailArchive::FilterKMailArchive() : Filter( i18n( "Import KMail Archive File" ), diff --git a/kmailcvt/filter_kmail_maildir.cxx b/kmailcvt/filter_kmail_maildir.cxx index 9305e6448..9d642814d 100644 --- a/kmailcvt/filter_kmail_maildir.cxx +++ b/kmailcvt/filter_kmail_maildir.cxx @@ -18,7 +18,7 @@ #include "filter_kmail_maildir.hxx" #include <config.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> /** Default constructor. */ diff --git a/kmailcvt/filter_lnotes.cxx b/kmailcvt/filter_lnotes.cxx index 8d987d0db..af92e1b41 100644 --- a/kmailcvt/filter_lnotes.cxx +++ b/kmailcvt/filter_lnotes.cxx @@ -17,9 +17,9 @@ #include <config.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <tqfileinfo.h> diff --git a/kmailcvt/filter_mailapp.cxx b/kmailcvt/filter_mailapp.cxx index 51df32359..fded411da 100644 --- a/kmailcvt/filter_mailapp.cxx +++ b/kmailcvt/filter_mailapp.cxx @@ -21,9 +21,9 @@ #include <config.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include "filter_mailapp.hxx" diff --git a/kmailcvt/filter_mbox.cxx b/kmailcvt/filter_mbox.cxx index 78bfec072..19afccf22 100644 --- a/kmailcvt/filter_mbox.cxx +++ b/kmailcvt/filter_mbox.cxx @@ -16,9 +16,9 @@ ***************************************************************************/ #include <config.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include "filter_mbox.hxx" diff --git a/kmailcvt/filter_oe.cxx b/kmailcvt/filter_oe.cxx index 22c7a615a..afd96527b 100644 --- a/kmailcvt/filter_oe.cxx +++ b/kmailcvt/filter_oe.cxx @@ -20,9 +20,9 @@ // This filter was created by looking at libdbx & liboe #include <config.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include "filter_oe.hxx" diff --git a/kmailcvt/filter_opera.cxx b/kmailcvt/filter_opera.cxx index 784c0b101..90aef3820 100644 --- a/kmailcvt/filter_opera.cxx +++ b/kmailcvt/filter_opera.cxx @@ -16,9 +16,9 @@ ***************************************************************************/ #include <config.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include "filter_opera.hxx" diff --git a/kmailcvt/filter_outlook.cxx b/kmailcvt/filter_outlook.cxx index 63d2848b1..10483d090 100644 --- a/kmailcvt/filter_outlook.cxx +++ b/kmailcvt/filter_outlook.cxx @@ -17,9 +17,9 @@ #include <config.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include "filter_outlook.hxx" diff --git a/kmailcvt/filter_plain.cxx b/kmailcvt/filter_plain.cxx index b29d13389..9f78b939c 100644 --- a/kmailcvt/filter_plain.cxx +++ b/kmailcvt/filter_plain.cxx @@ -16,7 +16,7 @@ ***************************************************************************/ #include <config.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> #include <libgen.h> diff --git a/kmailcvt/filter_pmail.cxx b/kmailcvt/filter_pmail.cxx index d79c8f4b7..e48e062de 100644 --- a/kmailcvt/filter_pmail.cxx +++ b/kmailcvt/filter_pmail.cxx @@ -18,10 +18,10 @@ ***************************************************************************/ #include <config.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> #include <tqregexp.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include "filter_pmail.hxx" diff --git a/kmailcvt/filter_sylpheed.cxx b/kmailcvt/filter_sylpheed.cxx index af03a0990..1fc008d42 100644 --- a/kmailcvt/filter_sylpheed.cxx +++ b/kmailcvt/filter_sylpheed.cxx @@ -18,7 +18,7 @@ #include "filter_sylpheed.hxx" #include <config.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> #include <kdebug.h> diff --git a/kmailcvt/filter_thebat.cxx b/kmailcvt/filter_thebat.cxx index 499caedba..eaf16461a 100644 --- a/kmailcvt/filter_thebat.cxx +++ b/kmailcvt/filter_thebat.cxx @@ -22,11 +22,11 @@ #include <tqregexp.h> #include <tqvaluelist.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> -#include <ktempfile.h> +#include <tdetempfile.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> /** Default constructor. */ FilterTheBat::FilterTheBat( void ) : diff --git a/kmailcvt/filter_thunderbird.cxx b/kmailcvt/filter_thunderbird.cxx index d92e7efdf..50f6355f3 100644 --- a/kmailcvt/filter_thunderbird.cxx +++ b/kmailcvt/filter_thunderbird.cxx @@ -18,9 +18,9 @@ #include "filter_thunderbird.hxx" #include <config.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> -#include <ktempfile.h> +#include <tdetempfile.h> /** Default constructor. */ diff --git a/kmailcvt/filters.cxx b/kmailcvt/filters.cxx index 78728d2c3..d7af77059 100644 --- a/kmailcvt/filters.cxx +++ b/kmailcvt/filters.cxx @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <dcopclient.h> #include <dcopref.h> #include <kurl.h> diff --git a/kmailcvt/kselfilterpage.cpp b/kmailcvt/kselfilterpage.cpp index b8af0d0b3..7d97fcfd9 100644 --- a/kmailcvt/kselfilterpage.cpp +++ b/kmailcvt/kselfilterpage.cpp @@ -18,7 +18,7 @@ #include <kstandarddirs.h> #include <tqtextedit.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> #include "filters.hxx" #include "filter_mbox.hxx" diff --git a/kmobile/devices/gnokii/gnokii_mobile.cpp b/kmobile/devices/gnokii/gnokii_mobile.cpp index a999fed0d..e5629f872 100644 --- a/kmobile/devices/gnokii/gnokii_mobile.cpp +++ b/kmobile/devices/gnokii/gnokii_mobile.cpp @@ -28,10 +28,10 @@ #include <klibloader.h> #include <tdeconfig.h> #include <kstandarddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeio/global.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <gnokii.h> diff --git a/kmobile/devices/gnokii/gnokii_mobile.h b/kmobile/devices/gnokii/gnokii_mobile.h index fbcb3cb6a..5ace3e0b9 100644 --- a/kmobile/devices/gnokii/gnokii_mobile.h +++ b/kmobile/devices/gnokii/gnokii_mobile.h @@ -25,7 +25,7 @@ #define LIBKMOBILE_GNOKII_H #include <kmobiledevice.h> -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> class KMobileGnokii : public KMobileDevice { diff --git a/kmobile/devices/skeleton/skeleton.cpp b/kmobile/devices/skeleton/skeleton.cpp index 564681cd7..3593c7f8e 100644 --- a/kmobile/devices/skeleton/skeleton.cpp +++ b/kmobile/devices/skeleton/skeleton.cpp @@ -22,11 +22,11 @@ #include <klibloader.h> #include <kstandarddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeio/global.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "skeleton.h" diff --git a/kmobile/kmobile.cpp b/kmobile/kmobile.cpp index 70ec163bf..2fda2db1b 100644 --- a/kmobile/kmobile.cpp +++ b/kmobile/kmobile.cpp @@ -22,16 +22,16 @@ #include <tqpainter.h> #include <tqpaintdevicemetrics.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <kstatusbar.h> #include <kkeydialog.h> #include <tdeaccel.h> #include <tdeio/netaccess.h> #include <tdefiledialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeconfig.h> #include <kedittoolbar.h> diff --git a/kmobile/kmobileclient.cpp b/kmobile/kmobileclient.cpp index 2eef7c53c..8a0b967ad 100644 --- a/kmobile/kmobileclient.cpp +++ b/kmobile/kmobileclient.cpp @@ -20,7 +20,7 @@ #include <tqstringlist.h> #include <ktrader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "kmobileclient.h" diff --git a/kmobile/kmobiledevice.cpp b/kmobile/kmobiledevice.cpp index 3c970ab15..e92bbd04e 100644 --- a/kmobile/kmobiledevice.cpp +++ b/kmobile/kmobiledevice.cpp @@ -33,12 +33,12 @@ #include <klibloader.h> #include <kstandarddirs.h> #include "kmobiledevice.h" -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeconfig.h> #include <tdeio/global.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #define KMOBILEDEVICE_DEBUG_AREA 5730 #define PRINT_DEBUG kdDebug(KMOBILEDEVICE_DEBUG_AREA) << "KMobileDevice: " diff --git a/kmobile/kmobiledevice.h b/kmobile/kmobiledevice.h index 9dbad07a1..aad9287c5 100644 --- a/kmobile/kmobiledevice.h +++ b/kmobile/kmobiledevice.h @@ -27,8 +27,8 @@ #include <tdepimmacros.h> #include <klibloader.h> -#include <kabc/addressee.h> -#include <kabc/addresseelist.h> +#include <tdeabc/addressee.h> +#include <tdeabc/addresseelist.h> #include <tdeio/global.h> #include <tdeio/authinfo.h> diff --git a/kmobile/kmobileitem.cpp b/kmobile/kmobileitem.cpp index aa44cb937..8165eadd5 100644 --- a/kmobile/kmobileitem.cpp +++ b/kmobile/kmobileitem.cpp @@ -20,7 +20,7 @@ #include <tqobject.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeconfig.h> diff --git a/kmobile/kmobileview.cpp b/kmobile/kmobileview.cpp index 5356c879e..14f7c0a39 100644 --- a/kmobile/kmobileview.cpp +++ b/kmobile/kmobileview.cpp @@ -22,8 +22,8 @@ #include <ktrader.h> #include <klibloader.h> -#include <klocale.h> -#include <kabc/vcardconverter.h> +#include <tdelocale.h> +#include <tdeabc/vcardconverter.h> #include <kprocess.h> #include <kdebug.h> #include <tdeconfig.h> diff --git a/kmobile/main.cpp b/kmobile/main.cpp index 423c8be87..6fe97df3c 100644 --- a/kmobile/main.cpp +++ b/kmobile/main.cpp @@ -22,7 +22,7 @@ #include <dcopclient.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> static const char description[] = I18N_NOOP("TDE mobile devices manager"); diff --git a/kmobile/pref.cpp b/kmobile/pref.cpp index 6b5a02309..b42006017 100644 --- a/kmobile/pref.cpp +++ b/kmobile/pref.cpp @@ -4,7 +4,7 @@ #include "pref.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqlabel.h> diff --git a/kmobile/tdeioslave/tdeio_mobile.cpp b/kmobile/tdeioslave/tdeio_mobile.cpp index bb70b264e..f30742fe7 100644 --- a/kmobile/tdeioslave/tdeio_mobile.cpp +++ b/kmobile/tdeioslave/tdeio_mobile.cpp @@ -27,9 +27,9 @@ #include <tqregexp.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kinstance.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/vcardconverter.h> #include "tdeio_mobile.h" diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp index e6dca1ccd..1af971b3b 100644 --- a/knode/articlewidget.cpp +++ b/knode/articlewidget.cpp @@ -35,13 +35,13 @@ #include <tdehtml_part.h> #include <tdehtmlview.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmdcodec.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kmimetype.h> #include <krun.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kurl.h> #include <libemailfunctions/email.h> diff --git a/knode/headerview.cpp b/knode/headerview.cpp index 1952f8136..06210b2a5 100644 --- a/knode/headerview.cpp +++ b/knode/headerview.cpp @@ -17,7 +17,7 @@ #include <tqstylesheet.h> #include <tqtimer.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeversion.h> #include <tdepopupmenu.h> diff --git a/knode/knaccountmanager.cpp b/knode/knaccountmanager.cpp index ddc66afd3..7eac9000d 100644 --- a/knode/knaccountmanager.cpp +++ b/knode/knaccountmanager.cpp @@ -18,8 +18,8 @@ #include <kdebug.h> #include <ksimpleconfig.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <tdewallet.h> diff --git a/knode/knarticle.cpp b/knode/knarticle.cpp index fe475b1b3..24ffe7205 100644 --- a/knode/knarticle.cpp +++ b/knode/knarticle.cpp @@ -15,7 +15,7 @@ */ -#include <klocale.h> +#include <tdelocale.h> #include <kmdcodec.h> #include <kmimemagic.h> diff --git a/knode/knarticlecollection.cpp b/knode/knarticlecollection.cpp index d39d4d83a..e0a0af85c 100644 --- a/knode/knarticlecollection.cpp +++ b/knode/knarticlecollection.cpp @@ -16,8 +16,8 @@ #include <stdlib.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> #include "knglobals.h" diff --git a/knode/knarticlefactory.cpp b/knode/knarticlefactory.cpp index 6a20c4dd5..9e801a6ec 100644 --- a/knode/knarticlefactory.cpp +++ b/knode/knarticlefactory.cpp @@ -16,8 +16,8 @@ #include <tqlabel.h> #include <tqvbox.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <twin.h> #include <tdeapplication.h> diff --git a/knode/knarticlefilter.cpp b/knode/knarticlefilter.cpp index 65acb7c0b..8a708e29f 100644 --- a/knode/knarticlefilter.cpp +++ b/knode/knarticlefilter.cpp @@ -14,7 +14,7 @@ #include <kstandarddirs.h> #include <ksimpleconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "kngroup.h" diff --git a/knode/knarticlemanager.cpp b/knode/knarticlemanager.cpp index f5a59c574..e70f6243e 100644 --- a/knode/knarticlemanager.cpp +++ b/knode/knarticlemanager.cpp @@ -12,13 +12,13 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kuserprofile.h> #include <kopenwith.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <twin.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include "articlewidget.h" #include "knmainwidget.h" diff --git a/knode/kncleanup.cpp b/knode/kncleanup.cpp index f2078d71b..33714840c 100644 --- a/knode/kncleanup.cpp +++ b/knode/kncleanup.cpp @@ -19,8 +19,8 @@ #include <tqlayout.h> #include <tqprogressbar.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kseparator.h> #include <tdeapplication.h> #include <kdebug.h> diff --git a/knode/kncollectionview.cpp b/knode/kncollectionview.cpp index a8e9088ce..8a02fed2e 100644 --- a/knode/kncollectionview.cpp +++ b/knode/kncollectionview.cpp @@ -16,7 +16,7 @@ #include <kiconloader.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include "knglobals.h" diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp index afebca1af..678b38eb5 100644 --- a/knode/kncomposer.cpp +++ b/knode/kncomposer.cpp @@ -24,8 +24,8 @@ using KPIM::AddressesDialog; using TDERecentAddress::RecentAddresses; #include <tdeaccel.h> #include <kcharsets.h> -#include <kmessagebox.h> -#include <kabc/addresseedialog.h> +#include <tdemessagebox.h> +#include <tdeabc/addresseedialog.h> #include <tdeaction.h> #include <kstdaction.h> #include <kkeydialog.h> @@ -36,7 +36,7 @@ using TDERecentAddress::RecentAddresses; #include <klineedit.h> #include <kcombobox.h> #include <tdespell.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kpgp.h> #include <kpgpblock.h> #include <kprocess.h> @@ -57,7 +57,7 @@ using TDERecentAddress::RecentAddresses; #include "knnntpaccount.h" #include "knarticlefactory.h" #include <kstatusbar.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqpopupmenu.h> #include <spellingfilter.h> #include <kstdguiitem.h> diff --git a/knode/kncomposer.h b/knode/kncomposer.h index d12a05139..27cdade41 100644 --- a/knode/kncomposer.h +++ b/knode/kncomposer.h @@ -26,7 +26,7 @@ #include <tdeversion.h> #include <keditcl.h> -#include <kabc/addresslineedit.h> +#include <tdeabc/addresslineedit.h> #include <knodecomposeriface.h> class TQGroupBox; diff --git a/knode/knconfig.cpp b/knode/knconfig.cpp index b2bfb8bf7..8a218eb29 100644 --- a/knode/knconfig.cpp +++ b/knode/knconfig.cpp @@ -19,10 +19,10 @@ #include <tqtextcodec.h> #include <ksimpleconfig.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tdeapplication.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kstandarddirs.h> #include <kdebug.h> #include <kiconloader.h> diff --git a/knode/knconfigmanager.cpp b/knode/knconfigmanager.cpp index 95e342d5b..a07a9c5e0 100644 --- a/knode/knconfigmanager.cpp +++ b/knode/knconfigmanager.cpp @@ -18,7 +18,7 @@ #include <kcmultidialog.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <twin.h> #include <tqhbox.h> diff --git a/knode/knconfigpages.cpp b/knode/knconfigpages.cpp index 9fa153949..237ff41b7 100644 --- a/knode/knconfigpages.cpp +++ b/knode/knconfigpages.cpp @@ -15,7 +15,7 @@ #include <tdecmodule.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "knglobals.h" #include "knconfig.h" diff --git a/knode/knconfigwidgets.cpp b/knode/knconfigwidgets.cpp index 2ae1e1f01..3d4948a40 100644 --- a/knode/knconfigwidgets.cpp +++ b/knode/knconfigwidgets.cpp @@ -18,9 +18,9 @@ #include <tqwhatsthis.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <knumvalidator.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kcolordialog.h> #include <tdefontdialog.h> #include <tdefiledialog.h> diff --git a/knode/knconvert.cpp b/knode/knconvert.cpp index 19e2c56ae..20a63ffa0 100644 --- a/knode/knconvert.cpp +++ b/knode/knconvert.cpp @@ -17,10 +17,10 @@ #include <tqlabel.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> #include <kseparator.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <klineedit.h> #include <kprocess.h> diff --git a/knode/kndisplayedheader.cpp b/knode/kndisplayedheader.cpp index 65b165222..ffca72cf2 100644 --- a/knode/kndisplayedheader.cpp +++ b/knode/kndisplayedheader.cpp @@ -12,7 +12,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ -#include <klocale.h> +#include <tdelocale.h> #include "kndisplayedheader.h" diff --git a/knode/knfilterconfigwidget.cpp b/knode/knfilterconfigwidget.cpp index 3c7daee1e..4ba0f45f9 100644 --- a/knode/knfilterconfigwidget.cpp +++ b/knode/knfilterconfigwidget.cpp @@ -17,7 +17,7 @@ #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include "knstringfilter.h" #include "knstatusfilter.h" diff --git a/knode/knfilterdialog.cpp b/knode/knfilterdialog.cpp index e9ebf66e1..6a0e972a4 100644 --- a/knode/knfilterdialog.cpp +++ b/knode/knfilterdialog.cpp @@ -18,8 +18,8 @@ #include <tqcheckbox.h> #include <tqlayout.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <klineedit.h> #include "knglobals.h" diff --git a/knode/knfiltermanager.cpp b/knode/knfiltermanager.cpp index 9efc23dce..2264dd293 100644 --- a/knode/knfiltermanager.cpp +++ b/knode/knfiltermanager.cpp @@ -14,8 +14,8 @@ #include <stdlib.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdepopupmenu.h> #include <kstandarddirs.h> #include <ksimpleconfig.h> diff --git a/knode/knfolder.cpp b/knode/knfolder.cpp index 5be7535c2..ee4449faa 100644 --- a/knode/knfolder.cpp +++ b/knode/knfolder.cpp @@ -17,7 +17,7 @@ #include <ksimpleconfig.h> #include <kstandarddirs.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kqcstringsplitter.h> diff --git a/knode/knfoldermanager.cpp b/knode/knfoldermanager.cpp index 661e1b6cf..2b6d1cc1b 100644 --- a/knode/knfoldermanager.cpp +++ b/knode/knfoldermanager.cpp @@ -14,8 +14,8 @@ #include <tqdir.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kdebug.h> diff --git a/knode/kngroup.cpp b/knode/kngroup.cpp index 087eb7379..95de1a5b6 100644 --- a/knode/kngroup.cpp +++ b/knode/kngroup.cpp @@ -14,7 +14,7 @@ #include <ksimpleconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kqcstringsplitter.h> diff --git a/knode/kngroupbrowser.cpp b/knode/kngroupbrowser.cpp index be91593a7..f2379f51c 100644 --- a/knode/kngroupbrowser.cpp +++ b/knode/kngroupbrowser.cpp @@ -21,7 +21,7 @@ #include <kseparator.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <klineedit.h> diff --git a/knode/kngroupdialog.cpp b/knode/kngroupdialog.cpp index 4498898f9..8c9a17467 100644 --- a/knode/kngroupdialog.cpp +++ b/knode/kngroupdialog.cpp @@ -21,10 +21,10 @@ #include <tqcheckbox.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdatepicker.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <klineedit.h> #include "utilities.h" diff --git a/knode/kngroupmanager.cpp b/knode/kngroupmanager.cpp index 92ed16668..706e9d9b9 100644 --- a/knode/kngroupmanager.cpp +++ b/knode/kngroupmanager.cpp @@ -16,8 +16,8 @@ #include <stdlib.h> #include <tqdir.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kiconloader.h> #include <kdebug.h> #include <kcharsets.h> diff --git a/knode/kngrouppropdlg.cpp b/knode/kngrouppropdlg.cpp index 3ad2fee7a..a6a905786 100644 --- a/knode/kngrouppropdlg.cpp +++ b/knode/kngrouppropdlg.cpp @@ -17,7 +17,7 @@ #include <tqvbox.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include "knglobals.h" diff --git a/knode/kngroupselectdialog.cpp b/knode/kngroupselectdialog.cpp index 6767d3f64..3d137b8a1 100644 --- a/knode/kngroupselectdialog.cpp +++ b/knode/kngroupselectdialog.cpp @@ -19,8 +19,8 @@ #include <tqheader.h> #include <tqcheckbox.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "utilities.h" #include "kngroupselectdialog.h" diff --git a/knode/knjobdata.cpp b/knode/knjobdata.cpp index 0d626983b..7d4ac9123 100644 --- a/knode/knjobdata.cpp +++ b/knode/knjobdata.cpp @@ -14,7 +14,7 @@ #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeio/job.h> #include <libtdepim/progressmanager.h> diff --git a/knode/knmainwidget.cpp b/knode/knmainwidget.cpp index 7a1f407c0..bfb895d0f 100644 --- a/knode/knmainwidget.cpp +++ b/knode/knmainwidget.cpp @@ -21,14 +21,14 @@ #include <tdeaccel.h> #include <kxmlguiclient.h> #include <tdeconfig.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kedittoolbar.h> #include <kstdaction.h> #include <kdebug.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <kiconloader.h> #include <kstatusbar.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include "broadcaststatus.h" diff --git a/knode/knnetaccess.cpp b/knode/knnetaccess.cpp index 299a1200a..747f6d4cf 100644 --- a/knode/knnetaccess.cpp +++ b/knode/knnetaccess.cpp @@ -17,8 +17,8 @@ #include <tqsocketnotifier.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <tdeio/job.h> #include <tdeio/passdlg.h> diff --git a/knode/knnntpclient.cpp b/knode/knnntpclient.cpp index 8cedae08e..2ba465be3 100644 --- a/knode/knnntpclient.cpp +++ b/knode/knnntpclient.cpp @@ -15,7 +15,7 @@ */ #include <stdlib.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqtextcodec.h> #include <tqmutex.h> diff --git a/knode/knode.cpp b/knode/knode.cpp index a29cb7db5..175d1845f 100644 --- a/knode/knode.cpp +++ b/knode/knode.cpp @@ -21,10 +21,10 @@ #include <kedittoolbar.h> #include <kstdaction.h> #include <kdebug.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <kiconloader.h> #include <kstatusbar.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include "broadcaststatus.h" diff --git a/knode/knode_options.h b/knode/knode_options.h index f8329e380..c7c446910 100644 --- a/knode/knode_options.h +++ b/knode/knode_options.h @@ -18,7 +18,7 @@ #define KNODE_OPTIONS_H #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> static TDECmdLineOptions knode_options[] = { diff --git a/knode/knprotocolclient.cpp b/knode/knprotocolclient.cpp index 8289d02ee..9a10ca778 100644 --- a/knode/knprotocolclient.cpp +++ b/knode/knprotocolclient.cpp @@ -26,7 +26,7 @@ #include <stdlib.h> #include <unistd.h> -#include <klocale.h> +#include <tdelocale.h> #include <kextsock.h> #include <ksocks.h> diff --git a/knode/knsearchdialog.cpp b/knode/knsearchdialog.cpp index 45c59cb47..737bece29 100644 --- a/knode/knsearchdialog.cpp +++ b/knode/knsearchdialog.cpp @@ -17,7 +17,7 @@ #include <tqlayout.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <kiconloader.h> #include <kpushbutton.h> diff --git a/knode/knserverinfo.cpp b/knode/knserverinfo.cpp index 6af554ceb..3d4e4ded3 100644 --- a/knode/knserverinfo.cpp +++ b/knode/knserverinfo.cpp @@ -13,9 +13,9 @@ */ -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdewallet.h> using namespace KWallet; diff --git a/knode/knstatusfilter.cpp b/knode/knstatusfilter.cpp index a1379a265..ec098d9cc 100644 --- a/knode/knstatusfilter.cpp +++ b/knode/knstatusfilter.cpp @@ -16,7 +16,7 @@ #include <tqlayout.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <ksimpleconfig.h> #include "knarticle.h" diff --git a/knode/knstringfilter.cpp b/knode/knstringfilter.cpp index 4f69f7eaf..ba594a9fb 100644 --- a/knode/knstringfilter.cpp +++ b/knode/knstringfilter.cpp @@ -16,7 +16,7 @@ #include <tqlayout.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <ksimpleconfig.h> #include <klineedit.h> diff --git a/knode/main.cpp b/knode/main.cpp index f7f1a835c..ab833dd79 100644 --- a/knode/main.cpp +++ b/knode/main.cpp @@ -16,7 +16,7 @@ #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include "knapplication.h" #include "resource.h" diff --git a/knode/utilities.cpp b/knode/utilities.cpp index 2274d2eff..054838137 100644 --- a/knode/utilities.cpp +++ b/knode/utilities.cpp @@ -17,12 +17,12 @@ #include <tqapplication.h> #include <tqcursor.h> -#include <klocale.h> -#include <kmessagebox.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdemessagebox.h> +#include <tdeglobalsettings.h> #include <kdebug.h> #include <tdeio/netaccess.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdefiledialog.h> #include "knwidgets.h" diff --git a/knotes/knote.cpp b/knotes/knote.cpp index 29ad10f5a..62c8efc8c 100644 --- a/knotes/knote.cpp +++ b/knotes/knote.cpp @@ -43,14 +43,14 @@ #include <kxmlguifactory.h> #include <kcolordrag.h> #include <kiconeffect.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kfind.h> #include <kprocess.h> #include <kinputdialog.h> #include <kmdcodec.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdefiledialog.h> #include <tdeio/netaccess.h> diff --git a/knotes/knotealarmdlg.cpp b/knotes/knotealarmdlg.cpp index cb1ea1163..4496da264 100644 --- a/knotes/knotealarmdlg.cpp +++ b/knotes/knotealarmdlg.cpp @@ -34,7 +34,7 @@ #include <tqbuttongroup.h> #include <tqvbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <libtdepim/kdateedit.h> #include <libtdepim/ktimeedit.h> diff --git a/knotes/knotebutton.cpp b/knotes/knotebutton.cpp index 006b1e9c5..ff89b2dea 100644 --- a/knotes/knotebutton.cpp +++ b/knotes/knotebutton.cpp @@ -23,7 +23,7 @@ #include <tqiconset.h> #include <tqsizepolicy.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kicontheme.h> #include <kiconloader.h> diff --git a/knotes/knoteconfigdlg.cpp b/knotes/knoteconfigdlg.cpp index e3ee66fae..bd388c389 100644 --- a/knotes/knoteconfigdlg.cpp +++ b/knotes/knoteconfigdlg.cpp @@ -27,7 +27,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kcolorbutton.h> #include <knuminput.h> diff --git a/knotes/knoteedit.cpp b/knotes/knoteedit.cpp index 7ebb44354..2ba215b7b 100644 --- a/knotes/knoteedit.cpp +++ b/knotes/knoteedit.cpp @@ -22,7 +22,7 @@ #include <tqfont.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaction.h> #include <kurldrag.h> #include <kstdaction.h> diff --git a/knotes/knotehostdlg.cpp b/knotes/knotehostdlg.cpp index 3b8b8f50f..9d8fff975 100644 --- a/knotes/knotehostdlg.cpp +++ b/knotes/knotehostdlg.cpp @@ -36,8 +36,8 @@ #include <tqvbox.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <ksimpleconfig.h> #include <kcombobox.h> diff --git a/knotes/knoteprinter.cpp b/knotes/knoteprinter.cpp index c58031671..ade0a8a70 100644 --- a/knotes/knoteprinter.cpp +++ b/knotes/knoteprinter.cpp @@ -2,7 +2,7 @@ #include <libkcal/journal.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprinter.h> #include <kdebug.h> #include <tqfont.h> diff --git a/knotes/knotesalarm.cpp b/knotes/knotesalarm.cpp index 285d7224e..c2d1bd1cd 100644 --- a/knotes/knotesalarm.cpp +++ b/knotes/knotesalarm.cpp @@ -31,8 +31,8 @@ #include <tqstringlist.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <libkcal/calendarresources.h> diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp index f3b2ae158..26aee48c3 100644 --- a/knotes/knotesapp.cpp +++ b/knotes/knotesapp.cpp @@ -27,7 +27,7 @@ #include <kxmlguifactory.h> #include <kxmlguibuilder.h> #include <ksystemtray.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconeffect.h> #include <kstandarddirs.h> #include <tdepopupmenu.h> diff --git a/knotes/knoteslegacy.cpp b/knotes/knoteslegacy.cpp index 35816f88e..fb832a5b8 100644 --- a/knotes/knoteslegacy.cpp +++ b/knotes/knoteslegacy.cpp @@ -27,7 +27,7 @@ #include <kdebug.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kurl.h> #include <kstandarddirs.h> #include <ksimpleconfig.h> diff --git a/knotes/knotesnetrecv.cpp b/knotes/knotesnetrecv.cpp index 94ff29526..48bb791fd 100644 --- a/knotes/knotesnetrecv.cpp +++ b/knotes/knotesnetrecv.cpp @@ -38,8 +38,8 @@ #include <kdebug.h> #include <kbufferedsocket.h> #include <tdesocketaddress.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include "knotesnetrecv.h" diff --git a/knotes/knotesnetsend.cpp b/knotes/knotesnetsend.cpp index 001dcf9ff..26d2b8f7d 100644 --- a/knotes/knotesnetsend.cpp +++ b/knotes/knotesnetsend.cpp @@ -30,8 +30,8 @@ your version. *******************************************************************/ -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "knotesnetsend.h" diff --git a/knotes/main.cpp b/knotes/main.cpp index a8dde2d0f..e809a8f71 100644 --- a/knotes/main.cpp +++ b/knotes/main.cpp @@ -21,7 +21,7 @@ #include <kuniqueapplication.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <kxerrorhandler.h> #include <X11/Xlib.h> diff --git a/knotes/resourcelocal.cpp b/knotes/resourcelocal.cpp index 7e208531e..e5d4d6e5e 100644 --- a/knotes/resourcelocal.cpp +++ b/knotes/resourcelocal.cpp @@ -31,8 +31,8 @@ your version. *******************************************************************/ -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <libkcal/icalformat.h> diff --git a/knotes/resourcelocalconfig.cpp b/knotes/resourcelocalconfig.cpp index 1214e0ad6..c4eed4e0c 100644 --- a/knotes/resourcelocalconfig.cpp +++ b/knotes/resourcelocalconfig.cpp @@ -22,7 +22,7 @@ #include <tqlayout.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tderesources/configwidget.h> #include <kurlrequester.h> diff --git a/kode/CMakeLists.txt b/kode/CMakeLists.txt index 179a539e1..e2255d9a2 100644 --- a/kode/CMakeLists.txt +++ b/kode/CMakeLists.txt @@ -26,7 +26,7 @@ link_directories( tde_add_executable( kode SOURCES kodemain.cpp - LINK kode-shared kabc-shared + LINK kode-shared tdeabc-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kode/kodemain.cpp b/kode/kodemain.cpp index 8c2e3a364..e91be0c86 100644 --- a/kode/kodemain.cpp +++ b/kode/kodemain.cpp @@ -24,16 +24,16 @@ #include "license.h" #include "automakefile.h" -#include <kabc/stdaddressbook.h> +#include <tdeabc/stdaddressbook.h> #include <tdeaboutdata.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <ksimpleconfig.h> #include <ksavefile.h> diff --git a/kode/kwsdl/kung/binaryinputfield.cpp b/kode/kwsdl/kung/binaryinputfield.cpp index 95ea292e2..b0fb78b00 100644 --- a/kode/kwsdl/kung/binaryinputfield.cpp +++ b/kode/kwsdl/kung/binaryinputfield.cpp @@ -22,12 +22,12 @@ #include <tdefiledialog.h> #include <tdeio/netaccess.h> #include <kmdcodec.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kmimemagic.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeparts/part.h> #include <tdeparts/componentfactory.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tqfile.h> #include <tqlabel.h> diff --git a/kode/kwsdl/kung/dispatcher.cpp b/kode/kwsdl/kung/dispatcher.cpp index 58ac17d19..5c65d0c48 100644 --- a/kode/kwsdl/kung/dispatcher.cpp +++ b/kode/kwsdl/kung/dispatcher.cpp @@ -24,8 +24,8 @@ #include <tqwidget.h> #include <kinputdialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "generalconversationmanager.h" #include "inputdialog.h" diff --git a/kode/kwsdl/kung/inputdialog.cpp b/kode/kwsdl/kung/inputdialog.cpp index 17aa601b0..353494e21 100644 --- a/kode/kwsdl/kung/inputdialog.cpp +++ b/kode/kwsdl/kung/inputdialog.cpp @@ -19,7 +19,7 @@ Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "inputdialog.h" diff --git a/kode/kwsdl/kung/listinputfield.cpp b/kode/kwsdl/kung/listinputfield.cpp index 4a6921c07..539e3de2c 100644 --- a/kode/kwsdl/kung/listinputfield.cpp +++ b/kode/kwsdl/kung/listinputfield.cpp @@ -23,7 +23,7 @@ #include <tqlistbox.h> #include <tqpushbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <schema/simpletype.h> diff --git a/kode/kwsdl/kung/main.cpp b/kode/kwsdl/kung/main.cpp index 9f236c3cf..2dadbe9dd 100644 --- a/kode/kwsdl/kung/main.cpp +++ b/kode/kwsdl/kung/main.cpp @@ -23,7 +23,7 @@ #include <tdeapplication.h> #include <tdecmdlineargs.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqtimer.h> diff --git a/kode/kwsdl/kung/outputdialog.cpp b/kode/kwsdl/kung/outputdialog.cpp index 6cdb7e579..e8d676434 100644 --- a/kode/kwsdl/kung/outputdialog.cpp +++ b/kode/kwsdl/kung/outputdialog.cpp @@ -19,7 +19,7 @@ Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "outputdialog.h" diff --git a/kode/kwsdl/main.cpp b/kode/kwsdl/main.cpp index ab40e3a33..5ba4f533c 100644 --- a/kode/kwsdl/main.cpp +++ b/kode/kwsdl/main.cpp @@ -25,7 +25,7 @@ #include <tdeapplication.h> #include <tdecmdlineargs.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqdir.h> #include <tqfile.h> diff --git a/kode/kwsdl/schema/fileprovider.cpp b/kode/kwsdl/schema/fileprovider.cpp index 945f7261f..ed5606fd2 100644 --- a/kode/kwsdl/schema/fileprovider.cpp +++ b/kode/kwsdl/schema/fileprovider.cpp @@ -26,7 +26,7 @@ #include <tqfile.h> #include <tdeio/job.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include "fileprovider.h" diff --git a/kode/kxml_compiler/creator.cpp b/kode/kxml_compiler/creator.cpp index b46a99eb2..bc330eaf9 100644 --- a/kode/kxml_compiler/creator.cpp +++ b/kode/kxml_compiler/creator.cpp @@ -29,9 +29,9 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> diff --git a/kode/kxml_compiler/creator.h b/kode/kxml_compiler/creator.h index c0018fd5e..39cac4c6b 100644 --- a/kode/kxml_compiler/creator.h +++ b/kode/kxml_compiler/creator.h @@ -31,9 +31,9 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> diff --git a/kode/kxml_compiler/kxml_compiler.cpp b/kode/kxml_compiler/kxml_compiler.cpp index 87c3bb1d3..317515b6b 100644 --- a/kode/kxml_compiler/kxml_compiler.cpp +++ b/kode/kxml_compiler/kxml_compiler.cpp @@ -29,9 +29,9 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> diff --git a/kode/kxml_compiler/parser.cpp b/kode/kxml_compiler/parser.cpp index 163213f99..5fc72f97a 100644 --- a/kode/kxml_compiler/parser.cpp +++ b/kode/kxml_compiler/parser.cpp @@ -28,9 +28,9 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> diff --git a/kode/kxml_compiler/parser.h b/kode/kxml_compiler/parser.h index 07052787e..9f0f21a18 100644 --- a/kode/kxml_compiler/parser.h +++ b/kode/kxml_compiler/parser.h @@ -28,9 +28,9 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> diff --git a/konsolekalendar/konsolekalendar.cpp b/konsolekalendar/konsolekalendar.cpp index 3c7d2f003..535478cf8 100644 --- a/konsolekalendar/konsolekalendar.cpp +++ b/konsolekalendar/konsolekalendar.cpp @@ -40,7 +40,7 @@ #include <tqtextstream.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <libkcal/calendarlocal.h> #include <libkcal/resourcecalendar.h> diff --git a/konsolekalendar/konsolekalendaradd.cpp b/konsolekalendar/konsolekalendaradd.cpp index 36e23629c..d7b2774bc 100644 --- a/konsolekalendar/konsolekalendaradd.cpp +++ b/konsolekalendar/konsolekalendaradd.cpp @@ -38,7 +38,7 @@ #include <kdebug.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <libkcal/calendarlocal.h> #include <libkcal/calendar.h> diff --git a/konsolekalendar/konsolekalendarchange.cpp b/konsolekalendar/konsolekalendarchange.cpp index 338ed1e54..7c9e3b5e7 100644 --- a/konsolekalendar/konsolekalendarchange.cpp +++ b/konsolekalendar/konsolekalendarchange.cpp @@ -34,7 +34,7 @@ #include <iostream> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "konsolekalendarchange.h" diff --git a/konsolekalendar/konsolekalendardelete.cpp b/konsolekalendar/konsolekalendardelete.cpp index 65b8d4254..4da761006 100644 --- a/konsolekalendar/konsolekalendardelete.cpp +++ b/konsolekalendar/konsolekalendardelete.cpp @@ -34,7 +34,7 @@ #include <iostream> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "konsolekalendardelete.h" diff --git a/konsolekalendar/konsolekalendarexports.cpp b/konsolekalendar/konsolekalendarexports.cpp index 9894ac96c..bf0748a3e 100644 --- a/konsolekalendar/konsolekalendarexports.cpp +++ b/konsolekalendar/konsolekalendarexports.cpp @@ -36,7 +36,7 @@ #include <tqdatetime.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <libkcal/calendarlocal.h> #include <libkcal/calendar.h> diff --git a/konsolekalendar/konsolekalendarvariables.cpp b/konsolekalendar/konsolekalendarvariables.cpp index e5541e00d..fddb77d90 100644 --- a/konsolekalendar/konsolekalendarvariables.cpp +++ b/konsolekalendar/konsolekalendarvariables.cpp @@ -30,9 +30,9 @@ * @author Tuukka Pasanen * @author Allen Winter */ -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kstandarddirs.h> diff --git a/konsolekalendar/main.cpp b/konsolekalendar/main.cpp index 0339634ce..d03d084a1 100644 --- a/konsolekalendar/main.cpp +++ b/konsolekalendar/main.cpp @@ -47,8 +47,8 @@ #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kstandarddirs.h> #include <kdebug.h> diff --git a/konsolekalendar/stdcalendar.cpp b/konsolekalendar/stdcalendar.cpp index 3c735df73..0c871b811 100644 --- a/konsolekalendar/stdcalendar.cpp +++ b/konsolekalendar/stdcalendar.cpp @@ -28,7 +28,7 @@ #include <tdeconfig.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> using namespace KCal; diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp index 772ecc814..edaf86da4 100644 --- a/kontact/interfaces/core.cpp +++ b/kontact/interfaces/core.cpp @@ -27,7 +27,7 @@ #include <tdeparts/componentfactory.h> #include <kdebug.h> #include <tqtimer.h> -#include <klocale.h> +#include <tdelocale.h> using namespace Kontact; diff --git a/kontact/interfaces/plugin.cpp b/kontact/interfaces/plugin.cpp index a14a50db9..ed81dcb65 100644 --- a/kontact/interfaces/plugin.cpp +++ b/kontact/interfaces/plugin.cpp @@ -24,7 +24,7 @@ #include <dcopclient.h> #include <tdeaboutdata.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeparts/componentfactory.h> #include <kdebug.h> #include <kinstance.h> diff --git a/kontact/interfaces/uniqueapphandler.cpp b/kontact/interfaces/uniqueapphandler.cpp index 11b7bc5f1..98a5d45b0 100644 --- a/kontact/interfaces/uniqueapphandler.cpp +++ b/kontact/interfaces/uniqueapphandler.cpp @@ -20,14 +20,14 @@ */ #include "uniqueapphandler.h" -#include <kstartupinfo.h> +#include <tdestartupinfo.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> #include "core.h" #include <twin.h> #include <dcopclient.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kuniqueapplication.h> /* diff --git a/kontact/plugins/akregator/akregator_plugin.cpp b/kontact/plugins/akregator/akregator_plugin.cpp index bf59486c2..01997690c 100644 --- a/kontact/plugins/akregator/akregator_plugin.cpp +++ b/kontact/plugins/akregator/akregator_plugin.cpp @@ -33,7 +33,7 @@ #include <kdebug.h> #include <kgenericfactory.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeparts/componentfactory.h> #include <core.h> diff --git a/kontact/plugins/akregator/akregator_plugin.h b/kontact/plugins/akregator/akregator_plugin.h index 82ae6ea18..479ca8967 100644 --- a/kontact/plugins/akregator/akregator_plugin.h +++ b/kontact/plugins/akregator/akregator_plugin.h @@ -25,7 +25,7 @@ #ifndef AKREGATOR_PLUGIN_H #define AKREGATOR_PLUGIN_H -#include <klocale.h> +#include <tdelocale.h> #include <tdeparts/part.h> #include <tdeparts/part.h> diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp index 86a75ed06..cb20a3ca7 100644 --- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp +++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp @@ -30,12 +30,12 @@ #include <kdebug.h> #include <kgenericfactory.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeparts/componentfactory.h> #include <kaddrbook.h> -#include <kabc/addressbook.h> -#include <kabc/stdaddressbook.h> +#include <tdeabc/addressbook.h> +#include <tdeabc/stdaddressbook.h> #include <dcopclient.h> #include "kmailIface_stub.h" diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.h b/kontact/plugins/kaddressbook/kaddressbook_plugin.h index f9a7fff3b..b3a8fee86 100644 --- a/kontact/plugins/kaddressbook/kaddressbook_plugin.h +++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.h @@ -25,7 +25,7 @@ #ifndef KADDRESSBOOK_PLUGIN_H #define KADDRESSBOOK_PLUGIN_H -#include <klocale.h> +#include <tdelocale.h> #include <tdeparts/part.h> #include "kaddressbookiface_stub.h" diff --git a/kontact/plugins/karm/karm_plugin.h b/kontact/plugins/karm/karm_plugin.h index 1b4c80bd4..e65f8ff90 100644 --- a/kontact/plugins/karm/karm_plugin.h +++ b/kontact/plugins/karm/karm_plugin.h @@ -26,7 +26,7 @@ #ifndef KARM_PLUGIN_H #define KARM_PLUGIN_H -#include <klocale.h> +#include <tdelocale.h> #include <tdeparts/part.h> #include "karmdcopiface_stub.h" diff --git a/kontact/plugins/kitchensync/kitchensync_plugin.cpp b/kontact/plugins/kitchensync/kitchensync_plugin.cpp index 1240687a2..48e33627b 100644 --- a/kontact/plugins/kitchensync/kitchensync_plugin.cpp +++ b/kontact/plugins/kitchensync/kitchensync_plugin.cpp @@ -30,7 +30,7 @@ #include <kdebug.h> #include <kgenericfactory.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeparts/componentfactory.h> #include "core.h" diff --git a/kontact/plugins/kitchensync/kitchensync_plugin.h b/kontact/plugins/kitchensync/kitchensync_plugin.h index e14ee9a0e..5e9610365 100644 --- a/kontact/plugins/kitchensync/kitchensync_plugin.h +++ b/kontact/plugins/kitchensync/kitchensync_plugin.h @@ -25,7 +25,7 @@ #ifndef KITCHENSYNC_PLUGIN_H #define KITCHENSYNC_PLUGIN_H -#include <klocale.h> +#include <tdelocale.h> #include <tdeparts/part.h> #include "plugin.h" diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp index 3a4500172..497e27803 100644 --- a/kontact/plugins/kmail/kcmkmailsummary.cpp +++ b/kontact/plugins/kmail/kcmkmailsummary.cpp @@ -33,7 +33,7 @@ #include <kdebug.h> #include <kdialog.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include "kcmkmailsummary.h" diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp index 90d7b6ddd..1fa5fc9fc 100644 --- a/kontact/plugins/kmail/kmail_plugin.cpp +++ b/kontact/plugins/kmail/kmail_plugin.cpp @@ -31,9 +31,9 @@ #include <tdeparts/componentfactory.h> #include <kstandarddirs.h> #include <dcopclient.h> -#include <ktempfile.h> +#include <tdetempfile.h> -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <libkcal/vcaldrag.h> #include <libkcal/icaldrag.h> diff --git a/kontact/plugins/kmail/kmail_plugin.h b/kontact/plugins/kmail/kmail_plugin.h index d2c5f4a31..eb1914ec4 100644 --- a/kontact/plugins/kmail/kmail_plugin.h +++ b/kontact/plugins/kmail/kmail_plugin.h @@ -24,7 +24,7 @@ #ifndef KMAIL_PLUGIN_H #define KMAIL_PLUGIN_H -#include <klocale.h> +#include <tdelocale.h> #include <tdeparts/part.h> #include "kmailIface_stub.h" diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp index b203c3628..9ac186028 100644 --- a/kontact/plugins/kmail/summarywidget.cpp +++ b/kontact/plugins/kmail/summarywidget.cpp @@ -30,9 +30,9 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeparts/part.h> #include "core.h" diff --git a/kontact/plugins/knode/knode_plugin.h b/kontact/plugins/knode/knode_plugin.h index 1062ff628..460e06032 100644 --- a/kontact/plugins/knode/knode_plugin.h +++ b/kontact/plugins/knode/knode_plugin.h @@ -25,7 +25,7 @@ #ifndef KNODE_PLUGIN_H #define KNODE_PLUGIN_H -#include <klocale.h> +#include <tdelocale.h> #include <tdeparts/part.h> #include "knodeiface_stub.h" diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp index 5cac9cafa..7c3b456f5 100644 --- a/kontact/plugins/knotes/knotes_part.cpp +++ b/kontact/plugins/knotes/knotes_part.cpp @@ -25,7 +25,7 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdeaction.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <libtdepim/infoextension.h> #include <libtdepim/sidebarextension.h> diff --git a/kontact/plugins/knotes/knotes_part.h b/kontact/plugins/knotes/knotes_part.h index cda762eba..023a78b92 100644 --- a/kontact/plugins/knotes/knotes_part.h +++ b/kontact/plugins/knotes/knotes_part.h @@ -25,7 +25,7 @@ #include <tqdict.h> #include <kiconview.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <libkcal/journal.h> diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h index ab386d1a9..aa5b602cb 100644 --- a/kontact/plugins/knotes/knotes_part_p.h +++ b/kontact/plugins/knotes/knotes_part_p.h @@ -36,9 +36,9 @@ #include <tqlabel.h> #include <tdeactioncollection.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconview.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kiconeffect.h> #include <klineedit.h> diff --git a/kontact/plugins/knotes/knotes_plugin.h b/kontact/plugins/knotes/knotes_plugin.h index fe17bad52..01606fba2 100644 --- a/kontact/plugins/knotes/knotes_plugin.h +++ b/kontact/plugins/knotes/knotes_plugin.h @@ -21,7 +21,7 @@ #ifndef KNOTES_PLUGIN_H #define KNOTES_PLUGIN_H -#include <klocale.h> +#include <tdelocale.h> #include "plugin.h" diff --git a/kontact/plugins/knotes/knotetip.cpp b/kontact/plugins/knotes/knotetip.cpp index dc0a3fa75..97bd771f1 100644 --- a/kontact/plugins/knotes/knotetip.cpp +++ b/kontact/plugins/knotes/knotetip.cpp @@ -34,7 +34,7 @@ #include <tqtextedit.h> #include <tdeapplication.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include "knotetip.h" #include "knotes_part_p.h" diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp index ff517a43f..ca0f6ae5f 100644 --- a/kontact/plugins/knotes/summarywidget.cpp +++ b/kontact/plugins/knotes/summarywidget.cpp @@ -30,9 +30,9 @@ #include <dcopref.h> #include <tdeapplication.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurllabel.h> #include <kstandarddirs.h> diff --git a/kontact/plugins/korganizer/journalplugin.cpp b/kontact/plugins/korganizer/journalplugin.cpp index 4b017af94..ac3b77357 100644 --- a/kontact/plugins/korganizer/journalplugin.cpp +++ b/kontact/plugins/korganizer/journalplugin.cpp @@ -29,7 +29,7 @@ #include <kdebug.h> #include <kgenericfactory.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <dcopclient.h> #include <dcopref.h> diff --git a/kontact/plugins/korganizer/journalplugin.h b/kontact/plugins/korganizer/journalplugin.h index e8cb60518..f7d0a4653 100644 --- a/kontact/plugins/korganizer/journalplugin.h +++ b/kontact/plugins/korganizer/journalplugin.h @@ -24,7 +24,7 @@ #ifndef KONTACT_JOURNALPLUGIN_H #define KONTACT_JOURNALPLUGIN_H -#include <klocale.h> +#include <tdelocale.h> #include <tdeparts/part.h> #include "kcalendariface_stub.h" diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp index 43d027d4d..0f17435cc 100644 --- a/kontact/plugins/korganizer/kcmkorgsummary.cpp +++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp @@ -33,7 +33,7 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kdialogbase.h> -#include <klocale.h> +#include <tdelocale.h> #include "kcmkorgsummary.h" diff --git a/kontact/plugins/korganizer/korg_uniqueapp.cpp b/kontact/plugins/korganizer/korg_uniqueapp.cpp index 6131206e0..c83605833 100644 --- a/kontact/plugins/korganizer/korg_uniqueapp.cpp +++ b/kontact/plugins/korganizer/korg_uniqueapp.cpp @@ -25,7 +25,7 @@ #include "core.h" #include <dcopref.h> #include <tdeapplication.h> -#include <kstartupinfo.h> +#include <tdestartupinfo.h> #include <twin.h> void KOrganizerUniqueAppHandler::loadCommandLineOptions() diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp index 1cc6fb527..8628f4128 100644 --- a/kontact/plugins/korganizer/korganizerplugin.cpp +++ b/kontact/plugins/korganizer/korganizerplugin.cpp @@ -28,15 +28,15 @@ #include <tqdragobject.h> #include <tdeapplication.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/vcardconverter.h> #include <tdeaction.h> #include <dcopref.h> #include <kdebug.h> #include <kgenericfactory.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <dcopclient.h> diff --git a/kontact/plugins/korganizer/korganizerplugin.h b/kontact/plugins/korganizer/korganizerplugin.h index 3dd21fb3f..65a4d0531 100644 --- a/kontact/plugins/korganizer/korganizerplugin.h +++ b/kontact/plugins/korganizer/korganizerplugin.h @@ -25,7 +25,7 @@ #ifndef KORGANIZER_PLUGIN_H #define KORGANIZER_PLUGIN_H -#include <klocale.h> +#include <tdelocale.h> #include <tdeparts/part.h> #include "kcalendariface_stub.h" diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp index 16aba3778..96957fb31 100644 --- a/kontact/plugins/korganizer/summarywidget.cpp +++ b/kontact/plugins/korganizer/summarywidget.cpp @@ -27,9 +27,9 @@ #include <tqtooltip.h> #include <kdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeparts/part.h> #include <tdepopupmenu.h> #include <kstandarddirs.h> diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp index a0208f539..b12772c61 100644 --- a/kontact/plugins/korganizer/todoplugin.cpp +++ b/kontact/plugins/korganizer/todoplugin.cpp @@ -27,15 +27,15 @@ #include <tqfile.h> #include <tdeapplication.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/vcardconverter.h> #include <tdeaction.h> #include <kdebug.h> #include <kgenericfactory.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <dcopclient.h> #include <dcopref.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <libkcal/calendarlocal.h> #include <libkcal/icaldrag.h> diff --git a/kontact/plugins/korganizer/todoplugin.h b/kontact/plugins/korganizer/todoplugin.h index 8fd453912..4d62a72d7 100644 --- a/kontact/plugins/korganizer/todoplugin.h +++ b/kontact/plugins/korganizer/todoplugin.h @@ -24,7 +24,7 @@ #ifndef KONTACT_TODOPLUGIN_H #define KONTACT_TODOPLUGIN_H -#include <klocale.h> +#include <tdelocale.h> #include <tdeparts/part.h> #include "kcalendariface_stub.h" diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp index 16aced52d..c6c594611 100644 --- a/kontact/plugins/korganizer/todosummarywidget.cpp +++ b/kontact/plugins/korganizer/todosummarywidget.cpp @@ -27,9 +27,9 @@ #include <tqtooltip.h> #include <kdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeparts/part.h> #include <tdepopupmenu.h> #include <kstandarddirs.h> diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp index ec17c1f32..9ab256d2f 100644 --- a/kontact/plugins/kpilot/summarywidget.cpp +++ b/kontact/plugins/kpilot/summarywidget.cpp @@ -35,13 +35,13 @@ #include <dcopref.h> #include <tdeapplication.h> #include <kdebug.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurllabel.h> #include <kdialogbase.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "pilotDaemonDCOP_stub.h" diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp index 5c388f2aa..577bc992a 100644 --- a/kontact/plugins/newsticker/kcmkontactknt.cpp +++ b/kontact/plugins/newsticker/kcmkontactknt.cpp @@ -38,7 +38,7 @@ #include <kdebug.h> #include <kdialogbase.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include "kcmkontactknt.h" diff --git a/kontact/plugins/newsticker/newsticker_plugin.cpp b/kontact/plugins/newsticker/newsticker_plugin.cpp index 79e03770d..b00cc0ac3 100644 --- a/kontact/plugins/newsticker/newsticker_plugin.cpp +++ b/kontact/plugins/newsticker/newsticker_plugin.cpp @@ -19,7 +19,7 @@ */ #include <kgenericfactory.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeparts/componentfactory.h> #include "core.h" diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp index 8fff21806..f385b269c 100644 --- a/kontact/plugins/newsticker/summarywidget.cpp +++ b/kontact/plugins/newsticker/summarywidget.cpp @@ -34,9 +34,9 @@ #include <kcharsets.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurllabel.h> #include "summarywidget.h" diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp index e375c7946..93c7bd8bc 100644 --- a/kontact/plugins/specialdates/kcmsdsummary.cpp +++ b/kontact/plugins/specialdates/kcmsdsummary.cpp @@ -35,7 +35,7 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kdialogbase.h> -#include <klocale.h> +#include <tdelocale.h> #include "kcmsdsummary.h" diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp index a378a1218..8918f8c1a 100644 --- a/kontact/plugins/specialdates/sdsummarywidget.cpp +++ b/kontact/plugins/specialdates/sdsummarywidget.cpp @@ -30,13 +30,13 @@ #include <dcopclient.h> #include <dcopref.h> -#include <kabc/stdaddressbook.h> +#include <tdeabc/stdaddressbook.h> #include <korganizer/stdcalendar.h> #include <tdeapplication.h> #include <kdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeparts/part.h> #include <tdepopupmenu.h> #include <kstandarddirs.h> diff --git a/kontact/plugins/specialdates/specialdates_plugin.cpp b/kontact/plugins/specialdates/specialdates_plugin.cpp index fbbdfe0a1..58c830c83 100644 --- a/kontact/plugins/specialdates/specialdates_plugin.cpp +++ b/kontact/plugins/specialdates/specialdates_plugin.cpp @@ -25,7 +25,7 @@ #include <tdeaboutdata.h> #include <kgenericfactory.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeparts/componentfactory.h> #include "core.h" diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp index 8b2999f4d..3877827d2 100644 --- a/kontact/plugins/summary/kcmkontactsummary.cpp +++ b/kontact/plugins/summary/kcmkontactsummary.cpp @@ -28,7 +28,7 @@ #include <kdialog.h> #include <kiconloader.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <plugin.h> #include <kplugininfo.h> #include <ktrader.h> diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp index 4ba14d2eb..b55256839 100644 --- a/kontact/plugins/summary/summaryview_part.cpp +++ b/kontact/plugins/summary/summaryview_part.cpp @@ -33,14 +33,14 @@ #include <kdcopservicestarter.h> #include <kdebug.h> #include <kdialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kservice.h> #include <ktrader.h> #include <kstandarddirs.h> #include <tqscrollview.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kcmultidialog.h> #include <tdeparts/componentfactory.h> diff --git a/kontact/plugins/summary/summaryview_plugin.h b/kontact/plugins/summary/summaryview_plugin.h index ad14ce2ec..08055ba48 100644 --- a/kontact/plugins/summary/summaryview_plugin.h +++ b/kontact/plugins/summary/summaryview_plugin.h @@ -23,7 +23,7 @@ #define SUMMARYVIEW_PLUGIN_H #include "plugin.h" -#include <klocale.h> +#include <tdelocale.h> #include <tdeparts/part.h> #include <tqmap.h> diff --git a/kontact/plugins/test/test_part.cpp b/kontact/plugins/test/test_part.cpp index bd5fed431..2e712ae82 100644 --- a/kontact/plugins/test/test_part.cpp +++ b/kontact/plugins/test/test_part.cpp @@ -30,8 +30,8 @@ #include "sidebarextension.h" -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tdeaction.h> #include <tdeapplication.h> #include <kdebug.h> diff --git a/kontact/plugins/test/test_plugin.cpp b/kontact/plugins/test/test_plugin.cpp index db375d278..631d91cb8 100644 --- a/kontact/plugins/test/test_plugin.cpp +++ b/kontact/plugins/test/test_plugin.cpp @@ -21,7 +21,7 @@ with any edition of TQt, and distribute the resulting executable, without including the source code for TQt in the source distribution. */ -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeaction.h> #include <kgenericfactory.h> #include <kstatusbar.h> diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp index 65d0e73b3..37fbe74d0 100644 --- a/kontact/plugins/weather/summarywidget.cpp +++ b/kontact/plugins/weather/summarywidget.cpp @@ -29,10 +29,10 @@ #include <dcopref.h> #include <tdeapplication.h> #include <kdebug.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprocess.h> #include <kurllabel.h> diff --git a/kontact/src/aboutdialog.cpp b/kontact/src/aboutdialog.cpp index ca3bc265a..9059d09ba 100644 --- a/kontact/src/aboutdialog.cpp +++ b/kontact/src/aboutdialog.cpp @@ -27,7 +27,7 @@ #include "core.h" #include "plugin.h" -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdeaboutdata.h> #include <kactivelabel.h> diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp index d4eb6d3d1..39deb330c 100644 --- a/kontact/src/iconsidepane.cpp +++ b/kontact/src/iconsidepane.cpp @@ -39,7 +39,7 @@ #include <tdepopupmenu.h> #include <tdeapplication.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <sidebarextension.h> diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp index 61628bf9d..622d597b1 100644 --- a/kontact/src/kcmkontact.cpp +++ b/kontact/src/kcmkontact.cpp @@ -29,7 +29,7 @@ #include <tdeaboutdata.h> #include <kdebug.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <ktrader.h> #include <tqbuttongroup.h> diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp index 268acb897..a243db711 100644 --- a/kontact/src/main.cpp +++ b/kontact/src/main.cpp @@ -26,8 +26,8 @@ #include <tdecmdlineargs.h> #include <kdebug.h> #include <kiconloader.h> -#include <klocale.h> -#include <kstartupinfo.h> +#include <tdelocale.h> +#include <tdestartupinfo.h> #include <kuniqueapplication.h> #include <twin.h> #include <kstandarddirs.h> diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp index e36cd8270..d1a054edb 100644 --- a/kontact/src/mainwindow.cpp +++ b/kontact/src/mainwindow.cpp @@ -44,8 +44,8 @@ #include <kkeydialog.h> #include <klibloader.h> #include <tdelistbox.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdeparts/componentfactory.h> #include <kplugininfo.h> #include <tdepopupmenu.h> @@ -66,7 +66,7 @@ #include <kcursor.h> #include <krun.h> #include <tdeaboutdata.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <tdestdaccel.h> #include <kcmultidialog.h> #include <kipc.h> diff --git a/kontact/src/profiledialog.cpp b/kontact/src/profiledialog.cpp index 328848401..e85d90c51 100644 --- a/kontact/src/profiledialog.cpp +++ b/kontact/src/profiledialog.cpp @@ -27,8 +27,8 @@ #include <tdefiledialog.h> #include <tdelistview.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tqlayout.h> #include <tqpushbutton.h> diff --git a/kontact/src/profilemanager.cpp b/kontact/src/profilemanager.cpp index 80fdc8139..0d87b9bf7 100644 --- a/kontact/src/profilemanager.cpp +++ b/kontact/src/profilemanager.cpp @@ -28,7 +28,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kstaticdeleter.h> #include <kurl.h> diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp index 6c85c48b7..161614bfe 100644 --- a/korganizer/actionmanager.cpp +++ b/korganizer/actionmanager.cpp @@ -63,7 +63,7 @@ #include <tdepopupmenu.h> #include <kstandarddirs.h> #include <ktip.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kxmlguiclient.h> #include <twin.h> #include <knotifyclient.h> diff --git a/korganizer/archivedialog.cpp b/korganizer/archivedialog.cpp index 76985d1ac..989be2619 100644 --- a/korganizer/archivedialog.cpp +++ b/korganizer/archivedialog.cpp @@ -32,9 +32,9 @@ #include <tqhgroupbox.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurlrequester.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdefiledialog.h> #include <kurl.h> #include <klineedit.h> diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 3ef70ea7d..d4d2e8b07 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -82,11 +82,11 @@ #include <libkcal/calendarnull.h> #include <libkcal/htmlexportsettings.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> #include <kstandarddirs.h> #include <tdefiledialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <knotifyclient.h> #include <tdeconfig.h> #include <krun.h> diff --git a/korganizer/datechecker.cpp b/korganizer/datechecker.cpp index 7d7cdedbe..2be3d060e 100644 --- a/korganizer/datechecker.cpp +++ b/korganizer/datechecker.cpp @@ -26,8 +26,8 @@ #include <tqtimer.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include "datechecker.h" diff --git a/korganizer/datenavigator.cpp b/korganizer/datenavigator.cpp index 4d85a7a4d..1d7e8bde8 100644 --- a/korganizer/datenavigator.cpp +++ b/korganizer/datenavigator.cpp @@ -29,8 +29,8 @@ #include <kcalendarsystem.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KCal; diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp index dd3f8a1ac..bb965ba24 100644 --- a/korganizer/datenavigatorcontainer.cpp +++ b/korganizer/datenavigatorcontainer.cpp @@ -24,7 +24,7 @@ */ #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "koglobals.h" #include "navigatorbar.h" diff --git a/korganizer/eventarchiver.cpp b/korganizer/eventarchiver.cpp index 739dc9050..345629212 100644 --- a/korganizer/eventarchiver.cpp +++ b/korganizer/eventarchiver.cpp @@ -24,15 +24,15 @@ */ #include "eventarchiver.h" -#include <kglobal.h> -#include <klocale.h> -#include <ktempfile.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdetempfile.h> #include <tdeio/netaccess.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <libkcal/filestorage.h> #include <libkcal/calendarlocal.h> #include <libkcal/calendar.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include "koprefs.h" diff --git a/korganizer/exportwebdialog.cpp b/korganizer/exportwebdialog.cpp index 0cece6631..156ed7027 100644 --- a/korganizer/exportwebdialog.cpp +++ b/korganizer/exportwebdialog.cpp @@ -36,7 +36,7 @@ #include <tqtextstream.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdefiledialog.h> #include <klineedit.h> @@ -48,8 +48,8 @@ #include <kurlrequester.h> #include <tdeio/netaccess.h> #include <knotifyclient.h> -#include <ktempfile.h> -#include <kmessagebox.h> +#include <tdetempfile.h> +#include <tdemessagebox.h> #include <libkcal/calendar.h> #include <libkcal/htmlexportsettings.h> diff --git a/korganizer/filtereditdialog.cpp b/korganizer/filtereditdialog.cpp index c8251ca61..cd44d9c8f 100644 --- a/korganizer/filtereditdialog.cpp +++ b/korganizer/filtereditdialog.cpp @@ -33,8 +33,8 @@ #include <tqwhatsthis.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <knuminput.h> #include <libkcal/calfilter.h> diff --git a/korganizer/freebusymanager.cpp b/korganizer/freebusymanager.cpp index d23c75285..b3de84ad7 100644 --- a/korganizer/freebusymanager.cpp +++ b/korganizer/freebusymanager.cpp @@ -51,17 +51,17 @@ #include <tdeio/job.h> #include <kdebug.h> -#include <kmessagebox.h> -#include <ktempfile.h> +#include <tdemessagebox.h> +#include <tdetempfile.h> #include <tdeio/jobclasses.h> #include <tdeio/netaccess.h> #include <tdeio/scheduler.h> #include <tdeapplication.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> -#include <kabc/stdaddressbook.h> -#include <kabc/addressee.h> +#include <tdeabc/stdaddressbook.h> +#include <tdeabc/addressee.h> #include <tqfile.h> #include <tqbuffer.h> diff --git a/korganizer/freebusyurldialog.cpp b/korganizer/freebusyurldialog.cpp index eac14271b..519e103e7 100644 --- a/korganizer/freebusyurldialog.cpp +++ b/korganizer/freebusyurldialog.cpp @@ -28,7 +28,7 @@ #include <libkcal/freebusyurlstore.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kstandarddirs.h> diff --git a/korganizer/history.cpp b/korganizer/history.cpp index 0b9e5d995..74f8c8a35 100644 --- a/korganizer/history.cpp +++ b/korganizer/history.cpp @@ -28,7 +28,7 @@ #include <libkcal/calendar.h> #include <libkcal/incidence.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> using namespace KCal; diff --git a/korganizer/importdialog.cpp b/korganizer/importdialog.cpp index ee638fc77..4272f5dac 100644 --- a/korganizer/importdialog.cpp +++ b/korganizer/importdialog.cpp @@ -28,7 +28,7 @@ #include "koprefs.h" #include "stdcalendar.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqlabel.h> #include <tqlayout.h> diff --git a/korganizer/incidencechanger.cpp b/korganizer/incidencechanger.cpp index 20f409e77..e03eba318 100644 --- a/korganizer/incidencechanger.cpp +++ b/korganizer/incidencechanger.cpp @@ -31,8 +31,8 @@ #include <libkcal/freebusy.h> #include <libkcal/dndfactory.h> #include <kdebug.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> bool IncidenceChanger::beginChange( Incidence *incidence, ResourceCalendar *res, const TQString &subRes ) diff --git a/korganizer/interfaces/calendar/plugin.h b/korganizer/interfaces/calendar/plugin.h index eb0f78927..853c3cdf0 100644 --- a/korganizer/interfaces/calendar/plugin.h +++ b/korganizer/interfaces/calendar/plugin.h @@ -21,7 +21,7 @@ #ifndef KORG_PLUGIN_H #define KORG_PLUGIN_H -#include <klocale.h> +#include <tdelocale.h> #include <klibloader.h> namespace KOrg { diff --git a/korganizer/interfaces/korganizer/baseview.h b/korganizer/interfaces/korganizer/baseview.h index fe0bd96c0..a8ca0c582 100644 --- a/korganizer/interfaces/korganizer/baseview.h +++ b/korganizer/interfaces/korganizer/baseview.h @@ -26,9 +26,9 @@ #include <tqptrlist.h> #include <tqvaluelist.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdepimmacros.h> #include "korganizer/incidencechangerbase.h" diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp index 3594a8605..f92ae338b 100644 --- a/korganizer/journalentry.cpp +++ b/korganizer/journalentry.cpp @@ -34,14 +34,14 @@ #include <kdebug.h> #include <kdialog.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <ktextedit.h> #include <ktimeedit.h> #include <klineedit.h> #include <kactivelabel.h> #include <kstdguiitem.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <libkcal/journal.h> #include <libkcal/calendar.h> diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index dcf2a3ebd..230c992dc 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp @@ -31,9 +31,9 @@ #include <tqlabel.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include "koglobals.h" #include "koprefs.h" diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index 484cc1657..b242c3065 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp @@ -35,10 +35,10 @@ #include <tqlabel.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kglobal.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdemessagebox.h> #include "koagendaitem.h" #include "koprefs.h" diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp index 216f1dfd8..bba8840ac 100644 --- a/korganizer/koagendaitem.cpp +++ b/korganizer/koagendaitem.cpp @@ -29,17 +29,17 @@ #include <kiconloader.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kwordwrap.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <libkcal/icaldrag.h> #include <libkcal/vcaldrag.h> #include <libtdepim/kvcarddrag.h> #include <libemailfunctions/email.h> #ifndef KORG_NOKABC -#include <kabc/addressee.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/addressee.h> +#include <tdeabc/vcardconverter.h> #endif #include "koprefs.h" diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index 869fe119b..7e68deebd 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp @@ -43,10 +43,10 @@ #include <kdebug.h> #include <kstandarddirs.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <kholidays.h> #include <libkcal/calendar.h> diff --git a/korganizer/koapp.cpp b/korganizer/koapp.cpp index ad9943593..8d6b6f61c 100644 --- a/korganizer/koapp.cpp +++ b/korganizer/koapp.cpp @@ -27,11 +27,11 @@ #include <stdlib.h> #include <iostream> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdecmdlineargs.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <twin.h> #include <kurl.h> @@ -50,7 +50,7 @@ #include "stdcalendar.h" #include "koapp.h" -#include <kstartupinfo.h> +#include <tdestartupinfo.h> using namespace std; diff --git a/korganizer/koattendeeeditor.cpp b/korganizer/koattendeeeditor.cpp index 5f0da24a2..4411e9666 100644 --- a/korganizer/koattendeeeditor.cpp +++ b/korganizer/koattendeeeditor.cpp @@ -25,7 +25,7 @@ #include "koglobals.h" #ifndef KORG_NOKABC -#include <kabc/addresseedialog.h> +#include <tdeabc/addresseedialog.h> #include <libtdepim/addressesdialog.h> #include <libtdepim/addresseelineedit.h> #endif @@ -37,13 +37,13 @@ #ifdef TDEPIM_NEW_DISTRLISTS #include "distributionlist.h" #else -#include <kabc/distributionlist.h> +#include <tdeabc/distributionlist.h> #endif -#include <kabc/stdaddressbook.h> +#include <tdeabc/stdaddressbook.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tqcheckbox.h> #include <tqcombobox.h> diff --git a/korganizer/koattendeeeditor.h b/korganizer/koattendeeeditor.h index 776304260..abe649595 100644 --- a/korganizer/koattendeeeditor.h +++ b/korganizer/koattendeeeditor.h @@ -23,7 +23,7 @@ #include <tqwidget.h> #include <libkcal/attendee.h> -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> class TQBoxLayout; class TQComboBox; diff --git a/korganizer/kocore.cpp b/korganizer/kocore.cpp index 0b1d39dbe..9bc2adbc8 100644 --- a/korganizer/kocore.cpp +++ b/korganizer/kocore.cpp @@ -37,7 +37,7 @@ #include <tdeconfig.h> #include <kxmlguifactory.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqwidget.h> diff --git a/korganizer/kocounterdialog.cpp b/korganizer/kocounterdialog.cpp index 883aba872..5341e1d03 100644 --- a/korganizer/kocounterdialog.cpp +++ b/korganizer/kocounterdialog.cpp @@ -23,7 +23,7 @@ */ -#include <klocale.h> +#include <tdelocale.h> #include <libkcal/event.h> #include <libkcal/todo.h> diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 13de8f7ea..1c9bc93cb 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -30,9 +30,9 @@ #include <tqpainter.h> #include <tqptrlist.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <libkcal/vcaldrag.h> diff --git a/korganizer/koeditoralarms.cpp b/korganizer/koeditoralarms.cpp index 6d91d1187..1415eef59 100644 --- a/korganizer/koeditoralarms.cpp +++ b/korganizer/koeditoralarms.cpp @@ -43,7 +43,7 @@ #include <tqwhatsthis.h> #include <kurlrequester.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <libkcal/alarm.h> diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp index b7aff0a28..77216a99e 100644 --- a/korganizer/koeditorattachments.cpp +++ b/korganizer/koeditorattachments.cpp @@ -34,13 +34,13 @@ #include <libtdepim/kvcarddrag.h> #include <libtdepim/tdepimprotocols.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kmdcodec.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <krun.h> #include <kurldrag.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <ktempdir.h> #include <tdeio/netaccess.h> #include <kmimetype.h> diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp index ebc70200b..4889906a3 100644 --- a/korganizer/koeditordetails.cpp +++ b/korganizer/koeditordetails.cpp @@ -46,16 +46,16 @@ #include <tqvaluevector.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #ifndef KORG_NOKABC -#include <kabc/addresseedialog.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/addresseedialog.h> +#include <tdeabc/vcardconverter.h> #include <libtdepim/addressesdialog.h> #include <libtdepim/addresseelineedit.h> #include <libtdepim/distributionlist.h> -#include <kabc/stdaddressbook.h> +#include <tdeabc/stdaddressbook.h> #endif #include <libtdepim/kvcarddrag.h> #include <libemailfunctions/email.h> diff --git a/korganizer/koeditorfreebusy.cpp b/korganizer/koeditorfreebusy.cpp index c97ad4568..ee416efaf 100644 --- a/korganizer/koeditorfreebusy.cpp +++ b/korganizer/koeditorfreebusy.cpp @@ -31,17 +31,17 @@ #include <tqwhatsthis.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #ifndef KORG_NOKABC -#include <kabc/addresseedialog.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/addresseedialog.h> +#include <tdeabc/vcardconverter.h> #include <libtdepim/addressesdialog.h> #include <libtdepim/addresseelineedit.h> #include <libtdepim/distributionlist.h> -#include <kabc/stdaddressbook.h> +#include <tdeabc/stdaddressbook.h> #endif #include <libkcal/event.h> diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp index 0ab854a96..304fea93f 100644 --- a/korganizer/koeditorgeneral.cpp +++ b/korganizer/koeditorgeneral.cpp @@ -39,12 +39,12 @@ #include <tqspinbox.h> #include <tqwhatsthis.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdialog.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdefiledialog.h> #include <ksqueezedtextlabel.h> #include <kstandarddirs.h> diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp index 47cb603a8..49b4d9691 100644 --- a/korganizer/koeditorgeneralevent.cpp +++ b/korganizer/koeditorgeneralevent.cpp @@ -37,9 +37,9 @@ #include <tqwhatsthis.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdefiledialog.h> #include <kstandarddirs.h> #include <ktextedit.h> diff --git a/korganizer/koeditorgeneraljournal.cpp b/korganizer/koeditorgeneraljournal.cpp index 3741acb3f..9b27c0638 100644 --- a/korganizer/koeditorgeneraljournal.cpp +++ b/korganizer/koeditorgeneraljournal.cpp @@ -33,8 +33,8 @@ #include <kdateedit.h> #include <ktimeedit.h> //#include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <tqgroupbox.h> diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp index 132c32901..5af7fd60f 100644 --- a/korganizer/koeditorgeneraltodo.cpp +++ b/korganizer/koeditorgeneraltodo.cpp @@ -36,9 +36,9 @@ #include <tqpushbutton.h> #include <tqwhatsthis.h> -#include <kglobal.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <kstandarddirs.h> #include <tdefiledialog.h> diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp index 3aceab473..ac372db76 100644 --- a/korganizer/koeditorrecurrence.cpp +++ b/korganizer/koeditorrecurrence.cpp @@ -41,13 +41,13 @@ #include <tqwhatsthis.h> #include <kdialog.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kdebug.h> #include <knumvalidator.h> #include <kcalendarsystem.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <libtdepim/kdateedit.h> #include <libkcal/todo.h> diff --git a/korganizer/koeventeditor.cpp b/korganizer/koeventeditor.cpp index c24af1a06..c31c54322 100644 --- a/korganizer/koeventeditor.cpp +++ b/korganizer/koeventeditor.cpp @@ -32,8 +32,8 @@ #include <kiconloader.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <libkcal/calendarresources.h> #include <libkcal/resourcecalendar.h> #include <libkcal/incidenceformatter.h> diff --git a/korganizer/koeventpopupmenu.cpp b/korganizer/koeventpopupmenu.cpp index 3d331ed07..ae4e4c20d 100644 --- a/korganizer/koeventpopupmenu.cpp +++ b/korganizer/koeventpopupmenu.cpp @@ -25,7 +25,7 @@ #include <tqcursor.h> #include <tdeactioncollection.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kiconloader.h> #include <kurl.h> diff --git a/korganizer/koeventview.cpp b/korganizer/koeventview.cpp index 587a60d06..9bd038d2a 100644 --- a/korganizer/koeventview.cpp +++ b/korganizer/koeventview.cpp @@ -25,10 +25,10 @@ #include <tqpopupmenu.h> #include <tqcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kxmlguiclient.h> #include <kxmlguifactory.h> diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index 124c38fbe..ddd4fcde7 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp @@ -32,7 +32,7 @@ #include <libkcal/incidenceformatter.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <tqcursor.h> diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp index afbe84194..7e783695b 100644 --- a/korganizer/koeventviewerdialog.cpp +++ b/korganizer/koeventviewerdialog.cpp @@ -26,7 +26,7 @@ #include "koeventviewer.h" -#include <klocale.h> +#include <tdelocale.h> KOEventViewerDialog::KOEventViewerDialog( Calendar *calendar, TQWidget *parent, const char *name, bool compact ) diff --git a/korganizer/koglobals.cpp b/korganizer/koglobals.cpp index b3fd073b6..829e8858c 100644 --- a/korganizer/koglobals.cpp +++ b/korganizer/koglobals.cpp @@ -25,11 +25,11 @@ #include <tqapplication.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kstandarddirs.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> #include <kstaticdeleter.h> #include <kiconloader.h> diff --git a/korganizer/kogroupware.cpp b/korganizer/kogroupware.cpp index 0673ec6ec..6e86c8575 100644 --- a/korganizer/kogroupware.cpp +++ b/korganizer/kogroupware.cpp @@ -45,7 +45,7 @@ #include <libkcal/journal.h> #include <libkcal/incidenceformatter.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kdirwatch.h> #include <tqfile.h> diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp index 74ad2855c..0cd128ccd 100644 --- a/korganizer/koincidenceeditor.cpp +++ b/korganizer/koincidenceeditor.cpp @@ -32,12 +32,12 @@ #include <tqwhatsthis.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kinputdialog.h> #include <tdeio/netaccess.h> -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <libtdepim/designerfields.h> #include <libtdepim/embeddedurlpage.h> diff --git a/korganizer/kojournaleditor.cpp b/korganizer/kojournaleditor.cpp index 867d447f4..b21146d09 100644 --- a/korganizer/kojournaleditor.cpp +++ b/korganizer/kojournaleditor.cpp @@ -35,8 +35,8 @@ #include <libkcal/calendarlocal.h> #include <korganizer/baseview.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqlayout.h> diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp index f5d64ca6a..3bc78156f 100644 --- a/korganizer/kojournalview.cpp +++ b/korganizer/kojournalview.cpp @@ -31,7 +31,7 @@ #include <tqlabel.h> #include <tqscrollview.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <libkcal/calendar.h> diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index d33f185d9..aa97348ca 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp @@ -30,10 +30,10 @@ #include <tqcursor.h> #include <tqstyle.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kiconloader.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <libkcal/calendar.h> #include <libkcal/incidenceformatter.h> diff --git a/korganizer/komailclient.cpp b/korganizer/komailclient.cpp index c88b6383d..60855bdaf 100644 --- a/korganizer/komailclient.cpp +++ b/korganizer/komailclient.cpp @@ -25,10 +25,10 @@ #include <unistd.h> #include <stdio.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kurl.h> #include <tdeapplication.h> #include <dcopclient.h> diff --git a/korganizer/komessagebox.cpp b/korganizer/komessagebox.cpp index 6a0100aad..9c843b59d 100644 --- a/korganizer/komessagebox.cpp +++ b/korganizer/komessagebox.cpp @@ -22,7 +22,7 @@ without including the source code for TQt in the source distribution. */ -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdialogbase.h> #include <tqpushbutton.h> diff --git a/korganizer/komessagebox.h b/korganizer/komessagebox.h index 2335fce77..561b9f8c2 100644 --- a/korganizer/komessagebox.h +++ b/korganizer/komessagebox.h @@ -25,7 +25,7 @@ #include <kguiitem.h> #include <kstdguiitem.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqmessagebox.h> #include <tqstring.h> diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index a741d7f2b..c75523a9c 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -38,8 +38,8 @@ #include <tqlabel.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kiconloader.h> #include <kwordwrap.h> diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index a8f6acc3e..f5f76e26f 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp @@ -33,12 +33,12 @@ #include <tqmap.h> #include <tqstringlist.h> -#include <kglobalsettings.h> -#include <kglobal.h> +#include <tdeglobalsettings.h> +#include <tdeglobal.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kemailsettings.h> +#include <tdeemailsettings.h> #include <kstaticdeleter.h> #include <kstringhandler.h> @@ -48,7 +48,7 @@ #include <libkpimidentities/identitymanager.h> #include <libkpimidentities/identity.h> #include <libemailfunctions/email.h> -#include <kabc/stdaddressbook.h> +#include <tdeabc/stdaddressbook.h> #include <ktimezones.h> #include "kocore.h" diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index 3cfbe1711..08763b63a 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp @@ -46,12 +46,12 @@ #include <kcolorbutton.h> #include <kcombobox.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdeglobal.h> +#include <tdemessagebox.h> #include <kiconloader.h> #include <knuminput.h> -#include <kemailsettings.h> +#include <tdeemailsettings.h> #include <kcalendarsystem.h> #include <ktrader.h> #include <kpushbutton.h> diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp index fc3369461..edeffaf38 100644 --- a/korganizer/korgac/alarmdialog.cpp +++ b/korganizer/korgac/alarmdialog.cpp @@ -40,11 +40,11 @@ #include <tdeconfig.h> #include <kdcopservicestarter.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprocess.h> #include <kaudioplayer.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <knotifyclient.h> #include <kcombobox.h> #include <tdelistview.h> diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp index d1eb5347a..f8f15addf 100644 --- a/korganizer/korgac/alarmdockwindow.cpp +++ b/korganizer/korgac/alarmdockwindow.cpp @@ -28,14 +28,14 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdeversion.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdeconfig.h> #include <kurl.h> #include <kstandarddirs.h> #include <dcopclient.h> #include <tdepopupmenu.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeaction.h> #include <kstdaction.h> diff --git a/korganizer/korgac/koalarmclient.cpp b/korganizer/korgac/koalarmclient.cpp index 7707e0eca..2a87c7fd2 100644 --- a/korganizer/korgac/koalarmclient.cpp +++ b/korganizer/korgac/koalarmclient.cpp @@ -33,7 +33,7 @@ #include <kstandarddirs.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <twin.h> diff --git a/korganizer/korgac/korgacmain.cpp b/korganizer/korgac/korgacmain.cpp index 6dce72116..d44ac4a2e 100644 --- a/korganizer/korgac/korgacmain.cpp +++ b/korganizer/korgac/korgacmain.cpp @@ -24,9 +24,9 @@ #include <stdlib.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> #include <kuniqueapplication.h> diff --git a/korganizer/korgac/testalarmdlg.cpp b/korganizer/korgac/testalarmdlg.cpp index 38b6310e0..de4f839e6 100644 --- a/korganizer/korgac/testalarmdlg.cpp +++ b/korganizer/korgac/testalarmdlg.cpp @@ -27,7 +27,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <tdeconfig.h> #include <kstandarddirs.h> diff --git a/korganizer/korganizer.cpp b/korganizer/korganizer.cpp index 6bbcdaeea..5646d709e 100644 --- a/korganizer/korganizer.cpp +++ b/korganizer/korganizer.cpp @@ -54,7 +54,7 @@ #include <libkcal/calendarresources.h> #include <libkcal/resourcecalendar.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> #include <kiconloader.h> #include <kstandarddirs.h> @@ -63,9 +63,9 @@ #include <tdeaction.h> #include <kstdaction.h> #include <kedittoolbar.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeio/netaccess.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <dcopclient.h> #include <kprocess.h> #include <twin.h> diff --git a/korganizer/korganizer.kcfg b/korganizer/korganizer.kcfg index ce09ca969..01ff6b2e7 100644 --- a/korganizer/korganizer.kcfg +++ b/korganizer/korganizer.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" > <kcfgfile name="korganizerrc"/> - <include>klocale.h</include> + <include>tdelocale.h</include> <group name="General"> <entry type="Bool" key="Auto Save"> diff --git a/korganizer/korganizer_options.h b/korganizer/korganizer_options.h index 29e0a543e..fcd2b7ce4 100644 --- a/korganizer/korganizer_options.h +++ b/korganizer/korganizer_options.h @@ -27,7 +27,7 @@ #define KORGANIZER_OPTIONS_H #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> static const TDECmdLineOptions korganizer_options[] = { diff --git a/korganizer/korganizer_part.cpp b/korganizer/korganizer_part.cpp index cce2c88d1..1b607169c 100644 --- a/korganizer/korganizer_part.cpp +++ b/korganizer/korganizer_part.cpp @@ -42,14 +42,14 @@ #include <tdepopupmenu.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdeaction.h> #include <kdebug.h> #include <kstandarddirs.h> #include <tdeconfig.h> #include <kprocess.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kstatusbar.h> #include <tdeparts/genericfactory.h> #include <tdeparts/partmanager.h> diff --git a/korganizer/korgplugins.cpp b/korganizer/korgplugins.cpp index 3ee64db4f..882afd943 100644 --- a/korganizer/korgplugins.cpp +++ b/korganizer/korgplugins.cpp @@ -25,7 +25,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <calendar/plugin.h> diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp index 6b59571da..9da336594 100644 --- a/korganizer/kotodoeditor.cpp +++ b/korganizer/kotodoeditor.cpp @@ -31,8 +31,8 @@ #include <tqdatetime.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <libkcal/calendarlocal.h> #include <libkcal/calendarresources.h> diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index 703ec040b..c1e30eedd 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp @@ -30,10 +30,10 @@ #include <tqtimer.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <libkcal/calhelper.h> #include <libkcal/icaldrag.h> diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp index 1e13f8a6a..92d68f9f4 100644 --- a/korganizer/kotodoviewitem.cpp +++ b/korganizer/kotodoviewitem.cpp @@ -31,7 +31,7 @@ #include <libkcal/incidenceformatter.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqpainter.h> #include <tqpixmap.h> diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index ec53ba360..2ee92b12d 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp @@ -29,7 +29,7 @@ #include <libkcal/calendarresources.h> #include <tdeactioncollection.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "actionmanager.h" #include "calendarview.h" diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp index b2a3b402d..7b8ab9921 100644 --- a/korganizer/kowhatsnextview.cpp +++ b/korganizer/kowhatsnextview.cpp @@ -28,11 +28,11 @@ #include <tqfileinfo.h> #include <tqlabel.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <libkcal/calendar.h> #include <libkcal/incidenceformatter.h> diff --git a/korganizer/mailscheduler.cpp b/korganizer/mailscheduler.cpp index 671e15d3d..c57cd6f28 100644 --- a/korganizer/mailscheduler.cpp +++ b/korganizer/mailscheduler.cpp @@ -26,7 +26,7 @@ #include <tqfile.h> #include <tqregexp.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kdebug.h> diff --git a/korganizer/main.cpp b/korganizer/main.cpp index 8a022d8ab..9090b949c 100644 --- a/korganizer/main.cpp +++ b/korganizer/main.cpp @@ -26,11 +26,11 @@ #include "koapp.h" #include "aboutdata.h" -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include "korganizer.h" #include "korganizer_options.h" diff --git a/korganizer/multiagendaview.cpp b/korganizer/multiagendaview.cpp index e76d36b50..7cbd42ebb 100644 --- a/korganizer/multiagendaview.cpp +++ b/korganizer/multiagendaview.cpp @@ -25,7 +25,7 @@ #include <libkcal/calendarresources.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tqlayout.h> #include <tqvbox.h> diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp index f14176fb8..223cbb98e 100644 --- a/korganizer/navigatorbar.cpp +++ b/korganizer/navigatorbar.cpp @@ -31,8 +31,8 @@ #include <tqlabel.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kiconloader.h> #include "koglobals.h" diff --git a/korganizer/plugins/datenums/configdialog.cpp b/korganizer/plugins/datenums/configdialog.cpp index a8ad5858d..5b3b47d84 100644 --- a/korganizer/plugins/datenums/configdialog.cpp +++ b/korganizer/plugins/datenums/configdialog.cpp @@ -23,10 +23,10 @@ #include <tqvbuttongroup.h> #include <tqradiobutton.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kstandarddirs.h> #include <ksimpleconfig.h> diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp index e6695e53c..1adefd207 100644 --- a/korganizer/plugins/exchange/exchange.cpp +++ b/korganizer/plugins/exchange/exchange.cpp @@ -26,10 +26,10 @@ #include <kurl.h> #include <kdebug.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tdeaction.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "korganizer/korganizer.h" #include "korganizer/calendarview.h" diff --git a/korganizer/plugins/exchange/exchangeconfig.cpp b/korganizer/plugins/exchange/exchangeconfig.cpp index 55710bcc8..106fc8672 100644 --- a/korganizer/plugins/exchange/exchangeconfig.cpp +++ b/korganizer/plugins/exchange/exchangeconfig.cpp @@ -23,9 +23,9 @@ #include <tdeapplication.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <exchangeaccount.h> diff --git a/korganizer/plugins/exchange/exchangedialog.cpp b/korganizer/plugins/exchange/exchangedialog.cpp index d998f37f3..e457de38a 100644 --- a/korganizer/plugins/exchange/exchangedialog.cpp +++ b/korganizer/plugins/exchange/exchangedialog.cpp @@ -21,10 +21,10 @@ #include <tqlabel.h> #include <tqcombobox.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <ksimpleconfig.h> diff --git a/korganizer/plugins/hebrew/configdialog.cpp b/korganizer/plugins/hebrew/configdialog.cpp index a6dd2e5a8..06f0b1b7d 100644 --- a/korganizer/plugins/hebrew/configdialog.cpp +++ b/korganizer/plugins/hebrew/configdialog.cpp @@ -18,10 +18,10 @@ */ #include "configdialog.h" #include "configdialog.moc" -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kstandarddirs.h> #include <ksimpleconfig.h> diff --git a/korganizer/plugins/hebrew/converter.cpp b/korganizer/plugins/hebrew/converter.cpp index 1381292e6..39140715f 100644 --- a/korganizer/plugins/hebrew/converter.cpp +++ b/korganizer/plugins/hebrew/converter.cpp @@ -9,7 +9,7 @@ * (at your option) any later version. * ***************************************************************************/ #include "converter.h" -#include <klocale.h> +#include <tdelocale.h> Converter::Converter() { diff --git a/korganizer/plugins/hebrew/hebrew.cpp b/korganizer/plugins/hebrew/hebrew.cpp index 065188537..a96859a6c 100644 --- a/korganizer/plugins/hebrew/hebrew.cpp +++ b/korganizer/plugins/hebrew/hebrew.cpp @@ -17,7 +17,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kstandarddirs.h> #include <ksimpleconfig.h> diff --git a/korganizer/plugins/hebrew/holiday.cpp b/korganizer/plugins/hebrew/holiday.cpp index c6afbb613..c4f5aa6ee 100644 --- a/korganizer/plugins/hebrew/holiday.cpp +++ b/korganizer/plugins/hebrew/holiday.cpp @@ -9,7 +9,7 @@ * (at your option) any later version. * ***************************************************************************/ #include "holiday.h" -#include <klocale.h> +#include <tdelocale.h> bool Holiday::CholP; bool Holiday::OmerP; diff --git a/korganizer/plugins/hebrew/parsha.cpp b/korganizer/plugins/hebrew/parsha.cpp index bba30f620..4f5522ab7 100644 --- a/korganizer/plugins/hebrew/parsha.cpp +++ b/korganizer/plugins/hebrew/parsha.cpp @@ -9,7 +9,7 @@ * (at your option) any later version. * ***************************************************************************/ #include "parsha.h" -#include <klocale.h> +#include <tdelocale.h> TQStringList Parsha::parshiot_names; diff --git a/korganizer/plugins/printing/journal/journalprint.h b/korganizer/plugins/printing/journal/journalprint.h index c84153a47..1ab7e2597 100644 --- a/korganizer/plugins/printing/journal/journalprint.h +++ b/korganizer/plugins/printing/journal/journalprint.h @@ -24,7 +24,7 @@ #ifndef JOURNALPRINT_H #define JOURNALPRINT_H -#include <klocale.h> +#include <tdelocale.h> #include "calprintpluginbase.h" #ifndef KORG_NOPRINTER diff --git a/korganizer/plugins/printing/list/listprint.h b/korganizer/plugins/printing/list/listprint.h index db7997272..dd47ae374 100644 --- a/korganizer/plugins/printing/list/listprint.h +++ b/korganizer/plugins/printing/list/listprint.h @@ -24,7 +24,7 @@ #ifndef LISTPRINT_H #define LISTPRINT_H -#include <klocale.h> +#include <tdelocale.h> #include "calprintpluginbase.h" #ifndef KORG_NOPRINTER diff --git a/korganizer/plugins/printing/whatsnext/whatsnextprint.h b/korganizer/plugins/printing/whatsnext/whatsnextprint.h index 467e02571..d31a585cc 100644 --- a/korganizer/plugins/printing/whatsnext/whatsnextprint.h +++ b/korganizer/plugins/printing/whatsnext/whatsnextprint.h @@ -24,7 +24,7 @@ #ifndef WHATSNEXTPRINT_H #define WHATSNEXTPRINT_H -#include <klocale.h> +#include <tdelocale.h> #include "calprintpluginbase.h" #ifndef KORG_NOPRINTER diff --git a/korganizer/plugins/printing/year/yearprint.cpp b/korganizer/plugins/printing/year/yearprint.cpp index 41d54c243..c10218457 100644 --- a/korganizer/plugins/printing/year/yearprint.cpp +++ b/korganizer/plugins/printing/year/yearprint.cpp @@ -32,7 +32,7 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kcalendarsystem.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqcheckbox.h> #include <tqspinbox.h> diff --git a/korganizer/plugins/printing/year/yearprint.h b/korganizer/plugins/printing/year/yearprint.h index 99c1422e0..ae6435bf3 100644 --- a/korganizer/plugins/printing/year/yearprint.h +++ b/korganizer/plugins/printing/year/yearprint.h @@ -24,7 +24,7 @@ #ifndef YEARPRINT_H #define YEARPRINT_H -#include <klocale.h> +#include <tdelocale.h> #include "calprintpluginbase.h" #ifndef KORG_NOPRINTER diff --git a/korganizer/plugins/projectview/koprojectview.cpp b/korganizer/plugins/projectview/koprojectview.cpp index 8f0c3b662..033b6ba64 100644 --- a/korganizer/plugins/projectview/koprojectview.cpp +++ b/korganizer/plugins/projectview/koprojectview.cpp @@ -30,10 +30,10 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeconfig.h> #include <kstandarddirs.h> diff --git a/korganizer/plugins/projectview/projectview.cpp b/korganizer/plugins/projectview/projectview.cpp index 9c8b611e0..602576234 100644 --- a/korganizer/plugins/projectview/projectview.cpp +++ b/korganizer/plugins/projectview/projectview.cpp @@ -22,10 +22,10 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeaction.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "koprojectview.h" diff --git a/korganizer/plugins/timespanview/timespanview.cpp b/korganizer/plugins/timespanview/timespanview.cpp index d3ab6a6cf..4b3df7ef7 100644 --- a/korganizer/plugins/timespanview/timespanview.cpp +++ b/korganizer/plugins/timespanview/timespanview.cpp @@ -22,10 +22,10 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeaction.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "kotimespanview.h" diff --git a/korganizer/plugins/timespanview/timespanwidget.cpp b/korganizer/plugins/timespanview/timespanwidget.cpp index b1c156ee5..8b0ff4b39 100644 --- a/korganizer/plugins/timespanview/timespanwidget.cpp +++ b/korganizer/plugins/timespanview/timespanwidget.cpp @@ -28,7 +28,7 @@ #include <tqheader.h> #include <tqpushbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <libkcal/event.h> diff --git a/korganizer/previewdialog.cpp b/korganizer/previewdialog.cpp index 2753475f9..dade7791b 100644 --- a/korganizer/previewdialog.cpp +++ b/korganizer/previewdialog.cpp @@ -32,13 +32,13 @@ #include "koprefs.h" #include "stdcalendar.h" -#include <klocale.h> +#include <tdelocale.h> #include <libkcal/calendarlocal.h> #include <kstandarddirs.h> #include <tdefiledialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeio/netaccess.h> #include <tqlabel.h> diff --git a/korganizer/printing/calprintdefaultplugins.h b/korganizer/printing/calprintdefaultplugins.h index 162b8a4e8..ee9cc3f72 100644 --- a/korganizer/printing/calprintdefaultplugins.h +++ b/korganizer/printing/calprintdefaultplugins.h @@ -26,7 +26,7 @@ #define CALPRINTDEFAULTPLUGINS_H -#include <klocale.h> +#include <tdelocale.h> #include "calprintpluginbase.h" #ifndef KORG_NOPRINTER diff --git a/korganizer/printing/cellitem.cpp b/korganizer/printing/cellitem.cpp index 9551ac8ae..575669a42 100644 --- a/korganizer/printing/cellitem.cpp +++ b/korganizer/printing/cellitem.cpp @@ -24,7 +24,7 @@ #include "cellitem.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqintdict.h> diff --git a/korganizer/publishdialog.cpp b/korganizer/publishdialog.cpp index 5d8b3462e..f4d8ea84f 100644 --- a/korganizer/publishdialog.cpp +++ b/korganizer/publishdialog.cpp @@ -26,10 +26,10 @@ #include <kdebug.h> #include <tqlistview.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #ifndef KORG_NOKABC -#include <kabc/addresseedialog.h> +#include <tdeabc/addresseedialog.h> #endif #include <libkcal/attendee.h> diff --git a/korganizer/resourceview.cpp b/korganizer/resourceview.cpp index 2dd4953bb..4a07cb4b7 100644 --- a/korganizer/resourceview.cpp +++ b/korganizer/resourceview.cpp @@ -31,10 +31,10 @@ #include <kcolordialog.h> #include <kdialog.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kglobal.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdemessagebox.h> #include <kinputdialog.h> #include <kiconloader.h> #include <tderesources/resource.h> diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index 6d315c50a..dd0f4552c 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp @@ -31,8 +31,8 @@ #include <tqlabel.h> #include <tqlineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <libkcal/calendar.h> diff --git a/korganizer/statusdialog.cpp b/korganizer/statusdialog.cpp index ba86ce7f6..1d4064478 100644 --- a/korganizer/statusdialog.cpp +++ b/korganizer/statusdialog.cpp @@ -28,7 +28,7 @@ #include <tqcombobox.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <kstdguiitem.h> diff --git a/korganizer/stdcalendar.cpp b/korganizer/stdcalendar.cpp index a7fcd5442..481fd3fd4 100644 --- a/korganizer/stdcalendar.cpp +++ b/korganizer/stdcalendar.cpp @@ -27,7 +27,7 @@ #include <kstaticdeleter.h> #include <tdeconfig.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> using namespace KOrg; diff --git a/korganizer/templatemanagementdialog.cpp b/korganizer/templatemanagementdialog.cpp index bbee8ca80..57209cd05 100644 --- a/korganizer/templatemanagementdialog.cpp +++ b/korganizer/templatemanagementdialog.cpp @@ -42,8 +42,8 @@ #include <kpushbutton.h> #include <kinputdialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> TemplateManagementDialog::TemplateManagementDialog(TQWidget *parent, const TQStringList &templates ) :KDialogBase( parent, "template_management_dialog", true, diff --git a/korganizer/timelabels.cpp b/korganizer/timelabels.cpp index 0d554edd4..27a253c09 100644 --- a/korganizer/timelabels.cpp +++ b/korganizer/timelabels.cpp @@ -35,7 +35,7 @@ #include <tqstringlist.h> #include <tqdatetime.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "koglobals.h" #include "kocore.h" diff --git a/korganizer/timezone.cpp b/korganizer/timezone.cpp index 1753e0376..c77711b00 100644 --- a/korganizer/timezone.cpp +++ b/korganizer/timezone.cpp @@ -28,9 +28,9 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "koprefs.h" diff --git a/korganizer/urihandler.cpp b/korganizer/urihandler.cpp index 236a71244..966442401 100644 --- a/korganizer/urihandler.cpp +++ b/korganizer/urihandler.cpp @@ -37,13 +37,13 @@ using namespace KCal; #include <tdeapplication.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kmimetype.h> #include <kprocess.h> #include <krun.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <tdeio/netaccess.h> diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp index 4b1fd76da..e67296d57 100644 --- a/korn/boxcontaineritem.cpp +++ b/korn/boxcontaineritem.cpp @@ -26,10 +26,10 @@ #include <kbugreport.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconeffect.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpassivepopup.h> #include <tdepopupmenu.h> #include <kprocess.h> diff --git a/korn/dcop_proto.cpp b/korn/dcop_proto.cpp index d4a8bd3b0..94fd5f041 100644 --- a/korn/dcop_proto.cpp +++ b/korn/dcop_proto.cpp @@ -23,7 +23,7 @@ #include "dcopdrop.h" #include <tdeconfigbase.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqmap.h> #include <tqptrlist.h> diff --git a/korn/dockeditem.cpp b/korn/dockeditem.cpp index 7d5de1865..40274474d 100644 --- a/korn/dockeditem.cpp +++ b/korn/dockeditem.cpp @@ -23,11 +23,11 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kpassivepopup.h> #include <tdepopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqbitmap.h> #include <tqcursor.h> diff --git a/korn/kio.cpp b/korn/kio.cpp index 195f73d8c..678b3848c 100644 --- a/korn/kio.cpp +++ b/korn/kio.cpp @@ -43,7 +43,7 @@ #include<tdeconfig.h> #include<tdeconfigbase.h> #include<kdebug.h> -#include<klocale.h> +#include<tdelocale.h> #include<kprocess.h> #include<tqptrlist.h> diff --git a/korn/kmail_proto.cpp b/korn/kmail_proto.cpp index 7be0555d4..a3fddad33 100644 --- a/korn/kmail_proto.cpp +++ b/korn/kmail_proto.cpp @@ -26,7 +26,7 @@ #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqmap.h> #include <tqobject.h> diff --git a/korn/kornboxcfgimpl.cpp b/korn/kornboxcfgimpl.cpp index 92f81be8f..7d29e1f51 100644 --- a/korn/kornboxcfgimpl.cpp +++ b/korn/kornboxcfgimpl.cpp @@ -28,7 +28,7 @@ class TDEConfig; #include <kdebug.h> #include <tdefiledialog.h> #include <tdefontdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kicondialog.h> #include <kurlrequester.h> diff --git a/korn/korncfgimpl.cpp b/korn/korncfgimpl.cpp index 1d3ba7360..c6e8d171d 100644 --- a/korn/korncfgimpl.cpp +++ b/korn/korncfgimpl.cpp @@ -25,7 +25,7 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kdialogbase.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqcolor.h> #include <tqcheckbox.h> diff --git a/korn/kornshell.cpp b/korn/kornshell.cpp index 72ca18a8c..7f5587bc6 100644 --- a/korn/kornshell.cpp +++ b/korn/kornshell.cpp @@ -28,7 +28,7 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kdialogbase.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqtimer.h> diff --git a/korn/maildlg.cpp b/korn/maildlg.cpp index 3424e19e4..d912c447a 100644 --- a/korn/maildlg.cpp +++ b/korn/maildlg.cpp @@ -1,7 +1,7 @@ #include "maildlg.h" #include <tqlayout.h> #include<kdebug.h> -#include<klocale.h> +#include<tdelocale.h> #include<tqapplication.h> #include "mailsubject.h" #include <tqprogressdialog.h> diff --git a/korn/mailsubject.cpp b/korn/mailsubject.cpp index 459d7d467..0b7a2e3a9 100644 --- a/korn/mailsubject.cpp +++ b/korn/mailsubject.cpp @@ -3,8 +3,8 @@ #include <kmime_codecs.h> #include <kcharsets.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tqdatetime.h> #include <tqtextcodec.h> #include <ctype.h> diff --git a/korn/main.cpp b/korn/main.cpp index d5a68a3ae..f3e8cf9ae 100644 --- a/korn/main.cpp +++ b/korn/main.cpp @@ -6,7 +6,7 @@ #include"kornapp.h" #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include"kornshell.h" diff --git a/korn/subjectsdlg.cpp b/korn/subjectsdlg.cpp index 6a2ec1847..f3e4b3f4b 100644 --- a/korn/subjectsdlg.cpp +++ b/korn/subjectsdlg.cpp @@ -7,9 +7,9 @@ #include <tqdatetime.h> #include <tqtimer.h> #include "mailsubject.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqprogressdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "maildlg.h" #include "progress_dialog.h" diff --git a/korn/tdeio_delete.cpp b/korn/tdeio_delete.cpp index 4550f20dd..1bb87d258 100644 --- a/korn/tdeio_delete.cpp +++ b/korn/tdeio_delete.cpp @@ -24,7 +24,7 @@ #include "tdeio_proto.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <tdeio/global.h> #include <tdeio/jobclasses.h> diff --git a/korn/tdeio_proto.h b/korn/tdeio_proto.h index e56de6885..67e673e74 100644 --- a/korn/tdeio_proto.h +++ b/korn/tdeio_proto.h @@ -28,7 +28,7 @@ class TQString; #include <tdeio/global.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqstringlist.h> #include "protocol.h" diff --git a/korn/tdeio_read.cpp b/korn/tdeio_read.cpp index 6ec5a12b2..4d8cbf6c0 100644 --- a/korn/tdeio_read.cpp +++ b/korn/tdeio_read.cpp @@ -24,7 +24,7 @@ #include "stringid.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <tdeio/global.h> #include <tdeio/jobclasses.h> diff --git a/korn/tdeio_single_subject.cpp b/korn/tdeio_single_subject.cpp index b98a2edb0..022dac493 100644 --- a/korn/tdeio_single_subject.cpp +++ b/korn/tdeio_single_subject.cpp @@ -23,7 +23,7 @@ #include "stringid.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <tdeio/global.h> #include <tdeio/scheduler.h> diff --git a/ktnef/gui/attachpropertydialog.cpp b/ktnef/gui/attachpropertydialog.cpp index c62001e56..73b208715 100644 --- a/ktnef/gui/attachpropertydialog.cpp +++ b/ktnef/gui/attachpropertydialog.cpp @@ -26,8 +26,8 @@ #include <tdelistview.h> #include <kmimetype.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdefiledialog.h> #include <tqbuffer.h> #include <tqdatastream.h> diff --git a/ktnef/gui/ktnefmain.cpp b/ktnef/gui/ktnefmain.cpp index 4db5013fc..a689d47ba 100644 --- a/ktnef/gui/ktnefmain.cpp +++ b/ktnef/gui/ktnefmain.cpp @@ -27,7 +27,7 @@ #include <tqpopupmenu.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <kiconloader.h> #include <tqpixmap.h> @@ -36,12 +36,12 @@ #include <tdefiledialog.h> #include <tqdir.h> #include <kprocess.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <tdeaction.h> #include <kstdaction.h> #include <kdialogbase.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kkeydialog.h> #ifdef KDE_NO_COMPAT diff --git a/ktnef/gui/ktnefview.cpp b/ktnef/gui/ktnefview.cpp index b06a8d6a2..a28a7d51f 100644 --- a/ktnef/gui/ktnefview.cpp +++ b/ktnef/gui/ktnefview.cpp @@ -25,7 +25,7 @@ #include <tdeapplication.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kmimetype.h> diff --git a/ktnef/gui/main.cpp b/ktnef/gui/main.cpp index c68fd3e6f..4a16a8c83 100644 --- a/ktnef/gui/main.cpp +++ b/ktnef/gui/main.cpp @@ -17,7 +17,7 @@ #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include "ktnefmain.h" diff --git a/ktnef/gui/messagepropertydialog.cpp b/ktnef/gui/messagepropertydialog.cpp index ba4dad91f..ad6106172 100644 --- a/ktnef/gui/messagepropertydialog.cpp +++ b/ktnef/gui/messagepropertydialog.cpp @@ -20,7 +20,7 @@ #include "ktnef/ktnefmessage.h" #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> MessagePropertyDialog::MessagePropertyDialog( TQWidget *parent, KTNEFMessage *msg ) : KDialogBase( parent, "MessagePropertyDialog", true, i18n( "Message Properties" ), diff --git a/ktnef/lib/mapi.cpp b/ktnef/lib/mapi.cpp index 449c41770..486ea84ea 100644 --- a/ktnef/lib/mapi.cpp +++ b/ktnef/lib/mapi.cpp @@ -17,7 +17,7 @@ #include "mapi.h" #include <tqmap.h> -#include <klocale.h> +#include <tdelocale.h> static struct { diff --git a/libemailfunctions/email.cpp b/libemailfunctions/email.cpp index b4d81f0b2..03999f879 100644 --- a/libemailfunctions/email.cpp +++ b/libemailfunctions/email.cpp @@ -21,7 +21,7 @@ #include "email.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kidna.h> #include <kmime_util.h> diff --git a/libemailfunctions/kasciistricmp.h b/libemailfunctions/kasciistricmp.h index a7abc104e..10c1551e8 100644 --- a/libemailfunctions/kasciistricmp.h +++ b/libemailfunctions/kasciistricmp.h @@ -19,8 +19,8 @@ #include <tdeversion.h> #if KDE_IS_VERSION(3,3,89) -// get kasciistricmp from kglobal.h -#include <kglobal.h> +// get kasciistricmp from tdeglobal.h +#include <tdeglobal.h> #else // define kasciistricmp to this tdepim symbol (renamed to avoid problems when upgrading tdelibs later) int tdepim_kasciistricmp( const char *str1, const char *str2 ); diff --git a/libemailfunctions/networkstatus.cpp b/libemailfunctions/networkstatus.cpp index eb99bcff5..878a564af 100644 --- a/libemailfunctions/networkstatus.cpp +++ b/libemailfunctions/networkstatus.cpp @@ -20,7 +20,7 @@ */ #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstaticdeleter.h> #include <dcopref.h> diff --git a/libkcal/CMakeLists.txt b/libkcal/CMakeLists.txt index a4113e36c..af759febd 100644 --- a/libkcal/CMakeLists.txt +++ b/libkcal/CMakeLists.txt @@ -99,7 +99,7 @@ tde_add_library( kcal SHARED AUTOMOC htmlexportsettings.kcfgc htmlexport.cpp calendarnull.cpp freebusyurlstore.cpp confirmsavedialog.cpp VERSION 2.0.0 - LINK versit-static emailfunctions-static ktnef-shared kmime-shared kabc-shared ${LIBICAL_LIBRARIES} + LINK versit-static emailfunctions-static ktnef-shared kmime-shared tdeabc-shared ${LIBICAL_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/libkcal/HACKING b/libkcal/HACKING index fc431906e..ffaef8ac4 100644 --- a/libkcal/HACKING +++ b/libkcal/HACKING @@ -1,4 +1,4 @@ -See tdelibs/kabc/HACKING or http://korganizer.kde.org/develop/hacking.html for +See tdelibs/tdeabc/HACKING or http://korganizer.kde.org/develop/hacking.html for general coding style conventions. Additional conventions for libkcal and KOrganizer: diff --git a/libkcal/attachmenthandler.cpp b/libkcal/attachmenthandler.cpp index aff810c10..0ddb5c8d8 100644 --- a/libkcal/attachmenthandler.cpp +++ b/libkcal/attachmenthandler.cpp @@ -36,11 +36,11 @@ #include <tdeapplication.h> #include <tdefiledialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kmimetype.h> #include <krun.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeio/netaccess.h> #include <tqfile.h> diff --git a/libkcal/attendee.cpp b/libkcal/attendee.cpp index 9aa3d46f7..7eca77464 100644 --- a/libkcal/attendee.cpp +++ b/libkcal/attendee.cpp @@ -22,7 +22,7 @@ #include <tqstringlist.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "attendee.h" diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp index ad5030a15..5918a749b 100644 --- a/libkcal/calendar.cpp +++ b/libkcal/calendar.cpp @@ -31,7 +31,7 @@ #include <stdlib.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "exceptions.h" #include "calfilter.h" diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp index fd7025f76..297c5104b 100644 --- a/libkcal/calendarlocal.cpp +++ b/libkcal/calendarlocal.cpp @@ -26,8 +26,8 @@ #include <tqptrlist.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "vcaldrag.h" #include "vcalformat.h" diff --git a/libkcal/calendarresources.cpp b/libkcal/calendarresources.cpp index d39564e9a..b7d73dec1 100644 --- a/libkcal/calendarresources.cpp +++ b/libkcal/calendarresources.cpp @@ -34,7 +34,7 @@ #include <kdebug.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include "vcaldrag.h" #include "vcalformat.h" @@ -46,7 +46,7 @@ #include <tderesources/manager.h> #include <tderesources/selectdialog.h> -#include <kabc/lock.h> +#include <tdeabc/lock.h> #include "resourcecalendar.h" #include "resourcelocal.h" diff --git a/libkcal/calformat.cpp b/libkcal/calformat.cpp index 6775c9ec9..d6aa22784 100644 --- a/libkcal/calformat.cpp +++ b/libkcal/calformat.cpp @@ -19,7 +19,7 @@ Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeapplication.h> diff --git a/libkcal/confirmsavedialog.cpp b/libkcal/confirmsavedialog.cpp index 6ac64e611..61716eaba 100644 --- a/libkcal/confirmsavedialog.cpp +++ b/libkcal/confirmsavedialog.cpp @@ -21,7 +21,7 @@ #include "confirmsavedialog.h" #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqframe.h> diff --git a/libkcal/convertqtopia.cpp b/libkcal/convertqtopia.cpp index ef585e633..a626231f4 100644 --- a/libkcal/convertqtopia.cpp +++ b/libkcal/convertqtopia.cpp @@ -26,9 +26,9 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kstandarddirs.h> diff --git a/libkcal/dndfactory.cpp b/libkcal/dndfactory.cpp index 61818b9d6..0a1d68c08 100644 --- a/libkcal/dndfactory.cpp +++ b/libkcal/dndfactory.cpp @@ -27,8 +27,8 @@ #include <kiconloader.h> #include <kdebug.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include "vcaldrag.h" #include "icaldrag.h" diff --git a/libkcal/event.cpp b/libkcal/event.cpp index b040d1823..53d094d37 100644 --- a/libkcal/event.cpp +++ b/libkcal/event.cpp @@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA. */ -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include "event.h" diff --git a/libkcal/exceptions.cpp b/libkcal/exceptions.cpp index 99c804ddf..8939248c7 100644 --- a/libkcal/exceptions.cpp +++ b/libkcal/exceptions.cpp @@ -19,7 +19,7 @@ Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "calformat.h" #include "exceptions.h" diff --git a/libkcal/htmlexport.cpp b/libkcal/htmlexport.cpp index 7938c7512..2b538574a 100644 --- a/libkcal/htmlexport.cpp +++ b/libkcal/htmlexport.cpp @@ -27,8 +27,8 @@ #include <tqregexp.h> #include <kcharsets.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include <kcalendarsystem.h> @@ -38,7 +38,7 @@ #include <libkcal/todo.h> #ifndef KORG_NOKABC - #include <kabc/stdaddressbook.h> + #include <tdeabc/stdaddressbook.h> #endif #include "htmlexport.h" #include "htmlexportsettings.h" diff --git a/libkcal/icalformat.cpp b/libkcal/icalformat.cpp index deb38a60d..34a4a1a92 100644 --- a/libkcal/icalformat.cpp +++ b/libkcal/icalformat.cpp @@ -28,7 +28,7 @@ #include <tqtextstream.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> extern "C" { #include <libical/ical.h> diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp index db3177fd2..599eab3f1 100644 --- a/libkcal/icalformatimpl.cpp +++ b/libkcal/icalformatimpl.cpp @@ -27,7 +27,7 @@ #include <cstdlib> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmdcodec.h> extern "C" { diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp index e509cc05a..99b17e99f 100644 --- a/libkcal/incidence.cpp +++ b/libkcal/incidence.cpp @@ -20,8 +20,8 @@ Boston, MA 02110-1301, USA. */ -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include "calformat.h" diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp index 74c896f57..da314b639 100644 --- a/libkcal/incidencebase.cpp +++ b/libkcal/incidencebase.cpp @@ -20,8 +20,8 @@ Boston, MA 02110-1301, USA. */ -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include "calformat.h" diff --git a/libkcal/incidenceformatter.cpp b/libkcal/incidenceformatter.cpp index 0a42e2aac..1455a24a0 100644 --- a/libkcal/incidenceformatter.cpp +++ b/libkcal/incidenceformatter.cpp @@ -38,15 +38,15 @@ #include <ktnef/ktnefparser.h> #include <ktnef/ktnefmessage.h> #include <ktnef/ktnefdefs.h> -#include <kabc/phonenumber.h> -#include <kabc/vcardconverter.h> -#include <kabc/stdaddressbook.h> +#include <tdeabc/phonenumber.h> +#include <tdeabc/vcardconverter.h> +#include <tdeabc/stdaddressbook.h> #include <tdeapplication.h> -#include <kemailsettings.h> +#include <tdeemailsettings.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kcalendarsystem.h> #include <kmimetype.h> diff --git a/libkcal/period.cpp b/libkcal/period.cpp index ff944ee94..586ba3e7f 100644 --- a/libkcal/period.cpp +++ b/libkcal/period.cpp @@ -20,7 +20,7 @@ */ #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "period.h" diff --git a/libkcal/person.cpp b/libkcal/person.cpp index aad80f68f..d56233bb8 100644 --- a/libkcal/person.cpp +++ b/libkcal/person.cpp @@ -23,7 +23,7 @@ #include "person.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <libemailfunctions/email.h> diff --git a/libkcal/qtopiaformat.cpp b/libkcal/qtopiaformat.cpp index d417f9ea4..a3f3f6f0c 100644 --- a/libkcal/qtopiaformat.cpp +++ b/libkcal/qtopiaformat.cpp @@ -29,7 +29,7 @@ #include <tqxml.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "calendar.h" #include "calendarlocal.h" diff --git a/libkcal/recurrence.cpp b/libkcal/recurrence.cpp index d4e47a528..1c64ea3d2 100644 --- a/libkcal/recurrence.cpp +++ b/libkcal/recurrence.cpp @@ -25,8 +25,8 @@ #include <limits.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tqbitarray.h> #include "recurrence.h" diff --git a/libkcal/recurrencerule.cpp b/libkcal/recurrencerule.cpp index 946141df7..9805784f3 100644 --- a/libkcal/recurrencerule.cpp +++ b/libkcal/recurrencerule.cpp @@ -23,7 +23,7 @@ #include "recurrencerule.h" #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tqdatetime.h> #include <tqstringlist.h> diff --git a/libkcal/resourcecached.cpp b/libkcal/resourcecached.cpp index 13d11be04..381104317 100644 --- a/libkcal/resourcecached.cpp +++ b/libkcal/resourcecached.cpp @@ -30,7 +30,7 @@ #include <tqptrlist.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <kstandarddirs.h> diff --git a/libkcal/resourcecachedconfig.cpp b/libkcal/resourcecachedconfig.cpp index caa1fddf8..ee43f711d 100644 --- a/libkcal/resourcecachedconfig.cpp +++ b/libkcal/resourcecachedconfig.cpp @@ -26,7 +26,7 @@ #include <tqhbox.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "resourcecached.h" diff --git a/libkcal/resourcecalendar.cpp b/libkcal/resourcecalendar.cpp index 76f12ed13..fb51f0abb 100644 --- a/libkcal/resourcecalendar.cpp +++ b/libkcal/resourcecalendar.cpp @@ -24,7 +24,7 @@ #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "calendar.h" diff --git a/libkcal/resourcecalendar.h b/libkcal/resourcecalendar.h index c84554833..80f37f821 100644 --- a/libkcal/resourcecalendar.h +++ b/libkcal/resourcecalendar.h @@ -40,7 +40,7 @@ #include <tderesources/resource.h> #include <tderesources/manager.h> -#include <kabc/lock.h> +#include <tdeabc/lock.h> #include <tdepimmacros.h> namespace KCal { diff --git a/libkcal/resourcelocal.cpp b/libkcal/resourcelocal.cpp index dca20b9ae..aee2ba988 100644 --- a/libkcal/resourcelocal.cpp +++ b/libkcal/resourcelocal.cpp @@ -28,7 +28,7 @@ #include <tqptrlist.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <kstandarddirs.h> diff --git a/libkcal/resourcelocalconfig.cpp b/libkcal/resourcelocalconfig.cpp index 92c34e294..ccba03284 100644 --- a/libkcal/resourcelocalconfig.cpp +++ b/libkcal/resourcelocalconfig.cpp @@ -25,8 +25,8 @@ #include <tqlabel.h> #include <tqlayout.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <kstandarddirs.h> diff --git a/libkcal/resourcelocaldir.cpp b/libkcal/resourcelocaldir.cpp index 730f3abd8..f51457351 100644 --- a/libkcal/resourcelocaldir.cpp +++ b/libkcal/resourcelocaldir.cpp @@ -28,7 +28,7 @@ #include <tqptrlist.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <tdeconfig.h> #include <kstandarddirs.h> diff --git a/libkcal/resourcelocaldirconfig.cpp b/libkcal/resourcelocaldirconfig.cpp index df2412b3d..afe9c95b1 100644 --- a/libkcal/resourcelocaldirconfig.cpp +++ b/libkcal/resourcelocaldirconfig.cpp @@ -24,9 +24,9 @@ #include <tqlabel.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include "vcaldrag.h" diff --git a/libkcal/scheduler.cpp b/libkcal/scheduler.cpp index 6e3cf3850..c398a77ca 100644 --- a/libkcal/scheduler.cpp +++ b/libkcal/scheduler.cpp @@ -20,9 +20,9 @@ Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include "calhelper.h" diff --git a/libkcal/tests/readandwrite.cpp b/libkcal/tests/readandwrite.cpp index 53e082a3d..5f6c3488d 100644 --- a/libkcal/tests/readandwrite.cpp +++ b/libkcal/tests/readandwrite.cpp @@ -28,7 +28,7 @@ extern "C" { #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <tqfile.h> diff --git a/libkcal/tests/testcalendar.cpp b/libkcal/tests/testcalendar.cpp index 85f77d78e..b5c15ac45 100644 --- a/libkcal/tests/testcalendar.cpp +++ b/libkcal/tests/testcalendar.cpp @@ -22,7 +22,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include "calendarlocal.h" diff --git a/libkcal/tests/testcalselectdialog.cpp b/libkcal/tests/testcalselectdialog.cpp index 2c3ae7f72..84fe89c8f 100644 --- a/libkcal/tests/testcalselectdialog.cpp +++ b/libkcal/tests/testcalselectdialog.cpp @@ -22,7 +22,7 @@ using namespace KCal; #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> int main( int argc, char **argv ) diff --git a/libkcal/tests/testfields.cpp b/libkcal/tests/testfields.cpp index 2d393aa65..05522dfec 100644 --- a/libkcal/tests/testfields.cpp +++ b/libkcal/tests/testfields.cpp @@ -22,7 +22,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include "calendarlocal.h" diff --git a/libkcal/tests/testincidence.cpp b/libkcal/tests/testincidence.cpp index 858ed9ccd..e510cf739 100644 --- a/libkcal/tests/testincidence.cpp +++ b/libkcal/tests/testincidence.cpp @@ -22,7 +22,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include "icalformat.h" diff --git a/libkcal/tests/testresource.cpp b/libkcal/tests/testresource.cpp index 64ada3b0a..a5f207862 100644 --- a/libkcal/tests/testresource.cpp +++ b/libkcal/tests/testresource.cpp @@ -21,7 +21,7 @@ #include <config.h> -#include <kabc/stdaddressbook.h> +#include <tdeabc/stdaddressbook.h> #include <kurl.h> #include <tdeapplication.h> #include <tdeio/netaccess.h> diff --git a/libkcal/tests/testvcalexport.cpp b/libkcal/tests/testvcalexport.cpp index d6997ef49..7cf619d00 100644 --- a/libkcal/tests/testvcalexport.cpp +++ b/libkcal/tests/testvcalexport.cpp @@ -32,7 +32,7 @@ extern "C" { #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <tqfile.h> diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp index 7c4a4df33..d7ba1658a 100644 --- a/libkcal/todo.cpp +++ b/libkcal/todo.cpp @@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA. */ -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include "todo.h" diff --git a/libkcal/vcalformat.cpp b/libkcal/vcalformat.cpp index 9c7a0f1cd..7733b27dd 100644 --- a/libkcal/vcalformat.cpp +++ b/libkcal/vcalformat.cpp @@ -30,9 +30,9 @@ #include <tqfile.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include "vcc.h" #include "vobject.h" diff --git a/libkholidays/lunarphase.cpp b/libkholidays/lunarphase.cpp index f1de52a3c..f553dfb73 100644 --- a/libkholidays/lunarphase.cpp +++ b/libkholidays/lunarphase.cpp @@ -33,8 +33,8 @@ #include "config.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include "lunarphase.h" diff --git a/libkmime/kmime_codec_identity.cpp b/libkmime/kmime_codec_identity.cpp index 529084d56..27fe8f42e 100644 --- a/libkmime/kmime_codec_identity.cpp +++ b/libkmime/kmime_codec_identity.cpp @@ -32,7 +32,7 @@ #include "kmime_codec_identity.h" #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <cassert> #include <cstring> diff --git a/libkmime/kmime_content.cpp b/libkmime/kmime_content.cpp index 20862496d..037d8f4d8 100644 --- a/libkmime/kmime_content.cpp +++ b/libkmime/kmime_content.cpp @@ -18,8 +18,8 @@ #include <kcharsets.h> #include <kmdcodec.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqtextcodec.h> diff --git a/libkmime/kmime_header_parsing.cpp b/libkmime/kmime_header_parsing.cpp index 70d0b657d..5c9423b72 100644 --- a/libkmime/kmime_header_parsing.cpp +++ b/libkmime/kmime_header_parsing.cpp @@ -36,7 +36,7 @@ #include "kmime_util.h" #include "kmime_warning.h" -#include <kglobal.h> +#include <tdeglobal.h> #include <kcharsets.h> #include <tqtextcodec.h> diff --git a/libkmime/kmime_headers.cpp b/libkmime/kmime_headers.cpp index 649e1e614..2679971a9 100644 --- a/libkmime/kmime_headers.cpp +++ b/libkmime/kmime_headers.cpp @@ -31,7 +31,7 @@ #include <tqstringlist.h> #include <tqvaluelist.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kcharsets.h> #include <krfcdate.h> diff --git a/libkmime/kmime_mdn.cpp b/libkmime/kmime_mdn.cpp index bba37023c..4040d8934 100644 --- a/libkmime/kmime_mdn.cpp +++ b/libkmime/kmime_mdn.cpp @@ -34,7 +34,7 @@ #include "kmime_version.h" #include "kmime_util.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqcstring.h> diff --git a/libkmime/kmime_util.cpp b/libkmime/kmime_util.cpp index 38f282752..d93c49901 100644 --- a/libkmime/kmime_util.cpp +++ b/libkmime/kmime_util.cpp @@ -21,8 +21,8 @@ #include "kmime_util.h" #include <kmdcodec.h> // for KCodec::{quotedPrintableDe,base64{En,De}}code -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kcharsets.h> #include <tdeversion.h> #if KDE_IS_VERSION( 3, 1, 90 ) diff --git a/libkpgp/kpgp.cpp b/libkpgp/kpgp.cpp index 33aa89954..293b36811 100644 --- a/libkpgp/kpgp.cpp +++ b/libkpgp/kpgp.cpp @@ -35,8 +35,8 @@ #include <tqapplication.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdeconfigbase.h> #include <tdeconfig.h> #include <kstaticdeleter.h> diff --git a/libkpgp/kpgpbase2.cpp b/libkpgp/kpgpbase2.cpp index b8a6448ae..2d16951c4 100644 --- a/libkpgp/kpgpbase2.cpp +++ b/libkpgp/kpgpbase2.cpp @@ -28,7 +28,7 @@ #include <tqdatetime.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprocess.h> #include <kdebug.h> diff --git a/libkpgp/kpgpbase5.cpp b/libkpgp/kpgpbase5.cpp index d7066cb91..7f8e405a6 100644 --- a/libkpgp/kpgpbase5.cpp +++ b/libkpgp/kpgpbase5.cpp @@ -29,7 +29,7 @@ #include <tqregexp.h> #include <tqdatetime.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprocess.h> #include <kdebug.h> diff --git a/libkpgp/kpgpbase6.cpp b/libkpgp/kpgpbase6.cpp index 7fada7cc6..40bef7abc 100644 --- a/libkpgp/kpgpbase6.cpp +++ b/libkpgp/kpgpbase6.cpp @@ -27,7 +27,7 @@ #include <tqdatetime.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #define PGP6 "pgp" diff --git a/libkpgp/kpgpbaseG.cpp b/libkpgp/kpgpbaseG.cpp index 52bb6bc7e..7e96b4e93 100644 --- a/libkpgp/kpgpbaseG.cpp +++ b/libkpgp/kpgpbaseG.cpp @@ -23,7 +23,7 @@ #include "kpgpbase.h" #include "kpgp.h" -#include <klocale.h> +#include <tdelocale.h> #include <kprocess.h> #include <kdebug.h> diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp index fbcb3efdd..f4b40a708 100644 --- a/libkpgp/kpgpui.cpp +++ b/libkpgp/kpgpui.cpp @@ -32,7 +32,7 @@ #include <tqpopupmenu.h> #include <tqregexp.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpassdlg.h> #include <kcharsets.h> #include <kseparator.h> @@ -44,7 +44,7 @@ #include <tdeapplication.h> #include <twin.h> #if KDE_IS_VERSION( 3, 1, 90 ) -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #endif #include "kpgp.h" diff --git a/libkpimexchange/core/exchangeaccount.cpp b/libkpimexchange/core/exchangeaccount.cpp index 75b1446d9..a033b6b02 100644 --- a/libkpimexchange/core/exchangeaccount.cpp +++ b/libkpimexchange/core/exchangeaccount.cpp @@ -34,8 +34,8 @@ #include <tdeconfig.h> #include <dcopclient.h> #include <kcursor.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tdeio/authinfo.h> #include <tdeio/davjob.h> diff --git a/libkpimexchange/core/exchangeclient.cpp b/libkpimexchange/core/exchangeclient.cpp index 4f540aee9..5658c7075 100644 --- a/libkpimexchange/core/exchangeclient.cpp +++ b/libkpimexchange/core/exchangeclient.cpp @@ -22,7 +22,7 @@ #include <kurl.h> #include <kdebug.h> #include <kcursor.h> -#include <klocale.h> +#include <tdelocale.h> // These for test() method #include <tdeio/http.h> diff --git a/libkpimexchange/core/exchangedownload.cpp b/libkpimexchange/core/exchangedownload.cpp index 9ff3040f5..58bf236e3 100644 --- a/libkpimexchange/core/exchangedownload.cpp +++ b/libkpimexchange/core/exchangedownload.cpp @@ -27,8 +27,8 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kstandarddirs.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tdeaction.h> #include <kurl.h> #include <kdebug.h> diff --git a/libkpimexchange/core/exchangeprogress.cpp b/libkpimexchange/core/exchangeprogress.cpp index 0c7393bb7..7d52711f1 100644 --- a/libkpimexchange/core/exchangeprogress.cpp +++ b/libkpimexchange/core/exchangeprogress.cpp @@ -22,10 +22,10 @@ #include <tqlabel.h> #include <tqcombobox.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kstandarddirs.h> #include <ksimpleconfig.h> diff --git a/libkpimidentities/identity.cpp b/libkpimidentities/identity.cpp index 9b4c9df67..c43620ea3 100644 --- a/libkpimidentities/identity.cpp +++ b/libkpimidentities/identity.cpp @@ -12,8 +12,8 @@ #include <libtdepim/collectingprocess.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdeconfig.h> #include <kurl.h> diff --git a/libkpimidentities/identitycombo.cpp b/libkpimidentities/identitycombo.cpp index 5ddc01975..adc79efd1 100644 --- a/libkpimidentities/identitycombo.cpp +++ b/libkpimidentities/identitycombo.cpp @@ -37,7 +37,7 @@ #include "identity.h" #include "identitymanager.h" -#include <klocale.h> +#include <tdelocale.h> #include <assert.h> diff --git a/libkpimidentities/identitymanager.cpp b/libkpimidentities/identitymanager.cpp index 44cabc047..c7b97216a 100644 --- a/libkpimidentities/identitymanager.cpp +++ b/libkpimidentities/identitymanager.cpp @@ -41,9 +41,9 @@ static const char configKeyDefaultIdentity[] = "Default Identity"; #include "identity.h" // for IdentityList::{export,import}Data #include <libemailfunctions/email.h> // for static helper functions -#include <kemailsettings.h> // for IdentityEntry::fromControlCenter() +#include <tdeemailsettings.h> // for IdentityEntry::fromControlCenter() #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeconfig.h> #include <kuser.h> diff --git a/libksieve/shared/error.cpp b/libksieve/shared/error.cpp index faf20bcc6..400587c3d 100644 --- a/libksieve/shared/error.cpp +++ b/libksieve/shared/error.cpp @@ -34,7 +34,7 @@ #include <ksieve/error.h> -#include <klocale.h> // i18n +#include <tdelocale.h> // i18n #include <climits> // UINT_MAX diff --git a/libtdepim/addresseediffalgo.h b/libtdepim/addresseediffalgo.h index f3c6632a7..991d46fbd 100644 --- a/libtdepim/addresseediffalgo.h +++ b/libtdepim/addresseediffalgo.h @@ -22,7 +22,7 @@ #ifndef KPIM_ADDRESSEEDIFFALGO_H #define KPIM_ADDRESSEEDIFFALGO_H -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <libtdepim/diffalgo.h> namespace KPIM { diff --git a/libtdepim/addresseeemailselection.cpp b/libtdepim/addresseeemailselection.cpp index 9cbbeb027..11e9af2c6 100644 --- a/libtdepim/addresseeemailselection.cpp +++ b/libtdepim/addresseeemailselection.cpp @@ -19,9 +19,9 @@ Boston, MA 02110-1301, USA. */ -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include "recentaddresses.h" diff --git a/libtdepim/addresseelineedit.cpp b/libtdepim/addresseelineedit.cpp index bfb736b56..2277182bc 100644 --- a/libtdepim/addresseelineedit.cpp +++ b/libtdepim/addresseelineedit.cpp @@ -34,11 +34,11 @@ #ifdef TDEPIM_NEW_DISTRLISTS #include "distributionlist.h" #else -#include <kabc/distributionlist.h> +#include <tdeabc/distributionlist.h> #endif -#include <kabc/stdaddressbook.h> -#include <kabc/resource.h> +#include <tdeabc/stdaddressbook.h> +#include <tdeabc/resource.h> #include <libemailfunctions/email.h> #include <tdecompletionbox.h> @@ -48,7 +48,7 @@ #include <kstaticdeleter.h> #include <tdestdaccel.h> #include <kurldrag.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqpopupmenu.h> #include <tqapplication.h> diff --git a/libtdepim/addresseelineedit.h b/libtdepim/addresseelineedit.h index 035f285da..169d807e0 100644 --- a/libtdepim/addresseelineedit.h +++ b/libtdepim/addresseelineedit.h @@ -32,7 +32,7 @@ #include <tqpair.h> #include <tqvaluelist.h> -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include "clicklineedit.h" #include "kmailcompletion.h" diff --git a/libtdepim/addresseeselector.cpp b/libtdepim/addresseeselector.cpp index 082b73c54..30288d0aa 100644 --- a/libtdepim/addresseeselector.cpp +++ b/libtdepim/addresseeselector.cpp @@ -25,14 +25,14 @@ #include <tqsignalmapper.h> #include <tqtoolbutton.h> -#include <kabc/stdaddressbook.h> +#include <tdeabc/stdaddressbook.h> #include <kcombobox.h> #include <kdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <klineedit.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include "addresseeselector.h" diff --git a/libtdepim/addresseeselector.h b/libtdepim/addresseeselector.h index f06c030bc..92c544789 100644 --- a/libtdepim/addresseeselector.h +++ b/libtdepim/addresseeselector.h @@ -22,9 +22,9 @@ #ifndef KPIM_ADDRESSEESELECTOR_H #define KPIM_ADDRESSEESELECTOR_H -#include <kabc/addressee.h> -#include <kabc/distributionlist.h> -#include <kabc/resource.h> +#include <tdeabc/addressee.h> +#include <tdeabc/distributionlist.h> +#include <tdeabc/resource.h> #include <kdialogbase.h> #include <tdepimmacros.h> diff --git a/libtdepim/addresseeview.cpp b/libtdepim/addresseeview.cpp index e4c0a0c48..aebb108cd 100644 --- a/libtdepim/addresseeview.cpp +++ b/libtdepim/addresseeview.cpp @@ -24,23 +24,23 @@ #include <tqpopupmenu.h> #include <tqurl.h> -#include <kabc/address.h> -#include <kabc/addressee.h> -#include <kabc/phonenumber.h> -#include <kabc/resource.h> +#include <tdeabc/address.h> +#include <tdeabc/addressee.h> +#include <tdeabc/phonenumber.h> +#include <tdeabc/resource.h> #include <tdeactionclasses.h> #include <tdeapplication.h> #include <tdeconfig.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> #include <tdeio/job.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmdcodec.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <krun.h> #include <kstringhandler.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> diff --git a/libtdepim/addresseeview.h b/libtdepim/addresseeview.h index 92760529a..af7ee4b19 100644 --- a/libtdepim/addresseeview.h +++ b/libtdepim/addresseeview.h @@ -24,7 +24,7 @@ #include <tqcstring.h> -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <ktextbrowser.h> #include <tdeimproxy.h> #include <tdepimmacros.h> diff --git a/libtdepim/addressesdialog.cpp b/libtdepim/addressesdialog.cpp index d7c540031..aa52f4625 100644 --- a/libtdepim/addressesdialog.cpp +++ b/libtdepim/addressesdialog.cpp @@ -33,20 +33,20 @@ #ifdef TDEPIM_NEW_DISTRLISTS #include "distributionlist.h" #include <tderesources/selectdialog.h> -#include <kabc/resource.h> +#include <tdeabc/resource.h> #else -#include <kabc/distributionlist.h> +#include <tdeabc/distributionlist.h> #endif -#include <kabc/stdaddressbook.h> +#include <tdeabc/stdaddressbook.h> #include <tdeapplication.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kinputdialog.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <kpushbutton.h> #include <krun.h> diff --git a/libtdepim/addressesdialog.h b/libtdepim/addressesdialog.h index ba9eaf1f5..c27ed68bf 100644 --- a/libtdepim/addressesdialog.h +++ b/libtdepim/addressesdialog.h @@ -25,7 +25,7 @@ #ifndef ADDRESSESDIALOG_H #define ADDRESSESDIALOG_H -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <kdialogbase.h> #include <tdelistview.h> #include <tqstringlist.h> diff --git a/libtdepim/broadcaststatus.cpp b/libtdepim/broadcaststatus.cpp index d7a26944e..905c46fab 100644 --- a/libtdepim/broadcaststatus.cpp +++ b/libtdepim/broadcaststatus.cpp @@ -16,8 +16,8 @@ #include <tqdatetime.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kstaticdeleter.h> #include "broadcaststatus.h" diff --git a/libtdepim/calendardiffalgo.cpp b/libtdepim/calendardiffalgo.cpp index 587d0dc0c..a7d333ae0 100644 --- a/libtdepim/calendardiffalgo.cpp +++ b/libtdepim/calendardiffalgo.cpp @@ -19,7 +19,7 @@ Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "calendardiffalgo.h" diff --git a/libtdepim/categoryeditdialog.cpp b/libtdepim/categoryeditdialog.cpp index a6ab6e77c..26abbc070 100644 --- a/libtdepim/categoryeditdialog.cpp +++ b/libtdepim/categoryeditdialog.cpp @@ -26,7 +26,7 @@ #include <tqlayout.h> #include <tqheader.h> #include <tqpushbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include "kpimprefs.h" diff --git a/libtdepim/categoryselectdialog.cpp b/libtdepim/categoryselectdialog.cpp index 36996614e..cf1b2ac6d 100644 --- a/libtdepim/categoryselectdialog.cpp +++ b/libtdepim/categoryselectdialog.cpp @@ -25,7 +25,7 @@ #include <tqheader.h> #include "categoryselectdialog_base.h" -#include <klocale.h> +#include <tdelocale.h> #include "categoryselectdialog.h" #include "kpimprefs.h" diff --git a/libtdepim/cfgc/autoexample.cpp b/libtdepim/cfgc/autoexample.cpp index ea94e0916..746c07141 100644 --- a/libtdepim/cfgc/autoexample.cpp +++ b/libtdepim/cfgc/autoexample.cpp @@ -27,9 +27,9 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kstandarddirs.h> #include <kautoconfigdialog.h> diff --git a/libtdepim/cfgc/example.cpp b/libtdepim/cfgc/example.cpp index ab58e0d20..8af18fc37 100644 --- a/libtdepim/cfgc/example.cpp +++ b/libtdepim/cfgc/example.cpp @@ -24,9 +24,9 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kstandarddirs.h> diff --git a/libtdepim/completionordereditor.cpp b/libtdepim/completionordereditor.cpp index 1ee6f8a88..a94b62217 100644 --- a/libtdepim/completionordereditor.cpp +++ b/libtdepim/completionordereditor.cpp @@ -33,11 +33,11 @@ #include "ldapclient.h" #include "resourceabc.h" -#include <kabc/stdaddressbook.h> -#include <kabc/resource.h> +#include <tdeabc/stdaddressbook.h> +#include <tdeabc/resource.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdelistview.h> #include <kpushbutton.h> @@ -59,7 +59,7 @@ The default completion weights are as follow: LDAP: 50, 49, 48 etc. (see ldapclient.cpp) KABC non-imap resources: 60 (see addresseelineedit.cpp and SimpleCompletionItem here) Distribution lists: 60 (see addresseelineedit.cpp and SimpleCompletionItem here) - KABC imap resources: 80 (see tderesources/imap/kabc/resourceimap.cpp) + KABC imap resources: 80 (see tderesources/imap/tdeabc/resourceimap.cpp) This dialog allows to change those weights, by showing one item per: - LDAP server diff --git a/libtdepim/csshelper.cpp b/libtdepim/csshelper.cpp index d3c648096..bb4d8ea99 100644 --- a/libtdepim/csshelper.cpp +++ b/libtdepim/csshelper.cpp @@ -32,9 +32,9 @@ #include "csshelper.h" #include <tdeconfig.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tqstring.h> #include <tqapplication.h> diff --git a/libtdepim/designerfields.h b/libtdepim/designerfields.h index 8e870bd4e..dd05b3369 100644 --- a/libtdepim/designerfields.h +++ b/libtdepim/designerfields.h @@ -22,7 +22,7 @@ #ifndef KPIM_DESIGNERFIELDS_H #define KPIM_DESIGNERFIELDS_H -#include <klocale.h> +#include <tdelocale.h> #include <tqmap.h> #include <tqpair.h> diff --git a/libtdepim/distributionlist.cpp b/libtdepim/distributionlist.cpp index 4cf079c76..f5742a144 100644 --- a/libtdepim/distributionlist.cpp +++ b/libtdepim/distributionlist.cpp @@ -1,5 +1,5 @@ #include "distributionlist.h" -#include <kabc/addressbook.h> +#include <tdeabc/addressbook.h> static const char* s_customFieldName = "DistributionList"; diff --git a/libtdepim/distributionlist.h b/libtdepim/distributionlist.h index afc5a5bd2..433e95b5c 100644 --- a/libtdepim/distributionlist.h +++ b/libtdepim/distributionlist.h @@ -21,7 +21,7 @@ #ifndef DISTRIBUTIONLIST_H #define DISTRIBUTIONLIST_H -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> namespace KABC { class AddressBook; diff --git a/libtdepim/embeddedurlpage.cpp b/libtdepim/embeddedurlpage.cpp index b8567d774..79bf58637 100644 --- a/libtdepim/embeddedurlpage.cpp +++ b/libtdepim/embeddedurlpage.cpp @@ -26,7 +26,7 @@ #include <tdeparts/browserextension.h> #include <tdeparts/part.h> #include <kmimetype.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqlabel.h> diff --git a/libtdepim/htmldiffalgodisplay.cpp b/libtdepim/htmldiffalgodisplay.cpp index 03553c6d8..6b7ac1eff 100644 --- a/libtdepim/htmldiffalgodisplay.cpp +++ b/libtdepim/htmldiffalgodisplay.cpp @@ -19,7 +19,7 @@ Boston, MA 02110-1301, USA. */ -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <libtdepim/htmldiffalgodisplay.h> diff --git a/libtdepim/kabcresourcecached.cpp b/libtdepim/kabcresourcecached.cpp index df8ecbcad..935fc942c 100644 --- a/libtdepim/kabcresourcecached.cpp +++ b/libtdepim/kabcresourcecached.cpp @@ -20,9 +20,9 @@ #include <tqfile.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/vcardconverter.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include "kabcresourcecached.h" @@ -30,7 +30,7 @@ using namespace KABC; ResourceCached::ResourceCached( const TDEConfig *config ) - : KABC::Resource( config ), mIdMapper( "kabc/uidmaps/" ), + : KABC::Resource( config ), mIdMapper( "tdeabc/uidmaps/" ), mReloadPolicy( ReloadInterval ), mReloadInterval( 10 ), mKABCReloadTimer( 0, "mKABCReloadTimer" ), mReloaded( false ), mSavePolicy( SaveDelayed ), mSaveInterval( 10 ), @@ -342,12 +342,12 @@ KABC::Addressee::List ResourceCached::deletedAddressees() const TQString ResourceCached::cacheFile() const { - return locateLocal( "cache", "kabc/tderesources/" + identifier() ); + return locateLocal( "cache", "tdeabc/tderesources/" + identifier() ); } TQString ResourceCached::changesCacheFile( const TQString &type ) const { - return locateLocal( "cache", "kabc/changescache/" + identifier() + "_" + type ); + return locateLocal( "cache", "tdeabc/changescache/" + identifier() + "_" + type ); } void ResourceCached::saveChangesCache( const TQMap<TQString, KABC::Addressee> &map, const TQString &type ) diff --git a/libtdepim/kabcresourcecached.h b/libtdepim/kabcresourcecached.h index db46ee27f..aab4a192a 100644 --- a/libtdepim/kabcresourcecached.h +++ b/libtdepim/kabcresourcecached.h @@ -21,7 +21,7 @@ #ifndef KABC_RESOURCECACHED_H #define KABC_RESOURCECACHED_H -#include <kabc/resource.h> +#include <tdeabc/resource.h> #include <tdepimmacros.h> #include <tqdatetime.h> diff --git a/libtdepim/kabcresourcenull.h b/libtdepim/kabcresourcenull.h index a926e2059..dfc731f79 100644 --- a/libtdepim/kabcresourcenull.h +++ b/libtdepim/kabcresourcenull.h @@ -21,7 +21,7 @@ #ifndef KABC_RESOURCENULL_H #define KABC_RESOURCENULL_H -#include <kabc/resource.h> +#include <tdeabc/resource.h> namespace KABC { diff --git a/libtdepim/kaddrbook.cpp b/libtdepim/kaddrbook.cpp index 9da5eb628..291669216 100644 --- a/libtdepim/kaddrbook.cpp +++ b/libtdepim/kaddrbook.cpp @@ -10,18 +10,18 @@ #ifdef TDEPIM_NEW_DISTRLISTS #include "distributionlist.h" #else -#include <kabc/distributionlist.h> +#include <tdeabc/distributionlist.h> #endif #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdeversion.h> -#include <kabc/resource.h> -#include <kabc/stdaddressbook.h> -#include <kabc/vcardconverter.h> -#include <kabc/errorhandler.h> +#include <tdeabc/resource.h> +#include <tdeabc/stdaddressbook.h> +#include <tdeabc/vcardconverter.h> +#include <tdeabc/errorhandler.h> #include <tderesources/selectdialog.h> #include <dcopref.h> #include <dcopclient.h> diff --git a/libtdepim/kaddrbook.h b/libtdepim/kaddrbook.h index e15d7a9f8..10b896098 100644 --- a/libtdepim/kaddrbook.h +++ b/libtdepim/kaddrbook.h @@ -8,7 +8,7 @@ #include <tqstringlist.h> #include <tdeversion.h> -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <tdepimmacros.h> namespace KABC { diff --git a/libtdepim/kcmdesignerfields.cpp b/libtdepim/kcmdesignerfields.cpp index eda7248a9..9156452c1 100644 --- a/libtdepim/kcmdesignerfields.cpp +++ b/libtdepim/kcmdesignerfields.cpp @@ -37,15 +37,15 @@ #include <tdeaboutdata.h> #include <kdebug.h> #include <kdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <krun.h> #include <kstandarddirs.h> #include <kactivelabel.h> #include <kdirwatch.h> #include <tdefiledialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <tdeio/netaccess.h> diff --git a/libtdepim/kdateedit.cpp b/libtdepim/kdateedit.cpp index 73f0586a6..dd6b4e480 100644 --- a/libtdepim/kdateedit.cpp +++ b/libtdepim/kdateedit.cpp @@ -28,9 +28,9 @@ #include <tqvalidator.h> #include <kcalendarsystem.h> -#include <kglobal.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> #include "kdateedit.h" diff --git a/libtdepim/kdatepickerpopup.cpp b/libtdepim/kdatepickerpopup.cpp index f6e7031e0..d9ffe8c3f 100644 --- a/libtdepim/kdatepickerpopup.cpp +++ b/libtdepim/kdatepickerpopup.cpp @@ -22,7 +22,7 @@ #include <tqdatetime.h> #include <tqpopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include "kdatepickerpopup.h" diff --git a/libtdepim/kfoldertree.cpp b/libtdepim/kfoldertree.cpp index abc69fad4..f353c4d39 100644 --- a/libtdepim/kfoldertree.cpp +++ b/libtdepim/kfoldertree.cpp @@ -1,7 +1,7 @@ // -*- c-basic-offset: 2 -*- #include "kfoldertree.h" -#include <klocale.h> +#include <tdelocale.h> #include <tdeio/global.h> #include <kiconloader.h> #include <kdebug.h> diff --git a/libtdepim/kimportdialog.cpp b/libtdepim/kimportdialog.cpp index 861cbfb4d..879b61567 100644 --- a/libtdepim/kimportdialog.cpp +++ b/libtdepim/kimportdialog.cpp @@ -41,7 +41,7 @@ #include <kcombobox.h> #include <kinputdialog.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprogress.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> diff --git a/libtdepim/kincidencechooser.cpp b/libtdepim/kincidencechooser.cpp index f1c43daa5..8bb72d5ce 100644 --- a/libtdepim/kincidencechooser.cpp +++ b/libtdepim/kincidencechooser.cpp @@ -35,8 +35,8 @@ #include <tqapplication.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include "kincidencechooser.h" #include "libkcal/incidence.h" diff --git a/libtdepim/komposer/core/core.cpp b/libtdepim/komposer/core/core.cpp index acd798120..24a3b7d34 100644 --- a/libtdepim/komposer/core/core.cpp +++ b/libtdepim/komposer/core/core.cpp @@ -37,7 +37,7 @@ #include <kiconloader.h> #include <kstandarddirs.h> #include <tdeshortcut.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstatusbar.h> #include <kguiitem.h> #include <tdepopupmenu.h> diff --git a/libtdepim/komposer/core/prefsmodule.cpp b/libtdepim/komposer/core/prefsmodule.cpp index 80b9951a2..3070b165d 100644 --- a/libtdepim/komposer/core/prefsmodule.cpp +++ b/libtdepim/komposer/core/prefsmodule.cpp @@ -24,7 +24,7 @@ #include <tdeaboutdata.h> #include <kdebug.h> #include <kcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <ktrader.h> #include <tqlayout.h> diff --git a/libtdepim/komposer/core/tests/main.cpp b/libtdepim/komposer/core/tests/main.cpp index c59080ed4..d5fe826a9 100644 --- a/libtdepim/komposer/core/tests/main.cpp +++ b/libtdepim/komposer/core/tests/main.cpp @@ -22,7 +22,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <unistd.h> diff --git a/libtdepim/komposer/plugins/default/defaulteditor.cpp b/libtdepim/komposer/plugins/default/defaulteditor.cpp index a5e2ff696..82c04e3f9 100644 --- a/libtdepim/komposer/plugins/default/defaulteditor.cpp +++ b/libtdepim/komposer/plugins/default/defaulteditor.cpp @@ -31,7 +31,7 @@ #include <kcolordialog.h> #include <tdefiledialog.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstdaction.h> #include <kprinter.h> #include <kfinddialog.h> diff --git a/libtdepim/komposer/test/test.cpp b/libtdepim/komposer/test/test.cpp index 40996d1e6..b5dfc63ad 100644 --- a/libtdepim/komposer/test/test.cpp +++ b/libtdepim/komposer/test/test.cpp @@ -24,7 +24,7 @@ #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kuniqueapplication.h> #include <tqlabel.h> diff --git a/libtdepim/kpimprefs.cpp b/libtdepim/kpimprefs.cpp index 02e397361..d58ca447e 100644 --- a/libtdepim/kpimprefs.cpp +++ b/libtdepim/kpimprefs.cpp @@ -28,9 +28,9 @@ #include <tqstring.h> #include <kstandarddirs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "kpimprefs.h" diff --git a/libtdepim/kpimurlrequesterdlg.cpp b/libtdepim/kpimurlrequesterdlg.cpp index 311d1d007..6abff8d0e 100644 --- a/libtdepim/kpimurlrequesterdlg.cpp +++ b/libtdepim/kpimurlrequesterdlg.cpp @@ -21,7 +21,7 @@ #include <kpimurlrequesterdlg.h> #include <tderecentdocument.h> #include <kurlrequesterdlg.h> -#include <klocale.h> +#include <tdelocale.h> // KDE3.4 or KDE4.0: FIXME: Move to tdelibs! KURL KPimURLRequesterDlg::getURL( const TQString& dir, const TQString &label, diff --git a/libtdepim/kpixmapregionselectordialog.cpp b/libtdepim/kpixmapregionselectordialog.cpp index b715e000b..d77c31355 100644 --- a/libtdepim/kpixmapregionselectordialog.cpp +++ b/libtdepim/kpixmapregionselectordialog.cpp @@ -23,7 +23,7 @@ #include <kdialogbase.h> #include <tqdialog.h> #include <tqdesktopwidget.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> using namespace KPIM; diff --git a/libtdepim/kpixmapregionselectorwidget.cpp b/libtdepim/kpixmapregionselectorwidget.cpp index e82168826..e1c4cce45 100644 --- a/libtdepim/kpixmapregionselectorwidget.cpp +++ b/libtdepim/kpixmapregionselectorwidget.cpp @@ -32,7 +32,7 @@ #include <tqlayout.h> #include <kimageeffect.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <tdeaction.h> #include <stdlib.h> diff --git a/libtdepim/kprefsdialog.cpp b/libtdepim/kprefsdialog.cpp index b4aea5589..ae24bc221 100644 --- a/libtdepim/kprefsdialog.cpp +++ b/libtdepim/kprefsdialog.cpp @@ -37,9 +37,9 @@ #include <kcolorbutton.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefontdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeconfigskeleton.h> #include <kurlrequester.h> #include "ktimeedit.h" diff --git a/libtdepim/kscoring.cpp b/libtdepim/kscoring.cpp index 4fcc9774c..e447ac7ec 100644 --- a/libtdepim/kscoring.cpp +++ b/libtdepim/kscoring.cpp @@ -29,7 +29,7 @@ #include <tqcheckbox.h> #include <tqtextview.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kdebug.h> #include <kinputdialog.h> diff --git a/libtdepim/kscoringeditor.cpp b/libtdepim/kscoringeditor.cpp index a0ce66f5a..d793c7a1c 100644 --- a/libtdepim/kscoringeditor.cpp +++ b/libtdepim/kscoringeditor.cpp @@ -21,7 +21,7 @@ #include "kscoringeditor.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcombobox.h> #include <kcolorcombo.h> #include <kiconloader.h> diff --git a/libtdepim/ksubscription.cpp b/libtdepim/ksubscription.cpp index 94030bcc1..d72776bc0 100644 --- a/libtdepim/ksubscription.cpp +++ b/libtdepim/ksubscription.cpp @@ -23,7 +23,7 @@ #include <kseparator.h> #include <tdeapplication.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <klineedit.h> diff --git a/libtdepim/ktimeedit.cpp b/libtdepim/ktimeedit.cpp index 2fe849c5f..edb871e86 100644 --- a/libtdepim/ktimeedit.cpp +++ b/libtdepim/ktimeedit.cpp @@ -29,10 +29,10 @@ #include <tqdatetime.h> #include <tqlineedit.h> -#include <kmessagebox.h> -#include <kglobal.h> +#include <tdemessagebox.h> +#include <tdeglobal.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "ktimeedit.h" #include <tqvalidator.h> diff --git a/libtdepim/kvcarddrag.cpp b/libtdepim/kvcarddrag.cpp index d8e83d898..285224497 100644 --- a/libtdepim/kvcarddrag.cpp +++ b/libtdepim/kvcarddrag.cpp @@ -21,7 +21,7 @@ #include "kvcarddrag.h" -#include <kabc/vcardconverter.h> +#include <tdeabc/vcardconverter.h> static const char vcard_mime_string[] = "text/x-vcard"; diff --git a/libtdepim/kvcarddrag.h b/libtdepim/kvcarddrag.h index e2d3c1e24..83c7f3e50 100644 --- a/libtdepim/kvcarddrag.h +++ b/libtdepim/kvcarddrag.h @@ -25,8 +25,8 @@ #include <tqdragobject.h> #include <tqstring.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 <tdepimmacros.h> class KVCardDragPrivate; diff --git a/libtdepim/kwidgetlister.cpp b/libtdepim/kwidgetlister.cpp index 546bbb322..dc4e8a620 100644 --- a/libtdepim/kwidgetlister.cpp +++ b/libtdepim/kwidgetlister.cpp @@ -31,7 +31,7 @@ #include "kwidgetlister.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqpushbutton.h> diff --git a/libtdepim/ldapclient.cpp b/libtdepim/ldapclient.cpp index 4ea3b4584..290238403 100644 --- a/libtdepim/ldapclient.cpp +++ b/libtdepim/ldapclient.cpp @@ -29,8 +29,8 @@ #include <tqtextstream.h> #include <tqurl.h> -#include <kabc/ldapurl.h> -#include <kabc/ldif.h> +#include <tdeabc/ldapurl.h> +#include <tdeabc/ldif.h> #include <tdeapplication.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/libtdepim/ldapclient.h b/libtdepim/ldapclient.h index 789b46054..51701272b 100644 --- a/libtdepim/ldapclient.h +++ b/libtdepim/ldapclient.h @@ -32,7 +32,7 @@ #include <tqtimer.h> #include <tdeio/job.h> -#include <kabc/ldif.h> +#include <tdeabc/ldif.h> #include <tdeconfig.h> #include <tdepimmacros.h> diff --git a/libtdepim/ldapsearchdialog.cpp b/libtdepim/ldapsearchdialog.cpp index 7a1319b74..b6e49c8a2 100644 --- a/libtdepim/ldapsearchdialog.cpp +++ b/libtdepim/ldapsearchdialog.cpp @@ -31,13 +31,13 @@ #include <tqlistview.h> #include <tqpushbutton.h> -#include <kabc/addresslineedit.h> +#include <tdeabc/addresslineedit.h> #include <tdeapplication.h> #include <kcombobox.h> #include <tdeconfig.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> using namespace KPIM; diff --git a/libtdepim/linklocator.cpp b/libtdepim/linklocator.cpp index d71bc875e..f740c1940 100644 --- a/libtdepim/linklocator.cpp +++ b/libtdepim/linklocator.cpp @@ -22,7 +22,7 @@ #include "linklocator.h" #include "pimemoticons.h" -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kstaticdeleter.h> #include <kmdcodec.h> diff --git a/libtdepim/maillistdrag.cpp b/libtdepim/maillistdrag.cpp index 159ca2f24..b269efe08 100644 --- a/libtdepim/maillistdrag.cpp +++ b/libtdepim/maillistdrag.cpp @@ -25,7 +25,7 @@ #include <tqdatastream.h> #include <tqeventloop.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprogress.h> using namespace KPIM; diff --git a/libtdepim/pluginloaderbase.cpp b/libtdepim/pluginloaderbase.cpp index 5d0a89f67..911fbba6e 100644 --- a/libtdepim/pluginloaderbase.cpp +++ b/libtdepim/pluginloaderbase.cpp @@ -22,10 +22,10 @@ #include <pluginloaderbase.h> #include <ksimpleconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <klibloader.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> #include <tqfile.h> diff --git a/libtdepim/progressdialog.cpp b/libtdepim/progressdialog.cpp index 82a8895d4..101579305 100644 --- a/libtdepim/progressdialog.cpp +++ b/libtdepim/progressdialog.cpp @@ -45,7 +45,7 @@ #include <tqvbox.h> #include <tqtooltip.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <kstdguiitem.h> #include <kiconloader.h> diff --git a/libtdepim/progressmanager.cpp b/libtdepim/progressmanager.cpp index 0f3e39cae..37216e94c 100644 --- a/libtdepim/progressmanager.cpp +++ b/libtdepim/progressmanager.cpp @@ -24,7 +24,7 @@ #include <tqvaluevector.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstaticdeleter.h> #include "progressmanager.h" diff --git a/libtdepim/recentaddresses.cpp b/libtdepim/recentaddresses.cpp index 35c52e35d..6698b263d 100644 --- a/libtdepim/recentaddresses.cpp +++ b/libtdepim/recentaddresses.cpp @@ -32,10 +32,10 @@ #include <kstaticdeleter.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <keditlistbox.h> diff --git a/libtdepim/recentaddresses.h b/libtdepim/recentaddresses.h index 6adc65986..547986370 100644 --- a/libtdepim/recentaddresses.h +++ b/libtdepim/recentaddresses.h @@ -31,7 +31,7 @@ #define RECENTADDRESSES_H #include <tqstringlist.h> -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <kdialogbase.h> diff --git a/libtdepim/resourceabc.h b/libtdepim/resourceabc.h index fe2e45bf1..0b76b7f36 100644 --- a/libtdepim/resourceabc.h +++ b/libtdepim/resourceabc.h @@ -25,7 +25,7 @@ #ifndef RESOURCEABC_H #define RESOURCEABC_H -#include <kabc/resource.h> +#include <tdeabc/resource.h> #include <tqmap.h> #include <tdepimmacros.h> diff --git a/libtdepim/sendsmsdialog.cpp b/libtdepim/sendsmsdialog.cpp index 2fb4efe41..2b658112a 100644 --- a/libtdepim/sendsmsdialog.cpp +++ b/libtdepim/sendsmsdialog.cpp @@ -23,7 +23,7 @@ #include <tqlayout.h> #include <tqtextedit.h> -#include <klocale.h> +#include <tdelocale.h> #include "sendsmsdialog.h" diff --git a/libtdepim/ssllabel.cpp b/libtdepim/ssllabel.cpp index 6e4717cd3..fc876fad1 100644 --- a/libtdepim/ssllabel.cpp +++ b/libtdepim/ssllabel.cpp @@ -35,7 +35,7 @@ #include "ssllabel.h" #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqtooltip.h> diff --git a/libtdepim/statusbarprogresswidget.cpp b/libtdepim/statusbarprogresswidget.cpp index 99a035b89..61dd1bf2b 100644 --- a/libtdepim/statusbarprogresswidget.cpp +++ b/libtdepim/statusbarprogresswidget.cpp @@ -47,7 +47,7 @@ using KPIM::ProgressManager; #include <tqlabel.h> #include <tqpushbutton.h> #include <tqtooltip.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqwidgetstack.h> #include <tqframe.h> diff --git a/libtdepim/tdeconfigpropagator.cpp b/libtdepim/tdeconfigpropagator.cpp index f6f482402..01ed31ab3 100644 --- a/libtdepim/tdeconfigpropagator.cpp +++ b/libtdepim/tdeconfigpropagator.cpp @@ -26,7 +26,7 @@ #include <tdeconfigskeleton.h> #include <kstandarddirs.h> #include <kstringhandler.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqfile.h> #include <tqstringlist.h> diff --git a/libtdepim/tdeconfigwizard.cpp b/libtdepim/tdeconfigwizard.cpp index 30e11fbc9..8c2620d1f 100644 --- a/libtdepim/tdeconfigwizard.cpp +++ b/libtdepim/tdeconfigwizard.cpp @@ -21,10 +21,10 @@ #include "tdeconfigwizard.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeconfigskeleton.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> #include <tqlistview.h> diff --git a/libtdepim/tdefileio.cpp b/libtdepim/tdefileio.cpp index ad899351f..14fc458ed 100644 --- a/libtdepim/tdefileio.cpp +++ b/libtdepim/tdefileio.cpp @@ -6,13 +6,13 @@ #include <config.h> #endif -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <assert.h> #include <tqdir.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstdguiitem.h> #include <tqwidget.h> diff --git a/libtdepim/tests/testaddresseelineedit.cpp b/libtdepim/tests/testaddresseelineedit.cpp index 9fb3470d0..64d969fd5 100644 --- a/libtdepim/tests/testaddresseelineedit.cpp +++ b/libtdepim/tests/testaddresseelineedit.cpp @@ -22,7 +22,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include "../addresseelineedit.h" diff --git a/libtdepim/tests/testaddresseeselector.cpp b/libtdepim/tests/testaddresseeselector.cpp index 438208698..8410188c2 100644 --- a/libtdepim/tests/testaddresseeselector.cpp +++ b/libtdepim/tests/testaddresseeselector.cpp @@ -22,7 +22,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include "../addresseeselector.h" diff --git a/libtdepim/tests/testdateedit.cpp b/libtdepim/tests/testdateedit.cpp index 257624645..a87e950c3 100644 --- a/libtdepim/tests/testdateedit.cpp +++ b/libtdepim/tests/testdateedit.cpp @@ -25,7 +25,7 @@ #include <tdeapplication.h> #include <tdecmdlineargs.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "kdateedit.h" diff --git a/libtdepim/tests/testdistrlist.cpp b/libtdepim/tests/testdistrlist.cpp index d57cc5929..0bbb536d7 100644 --- a/libtdepim/tests/testdistrlist.cpp +++ b/libtdepim/tests/testdistrlist.cpp @@ -23,7 +23,7 @@ using KPIM::DistributionList; #include <config.h> -#include <kabc/stdaddressbook.h> +#include <tdeabc/stdaddressbook.h> #include <kurl.h> #include <tdeapplication.h> #include <tdeio/netaccess.h> diff --git a/libtdepim/tests/testkincidencechooser.cpp b/libtdepim/tests/testkincidencechooser.cpp index d2f8cadf3..ab113a046 100644 --- a/libtdepim/tests/testkincidencechooser.cpp +++ b/libtdepim/tests/testkincidencechooser.cpp @@ -19,7 +19,7 @@ #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <libkcal/event.h> using namespace KCal; diff --git a/libtdepim/tests/testwizard.cpp b/libtdepim/tests/testwizard.cpp index fd6c70eb8..f2a9a5fd3 100644 --- a/libtdepim/tests/testwizard.cpp +++ b/libtdepim/tests/testwizard.cpp @@ -26,7 +26,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <tqlayout.h> diff --git a/plugins/kmail/bodypartformatter/attendeeselector.cpp b/plugins/kmail/bodypartformatter/attendeeselector.cpp index dae65dc3e..08bf9c008 100644 --- a/plugins/kmail/bodypartformatter/attendeeselector.cpp +++ b/plugins/kmail/bodypartformatter/attendeeselector.cpp @@ -23,7 +23,7 @@ #include <libtdepim/addresseelineedit.h> #include <libemailfunctions/email.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <tqlayout.h> diff --git a/plugins/kmail/bodypartformatter/delegateselector.cpp b/plugins/kmail/bodypartformatter/delegateselector.cpp index d175c6b4d..e4d3c6e1c 100644 --- a/plugins/kmail/bodypartformatter/delegateselector.cpp +++ b/plugins/kmail/bodypartformatter/delegateselector.cpp @@ -21,7 +21,7 @@ #include <libtdepim/addresseelineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqcheckbox.h> #include <tqhbox.h> diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp index b85cca490..bfe78c615 100644 --- a/plugins/kmail/bodypartformatter/text_calendar.cpp +++ b/plugins/kmail/bodypartformatter/text_calendar.cpp @@ -57,19 +57,19 @@ #include <email.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdefiledialog.h> #include <kinputdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstringhandler.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> #include <kdebug.h> #include <kdcopservicestarter.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <tdeapplication.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kmdcodec.h> #include <kmimetype.h> #include <tdepopupmenu.h> diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp index 74b564570..61a254c4b 100644 --- a/plugins/kmail/bodypartformatter/text_vcard.cpp +++ b/plugins/kmail/bodypartformatter/text_vcard.cpp @@ -33,14 +33,14 @@ #include <tqurl.h> #include <tdeapplication.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kstringhandler.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdefiledialog.h> #include <kiconloader.h> -#include <kmessagebox.h> -#include <ktempfile.h> +#include <tdemessagebox.h> +#include <tdetempfile.h> #include <tdeio/netaccess.h> @@ -55,8 +55,8 @@ using KMail::Interface::BodyPart; #include <tdeimproxy.h> #include <tdepopupmenu.h> -#include <kabc/vcardconverter.h> -#include <kabc/addressee.h> +#include <tdeabc/vcardconverter.h> +#include <tdeabc/addressee.h> using KABC::VCardConverter; using KABC::Addressee; diff --git a/plugins/kmail/bodypartformatter/text_xdiff.cpp b/plugins/kmail/bodypartformatter/text_xdiff.cpp index 7e364450c..8d4937c7f 100644 --- a/plugins/kmail/bodypartformatter/text_xdiff.cpp +++ b/plugins/kmail/bodypartformatter/text_xdiff.cpp @@ -37,13 +37,13 @@ #include <kmail/callback.h> #include <kmail/kmmessage.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kstringhandler.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <tdeapplication.h> diff --git a/tdefile-plugins/palm-databases/tdefile_palm.cpp b/tdefile-plugins/palm-databases/tdefile_palm.cpp index 3d4e20e93..e995b1368 100644 --- a/tdefile-plugins/palm-databases/tdefile_palm.cpp +++ b/tdefile-plugins/palm-databases/tdefile_palm.cpp @@ -21,7 +21,7 @@ #include "tdefile_palm.h" -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <tqfile.h> diff --git a/tdefile-plugins/rfc822/tdefile_rfc822.cpp b/tdefile-plugins/rfc822/tdefile_rfc822.cpp index 261f0835a..f1b4d6ff4 100644 --- a/tdefile-plugins/rfc822/tdefile_rfc822.cpp +++ b/tdefile-plugins/rfc822/tdefile_rfc822.cpp @@ -21,7 +21,7 @@ #include "tdefile_rfc822.h" #include <kprocess.h> -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <kstringvalidator.h> #include <kdebug.h> diff --git a/tdefile-plugins/vcf/CMakeLists.txt b/tdefile-plugins/vcf/CMakeLists.txt index 4cf771d26..c0a8944a0 100644 --- a/tdefile-plugins/vcf/CMakeLists.txt +++ b/tdefile-plugins/vcf/CMakeLists.txt @@ -30,6 +30,6 @@ install( FILES tdefile_vcf.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) tde_add_kpart( tdefile_vcf AUTOMOC SOURCES tdefile_vcf.cpp - LINK kabc-shared + LINK tdeabc-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/tdefile-plugins/vcf/tdefile_vcf.cpp b/tdefile-plugins/vcf/tdefile_vcf.cpp index e8746c56a..3b70960da 100644 --- a/tdefile-plugins/vcf/tdefile_vcf.cpp +++ b/tdefile-plugins/vcf/tdefile_vcf.cpp @@ -22,9 +22,9 @@ #include "tdefile_vcf.h" #include <kprocess.h> -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/vcardconverter.h> #include <tqdict.h> #include <tqfile.h> diff --git a/tdeioslaves/imap4/imap4.cc b/tdeioslaves/imap4/imap4.cc index 4871ae68e..cb0f06ad8 100644 --- a/tdeioslaves/imap4/imap4.cc +++ b/tdeioslaves/imap4/imap4.cc @@ -81,13 +81,13 @@ extern "C" { #include <tqbuffer.h> #include <tqdatetime.h> #include <tqregexp.h> -#include <kprotocolmanager.h> -#include <kmessagebox.h> +#include <tdeprotocolmanager.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <tdeio/connection.h> #include <tdeio/slaveinterface.h> #include <tdeio/passdlg.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmimetype.h> #include <kmdcodec.h> diff --git a/tdeioslaves/imap4/imapcommand.cc b/tdeioslaves/imap4/imapcommand.cc index a3239d09d..f88a65add 100644 --- a/tdeioslaves/imap4/imapcommand.cc +++ b/tdeioslaves/imap4/imapcommand.cc @@ -46,14 +46,14 @@ #include <tqregexp.h> #include <tqbuffer.h> -#include <kprotocolmanager.h> +#include <tdeprotocolmanager.h> #include <ksock.h> #include <kdebug.h> #include <kinstance.h> #include <tdeio/connection.h> #include <tdeio/slaveinterface.h> #include <tdeio/passdlg.h> -#include <klocale.h> */ +#include <tdelocale.h> */ imapCommand::imapCommand () { diff --git a/tdeioslaves/imap4/mimeheader.cc b/tdeioslaves/imap4/mimeheader.cc index 4f3de6469..d0916ba50 100644 --- a/tdeioslaves/imap4/mimeheader.cc +++ b/tdeioslaves/imap4/mimeheader.cc @@ -23,7 +23,7 @@ #include <tqregexp.h> // #include <iostream.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kinstance.h> #include <kiconloader.h> #include <kmimetype.h> diff --git a/tdeioslaves/mbox/mbox.cc b/tdeioslaves/mbox/mbox.cc index 91a324889..5742baffd 100644 --- a/tdeioslaves/mbox/mbox.cc +++ b/tdeioslaves/mbox/mbox.cc @@ -26,9 +26,9 @@ #include <tqcstring.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kinstance.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kurl.h> #include <tdeio/global.h> diff --git a/tdeioslaves/opengroupware/opengroupware.cpp b/tdeioslaves/opengroupware/opengroupware.cpp index 3624b61e9..c1fd485df 100644 --- a/tdeioslaves/opengroupware/opengroupware.cpp +++ b/tdeioslaves/opengroupware/opengroupware.cpp @@ -25,7 +25,7 @@ #include <kurl.h> #include <tdeio/job.h> #include <tdeio/davjob.h> -#include <klocale.h> +#include <tdelocale.h> #include <libtdepim/kabcresourcecached.h> @@ -34,12 +34,12 @@ #include <libkcal/scheduler.h> #include <libkcal/calendarlocal.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/vcardconverter.h> #include <kinstance.h> #include <kdebug.h> -#include <klocale.h> -#include <ktempfile.h> +#include <tdelocale.h> +#include <tdetempfile.h> #include <sys/types.h> #include <unistd.h> diff --git a/tdeioslaves/sieve/sieve.cpp b/tdeioslaves/sieve/sieve.cpp index 4a84997cb..77b262fd4 100644 --- a/tdeioslaves/sieve/sieve.cpp +++ b/tdeioslaves/sieve/sieve.cpp @@ -35,11 +35,11 @@ extern "C" { #include <kdebug.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <kmdcodec.h> -#include <kglobal.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdemessagebox.h> #include <tqcstring.h> #include <tqregexp.h> diff --git a/tderesources/birthdays/resourcekabc.cpp b/tderesources/birthdays/resourcekabc.cpp index a36517ebd..d6869bbe5 100644 --- a/tderesources/birthdays/resourcekabc.cpp +++ b/tderesources/birthdays/resourcekabc.cpp @@ -26,14 +26,14 @@ #include <tqstring.h> #include <tqptrlist.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kurl.h> #include <tdeio/job.h> #include <kstandarddirs.h> -#include <kabc/stdaddressbook.h> -#include <kabc/locknull.h> +#include <tdeabc/stdaddressbook.h> +#include <tdeabc/locknull.h> #include "libkcal/vcaldrag.h" #include "libkcal/vcalformat.h" diff --git a/tderesources/birthdays/resourcekabc.h b/tderesources/birthdays/resourcekabc.h index 008b87e5d..42bb50412 100644 --- a/tderesources/birthdays/resourcekabc.h +++ b/tderesources/birthdays/resourcekabc.h @@ -29,7 +29,7 @@ #include "libkcal/incidence.h" #include "libkcal/calendarlocal.h" -#include <kabc/addressbook.h> +#include <tdeabc/addressbook.h> #include "libkcal/resourcecalendar.h" diff --git a/tderesources/birthdays/resourcekabcconfig.cpp b/tderesources/birthdays/resourcekabcconfig.cpp index 24a79bf2b..5bb459091 100644 --- a/tderesources/birthdays/resourcekabcconfig.cpp +++ b/tderesources/birthdays/resourcekabcconfig.cpp @@ -26,7 +26,7 @@ #include <kabprefs.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "resourcekabc.h" #include "resourcekabcconfig.h" diff --git a/tderesources/blogging/kcal_resourceblogging_plugin.cpp b/tderesources/blogging/kcal_resourceblogging_plugin.cpp index 4cc3dd8cb..463df66ee 100644 --- a/tderesources/blogging/kcal_resourceblogging_plugin.cpp +++ b/tderesources/blogging/kcal_resourceblogging_plugin.cpp @@ -22,8 +22,8 @@ #include "kcal_resourceblogging.h" #include "kcal_resourcebloggingconfig.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KCal; diff --git a/tderesources/blogging/kcal_resourcebloggingconfig.cpp b/tderesources/blogging/kcal_resourcebloggingconfig.cpp index bd999ffe3..c7e3e42f9 100644 --- a/tderesources/blogging/kcal_resourcebloggingconfig.cpp +++ b/tderesources/blogging/kcal_resourcebloggingconfig.cpp @@ -20,8 +20,8 @@ #include "kcal_resourcebloggingconfig.h" -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> using namespace KCal; diff --git a/tderesources/blogging/xmlrpcjob.cpp b/tderesources/blogging/xmlrpcjob.cpp index cb377e7ed..cd9a0fa46 100644 --- a/tderesources/blogging/xmlrpcjob.cpp +++ b/tderesources/blogging/xmlrpcjob.cpp @@ -30,7 +30,7 @@ #include <tqregexp.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeio/http.h> #include <kmdcodec.h> #include <tdeio/davjob.h> diff --git a/tderesources/caldav/config.cpp b/tderesources/caldav/config.cpp index 5aeb2ddf6..b83660f8b 100644 --- a/tderesources/caldav/config.cpp +++ b/tderesources/caldav/config.cpp @@ -21,7 +21,7 @@ #include <kcombobox.h> #include <kdebug.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <tdelistview.h> #include <kurlrequester.h> diff --git a/tderesources/caldav/configwidgets.cpp b/tderesources/caldav/configwidgets.cpp index ab8c79050..db6207417 100644 --- a/tderesources/caldav/configwidgets.cpp +++ b/tderesources/caldav/configwidgets.cpp @@ -37,7 +37,7 @@ #include <libkcal/resourcecached.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqlabel.h> diff --git a/tderesources/caldav/job.cpp b/tderesources/caldav/job.cpp index 93f91cd52..354898aed 100644 --- a/tderesources/caldav/job.cpp +++ b/tderesources/caldav/job.cpp @@ -16,7 +16,7 @@ #include "job.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqmutex.h> diff --git a/tderesources/caldav/plugin.cpp b/tderesources/caldav/plugin.cpp index c7ea06e81..479f774b5 100644 --- a/tderesources/caldav/plugin.cpp +++ b/tderesources/caldav/plugin.cpp @@ -18,8 +18,8 @@ #include "config.h" #include "export.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> /*========================================================================= | NAMESPACE diff --git a/tderesources/caldav/resource.cpp b/tderesources/caldav/resource.cpp index b9285e611..e84d864d3 100644 --- a/tderesources/caldav/resource.cpp +++ b/tderesources/caldav/resource.cpp @@ -25,7 +25,7 @@ #include <libkcal/calendarlocal.h> #include <libkcal/icalformat.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpassdlg.h> #include <tqdatetime.h> diff --git a/tderesources/caldav/resource.h b/tderesources/caldav/resource.h index ee5805327..d65c7f904 100644 --- a/tderesources/caldav/resource.h +++ b/tderesources/caldav/resource.h @@ -24,7 +24,7 @@ #include <libkcal/resourcecached.h> #include <libtdepim/progressmanager.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include <tdepimmacros.h> #include <tdeconfig.h> diff --git a/tderesources/carddav/config.cpp b/tderesources/carddav/config.cpp index ecfff25e0..a71035058 100644 --- a/tderesources/carddav/config.cpp +++ b/tderesources/carddav/config.cpp @@ -20,7 +20,7 @@ #include <kcombobox.h> #include <kdebug.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <tdelistview.h> #include <kurlrequester.h> diff --git a/tderesources/carddav/configwidgets.cpp b/tderesources/carddav/configwidgets.cpp index b2d505dfe..2c22b3f11 100644 --- a/tderesources/carddav/configwidgets.cpp +++ b/tderesources/carddav/configwidgets.cpp @@ -36,7 +36,7 @@ #include <kabcresourcecached.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqlabel.h> diff --git a/tderesources/carddav/job.cpp b/tderesources/carddav/job.cpp index 9c2886505..5cab5cdfb 100644 --- a/tderesources/carddav/job.cpp +++ b/tderesources/carddav/job.cpp @@ -15,7 +15,7 @@ #include "job.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqmutex.h> diff --git a/tderesources/carddav/plugin.cpp b/tderesources/carddav/plugin.cpp index d0c4724ff..9079ecd33 100644 --- a/tderesources/carddav/plugin.cpp +++ b/tderesources/carddav/plugin.cpp @@ -17,8 +17,8 @@ #include "config.h" #include "export.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> /*========================================================================= | NAMESPACE diff --git a/tderesources/carddav/resource.cpp b/tderesources/carddav/resource.cpp index dae91c322..ddaae59dc 100644 --- a/tderesources/carddav/resource.cpp +++ b/tderesources/carddav/resource.cpp @@ -21,10 +21,10 @@ #include <tqapplication.h> #include <tqeventloop.h> -#include <kabc/addressee.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/addressee.h> +#include <tdeabc/vcardconverter.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpassdlg.h> #include <tqdatetime.h> diff --git a/tderesources/carddav/resource.h b/tderesources/carddav/resource.h index 8f783ab28..2e2de6284 100644 --- a/tderesources/carddav/resource.h +++ b/tderesources/carddav/resource.h @@ -23,7 +23,7 @@ #include <kabcresourcecached.h> #include <libtdepim/progressmanager.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include <tdepimmacros.h> #include <tdeconfig.h> diff --git a/tderesources/egroupware/debugdialog.cpp b/tderesources/egroupware/debugdialog.cpp index 54fe07234..70cc87f57 100644 --- a/tderesources/egroupware/debugdialog.cpp +++ b/tderesources/egroupware/debugdialog.cpp @@ -26,7 +26,7 @@ #include <kstaticdeleter.h> #include <stdlib.h> -#include <klocale.h> +#include <tdelocale.h> #include "debugdialog.h" DebugDialog* DebugDialog::mSelf = 0; diff --git a/tderesources/egroupware/kabc_resourcexmlrpc.cpp b/tderesources/egroupware/kabc_resourcexmlrpc.cpp index 39e3aac14..587ebc84d 100644 --- a/tderesources/egroupware/kabc_resourcexmlrpc.cpp +++ b/tderesources/egroupware/kabc_resourcexmlrpc.cpp @@ -20,11 +20,11 @@ #include <tqapplication.h> -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <kabprefs.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmdcodec.h> #include <kstandarddirs.h> #include <kstringhandler.h> diff --git a/tderesources/egroupware/kabc_resourcexmlrpcconfig.cpp b/tderesources/egroupware/kabc_resourcexmlrpcconfig.cpp index ddafbd1f2..03665e75d 100644 --- a/tderesources/egroupware/kabc_resourcexmlrpcconfig.cpp +++ b/tderesources/egroupware/kabc_resourcexmlrpcconfig.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <kurlrequester.h> diff --git a/tderesources/egroupware/kabc_resourcexmlrpcplugin.cpp b/tderesources/egroupware/kabc_resourcexmlrpcplugin.cpp index c4c0cc6c0..c14a8f679 100644 --- a/tderesources/egroupware/kabc_resourcexmlrpcplugin.cpp +++ b/tderesources/egroupware/kabc_resourcexmlrpcplugin.cpp @@ -21,8 +21,8 @@ #include "kabc_resourcexmlrpc.h" #include "kabc_resourcexmlrpcconfig.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KABC; diff --git a/tderesources/egroupware/kcal_resourcexmlrpc.cpp b/tderesources/egroupware/kcal_resourcexmlrpc.cpp index c703fa2b9..7c568e4e6 100644 --- a/tderesources/egroupware/kcal_resourcexmlrpc.cpp +++ b/tderesources/egroupware/kcal_resourcexmlrpc.cpp @@ -28,9 +28,9 @@ #include <tqstringlist.h> #include <tqtimer.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tderesources/configwidget.h> #include <kstandarddirs.h> #include <kstringhandler.h> diff --git a/tderesources/egroupware/kcal_resourcexmlrpcconfig.cpp b/tderesources/egroupware/kcal_resourcexmlrpcconfig.cpp index 213da26e3..12b1c76d1 100644 --- a/tderesources/egroupware/kcal_resourcexmlrpcconfig.cpp +++ b/tderesources/egroupware/kcal_resourcexmlrpcconfig.cpp @@ -24,7 +24,7 @@ #include <kdebug.h> #include <kdialog.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kurlrequester.h> diff --git a/tderesources/egroupware/kcal_resourcexmlrpcplugin.cpp b/tderesources/egroupware/kcal_resourcexmlrpcplugin.cpp index 021389b61..b1d9665a0 100644 --- a/tderesources/egroupware/kcal_resourcexmlrpcplugin.cpp +++ b/tderesources/egroupware/kcal_resourcexmlrpcplugin.cpp @@ -21,8 +21,8 @@ #include "kcal_resourcexmlrpc.h" #include "kcal_resourcexmlrpcconfig.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KCal; diff --git a/tderesources/egroupware/knotes_resourcexmlrpc.cpp b/tderesources/egroupware/knotes_resourcexmlrpc.cpp index 1b19831bc..15d76b238 100644 --- a/tderesources/egroupware/knotes_resourcexmlrpc.cpp +++ b/tderesources/egroupware/knotes_resourcexmlrpc.cpp @@ -23,7 +23,7 @@ #include <tqstringlist.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kstringhandler.h> #include <kurl.h> diff --git a/tderesources/egroupware/knotes_resourcexmlrpcconfig.cpp b/tderesources/egroupware/knotes_resourcexmlrpcconfig.cpp index 8cf2a35c8..c7b43a362 100644 --- a/tderesources/egroupware/knotes_resourcexmlrpcconfig.cpp +++ b/tderesources/egroupware/knotes_resourcexmlrpcconfig.cpp @@ -24,7 +24,7 @@ #include <kdebug.h> #include <kdialog.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kurlrequester.h> diff --git a/tderesources/egroupware/knotes_resourcexmlrpcplugin.cpp b/tderesources/egroupware/knotes_resourcexmlrpcplugin.cpp index 276cb6b0f..6d7809207 100644 --- a/tderesources/egroupware/knotes_resourcexmlrpcplugin.cpp +++ b/tderesources/egroupware/knotes_resourcexmlrpcplugin.cpp @@ -21,8 +21,8 @@ #include "knotes_resourcexmlrpc.h" #include "knotes_resourcexmlrpcconfig.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KNotes; diff --git a/tderesources/egroupware/xmlrpciface.cpp b/tderesources/egroupware/xmlrpciface.cpp index 7af9814a1..06ad93e06 100644 --- a/tderesources/egroupware/xmlrpciface.cpp +++ b/tderesources/egroupware/xmlrpciface.cpp @@ -12,7 +12,7 @@ #include <kdebug.h> #include <tdeio/job.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmdcodec.h> #include "debugdialog.h" diff --git a/tderesources/exchange/resourceexchange.cpp b/tderesources/exchange/resourceexchange.cpp index 6335dc64b..a85c741d2 100644 --- a/tderesources/exchange/resourceexchange.cpp +++ b/tderesources/exchange/resourceexchange.cpp @@ -29,8 +29,8 @@ #include <kdebug.h> #include <tdeapplication.h> #include <kstringhandler.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <libkcal/calendarlocal.h> #include <libkcal/calendar.h> @@ -38,7 +38,7 @@ #include <tderesources/configwidget.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include "dateset.h" #include "exchangeaccount.h" diff --git a/tderesources/exchange/resourceexchangeconfig.cpp b/tderesources/exchange/resourceexchangeconfig.cpp index 36774901b..3b3bf14f2 100644 --- a/tderesources/exchange/resourceexchangeconfig.cpp +++ b/tderesources/exchange/resourceexchangeconfig.cpp @@ -22,10 +22,10 @@ #include <tqlabel.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kstandarddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "exchangeaccount.h" #include "resourceexchangeconfig.h" diff --git a/tderesources/featureplan/kcal_resourcefeatureplan.cpp b/tderesources/featureplan/kcal_resourcefeatureplan.cpp index 2bddc7fd9..d417c0d83 100644 --- a/tderesources/featureplan/kcal_resourcefeatureplan.cpp +++ b/tderesources/featureplan/kcal_resourcefeatureplan.cpp @@ -32,9 +32,9 @@ #include <tqstringlist.h> #include <tqtimer.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tderesources/configwidget.h> #include <kstandarddirs.h> #include <kstringhandler.h> diff --git a/tderesources/featureplan/kcal_resourcefeatureplan.h b/tderesources/featureplan/kcal_resourcefeatureplan.h index 08bf1f39f..f6487521e 100644 --- a/tderesources/featureplan/kcal_resourcefeatureplan.h +++ b/tderesources/featureplan/kcal_resourcefeatureplan.h @@ -27,7 +27,7 @@ #include <libkcal/resourcecached.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include <tdepimmacros.h> #include <tdeconfig.h> diff --git a/tderesources/featureplan/kcal_resourcefeatureplanconfig.cpp b/tderesources/featureplan/kcal_resourcefeatureplanconfig.cpp index 55d12cbd9..3cedd536f 100644 --- a/tderesources/featureplan/kcal_resourcefeatureplanconfig.cpp +++ b/tderesources/featureplan/kcal_resourcefeatureplanconfig.cpp @@ -26,7 +26,7 @@ #include <kdebug.h> #include <kdialog.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kurlrequester.h> diff --git a/tderesources/featureplan/kcal_resourcefeatureplanplugin.cpp b/tderesources/featureplan/kcal_resourcefeatureplanplugin.cpp index ae2759e46..6a0e7b726 100644 --- a/tderesources/featureplan/kcal_resourcefeatureplanplugin.cpp +++ b/tderesources/featureplan/kcal_resourcefeatureplanplugin.cpp @@ -22,8 +22,8 @@ #include "kcal_resourcefeatureplan.h" #include "kcal_resourcefeatureplanconfig.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KCal; diff --git a/tderesources/groupdav/Makefile.am b/tderesources/groupdav/Makefile.am index 1e20f2912..cbc9418b8 100644 --- a/tderesources/groupdav/Makefile.am +++ b/tderesources/groupdav/Makefile.am @@ -42,7 +42,7 @@ METASOURCES = AUTO install-data-local: uninstall.desktop $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)/tderesources/kabc $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)/tderesources/kcal - $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_servicesdir)/tderesources/kabc/kabc_opengroupware.desktop + $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_servicesdir)/tderesources/tdeabc/kabc_opengroupware.desktop $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_servicesdir)/tderesources/kcal/kcal_opengroupware.desktop messages: rc.cpp diff --git a/tderesources/groupdav/groupdavaddressbookadaptor.cpp b/tderesources/groupdav/groupdavaddressbookadaptor.cpp index 9704e5bd8..f9d06179d 100644 --- a/tderesources/groupdav/groupdavaddressbookadaptor.cpp +++ b/tderesources/groupdav/groupdavaddressbookadaptor.cpp @@ -26,8 +26,8 @@ #include "davgroupwareglobals.h" #include "webdavhandler.h" -#include <kabc/addressee.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/addressee.h> +#include <tdeabc/vcardconverter.h> #include <kabcresourcecached.h> #include <tdeio/job.h> diff --git a/tderesources/groupdav/groupdavaddressbookadaptor.h b/tderesources/groupdav/groupdavaddressbookadaptor.h index 425c63712..7a845955d 100644 --- a/tderesources/groupdav/groupdavaddressbookadaptor.h +++ b/tderesources/groupdav/groupdavaddressbookadaptor.h @@ -26,7 +26,7 @@ #include "davaddressbookadaptor.h" #include "groupdavglobals.h" #include <davgroupwareglobals.h> -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <kurl.h> #include <tqdom.h> diff --git a/tderesources/groupdav/groupdavglobals.cpp b/tderesources/groupdav/groupdavglobals.cpp index 793c1b965..fdf687977 100644 --- a/tderesources/groupdav/groupdavglobals.cpp +++ b/tderesources/groupdav/groupdavglobals.cpp @@ -31,7 +31,7 @@ #include <libkcal/calendarlocal.h> #include <libkcal/icalformat.h> #include <libkcal/resourcecached.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/vcardconverter.h> #include <kdebug.h> #include <tdeio/davjob.h> diff --git a/tderesources/groupdav/kabc_resourcegroupdav_plugin.cpp b/tderesources/groupdav/kabc_resourcegroupdav_plugin.cpp index d487889fc..2377808a2 100644 --- a/tderesources/groupdav/kabc_resourcegroupdav_plugin.cpp +++ b/tderesources/groupdav/kabc_resourcegroupdav_plugin.cpp @@ -23,8 +23,8 @@ #include "kabc_resourcegroupdav.h" #include "kabc_resourcegroupwarebaseconfig.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KABC; diff --git a/tderesources/groupdav/kcal_resourcegroupdav_plugin.cpp b/tderesources/groupdav/kcal_resourcegroupdav_plugin.cpp index f06e5d248..276b2fd2d 100644 --- a/tderesources/groupdav/kcal_resourcegroupdav_plugin.cpp +++ b/tderesources/groupdav/kcal_resourcegroupdav_plugin.cpp @@ -24,8 +24,8 @@ #include "kcal_resourcegroupdav.h" #include "kcal_resourcegroupwarebaseconfig.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KCal; diff --git a/tderesources/groupware/kabc_resourcegroupware.cpp b/tderesources/groupware/kabc_resourcegroupware.cpp index 44cee5630..e2503b83d 100644 --- a/tderesources/groupware/kabc_resourcegroupware.cpp +++ b/tderesources/groupware/kabc_resourcegroupware.cpp @@ -20,11 +20,11 @@ #include <tqapplication.h> -#include <kabc/addressee.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/addressee.h> +#include <tdeabc/vcardconverter.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <libtdepim/groupwarejob.h> diff --git a/tderesources/groupware/kabc_resourcegroupware_plugin.cpp b/tderesources/groupware/kabc_resourcegroupware_plugin.cpp index c7266b181..12f3233b6 100644 --- a/tderesources/groupware/kabc_resourcegroupware_plugin.cpp +++ b/tderesources/groupware/kabc_resourcegroupware_plugin.cpp @@ -21,8 +21,8 @@ #include "kabc_resourcegroupware.h" #include "kabc_resourcegroupwareconfig.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KABC; diff --git a/tderesources/groupware/kabc_resourcegroupwareconfig.cpp b/tderesources/groupware/kabc_resourcegroupwareconfig.cpp index 317c82b6f..35ca8596f 100644 --- a/tderesources/groupware/kabc_resourcegroupwareconfig.cpp +++ b/tderesources/groupware/kabc_resourcegroupwareconfig.cpp @@ -26,7 +26,7 @@ #include <kcombobox.h> #include <kdebug.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <tdelistview.h> #include <kurlrequester.h> diff --git a/tderesources/groupware/kcal_resourcegroupware.cpp b/tderesources/groupware/kcal_resourcegroupware.cpp index f515bd06e..1bb0b2db9 100644 --- a/tderesources/groupware/kcal_resourcegroupware.cpp +++ b/tderesources/groupware/kcal_resourcegroupware.cpp @@ -34,9 +34,9 @@ #include <tqstringlist.h> #include <tqtimer.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tderesources/configwidget.h> #include <kstandarddirs.h> #include <kstringhandler.h> diff --git a/tderesources/groupware/kcal_resourcegroupware.h b/tderesources/groupware/kcal_resourcegroupware.h index d757ad730..7fe564bc7 100644 --- a/tderesources/groupware/kcal_resourcegroupware.h +++ b/tderesources/groupware/kcal_resourcegroupware.h @@ -25,7 +25,7 @@ #include <libkcal/resourcecached.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include <tdeio/job.h> #include <tdeconfig.h> diff --git a/tderesources/groupware/kcal_resourcegroupware_plugin.cpp b/tderesources/groupware/kcal_resourcegroupware_plugin.cpp index 992a95d58..dfbbd80d6 100644 --- a/tderesources/groupware/kcal_resourcegroupware_plugin.cpp +++ b/tderesources/groupware/kcal_resourcegroupware_plugin.cpp @@ -22,8 +22,8 @@ #include "kcal_resourcegroupware.h" #include "kcal_resourcegroupwareconfig.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KCal; diff --git a/tderesources/groupware/kcal_resourcegroupwareconfig.cpp b/tderesources/groupware/kcal_resourcegroupwareconfig.cpp index 9a191bc30..305118f14 100644 --- a/tderesources/groupware/kcal_resourcegroupwareconfig.cpp +++ b/tderesources/groupware/kcal_resourcegroupwareconfig.cpp @@ -24,7 +24,7 @@ #include <tqlayout.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kstandarddirs.h> #include <klineedit.h> diff --git a/tderesources/groupwise/kabc_resourcegroupwise.cpp b/tderesources/groupwise/kabc_resourcegroupwise.cpp index cf5c4e95d..8499aa9ff 100644 --- a/tderesources/groupwise/kabc_resourcegroupwise.cpp +++ b/tderesources/groupwise/kabc_resourcegroupwise.cpp @@ -21,11 +21,11 @@ #include <tqapplication.h> #include <tqfile.h> -#include <kabc/addressee.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/addressee.h> +#include <tdeabc/vcardconverter.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "kabc_groupwiseprefs.h" diff --git a/tderesources/groupwise/kabc_resourcegroupwise_plugin.cpp b/tderesources/groupwise/kabc_resourcegroupwise_plugin.cpp index 3f973bc52..e71a66e5e 100644 --- a/tderesources/groupwise/kabc_resourcegroupwise_plugin.cpp +++ b/tderesources/groupwise/kabc_resourcegroupwise_plugin.cpp @@ -21,8 +21,8 @@ #include "kabc_resourcegroupwise.h" #include "kabc_resourcegroupwiseconfig.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KABC; diff --git a/tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp b/tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp index 0f35e5b4c..1212a6bc5 100644 --- a/tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp +++ b/tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp @@ -26,7 +26,7 @@ #include <kcombobox.h> #include <kdebug.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <tdelistview.h> #include <kurlrequester.h> diff --git a/tderesources/groupwise/kcal_resourcegroupwise.cpp b/tderesources/groupwise/kcal_resourcegroupwise.cpp index 7471b7cd6..0d385ae98 100644 --- a/tderesources/groupwise/kcal_resourcegroupwise.cpp +++ b/tderesources/groupwise/kcal_resourcegroupwise.cpp @@ -36,9 +36,9 @@ #include <tqstringlist.h> #include <tqtimer.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tderesources/configwidget.h> #include <kstandarddirs.h> #include <kstringhandler.h> diff --git a/tderesources/groupwise/kcal_resourcegroupwise.h b/tderesources/groupwise/kcal_resourcegroupwise.h index f4417079c..e1cab8758 100644 --- a/tderesources/groupwise/kcal_resourcegroupwise.h +++ b/tderesources/groupwise/kcal_resourcegroupwise.h @@ -27,7 +27,7 @@ #include <libkcal/resourcecached.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include <tdeio/job.h> #include <tdeconfig.h> #include <tdepimmacros.h> diff --git a/tderesources/groupwise/kcal_resourcegroupwise_plugin.cpp b/tderesources/groupwise/kcal_resourcegroupwise_plugin.cpp index 1c1df762f..3bd7d088d 100644 --- a/tderesources/groupwise/kcal_resourcegroupwise_plugin.cpp +++ b/tderesources/groupwise/kcal_resourcegroupwise_plugin.cpp @@ -21,8 +21,8 @@ #include "kcal_resourcegroupwise.h" #include "kcal_resourcegroupwiseconfig.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KCal; diff --git a/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp b/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp index 5f0152a21..cb9f44936 100644 --- a/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp +++ b/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp @@ -24,7 +24,7 @@ #include <tqlayout.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdelistview.h> #include <kdebug.h> #include <kdialogbase.h> diff --git a/tderesources/groupwise/soap/contactconverter.cpp b/tderesources/groupwise/soap/contactconverter.cpp index 69c4b90f2..1ce391381 100644 --- a/tderesources/groupwise/soap/contactconverter.cpp +++ b/tderesources/groupwise/soap/contactconverter.cpp @@ -21,7 +21,7 @@ #include "contactconverter.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> ContactConverter::ContactConverter( struct soap* soap ) : GWConverter( soap ) diff --git a/tderesources/groupwise/soap/contactconverter.h b/tderesources/groupwise/soap/contactconverter.h index 7dbc8c79c..2f98a328c 100644 --- a/tderesources/groupwise/soap/contactconverter.h +++ b/tderesources/groupwise/soap/contactconverter.h @@ -21,7 +21,7 @@ #ifndef KABC_GW_CONTACTCONVERTER_H #define KABC_GW_CONTACTCONVERTER_H -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include "gwconverter.h" diff --git a/tderesources/groupwise/soap/groupwiseserver.cpp b/tderesources/groupwise/soap/groupwiseserver.cpp index 780708347..4e2810777 100644 --- a/tderesources/groupwise/soap/groupwiseserver.cpp +++ b/tderesources/groupwise/soap/groupwiseserver.cpp @@ -27,16 +27,16 @@ #include <libkcal/incidence.h> #include <libtdepim/kpimprefs.h> -#include <kabc/addressee.h> -#include <kabc/addresseelist.h> +#include <tdeabc/addressee.h> +#include <tdeabc/addresseelist.h> #include <tdeio/job.h> #include <tdeio/jobclasses.h> #include <tdeio/netaccess.h> -#include <kprotocolmanager.h> -#include <ktempfile.h> +#include <tdeprotocolmanager.h> +#include <tdetempfile.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqnamespace.h> #include <tqfile.h> diff --git a/tderesources/groupwise/soap/groupwiseserver.h b/tderesources/groupwise/soap/groupwiseserver.h index e1c25c0f3..71c6f6d54 100644 --- a/tderesources/groupwise/soap/groupwiseserver.h +++ b/tderesources/groupwise/soap/groupwiseserver.h @@ -32,7 +32,7 @@ #include <string> -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <libkcal/freebusy.h> #include "gwjobs.h" diff --git a/tderesources/groupwise/soap/gwjobs.cpp b/tderesources/groupwise/soap/gwjobs.cpp index 343a4a208..435bb2aef 100644 --- a/tderesources/groupwise/soap/gwjobs.cpp +++ b/tderesources/groupwise/soap/gwjobs.cpp @@ -19,9 +19,9 @@ */ #include <kdebug.h> -#include <klocale.h> -#include <kabc/addressee.h> -#include <kabc/resource.h> +#include <tdelocale.h> +#include <tdeabc/addressee.h> +#include <tdeabc/resource.h> #include <libkcal/incidence.h> #include <libkcal/resourcecached.h> diff --git a/tderesources/groupwise/soap/gwjobs.h b/tderesources/groupwise/soap/gwjobs.h index bf60ecbd9..e3ce4a2fa 100644 --- a/tderesources/groupwise/soap/gwjobs.h +++ b/tderesources/groupwise/soap/gwjobs.h @@ -24,7 +24,7 @@ #include <string> -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> namespace KABC { class Resource; diff --git a/tderesources/groupwise/soap/incidenceconverter.cpp b/tderesources/groupwise/soap/incidenceconverter.cpp index 79ad94a57..580d84e6e 100644 --- a/tderesources/groupwise/soap/incidenceconverter.cpp +++ b/tderesources/groupwise/soap/incidenceconverter.cpp @@ -18,15 +18,15 @@ Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <kmdcodec.h> #include <libtdepim/kpimprefs.h> #include <libkcal/event.h> #include <libkcal/journal.h> #include <libkcal/recurrence.h> #include <libkcal/kcalversion.h> -#include <kabc/stdaddressbook.h> -#include <kabc/addressee.h> +#include <tdeabc/stdaddressbook.h> +#include <tdeabc/addressee.h> #include <kdebug.h> #include "incidenceconverter.h" diff --git a/tderesources/groupwise/soap/ksslsocket.cpp b/tderesources/groupwise/soap/ksslsocket.cpp index 16ddf70db..6bf74da55 100644 --- a/tderesources/groupwise/soap/ksslsocket.cpp +++ b/tderesources/groupwise/soap/ksslsocket.cpp @@ -20,7 +20,7 @@ #include <tqsocketnotifier.h> #include <dcopclient.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kssl.h> #include <ksslinfodlg.h> @@ -28,7 +28,7 @@ #include <ksslcertchain.h> #include <ksslcertificatecache.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "ksslsocket.h" diff --git a/tderesources/groupwise/soap/soapdebug.cpp b/tderesources/groupwise/soap/soapdebug.cpp index 5ea29cbea..3c9cfc802 100644 --- a/tderesources/groupwise/soap/soapdebug.cpp +++ b/tderesources/groupwise/soap/soapdebug.cpp @@ -5,7 +5,7 @@ #include <tdecmdlineargs.h> #include <tdeconfig.h> #include <kdebug.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kabcresourcecached.h> diff --git a/tderesources/groupwise/tdeioslave/groupwise.cpp b/tderesources/groupwise/tdeioslave/groupwise.cpp index fb58643cb..4eb240240 100644 --- a/tderesources/groupwise/tdeioslave/groupwise.cpp +++ b/tderesources/groupwise/tdeioslave/groupwise.cpp @@ -30,14 +30,14 @@ #include <libkcal/scheduler.h> #include <libkcal/calendarlocal.h> -#include <kabc/addressee.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/addressee.h> +#include <tdeabc/vcardconverter.h> #include <kinstance.h> #include <tdeio/global.h> #include <kdebug.h> -#include <klocale.h> -#include <ktempfile.h> +#include <tdelocale.h> +#include <tdetempfile.h> #include <tdeversion.h> #include <sys/types.h> diff --git a/tderesources/kolab/kabc/contact.cpp b/tderesources/kolab/kabc/contact.cpp index dac619fea..fec56ec6f 100644 --- a/tderesources/kolab/kabc/contact.cpp +++ b/tderesources/kolab/kabc/contact.cpp @@ -33,8 +33,8 @@ #include "contact.h" #include "resourcekolab.h" -#include <kabc/addressee.h> -#include <kabc/stdaddressbook.h> +#include <tdeabc/addressee.h> +#include <tdeabc/stdaddressbook.h> #include <libkcal/freebusyurlstore.h> #include <libtdepim/distributionlist.h> #include <tdeio/netaccess.h> diff --git a/tderesources/kolab/kabc/resourcekolab.cpp b/tderesources/kolab/kabc/resourcekolab.cpp index 93308b39f..246c0eec2 100644 --- a/tderesources/kolab/kabc/resourcekolab.cpp +++ b/tderesources/kolab/kabc/resourcekolab.cpp @@ -34,13 +34,13 @@ #include "contact.h" #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> -#include <kmessagebox.h> -#include <ktempfile.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdemessagebox.h> +#include <tdetempfile.h> #include <tdeio/observer.h> #include <tdeio/uiserver_stub.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/vcardconverter.h> #include <tdemainwindow.h> #include <tdeapplication.h> #include <dcopclient.h> diff --git a/tderesources/kolab/kcal/resourcekolab.cpp b/tderesources/kolab/kcal/resourcekolab.cpp index 101a9858b..064ea7589 100644 --- a/tderesources/kolab/kcal/resourcekolab.cpp +++ b/tderesources/kolab/kcal/resourcekolab.cpp @@ -42,11 +42,11 @@ #include <tdeapplication.h> #include <dcopclient.h> #include <libtdepim/kincidencechooser.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include <tdemainwindow.h> -#include <klocale.h> +#include <tdelocale.h> #include <kinputdialog.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kmdcodec.h> #include <tqfile.h> diff --git a/tderesources/kolab/knotes/resourcekolab.cpp b/tderesources/kolab/knotes/resourcekolab.cpp index a28a51b27..242281598 100644 --- a/tderesources/kolab/knotes/resourcekolab.cpp +++ b/tderesources/kolab/knotes/resourcekolab.cpp @@ -40,8 +40,8 @@ #include <libkcal/icalformat.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace Kolab; diff --git a/tderesources/kolab/shared/kmailconnection.cpp b/tderesources/kolab/shared/kmailconnection.cpp index d05b64a7b..8011c15d3 100644 --- a/tderesources/kolab/shared/kmailconnection.cpp +++ b/tderesources/kolab/shared/kmailconnection.cpp @@ -38,7 +38,7 @@ #include <dcopclient.h> #include <tdeapplication.h> #include <kdcopservicestarter.h> -#include <klocale.h> +#include <tdelocale.h> #include "kmailicalIface_stub.h" diff --git a/tderesources/kolab/shared/kolabbase.cpp b/tderesources/kolab/shared/kolabbase.cpp index 167f2566a..35ca5b2b8 100644 --- a/tderesources/kolab/shared/kolabbase.cpp +++ b/tderesources/kolab/shared/kolabbase.cpp @@ -33,7 +33,7 @@ #include "kolabbase.h" -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <libkcal/journal.h> #include <libtdepim/kpimprefs.h> #include <libemailfunctions/email.h> diff --git a/tderesources/kolab/shared/resourcekolabbase.cpp b/tderesources/kolab/shared/resourcekolabbase.cpp index a56538a67..ce53bad39 100644 --- a/tderesources/kolab/shared/resourcekolabbase.cpp +++ b/tderesources/kolab/shared/resourcekolabbase.cpp @@ -36,12 +36,12 @@ #include <folderselectdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kinputdialog.h> #include <kurl.h> -#include <ktempfile.h> -#include <kmessagebox.h> +#include <tdetempfile.h> +#include <tdemessagebox.h> #include <tqtextstream.h> #include <kdebug.h> diff --git a/tderesources/lib/addressbookadaptor.cpp b/tderesources/lib/addressbookadaptor.cpp index 230ac3509..722b29477 100644 --- a/tderesources/lib/addressbookadaptor.cpp +++ b/tderesources/lib/addressbookadaptor.cpp @@ -23,8 +23,8 @@ #include "addressbookadaptor.h" -#include <kabc/addressee.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/addressee.h> +#include <tdeabc/vcardconverter.h> #include <libtdepim/kabcresourcecached.h> #include <tdeio/job.h> diff --git a/tderesources/lib/addressbookadaptor.h b/tderesources/lib/addressbookadaptor.h index b029ff60d..614afc488 100644 --- a/tderesources/lib/addressbookadaptor.h +++ b/tderesources/lib/addressbookadaptor.h @@ -25,7 +25,7 @@ #include "groupwaredataadaptor.h" -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <tdepimmacros.h> #include <kurl.h> diff --git a/tderesources/lib/davaddressbookadaptor.cpp b/tderesources/lib/davaddressbookadaptor.cpp index bf4a03476..2d90c7cb5 100644 --- a/tderesources/lib/davaddressbookadaptor.cpp +++ b/tderesources/lib/davaddressbookadaptor.cpp @@ -26,8 +26,8 @@ // #include "davgroupwareglobals.h" // #include "webdavhandler.h" -// #include <kabc/addressee.h> -// #include <kabc/vcardconverter.h> +// #include <tdeabc/addressee.h> +// #include <tdeabc/vcardconverter.h> // #include <kabcresourcecached.h> #include <tdeio/davjob.h> diff --git a/tderesources/lib/folderconfig.cpp b/tderesources/lib/folderconfig.cpp index 81c65af48..e400c02f8 100644 --- a/tderesources/lib/folderconfig.cpp +++ b/tderesources/lib/folderconfig.cpp @@ -28,7 +28,7 @@ #include "folderlistview.h" #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kdialog.h> diff --git a/tderesources/lib/folderlistview.cpp b/tderesources/lib/folderlistview.cpp index be719d95a..4659bd46d 100644 --- a/tderesources/lib/folderlistview.cpp +++ b/tderesources/lib/folderlistview.cpp @@ -25,7 +25,7 @@ #include "folderlister.h" #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdepopupmenu.h> #include <kdebug.h> diff --git a/tderesources/lib/groupwaredownloadjob.cpp b/tderesources/lib/groupwaredownloadjob.cpp index 63c7e988d..52a01fd47 100644 --- a/tderesources/lib/groupwaredownloadjob.cpp +++ b/tderesources/lib/groupwaredownloadjob.cpp @@ -27,7 +27,7 @@ #include "groupwaredataadaptor.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <tdeio/job.h> #include <libemailfunctions/idmapper.h> diff --git a/tderesources/lib/groupwareuploadjob.cpp b/tderesources/lib/groupwareuploadjob.cpp index e896c0dab..51307d836 100644 --- a/tderesources/lib/groupwareuploadjob.cpp +++ b/tderesources/lib/groupwareuploadjob.cpp @@ -35,7 +35,7 @@ #include <tqstringlist.h> #include <tqtimer.h> -#include <klocale.h> +#include <tdelocale.h> using namespace KPIM; diff --git a/tderesources/lib/kabc_resourcegroupwarebase.cpp b/tderesources/lib/kabc_resourcegroupwarebase.cpp index 87ca28cec..3ebd175eb 100644 --- a/tderesources/lib/kabc_resourcegroupwarebase.cpp +++ b/tderesources/lib/kabc_resourcegroupwarebase.cpp @@ -28,9 +28,9 @@ #include "groupwaredownloadjob.h" #include "groupwareuploadjob.h" -#include <kabc/addressee.h> -#include <kabc/vcardconverter.h> -#include <klocale.h> +#include <tdeabc/addressee.h> +#include <tdeabc/vcardconverter.h> +#include <tdelocale.h> using namespace KABC; diff --git a/tderesources/lib/kabc_resourcegroupwarebaseconfig.cpp b/tderesources/lib/kabc_resourcegroupwarebaseconfig.cpp index 4e4f05275..918dfc52b 100644 --- a/tderesources/lib/kabc_resourcegroupwarebaseconfig.cpp +++ b/tderesources/lib/kabc_resourcegroupwarebaseconfig.cpp @@ -28,7 +28,7 @@ #include <kdebug.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <kurlrequester.h> diff --git a/tderesources/lib/kcal_cachesettingsdlg.cpp b/tderesources/lib/kcal_cachesettingsdlg.cpp index 3c2dbed17..014249078 100644 --- a/tderesources/lib/kcal_cachesettingsdlg.cpp +++ b/tderesources/lib/kcal_cachesettingsdlg.cpp @@ -27,7 +27,7 @@ #include <libkcal/resourcecachedconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <klineedit.h> #include <kdialog.h> diff --git a/tderesources/lib/kcal_resourcegroupwarebase.cpp b/tderesources/lib/kcal_resourcegroupwarebase.cpp index 56ffae7d5..8f507fd16 100644 --- a/tderesources/lib/kcal_resourcegroupwarebase.cpp +++ b/tderesources/lib/kcal_resourcegroupwarebase.cpp @@ -32,7 +32,7 @@ #include <libkcal/icalformat.h> #include <tdeio/job.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqapplication.h> diff --git a/tderesources/lib/kcal_resourcegroupwarebase.h b/tderesources/lib/kcal_resourcegroupwarebase.h index 8a1033fb2..b0c9af2e9 100644 --- a/tderesources/lib/kcal_resourcegroupwarebase.h +++ b/tderesources/lib/kcal_resourcegroupwarebase.h @@ -26,7 +26,7 @@ #include <kurl.h> #include <libkcal/resourcecached.h> #include <tdepimmacros.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> namespace TDEIO { class Job; diff --git a/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp b/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp index b654f8d0e..1ca2570af 100644 --- a/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp +++ b/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp @@ -29,7 +29,7 @@ #include <libkcal/resourcecachedconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <klineedit.h> #include <kdialog.h> diff --git a/tderesources/newexchange/exchangeaddressbookadaptor.h b/tderesources/newexchange/exchangeaddressbookadaptor.h index cbf5ac6f6..fd89fa84d 100644 --- a/tderesources/newexchange/exchangeaddressbookadaptor.h +++ b/tderesources/newexchange/exchangeaddressbookadaptor.h @@ -29,7 +29,7 @@ #include <folderlister.h> -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <kurl.h> #include <tqdom.h> diff --git a/tderesources/newexchange/exchangecalendaradaptor.cpp b/tderesources/newexchange/exchangecalendaradaptor.cpp index a6777fb27..5b51de5ed 100644 --- a/tderesources/newexchange/exchangecalendaradaptor.cpp +++ b/tderesources/newexchange/exchangecalendaradaptor.cpp @@ -25,7 +25,7 @@ #include <davgroupwareglobals.h> #include <webdavhandler.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeio/davjob.h> #include <libkcal/resourcecached.h> #include "davcalendaradaptor.h" diff --git a/tderesources/newexchange/exchangeconvertercontact.h b/tderesources/newexchange/exchangeconvertercontact.h index 191abccb7..847b07676 100644 --- a/tderesources/newexchange/exchangeconvertercontact.h +++ b/tderesources/newexchange/exchangeconvertercontact.h @@ -24,7 +24,7 @@ #include <tqstring.h> #include <tqdom.h> -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> namespace KABC { diff --git a/tderesources/newexchange/kabc_resourceexchange.cpp b/tderesources/newexchange/kabc_resourceexchange.cpp index dc789ea20..bd60cd2fc 100644 --- a/tderesources/newexchange/kabc_resourceexchange.cpp +++ b/tderesources/newexchange/kabc_resourceexchange.cpp @@ -26,7 +26,7 @@ #include "groupwareuploadjob.h" #include "tderesources_groupwareprefs.h" -#include <klocale.h> +#include <tdelocale.h> using namespace KABC; diff --git a/tderesources/newexchange/kcal_resourceexchange.cpp b/tderesources/newexchange/kcal_resourceexchange.cpp index ce06fd763..ad2e22208 100644 --- a/tderesources/newexchange/kcal_resourceexchange.cpp +++ b/tderesources/newexchange/kcal_resourceexchange.cpp @@ -25,7 +25,7 @@ #include <groupwaredownloadjob.h> #include <groupwareuploadjob.h> #include <tderesources_groupwareprefs.h> -#include <klocale.h> +#include <tdelocale.h> using namespace KCal; diff --git a/tderesources/remote/resourceremote.cpp b/tderesources/remote/resourceremote.cpp index 78b650658..3e97eed30 100644 --- a/tderesources/remote/resourceremote.cpp +++ b/tderesources/remote/resourceremote.cpp @@ -29,8 +29,8 @@ #include <kdebug.h> #include <kurl.h> #include <tdeio/job.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <libkcal/icalformat.h> @@ -41,7 +41,7 @@ #include <libkcal/journal.h> #include <libkcal/filestorage.h> -#include <kabc/lock.h> +#include <tdeabc/lock.h> #include <tderesources/configwidget.h> diff --git a/tderesources/remote/resourceremote_plugin.cpp b/tderesources/remote/resourceremote_plugin.cpp index 67eaa92fe..9c198582a 100644 --- a/tderesources/remote/resourceremote_plugin.cpp +++ b/tderesources/remote/resourceremote_plugin.cpp @@ -22,8 +22,8 @@ #include "resourceremoteconfig.h" #include "resourceremote.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KCal; diff --git a/tderesources/remote/resourceremoteconfig.cpp b/tderesources/remote/resourceremoteconfig.cpp index 67d7f4b94..381134b01 100644 --- a/tderesources/remote/resourceremoteconfig.cpp +++ b/tderesources/remote/resourceremoteconfig.cpp @@ -24,9 +24,9 @@ #include <tqlabel.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kdialog.h> diff --git a/tderesources/scalix/Makefile.am b/tderesources/scalix/Makefile.am index ca3230486..6ba71e205 100644 --- a/tderesources/scalix/Makefile.am +++ b/tderesources/scalix/Makefile.am @@ -1,4 +1,4 @@ SUBDIRS = shared kabc kcal tdeioslave knotes scalixadmin messages: rc.cpp - $(XGETTEXT) shared/*.cpp kabc/*.cpp kcal/*.cpp knotes/*.cpp -o $(podir)/kres_scalix.pot + $(XGETTEXT) shared/*.cpp tdeabc/*.cpp kcal/*.cpp knotes/*.cpp -o $(podir)/kres_scalix.pot diff --git a/tderesources/scalix/kabc/contact.h b/tderesources/scalix/kabc/contact.h index ad095a8d0..33ea1a9cb 100644 --- a/tderesources/scalix/kabc/contact.h +++ b/tderesources/scalix/kabc/contact.h @@ -21,7 +21,7 @@ #ifndef SCALIX_CONTACT_H #define SCALIX_CONTACT_H -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> namespace Scalix { diff --git a/tderesources/scalix/kabc/resourcescalix.cpp b/tderesources/scalix/kabc/resourcescalix.cpp index 0629b5169..d7826e17c 100644 --- a/tderesources/scalix/kabc/resourcescalix.cpp +++ b/tderesources/scalix/kabc/resourcescalix.cpp @@ -34,10 +34,10 @@ #include "resourcescalix.h" #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> -#include <kmessagebox.h> -#include <ktempfile.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdemessagebox.h> +#include <tdetempfile.h> #include <tdeio/observer.h> #include <tdeio/uiserver_stub.h> #include <tdemainwindow.h> diff --git a/tderesources/scalix/kcal/resourcescalix.cpp b/tderesources/scalix/kcal/resourcescalix.cpp index b75fd6c9d..a58a85957 100644 --- a/tderesources/scalix/kcal/resourcescalix.cpp +++ b/tderesources/scalix/kcal/resourcescalix.cpp @@ -39,9 +39,9 @@ #include <dcopclient.h> #include <libkcal/icalformat.h> #include <libtdepim/kincidencechooser.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include <tdemainwindow.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqobject.h> #include <tqtimer.h> diff --git a/tderesources/scalix/knotes/resourcescalix.cpp b/tderesources/scalix/knotes/resourcescalix.cpp index 62b0daf48..c227d6546 100644 --- a/tderesources/scalix/knotes/resourcescalix.cpp +++ b/tderesources/scalix/knotes/resourcescalix.cpp @@ -38,7 +38,7 @@ #include <libkcal/icalformat.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> using namespace Scalix; diff --git a/tderesources/scalix/scalixadmin/CMakeLists.txt b/tderesources/scalix/scalixadmin/CMakeLists.txt index f13d11a83..b2e1be91c 100644 --- a/tderesources/scalix/scalixadmin/CMakeLists.txt +++ b/tderesources/scalix/scalixadmin/CMakeLists.txt @@ -28,6 +28,6 @@ tde_add_executable( scalixadmin AUTOMOC otherusermanager.cpp otheruserview.cpp otheruserpage.cpp ldapview.cpp ldapdialog.cpp delegatemanager.cpp delegateview.cpp delegatepage.cpp delegatedialog.cpp outofofficepage.cpp - LINK kabc-shared + LINK tdeabc-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/tderesources/scalix/scalixadmin/delegatedialog.cpp b/tderesources/scalix/scalixadmin/delegatedialog.cpp index 661f57430..8674ce70c 100644 --- a/tderesources/scalix/scalixadmin/delegatedialog.cpp +++ b/tderesources/scalix/scalixadmin/delegatedialog.cpp @@ -24,7 +24,7 @@ #include <tqlineedit.h> #include <tqtoolbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include "jobs.h" #include "ldapdialog.h" diff --git a/tderesources/scalix/scalixadmin/delegatepage.cpp b/tderesources/scalix/scalixadmin/delegatepage.cpp index 169ff0853..b4368f7d1 100644 --- a/tderesources/scalix/scalixadmin/delegatepage.cpp +++ b/tderesources/scalix/scalixadmin/delegatepage.cpp @@ -22,8 +22,8 @@ #include <tqpushbutton.h> #include <kinputdialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <unistd.h> diff --git a/tderesources/scalix/scalixadmin/delegateview.cpp b/tderesources/scalix/scalixadmin/delegateview.cpp index 440fb66fa..79b8cf335 100644 --- a/tderesources/scalix/scalixadmin/delegateview.cpp +++ b/tderesources/scalix/scalixadmin/delegateview.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "delegatemanager.h" diff --git a/tderesources/scalix/scalixadmin/jobs.cpp b/tderesources/scalix/scalixadmin/jobs.cpp index e7dd94457..e07b17cad 100644 --- a/tderesources/scalix/scalixadmin/jobs.cpp +++ b/tderesources/scalix/scalixadmin/jobs.cpp @@ -19,7 +19,7 @@ */ #include <tdeio/scheduler.h> -#include <klocale.h> +#include <tdelocale.h> #include "jobs.h" diff --git a/tderesources/scalix/scalixadmin/ldapdialog.cpp b/tderesources/scalix/scalixadmin/ldapdialog.cpp index 6af08c4d7..609c472b0 100644 --- a/tderesources/scalix/scalixadmin/ldapdialog.cpp +++ b/tderesources/scalix/scalixadmin/ldapdialog.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "ldapview.h" diff --git a/tderesources/scalix/scalixadmin/ldapview.cpp b/tderesources/scalix/scalixadmin/ldapview.cpp index 0cdca1819..bc3059984 100644 --- a/tderesources/scalix/scalixadmin/ldapview.cpp +++ b/tderesources/scalix/scalixadmin/ldapview.cpp @@ -18,9 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <kabc/ldapclient.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeabc/ldapclient.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "settings.h" diff --git a/tderesources/scalix/scalixadmin/main.cpp b/tderesources/scalix/scalixadmin/main.cpp index caaabcf41..6f162df9d 100644 --- a/tderesources/scalix/scalixadmin/main.cpp +++ b/tderesources/scalix/scalixadmin/main.cpp @@ -21,7 +21,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include "mainwindow.h" diff --git a/tderesources/scalix/scalixadmin/mainwindow.cpp b/tderesources/scalix/scalixadmin/mainwindow.cpp index 5eb3d2a5c..1759076a3 100644 --- a/tderesources/scalix/scalixadmin/mainwindow.cpp +++ b/tderesources/scalix/scalixadmin/mainwindow.cpp @@ -20,10 +20,10 @@ #include <tqvbox.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kjanuswidget.h> -#include <klocale.h> +#include <tdelocale.h> #include "delegatepage.h" #include "otheruserpage.h" diff --git a/tderesources/scalix/scalixadmin/otheruserpage.cpp b/tderesources/scalix/scalixadmin/otheruserpage.cpp index 3aac47c9e..3cc220eab 100644 --- a/tderesources/scalix/scalixadmin/otheruserpage.cpp +++ b/tderesources/scalix/scalixadmin/otheruserpage.cpp @@ -25,8 +25,8 @@ #include <dcopref.h> #include <kdcopservicestarter.h> #include <kinputdialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <unistd.h> diff --git a/tderesources/scalix/scalixadmin/otheruserview.cpp b/tderesources/scalix/scalixadmin/otheruserview.cpp index 06e69d41c..e8aa13bc4 100644 --- a/tderesources/scalix/scalixadmin/otheruserview.cpp +++ b/tderesources/scalix/scalixadmin/otheruserview.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "otherusermanager.h" diff --git a/tderesources/scalix/scalixadmin/outofofficepage.cpp b/tderesources/scalix/scalixadmin/outofofficepage.cpp index 4e34a9144..e807379ab 100644 --- a/tderesources/scalix/scalixadmin/outofofficepage.cpp +++ b/tderesources/scalix/scalixadmin/outofofficepage.cpp @@ -25,8 +25,8 @@ #include <tqradiobutton.h> #include <tqtextedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "jobs.h" #include "settings.h" diff --git a/tderesources/scalix/scalixadmin/passwordpage.cpp b/tderesources/scalix/scalixadmin/passwordpage.cpp index 9bdc13776..4a13b700f 100644 --- a/tderesources/scalix/scalixadmin/passwordpage.cpp +++ b/tderesources/scalix/scalixadmin/passwordpage.cpp @@ -25,8 +25,8 @@ #include <tqpushbutton.h> #include <tdeconfig.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstringhandler.h> #include <tdewallet.h> diff --git a/tderesources/scalix/shared/kmailconnection.cpp b/tderesources/scalix/shared/kmailconnection.cpp index 57f2f4489..147b9822a 100644 --- a/tderesources/scalix/shared/kmailconnection.cpp +++ b/tderesources/scalix/shared/kmailconnection.cpp @@ -37,7 +37,7 @@ #include <dcopclient.h> #include <tdeapplication.h> #include <kdcopservicestarter.h> -#include <klocale.h> +#include <tdelocale.h> #include "kmailicalIface_stub.h" diff --git a/tderesources/scalix/shared/resourcescalixbase.cpp b/tderesources/scalix/shared/resourcescalixbase.cpp index 1f829a79d..6108230c0 100644 --- a/tderesources/scalix/shared/resourcescalixbase.cpp +++ b/tderesources/scalix/shared/resourcescalixbase.cpp @@ -35,12 +35,12 @@ #include <folderselectdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kinputdialog.h> #include <kurl.h> -#include <ktempfile.h> -#include <kmessagebox.h> +#include <tdetempfile.h> +#include <tdemessagebox.h> #include <tqtextstream.h> #include <kdebug.h> diff --git a/tderesources/scalix/shared/scalixbase.cpp b/tderesources/scalix/shared/scalixbase.cpp index d40bdb03f..3cdf16c0b 100644 --- a/tderesources/scalix/shared/scalixbase.cpp +++ b/tderesources/scalix/shared/scalixbase.cpp @@ -32,7 +32,7 @@ #include "scalixbase.h" -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <libkcal/journal.h> #include <libtdepim/kpimprefs.h> #include <kdebug.h> diff --git a/tderesources/scalix/tdeioslave/scalix.cpp b/tderesources/scalix/tdeioslave/scalix.cpp index b4f662fdb..268b164bf 100644 --- a/tderesources/scalix/tdeioslave/scalix.cpp +++ b/tderesources/scalix/tdeioslave/scalix.cpp @@ -26,7 +26,7 @@ #include <kdebug.h> #include <tdeversion.h> #include <tdeio/global.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepimmacros.h> diff --git a/tderesources/slox/kabcresourceslox.cpp b/tderesources/slox/kabcresourceslox.cpp index 04ce9555e..426d86add 100644 --- a/tderesources/slox/kabcresourceslox.cpp +++ b/tderesources/slox/kabcresourceslox.cpp @@ -21,10 +21,10 @@ #include <tqapplication.h> -#include <kabc/picture.h> +#include <tdeabc/picture.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmdcodec.h> #include <kstandarddirs.h> #include <kstringhandler.h> diff --git a/tderesources/slox/kabcresourceslox.h b/tderesources/slox/kabcresourceslox.h index d5251bdc7..d51b06a17 100644 --- a/tderesources/slox/kabcresourceslox.h +++ b/tderesources/slox/kabcresourceslox.h @@ -25,7 +25,7 @@ #include <libtdepim/kabcresourcecached.h> #include <tdepimmacros.h> -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <tqmap.h> #include <tqdom.h> diff --git a/tderesources/slox/kabcresourceslox_plugin.cpp b/tderesources/slox/kabcresourceslox_plugin.cpp index cbc02f25e..0ee425179 100644 --- a/tderesources/slox/kabcresourceslox_plugin.cpp +++ b/tderesources/slox/kabcresourceslox_plugin.cpp @@ -21,8 +21,8 @@ #include "kabcresourceslox.h" #include "kabcresourcesloxconfig.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KABC; diff --git a/tderesources/slox/kabcresourcesloxconfig.cpp b/tderesources/slox/kabcresourcesloxconfig.cpp index d9e32a556..72ba39d01 100644 --- a/tderesources/slox/kabcresourcesloxconfig.cpp +++ b/tderesources/slox/kabcresourcesloxconfig.cpp @@ -29,7 +29,7 @@ #include <kdebug.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <kurlrequester.h> diff --git a/tderesources/slox/kcalresourceslox.cpp b/tderesources/slox/kcalresourceslox.cpp index a877622e9..238b71832 100644 --- a/tderesources/slox/kcalresourceslox.cpp +++ b/tderesources/slox/kcalresourceslox.cpp @@ -32,7 +32,7 @@ #include <kurl.h> #include <tdeio/job.h> #include <tdeio/davjob.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <libtdepim/progressmanager.h> @@ -48,8 +48,8 @@ #include <libkcal/filestorage.h> #include <libkcal/confirmsavedialog.h> -#include <kabc/locknull.h> -#include <kabc/stdaddressbook.h> +#include <tdeabc/locknull.h> +#include <tdeabc/stdaddressbook.h> #include <tderesources/configwidget.h> diff --git a/tderesources/slox/kcalresourceslox_plugin.cpp b/tderesources/slox/kcalresourceslox_plugin.cpp index 8a5cf6906..97e2bbebc 100644 --- a/tderesources/slox/kcalresourceslox_plugin.cpp +++ b/tderesources/slox/kcalresourceslox_plugin.cpp @@ -21,8 +21,8 @@ #include "kcalresourcesloxconfig.h" #include "kcalresourceslox.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KCal; diff --git a/tderesources/slox/kcalresourcesloxconfig.cpp b/tderesources/slox/kcalresourcesloxconfig.cpp index e09cf85c1..83246a033 100644 --- a/tderesources/slox/kcalresourcesloxconfig.cpp +++ b/tderesources/slox/kcalresourcesloxconfig.cpp @@ -24,7 +24,7 @@ #include <tqlayout.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kstandarddirs.h> #include <klineedit.h> diff --git a/tderesources/slox/sloxaccounts.h b/tderesources/slox/sloxaccounts.h index 214e3c707..8bb7a1b5b 100644 --- a/tderesources/slox/sloxaccounts.h +++ b/tderesources/slox/sloxaccounts.h @@ -20,7 +20,7 @@ #ifndef SLOXACCOUNTS_H #define SLOXACCOUNTS_H -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <tdepimmacros.h> #include <tqobject.h> diff --git a/tderesources/slox/sloxfolder.cpp b/tderesources/slox/sloxfolder.cpp index fbfb9f051..cf75868cb 100644 --- a/tderesources/slox/sloxfolder.cpp +++ b/tderesources/slox/sloxfolder.cpp @@ -17,7 +17,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "sloxfolder.h" diff --git a/tderesources/slox/sloxfolderdialog.cpp b/tderesources/slox/sloxfolderdialog.cpp index f7d19697d..716c2d40e 100644 --- a/tderesources/slox/sloxfolderdialog.cpp +++ b/tderesources/slox/sloxfolderdialog.cpp @@ -20,7 +20,7 @@ #include <kiconloader.h> #include <kguiitem.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include "sloxfolderdialog.h" #include "sloxfoldermanager.h" diff --git a/tderesources/slox/sloxfoldermanager.cpp b/tderesources/slox/sloxfoldermanager.cpp index 728420555..d7284d3a0 100644 --- a/tderesources/slox/sloxfoldermanager.cpp +++ b/tderesources/slox/sloxfoldermanager.cpp @@ -24,7 +24,7 @@ #include <kdebug.h> #include <tdeio/job.h> #include <tdeio/davjob.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include "sloxbase.h" diff --git a/tderesources/slox/webdavhandler.h b/tderesources/slox/webdavhandler.h index 136be879e..5b835f2ad 100644 --- a/tderesources/slox/webdavhandler.h +++ b/tderesources/slox/webdavhandler.h @@ -26,7 +26,7 @@ #include <tqdom.h> #include <tdepimmacros.h> -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> namespace KCal { class Incidence; diff --git a/tderesources/tvanytime/kcal_resourcetvanytime.cpp b/tderesources/tvanytime/kcal_resourcetvanytime.cpp index 9de4b0d1d..3a1db8f9a 100644 --- a/tderesources/tvanytime/kcal_resourcetvanytime.cpp +++ b/tderesources/tvanytime/kcal_resourcetvanytime.cpp @@ -38,14 +38,14 @@ #include <tqstringlist.h> #include <tqtimer.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include <karchive.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tderesources/configwidget.h> #include <kstandarddirs.h> #include <kstringhandler.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <ktar.h> #include <kurl.h> diff --git a/tderesources/tvanytime/kcal_resourcetvanytime.h b/tderesources/tvanytime/kcal_resourcetvanytime.h index 65e9ac115..e59f17038 100644 --- a/tderesources/tvanytime/kcal_resourcetvanytime.h +++ b/tderesources/tvanytime/kcal_resourcetvanytime.h @@ -27,7 +27,7 @@ #include <libkcal/resourcecached.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include <tdeio/job.h> #include <tdeconfig.h> #include <tdepimmacros.h> diff --git a/tderesources/tvanytime/kcal_resourcetvanytime_plugin.cpp b/tderesources/tvanytime/kcal_resourcetvanytime_plugin.cpp index 9ff0ae752..fd2942cd8 100644 --- a/tderesources/tvanytime/kcal_resourcetvanytime_plugin.cpp +++ b/tderesources/tvanytime/kcal_resourcetvanytime_plugin.cpp @@ -21,8 +21,8 @@ #include "kcal_resourcetvanytime.h" #include "kcal_resourcetvanytimeconfig.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KCal; diff --git a/tderesources/tvanytime/kcal_resourcetvanytimeconfig.cpp b/tderesources/tvanytime/kcal_resourcetvanytimeconfig.cpp index dbce86fef..8405e2f03 100644 --- a/tderesources/tvanytime/kcal_resourcetvanytimeconfig.cpp +++ b/tderesources/tvanytime/kcal_resourcetvanytimeconfig.cpp @@ -26,7 +26,7 @@ #include <tqwhatsthis.h> #include <tdeconfigskeleton.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> //#include <kdialogbase.h> //#include <kstandarddirs.h> diff --git a/wizards/Makefile.am b/wizards/Makefile.am index 5faa267ae..93cbeae69 100644 --- a/wizards/Makefile.am +++ b/wizards/Makefile.am @@ -29,7 +29,7 @@ groupwarewizard_SOURCES = groupwarewizard.cpp main.cpp overviewpage.cpp # Kolab libkolabwizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libkolabwizard_la_LIBADD = $(top_builddir)/tderesources/kolab/kcal/libkcalkolab.la \ - $(top_builddir)/tderesources/kolab/kabc/libkabckolab.la \ + $(top_builddir)/tderesources/kolab/tdeabc/libkabckolab.la \ $(top_builddir)/tderesources/kolab/knotes/libknoteskolab.la \ $(top_builddir)/libkcal/libkcal.la \ $(top_builddir)/libtdepim/libtdepim.la \ @@ -97,7 +97,7 @@ exchangewizard_SOURCES = exchangemain.cpp # Scalix libscalixwizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libscalixwizard_la_LIBADD = $(top_builddir)/tderesources/scalix/kcal/libkcalscalix.la \ - $(top_builddir)/tderesources/scalix/kabc/libkabcscalix.la \ + $(top_builddir)/tderesources/scalix/tdeabc/libkabcscalix.la \ $(top_builddir)/libkcal/libkcal.la \ $(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/libkpimidentities/libkpimidentities.la diff --git a/wizards/egroupwaremain.cpp b/wizards/egroupwaremain.cpp index 657b8ad27..baff8afb8 100644 --- a/wizards/egroupwaremain.cpp +++ b/wizards/egroupwaremain.cpp @@ -24,7 +24,7 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdecmdlineargs.h> -#include <kglobal.h> +#include <tdeglobal.h> static const TDECmdLineOptions options[] = { diff --git a/wizards/egroupwarewizard.cpp b/wizards/egroupwarewizard.cpp index 843a20596..80cab2c49 100644 --- a/wizards/egroupwarewizard.cpp +++ b/wizards/egroupwarewizard.cpp @@ -31,8 +31,8 @@ #include <libkcal/resourcecalendar.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tqcheckbox.h> #include <tqlabel.h> diff --git a/wizards/exchangemain.cpp b/wizards/exchangemain.cpp index fc50c0c04..923c575d5 100644 --- a/wizards/exchangemain.cpp +++ b/wizards/exchangemain.cpp @@ -24,8 +24,8 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdecmdlineargs.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> static const TDECmdLineOptions options[] = { diff --git a/wizards/exchangewizard.cpp b/wizards/exchangewizard.cpp index 258d0a54c..de61328fb 100644 --- a/wizards/exchangewizard.cpp +++ b/wizards/exchangewizard.cpp @@ -28,7 +28,7 @@ #include <libkcal/resourcecalendar.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqcheckbox.h> diff --git a/wizards/groupwarewizard.cpp b/wizards/groupwarewizard.cpp index dd2fa0364..231862b48 100644 --- a/wizards/groupwarewizard.cpp +++ b/wizards/groupwarewizard.cpp @@ -22,7 +22,7 @@ #include <tqapplication.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include "overviewpage.h" diff --git a/wizards/groupwisemain.cpp b/wizards/groupwisemain.cpp index cf48bc436..9de56eb1c 100644 --- a/wizards/groupwisemain.cpp +++ b/wizards/groupwisemain.cpp @@ -24,8 +24,8 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdecmdlineargs.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> static const TDECmdLineOptions options[] = { diff --git a/wizards/groupwisewizard.cpp b/wizards/groupwisewizard.cpp index 583615b3f..71e89f49c 100644 --- a/wizards/groupwisewizard.cpp +++ b/wizards/groupwisewizard.cpp @@ -32,7 +32,7 @@ #include <libemailfunctions/email.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqcheckbox.h> #include <tqlabel.h> diff --git a/wizards/kmailchanges.cpp b/wizards/kmailchanges.cpp index 7d722a913..968a30b2a 100644 --- a/wizards/kmailchanges.cpp +++ b/wizards/kmailchanges.cpp @@ -23,9 +23,9 @@ #include "kmailchanges.h" #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> -#include <kemailsettings.h> +#include <tdeemailsettings.h> #include <identitymanager.h> #include <identity.h> #include <kdebug.h> diff --git a/wizards/kolabkmailchanges.cpp b/wizards/kolabkmailchanges.cpp index 6227383fc..1223ea3bf 100644 --- a/wizards/kolabkmailchanges.cpp +++ b/wizards/kolabkmailchanges.cpp @@ -24,7 +24,7 @@ #include "kolabconfig.h" #include "kmailchanges.h" -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/wizards/kolabmain.cpp b/wizards/kolabmain.cpp index 94340f247..388478ca1 100644 --- a/wizards/kolabmain.cpp +++ b/wizards/kolabmain.cpp @@ -25,8 +25,8 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdecmdlineargs.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> static const TDECmdLineOptions options[] = { diff --git a/wizards/kolabwizard.cpp b/wizards/kolabwizard.cpp index b0002a508..f781917fd 100644 --- a/wizards/kolabwizard.cpp +++ b/wizards/kolabwizard.cpp @@ -26,14 +26,14 @@ #include "kolabkmailchanges.h" #include "tderesources/kolab/kcal/resourcekolab.h" -#include "tderesources/kolab/kabc/resourcekolab.h" +#include "tderesources/kolab/tdeabc/resourcekolab.h" #include "tderesources/kolab/knotes/resourcekolab.h" #include <libkcal/resourcecalendar.h> -#include <kabc/resource.h> +#include <tdeabc/resource.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqcheckbox.h> #include <tqhbuttongroup.h> diff --git a/wizards/main.cpp b/wizards/main.cpp index 98ce36837..b6c2de25e 100644 --- a/wizards/main.cpp +++ b/wizards/main.cpp @@ -1,8 +1,8 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include "groupwarewizard.h" diff --git a/wizards/overviewpage.cpp b/wizards/overviewpage.cpp index 893884ce5..e9f6596a3 100644 --- a/wizards/overviewpage.cpp +++ b/wizards/overviewpage.cpp @@ -26,9 +26,9 @@ #include <tdeaccelmanager.h> #include <kdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <kstdguiitem.h> diff --git a/wizards/scalixkmailchanges.cpp b/wizards/scalixkmailchanges.cpp index 89ea65d54..f7f86053f 100644 --- a/wizards/scalixkmailchanges.cpp +++ b/wizards/scalixkmailchanges.cpp @@ -24,7 +24,7 @@ #include "scalixconfig.h" #include "kmailchanges.h" -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/wizards/scalixmain.cpp b/wizards/scalixmain.cpp index a207d560c..16920c01b 100644 --- a/wizards/scalixmain.cpp +++ b/wizards/scalixmain.cpp @@ -25,8 +25,8 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdecmdlineargs.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> static const TDECmdLineOptions options[] = { diff --git a/wizards/scalixwizard.cpp b/wizards/scalixwizard.cpp index dc8c5e038..59c38766a 100644 --- a/wizards/scalixwizard.cpp +++ b/wizards/scalixwizard.cpp @@ -26,17 +26,17 @@ #include "scalixkmailchanges.h" #include "tderesources/scalix/kcal/resourcescalix.h" -#include "tderesources/scalix/kabc/resourcescalix.h" +#include "tderesources/scalix/tdeabc/resourcescalix.h" #include <libkcal/resourcecalendar.h> -#include <kabc/resource.h> +#include <tdeabc/resource.h> #include <dcopref.h> #include <kcombobox.h> #include <kdcopservicestarter.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstringhandler.h> #include <tqapplication.h> diff --git a/wizards/sloxmain.cpp b/wizards/sloxmain.cpp index 08be97d6b..20dbcb665 100644 --- a/wizards/sloxmain.cpp +++ b/wizards/sloxmain.cpp @@ -24,8 +24,8 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdecmdlineargs.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> static const TDECmdLineOptions options[] = { diff --git a/wizards/sloxwizard.cpp b/wizards/sloxwizard.cpp index 250f76a45..646597269 100644 --- a/wizards/sloxwizard.cpp +++ b/wizards/sloxwizard.cpp @@ -29,7 +29,7 @@ #include <libkcal/resourcecalendar.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqcheckbox.h> |