1 files changed, 38 insertions, 38 deletions

diff --git a/kmail/messagecomposer.h b/kmail/messagecomposer.h
index 7d908bfac..2284b04a8 100644
--- a/kmail/messagecomposer.h
+++ b/kmail/messagecomposer.h
@@ -34,8 +34,8 @@
 #include "kmmsgpart.h"
 #include "keyresolver.h"
 
-#include <qobject.h>
-#include <qvaluevector.h>
+#include <tqobject.h>
+#include <tqvaluevector.h>
 
 #include <mimelib/mediatyp.h>
 #include <kleo/cryptobackend.h>
@@ -62,7 +62,7 @@ namespace KPIM {
   class Identity;
 }
 
-class MessageComposer : public QObject {
+class MessageComposer : public TQObject {
   Q_OBJECT
   friend class ::MessageComposerJob;
   friend class ::EncryptMessageJob;
@@ -83,11 +83,11 @@ public:
    */
   void applyChanges( bool disableCrypto );
 
-  QString originalBCC() const { return mBcc; }
+  TQString originalBCC() const { return mBcc; }
 
   void setDisableBreaking( bool b ) { mDisableBreaking = b; }
 
-  const QValueVector<KMMessage*> & composedMessageList() const {
+  const TQValueVector<KMMessage*> & composedMessageList() const {
     return mMessageList;
   }
 
@@ -101,8 +101,8 @@ private:
   void adjustCryptFlags();
 
   bool encryptWithChiasmus( const Kleo::CryptoBackend::Protocol * chiasmus,
-                            const QByteArray& body,
-                            QByteArray& resultData );
+                            const TQByteArray& body,
+                            TQByteArray& resultData );
   void chiasmusEncryptAllAttachments();
   void composeChiasmusMessage( KMMessage& theMessage, Kleo::CryptoMessageFormat format );
 
@@ -135,25 +135,25 @@ private:
    * Get message ready for sending or saving.
    * This must be done _before_ signing and/or encrypting it.
    */
-  QByteArray breakLinesAndApplyCodec();
+  TQByteArray breakLinesAndApplyCodec();
 
   /**
    * Create a plain text version of a marked up mail for use as the plain
    * part in a multipart/alternative mail.
    */
-  QCString plainTextFromMarkup( const QString& markupText );
+  TQCString plainTextFromMarkup( const TQString& markupText );
 
   /**
    * Get signature for a message (into mMessage).
    * To build nice S/MIME objects signing and encoding must be separated.
    */
-  void pgpSignedMsg( const QByteArray& cText, Kleo::CryptoMessageFormat f );
+  void pgpSignedMsg( const TQByteArray& cText, Kleo::CryptoMessageFormat f );
   /**
    * Get encrypted message.
    * To build nice S/MIME objects signing and encrypting must be separate.
    */
-  Kpgp::Result pgpEncryptedMsg( QByteArray& rEncryptedBody,
-                                const QByteArray& cText,
+  Kpgp::Result pgpEncryptedMsg( TQByteArray& rEncryptedBody,
+                                const TQByteArray& cText,
                                 const std::vector<GpgME::Key> & encryptionKeys,
 				Kleo::CryptoMessageFormat f );
 
@@ -161,8 +161,8 @@ private:
    * Get signed & encrypted message.
    * To build nice S/MIME objects signing and encrypting must be separate.
    */
-  Kpgp::Result pgpSignedAndEncryptedMsg( QByteArray& rEncryptedBody,
-					 const QByteArray& cText,
+  Kpgp::Result pgpSignedAndEncryptedMsg( TQByteArray& rEncryptedBody,
+					 const TQByteArray& cText,
 					 const std::vector<GpgME::Key> & signingKeys,
 					 const std::vector<GpgME::Key> & encryptionKeys,
 					 Kleo::CryptoMessageFormat f );
@@ -170,8 +170,8 @@ private:
   /**
    * Check for expiry of various certificates.
    */
-  bool checkForEncryptCertificateExpiry( const QString& recipient,
-                                         const QCString& certFingerprint );
+  bool checkForEncryptCertificateExpiry( const TQString& recipient,
+                                         const TQCString& certFingerprint );
 
   /**
    * Build a MIME object (or a flat text resp.) based upon
@@ -184,15 +184,15 @@ private:
    *       This string *is* encoded according to contentTEncClear
    *       and thus should be ready for being sent via SMTP.
    */
-  bool processStructuringInfo( const QString bugURL,
-                               const QString contentDescriptionClear,
-                               const QCString contentTypeClear,
-                               const QCString contentSubtypeClear,
-                               const QCString contentDispClear,
-                               const QCString contentTEncClear,
-                               const QByteArray& bodytext,
-                               const QString contentDescriptionCiph,
-                               const QByteArray& ciphertext,
+  bool processStructuringInfo( const TQString bugURL,
+                               const TQString contentDescriptionClear,
+                               const TQCString contentTypeClear,
+                               const TQCString contentSubtypeClear,
+                               const TQCString contentDispClear,
+                               const TQCString contentTEncClear,
+                               const TQByteArray& bodytext,
+                               const TQString contentDescriptionCiph,
+                               const TQByteArray& ciphertext,
                                KMMessagePart& resultingPart,
 			       bool signing, Kleo::CryptoMessageFormat format );
 
@@ -213,7 +213,7 @@ private:
   void doNextJob();
   void emitDone( bool ok );
 
-  int encryptionPossible( const QStringList & recipients, bool openPGP );
+  int encryptionPossible( const TQStringList & recipients, bool openPGP );
   bool determineWhetherToSign( bool doSignCompletely );
   bool determineWhetherToEncrypt( bool doEncryptCompletely );
   void markAllAttachmentsForSigning( bool sign );
@@ -222,11 +222,11 @@ private:
   KMComposeWin* mComposeWin;
   MessageComposerJob * mCurrentJob;
   KMMessage* mReferenceMessage;
-  QValueVector<KMMessage*> mMessageList;
+  TQValueVector<KMMessage*> mMessageList;
 
   Kleo::KeyResolver * mKeyResolver;
 
-  QCString mSignCertFingerprint;
+  TQCString mSignCertFingerprint;
 
   struct Attachment {
     Attachment( KMMessagePart * p=0, bool s=false, bool e=false )
@@ -235,9 +235,9 @@ private:
     bool sign;
     bool encrypt;
   };
-  QValueVector<Attachment> mAttachments;
+  TQValueVector<Attachment> mAttachments;
 
-  QString mPGPSigningKey, mSMIMESigningKey;
+  TQString mPGPSigningKey, mSMIMESigningKey;
   bool mUseOpportunisticEncryption;
   bool mSignBody, mEncryptBody;
   bool mSigningRequested, mEncryptionRequested;
@@ -245,33 +245,33 @@ private:
   unsigned int mAllowedCryptoMessageFormats;
   bool mDisableCrypto;
   bool mDisableBreaking;
-  QString mBcc;
-  QStringList mTo, mCc, mBccList;
+  TQString mBcc;
+  TQStringList mTo, mCc, mBccList;
   bool mDebugComposerCrypto;
   bool mAutoCharset;
-  QCString mCharset;
+  TQCString mCharset;
   bool mIsRichText;
   uint mIdentityUid;
   bool mRc; // Set this to false, if something fails during the processes
   bool mHoldJobs; // Don't run the next job yet
 
-  QByteArray mText; // textual representation of the message text, encoded
+  TQByteArray mText; // textual representation of the message text, encoded
   unsigned int mLineBreakColumn; // used for line breaking
 
   // These are the variables of the big composeMessage(X,Y,Z) message
   KMMessagePart* mNewBodyPart;
-  QByteArray mSignature;
+  TQByteArray mSignature;
 
-  QByteArray mEncodedBody; // Only needed if signing and/or encrypting
+  TQByteArray mEncodedBody; // Only needed if signing and/or encrypting
   bool mEarlyAddAttachments, mAllAttachmentsAreInBody;
   KMMessagePart mOldBodyPart;
   int mPreviousBoundaryLevel;
 
   // The boundary is saved for later addition into mp/a body
   DwString  mSaveBoundary;
-  QCString mMultipartMixedBoundary;
+  TQCString mMultipartMixedBoundary;
 
-  QValueList<MessageComposerJob*> mJobs;
+  TQValueList<MessageComposerJob*> mJobs;
   bool mEncryptWithChiasmus;
   bool mPerformingSignOperation;
 };