Rename old tq methods that no longer need a unique name

1 files changed, 35 insertions, 35 deletions

diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp
index 1e666701d..ecf1e763a 100644
--- a/kmail/kmmessage.cpp
+++ b/kmail/kmmessage.cpp
@@ -110,7 +110,7 @@ KMMessage::KMMessage(KMMsgInfo& msgInfo): KMMsgBase()
   // now overwrite a few from the msgInfo
   mMsgSize = msgInfo.msgSize();
   mFolderOffset = msgInfo.folderOffset();
-  mtqStatus = msgInfo.status();
+  mStatus = msgInfo.status();
   mEncryptionState = msgInfo.encryptionState();
   mSignatureState = msgInfo.signatureState();
   mMDNSentState = msgInfo.mdnSentState();
@@ -145,7 +145,7 @@ void KMMessage::init( DwMessage* aMsg )
   mMsgSize = 0;
   mMsgLength = 0;
   mFolderOffset = 0;
-  mtqStatus  = KMMsgStatusNew;
+  mStatus  = KMMsgStatusNew;
   mEncryptionState = KMMsgEncryptionStateUnknown;
   mSignatureState = KMMsgSignatureStateUnknown;
   mMDNSentState = KMMsgMDNStateUnknown;
@@ -173,7 +173,7 @@ void KMMessage::assign( const KMMessage& other )
   mMsgSize = other.mMsgSize;
   mMsgLength = other.mMsgLength;
   mFolderOffset = other.mFolderOffset;
-  mtqStatus  = other.mtqStatus;
+  mStatus  = other.mStatus;
   mEncryptionState = other.mEncryptionState;
   mSignatureState = other.mSignatureState;
   mMDNSentState = other.mMDNSentState;
@@ -384,7 +384,7 @@ TQString KMMessage::headerAsString() const
   header.Assemble();
   if ( header.AsString().empty() )
     return TQString();
-  return TQString::tqfromLatin1( header.AsString().c_str() );
+  return TQString::fromLatin1( header.AsString().c_str() );
 }
 
 
@@ -394,23 +394,23 @@ DwMediaType& KMMessage::dwContentType()
   return mMsg->Headers().ContentType();
 }
 
