[Kde-pim] KDE/kdepim/kmail

[Adriaan de Groot]

SVN commit 755658 by adridg:

Similar to pimlibs issues dealt with last week: ambiguity between operator char * and void * when used in strange constructs. Since we just need the const char *, use the method for that.

CCMAIL: kde-pim at kde.org


 M  +4 -4      objecttreeparser.cpp  


--- trunk/KDE/kdepim/kmail/objecttreeparser.cpp #755657:755658
@@ -1251,7 +1251,7 @@
         node->setSignatureState( KMMsgFullySigned );
       } else {
         insertAndParseNewChildNode( *node,
-                                    &*decryptedData,
+                                    decryptedData.constData(),
                                     "encrypted data" );
       }
     } else {
@@ -1315,7 +1315,7 @@
       //mReader->parseMsgHeader( &rfc822message );
     // display the body of the encapsulated message
     insertAndParseNewChildNode( *node,
-                                &*rfc822messageStr,
+                                rfc822messageStr.constData(),
                                 "encapsulated message" );
     if ( mReader )
       htmlWriter()->queue( writeSigstatFooter( messagePart ) );
@@ -1383,7 +1383,7 @@
         if ( bOkDecrypt ) {
           // fixing the missing attachments bug #1090-b
           insertAndParseNewChildNode( *node,
-                                      &*decryptedData,
+                                      decryptedData.constData(),
                                       "encrypted data" );
         } else {
           mRawReplyString += decryptedData;
@@ -1542,7 +1542,7 @@
                                                    cryptPlugWrapper(),
                                                    node->trueFromAddress() ) );
         insertAndParseNewChildNode( *node,
-                                    &*decryptedData,
+                                    decryptedData.constData(),
                                     "encrypted data" );
         if ( mReader )
           htmlWriter()->queue( writeSigstatFooter( messagePart ) );
_______________________________________________
KDE PIM mailing list kde-pim at kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/