1 files changed, 27 insertions, 27 deletions

diff --git a/kmail/annotationjobs.h b/kmail/annotationjobs.h
index 5375eeeda..2c6ca984d 100644
--- a/kmail/annotationjobs.h
+++ b/kmail/annotationjobs.h
@@ -33,21 +33,21 @@
 #define ANNOTATIONJOBS_H
 
 #include <kio/job.h>
-#include <qvaluevector.h>
+#include <tqvaluevector.h>
 
 namespace KMail {
 
 /// One entry in the annotation list: attribute name and attribute value
 struct AnnotationAttribute {
   AnnotationAttribute() {} // for QValueVector
-  AnnotationAttribute( const QString& e, const QString& n, const QString& v )
+  AnnotationAttribute( const TQString& e, const TQString& n, const TQString& v )
     : entry( e ), name( n ), value( v ) {}
-  QString entry; // e.g. /comment
-  QString name;  // e.g. value.shared
-  QString value;
+  TQString entry; // e.g. /comment
+  TQString name;  // e.g. value.shared
+  TQString value;
 };
 
-typedef QValueVector<AnnotationAttribute> AnnotationList;
+typedef TQValueVector<AnnotationAttribute> AnnotationList;
 
 /**
  * This namespace contains functions that return jobs for annotation operations.
@@ -65,8 +65,8 @@ namespace AnnotationJobs {
  * @param entry the name of the annotation entry
  * @param attributes attribute name+value pairs
  */
-KIO::SimpleJob* setAnnotation( KIO::Slave* slave, const KURL& url, const QString& entry,
-                               const QMap<QString,QString>& attributes );
+KIO::SimpleJob* setAnnotation( KIO::Slave* slave, const KURL& url, const TQString& entry,
+                               const TQMap<TQString,TQString>& attributes );
 
 class MultiSetAnnotationJob;
 /**
@@ -82,15 +82,15 @@ class GetAnnotationJob;
  * @param entry the name of the annotation entry
  * @param attributes attribute names
  */
-GetAnnotationJob* getAnnotation( KIO::Slave* slave, const KURL& url, const QString& entry,
-                                 const QStringList& attributes );
+GetAnnotationJob* getAnnotation( KIO::Slave* slave, const KURL& url, const TQString& entry,
+                                 const TQStringList& attributes );
 
 class MultiGetAnnotationJob;
 /**
  * Get multiple annotation entries
  * Currently we assume we want to get the "value" for each, to simplify the data structure.
  */
-MultiGetAnnotationJob* multiGetAnnotation( KIO::Slave* slave, const KURL& url, const QStringList& entries );
+MultiGetAnnotationJob* multiGetAnnotation( KIO::Slave* slave, const KURL& url, const TQStringList& entries );
 
 class MultiUrlGetAnnotationJob;
 /**
@@ -100,8 +100,8 @@ class MultiUrlGetAnnotationJob;
  */
 MultiUrlGetAnnotationJob* multiUrlGetAnnotation( KIO::Slave* slave,
                                               const KURL& baseUrl,
-                                              const QStringList& paths,
-                                              const QString& annotation );
+                                              const TQStringList& paths,
+                                              const TQString& annotation );
 
 
 /// for getAnnotation()
@@ -109,16 +109,16 @@ class GetAnnotationJob : public KIO::SimpleJob
 {
   Q_OBJECT
 public:
-  GetAnnotationJob( const KURL& url, const QString& entry, const QByteArray &packedArgs,
+  GetAnnotationJob( const KURL& url, const TQString& entry, const TQByteArray &packedArgs,
                     bool showProgressInfo );
 
   const AnnotationList& annotations() const { return mAnnotations; }
 
 protected slots:
-  void slotInfoMessage( KIO::Job*, const QString& );
+  void slotInfoMessage( KIO::Job*, const TQString& );
 private:
   AnnotationList mAnnotations;
-  QString mEntry;
+  TQString mEntry;
 };
 
 /// for multiGetAnnotation
@@ -127,11 +127,11 @@ class MultiGetAnnotationJob : public KIO::Job
   Q_OBJECT
 
 public:
-  MultiGetAnnotationJob( KIO::Slave* slave, const KURL& url, const QStringList& entries, bool showProgressInfo );
+  MultiGetAnnotationJob( KIO::Slave* slave, const KURL& url, const TQStringList& entries, bool showProgressInfo );
 
 signals:
   // Emitted when a given annotation was found - or not found
-  void annotationResult( const QString& entry, const QString& value, bool found );
+  void annotationResult( const TQString& entry, const TQString& value, bool found );
 
 protected slots:
   virtual void slotStart();
@@ -140,8 +140,8 @@ protected slots:
 private:
   KIO::Slave* mSlave;
   const KURL mUrl;
-  const QStringList mEntryList;
-  QStringList::const_iterator mEntryListIterator;
+  const TQStringList mEntryList;
+  TQStringList::const_iterator mEntryListIterator;
 };
 
 /// for multiUrlGetAnnotation
@@ -151,9 +151,9 @@ class MultiUrlGetAnnotationJob : public KIO::Job
 
 public:
   MultiUrlGetAnnotationJob( KIO::Slave* slave, const KURL& baseUrl,
-                            const QStringList& paths, const QString& annotation );
+                            const TQStringList& paths, const TQString& annotation );
 
-  QMap<QString, QString> annotations() const;
+  TQMap<TQString, TQString> annotations() const;
 
 protected slots:
   virtual void slotStart();
@@ -162,10 +162,10 @@ protected slots:
 private:
   KIO::Slave* mSlave;
   const KURL mUrl;
-  const QStringList mPathList;
-  QStringList::const_iterator mPathListIterator;
-  QString mAnnotation;
-  QMap<QString, QString> mAnnotations;
+  const TQStringList mPathList;
+  TQStringList::const_iterator mPathListIterator;
+  TQString mAnnotation;
+  TQMap<TQString, TQString> mAnnotations;
 };
 
 /// for multiSetAnnotation
@@ -178,7 +178,7 @@ public:
 
 signals:
   // Emitted when a given annotation was successfully changed
-  void annotationChanged( const QString& entry, const QString& attribute, const QString& value );
+  void annotationChanged( const TQString& entry, const TQString& attribute, const TQString& value );
 
 protected slots:
   virtual void slotStart();