13 files changed, 27 insertions, 27 deletions
diff --git a/tderesources/lib/addressbookadaptor.h b/tderesources/lib/addressbookadaptor.h
index 5a754bc6..ef1beb5d 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 {
@@ -43,7 +43,7 @@ class AddressBookUploadItem : public KPIM::GroupwareUploadItem
                                           : KPIM::GroupwareUploadItem( type ) {}
 };
 
-class KDE_EXPORT AddressBookAdaptor : public KPIM::GroupwareDataAdaptor
+class TDE_EXPORT AddressBookAdaptor : public KPIM::GroupwareDataAdaptor
 {
   public:
     AddressBookAdaptor();
diff --git a/tderesources/lib/calendaradaptor.h b/tderesources/lib/calendaradaptor.h
index dc203440..aea6a69e 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 {
@@ -49,7 +49,7 @@ class CalendarUploadItem : public KPIM::GroupwareUploadItem
 };
 
 
-class KDE_EXPORT CalendarAdaptor : public KPIM::GroupwareDataAdaptor
+class TDE_EXPORT CalendarAdaptor : public KPIM::GroupwareDataAdaptor
 {
   TQ_OBJECT
   
diff --git a/tderesources/lib/davaddressbookadaptor.h b/tderesources/lib/davaddressbookadaptor.h
index fcb16afa..41a39bf4 100644
--- a/tderesources/lib/davaddressbookadaptor.h
+++ b/tderesources/lib/davaddressbookadaptor.h
@@ -24,11 +24,11 @@
 #include "addressbookadaptor.h"
 #include "folderlister.h"
 #include <tqdom.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace TDEABC {
 
-class KDE_EXPORT DavAddressBookAdaptor : public AddressBookAdaptor
+class TDE_EXPORT DavAddressBookAdaptor : public AddressBookAdaptor
 {
   public:
     DavAddressBookAdaptor() {}
diff --git a/tderesources/lib/davcalendaradaptor.h b/tderesources/lib/davcalendaradaptor.h
index ab1c9757..069d6245 100644
--- a/tderesources/lib/davcalendaradaptor.h
+++ b/tderesources/lib/davcalendaradaptor.h
@@ -24,11 +24,11 @@
 #include "calendaradaptor.h"
 #include "folderlister.h"
 #include <tqdom.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KCal {
 
-class KDE_EXPORT DavCalendarAdaptor : public CalendarAdaptor
+class TDE_EXPORT DavCalendarAdaptor : public CalendarAdaptor
 {
   public:
     DavCalendarAdaptor() {}
diff --git a/tderesources/lib/folderconfig.h b/tderesources/lib/folderconfig.h
index 892128a4..1694613c 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;
@@ -35,7 +35,7 @@ namespace KPIM {
 
 class FolderLister;
 
-class KDE_EXPORT FolderConfig : public TQWidget
+class TDE_EXPORT FolderConfig : public TQWidget
 {
     TQ_OBJECT
   
diff --git a/tderesources/lib/folderlister.h b/tderesources/lib/folderlister.h
index 8a5ba529..4f04bf1c 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>
@@ -45,7 +45,7 @@ class GroupwareDataAdaptor;
 class GroupwarePrefsBase;
 
 
-class KDE_EXPORT FolderLister : public TQObject
+class TDE_EXPORT FolderLister : public TQObject
 {
     TQ_OBJECT
   
diff --git a/tderesources/lib/groupwaredataadaptor.h b/tderesources/lib/groupwaredataadaptor.h
index 27807124..51def5c7 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 {
@@ -44,7 +44,7 @@ class IdMapper;
 class GroupwareDataAdaptor;
 //class GroupwareJob;
 
-class KDE_EXPORT GroupwareUploadItem
+class TDE_EXPORT GroupwareUploadItem
 {
   public:
     typedef KCal::ListBase<GroupwareUploadItem> List;
@@ -88,7 +88,7 @@ class KDE_EXPORT GroupwareUploadItem
 };
 
 
-class KDE_EXPORT GroupwareDataAdaptor : public TQObject
+class TDE_EXPORT GroupwareDataAdaptor : public TQObject
 {
 TQ_OBJECT
   
diff --git a/tderesources/lib/kcal_cachesettingsdlg.h b/tderesources/lib/kcal_cachesettingsdlg.h
index f9462e5d..13510782 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 {
@@ -39,7 +39,7 @@ class ResourceCachedSaveConfig;
   Configuration widget for groupware tdeioslave resource.
   @see KCalOpenGroupware
 */
-class KDE_EXPORT CacheSettingsDialog : public KDialogBase
+class TDE_EXPORT CacheSettingsDialog : public KDialogBase
 { 
     TQ_OBJECT
   
diff --git a/tderesources/lib/kcal_resourcegroupwarebase.h b/tderesources/lib/kcal_resourcegroupwarebase.h
index ae4ca579..fcde85aa 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 {
@@ -49,7 +49,7 @@ class CalendarAdaptor;
   This class provides a resource for accessing a Groupware tdeioslave-based
   calendar.
 */
-class KDE_EXPORT ResourceGroupwareBase : public ResourceCached
+class TDE_EXPORT ResourceGroupwareBase : public ResourceCached
 {
     TQ_OBJECT
   
diff --git a/tderesources/lib/kcal_resourcegroupwarebaseconfig.h b/tderesources/lib/kcal_resourcegroupwarebaseconfig.h
index db3ddd98..23ffef60 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;
@@ -44,7 +44,7 @@ class CacheSettingsDialog;
 
   @see KCalOpenGroupware
 */
-class KDE_EXPORT ResourceGroupwareBaseConfig : public KRES::ConfigWidget
+class TDE_EXPORT ResourceGroupwareBaseConfig : public KRES::ConfigWidget
 {
     TQ_OBJECT
   
diff --git a/tderesources/lib/tdeabc_resourcegroupwarebase.h b/tderesources/lib/tdeabc_resourcegroupwarebase.h
index bea6ca91..36307699 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;
 
@@ -40,7 +40,7 @@ namespace TDEABC {
 
 class AddressBookAdaptor;
 
-class KDE_EXPORT ResourceGroupwareBase : public ResourceCached
+class TDE_EXPORT ResourceGroupwareBase : public ResourceCached
 {
   TQ_OBJECT
   
diff --git a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h
index c1ccb689..b7cb3a3e 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;
@@ -36,7 +36,7 @@ namespace TDEABC {
 
 class ResourceGroupwareBase;
 
-class KDE_EXPORT ResourceGroupwareBaseConfig : public KRES::ConfigWidget
+class TDE_EXPORT ResourceGroupwareBaseConfig : public KRES::ConfigWidget
 { 
   TQ_OBJECT
   
diff --git a/tderesources/lib/webdavhandler.h b/tderesources/lib/webdavhandler.h
index a2de509d..4371ac5b 100644
--- a/tderesources/lib/webdavhandler.h
+++ b/tderesources/lib/webdavhandler.h
@@ -27,9 +27,9 @@
 #include <tqdom.h>
 #include <tqdatetime.h>
 #include <kurl.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
-class KDE_EXPORT WebdavHandler
+class TDE_EXPORT WebdavHandler
 {
   public:
     WebdavHandler();