5 files changed, 19 insertions, 19 deletions
diff --git a/tderesources/carddav/config.h b/tderesources/carddav/config.h
index 027dc069..c4c8c659 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;
@@ -36,7 +36,7 @@ class CardDavSaveConfig;
 /**
  * Configuration widget for CardDAV resource.
  */
-class KDE_EXPORT ResourceCardDavConfig : public KRES::ConfigWidget
+class TDE_EXPORT ResourceCardDavConfig : public KRES::ConfigWidget
 {
     TQ_OBJECT
   
diff --git a/tderesources/carddav/configwidgets.cpp b/tderesources/carddav/configwidgets.cpp
index 3d747513..60fc5ed2 100644
--- a/tderesources/carddav/configwidgets.cpp
+++ b/tderesources/carddav/configwidgets.cpp
@@ -102,8 +102,8 @@ CardDavReloadConfig::CardDavReloadConfig( TQWidget *parent )
   d->mGroup->insert( automaticReloadOnStartup, 1 );
   d->mGroup->insert( noAutomaticReload, 0 );
 
-  connect( intervalRadio, TQT_SIGNAL( toggled( bool ) ),
-           TQT_SLOT( slotIntervalToggled( bool ) ) );
+  connect( intervalRadio, TQ_SIGNAL( toggled( bool ) ),
+           TQ_SLOT( slotIntervalToggled( bool ) ) );
 
   TQHBox *intervalBox = new TQHBox( groupBox );
   //new TQLabel( i18nc( "@label:spinbox", "Interval in minutes:" ), intervalBox );
@@ -178,8 +178,8 @@ CardDavSaveConfig::CardDavSaveConfig( TQWidget *parent )
   d->mGroup->insert( onExit, 1 );
   d->mGroup->insert( intervalRadio, 2 );
 
-  connect( intervalRadio, TQT_SIGNAL( toggled( bool ) ),
-           TQT_SLOT( slotIntervalToggled( bool ) ) );
+  connect( intervalRadio, TQ_SIGNAL( toggled( bool ) ),
+           TQ_SLOT( slotIntervalToggled( bool ) ) );
 
   TQHBox *intervalBox = new TQHBox( groupBox );
   //new TQLabel( i18nc( "@label:spinbox", "Interval in minutes:" ), intervalBox );
diff --git a/tderesources/carddav/configwidgets.h b/tderesources/carddav/configwidgets.h
index 3fcb10f8..f723cda6 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 {
 
@@ -46,7 +46,7 @@ class ResourceCached;
 
   @see ResourceCached
 */
-class KDE_EXPORT CardDavReloadConfig : public TQWidget
+class TDE_EXPORT CardDavReloadConfig : public TQWidget
 {
   TQ_OBJECT
   
@@ -73,7 +73,7 @@ class KDE_EXPORT CardDavReloadConfig : public TQWidget
 
   @see ResourceCached
 */
-class KDE_EXPORT CardDavSaveConfig : public TQWidget
+class TDE_EXPORT CardDavSaveConfig : public TQWidget
 {
     TQ_OBJECT
   
diff --git a/tderesources/carddav/resource.cpp b/tderesources/carddav/resource.cpp
index 69eb98e4..4bc11df0 100644
--- a/tderesources/carddav/resource.cpp
+++ b/tderesources/carddav/resource.cpp
@@ -197,7 +197,7 @@ bool ResourceCardDav::doSave() {
         clearChanges();
         if (mWriteRetryTimer != NULL) {
             if (mWriteRetryTimer->isActive() == false) {
-                disconnect( mWriteRetryTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doSave()) );
+                disconnect( mWriteRetryTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doSave()) );
                 delete mWriteRetryTimer;
                 mWriteRetryTimer = NULL;
             }
@@ -256,8 +256,8 @@ void ResourceCardDav::init() {
     // creating jobs
     // TQt4 handles this quite differently, as shown below,
     // whereas TQt3 needs events (see ::event())
-//     connect(mLoader, TQT_SIGNAL(finished()), this, TQT_SLOT(loadFinished()));
-//     connect(mWriter, TQT_SIGNAL(finished()), this, TQT_SLOT(writingFinished()));
+//     connect(mLoader, TQ_SIGNAL(finished()), this, TQ_SLOT(loadFinished()));
+//     connect(mWriter, TQ_SIGNAL(finished()), this, TQ_SLOT(writingFinished()));
 
     setType("ResourceCardDav");
 }
@@ -587,14 +587,14 @@ bool ResourceCardDav::event ( TQEvent * e ) {
     if (e->type() == 1000) {
         // Read done
         loadFinished();
-        return TRUE;
+        return true;
     }
     else if (e->type() == 1001) {
         // Write done
         writingFinished();
-        return TRUE;
+        return true;
     }
-    else return FALSE;
+    else return false;
 }
 
 bool ResourceCardDav::startWriting(const TQString& url) {
@@ -609,9 +609,9 @@ bool ResourceCardDav::startWriting(const TQString& url) {
     if ((mLoader->running() == true) || (mLoadingQueue.isEmpty() == false) || (mWriter->running() == true) || (mWritingQueue.isEmpty() == false)) {
         if (mWriteRetryTimer == NULL) {
             mWriteRetryTimer = new TQTimer(this);
-            connect( mWriteRetryTimer, TQT_SIGNAL(timeout()), TQT_SLOT(doSave()) );
+            connect( mWriteRetryTimer, TQ_SIGNAL(timeout()), TQ_SLOT(doSave()) );
         }
-        mWriteRetryTimer->start(1000, TRUE);
+        mWriteRetryTimer->start(1000, true);
         return false;
     }
 
diff --git a/tderesources/carddav/resource.h b/tderesources/carddav/resource.h
index e255714a..a76754bd 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 {
@@ -40,7 +40,7 @@ class CardDavWriter;
 /**
  * This class provides a resource for accessing calendars via CardDAV protocol.
  */
-class KDE_EXPORT ResourceCardDav : public ResourceCached
+class TDE_EXPORT ResourceCardDav : public ResourceCached
 {
     TQ_OBJECT