From e77087ce3d590ddede0a0590caaade9aadc78d41 Mon Sep 17 00:00:00 2001
From: Slávek Banko <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>
---
 kmail/aboutdata.h         | 2 +-
 kmail/accountmanager.h    | 2 +-
 kmail/app_octetstream.cpp | 2 +-
 kmail/callback.h          | 2 +-
 kmail/configuredialog_p.h | 2 +-
 kmail/kmail_part.h        | 2 +-
 kmail/kmcommands.h        | 2 +-
 kmail/kmfoldertree.h      | 2 +-
 kmail/kmkernel.h          | 2 +-
 kmail/kmstartup.h         | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'kmail')

diff --git a/kmail/aboutdata.h b/kmail/aboutdata.h
index 02c0a7c4..2ae6283a 100644
--- a/kmail/aboutdata.h
+++ b/kmail/aboutdata.h
@@ -33,7 +33,7 @@
 #define __KMAIL_ABOUTDATA_H__
 
 #include <tdeaboutdata.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KMail {
 
diff --git a/kmail/accountmanager.h b/kmail/accountmanager.h
index 9097d351..b1c1ef7c 100644
--- a/kmail/accountmanager.h
+++ b/kmail/accountmanager.h
@@ -22,7 +22,7 @@
 
 #include <tqobject.h>
 #include "kmaccount.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQString;
 class TQStringList;
diff --git a/kmail/app_octetstream.cpp b/kmail/app_octetstream.cpp
index 5fe9348e..b45140ac 100644
--- a/kmail/app_octetstream.cpp
+++ b/kmail/app_octetstream.cpp
@@ -32,7 +32,7 @@
 
 #include "interfaces/bodypartformatter.h"
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace {
 
diff --git a/kmail/callback.h b/kmail/callback.h
index 560d5ddc..2722d0ff 100644
--- a/kmail/callback.h
+++ b/kmail/callback.h
@@ -38,7 +38,7 @@
 class KMMessage;
 class KMReaderWin;
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 
 #include <libkcal/attendee.h> // only for an enum, we are not linking
diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h
index 10e9b8df..3d8447a0 100644
--- a/kmail/configuredialog_p.h
+++ b/kmail/configuredialog_p.h
@@ -17,7 +17,7 @@
 #include <tdelistview.h>
 #include <tdecmodule.h>
 #include <tdelocale.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQPushButton;
 class TQLabel;
diff --git a/kmail/kmail_part.h b/kmail/kmail_part.h
index 34a6e8d5..3738aed7 100644
--- a/kmail/kmail_part.h
+++ b/kmail/kmail_part.h
@@ -35,7 +35,7 @@
 #include <tdeparts/part.h>
 
 #include <tqwidget.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TDEInstance;
 class TDEAboutData;
diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h
index dcafbf3d..24e42524 100644
--- a/kmail/kmcommands.h
+++ b/kmail/kmcommands.h
@@ -11,7 +11,7 @@
 #include <tdeio/job.h>
 #include "kmmsgbase.h" // for KMMsgStatus
 #include <mimelib/string.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <kservice.h>
 #include <tdetempfile.h>
 
diff --git a/kmail/kmfoldertree.h b/kmail/kmfoldertree.h
index b41c2b55..d5780a89 100644
--- a/kmail/kmfoldertree.h
+++ b/kmail/kmfoldertree.h
@@ -21,7 +21,7 @@
 #include "foldertreebase.h"
 
 #include <tdelocale.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include <tqguardedptr.h>
 #include <tqwidget.h>
diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h
index d9226683..b8055340 100644
--- a/kmail/kmkernel.h
+++ b/kmail/kmkernel.h
@@ -11,7 +11,7 @@
 #include <tdeconfig.h>
 #include <tdeversion.h>
 #include <tdeimproxy.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #ifdef __TDE_HAVE_TDEHWLIB
 # include <tdenetworkconnections.h>
diff --git a/kmail/kmstartup.h b/kmail/kmstartup.h
index 456a39a4..11c840e6 100644
--- a/kmail/kmstartup.h
+++ b/kmail/kmstartup.h
@@ -18,7 +18,7 @@
 #ifndef KMSTARTUP
 #define KMSTARTUP
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 extern "C" {
 
-- 
cgit v1.2.3