5 files changed, 16 insertions, 16 deletions
diff --git a/tderesources/exchange/dateset.cpp b/tderesources/exchange/dateset.cpp
index b2622902..5366b029 100644
--- a/tderesources/exchange/dateset.cpp
+++ b/tderesources/exchange/dateset.cpp
@@ -239,7 +239,7 @@ void DateSet::print()
 }
 
 // Try and merge range i with range i+1
-// NOT TRUE preconditions: range i starts before range i+1, but MAY end later!
+// NOT true preconditions: range i starts before range i+1, but MAY end later!
 // preconditions: range i starts before or in range i+1
 bool DateSet::tryMerge( int i )
 {
diff --git a/tderesources/exchange/resourceexchange.cpp b/tderesources/exchange/resourceexchange.cpp
index ae65f9cd..a2cbbed0 100644
--- a/tderesources/exchange/resourceexchange.cpp
+++ b/tderesources/exchange/resourceexchange.cpp
@@ -123,18 +123,18 @@ bool ResourceExchange::doOpen()
   kdDebug() << "ResourceExchange::doOpen()" << endl;
 
   mClient = new ExchangeClient( mAccount, mTimeZoneId );
-  connect( mClient, TQT_SIGNAL( downloadFinished( int, const TQString & ) ),
-           TQT_SLOT( slotDownloadFinished( int, const TQString & ) ) );
-  connect( mClient, TQT_SIGNAL( event( KCal::Event *, const KURL & ) ),
-           TQT_SLOT( downloadedEvent( KCal::Event *, const KURL & ) ) );
+  connect( mClient, TQ_SIGNAL( downloadFinished( int, const TQString & ) ),
+           TQ_SLOT( slotDownloadFinished( int, const TQString & ) ) );
+  connect( mClient, TQ_SIGNAL( event( KCal::Event *, const KURL & ) ),
+           TQ_SLOT( downloadedEvent( KCal::Event *, const KURL & ) ) );
 
 #if 0
   kdDebug() << "Creating monitor" << endl;
   TQHostAddress ip;
   ip.setAddress( mAccount->host() );
   mMonitor = new ExchangeMonitor( mAccount, ExchangeMonitor::CallBack, ip );
-  connect( mMonitor, TQT_SIGNAL(notify( const TQValueList<long>& , const TQValueList<KURL>& )), this, TQT_SLOT(slotMonitorNotify( const TQValueList<long>& , const TQValueList<KURL>& )) );
-  connect( mMonitor, TQT_SIGNAL(error(int , const TQString&)), this, TQT_SLOT(slotMonitorError(int , const TQString&)) );
+  connect( mMonitor, TQ_SIGNAL(notify( const TQValueList<long>& , const TQValueList<KURL>& )), this, TQ_SLOT(slotMonitorNotify( const TQValueList<long>& , const TQValueList<KURL>& )) );
+  connect( mMonitor, TQ_SIGNAL(error(int , const TQString&)), this, TQ_SLOT(slotMonitorError(int , const TQString&)) );
 
   mMonitor->addWatch( mAccount->calendarURL(), ExchangeMonitor::UpdateNewMember, 1 );
 #endif
diff --git a/tderesources/exchange/resourceexchange.h b/tderesources/exchange/resourceexchange.h
index 120a4de9..c944e9d7 100644
--- a/tderesources/exchange/resourceexchange.h
+++ b/tderesources/exchange/resourceexchange.h
@@ -47,7 +47,7 @@ class CalFormat;
 // FIXME: Use ResourceCached
 class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
@@ -84,7 +84,7 @@ class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer
 //    void close();
 
     /** Add Event to calendar. */
-    KDE_DEPRECATED bool addEvent( Event *event );
+    TDE_DEPRECATED bool addEvent( Event *event );
     bool addEvent( Event *event, const TQString &subresource );
 
     /** deletes an event from this calendar. */
@@ -121,7 +121,7 @@ class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer
     /**
       Add a todo to the todolist.
     */
-    KDE_DEPRECATED bool addTodo( Todo *todo );
+    TDE_DEPRECATED bool addTodo( Todo *todo );
     bool addTodo( Todo *todo, const TQString &subresource );
     /**
       Remove a todo from the todolist.
@@ -142,7 +142,7 @@ class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer
     Todo::List rawTodosForDate( const TQDate &date );
 
     /** Add a Journal entry to calendar */
-    KDE_DEPRECATED bool addJournal( Journal *journal );
+    TDE_DEPRECATED bool addJournal( Journal *journal );
     bool addJournal( Journal *journal, const TQString &subresource );
     /** deletes an event from this calendar. */
     virtual bool deleteJournal(Journal *);
diff --git a/tderesources/exchange/resourceexchangeconfig.cpp b/tderesources/exchange/resourceexchangeconfig.cpp
index 3b3bf14f..5d2de94a 100644
--- a/tderesources/exchange/resourceexchangeconfig.cpp
+++ b/tderesources/exchange/resourceexchangeconfig.cpp
@@ -24,7 +24,7 @@
 
 #include <tdelocale.h>
 #include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdemessagebox.h>
 
 #include "exchangeaccount.h"
@@ -62,7 +62,7 @@ ResourceExchangeConfig::ResourceExchangeConfig( TQWidget* parent,  const char* n
 
   mAutoMailbox = new TQCheckBox( i18n( "Determine mailbox &automatically" ), this );
   mainLayout->addMultiCellWidget( mAutoMailbox, 5, 5, 0, 1 );
-  connect( mAutoMailbox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAuto(bool)) );
+  connect( mAutoMailbox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleAuto(bool)) );
 
   mMailboxEdit = new KLineEdit( this );
   mainLayout->addWidget( new TQLabel( i18n( "Mailbox URL:" ), this ), 6, 0 );
@@ -70,11 +70,11 @@ ResourceExchangeConfig::ResourceExchangeConfig( TQWidget* parent,  const char* n
 
   mTryFindMailbox = new TQPushButton( i18n( "&Find" ), this );
   mainLayout->addWidget( mTryFindMailbox, 6, 2 );
-  connect( mTryFindMailbox, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFindClicked()) );
+  connect( mTryFindMailbox, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFindClicked()) );
 
   label = new TQLabel( i18n( "Cache timeout:" ), this );
   mCacheEdit = new KIntNumInput( this );
-  connect(mCacheEdit, TQT_SIGNAL(valueChanged( int )), TQT_SLOT(slotCacheEditChanged( int )));
+  connect(mCacheEdit, TQ_SIGNAL(valueChanged( int )), TQ_SLOT(slotCacheEditChanged( int )));
   mCacheEdit->setMinValue( 0 );
   mainLayout->addWidget( label, 7, 0 );
   mainLayout->addWidget( mCacheEdit, 7, 1 );
diff --git a/tderesources/exchange/resourceexchangeconfig.h b/tderesources/exchange/resourceexchangeconfig.h
index c008c2ce..f9332bad 100644
--- a/tderesources/exchange/resourceexchangeconfig.h
+++ b/tderesources/exchange/resourceexchangeconfig.h
@@ -36,7 +36,7 @@ namespace KCal {
 
 class ResourceExchangeConfig : public KRES::ConfigWidget
 { 
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public: