1 files changed, 16 insertions, 16 deletions
diff --git a/libtdepim/kscoring.h b/libtdepim/kscoring.h
index a345ba14..93c76e3c 100644
--- a/libtdepim/kscoring.h
+++ b/libtdepim/kscoring.h
@@ -38,7 +38,7 @@
 #include <klineedit.h>
 #include <knuminput.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQDomNode;
 class TQDomDocument;
@@ -55,13 +55,13 @@ class TQLabel;
  */
 
 //----------------------------------------------------------------------------
-class KDE_EXPORT ScorableGroup
+class TDE_EXPORT ScorableGroup
 {
 public:
   virtual ~ScorableGroup();
 };
 
-class KDE_EXPORT ScorableArticle
+class TDE_EXPORT ScorableArticle
 {
 public:
   virtual ~ScorableArticle();
@@ -81,7 +81,7 @@ public:
 /**
   Base class for other Action classes.
  */
-class KDE_EXPORT ActionBase {
+class TDE_EXPORT ActionBase {
  public:
   ActionBase();
   virtual ~ActionBase();
@@ -100,7 +100,7 @@ class KDE_EXPORT ActionBase {
   enum ActionTypes { SETSCORE, NOTIFY, COLOR, MARKASREAD };
 };
 
-class KDE_EXPORT ActionColor : public ActionBase {
+class TDE_EXPORT ActionColor : public ActionBase {
 public:
   ActionColor(const TQColor&);
   ActionColor(const TQString&);
@@ -118,7 +118,7 @@ private:
   TQColor color;
 };
 
-class KDE_EXPORT ActionSetScore : public ActionBase {
+class TDE_EXPORT ActionSetScore : public ActionBase {
  public:
   ActionSetScore(short);
   ActionSetScore(const ActionSetScore&);
@@ -136,7 +136,7 @@ class KDE_EXPORT ActionSetScore : public ActionBase {
   short val;
 };
 
-class KDE_EXPORT ActionNotify : public ActionBase {
+class TDE_EXPORT ActionNotify : public ActionBase {
  public:
   ActionNotify(const TQString&);
   ActionNotify(const ActionNotify&);
@@ -151,7 +151,7 @@ class KDE_EXPORT ActionNotify : public ActionBase {
   TQString note;
 };
 
-class KDE_EXPORT ActionMarkAsRead : public ActionBase {
+class TDE_EXPORT ActionMarkAsRead : public ActionBase {
   public:
     ActionMarkAsRead();
     ActionMarkAsRead( const ActionMarkAsRead& );
@@ -162,7 +162,7 @@ class KDE_EXPORT ActionMarkAsRead : public ActionBase {
     virtual ActionMarkAsRead* clone() const;
 };
 
-class KDE_EXPORT NotifyCollection
+class TDE_EXPORT NotifyCollection
 {
 public:
   NotifyCollection();
@@ -182,7 +182,7 @@ private:
 
 
 //----------------------------------------------------------------------------
-class KDE_EXPORT KScoringExpression
+class TDE_EXPORT KScoringExpression
 {
   friend class KScoringRule;
  public:
@@ -217,7 +217,7 @@ class KDE_EXPORT KScoringExpression
 };
 
 //----------------------------------------------------------------------------
-class KDE_EXPORT KScoringRule
+class TDE_EXPORT KScoringRule
 {
   friend class KScoringManager;
  public:
@@ -280,7 +280,7 @@ private:
     With the help of this class its very easy for the KScoringManager
     to temporary drop lists of rules and restore them afterwards
 */
-class KDE_EXPORT RuleStack
+class TDE_EXPORT RuleStack
 {
 public:
   RuleStack();
@@ -300,9 +300,9 @@ private:
 
 //----------------------------------------------------------------------------
 // Manages the score rules.
-class KDE_EXPORT KScoringManager : public TQObject
+class TDE_EXPORT KScoringManager : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
  public:
@@ -407,9 +407,9 @@ class KDE_EXPORT KScoringManager : public TQObject
 
 
 //----------------------------------------------------------------------------
-class KDE_EXPORT NotifyDialog : public KDialogBase
+class TDE_EXPORT NotifyDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
   static void display(ScorableArticle&,const TQString&);