summaryrefslogtreecommitdiffstats
path: root/kontact
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 11:44:39 +0100
commit8dd0afb14153929cc1af6c587b0e942d0d09086c (patch)
tree7be9ae134edcef81f34661c51adf85f356d3f60e /kontact
parentbade93e84b47a17bdc77a31d36e78e9c04b4ce96 (diff)
downloadtdepim-8dd0afb14153929cc1af6c587b0e942d0d09086c.tar.gz
tdepim-8dd0afb14153929cc1af6c587b0e942d0d09086c.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> (cherry picked from commit e77087ce3d590ddede0a0590caaade9aadc78d41)
Diffstat (limited to 'kontact')
-rw-r--r--kontact/interfaces/core.h2
-rw-r--r--kontact/interfaces/plugin.h2
-rw-r--r--kontact/interfaces/summary.h2
-rw-r--r--kontact/interfaces/uniqueapphandler.h2
-rw-r--r--kontact/plugins/kmail/kcmkmailsummary.cpp2
-rw-r--r--kontact/plugins/korganizer/kcmkorgsummary.cpp2
-rw-r--r--kontact/plugins/newsticker/kcmkontactknt.cpp2
-rw-r--r--kontact/plugins/specialdates/kcmsdsummary.cpp2
-rw-r--r--kontact/plugins/summary/kcmkontactsummary.cpp2
-rw-r--r--kontact/src/kcmkontact.cpp2
10 files changed, 10 insertions, 10 deletions
diff --git a/kontact/interfaces/core.h b/kontact/interfaces/core.h
index 2e96fd0be..c76406d5e 100644
--- a/kontact/interfaces/core.h
+++ b/kontact/interfaces/core.h
@@ -24,7 +24,7 @@
#define KONTACT_CORE_H
#include <tqdatetime.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
#include <tdeparts/mainwindow.h>
#include <tdeparts/part.h>
diff --git a/kontact/interfaces/plugin.h b/kontact/interfaces/plugin.h
index 3d8c66cf5..70c8a7e23 100644
--- a/kontact/interfaces/plugin.h
+++ b/kontact/interfaces/plugin.h
@@ -26,7 +26,7 @@
#include <tqobject.h>
#include <kxmlguiclient.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
#include <tqptrlist.h>
class TQStringList;
diff --git a/kontact/interfaces/summary.h b/kontact/interfaces/summary.h
index 961c4b07b..dba346e2b 100644
--- a/kontact/interfaces/summary.h
+++ b/kontact/interfaces/summary.h
@@ -23,7 +23,7 @@
#include <tqwidget.h>
#include <tqpixmap.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
class KStatusBar;
diff --git a/kontact/interfaces/uniqueapphandler.h b/kontact/interfaces/uniqueapphandler.h
index 6ecc23812..025bb8b83 100644
--- a/kontact/interfaces/uniqueapphandler.h
+++ b/kontact/interfaces/uniqueapphandler.h
@@ -24,7 +24,7 @@
#include <dcopobject.h>
#include <plugin.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
namespace Kontact
{
diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp
index 497e27803..e2f9126f7 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.cpp
+++ b/kontact/plugins/kmail/kcmkmailsummary.cpp
@@ -37,7 +37,7 @@
#include "kcmkmailsummary.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
extern "C"
{
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp
index 0f17435cc..b8c7a0cdf 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.cpp
+++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp
@@ -37,7 +37,7 @@
#include "kcmkorgsummary.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
extern "C"
{
diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp
index 577bc992a..179baed3c 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.cpp
+++ b/kontact/plugins/newsticker/kcmkontactknt.cpp
@@ -45,7 +45,7 @@
#include "newsfeeds.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
extern "C"
{
diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp
index 93c7bd8bc..b2d1a45dc 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.cpp
+++ b/kontact/plugins/specialdates/kcmsdsummary.cpp
@@ -39,7 +39,7 @@
#include "kcmsdsummary.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
extern "C"
{
diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index 3877827d2..65bd13e5b 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@@ -39,7 +39,7 @@
#include "kcmkontactsummary.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
extern "C"
{
diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp
index 622d597b1..4e6e44077 100644
--- a/kontact/src/kcmkontact.cpp
+++ b/kontact/src/kcmkontact.cpp
@@ -38,7 +38,7 @@
#include <tqlabel.h>
#include <tqlayout.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
extern "C"
{