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)

10 files changed, 10 insertions, 10 deletions

diff --git a/certmanager/lib/ui/backendconfigwidget.h b/certmanager/lib/ui/backendconfigwidget.h
index bde73c2ed..ad60654b6 100644
--- a/certmanager/lib/ui/backendconfigwidget.h
+++ b/certmanager/lib/ui/backendconfigwidget.h
@@ -35,7 +35,7 @@
 #define __KLEO_UI_BACKENDCONFIGWIDGET_H__
 
 #include <tqwidget.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace Kleo {
   class CryptoBackendFactory;
diff --git a/certmanager/lib/ui/cryptoconfigdialog.h b/certmanager/lib/ui/cryptoconfigdialog.h
index 3f6ba328c..0ef8009c6 100644
--- a/certmanager/lib/ui/cryptoconfigdialog.h
+++ b/certmanager/lib/ui/cryptoconfigdialog.h
@@ -33,7 +33,7 @@
 #define CRYPTOCONFIGDIALOG_H
 
 #include <kdialogbase.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace Kleo {
 
diff --git a/certmanager/lib/ui/directoryserviceswidget.h b/certmanager/lib/ui/directoryserviceswidget.h
index a98bc5fe2..950a87e94 100644
--- a/certmanager/lib/ui/directoryserviceswidget.h
+++ b/certmanager/lib/ui/directoryserviceswidget.h
@@ -34,7 +34,7 @@
 #define DIRECTORYSERVICESWIDGET_H
 #include "directoryserviceswidgetbase.h"
 #include <kurl.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class CryptPlugWrapper;
 namespace Kleo {
diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.h b/certmanager/lib/ui/dnattributeorderconfigwidget.h
index ea24728da..d39220ac9 100644
--- a/certmanager/lib/ui/dnattributeorderconfigwidget.h
+++ b/certmanager/lib/ui/dnattributeorderconfigwidget.h
@@ -34,7 +34,7 @@
 #define __KLEO_UI_DNATTRIBUTEORDERCONFIGWIDGET_H__
 
 #include <tqwidget.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace Kleo {
   class DNAttributeMapper;
 }
diff --git a/certmanager/lib/ui/keyapprovaldialog.h b/certmanager/lib/ui/keyapprovaldialog.h
index 8fa6a7cc6..a83e124b1 100644
--- a/certmanager/lib/ui/keyapprovaldialog.h
+++ b/certmanager/lib/ui/keyapprovaldialog.h
@@ -40,7 +40,7 @@
 #include <kleo/enum.h>
 
 #include <kdialogbase.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include <kpgpkey.h> // for EncryptPref
 #include <gpgmepp/key.h>
diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h
index 4149cb41e..6eeef5d87 100644
--- a/certmanager/lib/ui/keylistview.h
+++ b/certmanager/lib/ui/keylistview.h
@@ -36,7 +36,7 @@
 #include <tdelistview.h>
 
 #include <gpgmepp/key.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQPainter;
 class TQColorGroup;
diff --git a/certmanager/lib/ui/keyrequester.h b/certmanager/lib/ui/keyrequester.h
index e73b7988c..30fba80da 100644
--- a/certmanager/lib/ui/keyrequester.h
+++ b/certmanager/lib/ui/keyrequester.h
@@ -53,7 +53,7 @@
 #include <kleo/cryptobackend.h>
 
 #include <vector>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace Kleo {
   class KeyListView;
diff --git a/certmanager/lib/ui/keyselectiondialog.h b/certmanager/lib/ui/keyselectiondialog.h
index 3138d9996..126baa73a 100644
--- a/certmanager/lib/ui/keyselectiondialog.h
+++ b/certmanager/lib/ui/keyselectiondialog.h
@@ -41,7 +41,7 @@
 
 #include <kleo/cryptobackend.h>
 #include <gpgmepp/key.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <vector>
 
 class TQVBoxLayout;
diff --git a/certmanager/lib/ui/progressbar.h b/certmanager/lib/ui/progressbar.h
index 51f86dade..c5495d393 100644
--- a/certmanager/lib/ui/progressbar.h
+++ b/certmanager/lib/ui/progressbar.h
@@ -34,7 +34,7 @@
 #define __KLEO_PROGRESSBAR_H__
 
 #include <tqprogressbar.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TQTimer;
 
 namespace Kleo {
diff --git a/certmanager/lib/ui/progressdialog.h b/certmanager/lib/ui/progressdialog.h
index dadfd7690..eb1b95b76 100644
--- a/certmanager/lib/ui/progressdialog.h
+++ b/certmanager/lib/ui/progressdialog.h
@@ -35,7 +35,7 @@
 
 #include <tqprogressdialog.h>
 #include <tqstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace Kleo {
 
   class Job;