3 files changed, 7 insertions, 7 deletions
diff --git a/tderesources/featureplan/kcal_resourcefeatureplan.cpp b/tderesources/featureplan/kcal_resourcefeatureplan.cpp
index f5c7ee5f..6db45054 100644
--- a/tderesources/featureplan/kcal_resourcefeatureplan.cpp
+++ b/tderesources/featureplan/kcal_resourcefeatureplan.cpp
@@ -36,7 +36,7 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <tderesources/configwidget.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kstringhandler.h>
 #include <kurl.h>
 #include <libtdepim/kpimprefs.h>
diff --git a/tderesources/featureplan/kcal_resourcefeatureplan.h b/tderesources/featureplan/kcal_resourcefeatureplan.h
index 2d492897..f82da2cf 100644
--- a/tderesources/featureplan/kcal_resourcefeatureplan.h
+++ b/tderesources/featureplan/kcal_resourcefeatureplan.h
@@ -29,7 +29,7 @@
 
 #include <tdeabc/locknull.h>
 
-#include <tdepimmacros.h>
+#include <tdemacros.h>
 #include <tdeconfig.h>
 
 namespace KCal {
@@ -37,9 +37,9 @@ namespace KCal {
 /**
   This class represents a featureplan (in KDE XML format)
 */
-class KDE_EXPORT ResourceFeaturePlan : public ResourceCached
+class TDE_EXPORT ResourceFeaturePlan : public ResourceCached
 {
-    Q_OBJECT
+    TQ_OBJECT
   
   public:
     ResourceFeaturePlan( const TDEConfig * );
diff --git a/tderesources/featureplan/kcal_resourcefeatureplanconfig.h b/tderesources/featureplan/kcal_resourcefeatureplanconfig.h
index aa00123f..0bd6d4b9 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 <tdepimmacros.h>
+#include <tdemacros.h>
 
 class KLineEdit;
 class KURLRequester;
@@ -31,9 +31,9 @@ class TQCheckBox;
 
 namespace KCal {
 
-class KDE_EXPORT ResourceFeaturePlanConfig : public KRES::ConfigWidget
+class TDE_EXPORT ResourceFeaturePlanConfig : public KRES::ConfigWidget
 { 
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public: