Move all remaining member to private classes

src/CMakeLists.txt

@@ -13,6 +13,7 @@ set(simplemailqt_SRC
     mimepart.cpp
     mimepart_p.h
     mimetext.cpp
+    mimetext_p.h
     quotedprintable.cpp
     sender.cpp
     sender_p.h

src/mimeattachment.h

@@ -33,7 +33,7 @@ class SMTP_EXPORT MimeAttachment : public MimeFile
     ~MimeAttachment();
 
 protected:
-    virtual void prepare();
+    virtual void prepare() Q_DECL_OVERRIDE;
 };
 
 #endif // MIMEATTACHMENT_H

src/mimefile.cpp

@@ -23,7 +23,7 @@
 MimeFile::MimeFile(QFile *file)
 {
     Q_D(MimePart);
-    this->file = file;
+    d->contentFile = file;
     d->cType = QStringLiteral("application/octet-stream");
     d->cName = QFileInfo(*file).fileName();
     d->cEncoding = Base64;
@@ -40,17 +40,16 @@ MimeFile::MimeFile(const QByteArray &stream, const QString &fileName)
 
 MimeFile::~MimeFile()
 {
-    delete file;
 }
 
 void MimeFile::prepare()
 {
     Q_D(MimePart);
 
-    if (this->file) {
-        file->open(QIODevice::ReadOnly);
-        d->content = file->readAll();
-        file->close();
+    if (d->contentFile) {
+        d->contentFile->open(QIODevice::ReadOnly);
+        d->content = d->contentFile->readAll();
+        d->contentFile->close();
     }
 
     /* !!! IMPORTANT !!!! */

src/mimefile.h

@@ -31,9 +31,7 @@ class SMTP_EXPORT MimeFile : public MimePart
     ~MimeFile();
 
 protected:
-    QFile* file = nullptr;
-
-    virtual void prepare();
+    virtual void prepare() Q_DECL_OVERRIDE;
 };
 
 #endif // MIMEFILE_H

src/mimehtml.cpp

@@ -17,7 +17,7 @@
 */
 
 #include "mimehtml.h"
-#include "mimepart_p.h"
+#include "mimetext_p.h"
 
 MimeHtml::MimeHtml(const QString &html) : MimeText(html)
 {
@@ -32,12 +32,14 @@ MimeHtml::~MimeHtml()
 
 void MimeHtml::setHtml(const QString &html)
 {
-    this->m_text = html;
+    Q_D(MimePart);
+    static_cast<MimeTextPrivate*>(d)->text = html;
 }
 
 QString MimeHtml::html() const
 {
-    return m_text;
+    Q_D(const MimePart);
+    return static_cast<const MimeTextPrivate*>(d)->text;
 }
 
 void MimeHtml::prepare()

src/mimehtml.h

@@ -29,11 +29,10 @@ class SMTP_EXPORT MimeHtml : public MimeText
     ~MimeHtml();
 
     void setHtml(const QString &html);
-
     QString html() const;
 
 protected:
-    virtual void prepare();
+    virtual void prepare() Q_DECL_OVERRIDE;
 };
 
 #endif // MIMEHTML_H

src/mimeinlinefile.cpp

@@ -18,21 +18,13 @@
 #include "mimeinlinefile.h"
 #include "mimepart_p.h"
 
-MimeInlineFile::MimeInlineFile(QFile *f)
-    : MimeFile(f)
+MimeInlineFile::MimeInlineFile(QFile *f) : MimeFile(f)
 {
+    Q_D(MimePart);
+    d->header.append(QStringLiteral("Content-Disposition: inline\r\n"));
 }
 
 MimeInlineFile::~MimeInlineFile()
 {
 
 }
-
-void MimeInlineFile::prepare()
-{
-    Q_D(MimePart);
-    d->header.append(QStringLiteral("Content-Disposition: inline\r\n"));
-
-    /* !!! IMPORTANT !!! */
-    MimeFile::prepare();
-}

src/mimeinlinefile.h

@@ -27,9 +27,6 @@ class SMTP_EXPORT MimeInlineFile : public MimeFile
 public:
     MimeInlineFile(QFile *f);
     ~MimeInlineFile();
-
-protected:
-    virtual void prepare();
 };
 
 #endif // MIMEINLINEFILE_H

src/mimemessage.cpp

@@ -147,11 +147,11 @@ QString MimeMessage::subject() const
     return d->subject;
 }
 
