summaryrefslogtreecommitdiffstats
path: root/tderesources/kolab
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2021-02-26 01:07:13 +0100
committerSlávek Banko <slavek.banko@axis.cz>2021-02-26 01:47:25 +0100
commite77087ce3d590ddede0a0590caaade9aadc78d41 (patch)
tree181af70027be1d359a9e62c50d672f5a785b9d6f /tderesources/kolab
parent616964474240c627d9660a493a018bcb81a8dee1 (diff)
downloadtdepim-e77087ce3d590ddede0a0590caaade9aadc78d41.tar.gz
tdepim-e77087ce3d590ddede0a0590caaade9aadc78d41.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>
Diffstat (limited to 'tderesources/kolab')
-rw-r--r--tderesources/kolab/kcal/resourcekolab.h2
-rw-r--r--tderesources/kolab/knotes/resourcekolab.h2
-rw-r--r--tderesources/kolab/tdeabc/contact.cpp1
-rw-r--r--tderesources/kolab/tdeabc/resourcekolab.h2
4 files changed, 4 insertions, 3 deletions
diff --git a/tderesources/kolab/kcal/resourcekolab.h b/tderesources/kolab/kcal/resourcekolab.h
index 357c98040..8a4da37cf 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 fb0d191b9..5f205b16d 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 21583eb32..7d594735e 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 a19dfbaa0..9b4b4a172 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 {