4 files changed, 14 insertions, 14 deletions
diff --git a/tderesources/remote/resourceremote.cpp b/tderesources/remote/resourceremote.cpp
index 0a58aefb..4f81329a 100644
--- a/tderesources/remote/resourceremote.cpp
+++ b/tderesources/remote/resourceremote.cpp
@@ -31,7 +31,7 @@
 #include <tdeio/job.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <libkcal/icalformat.h>
 #include <libkcal/exceptions.h>
@@ -197,11 +197,11 @@ bool ResourceRemote::doLoad()
 
     mDownloadJob = TDEIO::file_copy( mDownloadUrl, KURL( cacheFile() ), -1, true,
                                     false, !mUseProgressManager );
-    connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
-            TQT_SLOT( slotLoadJobResult( TDEIO::Job * ) ) );
+    connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+            TQ_SLOT( slotLoadJobResult( TDEIO::Job * ) ) );
     if ( mUseProgressManager ) {
-        connect( mDownloadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
-                TQT_SLOT( slotPercent( TDEIO::Job *, unsigned long ) ) );
+        connect( mDownloadJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+                TQ_SLOT( slotPercent( TDEIO::Job *, unsigned long ) ) );
         mProgress = KPIM::ProgressManager::createProgressItem(
             KPIM::ProgressManager::getUniqueID(), i18n("Downloading Calendar") );
 
@@ -283,8 +283,8 @@ bool ResourceRemote::doSave()
   saveCache();
 
   mUploadJob = TDEIO::file_copy( KURL( cacheFile() ), mUploadUrl, -1, true );
-  connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
-           TQT_SLOT( slotSaveJobResult( TDEIO::Job * ) ) );
+  connect( mUploadJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+           TQ_SLOT( slotSaveJobResult( TDEIO::Job * ) ) );
 
   return true;
 }
diff --git a/tderesources/remote/resourceremote.h b/tderesources/remote/resourceremote.h
index ec7be921..58ddd831 100644
--- a/tderesources/remote/resourceremote.h
+++ b/tderesources/remote/resourceremote.h
@@ -28,7 +28,7 @@
 #include <kurl.h>
 #include <tdeconfig.h>
 #include <kdirwatch.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #include <libtdepim/progressmanager.h>
 
@@ -48,9 +48,9 @@ namespace KCal {
 /**
   This class provides a calendar stored as a remote file.
 */
-class KDE_EXPORT ResourceRemote : public ResourceCached
+class TDE_EXPORT ResourceRemote : public ResourceCached
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     friend class ResourceRemoteConfig;
diff --git a/tderesources/remote/resourceremoteconfig.cpp b/tderesources/remote/resourceremoteconfig.cpp
index 381134b0..ca822f01 100644
--- a/tderesources/remote/resourceremoteconfig.cpp
+++ b/tderesources/remote/resourceremoteconfig.cpp
@@ -27,7 +27,7 @@
 #include <tdelocale.h>
 #include <kdebug.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdialog.h>
 
 #include <libkcal/resourcecachedconfig.h>
diff --git a/tderesources/remote/resourceremoteconfig.h b/tderesources/remote/resourceremoteconfig.h
index fdf26203..6359aa99 100644
--- a/tderesources/remote/resourceremoteconfig.h
+++ b/tderesources/remote/resourceremoteconfig.h
@@ -30,7 +30,7 @@
 #include <tderesources/resource.h>
 #include <tderesources/configwidget.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 namespace KCal {
 
@@ -42,9 +42,9 @@ class ResourceCachedSaveConfig;
   
   @see ResourceRemote
 */
-class KDE_EXPORT ResourceRemoteConfig : public KRES::ConfigWidget
+class TDE_EXPORT ResourceRemoteConfig : public KRES::ConfigWidget
 { 
-    Q_OBJECT
+    TQ_OBJECT
   
   public:
     ResourceRemoteConfig( TQWidget *parent = 0, const char *name = 0 );