diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2021-02-26 01:07:13 +0100 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2021-02-26 11:44:39 +0100 |
commit | 8dd0afb14153929cc1af6c587b0e942d0d09086c (patch) | |
tree | 7be9ae134edcef81f34661c51adf85f356d3f60e /kaddressbook | |
parent | bade93e84b47a17bdc77a31d36e78e9c04b4ce96 (diff) | |
download | tdepim-8dd0afb14153929cc1af6c587b0e942d0d09086c.tar.gz tdepim-8dd0afb14153929cc1af6c587b0e942d0d09086c.zip |
The workaround that tdepimmacros.h do is no longer needed
and kdemacros.h can be used directly.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit e77087ce3d590ddede0a0590caaade9aadc78d41)
Diffstat (limited to 'kaddressbook')
-rw-r--r-- | kaddressbook/common/kabprefs.h | 2 | ||||
-rw-r--r-- | kaddressbook/interfaces/configurewidget.h | 2 | ||||
-rw-r--r-- | kaddressbook/interfaces/contacteditorwidget.h | 2 | ||||
-rw-r--r-- | kaddressbook/interfaces/core.h | 2 | ||||
-rw-r--r-- | kaddressbook/interfaces/extensionwidget.h | 2 | ||||
-rw-r--r-- | kaddressbook/interfaces/xxport.h | 2 | ||||
-rw-r--r-- | kaddressbook/kabcore.h | 2 | ||||
-rw-r--r-- | kaddressbook/kaddressbookiface.h | 2 | ||||
-rw-r--r-- | kaddressbook/kaddressbookview.h | 2 | ||||
-rw-r--r-- | kaddressbook/kcmconfigs/kcmkabconfig.cpp | 2 | ||||
-rw-r--r-- | kaddressbook/kcmconfigs/kcmkabcustomfields.cpp | 2 | ||||
-rw-r--r-- | kaddressbook/kcmconfigs/kcmkabldapconfig.cpp | 2 | ||||
-rw-r--r-- | kaddressbook/viewconfigurewidget.h | 2 | ||||
-rw-r--r-- | kaddressbook/xxportmanager.h | 2 |
14 files changed, 14 insertions, 14 deletions
diff --git a/kaddressbook/common/kabprefs.h b/kaddressbook/common/kabprefs.h index 4ac486f78..49350be4b 100644 --- a/kaddressbook/common/kabprefs.h +++ b/kaddressbook/common/kabprefs.h @@ -25,7 +25,7 @@ #define KABPREFS_H #include <tqstringlist.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include "kabprefs_base.h" class TDEConfig; diff --git a/kaddressbook/interfaces/configurewidget.h b/kaddressbook/interfaces/configurewidget.h index 33bc6f762..5660fed92 100644 --- a/kaddressbook/interfaces/configurewidget.h +++ b/kaddressbook/interfaces/configurewidget.h @@ -27,7 +27,7 @@ #include <tqwidget.h> #include <tdeconfig.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace TDEABC { class AddressBook; diff --git a/kaddressbook/interfaces/contacteditorwidget.h b/kaddressbook/interfaces/contacteditorwidget.h index 85195dd84..6927c7a82 100644 --- a/kaddressbook/interfaces/contacteditorwidget.h +++ b/kaddressbook/interfaces/contacteditorwidget.h @@ -28,7 +28,7 @@ #include <tdeabc/addressbook.h> #include <klibloader.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #define KAB_CEW_PLUGIN_VERSION 1 diff --git a/kaddressbook/interfaces/core.h b/kaddressbook/interfaces/core.h index 0132399c1..6632984d7 100644 --- a/kaddressbook/interfaces/core.h +++ b/kaddressbook/interfaces/core.h @@ -35,7 +35,7 @@ #include <tdeabc/field.h> #include <kcommand.h> #include <kxmlguiclient.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace TDEABC { class AddressBook; diff --git a/kaddressbook/interfaces/extensionwidget.h b/kaddressbook/interfaces/extensionwidget.h index 3de00edde..bcffc9b8b 100644 --- a/kaddressbook/interfaces/extensionwidget.h +++ b/kaddressbook/interfaces/extensionwidget.h @@ -28,7 +28,7 @@ #include <tdeabc/addressbook.h> #include <klibloader.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #define KAB_EXTENSIONWIDGET_PLUGIN_VERSION 1 diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h index b0dd43e74..a22205957 100644 --- a/kaddressbook/interfaces/xxport.h +++ b/kaddressbook/interfaces/xxport.h @@ -30,7 +30,7 @@ #include <tdeabc/addresseelist.h> #include <klibloader.h> #include <kxmlguiclient.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #define KAB_XXPORT_PLUGIN_VERSION 1 diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index 2a4bb2f4a..40ce444e1 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h @@ -33,7 +33,7 @@ #include <tqwidget.h> #include "core.h" -#include <tdepimmacros.h> +#include <kdemacros.h> namespace TDEABC { class AddressBook; diff --git a/kaddressbook/kaddressbookiface.h b/kaddressbook/kaddressbookiface.h index b7fa5f5c8..c02922d38 100644 --- a/kaddressbook/kaddressbookiface.h +++ b/kaddressbook/kaddressbookiface.h @@ -27,7 +27,7 @@ #include <dcopobject.h> #include <kurl.h> #include <tqstringlist.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KDE_EXPORT KAddressBookIface : virtual public DCOPObject { diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h index 8090408dc..8071b8af2 100644 --- a/kaddressbook/kaddressbookview.h +++ b/kaddressbook/kaddressbookview.h @@ -31,7 +31,7 @@ #include <tdeabc/field.h> #include <klibloader.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include "filter.h" #include "viewconfigurewidget.h" diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp index db05432cf..ce2c99730 100644 --- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp @@ -31,7 +31,7 @@ #include "kcmkabconfig.h" -#include <tdepimmacros.h> +#include <kdemacros.h> extern "C" { diff --git a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp index dcbcd2c58..8905b8995 100644 --- a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp +++ b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp @@ -29,7 +29,7 @@ #include <tqregexp.h> -#include <tdepimmacros.h> +#include <kdemacros.h> extern "C" { diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp index 73e8c5a22..0731ae577 100644 --- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp @@ -32,7 +32,7 @@ #include "kcmkabldapconfig.h" -#include <tdepimmacros.h> +#include <kdemacros.h> extern "C" { diff --git a/kaddressbook/viewconfigurewidget.h b/kaddressbook/viewconfigurewidget.h index 839078e66..11957a01c 100644 --- a/kaddressbook/viewconfigurewidget.h +++ b/kaddressbook/viewconfigurewidget.h @@ -25,7 +25,7 @@ #define VIEWCONFIGUREWIDGET_H #include <kdialogbase.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tqpixmap.h> #include "configurewidget.h" diff --git a/kaddressbook/xxportmanager.h b/kaddressbook/xxportmanager.h index 3da145d4c..04323636b 100644 --- a/kaddressbook/xxportmanager.h +++ b/kaddressbook/xxportmanager.h @@ -29,7 +29,7 @@ #include <kurl.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include "xxport.h" |