1 files changed, 13 insertions, 14 deletions

diff --git a/libtdepim/weaver.h b/libtdepim/weaver.h
index d914d980..6f38b870 100644
--- a/libtdepim/weaver.h
+++ b/libtdepim/weaver.h
@@ -1,5 +1,4 @@
-/* -*- C++ -*-
-
+/*
    This file declares the Weaver, Job and Thread classes.
 
    $ Author: Mirko Boehm $
@@ -30,7 +29,7 @@ extern "C"
 #include <tqmutex.h>
 #include <tqevent.h>
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KPIM {
 namespace ThreadWeaver {
@@ -51,22 +50,22 @@ namespace ThreadWeaver {
         Use setDebugLevel () to integrate adapt debug () to your platform.
     */
 
-    KDE_EXPORT extern bool Debug;
-    KDE_EXPORT extern int DebugLevel;
+    TDE_EXPORT extern bool Debug;
+    TDE_EXPORT extern int DebugLevel;
 
-    KDE_EXPORT inline void setDebugLevel (bool debug, int level)
+    TDE_EXPORT inline void setDebugLevel (bool debug, int level)
         {
             Debug = debug;
             DebugLevel = level;
         }
 
-    KDE_EXPORT inline void debug(int severity, const char * cformat, ...)
+    TDE_EXPORT inline void debug(int severity, const char * cformat, ...)
 #ifdef __GNUC__
         __attribute__ ( (format (printf, 2, 3 ) ) )
 #endif
 ;
 
-    KDE_EXPORT inline void debug(int severity, const char * cformat, ...)
+    TDE_EXPORT inline void debug(int severity, const char * cformat, ...)
     {
         if ( Debug == true && ( severity<=DebugLevel || severity == 0) )
         {
@@ -97,7 +96,7 @@ namespace ThreadWeaver {
         Note: Do not create and use SPR/APR events, use Job::triggerSPR or
         Job::triggerAPR to create the requests. */
 
-    class KDE_EXPORT Event : public TQCustomEvent
+    class TDE_EXPORT Event : public TQCustomEvent
     {
     public:
         enum Action {
@@ -161,9 +160,9 @@ namespace ThreadWeaver {
         Note: When using an APR, you better make sure to receive the signal
         with some object, otherwise the calling thread will block forever!
     */
-    class KDE_EXPORT Job : public TQObject
+    class TDE_EXPORT Job : public TQObject
     {
-        Q_OBJECT
+        TQ_OBJECT
   
     public:
         /** Construct a Job object. */
@@ -247,7 +246,7 @@ namespace ThreadWeaver {
 
     /** The class Thread is used to represent the worker threads in
         the weaver's inventory. It is not meant to be overloaded. */
-    class KDE_EXPORT Thread : public TQThread
+    class TDE_EXPORT Thread : public TQThread
     {
     public:
         /** Create a thread.
@@ -294,9 +293,9 @@ namespace ThreadWeaver {
 
     /** A weaver is the manager of worker threads (Thread objects) to
         which it assigns jobs from it's queue. */
-    class KDE_EXPORT Weaver : public TQObject
+    class TDE_EXPORT Weaver : public TQObject
     {
-        Q_OBJECT
+        TQ_OBJECT
   
     public:
         Weaver (TQObject* parent=0, const char* name=0,