From 1c93fca14d9ce37499bcfdf994c660186a0b6f17 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Thu, 14 Apr 2011 20:16:30 +0000
Subject: Enable kdepim compilation under Qt4 This will likely break Qt3
 compilation temporarily, which is an unintended side effect. A third and
 final kdepim commit will repair Qt3 compilation shortly.

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kmail/messagecomposer.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'kmail/messagecomposer.cpp')

diff --git a/kmail/messagecomposer.cpp b/kmail/messagecomposer.cpp
index 897b03e67..c7c4af6ed 100644
--- a/kmail/messagecomposer.cpp
+++ b/kmail/messagecomposer.cpp
@@ -599,7 +599,7 @@ void MessageComposer::chiasmusEncryptAllAttachments() {
   for ( TQValueVector<Attachment>::iterator it = mAttachments.begin(), end = mAttachments.end() ; it != end ; ++it ) {
     KMMessagePart * part = it->part;
     const TQString filename = part->fileName();
-    if ( filename.endsWith( ".xia", false ) )
+    if ( filename.tqendsWith( ".xia", false ) )
       continue; // already encrypted
     const TQByteArray body = part->bodyDecodedBinary();
     TQByteArray resultData;
@@ -1855,7 +1855,7 @@ void MessageComposer::addBodyAndAttachments( KMMessage* msg,
       (void)msg->asDwMessage(); // Assemble the message. One gets a completely empty message otherwise :/
     }
   } else { // no attachments in the final message
-    if( ourFineBodyPart.originalContentTypeStr() ) {
+    if( !ourFineBodyPart.originalContentTypeStr().isNull() ) {
       msg->headers().ContentType().FromString( ourFineBodyPart.originalContentTypeStr() );
       msg->headers().ContentType().Parse();
       kdDebug(5006) << "MessageComposer::addBodyAndAttachments() : set top level Content-Type from originalContentTypeStr()=" << ourFineBodyPart.originalContentTypeStr() << endl;
@@ -1952,7 +1952,7 @@ bool MessageComposer::processStructuringInfo( const TQString bugURL,
     //kdDebug(5006) << "processStructuringInfo: mainHeader=" << mainHeader << endl;
 
     DwString mainDwStr;
-    mainDwStr = mainHeader + "\n\n";
+    mainDwStr = TQString(mainHeader + "\n\n");
     DwBodyPart mainDwPa( mainDwStr, 0 );
     mainDwPa.Parse();
     KMMessage::bodyPart( &mainDwPa, &resultingPart );
@@ -2038,7 +2038,7 @@ bool MessageComposer::processStructuringInfo( const TQString bugURL,
                           i18n( "<qt><p>Error: The backend did not return "
                                 "any encoded data.</p>"
                                 "<p>Please report this bug:<br>%2</p></qt>" )
-                          .arg( bugURL ) );
+                          .tqarg( bugURL ) );
       bOk = false;
     }
     resultingPart.setBodyEncodedBinary( resultingBody );
-- 
cgit v1.2.1