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)

17 files changed, 18 insertions, 16 deletions

diff --git a/libkcal/alarm.h b/libkcal/alarm.h
index 09de14f09..01969caed 100644
--- a/libkcal/alarm.h
+++ b/libkcal/alarm.h
@@ -33,7 +33,7 @@
 #include "listbase.h"
 #include "libkcal_export.h"
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KCal {
 
diff --git a/libkcal/calendar.h b/libkcal/calendar.h
index 082559383..eeccff929 100644
--- a/libkcal/calendar.h
+++ b/libkcal/calendar.h
@@ -39,7 +39,7 @@
 #include "kcalversion.h"
 #include "person.h"
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include <tqobject.h>
 #include <tqstring.h>
diff --git a/libkcal/calendarlocal.h b/libkcal/calendarlocal.h
index a77238e47..e021a9b62 100644
--- a/libkcal/calendarlocal.h
+++ b/libkcal/calendarlocal.h
@@ -24,7 +24,7 @@
 
 #include "calendar.h"
 #include <tqdict.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KCal {
 
diff --git a/libkcal/confirmsavedialog.h b/libkcal/confirmsavedialog.h
index f92d4ae5a..bc0fcb09d 100644
--- a/libkcal/confirmsavedialog.h
+++ b/libkcal/confirmsavedialog.h
@@ -23,7 +23,7 @@
 #include <libkcal/incidence.h>
 
 #include <kdialogbase.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TDEListView;
 
diff --git a/libkcal/customproperties.h b/libkcal/customproperties.h
index e1b020dc6..de6b8bd77 100644
--- a/libkcal/customproperties.h
+++ b/libkcal/customproperties.h
@@ -24,7 +24,7 @@
 
 #include <tqstring.h>
 #include <tqmap.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include "libkcal_export.h"
 
diff --git a/libkcal/event.h b/libkcal/event.h
index 9bd217e1c..ba0780fb3 100644
--- a/libkcal/event.h
+++ b/libkcal/event.h
@@ -22,7 +22,7 @@
 #define KCAL_EVENT_H
 
 #include "incidence.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KCal {
 
diff --git a/libkcal/icalformat.h b/libkcal/icalformat.h
index 8da2868ab..f277b14ac 100644
--- a/libkcal/icalformat.h
+++ b/libkcal/icalformat.h
@@ -26,7 +26,7 @@
 #include "scheduler.h"
 
 #include "calformat.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KCal {
 
diff --git a/libkcal/incidence.h b/libkcal/incidence.h
index 20579ce7f..f5fedc34b 100644
--- a/libkcal/incidence.h
+++ b/libkcal/incidence.h
@@ -32,7 +32,7 @@
 #include "libkcal_export.h"
 
 #include "incidencebase.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KCal {
 
diff --git a/libkcal/journal.h b/libkcal/journal.h
index a3289d57d..d2ca83c45 100644
--- a/libkcal/journal.h
+++ b/libkcal/journal.h
@@ -23,7 +23,7 @@
 #define KCAL_JOURNAL_H
 
 #include "incidence.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KCal {
 
diff --git a/libkcal/kcalversion.h b/libkcal/kcalversion.h
index 13422197d..8eac5f4c7 100644
--- a/libkcal/kcalversion.h
+++ b/libkcal/kcalversion.h
@@ -21,6 +21,8 @@
 #ifndef KCAL_KCALVERSION_H
 #define KCAL_KCALVERSION_H
 
+#include <tdeversion.h>
+
 #define LIBKCAL_IS_VERSION( a,b,c ) ( LIBKCAL_VERSION >= TDE_MAKE_VERSION(a,b,c) )
 #define LIBKCAL_VERSION TDE_MAKE_VERSION(1,3,0)
 #define LIBKCAL_VERSIONSTR "1.3"
diff --git a/libkcal/libkcal_export.h b/libkcal/libkcal_export.h
index 88f270d01..7fca2dbee 100644
--- a/libkcal/libkcal_export.h
+++ b/libkcal/libkcal_export.h
@@ -21,7 +21,7 @@
 #ifndef KCAL_KCALEXPORT_H
 #define KCAL_KCALEXPORT_H
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #define LIBKCAL_EXPORT KDE_EXPORT
 
diff --git a/libkcal/resourcecached.h b/libkcal/resourcecached.h
index 94c00ae49..f890d2654 100644
--- a/libkcal/resourcecached.h
+++ b/libkcal/resourcecached.h
@@ -34,7 +34,7 @@
 #include <tqdatetime.h>
 #include <tqtimer.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KCal {
 
diff --git a/libkcal/resourcecachedconfig.h b/libkcal/resourcecachedconfig.h
index 0ee57793d..de63c2b67 100644
--- a/libkcal/resourcecachedconfig.h
+++ b/libkcal/resourcecachedconfig.h
@@ -22,7 +22,7 @@
 #define KCAL_RESOURCECACHEDCONFIG_H
 
 #include <tqwidget.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQButtonGroup;
 class TQSpinBox;
diff --git a/libkcal/resourcecalendar.h b/libkcal/resourcecalendar.h
index f33b7da44..ebb6a8b9e 100644
--- a/libkcal/resourcecalendar.h
+++ b/libkcal/resourcecalendar.h
@@ -41,7 +41,7 @@
 #include <tderesources/resource.h>
 #include <tderesources/manager.h>
 #include <tdeabc/lock.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KCal {
 
diff --git a/libkcal/resourcelocal.h b/libkcal/resourcelocal.h
index d13ed2d81..5b47d5ea6 100644
--- a/libkcal/resourcelocal.h
+++ b/libkcal/resourcelocal.h
@@ -27,7 +27,7 @@
 
 #include <kurl.h>
 #include <kdirwatch.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TDEConfig;
 
 #include "calendarlocal.h"
diff --git a/libkcal/resourcelocalconfig.h b/libkcal/resourcelocalconfig.h
index 7a1e7f721..d8b0c6c15 100644
--- a/libkcal/resourcelocalconfig.h
+++ b/libkcal/resourcelocalconfig.h
@@ -28,7 +28,7 @@
 
 #include <tderesources/resource.h>
 #include <tderesources/configwidget.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include "libkcal_export.h"
 
diff --git a/libkcal/resourcelocaldir.h b/libkcal/resourcelocaldir.h
index 6826da6b4..2f1bbec32 100644
--- a/libkcal/resourcelocaldir.h
+++ b/libkcal/resourcelocaldir.h
@@ -23,7 +23,7 @@
 
 #include <kurl.h>
 #include <kdirwatch.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include "resourcecached.h"