Delete content device and default MimeText to quotedPrintable

cutelyst · Nov 9, 2015 · 4305ec0 · 4305ec0
1 parent 3ef511e
commit 4305ec0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/mimepart.cpp b/src/mimepart.cpp
@@ -285,6 +285,11 @@ MimePartPrivate *MimePart::d_func()
     return d_ptr.data();
 }
 
+MimePartPrivate::~MimePartPrivate()
+{
+    delete contentDevice;
+}
+
 bool MimePartPrivate::writeRaw(QIODevice *input, QIODevice *out)
 {
     char block[4096];

diff --git a/src/mimepart_p.h b/src/mimepart_p.h
@@ -26,6 +26,7 @@ class QFile;
 class MimePartPrivate : public QSharedData
 {
 public:
+    virtual ~MimePartPrivate();
     bool writeRaw(QIODevice *input, QIODevice *out);
     bool writeBase64(QIODevice *input, QIODevice *out);
     bool writeQuotedPrintable(QIODevice *input, QIODevice *out);

diff --git a/src/mimetext.cpp b/src/mimetext.cpp
@@ -22,8 +22,8 @@ MimeText::MimeText(const QString &txt)
 {
     Q_D(MimePart);
     d->contentType = QByteArrayLiteral("text/plain");
-    d->contentCharset = QByteArrayLiteral("utf-8");
-    d->contentEncoding = _8Bit;
+    d->contentCharset = QByteArrayLiteral("UTF-8");
+    d->contentEncoding = QuotedPrintable;
     setData(txt);
 }