Replace kdemacros.h with tdemacros.hHEADmaster

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

56 files changed, 56 insertions, 56 deletions

diff --git a/tderesources/birthdays/resourcetdeabc.h b/tderesources/birthdays/resourcetdeabc.h
index 7cc2f7710..103c404f0 100644
--- a/tderesources/birthdays/resourcetdeabc.h
+++ b/tderesources/birthdays/resourcetdeabc.h
@@ -33,7 +33,7 @@
 
 #include "libkcal/resourcecalendar.h"
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace TDEIO {
 class FileCopyJob;
diff --git a/tderesources/blogging/kcal_resourceblogging.h b/tderesources/blogging/kcal_resourceblogging.h
index 109d9ccf0..1cbd01f89 100644
--- a/tderesources/blogging/kcal_resourceblogging.h
+++ b/tderesources/blogging/kcal_resourceblogging.h
@@ -22,7 +22,7 @@
 #define KCAL_RESOURCEBLOGGING_H
 
 #include <kcal_resourcegroupwarebase.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KBlog {
 class APIBlog;
diff --git a/tderesources/blogging/kcal_resourcebloggingconfig.h b/tderesources/blogging/kcal_resourcebloggingconfig.h
index d78042b34..ca3870060 100644
--- a/tderesources/blogging/kcal_resourcebloggingconfig.h
+++ b/tderesources/blogging/kcal_resourcebloggingconfig.h
@@ -20,7 +20,7 @@
 #ifndef KCAL_RESOURCEBLOGGINGCONFIG_H
 #define KCAL_RESOURCEBLOGGINGCONFIG_H
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <kcal_resourcegroupwarebaseconfig.h>
 
 namespace KCal {
diff --git a/tderesources/caldav/config.h b/tderesources/caldav/config.h
index ffeaa27fa..23ea20fb9 100644
--- a/tderesources/caldav/config.h
+++ b/tderesources/caldav/config.h
@@ -19,7 +19,7 @@
 
 #include "resource.h"
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <tderesources/configwidget.h>
 
 class TQLineEdit;
diff --git a/tderesources/caldav/configwidgets.h b/tderesources/caldav/configwidgets.h
index 7ad3597ee..07362c01e 100644
--- a/tderesources/caldav/configwidgets.h
+++ b/tderesources/caldav/configwidgets.h
@@ -36,7 +36,7 @@
 #define KCALDAV_AUTOWIDGETS_H
 
 #include <tqwidget.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KCal {
 
diff --git a/tderesources/caldav/resource.h b/tderesources/caldav/resource.h
index 95aba7d77..326806b1f 100644
--- a/tderesources/caldav/resource.h
+++ b/tderesources/caldav/resource.h
@@ -26,7 +26,7 @@
 
 #include <tdeabc/locknull.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <tdeconfig.h>
 
 namespace KCal {
diff --git a/tderesources/carddav/config.h b/tderesources/carddav/config.h
index e752aee49..c4c8c6592 100644
--- a/tderesources/carddav/config.h
+++ b/tderesources/carddav/config.h
@@ -18,7 +18,7 @@
 
 #include "resource.h"
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <tderesources/configwidget.h>
 
 class TQLineEdit;
diff --git a/tderesources/carddav/configwidgets.h b/tderesources/carddav/configwidgets.h
index e61b97e0a..f723cda62 100644
--- a/tderesources/carddav/configwidgets.h
+++ b/tderesources/carddav/configwidgets.h
@@ -35,7 +35,7 @@
 #define KCARDDAV_AUTOWIDGETS_H
 
 #include <tqwidget.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace TDEABC {
 
diff --git a/tderesources/carddav/resource.h b/tderesources/carddav/resource.h
index 828c6da72..a76754bd5 100644
--- a/tderesources/carddav/resource.h
+++ b/tderesources/carddav/resource.h
@@ -25,7 +25,7 @@
 
 #include <tdeabc/locknull.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <tdeconfig.h>
 
 namespace TDEABC {
diff --git a/tderesources/egroupware/kcal_resourcexmlrpc.h b/tderesources/egroupware/kcal_resourcexmlrpc.h
index 45cc13448..53005dd54 100644
--- a/tderesources/egroupware/kcal_resourcexmlrpc.h
+++ b/tderesources/egroupware/kcal_resourcexmlrpc.h
@@ -29,7 +29,7 @@
 #include <tdeconfig.h>
 #include <kurl.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include "libkcal/calendarlocal.h"
 #include "libkcal/incidence.h"
diff --git a/tderesources/egroupware/kcal_resourcexmlrpcconfig.h b/tderesources/egroupware/kcal_resourcexmlrpcconfig.h
index 316b5dfda..15aded2e7 100644
--- a/tderesources/egroupware/kcal_resourcexmlrpcconfig.h
+++ b/tderesources/egroupware/kcal_resourcexmlrpcconfig.h
@@ -22,7 +22,7 @@
 #define RESOURCEXMLRPCCONFIG_H
 
 #include <tderesources/configwidget.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class KIntSpinBox;
 class KLineEdit;
diff --git a/tderesources/egroupware/knotes_resourcexmlrpc.h b/tderesources/egroupware/knotes_resourcexmlrpc.h
index 83ee4b27b..c52c39253 100644
--- a/tderesources/egroupware/knotes_resourcexmlrpc.h
+++ b/tderesources/egroupware/knotes_resourcexmlrpc.h
@@ -27,7 +27,7 @@
 
 #include <tdeconfig.h>
 #include <kurl.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include "libkcal/calendarlocal.h"
 #include "libkcal/journal.h"
diff --git a/tderesources/egroupware/knotes_resourcexmlrpcconfig.h b/tderesources/egroupware/knotes_resourcexmlrpcconfig.h
index b451fafbb..3693e67c0 100644
--- a/tderesources/egroupware/knotes_resourcexmlrpcconfig.h
+++ b/tderesources/egroupware/knotes_resourcexmlrpcconfig.h
@@ -22,7 +22,7 @@
 #define RESOURCEXMLRPCCONFIG_H
 
 #include <tderesources/configwidget.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class KIntSpinBox;
 class KLineEdit;
diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpc.h b/tderesources/egroupware/tdeabc_resourcexmlrpc.h
index e5996b5eb..c9e318f4f 100644
--- a/tderesources/egroupware/tdeabc_resourcexmlrpc.h
+++ b/tderesources/egroupware/tdeabc_resourcexmlrpc.h
@@ -22,7 +22,7 @@
 #define TDEABC_RESOURCEXMLRPC_H
 
 #include <tqmap.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include "libtdepim/tdeabcresourcecached.h"
 
diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h b/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h
index 2b06903ad..502f05979 100644
--- a/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h
+++ b/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h
@@ -22,7 +22,7 @@
 #define RESOURCEXMLRPCCONFIG_H
 
 #include <tderesources/configwidget.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class KLineEdit;
 class KURLRequester;
diff --git a/tderesources/featureplan/kcal_resourcefeatureplan.h b/tderesources/featureplan/kcal_resourcefeatureplan.h
index fa83bef7f..f82da2cfb 100644
--- a/tderesources/featureplan/kcal_resourcefeatureplan.h
+++ b/tderesources/featureplan/kcal_resourcefeatureplan.h
@@ -29,7 +29,7 @@
 
 #include <tdeabc/locknull.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <tdeconfig.h>
 
 namespace KCal {
diff --git a/tderesources/featureplan/kcal_resourcefeatureplanconfig.h b/tderesources/featureplan/kcal_resourcefeatureplanconfig.h
index c811b72be..0bd6d4b94 100644
--- a/tderesources/featureplan/kcal_resourcefeatureplanconfig.h
+++ b/tderesources/featureplan/kcal_resourcefeatureplanconfig.h
@@ -23,7 +23,7 @@
 #define RESOURCEFEATUREPLANCONFIG_H
 
 #include <tderesources/configwidget.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class KLineEdit;
 class KURLRequester;
diff --git a/tderesources/groupdav/tdeabc_resourcegroupdav.h b/tderesources/groupdav/tdeabc_resourcegroupdav.h
index 5457e46e8..496f8e052 100644
--- a/tderesources/groupdav/tdeabc_resourcegroupdav.h
+++ b/tderesources/groupdav/tdeabc_resourcegroupdav.h
@@ -23,7 +23,7 @@
 #define TDEABC_RESOURCEGROUPDAV_H
 
 #include "tdeabc_resourcegroupwarebase.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace TDEABC {
 
diff --git a/tderesources/groupwise/kcal_resourcegroupwise.h b/tderesources/groupwise/kcal_resourcegroupwise.h
index 64a9c1117..ea9c846e7 100644
--- a/tderesources/groupwise/kcal_resourcegroupwise.h
+++ b/tderesources/groupwise/kcal_resourcegroupwise.h
@@ -30,7 +30,7 @@
 #include <tdeabc/locknull.h>
 #include <tdeio/job.h>
 #include <tdeconfig.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class ngwt__Settings;
 
diff --git a/tderesources/groupwise/kcal_resourcegroupwiseconfig.h b/tderesources/groupwise/kcal_resourcegroupwiseconfig.h
index 2c77dab5d..a955b0f33 100644
--- a/tderesources/groupwise/kcal_resourcegroupwiseconfig.h
+++ b/tderesources/groupwise/kcal_resourcegroupwiseconfig.h
@@ -21,7 +21,7 @@
 #define KCALRESOURCEGROUPWISECONFIG_H
 
 #include <kurlrequester.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include <tderesources/resource.h>
 #include <tderesources/configwidget.h>
diff --git a/tderesources/groupwise/tdeabc_resourcegroupwise.h b/tderesources/groupwise/tdeabc_resourcegroupwise.h
index 17cc9b528..c573eaf91 100644
--- a/tderesources/groupwise/tdeabc_resourcegroupwise.h
+++ b/tderesources/groupwise/tdeabc_resourcegroupwise.h
@@ -23,7 +23,7 @@
 #include "soap/groupwiseserver.h"
 
 #include <tdeabcresourcecached.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include <libtdepim/progressmanager.h>
 
diff --git a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h
index 7fd2b45a5..3ebdb52c1 100644
--- a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h
+++ b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h
@@ -23,7 +23,7 @@
 #include "soap/groupwiseserver.h"
 
 #include <tderesources/configwidget.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include <tqmap.h>
 
diff --git a/tderesources/groupwise/tdeioslave/groupwise.cpp b/tderesources/groupwise/tdeioslave/groupwise.cpp
index ed054b8e0..3f1076c97 100644
--- a/tderesources/groupwise/tdeioslave/groupwise.cpp
+++ b/tderesources/groupwise/tdeioslave/groupwise.cpp
@@ -44,7 +44,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include "groupwise.h"
 
diff --git a/tderesources/kolab/kcal/resourcekolab.h b/tderesources/kolab/kcal/resourcekolab.h
index b86701519..289e894d3 100644
--- a/tderesources/kolab/kcal/resourcekolab.h
+++ b/tderesources/kolab/kcal/resourcekolab.h
@@ -37,7 +37,7 @@
 
 #include <tqtimer.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <libkcal/calendarlocal.h>
 #include <libkcal/icalformat.h>
 #include <libkcal/resourcecalendar.h>
diff --git a/tderesources/kolab/knotes/resourcekolab.h b/tderesources/kolab/knotes/resourcekolab.h
index c28d6e22f..747c2ea43 100644
--- a/tderesources/kolab/knotes/resourcekolab.h
+++ b/tderesources/kolab/knotes/resourcekolab.h
@@ -39,7 +39,7 @@
 #include <libkcal/calendarlocal.h>
 #include "../shared/resourcekolabbase.h"
 #include "../shared/subresource.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 
 namespace Kolab {
diff --git a/tderesources/kolab/tdeabc/resourcekolab.h b/tderesources/kolab/tdeabc/resourcekolab.h
index 84bce5e63..dd3dab6ba 100644
--- a/tderesources/kolab/tdeabc/resourcekolab.h
+++ b/tderesources/kolab/tdeabc/resourcekolab.h
@@ -38,7 +38,7 @@
 #include "../shared/resourcekolabbase.h"
 #include "../shared/subresource.h"
 #include <kmail/kmailicalIface.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace TDEABC {
 
diff --git a/tderesources/lib/addressbookadaptor.h b/tderesources/lib/addressbookadaptor.h
index 00852d18b..ef1beb5de 100644
--- a/tderesources/lib/addressbookadaptor.h
+++ b/tderesources/lib/addressbookadaptor.h
@@ -26,7 +26,7 @@
 #include "groupwaredataadaptor.h"
 
 #include <tdeabc/addressee.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <kurl.h>
 
 namespace TDEABC {
diff --git a/tderesources/lib/calendaradaptor.h b/tderesources/lib/calendaradaptor.h
index 4b913d897..aea6a69e3 100644
--- a/tderesources/lib/calendaradaptor.h
+++ b/tderesources/lib/calendaradaptor.h
@@ -27,7 +27,7 @@
 
 
 #include <libkcal/incidence.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <kurl.h>
 
 namespace KPIM {
diff --git a/tderesources/lib/davaddressbookadaptor.h b/tderesources/lib/davaddressbookadaptor.h
index 6ff319d76..41a39bf40 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 <kdemacros.h>
+#include <tdemacros.h>
 
 namespace TDEABC {
 
diff --git a/tderesources/lib/davcalendaradaptor.h b/tderesources/lib/davcalendaradaptor.h
index 942caf717..069d62451 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 <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KCal {
 
diff --git a/tderesources/lib/folderconfig.h b/tderesources/lib/folderconfig.h
index 741c12d5c..1694613c9 100644
--- a/tderesources/lib/folderconfig.h
+++ b/tderesources/lib/folderconfig.h
@@ -24,7 +24,7 @@
 #define KPIM_FOLDERCONFIG_H
 
 #include <kurl.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <tqwidget.h>
 
 // class TDEListView;
diff --git a/tderesources/lib/folderlister.h b/tderesources/lib/folderlister.h
index 90790af74..4f04bf1c8 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 <kdemacros.h>
+#include <tdemacros.h>
 
 #include <tqvaluelist.h>
 #include <tqstring.h>
diff --git a/tderesources/lib/groupwaredataadaptor.h b/tderesources/lib/groupwaredataadaptor.h
index ba11cf1bb..51def5c74 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 <kdemacros.h>
+#include <tdemacros.h>
 
 
 namespace TDEIO {
diff --git a/tderesources/lib/kcal_cachesettingsdlg.h b/tderesources/lib/kcal_cachesettingsdlg.h
index 5fe2c7579..13510782b 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 <kdemacros.h>
+#include <tdemacros.h>
 
 
 namespace KRES {
diff --git a/tderesources/lib/kcal_resourcegroupwarebase.h b/tderesources/lib/kcal_resourcegroupwarebase.h
index d0f6c48fb..fcde85aa0 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 <kdemacros.h>
+#include <tdemacros.h>
 #include <tdeabc/locknull.h>
 
 namespace TDEIO {
diff --git a/tderesources/lib/kcal_resourcegroupwarebaseconfig.h b/tderesources/lib/kcal_resourcegroupwarebaseconfig.h
index 22c9f2077..23ffef60b 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 <kdemacros.h>
+#include <tdemacros.h>
 
 class KPushButton;
 class KLineEdit;
diff --git a/tderesources/lib/tdeabc_resourcegroupwarebase.h b/tderesources/lib/tdeabc_resourcegroupwarebase.h
index 77358bd69..363076993 100644
--- a/tderesources/lib/tdeabc_resourcegroupwarebase.h
+++ b/tderesources/lib/tdeabc_resourcegroupwarebase.h
@@ -24,7 +24,7 @@
 
 #include <kurl.h>
 #include <tdeabcresourcecached.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TDEConfig;
 
diff --git a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h
index 6b2ad4d34..b7cb3a3ee 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 <kdemacros.h>
+#include <tdemacros.h>
 
 class KLineEdit;
 class KURLRequester;
diff --git a/tderesources/lib/webdavhandler.h b/tderesources/lib/webdavhandler.h
index 65018c7b4..4371ac5b7 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 <kdemacros.h>
+#include <tdemacros.h>
 
 class TDE_EXPORT WebdavHandler
 {
diff --git a/tderesources/remote/resourceremote.h b/tderesources/remote/resourceremote.h
index cdbb6f1ad..58ddd831b 100644
--- a/tderesources/remote/resourceremote.h
+++ b/tderesources/remote/resourceremote.h
@@ -28,7 +28,7 @@
 #include <kurl.h>
 #include <tdeconfig.h>
 #include <kdirwatch.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include <libtdepim/progressmanager.h>
 
diff --git a/tderesources/remote/resourceremoteconfig.h b/tderesources/remote/resourceremoteconfig.h
index 8c4a2b251..6359aa994 100644
--- a/tderesources/remote/resourceremoteconfig.h
+++ b/tderesources/remote/resourceremoteconfig.h
@@ -30,7 +30,7 @@
 #include <tderesources/resource.h>
 #include <tderesources/configwidget.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KCal {
 
diff --git a/tderesources/scalix/kcal/resourcescalix.h b/tderesources/scalix/kcal/resourcescalix.h
index 60dba194a..0890eaf07 100644
--- a/tderesources/scalix/kcal/resourcescalix.h
+++ b/tderesources/scalix/kcal/resourcescalix.h
@@ -36,7 +36,7 @@
 
 #include <tqtimer.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <libkcal/calendarlocal.h>
 #include <libkcal/icalformat.h>
 #include <libkcal/resourcecalendar.h>
diff --git a/tderesources/scalix/knotes/resourcescalix.h b/tderesources/scalix/knotes/resourcescalix.h
index 2266bf1e1..592fc0a3d 100644
--- a/tderesources/scalix/knotes/resourcescalix.h
+++ b/tderesources/scalix/knotes/resourcescalix.h
@@ -38,7 +38,7 @@
 #include <libkcal/calendarlocal.h>
 #include "../shared/resourcescalixbase.h"
 #include "../shared/subresource.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 
 namespace Scalix {
diff --git a/tderesources/scalix/tdeabc/resourcescalix.h b/tderesources/scalix/tdeabc/resourcescalix.h
index 99e5f03cb..c3e8765c5 100644
--- a/tderesources/scalix/tdeabc/resourcescalix.h
+++ b/tderesources/scalix/tdeabc/resourcescalix.h
@@ -39,7 +39,7 @@
 #include "../shared/resourcescalixbase.h"
 #include "../shared/subresource.h"
 #include <kmail/kmailicalIface.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace TDEABC {
 
diff --git a/tderesources/scalix/tdeioslave/scalix.cpp b/tderesources/scalix/tdeioslave/scalix.cpp
index b56f398a3..165f4772a 100644
--- a/tderesources/scalix/tdeioslave/scalix.cpp
+++ b/tderesources/scalix/tdeioslave/scalix.cpp
@@ -28,7 +28,7 @@
 #include <tdeio/global.h>
 #include <tdelocale.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include <stdlib.h>
 
diff --git a/tderesources/slox/kcalresourceslox.h b/tderesources/slox/kcalresourceslox.h
index 59db8a9f9..83d787695 100644
--- a/tderesources/slox/kcalresourceslox.h
+++ b/tderesources/slox/kcalresourceslox.h
@@ -31,7 +31,7 @@
 #include <kurl.h>
 #include <tdeconfig.h>
 #include <kdirwatch.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include <libkcal/incidence.h>
 #include <libkcal/todo.h>
diff --git a/tderesources/slox/kcalresourcesloxconfig.h b/tderesources/slox/kcalresourcesloxconfig.h
index 2ebd0108c..46da81bdc 100644
--- a/tderesources/slox/kcalresourcesloxconfig.h
+++ b/tderesources/slox/kcalresourcesloxconfig.h
@@ -21,7 +21,7 @@
 #define KCALRESOURCESLOXCONFIG_H
 
 #include <kurlrequester.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include <tderesources/resource.h>
 #include <tderesources/configwidget.h>
diff --git a/tderesources/slox/sloxaccounts.h b/tderesources/slox/sloxaccounts.h
index a9e615da6..64c5a2733 100644
--- a/tderesources/slox/sloxaccounts.h
+++ b/tderesources/slox/sloxaccounts.h
@@ -21,7 +21,7 @@
 #define SLOXACCOUNTS_H
 
 #include <tdeabc/addressee.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <tqobject.h>
 
 namespace TDEIO {
diff --git a/tderesources/slox/sloxbase.h b/tderesources/slox/sloxbase.h
index 577c83879..525f76a3d 100644
--- a/tderesources/slox/sloxbase.h
+++ b/tderesources/slox/sloxbase.h
@@ -21,7 +21,7 @@
 #define SLOXUTILS_H
 
 #include <tqstring.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KRES {
 class Resource;
diff --git a/tderesources/slox/sloxfolder.h b/tderesources/slox/sloxfolder.h
index bb39ba85e..0bad3daef 100644
--- a/tderesources/slox/sloxfolder.h
+++ b/tderesources/slox/sloxfolder.h
@@ -21,7 +21,7 @@
 #define SLOXFOLDER_H
 
 #include <tqstring.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TDEListViewItem;
 
diff --git a/tderesources/slox/sloxfoldermanager.h b/tderesources/slox/sloxfoldermanager.h
index c0be7c1aa..d0f466aa3 100644
--- a/tderesources/slox/sloxfoldermanager.h
+++ b/tderesources/slox/sloxfoldermanager.h
@@ -25,7 +25,7 @@
 
 #include <kurl.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace TDEIO {
 class Job;
diff --git a/tderesources/slox/tdeabcresourceslox.h b/tderesources/slox/tdeabcresourceslox.h
index 126ee75c1..c78a2f6da 100644
--- a/tderesources/slox/tdeabcresourceslox.h
+++ b/tderesources/slox/tdeabcresourceslox.h
@@ -24,7 +24,7 @@
 #include "webdavhandler.h"
 
 #include <libtdepim/tdeabcresourcecached.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <tdeabc/addressee.h>
 
 #include <tqmap.h>
diff --git a/tderesources/slox/tdeabcresourcesloxconfig.h b/tderesources/slox/tdeabcresourcesloxconfig.h
index 37b27e1d9..76dd7e540 100644
--- a/tderesources/slox/tdeabcresourcesloxconfig.h
+++ b/tderesources/slox/tdeabcresourcesloxconfig.h
@@ -21,7 +21,7 @@
 #define RESOURCESLOXCONFIG_H
 
 #include <tderesources/configwidget.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 class TQCheckBox;
 class KLineEdit;
diff --git a/tderesources/slox/webdavhandler.h b/tderesources/slox/webdavhandler.h
index 338fe2c35..d617325f4 100644
--- a/tderesources/slox/webdavhandler.h
+++ b/tderesources/slox/webdavhandler.h
@@ -25,7 +25,7 @@
 #include <tqdatetime.h>
 #include <tqdom.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <tdeabc/addressee.h>
 
 namespace KCal {
diff --git a/tderesources/tvanytime/kcal_resourcetvanytime.h b/tderesources/tvanytime/kcal_resourcetvanytime.h
index 093a175c9..721e0542c 100644
--- a/tderesources/tvanytime/kcal_resourcetvanytime.h
+++ b/tderesources/tvanytime/kcal_resourcetvanytime.h
@@ -30,7 +30,7 @@
 #include <tdeabc/locknull.h>
 #include <tdeio/job.h>
 #include <tdeconfig.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include "service.h"
 
diff --git a/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h b/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h
index 3800d3244..b4db19cf6 100644
--- a/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h
+++ b/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h
@@ -21,7 +21,7 @@
 #define KCALRESOURCETVANYTIMECONFIG_H
 
 #include <kurlrequester.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include <tderesources/resource.h>
 #include <tderesources/configwidget.h>