diff options
author | Timothy Pearson <[email protected]> | 2013-02-15 21:59:38 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-15 21:59:38 -0600 |
commit | cfb328d59024a251690b6e47c9f8d343fd8c241c (patch) | |
tree | 7c11070cd07e5e023a26ddcfa41832c208c63732 /kaddressbook | |
parent | 38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff) | |
download | tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kaddressbook')
132 files changed, 256 insertions, 256 deletions
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" |