1 files changed, 47 insertions, 47 deletions

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;