Commit 99641dd8 authored by Laurent Montel's avatar Laurent Montel 😁

Fix function name

parent a8c22291
...@@ -1220,18 +1220,11 @@ bool ObjectTreeParser::processTextHtmlSubtype( KMime::Content * curNode, Process ...@@ -1220,18 +1220,11 @@ bool ObjectTreeParser::processTextHtmlSubtype( KMime::Content * curNode, Process
if ( !htmlWriter() ) if ( !htmlWriter() )
return true; return true;
QString bodyText;
if ( mSource->htmlMail() ) {
bodyText = bodyHTML;
}/* else {
bodyText = QLatin1String(StringUtil::convertAngleBracketsToHtml( partBody ));
}*/
if ( curNode->topLevel()->textContent() == curNode || attachmentStrategy()->defaultDisplay( curNode ) == AttachmentStrategy::Inline || if ( curNode->topLevel()->textContent() == curNode || attachmentStrategy()->defaultDisplay( curNode ) == AttachmentStrategy::Inline ||
showOnlyOneMimePart() ) showOnlyOneMimePart() )
{ {
if ( mSource->htmlMail() ) { if ( mSource->htmlMail() ) {
QString bodyText = bodyHTML;
HTMLQuoteColorer colorer; HTMLQuoteColorer colorer;
colorer.setEnableHtmlQuoteColorer(GlobalSettings::self()->htmlQuoteColorerEnabled()); colorer.setEnableHtmlQuoteColorer(GlobalSettings::self()->htmlQuoteColorerEnabled());
QString extraHead; QString extraHead;
...@@ -1472,7 +1465,7 @@ bool ObjectTreeParser::processTextPlainSubtype( KMime::Content *curNode, Process ...@@ -1472,7 +1465,7 @@ bool ObjectTreeParser::processTextPlainSubtype( KMime::Content *curNode, Process
return true; return true;
} }
void ObjectTreeParser::stdChildHandling( KMime::Content * child ) { void ObjectTreeParser::standardChildHandling( KMime::Content * child ) {
if ( !child ) if ( !child )
return; return;
...@@ -1511,7 +1504,7 @@ bool ObjectTreeParser::processMultiPartMixedSubtype( KMime::Content * node, Proc ...@@ -1511,7 +1504,7 @@ bool ObjectTreeParser::processMultiPartMixedSubtype( KMime::Content * node, Proc
return false; return false;
// normal treatment of the parts in the mp/mixed container // normal treatment of the parts in the mp/mixed container
stdChildHandling( child ); standardChildHandling( child );
return true; return true;
} }
...@@ -1545,10 +1538,10 @@ bool ObjectTreeParser::processMultiPartAlternativeSubtype( KMime::Content * node ...@@ -1545,10 +1538,10 @@ bool ObjectTreeParser::processMultiPartAlternativeSubtype( KMime::Content * node
// the plainTextContent and the htmlContent // the plainTextContent and the htmlContent
if ( !htmlWriter() ) { if ( !htmlWriter() ) {
if ( dataPlain ) { if ( dataPlain ) {
stdChildHandling( dataPlain ); standardChildHandling( dataPlain );
} }
if ( dataHtml ) { if ( dataHtml ) {
stdChildHandling( dataHtml ); standardChildHandling( dataHtml );
} }
return true; return true;
} }
...@@ -1557,19 +1550,19 @@ bool ObjectTreeParser::processMultiPartAlternativeSubtype( KMime::Content * node ...@@ -1557,19 +1550,19 @@ bool ObjectTreeParser::processMultiPartAlternativeSubtype( KMime::Content * node
(dataHtml && dataPlain && dataPlain->body().isEmpty()) ) { (dataHtml && dataPlain && dataPlain->body().isEmpty()) ) {
if ( dataPlain ) if ( dataPlain )
mNodeHelper->setNodeProcessed( dataPlain, false); mNodeHelper->setNodeProcessed( dataPlain, false);
stdChildHandling( dataHtml ); standardChildHandling( dataHtml );
mSource->setHtmlMode( Util::MultipartHtml ); mSource->setHtmlMode( Util::MultipartHtml );
return true; return true;
} }
if ( !htmlWriter() || (!mSource->htmlMail() && dataPlain) ) { if ( !htmlWriter() || (!mSource->htmlMail() && dataPlain) ) {
mNodeHelper->setNodeProcessed( dataHtml, false ); mNodeHelper->setNodeProcessed( dataHtml, false );
stdChildHandling( dataPlain ); standardChildHandling( dataPlain );
mSource->setHtmlMode( Util::MultipartPlain ); mSource->setHtmlMode( Util::MultipartPlain );
return true; return true;
} }
stdChildHandling( child ); standardChildHandling( child );
return true; return true;
} }
...@@ -1588,7 +1581,7 @@ bool ObjectTreeParser::processMultiPartSignedSubtype( KMime::Content * node, Pro ...@@ -1588,7 +1581,7 @@ bool ObjectTreeParser::processMultiPartSignedSubtype( KMime::Content * node, Pro
kDebug() << "mulitpart/signed must have exactly two child parts!" << endl kDebug() << "mulitpart/signed must have exactly two child parts!" << endl
<< "processing as multipart/mixed"; << "processing as multipart/mixed";
if ( child ) if ( child )
stdChildHandling( child ); standardChildHandling( child );
return child; return child;
} }
...@@ -1601,7 +1594,7 @@ bool ObjectTreeParser::processMultiPartSignedSubtype( KMime::Content * node, Pro ...@@ -1601,7 +1594,7 @@ bool ObjectTreeParser::processMultiPartSignedSubtype( KMime::Content * node, Pro
mNodeHelper->setNodeProcessed( signature, true); mNodeHelper->setNodeProcessed( signature, true);
if ( !includeSignatures() ) { if ( !includeSignatures() ) {
stdChildHandling( signedData ); standardChildHandling( signedData );
return true; return true;
} }
...@@ -1623,7 +1616,7 @@ bool ObjectTreeParser::processMultiPartSignedSubtype( KMime::Content * node, Pro ...@@ -1623,7 +1616,7 @@ bool ObjectTreeParser::processMultiPartSignedSubtype( KMime::Content * node, Pro
if ( !protocol ) { if ( !protocol ) {
mNodeHelper->setNodeProcessed( signature, true ); mNodeHelper->setNodeProcessed( signature, true );
stdChildHandling( signedData ); standardChildHandling( signedData );
return true; return true;
} }
...@@ -1672,7 +1665,7 @@ bool ObjectTreeParser::processMultiPartEncryptedSubtype( KMime::Content * node, ...@@ -1672,7 +1665,7 @@ bool ObjectTreeParser::processMultiPartEncryptedSubtype( KMime::Content * node,
*/ */
if ( !data ) { if ( !data ) {
stdChildHandling( child ); standardChildHandling( child );
return true; return true;
} }
...@@ -1680,7 +1673,7 @@ bool ObjectTreeParser::processMultiPartEncryptedSubtype( KMime::Content * node, ...@@ -1680,7 +1673,7 @@ bool ObjectTreeParser::processMultiPartEncryptedSubtype( KMime::Content * node,
KMime::Content * dataChild = MessageCore::NodeHelper::firstChild( data ); KMime::Content * dataChild = MessageCore::NodeHelper::firstChild( data );
if ( dataChild ) { if ( dataChild ) {
stdChildHandling( dataChild ); standardChildHandling( dataChild );
return true; return true;
} }
...@@ -3235,7 +3228,7 @@ QString ObjectTreeParser::quotedHTML( const QString& s, bool decorate ) ...@@ -3235,7 +3228,7 @@ QString ObjectTreeParser::quotedHTML( const QString& s, bool decorate )
unsigned int pos, beg; unsigned int pos, beg;
// skip leading empty lines // skip leading empty lines
for ( pos = 0; pos < length && s[pos] <= QLatin1Char(' '); pos++ ) for ( pos = 0; pos < length && s[pos] <= QLatin1Char(' '); ++pos )
; ;
while (pos > 0 && (s[pos-1] == QLatin1Char(' ') || s[pos-1] == QLatin1Char('\t'))) pos--; while (pos > 0 && (s[pos-1] == QLatin1Char(' ') || s[pos-1] == QLatin1Char('\t'))) pos--;
beg = pos; beg = pos;
......
...@@ -422,7 +422,7 @@ private: ...@@ -422,7 +422,7 @@ private:
/** Standard children handling a.k.a. multipart/mixed (w/o /** Standard children handling a.k.a. multipart/mixed (w/o
kroupware hacks) */ kroupware hacks) */
void stdChildHandling( KMime::Content * child ); void standardChildHandling( KMime::Content * child );
void defaultHandling( KMime::Content * node, ProcessResult & result ); void defaultHandling( KMime::Content * node, ProcessResult & result );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment