1 files changed, 25 insertions, 25 deletions

diff --git a/kmail/kmfoldersearch.h b/kmail/kmfoldersearch.h
index 9acb80724..ef3c87d0f 100644
--- a/kmail/kmfoldersearch.h
+++ b/kmail/kmfoldersearch.h
@@ -20,11 +20,11 @@
 #ifndef kmfoldersearch_h
 #define kmfoldersearch_h
 
-#include <qguardedptr.h>
-#include <qvaluelist.h>
-#include <qvaluevector.h>
-#include <qvaluestack.h>
-#include <qmap.h>
+#include <tqguardedptr.h>
+#include <tqvaluelist.h>
+#include <tqvaluevector.h>
+#include <tqvaluestack.h>
+#include <tqmap.h>
 #include "kmfolder.h"
 #include "folderstorage.h"
 
@@ -37,7 +37,7 @@
     numbers of all messages that currently match the search.
 **/
 
-typedef QValueList<Q_UINT32> SerNumList;
+typedef TQValueList<Q_UINT32> SerNumList;
 class KMSearchPattern;
 class KMFolderImap;
 class KMFolderSearchJob;
@@ -54,11 +54,11 @@ class KMSearch: public QObject
   Q_OBJECT
 
 public:
-  KMSearch(QObject * parent = 0, const char * name = 0);
+  KMSearch(TQObject * parent = 0, const char * name = 0);
   ~KMSearch();
 
-  bool write(QString location) const;
-  bool read(QString location);
+  bool write(TQString location) const;
+  bool read(TQString location);
   bool recursive() const { return mRecursive; }
   void setRecursive(bool recursive) { if (running()) stop(); mRecursive = recursive; }
   KMFolder* root() const { return mRoot; }
@@ -72,7 +72,7 @@ public:
   void stop();
   int foundCount() const { return mFoundCount; }
   int searchCount() const { return mSearchCount; }
-  QString currentFolder() const { return mLastFolder; }
+  TQString currentFolder() const { return mLastFolder; }
 
 public slots:
   void indexFinished();
@@ -83,27 +83,27 @@ signals:
 
 protected slots:
   void slotProcessNextBatch();
-  void slotSearchFolderResult( KMFolder*, QValueList<Q_UINT32>,
+  void slotSearchFolderResult( KMFolder*, TQValueList<Q_UINT32>,
                                const KMSearchPattern*, bool );
 
 protected:
   friend class ::KMIndexSearchTarget;
   void setRunning(bool b) { mRunning = b; }
   void setFoundCount(int f) { mFoundCount = f; }
-  void setCurrentFolder(const QString &f) { mLastFolder = f; }
+  void setCurrentFolder(const TQString &f) { mLastFolder = f; }
 
 private:
   int mRemainingFolders;
   bool mRecursive, mRunning, mIdle, mRunByIndex;
-  QGuardedPtr<KMFolder> mRoot;
+  TQGuardedPtr<KMFolder> mRoot;
   KMSearchPattern* mSearchPattern;
-  QValueList<QGuardedPtr<KMFolder> > mFolders, mOpenedFolders;
-  QValueList<QGuardedPtr<KMFolderImap> > mIncompleteFolders;
+  TQValueList<TQGuardedPtr<KMFolder> > mFolders, mOpenedFolders;
+  TQValueList<TQGuardedPtr<KMFolderImap> > mIncompleteFolders;
   SerNumList mSerNums;
-  QString mLastFolder;
+  TQString mLastFolder;
   int mFoundCount;
   int mSearchCount;
-  QTimer *mProcessNextBatchTimer;
+  TQTimer *mProcessNextBatchTimer;
 };
 
 class KMFolderSearch: public FolderStorage
@@ -180,16 +180,16 @@ public:
   virtual const KMMsgBase* getMsgBase(int idx) const;
   virtual KMMsgBase* getMsgBase(int idx);
   virtual int find(const KMMsgBase* msg) const;
-  virtual QString indexLocation() const;
+  virtual TQString indexLocation() const;
   virtual int writeIndex( bool createEmptyIndex = false );
   DwString getDwString(int idx);
   Q_UINT32 serNum(int idx) { return mSerNums[idx]; }
 
 protected:
   virtual FolderJob* doCreateJob(KMMessage *msg, FolderJob::JobType jt,
-                                 KMFolder *folder, QString partSpecifier,
+                                 KMFolder *folder, TQString partSpecifier,
                                  const AttachmentStrategy *as ) const;
-  virtual FolderJob* doCreateJob(QPtrList<KMMessage>& msgList, const QString& sets,
+  virtual FolderJob* doCreateJob(TQPtrList<KMMessage>& msgList, const TQString& sets,
                                  FolderJob::JobType jt, KMFolder *folder) const;
   virtual KMMessage* readMsg(int idx);
   virtual bool readIndex();
@@ -202,15 +202,15 @@ protected:
   virtual void truncateIndex();
 
 private:
-  QValueVector<Q_UINT32> mSerNums;
-  QValueList<QGuardedPtr<KMFolder> > mFolders;
-  QValueStack<Q_UINT32> mUnexaminedMessages;
+  TQValueVector<Q_UINT32> mSerNums;
+  TQValueList<TQGuardedPtr<KMFolder> > mFolders;
+  TQValueStack<Q_UINT32> mUnexaminedMessages;
   FILE *mIdsStream;
   KMSearch *mSearch;
   bool mInvalid, mUnlinked;
   bool mTempOpened;
-  QTimer *mExecuteSearchTimer;
-  QMap<const KMFolder*, unsigned int>mFoldersCurrentlyBeingSearched;
+  TQTimer *mExecuteSearchTimer;
+  TQMap<const KMFolder*, unsigned int>mFoldersCurrentlyBeingSearched;
 };
 #endif /*kmfoldersearch_h*/