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>

29 files changed, 29 insertions, 29 deletions

diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp
index 86ee531a3..a972ce9b1 100644
--- a/certmanager/certmanager.cpp
+++ b/certmanager/certmanager.cpp
@@ -96,7 +96,7 @@
 // other
 #include <algorithm>
 #include <assert.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <kinputdialog.h>
 namespace {
 
diff --git a/certmanager/certmanager.h b/certmanager/certmanager.h
index 5b6b26455..cf03a7101 100644
--- a/certmanager/certmanager.h
+++ b/certmanager/certmanager.h
@@ -36,7 +36,7 @@
 //#include <gpgme.h>
 
 #include <tdemainwindow.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <kurl.h>
 #include <tqcstring.h>
 #include <tqptrlist.h>
diff --git a/certmanager/conf/appearanceconfigpage.cpp b/certmanager/conf/appearanceconfigpage.cpp
index c31fa9007..087e237e3 100644
--- a/certmanager/conf/appearanceconfigpage.cpp
+++ b/certmanager/conf/appearanceconfigpage.cpp
@@ -36,7 +36,7 @@
 #include <tdelocale.h>
 #include <kdebug.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 AppearanceConfigurationPage::AppearanceConfigurationPage( TQWidget * parent, const char * name )
     : TDECModule( parent, name )
diff --git a/certmanager/conf/dirservconfigpage.cpp b/certmanager/conf/dirservconfigpage.cpp
index 7a19d4515..43373e72d 100644
--- a/certmanager/conf/dirservconfigpage.cpp
+++ b/certmanager/conf/dirservconfigpage.cpp
@@ -47,7 +47,7 @@
 #include <tqcheckbox.h>
 #include <tqlayout.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #if 0 // disabled, since it is apparently confusing
 // For sync'ing kabldaprc
diff --git a/certmanager/conf/dirservconfigpage.h b/certmanager/conf/dirservconfigpage.h
index f6a32301a..e9bdd51aa 100644
--- a/certmanager/conf/dirservconfigpage.h
+++ b/certmanager/conf/dirservconfigpage.h
@@ -34,7 +34,7 @@
 
 #include <tdecmodule.h>
 #include <kleo/cryptoconfig.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQCheckBox;
 class TQTimeEdit;
diff --git a/certmanager/conf/dnorderconfigpage.cpp b/certmanager/conf/dnorderconfigpage.cpp
index a802a06fe..186686844 100644
--- a/certmanager/conf/dnorderconfigpage.cpp
+++ b/certmanager/conf/dnorderconfigpage.cpp
@@ -34,7 +34,7 @@
 #include <ui/dnattributeorderconfigwidget.h>
 #include <kleo/dn.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include <tqlayout.h>
 
diff --git a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h
index 79ff268be..7e4eda03e 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h
@@ -38,7 +38,7 @@
 #include "qgpgmejob.h"
 
 #include <tqcstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace GpgME {
   class Error;
diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.h b/certmanager/lib/backends/qgpgme/qgpgmejob.h
index 844ca974d..64ce36bc5 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmejob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmejob.h
@@ -43,7 +43,7 @@
 #include <tqstring.h>
 
 #include <vector>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace GpgME {
   class Data;
diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h
index c9e164746..0b1362c92 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h
@@ -36,7 +36,7 @@
 #include <kleo/keygenerationjob.h>
 
 #include "qgpgmejob.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace GpgME {
   class Error;
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h
index 24672d834..90079706e 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h
@@ -44,7 +44,7 @@
 
 #include <utility>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace GpgME {
   class Error;
   class Context;
diff --git a/certmanager/lib/cryptplug.h b/certmanager/lib/cryptplug.h
index e11d28751..fce71937a 100644
--- a/certmanager/lib/cryptplug.h
+++ b/certmanager/lib/cryptplug.h
@@ -25,7 +25,7 @@
 
 #include <gpgmepp/context.h>
 #include <gpgme.h> // need it for gpgme_protocol_t :(
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace GpgME {
   class ImportResult;
diff --git a/certmanager/lib/cryptplugfactory.h b/certmanager/lib/cryptplugfactory.h
index 3eb5f7e6b..6f3f6f3d5 100644
--- a/certmanager/lib/cryptplugfactory.h
+++ b/certmanager/lib/cryptplugfactory.h
@@ -35,7 +35,7 @@
 
 #include "kleo/cryptobackendfactory.h"
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #ifndef LIBKLEOPATRA_NO_COMPAT
 namespace Kleo {
diff --git a/certmanager/lib/cryptplugwrapper.h b/certmanager/lib/cryptplugwrapper.h
index a8ea1112c..2be5cd567 100644
--- a/certmanager/lib/cryptplugwrapper.h
+++ b/certmanager/lib/cryptplugwrapper.h
@@ -54,7 +54,7 @@
 #include <tqpair.h>
 #include <tqstringlist.h>
 #include <tqstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 
 class TDEConfigBase;
diff --git a/certmanager/lib/kleo/cryptobackendfactory.h b/certmanager/lib/kleo/cryptobackendfactory.h
index 09012da3d..3fa642f35 100644
--- a/certmanager/lib/kleo/cryptobackendfactory.h
+++ b/certmanager/lib/kleo/cryptobackendfactory.h
@@ -36,7 +36,7 @@
 #include <tqobject.h>
 
 #include "cryptobackend.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include <vector>
 #include <map>
diff --git a/certmanager/lib/kleo/dn.h b/certmanager/lib/kleo/dn.h
index c9bdbffda..c194d58e8 100644
--- a/certmanager/lib/kleo/dn.h
+++ b/certmanager/lib/kleo/dn.h
@@ -35,7 +35,7 @@
 
 #include <tqstring.h>
 #include <tqvaluevector.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQStringList;
 class TQWidget;
diff --git a/certmanager/lib/kleo/enum.h b/certmanager/lib/kleo/enum.h
index 07e93c497..723f65aeb 100644
--- a/certmanager/lib/kleo/enum.h
+++ b/certmanager/lib/kleo/enum.h
@@ -33,7 +33,7 @@
 #ifndef __KLEO_ENUM_H__
 #define __KLEO_ENUM_H__
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQString;
 class TQStringList;
diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.h b/certmanager/lib/kleo/hierarchicalkeylistjob.h
index 0b74d2f9b..ebce19f2e 100644
--- a/certmanager/lib/kleo/hierarchicalkeylistjob.h
+++ b/certmanager/lib/kleo/hierarchicalkeylistjob.h
@@ -35,7 +35,7 @@
 
 #include <kleo/keylistjob.h>
 #include <kleo/cryptobackend.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include <gpgmepp/keylistresult.h>
 
diff --git a/certmanager/lib/kleo/keyfiltermanager.h b/certmanager/lib/kleo/keyfiltermanager.h
index a573934d6..e65be1d2f 100644
--- a/certmanager/lib/kleo/keyfiltermanager.h
+++ b/certmanager/lib/kleo/keyfiltermanager.h
@@ -34,7 +34,7 @@
 #define __KLEO_KEYFILTERMANAGER_H__
 
 #include <tqobject.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace GpgME {
   class Key;
 }
diff --git a/certmanager/lib/kleo/multideletejob.h b/certmanager/lib/kleo/multideletejob.h
index d927c9274..31d9d9e91 100644
--- a/certmanager/lib/kleo/multideletejob.h
+++ b/certmanager/lib/kleo/multideletejob.h
@@ -36,7 +36,7 @@
 #include <kleo/job.h>
 #include <kleo/cryptobackend.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tqguardedptr.h>
 
 #include <vector>
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;