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)

13 files changed, 13 insertions, 13 deletions

diff --git a/libtdenetwork/gpgmepp/context.h b/libtdenetwork/gpgmepp/context.h
index e886d832..2eaee660 100644
--- a/libtdenetwork/gpgmepp/context.h
+++ b/libtdenetwork/gpgmepp/context.h
@@ -25,7 +25,7 @@
 #include <utility>
 #include <iosfwd>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/gpgmepp/data.h b/libtdenetwork/gpgmepp/data.h
index e1206472..b1c76029 100644
--- a/libtdenetwork/gpgmepp/data.h
+++ b/libtdenetwork/gpgmepp/data.h
@@ -25,7 +25,7 @@
 
 #include <sys/types.h> // for size_t, off_t
 #include <cstdio> // FILE
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/gpgmepp/decryptionresult.h b/libtdenetwork/gpgmepp/decryptionresult.h
index da4833bb..1721a19e 100644
--- a/libtdenetwork/gpgmepp/decryptionresult.h
+++ b/libtdenetwork/gpgmepp/decryptionresult.h
@@ -26,7 +26,7 @@
 
 #include <iosfwd>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/gpgmepp/encryptionresult.h b/libtdenetwork/gpgmepp/encryptionresult.h
index 4339bef5..44ea09a6 100644
--- a/libtdenetwork/gpgmepp/encryptionresult.h
+++ b/libtdenetwork/gpgmepp/encryptionresult.h
@@ -27,7 +27,7 @@
 #include <vector>
 #include <iosfwd>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/gpgmepp/engineinfo.h b/libtdenetwork/gpgmepp/engineinfo.h
index c07d2817..5dcd2f83 100644
--- a/libtdenetwork/gpgmepp/engineinfo.h
+++ b/libtdenetwork/gpgmepp/engineinfo.h
@@ -24,7 +24,7 @@
 #include <gpgmepp/gpgmefw.h>
 #include <gpgmepp/context.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/gpgmepp/eventloopinteractor.h b/libtdenetwork/gpgmepp/eventloopinteractor.h
index 0bf3785f..37acc0f8 100644
--- a/libtdenetwork/gpgmepp/eventloopinteractor.h
+++ b/libtdenetwork/gpgmepp/eventloopinteractor.h
@@ -19,7 +19,7 @@
 #ifndef __GPGMEPP_EVENTLOOPINTERACTOR_H__
 #define __GPGMEPP_EVENTLOOPINTERACTOR_H__
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/gpgmepp/importresult.h b/libtdenetwork/gpgmepp/importresult.h
index 020ed0c4..87f9aaf9 100644
--- a/libtdenetwork/gpgmepp/importresult.h
+++ b/libtdenetwork/gpgmepp/importresult.h
@@ -25,7 +25,7 @@
 #include <gpgmepp/result.h>
 
 #include <vector>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/gpgmepp/interfaces/dataprovider.h b/libtdenetwork/gpgmepp/interfaces/dataprovider.h
index 34dd4a7e..be926446 100644
--- a/libtdenetwork/gpgmepp/interfaces/dataprovider.h
+++ b/libtdenetwork/gpgmepp/interfaces/dataprovider.h
@@ -23,7 +23,7 @@
 
 #include <sys/types.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/gpgmepp/key.h b/libtdenetwork/gpgmepp/key.h
index 753ffec0..4bbd24be 100644
--- a/libtdenetwork/gpgmepp/key.h
+++ b/libtdenetwork/gpgmepp/key.h
@@ -25,7 +25,7 @@
 #include <sys/time.h>
 
 #include <vector>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/gpgmepp/keygenerationresult.h b/libtdenetwork/gpgmepp/keygenerationresult.h
index 7b2d98e8..2cf8c8a7 100644
--- a/libtdenetwork/gpgmepp/keygenerationresult.h
+++ b/libtdenetwork/gpgmepp/keygenerationresult.h
@@ -23,7 +23,7 @@
 
 #include <gpgmepp/gpgmefw.h>
 #include <gpgmepp/result.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace GpgME {
 
   class Error;
diff --git a/libtdenetwork/gpgmepp/keylistresult.h b/libtdenetwork/gpgmepp/keylistresult.h
index 068210c0..064539cf 100644
--- a/libtdenetwork/gpgmepp/keylistresult.h
+++ b/libtdenetwork/gpgmepp/keylistresult.h
@@ -23,7 +23,7 @@
 
 #include <gpgmepp/gpgmefw.h>
 #include <gpgmepp/result.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/gpgmepp/signingresult.h b/libtdenetwork/gpgmepp/signingresult.h
index 1ee7a8de..a31b2928 100644
--- a/libtdenetwork/gpgmepp/signingresult.h
+++ b/libtdenetwork/gpgmepp/signingresult.h
@@ -30,7 +30,7 @@
 #include <vector>
 #include <iosfwd>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace GpgME {
 
diff --git a/libtdenetwork/gpgmepp/verificationresult.h b/libtdenetwork/gpgmepp/verificationresult.h
index e572ecfe..70269df3 100644
--- a/libtdenetwork/gpgmepp/verificationresult.h
+++ b/libtdenetwork/gpgmepp/verificationresult.h
@@ -29,7 +29,7 @@
 #include <vector>
 #include <iosfwd>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace GpgME {