From e77087ce3d590ddede0a0590caaade9aadc78d41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Fri, 26 Feb 2021 01:07:13 +0100
Subject: The workaround that tdepimmacros.h do is no longer needed and
 kdemacros.h can be used directly.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
---
 tderesources/lib/addressbookadaptor.h                 | 2 +-
 tderesources/lib/calendaradaptor.h                    | 2 +-
 tderesources/lib/davaddressbookadaptor.h              | 2 +-
 tderesources/lib/davcalendaradaptor.h                 | 2 +-
 tderesources/lib/folderconfig.h                       | 2 +-
 tderesources/lib/folderlister.h                       | 2 +-
 tderesources/lib/groupwaredataadaptor.h               | 2 +-
 tderesources/lib/kcal_cachesettingsdlg.h              | 2 +-
 tderesources/lib/kcal_resourcegroupwarebase.h         | 2 +-
 tderesources/lib/kcal_resourcegroupwarebaseconfig.h   | 2 +-
 tderesources/lib/tdeabc_resourcegroupwarebase.h       | 2 +-
 tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h | 2 +-
 tderesources/lib/webdavhandler.h                      | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'tderesources/lib')

diff --git a/tderesources/lib/addressbookadaptor.h b/tderesources/lib/addressbookadaptor.h
index a1a43f0e2..5a754bc69 100644
--- a/tderesources/lib/addressbookadaptor.h
+++ b/tderesources/lib/addressbookadaptor.h
@@ -26,7 +26,7 @@
 #include "groupwaredataadaptor.h"
 
 #include <tdeabc/addressee.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <kurl.h>
 
 namespace TDEABC {
diff --git a/tderesources/lib/calendaradaptor.h b/tderesources/lib/calendaradaptor.h
index 354a2795e..7a2567e35 100644
--- a/tderesources/lib/calendaradaptor.h
+++ b/tderesources/lib/calendaradaptor.h
@@ -27,7 +27,7 @@
 
 
 #include <libkcal/incidence.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <kurl.h>
 
 namespace KPIM {
diff --git a/tderesources/lib/davaddressbookadaptor.h b/tderesources/lib/davaddressbookadaptor.h
index 883d1510e..fcb16afa1 100644
--- a/tderesources/lib/davaddressbookadaptor.h
+++ b/tderesources/lib/davaddressbookadaptor.h
@@ -24,7 +24,7 @@
 #include "addressbookadaptor.h"
 #include "folderlister.h"
 #include <tqdom.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace TDEABC {
 
diff --git a/tderesources/lib/davcalendaradaptor.h b/tderesources/lib/davcalendaradaptor.h
index 998a9cc7d..ab1c9757f 100644
--- a/tderesources/lib/davcalendaradaptor.h
+++ b/tderesources/lib/davcalendaradaptor.h
@@ -24,7 +24,7 @@
 #include "calendaradaptor.h"
 #include "folderlister.h"
 #include <tqdom.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KCal {
 
diff --git a/tderesources/lib/folderconfig.h b/tderesources/lib/folderconfig.h
index a9b4c714c..e027095d0 100644
--- a/tderesources/lib/folderconfig.h
+++ b/tderesources/lib/folderconfig.h
@@ -24,7 +24,7 @@
 #define KPIM_FOLDERCONFIG_H
 
 #include <kurl.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tqwidget.h>
 
 // class TDEListView;
diff --git a/tderesources/lib/folderlister.h b/tderesources/lib/folderlister.h
index a1d3f2ebf..ac99d5169 100644
--- a/tderesources/lib/folderlister.h
+++ b/tderesources/lib/folderlister.h
@@ -26,7 +26,7 @@
 // #include "tderesources_groupwareprefs.h"
 /*#include "groupwareresourcejob.h"*/
 #include <kurl.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include <tqvaluelist.h>
 #include <tqstring.h>
diff --git a/tderesources/lib/groupwaredataadaptor.h b/tderesources/lib/groupwaredataadaptor.h
index b7bd6e333..0370aa6f1 100644
--- a/tderesources/lib/groupwaredataadaptor.h
+++ b/tderesources/lib/groupwaredataadaptor.h
@@ -29,7 +29,7 @@
 #include <tqstring.h>
 #include <libkcal/listbase.h>
 #include <tqobject.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 
 namespace TDEIO {
diff --git a/tderesources/lib/kcal_cachesettingsdlg.h b/tderesources/lib/kcal_cachesettingsdlg.h
index 51263e263..185864550 100644
--- a/tderesources/lib/kcal_cachesettingsdlg.h
+++ b/tderesources/lib/kcal_cachesettingsdlg.h
@@ -23,7 +23,7 @@
 #define KCAL_CACHESETTINGSDLG_H
 
 #include <kdialogbase.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 
 namespace KRES {
diff --git a/tderesources/lib/kcal_resourcegroupwarebase.h b/tderesources/lib/kcal_resourcegroupwarebase.h
index 80a1d4600..f7f80435c 100644
--- a/tderesources/lib/kcal_resourcegroupwarebase.h
+++ b/tderesources/lib/kcal_resourcegroupwarebase.h
@@ -25,7 +25,7 @@
 
 #include <kurl.h>
 #include <libkcal/resourcecached.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tdeabc/locknull.h>
 
 namespace TDEIO {
diff --git a/tderesources/lib/kcal_resourcegroupwarebaseconfig.h b/tderesources/lib/kcal_resourcegroupwarebaseconfig.h
index 7639b562f..940ba61bd 100644
--- a/tderesources/lib/kcal_resourcegroupwarebaseconfig.h
+++ b/tderesources/lib/kcal_resourcegroupwarebaseconfig.h
@@ -23,7 +23,7 @@
 #define KCAL_RESOURCEGROUPWAREBASECONFIG_H
 
 #include <tderesources/configwidget.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KPushButton;
 class KLineEdit;
diff --git a/tderesources/lib/tdeabc_resourcegroupwarebase.h b/tderesources/lib/tdeabc_resourcegroupwarebase.h
index 7835d3d23..9d122fe46 100644
--- a/tderesources/lib/tdeabc_resourcegroupwarebase.h
+++ b/tderesources/lib/tdeabc_resourcegroupwarebase.h
@@ -24,7 +24,7 @@
 
 #include <kurl.h>
 #include <tdeabcresourcecached.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TDEConfig;
 
diff --git a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h
index 7b8326239..37e98ef48 100644
--- a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h
+++ b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h
@@ -23,7 +23,7 @@
 #define TDEABC_RESOURCEGROUPWAREBASECONFIG_H
 
 #include <tderesources/configwidget.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KLineEdit;
 class KURLRequester;
diff --git a/tderesources/lib/webdavhandler.h b/tderesources/lib/webdavhandler.h
index 0bfb33e90..a2de509d4 100644
--- a/tderesources/lib/webdavhandler.h
+++ b/tderesources/lib/webdavhandler.h
@@ -27,7 +27,7 @@
 #include <tqdom.h>
 #include <tqdatetime.h>
 #include <kurl.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class KDE_EXPORT WebdavHandler
 {
-- 
cgit v1.2.1