Trinity Qt initial conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1157655 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

8 files changed, 294 insertions, 294 deletions

diff --git a/kresources/scalix/shared/kmailconnection.cpp b/kresources/scalix/shared/kmailconnection.cpp
index af32cd74b..b4b4b9ebf 100644
--- a/kresources/scalix/shared/kmailconnection.cpp
+++ b/kresources/scalix/shared/kmailconnection.cpp
@@ -46,7 +46,7 @@ using namespace Scalix;
 
 
 KMailConnection::KMailConnection( ResourceScalixBase* resource,
-                                  const QCString& objId )
+                                  const TQCString& objId )
   : DCOPObject( objId ), mResource( resource ), mKMailIcalIfaceStub( 0 )
 {
   // Make the connection to KMail ready
@@ -55,8 +55,8 @@ KMailConnection::KMailConnection( ResourceScalixBase* resource,
   mDCOPClient->registerAs( objId, true );
 
   kapp->dcopClient()->setNotifications( true );
-  connect( kapp->dcopClient(), SIGNAL( applicationRemoved( const QCString& ) ),
-           this, SLOT( unregisteredFromDCOP( const QCString& ) ) );
+  connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ),
+           this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
 }
 
 KMailConnection::~KMailConnection()
@@ -68,15 +68,15 @@ KMailConnection::~KMailConnection()
   mDCOPClient = 0;
 }
 
-static const QCString dcopObjectId = "KMailICalIface";
+static const TQCString dcopObjectId = "KMailICalIface";
 bool KMailConnection::connectToKMail()
 {
   if ( !mKMailIcalIfaceStub ) {
-    QString error;
-    QCString dcopService;
+    TQString error;
+    TQCString dcopService;
     int result = KDCOPServiceStarter::self()->
-      findServiceFor( "DCOP/ResourceBackend/IMAP", QString::null,
-                      QString::null, &error, &dcopService );
+      findServiceFor( "DCOP/ResourceBackend/IMAP", TQString::null,
+                      TQString::null, &error, &dcopService );
     if ( result != 0 ) {
       kdError(5650) << "Couldn't connect to the IMAP resource backend\n";
       // TODO: You might want to show "error" (if not empty) here,
@@ -88,34 +88,34 @@ bool KMailConnection::connectToKMail()
                                                    dcopService, dcopObjectId );
 
     // Attach to the KMail signals
-    if ( !connectKMailSignal( "incidenceAdded(QString,QString,Q_UINT32,int,QString)",
-                              "fromKMailAddIncidence(QString,QString,Q_UINT32,int,QString)" ) )
+    if ( !connectKMailSignal( "incidenceAdded(TQString,TQString,Q_UINT32,int,TQString)",
+                              "fromKMailAddIncidence(TQString,TQString,Q_UINT32,int,TQString)" ) )
       kdError(5650) << "DCOP connection to incidenceAdded failed" << endl;
-    if ( !connectKMailSignal( "incidenceDeleted(QString,QString,QString)",
-                              "fromKMailDelIncidence(QString,QString,QString)" ) )
+    if ( !connectKMailSignal( "incidenceDeleted(TQString,TQString,TQString)",
+                              "fromKMailDelIncidence(TQString,TQString,TQString)" ) )
       kdError(5650) << "DCOP connection to incidenceDeleted failed" << endl;
-    if ( !connectKMailSignal( "signalRefresh(QString,QString)",
-                              "fromKMailRefresh(QString,QString)" ) )
+    if ( !connectKMailSignal( "signalRefresh(TQString,TQString)",
+                              "fromKMailRefresh(TQString,TQString)" ) )
       kdError(5650) << "DCOP connection to signalRefresh failed" << endl;
-    if ( !connectKMailSignal( "subresourceAdded( QString, QString, QString )",
-                              "fromKMailAddSubresource( QString, QString, QString )" ) )
+    if ( !connectKMailSignal( "subresourceAdded( TQString, TQString, TQString )",
+                              "fromKMailAddSubresource( TQString, TQString, TQString )" ) )
       kdError(5650) << "DCOP connection to subresourceAdded failed" << endl;
-    if ( !connectKMailSignal( "subresourceDeleted(QString,QString)",
-                              "fromKMailDelSubresource(QString,QString)" ) )
+    if ( !connectKMailSignal( "subresourceDeleted(TQString,TQString)",
+                              "fromKMailDelSubresource(TQString,TQString)" ) )
       kdError(5650) << "DCOP connection to subresourceDeleted failed" << endl;
-    if ( !connectKMailSignal( "asyncLoadResult(QMap<Q_UINT32, QString>, QString, QString)",
-                              "fromKMailAsyncLoadResult(QMap<Q_UINT32, QString>, QString, QString)" ) )
+    if ( !connectKMailSignal( "asyncLoadResult(TQMap<Q_UINT32, TQString>, TQString, TQString)",
+                              "fromKMailAsyncLoadResult(TQMap<Q_UINT32, TQString>, TQString, TQString)" ) )
       kdError(5650) << "DCOP connection to asyncLoadResult failed" << endl;
   }
 
   return ( mKMailIcalIfaceStub != 0 );
 }
 