-QList<MimePart*> MimeMessage::getParts() const
+QList<MimePart*> MimeMessage::parts() const
 {
     Q_D(const MimeMessage);
     if (typeid(*d->content) == typeid(MimeMultiPart)) {
-        return ((MimeMultiPart*) d->content)->getParts();
+        return ((MimeMultiPart*) d->content)->parts();
     } else {
         QList<MimePart*> *res = new QList<MimePart*>();
         res->append(d->content);

src/mimemessage.h

@@ -52,7 +52,7 @@ class SMTP_EXPORT MimeMessage
     EmailAddress sender() const;
     QList<EmailAddress> getRecipients(RecipientType type = To) const;
     QString subject() const;
-    QList<MimePart *> getParts() const;
+    QList<MimePart *> parts() const;
 
     MimePart& getContent();
     void setContent(MimePart *content);

src/mimemultipart.cpp

@@ -50,7 +50,7 @@ void MimeMultiPart::addPart(MimePart *part)
     static_cast<MimeMultiPartPrivate*>(d)->parts.append(part);
 }
 
-QList<MimePart*> MimeMultiPart::getParts() const
+QList<MimePart*> MimeMultiPart::parts() const
 {
     Q_D(const MimePart);
     return static_cast<const MimeMultiPartPrivate*>(d)->parts;

src/mimemultipart.h

@@ -43,11 +43,11 @@ class SMTP_EXPORT MimeMultiPart : public MimePart
     void setMimeType(const MultiPartType type);
     MultiPartType mimeType() const;
 
-    QList<MimePart *> getParts() const;
-
+    QList<MimePart *> parts() const;
     void addPart(MimePart *part);
 
-    virtual void prepare();
+protected:
+    virtual void prepare() Q_DECL_OVERRIDE;
 };
 
 #endif // MIMEMULTIPART_H

src/mimepart_p.h

@@ -22,11 +22,13 @@
 
 #include "mimepart.h"
 
+class QFile;
 class MimePartPrivate : public QSharedData
 {
 public:
     QString header;
     QByteArray content;
+    QFile *contentFile = nullptr;
 
     QString cId;
     QString cName;

src/mimetext.cpp

@@ -16,13 +16,12 @@
   See the LICENSE file for more details.
 */
 
-#include "mimetext.h"
-#include "mimepart_p.h"
+#include "mimetext_p.h"
 
-MimeText::MimeText(const QString &txt)
+MimeText::MimeText(const QString &txt) : MimePart(new MimeTextPrivate)
 {
     Q_D(MimePart);
-    this->m_text = txt;
+    static_cast<MimeTextPrivate*>(d)->text = txt;
     d->cType = QStringLiteral("text/plain");
     d->cCharset = QStringLiteral("utf-8");
     d->cEncoding = _8Bit;
@@ -35,18 +34,20 @@ MimeText::~MimeText()
 
 void MimeText::setText(const QString &text)
 {
-    this->m_text = text;
+    Q_D(MimePart);
+    static_cast<MimeTextPrivate*>(d)->text = text;
 }
 
 QString MimeText::text() const
 {
-    return m_text;
+    Q_D(const MimePart);
+    return static_cast<const MimeTextPrivate*>(d)->text;
 }
 
 void MimeText::prepare()
 {
     Q_D(MimePart);
-    d->content = m_text.toUtf8();
+    d->content = static_cast<MimeTextPrivate*>(d)-> text.toUtf8();
 
     /* !!! IMPORTANT !!! */
     MimePart::prepare();

src/mimetext.h

@@ -32,10 +32,7 @@ class SMTP_EXPORT MimeText : public MimePart
     QString text() const;
 
 protected:
-    QString m_text;
-
-    void prepare();
-
+    virtual void prepare() Q_DECL_OVERRIDE;
 };
 
 #endif // MIMETEXT_H

src/mimetext_p.h

@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2015 Daniel Nicoletti <dantti12@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef MIMETEXT_P_H
+#define MIMETEXT_P_H
+
+#include "mimetext.h"
+#include "mimepart_p.h"
+
+class MimeTextPrivate : public MimePartPrivate
+{
+public:
+    QString text;
+};
+
+#endif // MIMETEXT_P_H
+