summaryrefslogtreecommitdiffstats
path: root/framework/domain/mailtemplates.cpp
diff options
context:
space:
mode:
authorSandro Knauß <sknauss@kde.org>2016-03-29 14:04:40 +0200
committerSandro Knauß <sknauss@kde.org>2016-03-29 14:04:40 +0200
commit0cb9c3d4632819a681c1a7eae2f985dff92db9f7 (patch)
treee9ae5177f1051b27c1f8e4d3e70656e5cf3d4e70 /framework/domain/mailtemplates.cpp
parent5b253b3a5da0829fa9b8f54f26a7f8f6f450c6e9 (diff)
downloadkube-0cb9c3d4632819a681c1a7eae2f985dff92db9f7.tar.gz
kube-0cb9c3d4632819a681c1a7eae2f985dff92db9f7.zip
Adapt the move from Otp -> MimeTreeParser
Diffstat (limited to 'framework/domain/mailtemplates.cpp')
-rw-r--r--framework/domain/mailtemplates.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/framework/domain/mailtemplates.cpp b/framework/domain/mailtemplates.cpp
index e5ee8533..9b0dab5d 100644
--- a/framework/domain/mailtemplates.cpp
+++ b/framework/domain/mailtemplates.cpp
@@ -37,7 +37,7 @@
37#include "objecttreesource.h" 37#include "objecttreesource.h"
38#include "csshelper.h" 38#include "csshelper.h"
39 39
40#include <MessageViewer/ObjectTreeParser> 40#include <MimeTreeParser/ObjectTreeParser>
41 41
42namespace KMime { 42namespace KMime {
43 namespace Types { 43 namespace Types {
@@ -341,7 +341,7 @@ QString stripSignature(const QString &msg)
341 return res; 341 return res;
342} 342}
343 343
344QString plainMessageText(MessageViewer::ObjectTreeParser &otp, bool aStripSignature) 344QString plainMessageText(MimeTreeParser::ObjectTreeParser &otp, bool aStripSignature)
345{ 345{
346 QString result = otp.plainTextContent(); 346 QString result = otp.plainTextContent();
347 if (result.isEmpty()) { //HTML-only mails 347 if (result.isEmpty()) { //HTML-only mails
@@ -357,7 +357,7 @@ QString plainMessageText(MessageViewer::ObjectTreeParser &otp, bool aStripSignat
357 return result; 357 return result;
358} 358}
359 359
360QString htmlMessageText(MessageViewer::ObjectTreeParser &otp, bool aStripSignature, QString &headElement) 360QString htmlMessageText(MimeTreeParser::ObjectTreeParser &otp, bool aStripSignature, QString &headElement)
361{ 361{
362 QString htmlElement = otp.htmlContent(); 362 QString htmlElement = otp.htmlContent();
363 363
@@ -759,9 +759,9 @@ KMime::Message::Ptr MailTemplates::reply(const KMime::Message::Ptr &origMsg)
759 StringHtmlWriter htmlWriter; 759 StringHtmlWriter htmlWriter;
760 QImage paintDevice; 760 QImage paintDevice;
761 CSSHelper cssHelper(&paintDevice); 761 CSSHelper cssHelper(&paintDevice);
762 MessageViewer::NodeHelper nodeHelper; 762 MimeTreeParser::NodeHelper nodeHelper;
763 ObjectTreeSource source(&htmlWriter, &cssHelper); 763 ObjectTreeSource source(&htmlWriter, &cssHelper);
764 MessageViewer::ObjectTreeParser otp(&source, &nodeHelper); 764 MimeTreeParser::ObjectTreeParser otp(&source, &nodeHelper);
765 otp.setAllowAsync(false); 765 otp.setAllowAsync(false);
766 otp.parseObjectTree(origMsg.data()); 766 otp.parseObjectTree(origMsg.data());
767 767