-bool KMailConnection::fromKMailAddIncidence( const QString& type,
-                                             const QString& folder,
+bool KMailConnection::fromKMailAddIncidence( const TQString& type,
+                                             const TQString& folder,
                                              Q_UINT32 sernum,
                                              int format,
-                                             const QString& data )
+                                             const TQString& data )
 {
   if ( format != KMailICalIface::StorageXML
       && format != KMailICalIface::StorageIcalVcard )
@@ -125,25 +125,25 @@ bool KMailConnection::fromKMailAddIncidence( const QString& type,
   return mResource->fromKMailAddIncidence( type, folder, sernum, format, data );
 }
 
-void KMailConnection::fromKMailDelIncidence( const QString& type,
-                                             const QString& folder,
-                                             const QString& xml )
+void KMailConnection::fromKMailDelIncidence( const TQString& type,
+                                             const TQString& folder,
+                                             const TQString& xml )
 {
 //   kdDebug(5650) << "KMailConnection::fromKMailDelIncidence( " << type << ", "
 //                 << folder << ", " << uid << " )\n";
   mResource->fromKMailDelIncidence( type, folder, xml );
 }
 
-void KMailConnection::fromKMailRefresh( const QString& type, const QString& folder )
+void KMailConnection::fromKMailRefresh( const TQString& type, const TQString& folder )
 {
 //   kdDebug(5650) << "KMailConnection::fromKMailRefresh( " << type << ", "
 //                 << folder << " )\n";
   mResource->fromKMailRefresh( type, folder );
 }
 
-void KMailConnection::fromKMailAddSubresource( const QString& type,
-                                               const QString& resource,
-                                               const QString& label )
+void KMailConnection::fromKMailAddSubresource( const TQString& type,
+                                               const TQString& resource,
+                                               const TQString& label )
 {
 //   kdDebug(5650) << "KMailConnection::fromKMailAddSubresource( " << type << ", "
 //                 << resource << " )\n";
@@ -156,30 +156,30 @@ void KMailConnection::fromKMailAddSubresource( const QString& type,
   mResource->fromKMailAddSubresource( type, resource, label, writable );
 }
 
-void KMailConnection::fromKMailDelSubresource( const QString& type,
-                                               const QString& resource )
+void KMailConnection::fromKMailDelSubresource( const TQString& type,
+                                               const TQString& resource )
 {
 //   kdDebug(5650) << "KMailConnection::fromKMailDelSubresource( " << type << ", "
 //                 << resource << " )\n";
   mResource->fromKMailDelSubresource( type, resource );
 }
 
-void KMailConnection::fromKMailAsyncLoadResult( const QMap<Q_UINT32, QString>& map,
-                                                const QString& type,
-                                                const QString& folder )
+void KMailConnection::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+                                                const TQString& type,
+                                                const TQString& folder )
 {
   mResource->fromKMailAsyncLoadResult( map, type, folder );
 }
 
-bool KMailConnection::connectKMailSignal( const QCString& signal,
-                                          const QCString& method )
+bool KMailConnection::connectKMailSignal( const TQCString& signal,
+                                          const TQCString& method )
 {
   return connectDCOPSignal( "kmail", dcopObjectId, signal, method, false )
     && connectDCOPSignal( "kontact", dcopObjectId, signal, method, false );
 }
 
-bool KMailConnection::kmailSubresources( QValueList<KMailICalIface::SubResource>& lst,
-                                         const QString& contentsType )
+bool KMailConnection::kmailSubresources( TQValueList<KMailICalIface::SubResource>& lst,
+                                         const TQString& contentsType )
 {
   if ( !connectToKMail() )
     return false;
@@ -189,8 +189,8 @@ bool KMailConnection::kmailSubresources( QValueList<KMailICalIface::SubResource>
 }
 
 bool KMailConnection::kmailIncidencesCount( int& count,
-                                            const QString& mimetype,
-                                            const QString& resource )
+                                            const TQString& mimetype,
+                                            const TQString& resource )
 {
   if ( !connectToKMail() )
     return false;
@@ -199,9 +199,9 @@ bool KMailConnection::kmailIncidencesCount( int& count,
   return mKMailIcalIfaceStub->ok();
 }
 
-bool KMailConnection::kmailIncidences( QMap<Q_UINT32, QString>& lst,
-                                       const QString& mimetype,
-                                       const QString& resource,
+bool KMailConnection::kmailIncidences( TQMap<Q_UINT32, TQString>& lst,
+                                       const TQString& mimetype,
+                                       const TQString& resource,
                                        int startIndex,
                                        int nbMessages )
 {
@@ -214,9 +214,9 @@ bool KMailConnection::kmailIncidences( QMap<Q_UINT32, QString>& lst,
 
 
 bool KMailConnection::kmailGetAttachment( KURL& url,
-                                          const QString& resource,
+                                          const TQString& resource,
                                           Q_UINT32 sernum,
-                                          const QString& filename )
+                                          const TQString& filename )
 {
   if ( !connectToKMail() )
     return false;
@@ -225,7 +225,7 @@ bool KMailConnection::kmailGetAttachment( KURL& url,
   return mKMailIcalIfaceStub->ok();
 }
 
-bool KMailConnection::kmailDeleteIncidence( const QString& resource,
+bool KMailConnection::kmailDeleteIncidence( const TQString& resource,
                                             Q_UINT32 sernum )
 {
   return connectToKMail()
@@ -233,15 +233,15 @@ bool KMailConnection::kmailDeleteIncidence( const QString& resource,
     && mKMailIcalIfaceStub->ok();
 }
 
-bool KMailConnection::kmailUpdate( const QString& resource,
+bool KMailConnection::kmailUpdate( const TQString& resource,
                                    Q_UINT32& sernum,
-                                   const QString& subject,
-                                   const QString& plainTextBody,
-                                   const QMap<QCString, QString>& customHeaders,
-                                   const QStringList& attachmentURLs,
-                                   const QStringList& attachmentMimetypes,
-                                   const QStringList& attachmentNames,
-                                   const QStringList& deletedAttachments )
+                                   const TQString& subject,
+                                   const TQString& plainTextBody,
+                                   const TQMap<TQCString, TQString>& customHeaders,
+                                   const TQStringList& attachmentURLs,
+                                   const TQStringList& attachmentMimetypes,
+                                   const TQStringList& attachmentNames,
+                                   const TQStringList& deletedAttachments )
 {
   //kdDebug(5006) << kdBacktrace() << endl;
   if ( connectToKMail() ) {
@@ -254,7 +254,7 @@ bool KMailConnection::kmailUpdate( const QString& resource,
 }
 
 bool KMailConnection::kmailStorageFormat( KMailICalIface::StorageFormat& type,
-                                          const QString& folder )
+                                          const TQString& folder )
 {
   bool ok = connectToKMail();
   type = mKMailIcalIfaceStub->storageFormat( folder );
@@ -262,13 +262,13 @@ bool KMailConnection::kmailStorageFormat( KMailICalIface::StorageFormat& type,
 }
 
 
-bool KMailConnection::kmailTriggerSync( const QString &contentsType )
+bool KMailConnection::kmailTriggerSync( const TQString &contentsType )
 {
   bool ok = connectToKMail();
   return ok && mKMailIcalIfaceStub->triggerSync( contentsType );
 }
 
-void KMailConnection::unregisteredFromDCOP( const QCString& appId )
+void KMailConnection::unregisteredFromDCOP( const TQCString& appId )
 {
   if ( mKMailIcalIfaceStub && mKMailIcalIfaceStub->app() == appId ) {
     // Delete the stub so that the next time we need to talk to kmail,
diff --git a/kresources/scalix/shared/kmailconnection.h b/kresources/scalix/shared/kmailconnection.h
index ea57857a8..bd02d7bb0 100644
--- a/kresources/scalix/shared/kmailconnection.h
+++ b/kresources/scalix/shared/kmailconnection.h
@@ -47,24 +47,24 @@ class ResourceScalixBase;
 /**
   This class provides the kmail connectivity for IMAP resources.
 */
-class KMailConnection : public QObject, public DCOPObject {
+class KMailConnection : public TQObject, public DCOPObject {
   Q_OBJECT
   K_DCOP
 
   // These are the methods called by KMail when the resource changes
 k_dcop:
-  bool fromKMailAddIncidence( const QString& type, const QString& resource,
-                              Q_UINT32 sernum, int format, const QString& xml );
-  void fromKMailDelIncidence( const QString& type, const QString& resource,
-                              const QString& xml );
-  void fromKMailRefresh( const QString& type, const QString& resource );
-  void fromKMailAddSubresource( const QString& type, const QString& resource, const QString& label );
-  void fromKMailDelSubresource( const QString& type, const QString& resource );
-  void fromKMailAsyncLoadResult( const QMap<Q_UINT32, QString>& map, const QString& type,
-                                 const QString& folder );
+  bool fromKMailAddIncidence( const TQString& type, const TQString& resource,
+                              Q_UINT32 sernum, int format, const TQString& xml );
+  void fromKMailDelIncidence( const TQString& type, const TQString& resource,
+                              const TQString& xml );
+  void fromKMailRefresh( const TQString& type, const TQString& resource );
+  void fromKMailAddSubresource( const TQString& type, const TQString& resource, const TQString& label );
+  void fromKMailDelSubresource( const TQString& type, const TQString& resource );
+  void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map, const TQString& type,
+                                 const TQString& folder );
 
 public:
-  KMailConnection( ResourceScalixBase* resource, const QCString& objId );
+  KMailConnection( ResourceScalixBase* resource, const TQCString& objId );
   virtual ~KMailConnection();
 
   /**
@@ -73,39 +73,39 @@ public:
   bool connectToKMail();
 
   // Call the DCOP methods
-  bool kmailSubresources( QValueList<KMailICalIface::SubResource>& lst,
-                          const QString& contentsType );
+  bool kmailSubresources( TQValueList<KMailICalIface::SubResource>& lst,
+                          const TQString& contentsType );
   bool kmailIncidencesCount( int& count,
-                             const QString& mimetype,
-                             const QString& resource );
-  bool kmailIncidences( QMap<Q_UINT32, QString>& lst, const QString& mimetype,
-                        const QString& resource,
+                             const TQString& mimetype,
+                             const TQString& resource );
+  bool kmailIncidences( TQMap<Q_UINT32, TQString>& lst, const TQString& mimetype,
+                        const TQString& resource,
                         int startIndex,
                         int nbMessages );
 
-  bool kmailGetAttachment( KURL& url, const QString& resource, Q_UINT32 sernum,
-                           const QString& filename );
-  bool kmailDeleteIncidence( const QString& resource, Q_UINT32 sernum );
-  bool kmailUpdate( const QString& resource,
+  bool kmailGetAttachment( KURL& url, const TQString& resource, Q_UINT32 sernum,
+                           const TQString& filename );
+  bool kmailDeleteIncidence( const TQString& resource, Q_UINT32 sernum );
+  bool kmailUpdate( const TQString& resource,
                     Q_UINT32& sernum,
-                    const QString& subject,
-                    const QString& plainTextBody,
-                    const QMap<QCString, QString>& customHeaders,
-                    const QStringList& attachmentURLs,
-                    const QStringList& attachmentMimetypes,
-                    const QStringList& attachmentNames,
-                    const QStringList& deletedAttachments );
+                    const TQString& subject,
+                    const TQString& plainTextBody,
+                    const TQMap<TQCString, TQString>& customHeaders,
+                    const TQStringList& attachmentURLs,
+                    const TQStringList& attachmentMimetypes,
+                    const TQStringList& attachmentNames,
+                    const TQStringList& deletedAttachments );
 
-  bool kmailStorageFormat( KMailICalIface::StorageFormat& type, const QString& folder);
+  bool kmailStorageFormat( KMailICalIface::StorageFormat& type, const TQString& folder);
 
-  bool kmailTriggerSync( const QString& contentsType );
+  bool kmailTriggerSync( const TQString& contentsType );
 
 private slots:
-  virtual void unregisteredFromDCOP( const QCString& );
+  virtual void unregisteredFromDCOP( const TQCString& );
 
 private:
   /** Connect a signal from KMail to a local slot. */
-  bool connectKMailSignal( const QCString&, const QCString& );
+  bool connectKMailSignal( const TQCString&, const TQCString& );
 
   ResourceScalixBase* mResource;
   DCOPClient* mDCOPClient;
diff --git a/kresources/scalix/shared/resourcescalixbase.cpp b/kresources/scalix/shared/resourcescalixbase.cpp
index e91e58787..e239bfb3e 100644
--- a/kresources/scalix/shared/resourcescalixbase.cpp
+++ b/kresources/scalix/shared/resourcescalixbase.cpp
@@ -41,19 +41,19 @@
 #include <kurl.h>
 #include <ktempfile.h>
 #include <kmessagebox.h>
-#include <qtextstream.h>
+#include <tqtextstream.h>
 #include <kdebug.h>
 
 using namespace Scalix;
 
 static unsigned int uniquifier = 0;
 
-ResourceScalixBase::ResourceScalixBase( const QCString& objId )
+ResourceScalixBase::ResourceScalixBase( const TQCString& objId )
   : mSilent( false )
 {
   KGlobal::locale()->insertCatalogue( "kres_scalix" );
   KGlobal::locale()->insertCatalogue( "libkcal" );
-  QString uniqueObjId = QString( objId ) + QString::number( uniquifier++ );
+  TQString uniqueObjId = TQString( objId ) + TQString::number( uniquifier++ );
   mConnection = new KMailConnection( this, uniqueObjId.utf8() );
 }
 
@@ -63,62 +63,62 @@ ResourceScalixBase::~ResourceScalixBase()
 }
 
 
-bool ResourceScalixBase::kmailSubresources( QValueList<KMailICalIface::SubResource>& lst,
-                                           const QString& contentsType ) const
+bool ResourceScalixBase::kmailSubresources( TQValueList<KMailICalIface::SubResource>& lst,
+                                           const TQString& contentsType ) const
 {
   return mConnection->kmailSubresources( lst, contentsType );
 }
 
-bool ResourceScalixBase::kmailTriggerSync( const QString& contentsType ) const
+bool ResourceScalixBase::kmailTriggerSync( const TQString& contentsType ) const
 {
   return mConnection->kmailTriggerSync( contentsType );
 }
 
 
 bool ResourceScalixBase::kmailIncidencesCount( int &count,
-                                              const QString& mimetype,
-                                              const QString& resource ) const
+                                              const TQString& mimetype,
+                                              const TQString& resource ) const
 {
   return mConnection->kmailIncidencesCount( count, mimetype, resource );
 }
 
-bool ResourceScalixBase::kmailIncidences( QMap<Q_UINT32, QString>& lst,
-                                         const QString& mimetype,
-                                         const QString& resource,
+bool ResourceScalixBase::kmailIncidences( TQMap<Q_UINT32, TQString>& lst,
+                                         const TQString& mimetype,
+                                         const TQString& resource,
                                          int startIndex,
                                          int nbMessages ) const
 {
   return mConnection->kmailIncidences( lst, mimetype, resource, startIndex, nbMessages );
 }
 
-bool ResourceScalixBase::kmailGetAttachment( KURL& url, const QString& resource,
+bool ResourceScalixBase::kmailGetAttachment( KURL& url, const TQString& resource,
                                             Q_UINT32 sernum,
-                                            const QString& filename ) const
+                                            const TQString& filename ) const
 {
   return mConnection->kmailGetAttachment( url, resource, sernum, filename );
 }
 
-bool ResourceScalixBase::kmailDeleteIncidence( const QString& resource,
+bool ResourceScalixBase::kmailDeleteIncidence( const TQString& resource,
                                               Q_UINT32 sernum )
 {
   return mSilent || mConnection->kmailDeleteIncidence( resource, sernum );
 }
 
-bool ResourceScalixBase::kmailUpdate( const QString& resource,
+bool ResourceScalixBase::kmailUpdate( const TQString& resource,
                                      Q_UINT32& sernum,
-                                     const QString& xml,
-                                     const QString& mimetype,
-                                     const QString& subject,
+                                     const TQString& xml,
+                                     const TQString& mimetype,
+                                     const TQString& subject,
                                      const CustomHeaderMap& _customHeaders,
-                                     const QStringList& _attachmentURLs,
-                                     const QStringList& _attachmentMimetypes,
-                                     const QStringList& _attachmentNames,
-                                     const QStringList& deletedAttachments )
+                                     const TQStringList& _attachmentURLs,
+                                     const TQStringList& _attachmentMimetypes,
+                                     const TQStringList& _attachmentNames,
+                                     const TQStringList& deletedAttachments )
 {
   if ( mSilent )
     return true;
 
-  QString subj = subject;
+  TQString subj = subject;
   if ( subj.isEmpty() )
     subj = i18n("Internal kolab data: Do not delete this mail.");
 
@@ -127,10 +127,10 @@ bool ResourceScalixBase::kmailUpdate( const QString& resource,
     _attachmentURLs, _attachmentMimetypes, _attachmentNames, deletedAttachments );
 }
 
-QString ResourceScalixBase::configFile( const QString& type ) const
+TQString ResourceScalixBase::configFile( const TQString& type ) const
 {
   return locateLocal( "config",
-                      QString( "kresources/scalix/%1rc" ).arg( type ) );
+                      TQString( "kresources/scalix/%1rc" ).arg( type ) );
 }
 
 bool ResourceScalixBase::connectToKMail() const
@@ -138,12 +138,12 @@ bool ResourceScalixBase::connectToKMail() const
   return mConnection->connectToKMail();
 }
 
-QString ResourceScalixBase::findWritableResource( const ResourceMap& resources )
+TQString ResourceScalixBase::findWritableResource( const ResourceMap& resources )
 {
   // I have to use the label (shown in the dialog) as key here. But given how the
   // label is made up, it should be unique. If it's not, well the dialog would suck anyway...
-  QMap<QString, QString> possible;
-  QStringList labels;
+  TQMap<TQString, TQString> possible;
+  TQStringList labels;
   ResourceMap::ConstIterator it;
   for ( it = resources.begin(); it != resources.end(); ++it ) {
     if ( it.data().writable() && it.data().active() ) {
@@ -155,23 +155,23 @@ QString ResourceScalixBase::findWritableResource( const ResourceMap& resources )
   if ( possible.isEmpty() ) { // None found!!
     kdWarning(5650) << "No writable resource found!" << endl;
     KMessageBox::error( 0, i18n( "No writable resource was found, saving will not be possible. Reconfigure KMail first." ) );
-    return QString::null;
+    return TQString::null;
   }
   if ( possible.count() == 1 )
     // Just one found
     return possible.begin().data(); // yes this is the subresource key, i.e. location
 
   // Several found, ask the user
-  QString chosenLabel = KPIM::FolderSelectDialog::getItem( i18n( "Select Resource Folder" ),
+  TQString chosenLabel = KPIM::FolderSelectDialog::getItem( i18n( "Select Resource Folder" ),
                                                            i18n( "You have more than one writable resource folder. "
                                                                  "Please select the one you want to write to." ),
                                                            possible.keys() );
   if ( chosenLabel.isEmpty() ) // cancelled
-    return QString::null;
+    return TQString::null;
   return possible[chosenLabel];
 }
 
-KMailICalIface::StorageFormat ResourceScalixBase::kmailStorageFormat( const QString &folder ) const
+KMailICalIface::StorageFormat ResourceScalixBase::kmailStorageFormat( const TQString &folder ) const
 {
   KMailICalIface::StorageFormat format = (KMailICalIface::StorageFormat) 3;
   mConnection->kmailStorageFormat( format, folder );
diff --git a/kresources/scalix/shared/resourcescalixbase.h b/kresources/scalix/shared/resourcescalixbase.h
index 3c32c1dfd..f1aefc19e 100644
--- a/kresources/scalix/shared/resourcescalixbase.h
+++ b/kresources/scalix/shared/resourcescalixbase.h
@@ -33,9 +33,9 @@
 #ifndef RESOURCESCALIXBASE_H
 #define RESOURCESCALIXBASE_H
 
-#include <qstring.h>
-#include <qmap.h>
-#include <qstringlist.h>
+#include <tqstring.h>
+#include <tqmap.h>
+#include <tqstringlist.h>
 
 #include "subresource.h"
 #include <kmail/kmailicalIface.h>
@@ -72,30 +72,30 @@ class KMailConnection;
 */
 class ResourceScalixBase {
 public:
-  ResourceScalixBase( const QCString& objId );
+  ResourceScalixBase( const TQCString& objId );
   virtual ~ResourceScalixBase();
 
   // These are the methods called by KMail when the resource changes
-  virtual bool fromKMailAddIncidence( const QString& type,
-                                      const QString& resource,
+  virtual bool fromKMailAddIncidence( const TQString& type,
+                                      const TQString& resource,
                                       Q_UINT32 sernum,
                                       int format,
-                                      const QString& data ) = 0;
-  virtual void fromKMailDelIncidence( const QString& type,
-                                      const QString& resource,
-                                      const QString& xml ) = 0;
-  virtual void fromKMailRefresh( const QString& type,
-                                 const QString& resource ) = 0;
-  virtual void fromKMailAddSubresource( const QString& type,
-                                        const QString& resource,
-                                        const QString& label,
+                                      const TQString& data ) = 0;
+  virtual void fromKMailDelIncidence( const TQString& type,
+                                      const TQString& resource,
+                                      const TQString& xml ) = 0;
+  virtual void fromKMailRefresh( const TQString& type,
+                                 const TQString& resource ) = 0;
+  virtual void fromKMailAddSubresource( const TQString& type,
+                                        const TQString& resource,
+                                        const TQString& label,
                                         bool writable ) = 0;
-  virtual void fromKMailDelSubresource( const QString& type,
-                                        const QString& resource ) = 0;
+  virtual void fromKMailDelSubresource( const TQString& type,
+                                        const TQString& resource ) = 0;
 
-  virtual void fromKMailAsyncLoadResult( const QMap<Q_UINT32, QString>& map,
-                                         const QString& type,
-                                         const QString& folder ) = 0;
+  virtual void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+                                         const TQString& type,
+                                         const TQString& folder ) = 0;
 protected:
   /// Do the connection to KMail.
   bool connectToKMail() const;
@@ -103,58 +103,58 @@ protected:
   // These are the KMail dcop function connections. The docs here say
   // "Get", which here means that the first argument is the return arg
 
-  /// List all folders with a certain contentsType. Returns a QMap with
+  /// List all folders with a certain contentsType. Returns a TQMap with
   /// resourcename/writable pairs
-  bool kmailSubresources( QValueList<KMailICalIface::SubResource>& lst,
-                          const QString& contentsType ) const;
+  bool kmailSubresources( TQValueList<KMailICalIface::SubResource>& lst,
+                          const TQString& contentsType ) const;
 
   /// Get the number of messages in this folder.
   /// Used to iterate over kmailIncidences by chunks
-  bool kmailIncidencesCount( int& count, const QString& mimetype,
-                             const QString& resource ) const;
+  bool kmailIncidencesCount( int& count, const TQString& mimetype,
+                             const TQString& resource ) const;
 
   /// Get the mimetype attachments from a chunk of messages from this folder.
-  /// Returns a QMap with serialNumber/attachment pairs.
-  bool kmailIncidences( QMap<Q_UINT32, QString>& lst, const QString& mimetype,
-                        const QString& resource,
+  /// Returns a TQMap with serialNumber/attachment pairs.
+  bool kmailIncidences( TQMap<Q_UINT32, TQString>& lst, const TQString& mimetype,
+                        const TQString& resource,
                         int startIndex,
                         int nbMessages ) const;
 
-  bool kmailTriggerSync( const QString& contentType ) const;
+  bool kmailTriggerSync( const TQString& contentType ) const;
 
 public: // for Contact
   /// Get an attachment from a mail. Returns a URL to it. This can
   /// be called by the resource after obtaining the incidence.
   /// The resource must delete the temp file.
-  bool kmailGetAttachment( KURL& url, const QString& resource,
+  bool kmailGetAttachment( KURL& url, const TQString& resource,
                            Q_UINT32 sernum,
-                           const QString& filename ) const;
+                           const TQString& filename ) const;
 
 protected:
   /// Delete an incidence.
-  bool kmailDeleteIncidence( const QString& resource, Q_UINT32 sernum );
+  bool kmailDeleteIncidence( const TQString& resource, Q_UINT32 sernum );
 
-  KMailICalIface::StorageFormat kmailStorageFormat( const QString& folder ) const;
+  KMailICalIface::StorageFormat kmailStorageFormat( const TQString& folder ) const;
 
-  typedef QMap<QCString, QString> CustomHeaderMap;
+  typedef TQMap<TQCString, TQString> CustomHeaderMap;
 
   /// Update an incidence. The list of attachments are URLs.
   /// The parameter sernum is updated with the right KMail serial number
-  bool kmailUpdate( const QString& resource, Q_UINT32& sernum,
-                    const QString& xml,
-                    const QString& mimetype,
-                    const QString& subject,
+  bool kmailUpdate( const TQString& resource, Q_UINT32& sernum,
+                    const TQString& xml,
+                    const TQString& mimetype,
+                    const TQString& subject,
                     const CustomHeaderMap& customHeaders = CustomHeaderMap(),
-                    const QStringList& attachmentURLs = QStringList(),
-                    const QStringList& attachmentMimetypes = QStringList(),
-                    const QStringList& attachmentNames = QStringList(),
-                    const QStringList& deletedAttachments = QStringList() );
+                    const TQStringList& attachmentURLs = TQStringList(),
+                    const TQStringList& attachmentMimetypes = TQStringList(),
+                    const TQStringList& attachmentNames = TQStringList(),
+                    const TQStringList& deletedAttachments = TQStringList() );
 
   /// Get the full path of the config file.
-  QString configFile( const QString& type ) const;
+  TQString configFile( const TQString& type ) const;
 
   /// If only one of these is writable, return that. Otherwise return null.
-  QString findWritableResource( const ResourceMap& resources );
+  TQString findWritableResource( const ResourceMap& resources );
 
   bool mSilent;
 
@@ -167,9 +167,9 @@ protected:
 
   /// This is used to distinguish operations triggered by the user,
   /// from operations triggered by KMail
-  QStringList mUidsPendingAdding;
-  QStringList mUidsPendingDeletion;
-  QStringList mUidsPendingUpdate;
+  TQStringList mUidsPendingAdding;
+  TQStringList mUidsPendingDeletion;
+  TQStringList mUidsPendingUpdate;
 
 private:
   mutable KMailConnection* mConnection;
diff --git a/kresources/scalix/shared/scalixbase.cpp b/kresources/scalix/shared/scalixbase.cpp
index ab38500e2..8fb5177b7 100644
--- a/kresources/scalix/shared/scalixbase.cpp
+++ b/kresources/scalix/shared/scalixbase.cpp
@@ -36,14 +36,14 @@
 #include <libkcal/journal.h>
 #include <libkdepim/kpimprefs.h>
 #include <kdebug.h>
-#include <qfile.h>
+#include <tqfile.h>
 
 using namespace Scalix;
 
 
-ScalixBase::ScalixBase( const QString& tz )
-  : mCreationDate( QDateTime::currentDateTime() ),
-    mLastModified( QDateTime::currentDateTime() ),
+ScalixBase::ScalixBase( const TQString& tz )
+  : mCreationDate( TQDateTime::currentDateTime() ),
+    mLastModified( TQDateTime::currentDateTime() ),
     mSensitivity( Public ), mTimeZoneId( tz ),
     mHasPilotSyncId( false ),  mHasPilotSyncStatus( false )
 {
@@ -88,20 +88,20 @@ void ScalixBase::setFields( const KABC::Addressee* addressee )
   setCategories( addressee->categories().join( "," ) );
 
   // Set creation-time and last-modification-time
-  const QString creationString = addressee->custom( "KOLAB", "CreationDate" );
+  const TQString creationString = addressee->custom( "KOLAB", "CreationDate" );
   kdDebug(5006) << "Creation time string: " << creationString << endl;
-  QDateTime creationDate;
+  TQDateTime creationDate;
   if ( creationString.isEmpty() ) {
-    creationDate = QDateTime::currentDateTime();
+    creationDate = TQDateTime::currentDateTime();
     kdDebug(5006) << "Creation date set to current time\n";
   }
   else {
     creationDate = stringToDateTime( creationString );
     kdDebug(5006) << "Creation date loaded\n";
   }
-  QDateTime modified = addressee->revision();
+  TQDateTime modified = addressee->revision();
   if ( !modified.isValid() )
-    modified = QDateTime::currentDateTime();
+    modified = TQDateTime::currentDateTime();
   setLastModified( modified );
   if ( modified < creationDate ) {
     // It's not possible that the modification date is earlier than creation
@@ -109,7 +109,7 @@ void ScalixBase::setFields( const KABC::Addressee* addressee )
     kdDebug(5006) << "Creation date set to modification date\n";
   }
   setCreationDate( creationDate );
-  const QString newCreationDate = dateTimeToString( creationDate );
+  const TQString newCreationDate = dateTimeToString( creationDate );
   if ( creationString != newCreationDate ) {
     // We modified the creation date, so store it for future reference
     const_cast<KABC::Addressee*>( addressee )
@@ -135,7 +135,7 @@ void ScalixBase::saveTo( KABC::Addressee* addressee ) const
 {
   addressee->setUid( uid() );
   addressee->setNote( body() );
-  addressee->setCategories( QStringList::split( ',', categories() ) );
+  addressee->setCategories( TQStringList::split( ',', categories() ) );
   addressee->setRevision( lastModified() );
   addressee->insertCustom( "KOLAB", "CreationDate",
                            dateTimeToString( creationDate() ) );
@@ -155,52 +155,52 @@ void ScalixBase::saveTo( KABC::Addressee* addressee ) const
   // TODO: Attachments
 }
 
-void ScalixBase::setUid( const QString& uid )
+void ScalixBase::setUid( const TQString& uid )
 {
   mUid = uid;
 }
 
-QString ScalixBase::uid() const
+TQString ScalixBase::uid() const
 {
   return mUid;
 }
 
-void ScalixBase::setBody( const QString& body )
+void ScalixBase::setBody( const TQString& body )
 {
   mBody = body;
 }
 
-QString ScalixBase::body() const
+TQString ScalixBase::body() const
 {
   return mBody;
 }
 
-void ScalixBase::setCategories( const QString& categories )
+void ScalixBase::setCategories( const TQString& categories )
 {
   mCategories = categories;
 }
 
-QString ScalixBase::categories() const
+TQString ScalixBase::categories() const
 {
   return mCategories;
 }
 
-void ScalixBase::setCreationDate( const QDateTime& date )
+void ScalixBase::setCreationDate( const TQDateTime& date )
 {
   mCreationDate = date;
 }
 
-QDateTime ScalixBase::creationDate() const
+TQDateTime ScalixBase::creationDate() const
 {
   return mCreationDate;
 }
 
-void ScalixBase::setLastModified( const QDateTime& date )
+void ScalixBase::setLastModified( const TQDateTime& date )
 {
   mLastModified = date;
 }
 
-QDateTime ScalixBase::lastModified() const
+TQDateTime ScalixBase::lastModified() const
 {
   return mLastModified;
 }
@@ -247,14 +247,14 @@ int ScalixBase::pilotSyncStatus() const
   return mPilotSyncStatus;
 }
 
-bool ScalixBase::loadEmailAttribute( QDomElement& element, Email& email )
+bool ScalixBase::loadEmailAttribute( TQDomElement& element, Email& email )
 {
-  for ( QDomNode n = element.firstChild(); !n.isNull(); n = n.nextSibling() ) {
+  for ( TQDomNode n = element.firstChild(); !n.isNull(); n = n.nextSibling() ) {
     if ( n.isComment() )
       continue;
     if ( n.isElement() ) {
-      QDomElement e = n.toElement();
-      QString tagName = e.tagName();
+      TQDomElement e = n.toElement();
+      TQString tagName = e.tagName();
 
       if ( tagName == "display-name" )
         email.displayName = e.text();
@@ -270,18 +270,18 @@ bool ScalixBase::loadEmailAttribute( QDomElement& element, Email& email )
   return true;
 }
 
-void ScalixBase::saveEmailAttribute( QDomElement& element, const Email& email,
-                                    const QString& tagName ) const
+void ScalixBase::saveEmailAttribute( TQDomElement& element, const Email& email,
+                                    const TQString& tagName ) const
 {
-  QDomElement e = element.ownerDocument().createElement( tagName );
+  TQDomElement e = element.ownerDocument().createElement( tagName );
   element.appendChild( e );
   writeString( e, "display-name", email.displayName );
   writeString( e, "smtp-address", email.smtpAddress );
 }
 
-bool ScalixBase::loadAttribute( QDomElement& element )
+bool ScalixBase::loadAttribute( TQDomElement& element )
 {
-  QString tagName = element.tagName();
+  TQString tagName = element.tagName();
 
   if ( tagName == "uid" )
     setUid( element.text() );
@@ -308,7 +308,7 @@ bool ScalixBase::loadAttribute( QDomElement& element )
   return true;
 }
 
-bool ScalixBase::saveAttributes( QDomElement& element ) const
+bool ScalixBase::saveAttributes( TQDomElement& element ) const
 {
   writeString( element, "product-id", productID() );
   writeString( element, "uid", uid() );
@@ -319,17 +319,17 @@ bool ScalixBase::saveAttributes( QDomElement& element ) const
                dateTimeToString( lastModified() ) );
   writeString( element, "sensitivity", sensitivityToString( sensitivity() ) );
   if ( hasPilotSyncId() )
-    writeString( element, "pilot-sync-id", QString::number( pilotSyncId() ) );
+    writeString( element, "pilot-sync-id", TQString::number( pilotSyncId() ) );
   if ( hasPilotSyncStatus() )
-    writeString( element, "pilot-sync-status", QString::number( pilotSyncStatus() ) );
+    writeString( element, "pilot-sync-status", TQString::number( pilotSyncStatus() ) );
   return true;
 }
 
-bool ScalixBase::load( const QString& xml )
+bool ScalixBase::load( const TQString& xml )
 {
-  QString errorMsg;
+  TQString errorMsg;
   int errorLine, errorColumn;
-  QDomDocument document;
+  TQDomDocument document;
   bool ok = document.setContent( xml, &errorMsg, &errorLine, &errorColumn );
 
   if ( !ok ) {
@@ -342,11 +342,11 @@ bool ScalixBase::load( const QString& xml )
   return loadXML( document );
 }
 
-bool ScalixBase::load( QFile& xml )
+bool ScalixBase::load( TQFile& xml )
 {
-  QString errorMsg;
+  TQString errorMsg;
   int errorLine, errorColumn;
-  QDomDocument document;
+  TQDomDocument document;
   bool ok = document.setContent( &xml, &errorMsg, &errorLine, &errorColumn );
 
   if ( !ok ) {
@@ -359,41 +359,41 @@ bool ScalixBase::load( QFile& xml )
   return loadXML( document );
 }
 
-QDomDocument ScalixBase::domTree()
+TQDomDocument ScalixBase::domTree()
 {
-  QDomDocument document;
+  TQDomDocument document;
 
-  QString p = "version=\"1.0\" encoding=\"UTF-8\"";
+  TQString p = "version=\"1.0\" encoding=\"UTF-8\"";
   document.appendChild(document.createProcessingInstruction( "xml", p ) );
 
   return document;
 }
 
 
-QString ScalixBase::dateTimeToString( const QDateTime& time )
+TQString ScalixBase::dateTimeToString( const TQDateTime& time )
 {
   return time.toString( Qt::ISODate ) + 'Z';
 }
 
-QString ScalixBase::dateToString( const QDate& date )
+TQString ScalixBase::dateToString( const TQDate& date )
 {
   return date.toString( Qt::ISODate );
 }
 
-QDateTime ScalixBase::stringToDateTime( const QString& _date )
+TQDateTime ScalixBase::stringToDateTime( const TQString& _date )
 {
-  QString date( _date );
+  TQString date( _date );
   if ( date.endsWith( "Z" ) )
     date.truncate( date.length() - 1 );
-  return QDateTime::fromString( date, Qt::ISODate );
+  return TQDateTime::fromString( date, Qt::ISODate );
 }
 
-QDate ScalixBase::stringToDate( const QString& date )
+TQDate ScalixBase::stringToDate( const TQString& date )
 {
-  return QDate::fromString( date, Qt::ISODate );
+  return TQDate::fromString( date, Qt::ISODate );
 }
 
-QString ScalixBase::sensitivityToString( Sensitivity s )
+TQString ScalixBase::sensitivityToString( Sensitivity s )
 {
   switch( s ) {
   case Private: return "private";
@@ -404,7 +404,7 @@ QString ScalixBase::sensitivityToString( Sensitivity s )
   return "What what what???";
 }
 
-ScalixBase::Sensitivity ScalixBase::stringToSensitivity( const QString& s )
+ScalixBase::Sensitivity ScalixBase::stringToSensitivity( const TQString& s )
 {
   if ( s == "private" )
     return Private;
@@ -413,34 +413,34 @@ ScalixBase::Sensitivity ScalixBase::stringToSensitivity( const QString& s )
   return Public;
 }
 
-QString ScalixBase::colorToString( const QColor& color )
+TQString ScalixBase::colorToString( const TQColor& color )
 {
   // Color is in the format "#RRGGBB"
   return color.name();
 }
 
-QColor ScalixBase::stringToColor( const QString& s )
+TQColor ScalixBase::stringToColor( const TQString& s )
 {
-  return QColor( s );
+  return TQColor( s );
 }
 
-void ScalixBase::writeString( QDomElement& element, const QString& tag,
-                             const QString& tagString )
+void ScalixBase::writeString( TQDomElement& element, const TQString& tag,
+                             const TQString& tagString )
 {
   if ( !tagString.isEmpty() ) {
-    QDomElement e = element.ownerDocument().createElement( tag );
-    QDomText t = element.ownerDocument().createTextNode( tagString );
+    TQDomElement e = element.ownerDocument().createElement( tag );
+    TQDomText t = element.ownerDocument().createTextNode( tagString );
     e.appendChild( t );
     element.appendChild( e );
   }
 }
 
-QDateTime ScalixBase::localToUTC( const QDateTime& time ) const
+TQDateTime ScalixBase::localToUTC( const TQDateTime& time ) const
 {
   return KPimPrefs::localTimeToUtc( time, mTimeZoneId );
 }
 
-QDateTime ScalixBase::utcToLocal( const QDateTime& time ) const
+TQDateTime ScalixBase::utcToLocal( const TQDateTime& time ) const
 {
   return KPimPrefs::utcToLocalTime( time, mTimeZoneId );
 }
diff --git a/kresources/scalix/shared/scalixbase.h b/kresources/scalix/shared/scalixbase.h
index efed7e27a..739a2615c 100644
--- a/kresources/scalix/shared/scalixbase.h
+++ b/kresources/scalix/shared/scalixbase.h
@@ -33,9 +33,9 @@
 #ifndef SCALIXBASE_H
 #define SCALIXBASE_H
 
-#include <qdom.h>
-#include <qdatetime.h>
-#include <qcolor.h>
+#include <tqdom.h>
+#include <tqdatetime.h>
+#include <tqcolor.h>
 
 class QFile;
 
@@ -53,38 +53,38 @@ class ScalixBase {
 public:
   struct Email {
   public:
-    Email( const QString& name = QString::null,
-           const QString& email = QString::null )
+    Email( const TQString& name = TQString::null,
+           const TQString& email = TQString::null )
       : displayName( name ), smtpAddress( email )
     {
     }
 
-    QString displayName;
-    QString smtpAddress;
+    TQString displayName;
+    TQString smtpAddress;
   };
 
   enum Sensitivity { Public = 0, Private = 1, Confidential = 2 };
 
-  explicit ScalixBase( const QString& timezone = QString::null );
+  explicit ScalixBase( const TQString& timezone = TQString::null );
   virtual ~ScalixBase();
 
   // Return a string identifying this type
-  virtual QString type() const = 0;
+  virtual TQString type() const = 0;
 
-  virtual void setUid( const QString& uid );
-  virtual QString uid() const;
+  virtual void setUid( const TQString& uid );
+  virtual TQString uid() const;
 
-  virtual void setBody( const QString& body );
-  virtual QString body() const;
+  virtual void setBody( const TQString& body );
+  virtual TQString body() const;
 
-  virtual void setCategories( const QString& categories );
-  virtual QString categories() const;
+  virtual void setCategories( const TQString& categories );
+  virtual TQString categories() const;
 
-  virtual void setCreationDate( const QDateTime& date );
-  virtual QDateTime creationDate() const;
+  virtual void setCreationDate( const TQDateTime& date );
+  virtual TQDateTime creationDate() const;
 
-  virtual void setLastModified( const QDateTime& date );
-  virtual QDateTime lastModified() const;
+  virtual void setLastModified( const TQDateTime& date );
+  virtual TQDateTime lastModified() const;
 
   virtual void setSensitivity( Sensitivity sensitivity );
   virtual Sensitivity sensitivity() const;
@@ -98,28 +98,28 @@ public:
   virtual int pilotSyncStatus() const;
 
   // String - Date conversion methods
-  static QString dateTimeToString( const QDateTime& time );
-  static QString dateToString( const QDate& date );
-  static QDateTime stringToDateTime( const QString& time );
-  static QDate stringToDate( const QString& date );
+  static TQString dateTimeToString( const TQDateTime& time );
+  static TQString dateToString( const TQDate& date );
+  static TQDateTime stringToDateTime( const TQString& time );
+  static TQDate stringToDate( const TQString& date );
 
   // String - Sensitivity conversion methods
-  static QString sensitivityToString( Sensitivity );
-  static Sensitivity stringToSensitivity( const QString& );
+  static TQString sensitivityToString( Sensitivity );
+  static Sensitivity stringToSensitivity( const TQString& );
 
   // String - Color conversion methods
-  static QString colorToString( const QColor& );
-  static QColor stringToColor( const QString& );
+  static TQString colorToString( const TQColor& );
+  static TQColor stringToColor( const TQString& );
 
   // Load this object by reading the XML file
-  bool load( const QString& xml );
-  bool load( QFile& xml );
+  bool load( const TQString& xml );
+  bool load( TQFile& xml );
 
   // Load this QDomDocument
-  virtual bool loadXML( const QDomDocument& xml ) = 0;
+  virtual bool loadXML( const TQDomDocument& xml ) = 0;
 
   // Serialize this object to an XML string
-  virtual QString saveXML() const = 0;
+  virtual TQString saveXML() const = 0;
 
 protected:
   /// Read all known fields from this ical incidence
@@ -135,35 +135,35 @@ protected:
   void saveTo( KABC::Addressee* ) const;
 
   // This just makes the initial dom tree with version and doctype
-  static QDomDocument domTree();
+  static TQDomDocument domTree();
 
-  bool loadEmailAttribute( QDomElement& element, Email& email );
+  bool loadEmailAttribute( TQDomElement& element, Email& email );
 
-  void saveEmailAttribute( QDomElement& element, const Email& email,
-                           const QString& tagName = "email" ) const;
+  void saveEmailAttribute( TQDomElement& element, const Email& email,
+                           const TQString& tagName = "email" ) const;
 
   // Load the attributes of this class
-  virtual bool loadAttribute( QDomElement& );
+  virtual bool loadAttribute( TQDomElement& );
 
   // Save the attributes of this class
-  virtual bool saveAttributes( QDomElement& ) const;
+  virtual bool saveAttributes( TQDomElement& ) const;
 
   // Return the product ID
-  virtual QString productID() const = 0;
+  virtual TQString productID() const = 0;
 
   // Write a string tag
-  static void writeString( QDomElement&, const QString&, const QString& );
+  static void writeString( TQDomElement&, const TQString&, const TQString& );
 
-  QDateTime localToUTC( const QDateTime& time ) const;
-  QDateTime utcToLocal( const QDateTime& time ) const;
+  TQDateTime localToUTC( const TQDateTime& time ) const;
+  TQDateTime utcToLocal( const TQDateTime& time ) const;
 
-  QString mUid;
-  QString mBody;
-  QString mCategories;
-  QDateTime mCreationDate;
-  QDateTime mLastModified;
+  TQString mUid;
+  TQString mBody;
+  TQString mCategories;
+  TQDateTime mCreationDate;
+  TQDateTime mLastModified;
   Sensitivity mSensitivity;
-  QString mTimeZoneId;
+  TQString mTimeZoneId;
 
   // KPilot synchronization stuff
   bool mHasPilotSyncId,  mHasPilotSyncStatus;
diff --git a/kresources/scalix/shared/subresource.cpp b/kresources/scalix/shared/subresource.cpp
index 6653e0f06..0acfb0816 100644
--- a/kresources/scalix/shared/subresource.cpp
+++ b/kresources/scalix/shared/subresource.cpp
@@ -35,7 +35,7 @@
 
 using namespace Scalix;
 
-SubResource::SubResource( bool active, bool writable, const QString& label,
+SubResource::SubResource( bool active, bool writable, const TQString& label,
                           int completionWeight )
   : mActive( active ),  mWritable( writable ), mLabel( label ),
     mCompletionWeight( completionWeight )
@@ -66,12 +66,12 @@ bool SubResource::writable() const
   return mWritable;
 }
 
-void SubResource::setLabel( const QString& label )
+void SubResource::setLabel( const TQString& label )
 {
   mLabel = label;
 }
 
-QString SubResource::label() const
+TQString SubResource::label() const
 {
   return mLabel;
 }
@@ -86,7 +86,7 @@ int SubResource::completionWeight() const
   return mCompletionWeight;
 }
 
-StorageReference::StorageReference( const QString& resource, Q_UINT32 sernum )
+StorageReference::StorageReference( const TQString& resource, Q_UINT32 sernum )
   : mResource( resource ), mSerialNumber( sernum )
 {
 }
@@ -95,12 +95,12 @@ StorageReference::~StorageReference()
 {
 }
 
-void StorageReference::setResource( const QString& resource )
+void StorageReference::setResource( const TQString& resource )
 {
   mResource = resource;
 }
 
-QString StorageReference::resource() const
+TQString StorageReference::resource() const
 {
   return mResource;
 }
diff --git a/kresources/scalix/shared/subresource.h b/kresources/scalix/shared/subresource.h
index 3cfc4429e..f7898c14f 100644
--- a/kresources/scalix/shared/subresource.h
+++ b/kresources/scalix/shared/subresource.h
@@ -34,8 +34,8 @@
 #ifndef SUBRESOURCE_H
 #define SUBRESOURCE_H
 
-#include <qstring.h>
-#include <qmap.h>
+#include <tqstring.h>
+#include <tqmap.h>
 
 
 namespace Scalix {
@@ -49,7 +49,7 @@ public:
   // This is just for QMap
   SubResource() {}
 
-  SubResource( bool active, bool writable, const QString& label,
+  SubResource( bool active, bool writable, const TQString& label,
                int completionWeight = 100 );
   virtual ~SubResource();
 
@@ -59,8 +59,8 @@ public:
   virtual void setWritable( bool writable );
   virtual bool writable() const;
 
-  virtual void setLabel( const QString& label );
-  virtual QString label() const;
+  virtual void setLabel( const TQString& label );
+  virtual TQString label() const;
 
   virtual void setCompletionWeight( int completionWeight );
   virtual int completionWeight() const;
@@ -68,7 +68,7 @@ public:
 private:
   bool mActive;   // Controlled by the applications
   bool mWritable; // Set if the KMail folder is writable
-  QString mLabel; // The GUI name of this resource
+  TQString mLabel; // The GUI name of this resource
 
   // This is just for the abc plugin. But as long as only this is here,
   // it's just as cheap to have it in here as making a d-pointer that
@@ -77,7 +77,7 @@ private:
   int mCompletionWeight;
 };
 
-typedef QMap<QString, SubResource> ResourceMap;
+typedef TQMap<TQString, SubResource> ResourceMap;
 
 /**
  * This class is used to store a mapping from the XML UID to the KMail
@@ -89,21 +89,21 @@ public:
   // Just for QMap
   StorageReference() {}
 
-  StorageReference( const QString& resource, Q_UINT32 sernum );
+  StorageReference( const TQString& resource, Q_UINT32 sernum );
   virtual ~StorageReference();
 
-  virtual void setResource( const QString& resource );
-  virtual QString resource() const;
+  virtual void setResource( const TQString& resource );
+  virtual TQString resource() const;
 
   virtual void setSerialNumber( Q_UINT32 serialNumber );
   virtual Q_UINT32 serialNumber() const;
 
 private:
-  QString mResource;
+  TQString mResource;
   Q_UINT32 mSerialNumber;
 };
 
-typedef QMap<QString, StorageReference> UidMap;
+typedef TQMap<TQString, StorageReference> UidMap;
 
 }