2 files changed, 11 insertions, 11 deletions
diff --git a/tderesources/kolab/kcal/resourcekolab.cpp b/tderesources/kolab/kcal/resourcekolab.cpp
index 869ddca8..d19a2576 100644
--- a/tderesources/kolab/kcal/resourcekolab.cpp
+++ b/tderesources/kolab/kcal/resourcekolab.cpp
@@ -77,8 +77,8 @@ ResourceKolab::ResourceKolab( const TDEConfig *config )
     setResourceName( i18n( "Kolab Server" ) );
   }
   setType( "imap" );
-  connect( &mResourceChangedTimer, TQT_SIGNAL( timeout() ),
-           this, TQT_SLOT( slotEmitResourceChanged() ) );
+  connect( &mResourceChangedTimer, TQ_SIGNAL( timeout() ),
+           this, TQ_SLOT( slotEmitResourceChanged() ) );
 }
 
 ResourceKolab::~ResourceKolab()
@@ -176,7 +176,7 @@ bool ResourceKolab::loadSubResource( const TQString& subResource,
   UIServer_stub uiserver( "tdeio_uiserver", "UIServer" );
   int progressId = 0;
   if ( useProgress ) {
-    progressId = uiserver.newJob( kapp->dcopClient()->appId(), true );
+    progressId = uiserver.newJob( tdeApp->dcopClient()->appId(), true );
     uiserver.totalFiles( progressId, count );
     uiserver.infoMessage( progressId, labelTxt );
     uiserver.transferring( progressId, labelTxt );
@@ -402,7 +402,7 @@ void ResourceKolab::resolveConflict( KCal::Incidence* inc, const TQString& subre
        KIncidenceChooser* ch = new KIncidenceChooser();
        ch->setIncidence( local ,inc );
        if ( KIncidenceChooser::chooseMode == KIncidenceChooser::ask ) {
-         connect ( this, TQT_SIGNAL( useGlobalMode() ), ch, TQT_SLOT (  useGlobalMode() ) );
+         connect ( this, TQ_SIGNAL( useGlobalMode() ), ch, TQ_SLOT (  useGlobalMode() ) );
          if ( ch->exec() ) {
            if ( KIncidenceChooser::chooseMode != KIncidenceChooser::ask ) {
              emit useGlobalMode() ;
@@ -711,7 +711,7 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s
 
           /* Will be needed when kmail triggers a delete, so we don't delete the inocent
            * incidence that's sharing the uid with this one */
-          mOriginalUID2fakeUID[tqMakePair( incidence->schedulingID(), subResource )] = uid;
+          mOriginalUID2fakeUID[qMakePair( incidence->schedulingID(), subResource )] = uid;
         }
       }
       /* Add to the cache if the add didn't come from KOrganizer, in which case
@@ -1185,7 +1185,7 @@ void ResourceKolab::setSubresourceActive( const TQString &subresource, bool v )
     }
     mResourceChangedTimer.changeInterval( 100 );
   }
-  TQTimer::singleShot( 0, this, TQT_SLOT(writeConfig()) );
+  TQTimer::singleShot( 0, this, TQ_SLOT(writeConfig()) );
 }
 
 bool ResourceKolab::subresourceWritable( const TQString& subresource ) const
diff --git a/tderesources/kolab/kcal/resourcekolab.h b/tderesources/kolab/kcal/resourcekolab.h
index a8404cd3..289e894d 100644
--- a/tderesources/kolab/kcal/resourcekolab.h
+++ b/tderesources/kolab/kcal/resourcekolab.h
@@ -37,7 +37,7 @@
 
 #include <tqtimer.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 #include <libkcal/calendarlocal.h>
 #include <libkcal/icalformat.h>
 #include <libkcal/resourcecalendar.h>
@@ -47,7 +47,7 @@ namespace KCal {
 
 struct TemporarySilencer;
 
-class KDE_EXPORT ResourceKolab : public KCal::ResourceCalendar,
+class TDE_EXPORT ResourceKolab : public KCal::ResourceCalendar,
                       public KCal::IncidenceBase::Observer,
                       public Kolab::ResourceKolabBase
 {
@@ -71,7 +71,7 @@ public:
   void doClose();
 
   // The libkcal functions. See the resource for descriptions
-  KDE_DEPRECATED bool addEvent( KCal::Event *event );
+  TDE_DEPRECATED bool addEvent( KCal::Event *event );
   bool addEvent( KCal::Event *event, const TQString &subResource );
   bool deleteEvent( KCal::Event * );
   KCal::Event* event( const TQString &UniqueStr );
@@ -84,14 +84,14 @@ public:
   KCal::Event::List rawEvents( const TQDate& start, const TQDate& end,
                                bool inclusive = false );
 
-  KDE_DEPRECATED bool addTodo( KCal::Todo * todo );
+  TDE_DEPRECATED bool addTodo( KCal::Todo * todo );
   bool addTodo( KCal::Todo *todo, const TQString &subResource );
   bool deleteTodo( KCal::Todo * );
   KCal::Todo* todo( const TQString &uid );
   KCal::Todo::List rawTodos( TodoSortField sortField = TodoSortUnsorted, SortDirection sortDirection = SortDirectionAscending );
   KCal::Todo::List rawTodosForDate( const TQDate& date );
 
-  KDE_DEPRECATED bool addJournal( KCal::Journal * );
+  TDE_DEPRECATED bool addJournal( KCal::Journal * );
   bool addJournal( KCal::Journal *, const TQString &subResource );
   bool deleteJournal( KCal::Journal * );
   KCal::Journal* journal( const TQString &uid );