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 /tderesources/kolab | |
| parent | bade93e84b47a17bdc77a31d36e78e9c04b4ce96 (diff) | |
| download | tdepim-8dd0afb1.tar.gz tdepim-8dd0afb1.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 'tderesources/kolab')
| -rw-r--r-- | tderesources/kolab/kcal/resourcekolab.h | 2 | ||||
| -rw-r--r-- | tderesources/kolab/knotes/resourcekolab.h | 2 | ||||
| -rw-r--r-- | tderesources/kolab/tdeabc/contact.cpp | 1 | ||||
| -rw-r--r-- | tderesources/kolab/tdeabc/resourcekolab.h | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/tderesources/kolab/kcal/resourcekolab.h b/tderesources/kolab/kcal/resourcekolab.h index 357c9804..8a4da37c 100644 --- a/tderesources/kolab/kcal/resourcekolab.h +++ b/tderesources/kolab/kcal/resourcekolab.h @@ -37,7 +37,7 @@ #include <tqtimer.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <libkcal/calendarlocal.h> #include <libkcal/icalformat.h> #include <libkcal/resourcecalendar.h> diff --git a/tderesources/kolab/knotes/resourcekolab.h b/tderesources/kolab/knotes/resourcekolab.h index fb0d191b..5f205b16 100644 --- a/tderesources/kolab/knotes/resourcekolab.h +++ b/tderesources/kolab/knotes/resourcekolab.h @@ -39,7 +39,7 @@ #include <libkcal/calendarlocal.h> #include "../shared/resourcekolabbase.h" #include "../shared/subresource.h" -#include <tdepimmacros.h> +#include <kdemacros.h> namespace Kolab { diff --git a/tderesources/kolab/tdeabc/contact.cpp b/tderesources/kolab/tdeabc/contact.cpp index 21583eb3..7d594735 100644 --- a/tderesources/kolab/tdeabc/contact.cpp +++ b/tderesources/kolab/tdeabc/contact.cpp @@ -33,6 +33,7 @@ #include "contact.h" #include "resourcekolab.h" +#include <tdeversion.h> #include <tdeabc/addressee.h> #include <tdeabc/stdaddressbook.h> #include <libkcal/freebusyurlstore.h> diff --git a/tderesources/kolab/tdeabc/resourcekolab.h b/tderesources/kolab/tdeabc/resourcekolab.h index a19dfbaa..9b4b4a17 100644 --- a/tderesources/kolab/tdeabc/resourcekolab.h +++ b/tderesources/kolab/tdeabc/resourcekolab.h @@ -38,7 +38,7 @@ #include "../shared/resourcekolabbase.h" #include "../shared/subresource.h" #include <kmail/kmailicalIface.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace TDEABC { |