summaryrefslogtreecommitdiffstats
path: root/kmail
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2021-02-26 01:07:13 +0100
committerSlávek Banko <slavek.banko@axis.cz>2021-02-26 01:47:25 +0100
commite77087ce3d590ddede0a0590caaade9aadc78d41 (patch)
tree181af70027be1d359a9e62c50d672f5a785b9d6f /kmail
parent616964474240c627d9660a493a018bcb81a8dee1 (diff)
downloadtdepim-e77087ce3d590ddede0a0590caaade9aadc78d41.tar.gz
tdepim-e77087ce3d590ddede0a0590caaade9aadc78d41.zip
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>
Diffstat (limited to 'kmail')
-rw-r--r--kmail/aboutdata.h2
-rw-r--r--kmail/accountmanager.h2
-rw-r--r--kmail/app_octetstream.cpp2
-rw-r--r--kmail/callback.h2
-rw-r--r--kmail/configuredialog_p.h2
-rw-r--r--kmail/kmail_part.h2
-rw-r--r--kmail/kmcommands.h2
-rw-r--r--kmail/kmfoldertree.h2
-rw-r--r--kmail/kmkernel.h2
-rw-r--r--kmail/kmstartup.h2
10 files changed, 10 insertions, 10 deletions
diff --git a/kmail/aboutdata.h b/kmail/aboutdata.h
index 02c0a7c46..2ae6283a9 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 9097d3510..b1c1ef7ce 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 5fe9348ef..b45140ac5 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 560d5ddcc..2722d0ffb 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 10e9b8df7..3d8447a04 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 34a6e8d55..3738aed77 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 dcafbf3d1..24e425243 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 b41c2b556..d5780a895 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 d92266835..b8055340b 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 456a39a4a..11c840e67 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" {