4 files changed, 11 insertions, 11 deletions
diff --git a/tderesources/scalix/shared/kmailconnection.cpp b/tderesources/scalix/shared/kmailconnection.cpp
index 147b9822..dec929ce 100644
--- a/tderesources/scalix/shared/kmailconnection.cpp
+++ b/tderesources/scalix/shared/kmailconnection.cpp
@@ -54,14 +54,14 @@ KMailConnection::KMailConnection( ResourceScalixBase* resource,
   mDCOPClient->attach();
   mDCOPClient->registerAs( objId, true );
 
-  kapp->dcopClient()->setNotifications( true );
-  connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ),
-           this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
+  tdeApp->dcopClient()->setNotifications( true );
+  connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ),
+           this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
 }
 
 KMailConnection::~KMailConnection()
 {
-  kapp->dcopClient()->setNotifications( false );
+  tdeApp->dcopClient()->setNotifications( false );
   delete mKMailIcalIfaceStub;
   mKMailIcalIfaceStub = 0;
   delete mDCOPClient;
@@ -84,7 +84,7 @@ bool KMailConnection::connectToKMail()
       return false;
     }
 
-    mKMailIcalIfaceStub = new KMailICalIface_stub( kapp->dcopClient(),
+    mKMailIcalIfaceStub = new KMailICalIface_stub( tdeApp->dcopClient(),
                                                    dcopService, dcopObjectId );
 
     // Attach to the KMail signals
diff --git a/tderesources/scalix/shared/kmailconnection.h b/tderesources/scalix/shared/kmailconnection.h
index 7fec6274..b8f102cd 100644
--- a/tderesources/scalix/shared/kmailconnection.h
+++ b/tderesources/scalix/shared/kmailconnection.h
@@ -48,7 +48,7 @@ class ResourceScalixBase;
   This class provides the kmail connectivity for IMAP resources.
 */
 class KMailConnection : public TQObject, public DCOPObject {
-  Q_OBJECT
+  TQ_OBJECT
 //  
   K_DCOP
 
diff --git a/tderesources/scalix/shared/resourcescalixbase.cpp b/tderesources/scalix/shared/resourcescalixbase.cpp
index 6108230c..f9b10423 100644
--- a/tderesources/scalix/shared/resourcescalixbase.cpp
+++ b/tderesources/scalix/shared/resourcescalixbase.cpp
@@ -36,7 +36,7 @@
 #include <folderselectdialog.h>
 
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kinputdialog.h>
 #include <kurl.h>
 #include <tdetempfile.h>
diff --git a/tderesources/scalix/shared/scalixbase.cpp b/tderesources/scalix/shared/scalixbase.cpp
index f07a6983..51ef8798 100644
--- a/tderesources/scalix/shared/scalixbase.cpp
+++ b/tderesources/scalix/shared/scalixbase.cpp
@@ -372,12 +372,12 @@ TQDomDocument ScalixBase::domTree()
 
 TQString ScalixBase::dateTimeToString( const TQDateTime& time )
 {
-  return time.toString( Qt::ISODate ) + 'Z';
+  return time.toString( TQt::ISODate ) + 'Z';
 }
 
 TQString ScalixBase::dateToString( const TQDate& date )
 {
-  return date.toString( Qt::ISODate );
+  return date.toString( TQt::ISODate );
 }
 
 TQDateTime ScalixBase::stringToDateTime( const TQString& _date )
@@ -385,12 +385,12 @@ TQDateTime ScalixBase::stringToDateTime( const TQString& _date )
   TQString date( _date );
   if ( date.endsWith( "Z" ) )
     date.truncate( date.length() - 1 );
-  return TQDateTime::fromString( date, Qt::ISODate );
+  return TQDateTime::fromString( date, TQt::ISODate );
 }
 
 TQDate ScalixBase::stringToDate( const TQString& date )
 {
-  return TQDate::fromString( date, Qt::ISODate );
+  return TQDate::fromString( date, TQt::ISODate );
 }
 
 TQString ScalixBase::sensitivityToString( Sensitivity s )