From 98efb475c6dacfcc937a9104c019b9aa8429f1b4 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Mon, 31 Jul 2017 22:45:57 -0600 Subject: ComposerController cleanup --- framework/src/domain/composercontroller.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'framework/src/domain') diff --git a/framework/src/domain/composercontroller.cpp b/framework/src/domain/composercontroller.cpp index bcfc1a9a..2cd29bfc 100644 --- a/framework/src/domain/composercontroller.cpp +++ b/framework/src/domain/composercontroller.cpp @@ -401,6 +401,13 @@ static KMime::Content *createAttachmentPart(const QByteArray &content, const QSt return part; } +static KMime::Content *createBodyPart(const QByteArray &body) { + auto mainMessage = new KMime::Content; + mainMessage->setBody(body); + mainMessage->contentType(true)->setMimeType("text/plain"); + return mainMessage; +} + KMime::Message::Ptr ComposerController::assembleMessage() { auto mail = mExistingMessage; @@ -448,10 +455,7 @@ KMime::Message::Ptr ComposerController::assembleMessage() const auto content = item->data(ContentRole).toByteArray(); mail->addContent(createAttachmentPart(content, filename, isInline, mimeType, name)); } - auto mainMessage = new KMime::Content; - mainMessage->setBody(getBody().toUtf8()); - mainMessage->contentType(true)->setMimeType("text/plain"); - mail->addContent(mainMessage); + mail->addContent(createBodyPart(getBody().toUtf8())); } else { //FIXME same implementation as above for attachments mail->setBody(getBody().toUtf8()); -- cgit v1.2.3