-void KMMessage::fromByteArray( const TQByteArray & ba, bool setqStatus ) {
-  return fromDwString( DwString( ba.data(), ba.size() ), setqStatus );
+void KMMessage::fromByteArray( const TQByteArray & ba, bool seStatus ) {
+  return fromDwString( DwString( ba.data(), ba.size() ), seStatus );
 }
 
-void KMMessage::fromString( const TQCString & str, bool aSetqStatus ) {
-  return fromDwString( KMail::Util::dwString( str ), aSetqStatus );
+void KMMessage::fromString( const TQCString & str, bool aSeStatus ) {
+  return fromDwString( KMail::Util::dwString( str ), aSeStatus );
 }
 
-void KMMessage::fromDwString(const DwString& str, bool aSetqStatus)
+void KMMessage::fromDwString(const DwString& str, bool aSeStatus)
 {
   delete mMsg;
   mMsg = new DwMessage;
   mMsg->FromString( str );
   mMsg->Parse();
 
-  if (aSetqStatus) {
-    setqStatus(headerField("Status").latin1(), headerField("X-Status").latin1());
+  if (aSeStatus) {
+    seStatus(headerField("Status").latin1(), headerField("X-Status").latin1());
     setEncryptionStateChar( headerField("X-KMail-EncryptionState").at(0) );
     setSignatureStateChar(  headerField("X-KMail-SignatureState").at(0) );
     setMDNSentState( static_cast<KMMsgMDNSentState>( headerField("X-KMail-MDN-Sent").tqat(0).latin1() ) );
@@ -1081,7 +1081,7 @@ KMMessage* KMMessage::createReply( KMail::ReplyStrategy replyStrategy,
        parser.process( this );
      }
   }
-  // setqStatus(KMMsgStatusReplied);
+  // seStatus(KMMsgStatusReplied);
   msg->link(this, KMMsgStatusReplied);
 
   if ( parent() && parent()->putRepliesInSameFolder() )
@@ -1216,7 +1216,7 @@ void KMMessage::sanitizeHeaders( const TQStringList& whiteList )
    {
      nextField = field->Next();
      if ( field->FieldNameStr().find( "ontent" ) == DwString::npos
-             && !whiteList.contains( TQString::tqfromLatin1( field->FieldNameStr().c_str() ) ) )
+             && !whiteList.contains( TQString::fromLatin1( field->FieldNameStr().c_str() ) ) )
        header.RemoveField(field);
      field = nextField;
    }
@@ -3358,7 +3358,7 @@ void KMMessage::addBodyPart(const KMMessagePart* aPart)
 //-----------------------------------------------------------------------------
 TQString KMMessage::generateMessageId( const TQString& addr )
 {
-  TQDateTime datetime = TQDateTime::tqcurrentDateTime();
+  TQDateTime datetime = TQDateTime::currentDateTime();
   TQString msgIdStr;
 
   msgIdStr = '<' + datetime.toString( "yyyyMMddhhmm.sszzz" );
@@ -3457,7 +3457,7 @@ TQCString KMMessage::html2source( const TQCString & src )
 TQString KMMessage::encodeMailtoUrl( const TQString& str )
 {
   TQString result;
-  result = TQString::tqfromLatin1( KMMsgBase::encodeRFC2047String( str,
+  result = TQString::fromLatin1( KMMsgBase::encodeRFC2047String( str,
                                                                 "utf-8" ) );
   result = KURL::encode_string( result );
   return result;
@@ -4145,11 +4145,11 @@ void KMMessage::setCharset( const TQCString &charset, DwEntity *entity )
 
 
 //-----------------------------------------------------------------------------
-void KMMessage::setqStatus(const KMMsgtqStatus atqStatus, int idx)
+void KMMessage::seStatus(const KMMsgStatus aStatus, int idx)
 {
-  if (mtqStatus == atqStatus)
+  if (mStatus == aStatus)
     return;
-  KMMsgBase::setqStatus(atqStatus, idx);
+  KMMsgBase::seStatus(aStatus, idx);
 }
 
 void KMMessage::setEncryptionState(const KMMsgEncryptionState s, int idx)
@@ -4182,11 +4182,11 @@ void KMMessage::setMDNSentState( KMMsgMDNSentState status, int idx )
 }
 
 //-----------------------------------------------------------------------------
-void KMMessage::link( const KMMessage *aMsg, KMMsgtqStatus atqStatus )
+void KMMessage::link( const KMMessage *aMsg, KMMsgStatus aStatus )
 {
-  Q_ASSERT( atqStatus == KMMsgStatusReplied
-      || atqStatus == KMMsgStatusForwarded
-      || atqStatus == KMMsgStatusDeleted );
+  Q_ASSERT( aStatus == KMMsgStatusReplied
+      || aStatus == KMMsgStatusForwarded
+      || aStatus == KMMsgStatusDeleted );
 
   TQString message = headerField( "X-KMail-Link-Message" );
   if ( !message.isEmpty() )
@@ -4196,11 +4196,11 @@ void KMMessage::link( const KMMessage *aMsg, KMMsgtqStatus atqStatus )
     type += ',';
 
   message += TQString::number( aMsg->getMsgSerNum() );
-  if ( atqStatus == KMMsgStatusReplied )
+  if ( aStatus == KMMsgStatusReplied )
     type += "reply";
-  else if ( atqStatus == KMMsgStatusForwarded )
+  else if ( aStatus == KMMsgStatusForwarded )
     type += "forward";
-  else if ( atqStatus == KMMsgStatusDeleted )
+  else if ( aStatus == KMMsgStatusDeleted )
     type += "deleted";
 
   setHeaderField( "X-KMail-Link-Message", message );
@@ -4208,10 +4208,10 @@ void KMMessage::link( const KMMessage *aMsg, KMMsgtqStatus atqStatus )
 }
 
 //-----------------------------------------------------------------------------
-void KMMessage::getLink(int n, ulong *retMsgSerNum, KMMsgtqStatus *retqStatus) const
+void KMMessage::getLink(int n, ulong *retMsgSerNum, KMMsgStatus *reStatus) const
 {
   *retMsgSerNum = 0;
-  *retqStatus = KMMsgStatusUnknown;
+  *reStatus = KMMsgStatusUnknown;
 
   TQString message = headerField("X-KMail-Link-Message");
   TQString type = headerField("X-KMail-Link-Type");
@@ -4221,11 +4221,11 @@ void KMMessage::getLink(int n, ulong *retMsgSerNum, KMMsgtqStatus *retqStatus) c
   if ( !message.isEmpty() && !type.isEmpty() ) {
     *retMsgSerNum = message.toULong();
     if ( type == "reply" )
-      *retqStatus = KMMsgStatusReplied;
+      *reStatus = KMMsgStatusReplied;
     else if ( type == "forward" )
-      *retqStatus = KMMsgStatusForwarded;
+      *reStatus = KMMsgStatusForwarded;
     else if ( type == "deleted" )
-      *retqStatus = KMMsgStatusDeleted;
+      *reStatus = KMMsgStatusDeleted;
   }
 }
 
@@ -4347,11 +4347,11 @@ void KMMessage::updateInvitationState()
     cntType += '/';
     cntType += mMsg->Headers().ContentType().SubtypeStr().c_str();
     if ( cntType.lower() == "text/calendar" ) {
-      setqStatus( KMMsgStatusHasInvitation );
+      seStatus( KMMsgStatusHasInvitation );
       return;
     }
   }
-  setqStatus( KMMsgStatusHasNoInvitation );
+  seStatus( KMMsgStatusHasNoInvitation );
   return;
 }
 
@@ -4364,7 +4364,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part )
   if ( !part )
   {
     // kdDebug(5006) << "updateAttachmentState - no part!" << endl;
-    setqStatus( KMMsgStatusHasNoAttach );
+    seStatus( KMMsgStatusHasNoAttach );
     return;
   }
 
@@ -4404,7 +4404,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part )
            part->Headers().ContentType().Subtype() != DwMime::kSubtypePgpSignature &&
            part->Headers().ContentType().Subtype() != DwMime::kSubtypePkcs7Signature ) )
     {
-      setqStatus( KMMsgStatusHasAttach );
+      seStatus( KMMsgStatusHasAttach );
     }
     return;
   }
@@ -4429,7 +4429,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part )
   if ( part->Next() )
     updateAttachmentState( part->Next() );
   else if ( attachmentState() == KMMsgAttachmentUnknown )
-    setqStatus( KMMsgStatusHasNoAttach );
+    seStatus( KMMsgStatusHasNoAttach );
 }
 
 void KMMessage::setBodyFromUnicode( const TQString &str, DwEntity *entity )