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>

10 files changed, 10 insertions, 9 deletions

diff --git a/tderesources/slox/kcalresourceslox.h b/tderesources/slox/kcalresourceslox.h
index 39a2757e0..cfad65ed7 100644
--- a/tderesources/slox/kcalresourceslox.h
+++ b/tderesources/slox/kcalresourceslox.h
@@ -31,7 +31,7 @@
 #include <kurl.h>
 #include <tdeconfig.h>
 #include <kdirwatch.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include <libkcal/incidence.h>
 #include <libkcal/todo.h>
diff --git a/tderesources/slox/kcalresourcesloxconfig.h b/tderesources/slox/kcalresourcesloxconfig.h
index e2a666c0b..f5784f845 100644
--- a/tderesources/slox/kcalresourcesloxconfig.h
+++ b/tderesources/slox/kcalresourcesloxconfig.h
@@ -21,7 +21,7 @@
 #define KCALRESOURCESLOXCONFIG_H
 
 #include <kurlrequester.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include <tderesources/resource.h>
 #include <tderesources/configwidget.h>
diff --git a/tderesources/slox/sloxaccounts.h b/tderesources/slox/sloxaccounts.h
index 2e9d1289f..1af805864 100644
--- a/tderesources/slox/sloxaccounts.h
+++ b/tderesources/slox/sloxaccounts.h
@@ -21,7 +21,7 @@
 #define SLOXACCOUNTS_H
 
 #include <tdeabc/addressee.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tqobject.h>
 
 namespace TDEIO {
diff --git a/tderesources/slox/sloxbase.h b/tderesources/slox/sloxbase.h
index 8e9309c9d..dc3c9c536 100644
--- a/tderesources/slox/sloxbase.h
+++ b/tderesources/slox/sloxbase.h
@@ -21,7 +21,7 @@
 #define SLOXUTILS_H
 
 #include <tqstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KRES {
 class Resource;
diff --git a/tderesources/slox/sloxfolder.h b/tderesources/slox/sloxfolder.h
index 6f6a6c938..06f080034 100644
--- a/tderesources/slox/sloxfolder.h
+++ b/tderesources/slox/sloxfolder.h
@@ -21,7 +21,7 @@
 #define SLOXFOLDER_H
 
 #include <tqstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TDEListViewItem;
 
diff --git a/tderesources/slox/sloxfoldermanager.h b/tderesources/slox/sloxfoldermanager.h
index f31c212c7..3907dab76 100644
--- a/tderesources/slox/sloxfoldermanager.h
+++ b/tderesources/slox/sloxfoldermanager.h
@@ -25,7 +25,7 @@
 
 #include <kurl.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace TDEIO {
 class Job;
diff --git a/tderesources/slox/tdeabcresourceslox.cpp b/tderesources/slox/tdeabcresourceslox.cpp
index 248e3f395..79036abd1 100644
--- a/tderesources/slox/tdeabcresourceslox.cpp
+++ b/tderesources/slox/tdeabcresourceslox.cpp
@@ -21,6 +21,7 @@
 
 #include <tqapplication.h>
 
+#include <tdeversion.h>
 #include <tdeabc/picture.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/tderesources/slox/tdeabcresourceslox.h b/tderesources/slox/tdeabcresourceslox.h
index 35a71be22..a37f17d6b 100644
--- a/tderesources/slox/tdeabcresourceslox.h
+++ b/tderesources/slox/tdeabcresourceslox.h
@@ -24,7 +24,7 @@
 #include "webdavhandler.h"
 
 #include <libtdepim/tdeabcresourcecached.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tdeabc/addressee.h>
 
 #include <tqmap.h>
diff --git a/tderesources/slox/tdeabcresourcesloxconfig.h b/tderesources/slox/tdeabcresourcesloxconfig.h
index 6bbaf6ae8..36e021267 100644
--- a/tderesources/slox/tdeabcresourcesloxconfig.h
+++ b/tderesources/slox/tdeabcresourcesloxconfig.h
@@ -21,7 +21,7 @@
 #define RESOURCESLOXCONFIG_H
 
 #include <tderesources/configwidget.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQCheckBox;
 class KLineEdit;
diff --git a/tderesources/slox/webdavhandler.h b/tderesources/slox/webdavhandler.h
index c7c93222b..6d98fd522 100644
--- a/tderesources/slox/webdavhandler.h
+++ b/tderesources/slox/webdavhandler.h
@@ -25,7 +25,7 @@
 #include <tqdatetime.h>
 #include <tqdom.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tdeabc/addressee.h>
 
 namespace KCal {