1 files changed, 34 insertions, 34 deletions

diff --git a/kmail/popaccount.h b/kmail/popaccount.h
index 718ac3165..840629a47 100644
--- a/kmail/popaccount.h
+++ b/kmail/popaccount.h
@@ -4,11 +4,11 @@
 
 #include "networkaccount.h"
 
-#include <qvaluelist.h>
-#include <qstringlist.h>
-#include <qvaluevector.h>
-#include <qtimer.h>
-#include <qdict.h>
+#include <tqvaluelist.h>
+#include <tqstringlist.h>
+#include <tqvaluevector.h>
+#include <tqtimer.h>
+#include <tqdict.h>
 
 class KMPopHeaders;
 class KMMessage;
@@ -37,7 +37,7 @@ public:
   /** A weak assignment operator */
   virtual void pseudoAssign( const KMAccount * a );
 
-  virtual QString protocol() const;
+  virtual TQString protocol() const;
   virtual unsigned short int defaultPort() const;
 
   /**
@@ -88,7 +88,7 @@ public:
   /**
    * Inherited methods.
    */
-  virtual QString type(void) const;
+  virtual TQString type(void) const;
   virtual void readConfig(KConfig&);
   virtual void writeConfig(KConfig&);
   virtual void processNewMail(bool _interactive);
@@ -98,7 +98,7 @@ public:
 protected:
   enum Stage { Idle, List, Uidl, Head, Retr, Dele, Quit };
   friend class ::AccountManager;
-  PopAccount(AccountManager* owner, const QString& accountName, uint id);
+  PopAccount(AccountManager* owner, const TQString& accountName, uint id);
 
   /**
    * Start a KIO Job to get a list of messages on the pop server
@@ -131,38 +131,38 @@ protected:
 
   KIO::SimpleJob *job;
   //Map of ID's vs. sizes of messages which should be downloaded
-  QMap<QString, int> mMsgsPendingDownload;
+  TQMap<TQString, int> mMsgsPendingDownload;
 
-  QPtrList<KMPopHeaders> headersOnServer;
-  QPtrListIterator<KMPopHeaders> headerIt;
+  TQPtrList<KMPopHeaders> headersOnServer;
+  TQPtrListIterator<KMPopHeaders> headerIt;
   bool headers;
 
-  QMap<QString, bool> mHeaderDeleteUids;
-  QMap<QString, bool> mHeaderDownUids;
-  QMap<QString, bool> mHeaderLaterUids;
-
-  QStringList idsOfMsgs; //used for ids and for count
-  QValueList<int> lensOfMsgs;
-  QMap<QString, QString> mUidForIdMap; // maps message ID (i.e. index on the server) to UID
-  QDict<int> mUidsOfSeenMsgsDict; // set of UIDs of previously seen messages (for fast lookup)
-  QDict<int> mUidsOfNextSeenMsgsDict; // set of UIDs of seen messages (for the next check)
-  QValueVector<int> mTimeOfSeenMsgsVector; // list of times of previously seen messages
-  QMap<QString, int> mTimeOfNextSeenMsgsMap; // map of uid to times of seen messages
-  QDict<int> mSizeOfNextSeenMsgsDict;
-  QStringList idsOfMsgsToDelete;
-  QStringList idsOfForcedDeletes;
+  TQMap<TQString, bool> mHeaderDeleteUids;
+  TQMap<TQString, bool> mHeaderDownUids;
+  TQMap<TQString, bool> mHeaderLaterUids;
+
+  TQStringList idsOfMsgs; //used for ids and for count
+  TQValueList<int> lensOfMsgs;
+  TQMap<TQString, TQString> mUidForIdMap; // maps message ID (i.e. index on the server) to UID
+  TQDict<int> mUidsOfSeenMsgsDict; // set of UIDs of previously seen messages (for fast lookup)
+  TQDict<int> mUidsOfNextSeenMsgsDict; // set of UIDs of seen messages (for the next check)
+  TQValueVector<int> mTimeOfSeenMsgsVector; // list of times of previously seen messages
+  TQMap<TQString, int> mTimeOfNextSeenMsgsMap; // map of uid to times of seen messages
+  TQDict<int> mSizeOfNextSeenMsgsDict;
+  TQStringList idsOfMsgsToDelete;
+  TQStringList idsOfForcedDeletes;
   int indexOfCurrentMsg;
 
-  QValueList<KMMessage*> msgsAwaitingProcessing;
-  QStringList msgIdsAwaitingProcessing;
-  QStringList msgUidsAwaitingProcessing;
+  TQValueList<KMMessage*> msgsAwaitingProcessing;
+  TQStringList msgIdsAwaitingProcessing;
+  TQStringList msgUidsAwaitingProcessing;
 
-  QByteArray curMsgData;
-  QDataStream *curMsgStrm;
+  TQByteArray curMsgData;
+  TQDataStream *curMsgStrm;
 
   int curMsgLen;
   Stage stage;
-  QTimer processMsgsTimer;
+  TQTimer processMsgsTimer;
   int processingDelay;
   int numMsgs, numBytes, numBytesToRead, numBytesRead, numMsgBytesRead;
   bool interactive;
@@ -193,12 +193,12 @@ protected slots:
    * A messages has been retrieved successfully. The next data belongs to the
    * next message.
    */
-  void slotMsgRetrieved(KIO::Job*, const QString &);
+  void slotMsgRetrieved(KIO::Job*, const TQString &);
 
   /**
    * New data has arrived append it to the end of the current message
    */
-  void slotData( KIO::Job*, const QByteArray &);
+  void slotData( KIO::Job*, const TQByteArray &);
 
   /**
    * Finished downloading the current kio job, either due to an error
@@ -226,7 +226,7 @@ protected slots:
   /**
    * Slave error handling
    */
-  void slotSlaveError(KIO::Slave *, int, const QString &);
+  void slotSlaveError(KIO::Slave *, int, const TQString &);
 
   /**
    * If there are more headers to be downloaded then start a new kio job