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)

17 files changed, 17 insertions, 17 deletions

diff --git a/korganizer/aboutdata.h b/korganizer/aboutdata.h
index 0edf98110..9edf278a1 100644
--- a/korganizer/aboutdata.h
+++ b/korganizer/aboutdata.h
@@ -25,7 +25,7 @@
 #define KORG_ABOUTDATA_H
 
 #include <tdeaboutdata.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KOrg {
 
diff --git a/korganizer/actionmanager.h b/korganizer/actionmanager.h
index 3494ecffe..ebfed5155 100644
--- a/korganizer/actionmanager.h
+++ b/korganizer/actionmanager.h
@@ -30,7 +30,7 @@
 #include <tqobject.h>
 #include <kurl.h>
 #include <korganizer/part.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include "kcalendariface.h"
 
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 469eddaf8..e9b3d6728 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -31,7 +31,7 @@
 #include <tdefile.h>
 #include <korganizer/koeventviewer.h>
 #include <libkcal/scheduler.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include "koglobals.h"
 #include "interfaces/korganizer/calendarviewbase.h"
diff --git a/korganizer/interfaces/korganizer/baseview.h b/korganizer/interfaces/korganizer/baseview.h
index a8ca0c582..fa47ab7a5 100644
--- a/korganizer/interfaces/korganizer/baseview.h
+++ b/korganizer/interfaces/korganizer/baseview.h
@@ -29,7 +29,7 @@
 #include <tdelocale.h>
 #include <kdebug.h>
 #include <tdemessagebox.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include "korganizer/incidencechangerbase.h"
 
 #include "printplugin.h"
diff --git a/korganizer/kocore.h b/korganizer/kocore.h
index d160f68d1..f5dd7c97b 100644
--- a/korganizer/kocore.h
+++ b/korganizer/kocore.h
@@ -29,7 +29,7 @@
 #include <korganizer/part.h>
 #include <korganizer/printplugin.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <ktrader.h>
 
 namespace KPIM { class IdentityManager; }
diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h
index 91fb0d4db..5aa897ac2 100644
--- a/korganizer/koeventviewer.h
+++ b/korganizer/koeventviewer.h
@@ -24,7 +24,7 @@
 #ifndef KOEVENTVIEWER_H
 #define KOEVENTVIEWER_H
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tdeconfig.h>
 #include <tqtextbrowser.h>
 
diff --git a/korganizer/koeventviewerdialog.h b/korganizer/koeventviewerdialog.h
index f66ecafd5..4c6a8f37d 100644
--- a/korganizer/koeventviewerdialog.h
+++ b/korganizer/koeventviewerdialog.h
@@ -25,7 +25,7 @@
 #define KOEVENTVIEWERDIALOG_H
 
 #include <kdialogbase.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include "koeventviewer.h"
 
 namespace KCal {
diff --git a/korganizer/koglobals.h b/korganizer/koglobals.h
index 678426fd6..b6f48cf78 100644
--- a/korganizer/koglobals.h
+++ b/korganizer/koglobals.h
@@ -23,7 +23,7 @@
 #ifndef KORG_GLOBALS_H
 #define KORG_GLOBALS_H
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <tqwidget.h>
 
 class TQDate;
diff --git a/korganizer/kogroupwareprefspage.ui b/korganizer/kogroupwareprefspage.ui
index 6adb3cbc5..83c5799f7 100644
--- a/korganizer/kogroupwareprefspage.ui
+++ b/korganizer/kogroupwareprefspage.ui
@@ -617,7 +617,7 @@ For security reasons, it is not recommended to store your password in the config
     <tabstop>retrieveSavePassword</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">tdepimmacros.h</include>
+    <include location="global" impldecl="in declaration">kdemacros.h</include>
     <include location="local" impldecl="in implementation">kogroupwareprefspage.ui.h</include>
 </includes>
 <Q_SIGNALS>
diff --git a/korganizer/kohelper.h b/korganizer/kohelper.h
index 329de2a60..e73484213 100644
--- a/korganizer/kohelper.h
+++ b/korganizer/kohelper.h
@@ -25,7 +25,7 @@
 #ifndef KOHELPER_H
 #define KOHELPER_H
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KCal {
   class Calendar;
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 0fa1eb21d..3e57a77c3 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -26,7 +26,7 @@
 
 #include <tqdict.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include "koprefs_base.h"
 
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 08763b63a..3e4f98bfa 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -77,7 +77,7 @@
 #include "ktimeedit.h"
 #include "koglobals.h"
 #include "stdcalendar.h"
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 
 KOPrefsDialogMain::KOPrefsDialogMain( TQWidget *parent, const char *name )
diff --git a/korganizer/korganizerifaceimpl.h b/korganizer/korganizerifaceimpl.h
index 4873ef631..c91a715e7 100644
--- a/korganizer/korganizerifaceimpl.h
+++ b/korganizer/korganizerifaceimpl.h
@@ -34,7 +34,7 @@
 #include "korganizeriface.h"
 
 #include <tqobject.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class ActionManager;
 
diff --git a/korganizer/printing/calprinter.h b/korganizer/printing/calprinter.h
index 29b925a67..ae62d75a8 100644
--- a/korganizer/printing/calprinter.h
+++ b/korganizer/printing/calprinter.h
@@ -31,7 +31,7 @@
 #include <kdialogbase.h>
 #include <korganizer/baseview.h>
 #include <korganizer/printplugin.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KOrg {
 class CoreHelper;
diff --git a/korganizer/printing/calprintpluginbase.h b/korganizer/printing/calprintpluginbase.h
index 3684e2f12..7b9e52e00 100644
--- a/korganizer/printing/calprintpluginbase.h
+++ b/korganizer/printing/calprintpluginbase.h
@@ -30,7 +30,7 @@
 
 #include <tqdatetime.h>
 #include <kprinter.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <libkcal/calendar.h>
 #include <libkcal/event.h>
 #include <libkcal/todo.h>
diff --git a/korganizer/printing/cellitem.h b/korganizer/printing/cellitem.h
index e4a37da06..4d8206bc5 100644
--- a/korganizer/printing/cellitem.h
+++ b/korganizer/printing/cellitem.h
@@ -27,7 +27,7 @@
 #include <tqstring.h>
 #include <tqptrlist.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KOrg {
 
diff --git a/korganizer/urihandler.h b/korganizer/urihandler.h
index 572a67a55..ccf8338f1 100644
--- a/korganizer/urihandler.h
+++ b/korganizer/urihandler.h
@@ -24,7 +24,7 @@
 #ifndef URIHANDLER_H
 #define URIHANDLER_H
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQString;
 class TQWidget;