Adjust again some smaller code details

- Wrap some overly long lines - Honor coding conventions better here and there - Use nullptr more instead of '0' - Switch remaining cases of Q_DECL_OVERRIDE and Q_NULLPTR to standard keywords. - Removed some unnecessary #includes - etc. Change-Id: Ia9a01807da88298a6c1c1bbb22c854743ed19429 Reviewed-by: Pekka Vuorela <pvuorela@iki.fi> Reviewed-by: <matti.viljanen@kapsi.fi> Reviewed-by: Damien Caliste <dcaliste@free.fr>
author: Pekka Vuorela <pvuorela@iki.fi> 2025-12-05 11:18:23 +0200
committer: Pekka Vuorela <pvuorela@iki.fi> 2025-12-05 12:37:19 +0200
commit: d3cc588c0e8290ad22e7cc07e50702524c95c967 (patch)
tree: 8c92030658a07c6b2a1bdfc3b8cbed51259fb2cd
parent: 8313f48cfdaa543ec581229404130b3c2be5a616 (diff)
77 files changed, 425 insertions, 255 deletions
diff --git a/examples/qtmail/accountsettings.h b/examples/qtmail/accountsettings.h
index 4f2ec914..d65fd0ec 100644
--- a/examples/qtmail/accountsettings.h
+++ b/examples/qtmail/accountsettings.h
@@ -57,7 +57,7 @@ class AccountSettings : public QDialog
 {
     Q_OBJECT
 public:
-    AccountSettings(QWidget *parent = Q_NULLPTR, Qt::WindowFlags flags = Qt::Widget);
+    AccountSettings(QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::Widget);
 
 signals:
     void deleteAccount(const QMailAccountId &id);
diff --git a/examples/qtmail/attachmentlistwidget.cpp b/examples/qtmail/attachmentlistwidget.cpp
index 9566f8db..afe1cc0e 100644
--- a/examples/qtmail/attachmentlistwidget.cpp
+++ b/examples/qtmail/attachmentlistwidget.cpp
@@ -148,7 +148,7 @@ class AttachmentListDelegate : public QItemDelegate
 {
     Q_OBJECT
 public:
-    AttachmentListDelegate(AttachmentListWidget* parent = Q_NULLPTR);
+    AttachmentListDelegate(AttachmentListWidget* parent = nullptr);
     void paint ( QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const;
     bool isOverRemoveLink(const QRect& parentRect, const QPoint& pos) const;
 
@@ -209,7 +209,7 @@ class AttachmentListView : public QTreeView
     Q_OBJECT
 
 public:
-    AttachmentListView(QWidget* parent = Q_NULLPTR);
+    AttachmentListView(QWidget* parent = nullptr);
 
 signals:
     void removeAttachmentAtIndex(int index);
diff --git a/examples/qtmail/attachmentlistwidget.h b/examples/qtmail/attachmentlistwidget.h
index 94ebff20..1b29915c 100644
--- a/examples/qtmail/attachmentlistwidget.h
+++ b/examples/qtmail/attachmentlistwidget.h
@@ -55,7 +55,7 @@ class AttachmentListWidget : public QWidget
     Q_OBJECT
 
 public:
-    AttachmentListWidget(QWidget* parent = Q_NULLPTR);
+    AttachmentListWidget(QWidget* parent = nullptr);
     QStringList attachments() const;
     QString attachmentAt(int index) const;
     int count() const;
diff --git a/examples/qtmail/browserwidget.cpp b/examples/qtmail/browserwidget.cpp
index e9a7e2cf..64a0af8e 100644
--- a/examples/qtmail/browserwidget.cpp
+++ b/examples/qtmail/browserwidget.cpp
@@ -141,7 +141,7 @@ public:
     void clear();
 
 protected:
-    QNetworkReply *createRequest(Operation op, const QNetworkRequest &req, QIODevice *outgoingData = Q_NULLPTR);
+    QNetworkReply *createRequest(Operation op, const QNetworkRequest &req, QIODevice *outgoingData = nullptr);
 
 private:
     QMap<QUrl, QPair<QByteArray, QString> > m_data;
diff --git a/examples/qtmail/browserwidget.h b/examples/qtmail/browserwidget.h
index 0db44fc9..65ce943f 100644
--- a/examples/qtmail/browserwidget.h
+++ b/examples/qtmail/browserwidget.h
@@ -56,7 +56,7 @@ class BrowserWidget : public QWidget
     Q_OBJECT
 
 public:
-    BrowserWidget(QWidget *parent = Q_NULLPTR);
+    BrowserWidget(QWidget *parent = nullptr);
 
 #ifndef USE_WEBKIT
     void setResource(const QUrl& name, QVariant var);
diff --git a/examples/qtmail/detailspage.cpp b/examples/qtmail/detailspage.cpp
index 8b5aa190..e7faa436 100644
--- a/examples/qtmail/detailspage.cpp
+++ b/examples/qtmail/detailspage.cpp
@@ -60,7 +60,7 @@ class FromAddressComboBox : public QComboBox
 {
     Q_OBJECT
 public:
-    FromAddressComboBox(QWidget *parent = Q_NULLPTR);
+    FromAddressComboBox(QWidget *parent = nullptr);
     ~FromAddressComboBox();
 
 signals:
diff --git a/examples/qtmail/detailspage_p.h b/examples/qtmail/detailspage_p.h
index 8f23ec36..6e82ff0d 100644
--- a/examples/qtmail/detailspage_p.h
+++ b/examples/qtmail/detailspage_p.h
@@ -70,7 +70,7 @@ class DetailsPage : public QWidget
 
 public:
 
-    DetailsPage( QWidget *parent, const char *name = Q_NULLPTR );
+    DetailsPage( QWidget *parent, const char *name = nullptr );
 
     void setDefaultAccount( const QMailAccountId& defaultId );
 
diff --git a/examples/qtmail/editaccount.h b/examples/qtmail/editaccount.h
index ed547d54..ca6bb75d 100644
--- a/examples/qtmail/editaccount.h
+++ b/examples/qtmail/editaccount.h
@@ -56,7 +56,7 @@ class EditAccount : public QDialog
     Q_OBJECT
 
 public:
-    EditAccount(QWidget* parent = Q_NULLPTR, const char* name = Q_NULLPTR, Qt::WindowFlags fl = Qt::Widget);
+    EditAccount(QWidget* parent = nullptr, const char* name = nullptr, Qt::WindowFlags fl = Qt::Widget);
 
     void setAccount(QMailAccount *in, QMailAccountConfiguration* config);
 
diff --git a/examples/qtmail/emailclient.cpp b/examples/qtmail/emailclient.cpp
index a0ca80a9..8e6796df 100644
--- a/examples/qtmail/emailclient.cpp
+++ b/examples/qtmail/emailclient.cpp
@@ -83,7 +83,7 @@ class ActivityIcon : public QLabel
     Q_OBJECT
 
 public:
-    ActivityIcon(QWidget* parent = Q_NULLPTR);
+    ActivityIcon(QWidget* parent = nullptr);
 
 private slots:
     void itemChanged(StatusItem* item);
diff --git a/examples/qtmail/emailclient.h b/examples/qtmail/emailclient.h
index b2f4fe11..ffb0bea3 100644
--- a/examples/qtmail/emailclient.h
+++ b/examples/qtmail/emailclient.h
@@ -74,7 +74,7 @@ class MessageUiBase : public QMainWindow
     Q_OBJECT
 
 public:
-    MessageUiBase(QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::Widget);
+    MessageUiBase(QWidget *parent = nullptr, Qt::WindowFlags f = Qt::Widget);
     virtual ~MessageUiBase() {}
 
 signals:
@@ -143,7 +143,7 @@ class EmailClient : public MessageUiBase
     Q_OBJECT
 
 public:
-    EmailClient(QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::Widget);
+    EmailClient(QWidget *parent = nullptr, Qt::WindowFlags f = Qt::Widget);
     ~EmailClient();
 
     bool cleanExit(bool force);
@@ -446,7 +446,7 @@ private:
 class NotificationTray : public QSystemTrayIcon {
     Q_OBJECT
 public:
-    NotificationTray(QObject *parent = Q_NULLPTR);
+    NotificationTray(QObject *parent = nullptr);
 
 private slots:
     void messagesAdded(const QMailMessageIdList &ids);
diff --git a/examples/qtmail/emailcomposer.cpp b/examples/qtmail/emailcomposer.cpp
index be8b471c..e6fc38d1 100644
--- a/examples/qtmail/emailcomposer.cpp
+++ b/examples/qtmail/emailcomposer.cpp
@@ -101,7 +101,7 @@ class RecipientWidget : public QWidget
     Q_OBJECT
 
 public:
-    RecipientWidget(QWidget* parent = Q_NULLPTR);
+    RecipientWidget(QWidget* parent = nullptr);
 
     bool isRemoveEnabled() const;
     void setRemoveEnabled(bool val);
@@ -229,7 +229,7 @@ class RecipientListWidget : public QWidget
     Q_OBJECT
 
 public:
-    RecipientListWidget(QWidget* parent = Q_NULLPTR);
+    RecipientListWidget(QWidget* parent = nullptr);
     QStringList recipients(RecipientType t) const;
     QStringList recipients() const;
     void setRecipients(RecipientType, const QStringList& list);
@@ -487,7 +487,7 @@ class BodyTextEdit : public QTextEdit
     Q_OBJECT
 
 public:
-    BodyTextEdit(EmailComposerInterface* composer, QWidget* parent = Q_NULLPTR);
+    BodyTextEdit(EmailComposerInterface* composer, QWidget* parent = nullptr);
 
     bool isComposing();
     bool isEmpty();
diff --git a/examples/qtmail/emailcomposer.h b/examples/qtmail/emailcomposer.h
index f8ea28e3..21b17c3c 100644
--- a/examples/qtmail/emailcomposer.h
+++ b/examples/qtmail/emailcomposer.h
@@ -57,7 +57,7 @@ class EmailComposerInterface : public QMailComposerInterface
     Q_OBJECT
 
 public:
-    EmailComposerInterface( QWidget *parent = Q_NULLPTR );
+    EmailComposerInterface( QWidget *parent = nullptr );
     virtual ~EmailComposerInterface();
 
     bool isEmpty() const;
diff --git a/examples/qtmail/genericviewer.h b/examples/qtmail/genericviewer.h
index e88d031f..318e721e 100644
--- a/examples/qtmail/genericviewer.h
+++ b/examples/qtmail/genericviewer.h
@@ -56,7 +56,7 @@ class GenericViewer : public QMailViewerInterface
     Q_OBJECT
 
 public:
-    GenericViewer(QWidget* parent = Q_NULLPTR);
+    GenericViewer(QWidget* parent = nullptr);
 
     QWidget* widget() const;
 
diff --git a/examples/qtmail/messagelistview.cpp b/examples/qtmail/messagelistview.cpp
index 2f1f1fed..9380cf46 100644
--- a/examples/qtmail/messagelistview.cpp
+++ b/examples/qtmail/messagelistview.cpp
@@ -64,7 +64,7 @@ class QuickSearchWidget : public QWidget
 {
     Q_OBJECT
 public:
-    QuickSearchWidget(QWidget* parent = Q_NULLPTR);
+    QuickSearchWidget(QWidget* parent = nullptr);
 
     QMailMessageKey searchKey() const;
 
diff --git a/examples/qtmail/messagelistview.h b/examples/qtmail/messagelistview.h
index fa5540f6..aebed649 100644
--- a/examples/qtmail/messagelistview.h
+++ b/examples/qtmail/messagelistview.h
@@ -63,7 +63,7 @@ class MessageListView : public QWidget
     Q_OBJECT
 
 public:
-    MessageListView(QWidget* parent = Q_NULLPTR);
+    MessageListView(QWidget* parent = nullptr);
     virtual ~MessageListView();
 
     QMailMessageKey key() const;
diff --git a/examples/qtmail/qmailcomposer.h b/examples/qtmail/qmailcomposer.h
index 7e9ce22c..f30f82a3 100644
--- a/examples/qtmail/qmailcomposer.h
+++ b/examples/qtmail/qmailcomposer.h
@@ -54,7 +54,7 @@ class QMailComposerInterface : public QWidget
     Q_OBJECT
 
 public:
-    QMailComposerInterface( QWidget *parent = Q_NULLPTR );
+    QMailComposerInterface( QWidget *parent = nullptr );
 
     virtual QString key() const = 0;
     virtual QList<QMailMessage::MessageType> messageTypes() const = 0;
@@ -113,7 +113,7 @@ public:
     static QIcon displayIcon(const QString &key, QMailMessage::MessageType type);
 
     // Use the interface identified by the supplied key to create a composer
-    static QMailComposerInterface *create( const QString& key, QWidget *parent = Q_NULLPTR );
+    static QMailComposerInterface *create( const QString& key, QWidget *parent = nullptr );
 };
 
 #endif
diff --git a/examples/qtmail/qmailviewer.h b/examples/qtmail/qmailviewer.h
index 46b6927e..b2f662dd 100644
--- a/examples/qtmail/qmailviewer.h
+++ b/examples/qtmail/qmailviewer.h
@@ -70,7 +70,7 @@ public:
     static QString defaultKey(QMailMessage::ContentType type = QMailMessage::UnknownContent, PresentationType pres = AnyPresentation);
 
     // Use the interface identified by the supplied ID to create a viewer
-    static QMailViewerInterface *create(const QString &key, QWidget *parent = Q_NULLPTR);
+    static QMailViewerInterface *create(const QString &key, QWidget *parent = nullptr);
 };
 
 // The interface for objects able to view mail messages
@@ -79,7 +79,7 @@ class QMailViewerInterface : public QObject
     Q_OBJECT
 
 public:
-    QMailViewerInterface( QWidget* parent = Q_NULLPTR );
+    QMailViewerInterface( QWidget* parent = nullptr );
     virtual ~QMailViewerInterface();
 
     virtual QWidget* widget() const = 0;
diff --git a/examples/qtmail/readmail.cpp b/examples/qtmail/readmail.cpp
index cd025042..a5ddce11 100644
--- a/examples/qtmail/readmail.cpp
+++ b/examples/qtmail/readmail.cpp
@@ -68,7 +68,7 @@ class SaveContactDialog : public QDialog
 public:
     enum Selection { None = 0, Create, Existing };
 
-    SaveContactDialog(const QMailAddress &address, QWidget *parent = Q_NULLPTR)
+    SaveContactDialog(const QMailAddress &address, QWidget *parent = nullptr)
         : QDialog(parent),
           sel(None),
           createButton(new QPushButton(tr("Create new contact"))),
diff --git a/examples/qtmail/readmail.h b/examples/qtmail/readmail.h
index 6a180b18..def9a02e 100644
--- a/examples/qtmail/readmail.h
+++ b/examples/qtmail/readmail.h
@@ -57,7 +57,7 @@ class ReadMail : public QFrame
     Q_OBJECT
 
 public:
-    ReadMail( QWidget* parent = Q_NULLPTR, Qt::WindowFlags fl = Qt::Widget );
+    ReadMail( QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::Widget );
 
     void displayMessage(const QMailMessageId& message, QMailViewerFactory::PresentationType, bool nextAvailable, bool previousAvailable);
     QMailMessageId displayedMessage() const;
diff --git a/examples/qtmail/searchview.cpp b/examples/qtmail/searchview.cpp
index 1d05a774..c74730d6 100644
--- a/examples/qtmail/searchview.cpp
+++ b/examples/qtmail/searchview.cpp
@@ -64,7 +64,7 @@ class SearchButton : public QPushButton
 {
     Q_OBJECT
 public:
-    SearchButton(QWidget* parent = Q_NULLPTR);
+    SearchButton(QWidget* parent = nullptr);
 
 signals:
     void startSearch();
@@ -124,7 +124,7 @@ class BodySearchWidget : public QWidget
     Q_OBJECT
 
 public:
-    BodySearchWidget(QWidget* parent = Q_NULLPTR);
+    BodySearchWidget(QWidget* parent = nullptr);
 
     QString term() const;
 
@@ -174,7 +174,7 @@ class FolderSelectorWidget : public QWidget
     Q_OBJECT
 
 public:
-    FolderSelectorWidget(QWidget* parent = Q_NULLPTR);
+    FolderSelectorWidget(QWidget* parent = nullptr);
     QMailMessageKey searchKey() const;
     QMailSearchAction::SearchSpecification searchSpecification() const;
 
@@ -379,7 +379,7 @@ public:
     }
 
 public:
-    SearchTermWidget(QWidget* parent = Q_NULLPTR);
+    SearchTermWidget(QWidget* parent = nullptr);
     void reset();
     QMailMessageKey searchKey() const;
 
@@ -709,7 +709,7 @@ class SearchTermsComposer : public QWidget
     Q_OBJECT
 
 public:
-    SearchTermsComposer(QWidget* parent = Q_NULLPTR);
+    SearchTermsComposer(QWidget* parent = nullptr);
     QMailMessageKey searchKey() const;
 
 public slots:
diff --git a/examples/qtmail/searchview.h b/examples/qtmail/searchview.h
index 83aa6ed4..0d1490bd 100644
--- a/examples/qtmail/searchview.h
+++ b/examples/qtmail/searchview.h
@@ -61,7 +61,7 @@ class SearchView : public QMainWindow
     Q_OBJECT
 
 public:
-    SearchView(QWidget * parent = Q_NULLPTR, Qt::WindowFlags flags = Qt::Widget);
+    SearchView(QWidget * parent = nullptr, Qt::WindowFlags flags = Qt::Widget);
     void setVisible(bool visible);
 
 signals:
diff --git a/examples/qtmail/selectcomposerwidget.cpp b/examples/qtmail/selectcomposerwidget.cpp
index 62b2c292..96b93cd6 100644
--- a/examples/qtmail/selectcomposerwidget.cpp
+++ b/examples/qtmail/selectcomposerwidget.cpp
@@ -46,7 +46,7 @@ class SelectListWidget : public QListWidget
     Q_OBJECT
 
 public:
-    SelectListWidget(QWidget* parent = Q_NULLPTR);
+    SelectListWidget(QWidget* parent = nullptr);
 
 signals:
     void cancel();
diff --git a/examples/qtmail/statusbar.cpp b/examples/qtmail/statusbar.cpp
index 7a01fc1b..4a9a51a4 100644
--- a/examples/qtmail/statusbar.cpp
+++ b/examples/qtmail/statusbar.cpp
@@ -44,7 +44,7 @@ class ArrowButton : public QToolButton
     Q_OBJECT
 
 public:
-    ArrowButton(QWidget* parent = Q_NULLPTR);
+    ArrowButton(QWidget* parent = nullptr);
     void reset();
     bool upState() const;
 
diff --git a/examples/qtmail/statusbar.h b/examples/qtmail/statusbar.h
index b18452db..8c8bd960 100644
--- a/examples/qtmail/statusbar.h
+++ b/examples/qtmail/statusbar.h
@@ -50,7 +50,7 @@ class StatusBar : public QWidget
     Q_OBJECT
 
 public:
-    StatusBar(QWidget* parent = Q_NULLPTR);
+    StatusBar(QWidget* parent = nullptr);
 
 public slots:
     void setProgress(unsigned int min, unsigned int max);
diff --git a/examples/qtmail/statusmonitor.cpp b/examples/qtmail/statusmonitor.cpp
index 918a99ad..7162bf00 100644
--- a/examples/qtmail/statusmonitor.cpp
+++ b/examples/qtmail/statusmonitor.cpp
@@ -47,7 +47,7 @@ class ServiceActionStatusWidget : public QWidget
     Q_OBJECT
 
 public:
-    ServiceActionStatusWidget(QMailServiceAction* service, const QString& description, QWidget* parent = Q_NULLPTR);
+    ServiceActionStatusWidget(QMailServiceAction* service, const QString& description, QWidget* parent = nullptr);
     QSize sizeHint() const;
 
 private slots:
diff --git a/examples/qtmail/statusmonitorwidget.h b/examples/qtmail/statusmonitorwidget.h
index da492c6f..a4714604 100644
--- a/examples/qtmail/statusmonitorwidget.h
+++ b/examples/qtmail/statusmonitorwidget.h
@@ -53,7 +53,7 @@ class StatusMonitorWidget : public QFrame
     Q_OBJECT
 
 public:
-    StatusMonitorWidget(QWidget* parent = Q_NULLPTR, uint bottomMargin = 0, uint rightMargin = 0);
+    StatusMonitorWidget(QWidget* parent = nullptr, uint bottomMargin = 0, uint rightMargin = 0);
     QSize sizeHint() const;
 
 protected:
diff --git a/examples/qtmail/writemail.h b/examples/qtmail/writemail.h
index be11a8a3..b660011c 100644
--- a/examples/qtmail/writemail.h
+++ b/examples/qtmail/writemail.h
@@ -56,7 +56,7 @@ class WriteMail : public QMainWindow
     Q_OBJECT
 
 public:
-    WriteMail(QWidget* parent = Q_NULLPTR);
+    WriteMail(QWidget* parent = nullptr);
 
     void create(const QMailMessage& initMessage = QMailMessage());
     void respond(const QMailMessage& source, QMailMessage::ResponseType type);
diff --git a/examples/serverobserver/serverobserver.h b/examples/serverobserver/serverobserver.h
index 4b9b9add..96e2790c 100644
--- a/examples/serverobserver/serverobserver.h
+++ b/examples/serverobserver/serverobserver.h
@@ -57,7 +57,7 @@ class ServerObserver : public QMainWindow
 {
     Q_OBJECT
 public:
-    ServerObserver(QWidget *parent = Q_NULLPTR);
+    ServerObserver(QWidget *parent = nullptr);
     virtual ~ServerObserver();
 private slots:
     void actionsChanged(QList<QSharedPointer< QMailActionInfo> > actions);
@@ -72,7 +72,7 @@ private:
 class RowWidget : public QWidget {
     Q_OBJECT
 public:
-    RowWidget(QSharedPointer<QMailActionInfo> action, QWidget *parent = Q_NULLPTR);
+    RowWidget(QSharedPointer<QMailActionInfo> action, QWidget *parent = nullptr);
 
 public slots:
     void progressChanged(uint x, uint y);
diff --git a/src/libraries/qmfclient/longstring.cpp b/src/libraries/qmfclient/longstring.cpp
index f5653b41..c6e7e5e9 100644
--- a/src/libraries/qmfclient/longstring.cpp
+++ b/src/libraries/qmfclient/longstring.cpp
@@ -110,8 +110,7 @@ static int insensitiveIndexOf(const QByteArray& target, const QByteArray &source
                 // We may find the next place to search in our scan
                 if ((restart == it) && (*searchIt == *(it - 1)))
                     restart = searchIt;
-            }
-            while (toupper(*searchIt++) == toupper(*matchIt++));
+            } while (toupper(*searchIt++) == toupper(*matchIt++));
 
             // No match
             it = restart;
@@ -181,7 +180,7 @@ private:
     // We need to keep these in an external map, because QFile is noncopyable
     struct QFileMapping
     {
-        QFileMapping() : file(0), mapping(0), size(0) {}
+        QFileMapping() : file(nullptr), mapping(nullptr), size(0) {}
 
         QFile* file;
         char* mapping;
@@ -363,14 +362,14 @@ template <typename Stream>
 Stream& operator>>(Stream &stream, LongStringPrivate& ls) { ls.deserialize(stream); return stream; }
 
 LongStringPrivate::LongStringPrivate()
-    : mapping(0),
+    : mapping(nullptr),
       offset(0),
       len(0)
 {
 }
 
 LongStringPrivate::LongStringPrivate(const QByteArray& ba)
-    : mapping(0),
+    : mapping(nullptr),
       data(ba),
       offset(0),
       len(data.length())
@@ -385,7 +384,7 @@ LongStringPrivate::LongStringPrivate(const QString& filename)
 }
 
 LongStringPrivate::LongStringPrivate(const LongStringPrivate &other)
-    : mapping(0),
+    : mapping(nullptr),
       offset(0),
       len(0)
 {
@@ -402,7 +401,8 @@ const LongStringPrivate &LongStringPrivate::operator=(const LongStringPrivate &o
     if (&other != this) {
         delete mapping;
 
-        mapping = (other.mapping ? new LongStringFileMapping(other.mapping->fileName()) : 0);
+        mapping = other.mapping ? new LongStringFileMapping(other.mapping->fileName())
+                                : nullptr;
         data = (other.mapping ? QByteArray() : other.data);
         offset = other.offset;
         len = other.len;
@@ -506,7 +506,7 @@ QTextStream* LongStringPrivate::textStream() const
 template <typename Stream>
 void LongStringPrivate::serialize(Stream &stream) const
 {
-    bool usesMapping(mapping != 0);
+    bool usesMapping(mapping != nullptr);
 
     stream << usesMapping;
     if (usesMapping) {
diff --git a/src/libraries/qmfclient/qmailaccountlistmodel.h b/src/libraries/qmfclient/qmailaccountlistmodel.h
index f6861307..2829f154 100644
--- a/src/libraries/qmfclient/qmailaccountlistmodel.h
+++ b/src/libraries/qmfclient/qmailaccountlistmodel.h
@@ -53,7 +53,7 @@ public:
     };
 
 public:
-    QMailAccountListModel(QObject* parent = Q_NULLPTR);
+    QMailAccountListModel(QObject* parent = nullptr);
     virtual ~QMailAccountListModel();
 
     int rowCount(const QModelIndex& index = QModelIndex()) const override;
diff --git a/src/libraries/qmfclient/qmailcrypto.cpp b/src/libraries/qmfclient/qmailcrypto.cpp
index 1c6b29cd..b01b1f61 100644
--- a/src/libraries/qmfclient/qmailcrypto.cpp
+++ b/src/libraries/qmfclient/qmailcrypto.cpp
@@ -48,8 +48,8 @@ struct SignedContainerFinder
 
     SignedContainerFinder(QMailCryptographicServiceInterface *engine)
         : m_engine(engine)
-        , m_signedContainer(0)
-        , m_signedConstContainer(0)
+        , m_signedContainer(nullptr)
+        , m_signedConstContainer(nullptr)
     {
     }
 
@@ -71,7 +71,8 @@ struct SignedContainerFinder
     }
 };
 
-QMailMessagePartContainer* QMailCryptographicServiceInterface::findSignedContainer(QMailMessagePartContainer *part)
+QMailMessagePartContainer*
+QMailCryptographicServiceInterface::findSignedContainer(QMailMessagePartContainer *part)
 {
     if (partHasSignature(*part))
         return part;
@@ -81,7 +82,8 @@ QMailMessagePartContainer* QMailCryptographicServiceInterface::findSignedContain
     return finder.m_signedContainer;
 }
 
-const QMailMessagePartContainer* QMailCryptographicServiceInterface::findSignedContainer(const QMailMessagePartContainer *part)
+const QMailMessagePartContainer*
+QMailCryptographicServiceInterface::findSignedContainer(const QMailMessagePartContainer *part)
 {
     if (partHasSignature(*part))
         return part;
@@ -98,7 +100,7 @@ const QMailMessagePartContainer* QMailCryptographicServiceInterface::findSignedC
     This class loads different cryptographic services and allows to sign, verify and decrypt content.
 */
 
-QMailCryptographicService* QMailCryptographicService::m_pInstance = 0;
+QMailCryptographicService* QMailCryptographicService::m_pInstance = nullptr;
 
 QMailCryptographicService::QMailCryptographicService(QObject* parent)
     : QMailPluginManager(QString::fromLatin1("crypto"), parent)
@@ -132,13 +134,14 @@ QMailCryptographicServiceInterface* QMailCryptographicService::decryptionEngine(
                 return engine;
         }
     }
-    return Q_NULLPTR;
+    return nullptr;
 }
 
-QMailMessagePartContainer* QMailCryptographicService::findSignedContainer(QMailMessagePartContainer *part, QMailCryptographicServiceInterface **engine)
+QMailMessagePartContainer*
+QMailCryptographicService::findSignedContainer(QMailMessagePartContainer *part,
+                                               QMailCryptographicServiceInterface **engine)
 {
-    QMailCryptographicService *plugins =
-        QMailCryptographicService::instance();
+    QMailCryptographicService *plugins = QMailCryptographicService::instance();
     QStringList engines = plugins->list();
 
     if (engine)
@@ -158,10 +161,12 @@ QMailMessagePartContainer* QMailCryptographicService::findSignedContainer(QMailM
 
     return 0;
 }
-const QMailMessagePartContainer* QMailCryptographicService::findSignedContainer(const QMailMessagePartContainer *part, QMailCryptographicServiceInterface **engine)
+
+const QMailMessagePartContainer*
+QMailCryptographicService::findSignedContainer(const QMailMessagePartContainer *part,
+                                               QMailCryptographicServiceInterface **engine)
 {
-    QMailCryptographicService *plugins =
-        QMailCryptographicService::instance();
+    QMailCryptographicService *plugins = QMailCryptographicService::instance();
     QStringList engines = plugins->list();
 
     if (engine)
@@ -184,8 +189,7 @@ const QMailMessagePartContainer* QMailCryptographicService::findSignedContainer(
 
 QMailCrypto::VerificationResult QMailCryptographicService::verifySignature(const QMailMessagePartContainer &part)
 {
-    QMailCryptographicService *plugins =
-        QMailCryptographicService::instance();
+    QMailCryptographicService *plugins = QMailCryptographicService::instance();
     QStringList engines = plugins->list();
 
     for (QStringList::iterator it = engines.begin(); it != engines.end(); it++) {
@@ -220,7 +224,7 @@ QMailCrypto::SignatureResult QMailCryptographicService::sign(QMailMessagePartCon
 
 bool QMailCryptographicService::canDecrypt(const QMailMessagePartContainer &part)
 {
-    return instance()->decryptionEngine(part) != Q_NULLPTR;
+    return instance()->decryptionEngine(part) != nullptr;
 }
 
 QMailCrypto::DecryptionResult QMailCryptographicService::decrypt(QMailMessagePartContainer *part,
diff --git a/src/libraries/qmfclient/qmailcrypto.h b/src/libraries/qmfclient/qmailcrypto.h
index ff9874c7..6d08225d 100644
--- a/src/libraries/qmfclient/qmailcrypto.h
+++ b/src/libraries/qmfclient/qmailcrypto.h
@@ -140,6 +140,7 @@ public:
     QMailMessagePartContainer* findSignedContainer(QMailMessagePartContainer *part);
     const QMailMessagePartContainer* findSignedContainer(const QMailMessagePartContainer *part);
 };
+
 QT_BEGIN_NAMESPACE
 Q_DECLARE_INTERFACE(QMailCryptographicServiceInterface, "org.qt-project.Qt.QMailCryptographicServiceInterface")
 QT_END_NAMESPACE
@@ -150,8 +151,10 @@ class QMF_EXPORT QMailCryptographicService : public QMailPluginManager
 
 public:
     static QMailCryptographicService* instance();
-    static QMailMessagePartContainer* findSignedContainer(QMailMessagePartContainer *part, QMailCryptographicServiceInterface **engine = Q_NULLPTR);
-    static const QMailMessagePartContainer* findSignedContainer(const QMailMessagePartContainer *part, QMailCryptographicServiceInterface **engine = Q_NULLPTR);
+    static QMailMessagePartContainer* findSignedContainer(QMailMessagePartContainer *part,
+                                                          QMailCryptographicServiceInterface **engine = nullptr);
+    static const QMailMessagePartContainer* findSignedContainer(const QMailMessagePartContainer *part,
+                                                                QMailCryptographicServiceInterface **engine = nullptr);
 
     QMailCryptographicServiceInterface* instance(const QString &engine);
     QMailCryptographicServiceInterface* decryptionEngine(const QMailMessagePartContainer &part);
@@ -160,14 +163,14 @@ public:
     static QMailCrypto::SignatureResult sign(QMailMessagePartContainer *part,
                                              const QString &crypto,
                                              const QStringList &keys,
-                                             QMailCrypto::PassphraseCallback cb = Q_NULLPTR);
+                                             QMailCrypto::PassphraseCallback cb = nullptr);
 
     static bool canDecrypt(const QMailMessagePartContainer &part);
     static QMailCrypto::DecryptionResult decrypt(QMailMessagePartContainer *part,
-                                                 QMailCrypto::PassphraseCallback cb = Q_NULLPTR);
+                                                 QMailCrypto::PassphraseCallback cb = nullptr);
 
 private:
-    QMailCryptographicService(QObject *parent = Q_NULLPTR);
+    QMailCryptographicService(QObject *parent = nullptr);
     ~QMailCryptographicService();
 
     static QMailCryptographicService* m_pInstance;
diff --git a/src/libraries/qmfclient/qmailmessage.cpp b/src/libraries/qmfclient/qmailmessage.cpp
index b684a79b..1110d449 100644
--- a/src/libraries/qmfclient/qmailmessage.cpp
+++ b/src/libraries/qmfclient/qmailmessage.cpp
@@ -1615,7 +1615,7 @@ QMailMessageHeaderFieldPrivate::QMailMessageHeaderFieldPrivate(const QByteArray&
     parse(text, structured);
 }
 
-static bool validExtension(const QByteArray& trailer, int* number = Q_NULLPTR, bool* encoded = Q_NULLPTR)
+static bool validExtension(const QByteArray& trailer, int* number = nullptr, bool* encoded = nullptr)
 {
     // Extensions according to RFC 2231:
     QRegularExpressionMatch extensionFormat
@@ -1632,7 +1632,7 @@ static bool validExtension(const QByteArray& trailer, int* number = Q_NULLPTR, b
     return false;
 }
 
-static bool matchingParameter(const QByteArray& name, const QByteArray& other, bool* encoded = Q_NULLPTR)
+static bool matchingParameter(const QByteArray& name, const QByteArray& other, bool* encoded = nullptr)
 {
     QByteArray match(name.trimmed());
 
@@ -1938,7 +1938,7 @@ static QByteArray protectedParameter(const QByteArray& value)
         return value;
 }
 
-static bool extendedParameter(const QByteArray& name, QByteArray* truncated = 0, int* number = Q_NULLPTR, bool* encoded = Q_NULLPTR)
+static bool extendedParameter(const QByteArray& name, QByteArray* truncated = 0, int* number = nullptr, bool* encoded = nullptr)
 {
     QByteArray param(name.trimmed());
 
@@ -3261,7 +3261,9 @@ void QMailMessageBodyPrivate::ensureCharsetExist()
     }
 }
 
-void QMailMessageBodyPrivate::fromLongString(LongString& ls, const QMailMessageContentType& content, QMailMessageBody::TransferEncoding te, QMailMessageBody::EncodingStatus status)
+void QMailMessageBodyPrivate::fromLongString(LongString& ls, const QMailMessageContentType& content,
+                                             QMailMessageBody::TransferEncoding te,
+                                             QMailMessageBody::EncodingStatus status)
 {
     _encoding = te;
     _type = content;
@@ -3272,7 +3274,9 @@ void QMailMessageBodyPrivate::fromLongString(LongString& ls, const QMailMessageC
     ensureCharsetExist();
 }
 
-void QMailMessageBodyPrivate::fromFile(const QString& file, const QMailMessageContentType& content, QMailMessageBody::TransferEncoding te, QMailMessageBody::EncodingStatus status)
+void QMailMessageBodyPrivate::fromFile(const QString& file, const QMailMessageContentType& content,
+                                       QMailMessageBody::TransferEncoding te,
+                                       QMailMessageBody::EncodingStatus status)
 {
     _encoding = te;
     _type = content;
@@ -3283,7 +3287,9 @@ void QMailMessageBodyPrivate::fromFile(const QString& file, const QMailMessageCo
     ensureCharsetExist();
 }
 
-void QMailMessageBodyPrivate::fromStream(QDataStream& in, const QMailMessageContentType& content, QMailMessageBody::TransferEncoding te, QMailMessageBody::EncodingStatus status)
+void QMailMessageBodyPrivate::fromStream(QDataStream& in, const QMailMessageContentType& content,
+                                         QMailMessageBody::TransferEncoding te,
+                                         QMailMessageBody::EncodingStatus status)
 {
     _encoding = te;
     _type = content;
@@ -3310,7 +3316,8 @@ void QMailMessageBodyPrivate::fromStream(QDataStream& in, const QMailMessageCont
     ensureCharsetExist();
 }
 
-void QMailMessageBodyPrivate::fromStream(QTextStream& in, const QMailMessageContentType& content, QMailMessageBody::TransferEncoding te)
+void QMailMessageBodyPrivate::fromStream(QTextStream& in, const QMailMessageContentType& content,
+                                         QMailMessageBody::TransferEncoding te)
 {
     _encoding = te;
     _type = content;
@@ -4185,7 +4192,8 @@ static QMailMessageContentType updateContentType(const QByteArray& existing, QMa
     return type;
 }
 
-void QMailMessagePartContainerPrivate::setMultipartType(QMailMessagePartContainer::MultipartType type, const QList<QMailMessageHeaderField::ParameterType> &parameters)
+void QMailMessagePartContainerPrivate::setMultipartType(QMailMessagePartContainer::MultipartType type,
+                                                        const QList<QMailMessageHeaderField::ParameterType> &parameters)
 {
     // TODO: Is there any value in keeping _multipartType and _boundary externally from
     // Content-type header field?
@@ -6093,7 +6101,8 @@ QMailMessagePart QMailMessagePart::fromPartReference(const QMailMessagePart::Loc
 
     \sa referenceType(), setReferenceResolution()
 */
-void QMailMessagePart::setReference(const QMailMessageId &id, const QMailMessageContentType& type, QMailMessageBody::TransferEncoding encoding)
+void QMailMessagePart::setReference(const QMailMessageId &id, const QMailMessageContentType& type,
+                                    QMailMessageBody::TransferEncoding encoding)
 {
     messagePartImpl()->setReference(id, type, encoding);
 }
@@ -6108,7 +6117,8 @@ void QMailMessagePart::setReference(const QMailMessageId &id, const QMailMessage
 
     \sa referenceType(), setReferenceResolution()
 */
-void QMailMessagePart::setReference(const QMailMessagePart::Location &location, const QMailMessageContentType& type, QMailMessageBody::TransferEncoding encoding)
+void QMailMessagePart::setReference(const QMailMessagePart::Location &location, const QMailMessageContentType& type,
+                                    QMailMessageBody::TransferEncoding encoding)
 {
     messagePartImpl()->setReference(location, type, encoding);
 }
diff --git a/src/libraries/qmfclient/qmailmessage.h b/src/libraries/qmfclient/qmailmessage.h
index 4bbdbed9..edd5bf39 100644
--- a/src/libraries/qmfclient/qmailmessage.h
+++ b/src/libraries/qmfclient/qmailmessage.h
@@ -379,7 +379,8 @@ public:
 
     // Parts management interface:
     MultipartType multipartType() const;
-    void setMultipartType(MultipartType type, const QList<QMailMessageHeaderField::ParameterType> &parameters = QList<QMailMessageHeaderField::ParameterType>());
+    void setMultipartType(MultipartType type,
+                          const QList<QMailMessageHeaderField::ParameterType> &parameters = QList<QMailMessageHeaderField::ParameterType>());
 
     uint partCount() const;
 
@@ -414,10 +415,12 @@ public:
 
     // Header fields describing this part container
     QString headerFieldText( const QString &id ) const;
-    QMailMessageHeaderField headerField( const QString &id, QMailMessageHeaderField::FieldType fieldType = QMailMessageHeaderField::StructuredField ) const;
+    QMailMessageHeaderField headerField(const QString &id,
+                                        QMailMessageHeaderField::FieldType fieldType = QMailMessageHeaderField::StructuredField) const;
 
     QStringList headerFieldsText( const QString &id ) const;
-    QList<QMailMessageHeaderField> headerFields( const QString &id, QMailMessageHeaderField::FieldType fieldType = QMailMessageHeaderField::StructuredField ) const;
+    QList<QMailMessageHeaderField> headerFields(const QString &id,
+                                                QMailMessageHeaderField::FieldType fieldType = QMailMessageHeaderField::StructuredField) const;
 
     QList<QMailMessageHeaderField> headerFields() const;
 
@@ -463,7 +466,7 @@ protected:
     QMailMessagePartContainer(const QMailMessagePartContainer &other);
     QMailMessagePartContainer(QMailMessagePartContainerPrivate *priv);
 
-    virtual void setHeader(const QMailMessageHeader& header, const QMailMessagePartContainerPrivate* parent = Q_NULLPTR);
+    virtual void setHeader(const QMailMessageHeader& header, const QMailMessagePartContainerPrivate* parent = nullptr);
 
     QSharedDataPointer<QMailMessagePartContainerPrivate> d;
 
@@ -506,13 +509,19 @@ public:
     static QMailMessagePart fromData(const QString& input, const QMailMessageContentDisposition& disposition,
                                      const QMailMessageContentType& type, QMailMessageBody::TransferEncoding encoding);
 
-    static QMailMessagePart fromMessageReference(const QMailMessageId &id, const QMailMessageContentDisposition& disposition,
-                                                 const QMailMessageContentType& type, QMailMessageBody::TransferEncoding encoding);
-    static QMailMessagePart fromPartReference(const QMailMessagePart::Location &partLocation, const QMailMessageContentDisposition& disposition,
-                                              const QMailMessageContentType& type, QMailMessageBody::TransferEncoding encoding);
+    static QMailMessagePart fromMessageReference(const QMailMessageId &id,
+                                                 const QMailMessageContentDisposition &disposition,
+                                                 const QMailMessageContentType &type,
+                                                 QMailMessageBody::TransferEncoding encoding);
+    static QMailMessagePart fromPartReference(const QMailMessagePart::Location &partLocation,
+                                              const QMailMessageContentDisposition &disposition,
+                                              const QMailMessageContentType &type,
+                                              QMailMessageBody::TransferEncoding encoding);
 
-    void setReference(const QMailMessageId &id, const QMailMessageContentType& type, QMailMessageBody::TransferEncoding encoding);
-    void setReference(const QMailMessagePart::Location &location, const QMailMessageContentType& type, QMailMessageBody::TransferEncoding encoding);
+    void setReference(const QMailMessageId &id, const QMailMessageContentType &type,
+                      QMailMessageBody::TransferEncoding encoding);
+    void setReference(const QMailMessagePart::Location &location, const QMailMessageContentType &type,
+                      QMailMessageBody::TransferEncoding encoding);
 
     QString contentID() const;
     void setContentID(const QString &s);
@@ -953,7 +962,7 @@ public:
     template <typename Stream> void deserialize(Stream &stream);
 
 protected:
-    void setHeader(const QMailMessageHeader& header, const QMailMessagePartContainerPrivate* parent = Q_NULLPTR) override;
+    void setHeader(const QMailMessageHeader& header, const QMailMessagePartContainerPrivate* parent = nullptr) override;
 
 private:
     friend class QMailStore;
diff --git a/src/libraries/qmfclient/qmailmessage_p.h b/src/libraries/qmfclient/qmailmessage_p.h
index 7ec9f6d7..b34c5d33 100644
--- a/src/libraries/qmfclient/qmailmessage_p.h
+++ b/src/libraries/qmfclient/qmailmessage_p.h
@@ -182,7 +182,7 @@ public:
     const QMailMessagePart& partAt(const QMailMessagePart::Location& location) const;
     QMailMessagePart& partAt(const QMailMessagePart::Location& location);
 
-    void setHeader(const QMailMessageHeader& header, const QMailMessagePartContainerPrivate* parent = Q_NULLPTR);
+    void setHeader(const QMailMessageHeader& header, const QMailMessagePartContainerPrivate* parent = nullptr);
 
     QByteArray headerField( const QByteArray &headerName ) const;
     QList<QByteArray> headerFields( const QByteArray &headerName, int maximum = 0 ) const;
diff --git a/src/libraries/qmfclient/qmailmessagelistmodel.h b/src/libraries/qmfclient/qmailmessagelistmodel.h
index 8a220302..da0519e8 100644
--- a/src/libraries/qmfclient/qmailmessagelistmodel.h
+++ b/src/libraries/qmfclient/qmailmessagelistmodel.h
@@ -43,7 +43,7 @@ class QMF_EXPORT QMailMessageListModel : public QMailMessageModelBase
     Q_OBJECT
 
 public:
-    QMailMessageListModel(QObject* parent = Q_NULLPTR);
+    QMailMessageListModel(QObject* parent = nullptr);
     virtual ~QMailMessageListModel();
 
     QModelIndex index(int row, int column = 0, const QModelIndex &parent = QModelIndex()) const override;
diff --git a/src/libraries/qmfclient/qmailmessagemodelbase.h b/src/libraries/qmfclient/qmailmessagemodelbase.h
index 7259d897..44b6e9fa 100644
--- a/src/libraries/qmfclient/qmailmessagemodelbase.h
+++ b/src/libraries/qmfclient/qmailmessagemodelbase.h
@@ -91,7 +91,7 @@ public:
         MessageIdRole
     };
 
-    QMailMessageModelBase(QObject* parent = Q_NULLPTR);
+    QMailMessageModelBase(QObject* parent = nullptr);
     virtual ~QMailMessageModelBase();
 
     int rowCount(const QModelIndex& index = QModelIndex()) const override;
diff --git a/src/libraries/qmfclient/qmailmessageserver.h b/src/libraries/qmfclient/qmailmessageserver.h
index 073e1b78..fb904992 100644
--- a/src/libraries/qmfclient/qmailmessageserver.h
+++ b/src/libraries/qmfclient/qmailmessageserver.h
@@ -53,7 +53,7 @@ class QMF_EXPORT QMailMessageServer : public QObject
     Q_OBJECT
 
 public:
-    QMailMessageServer(QObject* parent = Q_NULLPTR);
+    QMailMessageServer(QObject* parent = nullptr);
     ~QMailMessageServer();
 
 private:
diff --git a/src/libraries/qmfclient/qmailmessageset.h b/src/libraries/qmfclient/qmailmessageset.h
index 483c8c47..a4545ce5 100644
--- a/src/libraries/qmfclient/qmailmessageset.h
+++ b/src/libraries/qmfclient/qmailmessageset.h
@@ -245,7 +245,7 @@ public:
         SubclassUserRole
     };
 
-    QMailMessageSetModel(QObject *parent = Q_NULLPTR);
+    QMailMessageSetModel(QObject *parent = nullptr);
     virtual ~QMailMessageSetModel();
 
     int rowCount(const QModelIndex &parentIndex) const override;
diff --git a/src/libraries/qmfclient/qmailmessagesortkey_p.h b/src/libraries/qmfclient/qmailmessagesortkey_p.h
index 8db382df..f3af3169 100644
--- a/src/libraries/qmfclient/qmailmessagesortkey_p.h
+++ b/src/libraries/qmfclient/qmailmessagesortkey_p.h
@@ -51,7 +51,8 @@
 class QMailMessageSortKeyPrivate : public MailSortKeyImpl<QMailMessageSortKey>
 {
 public:
-    QMailMessageSortKeyPrivate() : MailSortKeyImpl<QMailMessageSortKey>() {}
+    QMailMessageSortKeyPrivate()
+        : MailSortKeyImpl<QMailMessageSortKey>() {}
     QMailMessageSortKeyPrivate(QMailMessageSortKey::Property p, Qt::SortOrder o, quint64 m)
         : MailSortKeyImpl<QMailMessageSortKey>(p, o, m) {}
     QMailMessageSortKeyPrivate(const QList<QMailMessageSortKey::ArgumentType> args)
diff --git a/src/libraries/qmfclient/qmailmessagethreadedmodel.cpp b/src/libraries/qmfclient/qmailmessagethreadedmodel.cpp
index 594d8c0d..452f7c55 100644
--- a/src/libraries/qmfclient/qmailmessagethreadedmodel.cpp
+++ b/src/libraries/qmfclient/qmailmessagethreadedmodel.cpp
@@ -43,7 +43,7 @@
 class QMailMessageThreadedModelItem
 {
 public:
-    explicit QMailMessageThreadedModelItem(const QMailMessageId& id, QMailMessageThreadedModelItem *parent = Q_NULLPTR)
+    explicit QMailMessageThreadedModelItem(const QMailMessageId& id, QMailMessageThreadedModelItem *parent = nullptr)
         : _id(id), _parent(parent) {}
     ~QMailMessageThreadedModelItem() {}
 
diff --git a/src/libraries/qmfclient/qmailmessagethreadedmodel.h b/src/libraries/qmfclient/qmailmessagethreadedmodel.h
index 4d20283c..52ffb6c7 100644
--- a/src/libraries/qmfclient/qmailmessagethreadedmodel.h
+++ b/src/libraries/qmfclient/qmailmessagethreadedmodel.h
@@ -43,7 +43,7 @@ class QMF_EXPORT QMailMessageThreadedModel : public QMailMessageModelBase
     Q_OBJECT
 
 public:
-    QMailMessageThreadedModel(QObject* parent = Q_NULLPTR);
+    QMailMessageThreadedModel(QObject* parent = nullptr);
     virtual ~QMailMessageThreadedModel();
 
     int rootRow(const QModelIndex& index) const;
diff --git a/src/libraries/qmfclient/qmailserviceaction.h b/src/libraries/qmfclient/qmailserviceaction.h
index fc9dcea6..c1ac33da 100644
--- a/src/libraries/qmfclient/qmailserviceaction.h
+++ b/src/libraries/qmfclient/qmailserviceaction.h
@@ -163,7 +163,7 @@ public:
         Auto
     };
 
-    QMailRetrievalAction(QObject *parent = Q_NULLPTR);
+    QMailRetrievalAction(QObject *parent = nullptr);
     ~QMailRetrievalAction();
 
     static uint defaultMinimum() { return 20; }
@@ -198,7 +198,7 @@ class QMF_EXPORT QMailTransmitAction : public QMailServiceAction
     Q_OBJECT
 
 public:
-    QMailTransmitAction(QObject *parent = Q_NULLPTR);
+    QMailTransmitAction(QObject *parent = nullptr);
     ~QMailTransmitAction();
 
 Q_SIGNALS:
@@ -222,7 +222,7 @@ class QMF_EXPORT QMailStorageAction : public QMailServiceAction
 public:
     typedef QMailStorageActionPrivate ImplementationType;
 
-    QMailStorageAction(QObject *parent = Q_NULLPTR);
+    QMailStorageAction(QObject *parent = nullptr);
     ~QMailStorageAction();
 
     QMailMessageIdList messagesAdded() const;
@@ -268,7 +268,7 @@ public:
         Remote
     };
 
-    QMailSearchAction(QObject *parent = Q_NULLPTR);
+    QMailSearchAction(QObject *parent = nullptr);
     ~QMailSearchAction();
 
     QMailMessageIdList matchingMessageIds() const;
@@ -334,7 +334,7 @@ class QMF_EXPORT QMailActionObserver : public QMailServiceAction
 {
     Q_OBJECT
 public:
-    QMailActionObserver(QObject *parent = Q_NULLPTR);
+    QMailActionObserver(QObject *parent = nullptr);
     virtual ~QMailActionObserver();
 
     QList< QSharedPointer<QMailActionInfo> > actions() const;
@@ -354,7 +354,7 @@ class QMF_EXPORT QMailProtocolAction : public QMailServiceAction
     Q_OBJECT
 
 public:
-    QMailProtocolAction(QObject *parent = Q_NULLPTR);
+    QMailProtocolAction(QObject *parent = nullptr);
     ~QMailProtocolAction();
 
 Q_SIGNALS:
diff --git a/src/libraries/qmfclient/qmailstore.cpp b/src/libraries/qmfclient/qmailstore.cpp
index 5dc40c85..bbb19b8f 100644
--- a/src/libraries/qmfclient/qmailstore.cpp
+++ b/src/libraries/qmfclient/qmailstore.cpp
@@ -279,8 +279,10 @@ bool QMailStore::addMessages(const QList<QMailMessage*>& messages)
     QMailAccountIdList modifiedAccountIds;
 
     d->setLastError(NoError);
-    if (!d->addMessages(messages, &addedMessageIds, &addedThreadIds, &updatedMessageIds, &updatedThreadIds, &modifiedFolderIds, &modifiedThreadIds, &modifiedAccountIds))
+    if (!d->addMessages(messages, &addedMessageIds, &addedThreadIds, &updatedMessageIds, &updatedThreadIds,
+                        &modifiedFolderIds, &modifiedThreadIds, &modifiedAccountIds)) {
         return false;
+    }
 
     emitMessageNotification(Added, addedMessageIds);
     emitThreadNotification(Added, addedThreadIds);
@@ -311,8 +313,10 @@ bool QMailStore::addMessages(const QList<QMailMessageMetaData*>& messages)
     QMailAccountIdList modifiedAccountIds;
 
     d->setLastError(NoError);
-    if (!d->addMessages(messages, &addedMessageIds, &addedThreadIds, &updatedMessageIds, &updatedThreadIds, &modifiedFolderIds, &modifiedThreadIds, &modifiedAccountIds))
+    if (!d->addMessages(messages, &addedMessageIds, &addedThreadIds, &updatedMessageIds, &updatedThreadIds,
+                        &modifiedFolderIds, &modifiedThreadIds, &modifiedAccountIds)) {
         return false;
+    }
 
     emitMessageNotification(Added, addedMessageIds);
     emitMessageNotification(Updated, updatedMessageIds);
@@ -323,6 +327,7 @@ bool QMailStore::addMessages(const QList<QMailMessageMetaData*>& messages)
     emitFolderNotification(ContentsModified, modifiedFolderIds);
     emitThreadNotification(ContentsModified, modifiedThreadIds);
     emitAccountNotification(ContentsModified, modifiedAccountIds);
+
     return true;
 }
 
@@ -360,8 +365,9 @@ bool QMailStore::removeAccounts(const QMailAccountKey& key)
 
     d->setLastError(NoError);
     if (!d->removeAccounts(key, &deletedAccountIds, &deletedFolderIds, &deletedThreadIds, &deletedMessageIds,
-                           &updatedMessageIds, &modifiedFolderIds, &modifiedThreadIds, &modifiedAccountIds))
+                           &updatedMessageIds, &modifiedFolderIds, &modifiedThreadIds, &modifiedAccountIds)) {
         return false;
+    }
 
     emitRemovalRecordNotification(Removed, deletedAccountIds);
     emitMessageNotification(Removed, deletedMessageIds);
@@ -372,6 +378,7 @@ bool QMailStore::removeAccounts(const QMailAccountKey& key)
     emitFolderNotification(ContentsModified, modifiedFolderIds);
     emitThreadNotification(ContentsModified, modifiedThreadIds);
     emitAccountNotification(ContentsModified, modifiedAccountIds);
+
     return true;
 }
 
@@ -415,8 +422,10 @@ bool QMailStore::removeFolders(const QMailFolderKey& key, QMailStore::MessageRem
     QMailAccountIdList modifiedAccountIds;
 
     d->setLastError(NoError);
-    if (!d->removeFolders(key, option, &deletedFolderIds, &deletedMessageIds, &deletedThreadIds, &updatedMessageIds, &modifiedFolderIds, &modifiedThreadIds, &modifiedAccountIds))
+    if (!d->removeFolders(key, option, &deletedFolderIds, &deletedMessageIds, &deletedThreadIds, &updatedMessageIds,
+                          &modifiedFolderIds, &modifiedThreadIds, &modifiedAccountIds)) {
         return false;
+    }
 
     emitRemovalRecordNotification(Added, modifiedAccountIds);
     emitMessageNotification(Removed, deletedMessageIds);
@@ -426,6 +435,7 @@ bool QMailStore::removeFolders(const QMailFolderKey& key, QMailStore::MessageRem
     emitFolderNotification(ContentsModified, modifiedFolderIds);
     emitThreadNotification(ContentsModified, modifiedThreadIds);
     emitAccountNotification(ContentsModified, modifiedAccountIds);
+
     return true;
 }
 
@@ -461,8 +471,10 @@ bool QMailStore::removeThreads(const QMailThreadKey& key, QMailStore::MessageRem
     QMailAccountIdList modifiedAccountIds;
 
     d->setLastError(NoError);
-    if (!d->removeThreads(key, option, &deletedThreadIds, &deletedMessageIds, &updatedMessageIds, &modifiedFolderIds, &modifiedThreadIds, &modifiedAccountIds))
+    if (!d->removeThreads(key, option, &deletedThreadIds, &deletedMessageIds, &updatedMessageIds,
+                          &modifiedFolderIds, &modifiedThreadIds, &modifiedAccountIds)) {
         return false;
+    }
 
     emitRemovalRecordNotification(Added, modifiedAccountIds);
     emitMessageNotification(Removed, deletedMessageIds);
@@ -470,6 +482,7 @@ bool QMailStore::removeThreads(const QMailThreadKey& key, QMailStore::MessageRem
     emitMessageNotification(Updated, updatedMessageIds);
     emitFolderNotification(ContentsModified, modifiedFolderIds);
     emitAccountNotification(ContentsModified, modifiedAccountIds);
+
     return true;
 }
 
@@ -506,8 +519,10 @@ bool QMailStore::removeMessages(const QMailMessageKey& key, QMailStore::MessageR
     QMailAccountIdList modifiedAccountIds;
 
     d->setLastError(NoError);
-    if (!d->removeMessages(key, option, &deletedMessageIds, &deletedThreadIds, &updatedMessageIds, &modifiedFolderIds, &modifiedThreadIds, &modifiedAccountIds))
+    if (!d->removeMessages(key, option, &deletedMessageIds, &deletedThreadIds, &updatedMessageIds, &modifiedFolderIds,
+                           &modifiedThreadIds, &modifiedAccountIds)) {
         return false;
+    }
 
     emitRemovalRecordNotification(Added, modifiedAccountIds);
     emitMessageNotification(Removed, deletedMessageIds);
@@ -520,6 +535,7 @@ bool QMailStore::removeMessages(const QMailMessageKey& key, QMailStore::MessageR
     emitThreadNotification(ContentsModified, modifiedThreadIds);
     emitThreadNotification(Removed, deletedThreadIds);
     emitAccountNotification(ContentsModified, modifiedAccountIds);
+
     return true;
 }
 
@@ -682,6 +698,7 @@ bool QMailStore::updateMessages(const QList<QPair<QMailMessageMetaData*, QMailMe
     emitMessageDataNotification(Updated, dataList(data, updatedMessages));
     emitFolderNotification(ContentsModified, modifiedFolders);
     emitAccountNotification(ContentsModified, modifiedAccounts);
+
     return true;
 }
 
@@ -702,8 +719,10 @@ bool QMailStore::updateMessagesMetaData(const QMailMessageKey& key,
     QMailAccountIdList modifiedAccounts;
 
     d->setLastError(NoError);
-    if (!d->updateMessagesMetaData(key, properties, data, &updatedMessages, &deletedThreads, &modifiedThreads, &modifiedFolders, &modifiedAccounts))
+    if (!d->updateMessagesMetaData(key, properties, data, &updatedMessages, &deletedThreads,
+                                   &modifiedThreads, &modifiedFolders, &modifiedAccounts)) {
         return false;
+    }
 
     emitMessageNotification(Updated, updatedMessages);
     emitMessageDataNotification(updatedMessages, properties, data);
@@ -715,6 +734,7 @@ bool QMailStore::updateMessagesMetaData(const QMailMessageKey& key,
     emitThreadNotification(ContentsModified, modifiedThreads);
     emitFolderNotification(ContentsModified, modifiedFolders);
     emitAccountNotification(ContentsModified, modifiedAccounts);
+
     return true;
 }
 
@@ -740,6 +760,7 @@ bool QMailStore::updateMessagesMetaData(const QMailMessageKey& key, quint64 stat
     emitThreadNotification(Updated, modifiedThreads);
     emitFolderNotification(ContentsModified, modifiedFolders);
     emitAccountNotification(ContentsModified, modifiedAccounts);
+
     return true;
 }
 
diff --git a/src/libraries/qmfclient/qmailstore.h b/src/libraries/qmfclient/qmailstore.h
index 3c444ab1..48097c5b 100644
--- a/src/libraries/qmfclient/qmailstore.h
+++ b/src/libraries/qmfclient/qmailstore.h
@@ -119,7 +119,7 @@ public:
     bool removeThread(const QMailThreadId &id, MessageRemovalOption option = NoRemovalRecord);
     bool removeThreads(const QMailThreadKey& key, QMailStore::MessageRemovalOption option = NoRemovalRecord);
 
-    bool updateAccount(QMailAccount* account, QMailAccountConfiguration* config = Q_NULLPTR);
+    bool updateAccount(QMailAccount* account, QMailAccountConfiguration* config = nullptr);
     bool updateAccountConfiguration(QMailAccountConfiguration* config);
     bool updateFolder(QMailFolder* f);
     bool updateMessage(QMailMessage* m);
diff --git a/src/libraries/qmfclient/qmailstore_p.cpp b/src/libraries/qmfclient/qmailstore_p.cpp
index 39a71846..7bd828d2 100644
--- a/src/libraries/qmfclient/qmailstore_p.cpp
+++ b/src/libraries/qmfclient/qmailstore_p.cpp
@@ -34,14 +34,12 @@
 #include "qmailstore_p.h"
 #include "qmailcontentmanager.h"
 #include "qmailmessageremovalrecord.h"
-#include "qmailtimestamp.h"
 #include "qmailnamespace.h"
 #include "qmaillog.h"
 
 #include <QCoreApplication>
 #include <QDir>
 #include <QFile>
-#include <QThread>
 #include <QRegularExpression>
 
 // The number of milliseconds that the database can be unused before
@@ -162,15 +160,23 @@ bool QMailStorePrivate::addFolder(QMailFolder *folder,
 }
 
 bool QMailStorePrivate::addMessages(const QList<QMailMessage *> &messages,
-                                    QMailMessageIdList *addedMessageIds, QMailThreadIdList *addedThreadIds, QMailMessageIdList *updatedMessageIds, QMailThreadIdList *updatedThreadIds, QMailFolderIdList *modifiedFolderIds, QMailThreadIdList *modifiedThreadIds, QMailAccountIdList *modifiedAccountIds)
+                                    QMailMessageIdList *addedMessageIds, QMailThreadIdList *addedThreadIds,
+                                    QMailMessageIdList *updatedMessageIds, QMailThreadIdList *updatedThreadIds,
+                                    QMailFolderIdList *modifiedFolderIds, QMailThreadIdList *modifiedThreadIds,
+                                    QMailAccountIdList *modifiedAccountIds)
 {
-    return QMailStoreSql::addMessages(messages, addedMessageIds, addedThreadIds, updatedMessageIds, updatedThreadIds, modifiedFolderIds, modifiedThreadIds, modifiedAccountIds);
+    return QMailStoreSql::addMessages(messages, addedMessageIds, addedThreadIds, updatedMessageIds, updatedThreadIds,
+                                      modifiedFolderIds, modifiedThreadIds, modifiedAccountIds);
 }
 
 bool QMailStorePrivate::addMessages(const QList<QMailMessageMetaData *> &messages,
-                                    QMailMessageIdList *addedMessageIds, QMailThreadIdList *addedThreadIds, QMailMessageIdList *updatedMessageIds, QMailThreadIdList *updatedThreadIds, QMailFolderIdList *modifiedFolderIds, QMailThreadIdList *modifiedThreadIds, QMailAccountIdList *modifiedAccountIds)
+                                    QMailMessageIdList *addedMessageIds, QMailThreadIdList *addedThreadIds,
+                                    QMailMessageIdList *updatedMessageIds, QMailThreadIdList *updatedThreadIds,
+                                    QMailFolderIdList *modifiedFolderIds, QMailThreadIdList *modifiedThreadIds,
+                                    QMailAccountIdList *modifiedAccountIds)
 {
-    return QMailStoreSql::addMessages(messages, addedMessageIds, addedThreadIds, updatedMessageIds, updatedThreadIds, modifiedFolderIds, modifiedThreadIds, modifiedAccountIds);
+    return QMailStoreSql::addMessages(messages, addedMessageIds, addedThreadIds, updatedMessageIds, updatedThreadIds,
+                                      modifiedFolderIds, modifiedThreadIds, modifiedAccountIds);
 }
 
 bool QMailStorePrivate::addThread(QMailThread *thread, QMailThreadIdList *addedThreadIds)
@@ -179,9 +185,14 @@ bool QMailStorePrivate::addThread(QMailThread *thread, QMailThreadIdList *addedT
 }
 
 bool QMailStorePrivate::removeAccounts(const QMailAccountKey &key,
-                                       QMailAccountIdList *deletedAccountIds, QMailFolderIdList *deletedFolderIds, QMailThreadIdList *deletedThreadIds, QMailMessageIdList *deletedMessageIds, QMailMessageIdList *updatedMessageIds, QMailFolderIdList *modifiedFolderIds, QMailThreadIdList *modifiedThreadIds, QMailAccountIdList *modifiedAccountIds)
-{
-    bool success = QMailStoreSql::removeAccounts(key, deletedAccountIds, deletedFolderIds, deletedThreadIds, deletedMessageIds, updatedMessageIds, modifiedFolderIds, modifiedThreadIds, modifiedAccountIds);
+                                       QMailAccountIdList *deletedAccountIds, QMailFolderIdList *deletedFolderIds,
+                                       QMailThreadIdList *deletedThreadIds, QMailMessageIdList *deletedMessageIds,
+                                       QMailMessageIdList *updatedMessageIds, QMailFolderIdList *modifiedFolderIds,
+                                       QMailThreadIdList *modifiedThreadIds, QMailAccountIdList *modifiedAccountIds)
+{
+    bool success = QMailStoreSql::removeAccounts(key, deletedAccountIds, deletedFolderIds, deletedThreadIds,
+                                                 deletedMessageIds, updatedMessageIds, modifiedFolderIds,
+                                                 modifiedThreadIds, modifiedAccountIds);
     if (success) {
         removeExpiredData(*deletedMessageIds, *deletedThreadIds, *deletedFolderIds, *deletedAccountIds);
         if (accountManager) {
@@ -195,9 +206,14 @@ bool QMailStorePrivate::removeAccounts(const QMailAccountKey &key,
 }
 
 bool QMailStorePrivate::removeFolders(const QMailFolderKey &key, QMailStore::MessageRemovalOption option,
-                                      QMailFolderIdList *deletedFolderIds, QMailMessageIdList *deletedMessageIds, QMailThreadIdList *deletedThreadIds, QMailMessageIdList *updatedMessageIds, QMailFolderIdList *modifiedFolderIds, QMailThreadIdList *modifiedThreadIds, QMailAccountIdList *modifiedAccountIds)
-{
-    bool success = QMailStoreSql::removeFolders(key, option, deletedFolderIds, deletedMessageIds, deletedThreadIds, updatedMessageIds, modifiedFolderIds, modifiedThreadIds, modifiedAccountIds);
+                                      QMailFolderIdList *deletedFolderIds, QMailMessageIdList *deletedMessageIds,
+                                      QMailThreadIdList *deletedThreadIds, QMailMessageIdList *updatedMessageIds,
+                                      QMailFolderIdList *modifiedFolderIds, QMailThreadIdList *modifiedThreadIds,
+                                      QMailAccountIdList *modifiedAccountIds)
+{
+    bool success = QMailStoreSql::removeFolders(key, option, deletedFolderIds, deletedMessageIds, deletedThreadIds,
+                                                updatedMessageIds, modifiedFolderIds, modifiedThreadIds,
+                                                modifiedAccountIds);
     if (success) {
         removeExpiredData(*deletedMessageIds, *deletedThreadIds, *deletedFolderIds);
     }
@@ -205,9 +221,12 @@ bool QMailStorePrivate::removeFolders(const QMailFolderKey &key, QMailStore::Mes
 }
 
 bool QMailStorePrivate::removeMessages(const QMailMessageKey &key, QMailStore::MessageRemovalOption option,
-                                       QMailMessageIdList *deletedMessageIds, QMailThreadIdList* deletedThreadIds, QMailMessageIdList *updatedMessageIds, QMailFolderIdList *modifiedFolderIds, QMailThreadIdList *modifiedThreadIds, QMailAccountIdList *modifiedAccountIds)
+                                       QMailMessageIdList *deletedMessageIds, QMailThreadIdList* deletedThreadIds,
+                                       QMailMessageIdList *updatedMessageIds, QMailFolderIdList *modifiedFolderIds,
+                                       QMailThreadIdList *modifiedThreadIds, QMailAccountIdList *modifiedAccountIds)
 {
-    bool success = QMailStoreSql::removeMessages(key, option, deletedMessageIds, deletedThreadIds, updatedMessageIds, modifiedFolderIds, modifiedThreadIds, modifiedAccountIds);
+    bool success = QMailStoreSql::removeMessages(key, option, deletedMessageIds, deletedThreadIds, updatedMessageIds,
+                                                 modifiedFolderIds, modifiedThreadIds, modifiedAccountIds);
     if (success) {
         removeExpiredData(*deletedMessageIds, *deletedThreadIds);
     }
@@ -215,9 +234,12 @@ bool QMailStorePrivate::removeMessages(const QMailMessageKey &key, QMailStore::M
 }
 
 bool QMailStorePrivate::removeThreads(const QMailThreadKey &key, QMailStore::MessageRemovalOption option,
-                               QMailThreadIdList *deletedThreads, QMailMessageIdList *deletedMessageIds, QMailMessageIdList *updatedMessageIds, QMailFolderIdList *modifiedFolderIds, QMailThreadIdList *modifiedThreadIds, QMailAccountIdList *modifiedAccountIds)
+                                      QMailThreadIdList *deletedThreads, QMailMessageIdList *deletedMessageIds,
+                                      QMailMessageIdList *updatedMessageIds, QMailFolderIdList *modifiedFolderIds,
+                                      QMailThreadIdList *modifiedThreadIds, QMailAccountIdList *modifiedAccountIds)
 {
-    bool success = QMailStoreSql::removeThreads(key, option, deletedThreads, deletedMessageIds, updatedMessageIds, modifiedFolderIds, modifiedThreadIds, modifiedAccountIds);
+    bool success = QMailStoreSql::removeThreads(key, option, deletedThreads, deletedMessageIds, updatedMessageIds,
+                                                modifiedFolderIds, modifiedThreadIds, modifiedAccountIds);
     if (success) {
         removeExpiredData(*deletedMessageIds, *deletedThreads);
     }
@@ -274,9 +296,12 @@ bool QMailStorePrivate::updateThread(QMailThread *thread,
 }
 
 bool QMailStorePrivate::updateMessages(const QList<QPair<QMailMessageMetaData*, QMailMessage*> > &messages,
-                                       QMailMessageIdList *updatedMessageIds, QMailThreadIdList *modifiedThreads, QMailMessageIdList *modifiedMessageIds, QMailFolderIdList *modifiedFolderIds, QMailAccountIdList *modifiedAccountIds)
+                                       QMailMessageIdList *updatedMessageIds, QMailThreadIdList *modifiedThreads,
+                                       QMailMessageIdList *modifiedMessageIds, QMailFolderIdList *modifiedFolderIds,
+                                       QMailAccountIdList *modifiedAccountIds)
 {
-    bool success = QMailStoreSql::updateMessages(messages, updatedMessageIds, modifiedThreads, modifiedMessageIds, modifiedFolderIds, modifiedAccountIds);
+    bool success = QMailStoreSql::updateMessages(messages, updatedMessageIds, modifiedThreads, modifiedMessageIds,
+                                                 modifiedFolderIds, modifiedAccountIds);
     if (success) {
         for (const QPair<QMailMessageMetaData*, QMailMessage*> &message : messages) {
             QMailMessageMetaData *metaData = message.first;
@@ -416,10 +441,17 @@ void QMailStorePrivate::updateMessageValues(const QMailMessageKey::Properties& p
     metaData->setStatus(QMailMessage::UnloadedData, true);
 }
 
-bool QMailStorePrivate::updateMessagesMetaData(const QMailMessageKey &key, const QMailMessageKey::Properties &properties, const QMailMessageMetaData &data,
-                                               QMailMessageIdList *updatedMessageIds, QMailThreadIdList *deletedThreads, QMailThreadIdList *modifiedThreads, QMailFolderIdList *modifiedFolderIds, QMailAccountIdList *modifiedAccountIds)
+bool QMailStorePrivate::updateMessagesMetaData(const QMailMessageKey &key,
+                                               const QMailMessageKey::Properties &properties,
+                                               const QMailMessageMetaData &data,
+                                               QMailMessageIdList *updatedMessageIds,
+                                               QMailThreadIdList *deletedThreads,
+                                               QMailThreadIdList *modifiedThreads,
+                                               QMailFolderIdList *modifiedFolderIds,
+                                               QMailAccountIdList *modifiedAccountIds)
 {
-    bool success = QMailStoreSql::updateMessagesMetaData(key, properties, data, updatedMessageIds, deletedThreads, modifiedThreads, modifiedFolderIds, modifiedAccountIds);
+    bool success = QMailStoreSql::updateMessagesMetaData(key, properties, data, updatedMessageIds, deletedThreads,
+                                                         modifiedThreads, modifiedFolderIds, modifiedAccountIds);
     if (success) {
         // Update the header cache
         foreach (const QMailMessageId& id, *updatedMessageIds) {
@@ -440,9 +472,13 @@ bool QMailStorePrivate::updateMessagesMetaData(const QMailMessageKey &key, const
 }
 
 bool QMailStorePrivate::updateMessagesMetaData(const QMailMessageKey &key, quint64 status, bool set,
-                                               QMailMessageIdList *updatedMessageIds, QMailThreadIdList *modifiedThreads, QMailFolderIdList *modifiedFolderIds, QMailAccountIdList *modifiedAccountIds)
+                                               QMailMessageIdList *updatedMessageIds,
+                                               QMailThreadIdList *modifiedThreads,
+                                               QMailFolderIdList *modifiedFolderIds,
+                                               QMailAccountIdList *modifiedAccountIds)
 {
-    bool success = QMailStoreSql::updateMessagesMetaData(key, status, set, updatedMessageIds, modifiedThreads, modifiedFolderIds, modifiedAccountIds);
+    bool success = QMailStoreSql::updateMessagesMetaData(key, status, set, updatedMessageIds, modifiedThreads,
+                                                         modifiedFolderIds, modifiedAccountIds);
     if (success) {
         // Update the header cache
         foreach (const QMailMessageId& id, *updatedMessageIds) {
@@ -453,7 +489,8 @@ bool QMailStorePrivate::updateMessagesMetaData(const QMailMessageKey &key, quint
                 cachedMetaData.setStatus(newStatus);
                 cachedMetaData.setUnmodified();
                 messageCache.insert(cachedMetaData);
-                uidCache.insert(qMakePair(cachedMetaData.parentAccountId(), cachedMetaData.serverUid()), cachedMetaData.id());
+                uidCache.insert(qMakePair(cachedMetaData.parentAccountId(), cachedMetaData.serverUid()),
+                                cachedMetaData.id());
             }
         }
 
@@ -539,27 +576,31 @@ QMailAccountIdList QMailStorePrivate::queryExternalAccounts(const QMailAccountKe
     return accountManager ? accountManager->queryAccounts(key) : QMailAccountIdList();
 }
 
-QMailAccountIdList QMailStorePrivate::queryAccounts(const QMailAccountKey &key, const QMailAccountSortKey &sortKey, uint limit, uint offset) const
+QMailAccountIdList QMailStorePrivate::queryAccounts(const QMailAccountKey &key, const QMailAccountSortKey &sortKey,
+                                                    uint limit, uint offset) const
 {
     return accountManager ? accountManager->queryAccounts(key, sortKey, limit, offset)
         : QMailStoreSql::queryAccounts(key, sortKey, limit, offset);
 }
 
-QMailFolderIdList QMailStorePrivate::queryFolders(const QMailFolderKey &key, const QMailFolderSortKey &sortKey, uint limit, uint offset) const
+QMailFolderIdList QMailStorePrivate::queryFolders(const QMailFolderKey &key, const QMailFolderSortKey &sortKey,
+                                                  uint limit, uint offset) const
 {
     return QMailStoreSql::queryFolders(key, sortKey, limit, offset);
 }
 
-QMailMessageIdList QMailStorePrivate::queryMessages(const QMailMessageKey &key, const QMailMessageSortKey &sortKey, uint limit, uint offset) const
+QMailMessageIdList QMailStorePrivate::queryMessages(const QMailMessageKey &key, const QMailMessageSortKey &sortKey,
+                                                    uint limit, uint offset) const
 {
-    //store the results of this call for cache preloading
+    // store the results of this call for cache preloading
     lastQueryMessageResult = QMailStoreSql::queryMessages(key, sortKey, limit, offset);
     return lastQueryMessageResult;
 }
 
-QMailThreadIdList QMailStorePrivate::queryThreads(const QMailThreadKey &key, const QMailThreadSortKey &sortKey, uint limit, uint offset) const
+QMailThreadIdList QMailStorePrivate::queryThreads(const QMailThreadKey &key, const QMailThreadSortKey &sortKey,
+                                                  uint limit, uint offset) const
 {
-    //store the results of this call for cache preloading
+    // store the results of this call for cache preloading
     lastQueryThreadResult = QMailStoreSql::queryThreads(key, sortKey, limit, offset);
     return lastQueryThreadResult;
 }
@@ -580,7 +621,7 @@ QMailAccount QMailStorePrivate::account(const QMailAccountId &id) const
                 result.setStandardFolder(it.key(), it.value());
             }
         }
-        //update cache
+        // update cache
         accountCache.insert(result);
     }
     return result;
@@ -670,7 +711,9 @@ QMailMessageMetaData QMailStorePrivate::messageMetaData(const QString &uid, cons
     return metaData;
 }
 
-QMailMessageMetaDataList QMailStorePrivate::messagesMetaData(const QMailMessageKey &key, const QMailMessageKey::Properties &properties, QMailStore::ReturnOption option) const
+QMailMessageMetaDataList QMailStorePrivate::messagesMetaData(const QMailMessageKey &key,
+                                                             const QMailMessageKey::Properties &properties,
+                                                             QMailStore::ReturnOption option) const
 {
     return QMailStoreSql::messagesMetaData(key, properties, option);
 }
@@ -680,7 +723,8 @@ QMailThreadList QMailStorePrivate::threads(const QMailThreadKey &key, QMailStore
     return QMailStoreSql::threads(key, option);
 }
 
-QMailMessageRemovalRecordList QMailStorePrivate::messageRemovalRecords(const QMailAccountId &accountId, const QMailFolderId &folderId) const
+QMailMessageRemovalRecordList QMailStorePrivate::messageRemovalRecords(const QMailAccountId &accountId,
+                                                                       const QMailFolderId &folderId) const
 {
     return QMailStoreSql::messageRemovalRecords(accountId, folderId);
 }
@@ -715,7 +759,8 @@ quint64 QMailStorePrivate::messageStatusMask(const QString &name) const
     return QMailStoreSql::messageStatusMask(name);
 }
 
-void QMailStorePrivate::removeExpiredData(const QMailMessageIdList& messageIds, const QMailThreadIdList& threadIds, const QMailFolderIdList& folderIds, const QMailAccountIdList& accountIds)
+void QMailStorePrivate::removeExpiredData(const QMailMessageIdList& messageIds, const QMailThreadIdList& threadIds,
+                                          const QMailFolderIdList& folderIds, const QMailAccountIdList& accountIds)
 {
     foreach (const QMailMessageId& id, messageIds) {
         messageCache.remove(id);
@@ -798,9 +843,9 @@ void QMailStorePrivate::preloadHeaderCache(const QMailMessageId& id) const
             uidCache.insert(qMakePair(metaData.parentAccountId(), metaData.serverUid()), metaData.id());
             if (metaData.id() == id) {
                 result = metaData;
+            }
         }
     }
-    }
 }
 
 void QMailStorePrivate::preloadThreadCache(const QMailThreadId& id) const
@@ -1014,7 +1059,6 @@ void QMailStorePrivate::messageMetaDataRemotelyChanged(QMailStore::ChangeType ch
                                                        const QMailMessageMetaDataList &data)
 {
     if (!data.isEmpty()) {
-
         QMailMessageIdList ids;
 
         for (const QMailMessageMetaData& metaData : data) {
@@ -1036,7 +1080,6 @@ void QMailStorePrivate::messageMetaDataRemotelyChanged(QMailStore::ChangeType ch
             break;
         }
     }
-
 }
 
 void QMailStorePrivate::messagePropertiesRemotelyChanged(const QMailMessageIdList& ids,
@@ -1139,7 +1182,6 @@ void QMailStorePrivate::messagePropertiesRemotelyChanged(const QMailMessageIdLis
 
             metaData.setUnmodified();
             messageCache.insert(metaData);
-
         }
     }
 
diff --git a/src/libraries/qmfclient/qmailstoreimplementation_p.cpp b/src/libraries/qmfclient/qmailstoreimplementation_p.cpp
index 0908183a..d3021eab 100644
--- a/src/libraries/qmfclient/qmailstoreimplementation_p.cpp
+++ b/src/libraries/qmfclient/qmailstoreimplementation_p.cpp
@@ -85,12 +85,16 @@ bool QMailStoreNullImplementation::addFolder(QMailFolder *, QMailFolderIdList *,
     return false;
 }
 
-bool QMailStoreNullImplementation::addMessages(const QList<QMailMessage *> &, QMailMessageIdList *, QMailThreadIdList *, QMailMessageIdList *, QMailThreadIdList *, QMailFolderIdList *, QMailThreadIdList *, QMailAccountIdList *)
+bool QMailStoreNullImplementation::addMessages(const QList<QMailMessage *> &, QMailMessageIdList *,
+                                               QMailThreadIdList *, QMailMessageIdList *, QMailThreadIdList *,
+                                               QMailFolderIdList *, QMailThreadIdList *, QMailAccountIdList *)
 {
     return false;
 }
 
-bool QMailStoreNullImplementation::addMessages(const QList<QMailMessageMetaData *> &, QMailMessageIdList *, QMailThreadIdList *, QMailMessageIdList *, QMailThreadIdList *, QMailFolderIdList *, QMailThreadIdList *, QMailAccountIdList *)
+bool QMailStoreNullImplementation::addMessages(const QList<QMailMessageMetaData *> &, QMailMessageIdList *,
+                                               QMailThreadIdList *, QMailMessageIdList *, QMailThreadIdList *,
+                                               QMailFolderIdList *, QMailThreadIdList *, QMailAccountIdList *)
 {
     return false;
 }
@@ -100,17 +104,24 @@ bool QMailStoreNullImplementation::addThread(QMailThread *, QMailThreadIdList *)
     return false;
 }
 
-bool QMailStoreNullImplementation::removeAccounts(const QMailAccountKey &, QMailAccountIdList *, QMailFolderIdList *, QMailThreadIdList *, QMailMessageIdList *, QMailMessageIdList *, QMailFolderIdList *, QMailThreadIdList *, QMailAccountIdList *)
+bool QMailStoreNullImplementation::removeAccounts(const QMailAccountKey &, QMailAccountIdList *, QMailFolderIdList *,
+                                                  QMailThreadIdList *, QMailMessageIdList *, QMailMessageIdList *,
+                                                  QMailFolderIdList *, QMailThreadIdList *, QMailAccountIdList *)
 {
     return false;
 }
 
-bool QMailStoreNullImplementation::removeFolders(const QMailFolderKey &, QMailStore::MessageRemovalOption, QMailFolderIdList *, QMailMessageIdList *, QMailThreadIdList *, QMailMessageIdList *, QMailFolderIdList *, QMailThreadIdList *, QMailAccountIdList *)
+bool QMailStoreNullImplementation::removeFolders(const QMailFolderKey &, QMailStore::MessageRemovalOption,
+                                                 QMailFolderIdList *, QMailMessageIdList *, QMailThreadIdList *,
+                                                 QMailMessageIdList *, QMailFolderIdList *, QMailThreadIdList *,
+                                                 QMailAccountIdList *)
 {
     return false;
 }
 
-bool QMailStoreNullImplementation::removeMessages(const QMailMessageKey &, QMailStore::MessageRemovalOption, QMailMessageIdList *, QMailThreadIdList*, QMailMessageIdList *, QMailFolderIdList *, QMailThreadIdList *, QMailAccountIdList *)
+bool QMailStoreNullImplementation::removeMessages(const QMailMessageKey &, QMailStore::MessageRemovalOption,
+                                                  QMailMessageIdList *, QMailThreadIdList*, QMailMessageIdList *,
+                                                  QMailFolderIdList *, QMailThreadIdList *, QMailAccountIdList *)
 {
     return false;
 }
@@ -137,17 +148,24 @@ bool QMailStoreNullImplementation::updateFolder(QMailFolder *, QMailFolderIdList
     return false;
 }
 
-bool QMailStoreNullImplementation::updateMessages(const QList<QPair<QMailMessageMetaData *, QMailMessage *> > &, QMailMessageIdList *, QMailThreadIdList *, QMailMessageIdList *, QMailFolderIdList *, QMailAccountIdList *)
+bool QMailStoreNullImplementation::updateMessages(const QList<QPair<QMailMessageMetaData *, QMailMessage *> > &,
+                                                  QMailMessageIdList *, QMailThreadIdList *, QMailMessageIdList *,
+                                                  QMailFolderIdList *, QMailAccountIdList *)
 {
     return false;
 }
 
-bool QMailStoreNullImplementation::updateMessagesMetaData(const QMailMessageKey &, const QMailMessageKey::Properties &, const QMailMessageMetaData &, QMailMessageIdList *, QMailThreadIdList *, QMailThreadIdList *, QMailFolderIdList *, QMailAccountIdList *)
+bool QMailStoreNullImplementation::updateMessagesMetaData(const QMailMessageKey &, const QMailMessageKey::Properties &,
+                                                          const QMailMessageMetaData &, QMailMessageIdList *,
+                                                          QMailThreadIdList *, QMailThreadIdList *,
+                                                          QMailFolderIdList *, QMailAccountIdList *)
 {
     return false;
 }
 
-bool QMailStoreNullImplementation::updateMessagesMetaData(const QMailMessageKey &, quint64, bool, QMailMessageIdList *, QMailThreadIdList *, QMailFolderIdList *, QMailAccountIdList *)
+bool QMailStoreNullImplementation::updateMessagesMetaData(const QMailMessageKey &, quint64, bool,
+                                                          QMailMessageIdList *, QMailThreadIdList *,
+                                                          QMailFolderIdList *, QMailAccountIdList *)
 {
     return false;
 }
@@ -200,22 +218,26 @@ int QMailStoreNullImplementation::sizeOfMessages(const QMailMessageKey &) const
     return 0;
 }
 
-QMailAccountIdList QMailStoreNullImplementation::queryAccounts(const QMailAccountKey &, const QMailAccountSortKey &, uint, uint) const
+QMailAccountIdList QMailStoreNullImplementation::queryAccounts(const QMailAccountKey &, const QMailAccountSortKey &,
+                                                               uint, uint) const
 {
     return QMailAccountIdList();
 }
 
-QMailFolderIdList QMailStoreNullImplementation::queryFolders(const QMailFolderKey &, const QMailFolderSortKey &, uint, uint) const
+QMailFolderIdList QMailStoreNullImplementation::queryFolders(const QMailFolderKey &, const QMailFolderSortKey &,
+                                                             uint, uint) const
 {
     return QMailFolderIdList();
 }
 
-QMailMessageIdList QMailStoreNullImplementation::queryMessages(const QMailMessageKey &, const QMailMessageSortKey &, uint, uint) const
+QMailMessageIdList QMailStoreNullImplementation::queryMessages(const QMailMessageKey &, const QMailMessageSortKey &,
+                                                               uint, uint) const
 {
     return QMailMessageIdList();
 }
 
-QMailThreadIdList QMailStoreNullImplementation::queryThreads(const QMailThreadKey &, const QMailThreadSortKey &, uint, uint) const
+QMailThreadIdList QMailStoreNullImplementation::queryThreads(const QMailThreadKey &, const QMailThreadSortKey &,
+                                                             uint, uint) const
 {
     return QMailThreadIdList();
 }
@@ -260,7 +282,9 @@ QMailMessageMetaData QMailStoreNullImplementation::messageMetaData(const QString
     return QMailMessageMetaData();
 }
 
-QMailMessageMetaDataList QMailStoreNullImplementation::messagesMetaData(const QMailMessageKey &, const QMailMessageKey::Properties &, QMailStore::ReturnOption) const
+QMailMessageMetaDataList QMailStoreNullImplementation::messagesMetaData(const QMailMessageKey &,
+                                                                        const QMailMessageKey::Properties &,
+                                                                        QMailStore::ReturnOption) const
 {
     return QMailMessageMetaDataList();
 }
@@ -270,7 +294,8 @@ QMailThreadList QMailStoreNullImplementation::threads(const QMailThreadKey &, QM
     return QMailThreadList();
 }
 
-QMailMessageRemovalRecordList QMailStoreNullImplementation::messageRemovalRecords(const QMailAccountId &, const QMailFolderId &) const
+QMailMessageRemovalRecordList QMailStoreNullImplementation::messageRemovalRecords(const QMailAccountId &,
+                                                                                  const QMailFolderId &) const
 {
     return QMailMessageRemovalRecordList();
 }
diff --git a/src/libraries/qmfclient/qmailstoreimplementation_p.h b/src/libraries/qmfclient/qmailstoreimplementation_p.h
index 19e79446..124c35d3 100644
--- a/src/libraries/qmfclient/qmailstoreimplementation_p.h
+++ b/src/libraries/qmfclient/qmailstoreimplementation_p.h
@@ -78,25 +78,41 @@ public:
                            QMailFolderIdList *addedFolderIds, QMailAccountIdList *modifiedAccountIds) = 0;
 
     virtual bool addMessages(const QList<QMailMessage *> &m,
-                             QMailMessageIdList *addedMessageIds, QMailThreadIdList *addedThreadIds, QMailMessageIdList *updatedMessageIds, QMailThreadIdList *updatedThreadIds, QMailFolderIdList *modifiedFolderIds, QMailThreadIdList *modifiedThreadIds, QMailAccountIdList *modifiedAccountIds) = 0;
+                             QMailMessageIdList *addedMessageIds, QMailThreadIdList *addedThreadIds,
+                             QMailMessageIdList *updatedMessageIds, QMailThreadIdList *updatedThreadIds,
+                             QMailFolderIdList *modifiedFolderIds, QMailThreadIdList *modifiedThreadIds,
+                             QMailAccountIdList *modifiedAccountIds) = 0;
 
     virtual bool addMessages(const QList<QMailMessageMetaData *> &m,
-                             QMailMessageIdList *addedMessageIds, QMailThreadIdList *addedThreadIds, QMailMessageIdList *updatedMessageIds, QMailThreadIdList *updatedThreadIds, QMailFolderIdList *modifiedFolderIds, QMailThreadIdList *modifiedThreadIds, QMailAccountIdList *modifiedAccountIds) = 0;
+                             QMailMessageIdList *addedMessageIds, QMailThreadIdList *addedThreadIds,
+                             QMailMessageIdList *updatedMessageIds, QMailThreadIdList *updatedThreadIds,
+                             QMailFolderIdList *modifiedFolderIds, QMailThreadIdList *modifiedThreadIds,
+                             QMailAccountIdList *modifiedAccountIds) = 0;
 
     virtual bool addThread(QMailThread *f,
                            QMailThreadIdList *addedThreadIds) = 0;
 
     virtual bool removeAccounts(const QMailAccountKey &key,
-                                QMailAccountIdList *deletedAccounts, QMailFolderIdList *deletedFolders, QMailThreadIdList *deletedThreadIds, QMailMessageIdList *deletedMessages, QMailMessageIdList *updatedMessages, QMailFolderIdList *modifiedFolderIds, QMailThreadIdList *modifiedThreadIds, QMailAccountIdList *modifiedAccountIds) = 0;
+                                QMailAccountIdList *deletedAccounts, QMailFolderIdList *deletedFolders,
+                                QMailThreadIdList *deletedThreadIds, QMailMessageIdList *deletedMessages,
+                                QMailMessageIdList *updatedMessages, QMailFolderIdList *modifiedFolderIds,
+                                QMailThreadIdList *modifiedThreadIds, QMailAccountIdList *modifiedAccountIds) = 0;
 
     virtual bool removeFolders(const QMailFolderKey &key, QMailStore::MessageRemovalOption option,
-                               QMailFolderIdList *deletedFolders, QMailMessageIdList *deletedMessages, QMailThreadIdList *deletedThreadIds, QMailMessageIdList *updatedMessages, QMailFolderIdList *modifiedFolderIds, QMailThreadIdList *modifiedThreadIds, QMailAccountIdList *modifiedAccountIds) = 0;
+                               QMailFolderIdList *deletedFolders, QMailMessageIdList *deletedMessages,
+                               QMailThreadIdList *deletedThreadIds, QMailMessageIdList *updatedMessages,
+                               QMailFolderIdList *modifiedFolderIds, QMailThreadIdList *modifiedThreadIds,
+                               QMailAccountIdList *modifiedAccountIds) = 0;
 
     virtual bool removeMessages(const QMailMessageKey &key, QMailStore::MessageRemovalOption option,
-                                QMailMessageIdList *deletedMessages, QMailThreadIdList *deletedThreadIds, QMailMessageIdList *updatedMessages, QMailFolderIdList *modifiedFolderIds, QMailThreadIdList *modifiedThreadIds, QMailAccountIdList *modifiedAccountIds) = 0;
+                                QMailMessageIdList *deletedMessages, QMailThreadIdList *deletedThreadIds,
+                                QMailMessageIdList *updatedMessages, QMailFolderIdList *modifiedFolderIds,
+                                QMailThreadIdList *modifiedThreadIds, QMailAccountIdList *modifiedAccountIds) = 0;
 
     virtual bool removeThreads(const QMailThreadKey &key, QMailStore::MessageRemovalOption option,
-                               QMailThreadIdList *deletedThreads, QMailMessageIdList *deletedMessageIds, QMailMessageIdList *updatedMessageIds, QMailFolderIdList *modifiedFolderIds, QMailThreadIdList *modifiedThreadIdList, QMailAccountIdList *modifiedAccountIds) = 0;
+                               QMailThreadIdList *deletedThreads, QMailMessageIdList *deletedMessageIds,
+                               QMailMessageIdList *updatedMessageIds, QMailFolderIdList *modifiedFolderIds,
+                               QMailThreadIdList *modifiedThreadIdList, QMailAccountIdList *modifiedAccountIds) = 0;
 
     virtual bool updateAccount(QMailAccount *account, QMailAccountConfiguration* config,
                                QMailAccountIdList *updatedAccountIds) = 0;
@@ -108,13 +124,19 @@ public:
                               QMailFolderIdList *updatedFolderIds, QMailAccountIdList *modifiedAccountIds) = 0;
 
     virtual bool updateMessages(const QList<QPair<QMailMessageMetaData *, QMailMessage *> > &m,
-                                QMailMessageIdList *updatedMessageIds, QMailThreadIdList *modifiedThreads, QMailMessageIdList *modifiedMessageIds, QMailFolderIdList *modifiedFolderIds, QMailAccountIdList *modifiedAccountIds) = 0;
+                                QMailMessageIdList *updatedMessageIds, QMailThreadIdList *modifiedThreads,
+                                QMailMessageIdList *modifiedMessageIds, QMailFolderIdList *modifiedFolderIds,
+                                QMailAccountIdList *modifiedAccountIds) = 0;
 
-    virtual bool updateMessagesMetaData(const QMailMessageKey &key, const QMailMessageKey::Properties &properties, const QMailMessageMetaData &data,
-                                        QMailMessageIdList *updatedMessageIds, QMailThreadIdList *deletedThreads, QMailThreadIdList *modifiedThreads, QMailFolderIdList *modifiedFolderIds, QMailAccountIdList *modifiedAccountIds) = 0;
+    virtual bool updateMessagesMetaData(const QMailMessageKey &key, const QMailMessageKey::Properties &properties,
+                                        const QMailMessageMetaData &data,
+                                        QMailMessageIdList *updatedMessageIds, QMailThreadIdList *deletedThreads,
+                                        QMailThreadIdList *modifiedThreads, QMailFolderIdList *modifiedFolderIds,
+                                        QMailAccountIdList *modifiedAccountIds) = 0;
 
     virtual bool updateMessagesMetaData(const QMailMessageKey &key, quint64 messageStatus, bool set,
-                                        QMailMessageIdList *updatedMessageIds, QMailThreadIdList *modifiedThreads, QMailFolderIdList *modifiedFolderIds, QMailAccountIdList *modifiedAccountIds) = 0;
+                                        QMailMessageIdList *updatedMessageIds, QMailThreadIdList *modifiedThreads,
+                                        QMailFolderIdList *modifiedFolderIds, QMailAccountIdList *modifiedAccountIds) = 0;
 
     virtual bool updateThread(QMailThread *t,
                               QMailThreadIdList *updatedThreadIds) = 0;
@@ -128,10 +150,14 @@ public:
 
     virtual int sizeOfMessages(const QMailMessageKey &key) const = 0;
 
-    virtual QMailAccountIdList queryAccounts(const QMailAccountKey &key, const QMailAccountSortKey &sortKey, uint limit, uint offset) const = 0;
-    virtual QMailFolderIdList queryFolders(const QMailFolderKey &key, const QMailFolderSortKey &sortKey, uint limit, uint offset) const = 0;
-    virtual QMailMessageIdList queryMessages(const QMailMessageKey &key, const QMailMessageSortKey &sortKey, uint limit, uint offset) const = 0;
-    virtual QMailThreadIdList queryThreads(const QMailThreadKey &key, const QMailThreadSortKey &sortKey, uint limit, uint offset) const = 0;
+    virtual QMailAccountIdList queryAccounts(const QMailAccountKey &key, const QMailAccountSortKey &sortKey,
+                                             uint limit, uint offset) const = 0;
+    virtual QMailFolderIdList queryFolders(const QMailFolderKey &key, const QMailFolderSortKey &sortKey,
+                                           uint limit, uint offset) const = 0;
+    virtual QMailMessageIdList queryMessages(const QMailMessageKey &key, const QMailMessageSortKey &sortKey,
+                                             uint limit, uint offset) const = 0;
+    virtual QMailThreadIdList queryThreads(const QMailThreadKey &key, const QMailThreadSortKey &sortKey,
+                                           uint limit, uint offset) const = 0;
 
     virtual QMailAccount account(const QMailAccountId &id) const = 0;
     virtual QMailAccountConfiguration accountConfiguration(const QMailAccountId &id) const = 0;
@@ -145,11 +171,14 @@ public:
 
     virtual QMailMessageMetaData messageMetaData(const QMailMessageId &id) const = 0;
     virtual QMailMessageMetaData messageMetaData(const QString &uid, const QMailAccountId &accountId) const = 0;
-    virtual QMailMessageMetaDataList messagesMetaData(const QMailMessageKey &key, const QMailMessageKey::Properties &properties, QMailStore::ReturnOption option) const = 0;
+    virtual QMailMessageMetaDataList messagesMetaData(const QMailMessageKey &key,
+                                                      const QMailMessageKey::Properties &properties,
+                                                      QMailStore::ReturnOption option) const = 0;
 
     virtual QMailThreadList threads(const QMailThreadKey &key, QMailStore::ReturnOption option) const = 0;
 
-    virtual QMailMessageRemovalRecordList messageRemovalRecords(const QMailAccountId &parentAccountId, const QMailFolderId &parentFolderId) const = 0;
+    virtual QMailMessageRemovalRecordList messageRemovalRecords(const QMailAccountId &parentAccountId,
+                                                                const QMailFolderId &parentFolderId) const = 0;
 
     virtual bool registerAccountStatusFlag(const QString &name) = 0;
     virtual quint64 accountStatusMask(const QString &name) const = 0;
diff --git a/src/libraries/qmfclient/qmailstoresql_p.cpp b/src/libraries/qmfclient/qmailstoresql_p.cpp
index 57c35af7..bc68953d 100644
--- a/src/libraries/qmfclient/qmailstoresql_p.cpp
+++ b/src/libraries/qmfclient/qmailstoresql_p.cpp
@@ -8879,10 +8879,14 @@ bool QMailStoreSql::recalculateThreadsColumns(const QMailThreadIdList& modifiedT
         thread.setUnreadCount(unreadCount);
         thread.setStatus(status);
         thread.setSenders(QMailAddress::fromStringList(senders));
-        QMailThreadKey::Properties props(QMailThreadKey::MessageCount | QMailThreadKey::UnreadCount |
-                                         QMailThreadKey::LastDate | QMailThreadKey::StartedDate |
-                                         QMailThreadKey::Preview | QMailThreadKey::Subject |
-                                         QMailThreadKey::Status | QMailThreadKey::Senders);
+        QMailThreadKey::Properties props(QMailThreadKey::MessageCount
+                                         | QMailThreadKey::UnreadCount
+                                         | QMailThreadKey::LastDate
+                                         | QMailThreadKey::StartedDate
+                                         | QMailThreadKey::Preview
+                                         | QMailThreadKey::Subject
+                                         | QMailThreadKey::Status
+                                         | QMailThreadKey::Senders);
 
         QSqlQuery query(simpleQuery(QString::fromLatin1("UPDATE mailthreads SET %1 WHERE id=?").arg(expandProperties(props, true)),
                                     QVariantList() << threadValues(props, thread) << threadId.toULongLong(),
diff --git a/src/libraries/qmfclient/qmailstoresql_p.h b/src/libraries/qmfclient/qmailstoresql_p.h
index 30fd4946..0fa2209d 100644
--- a/src/libraries/qmfclient/qmailstoresql_p.h
+++ b/src/libraries/qmfclient/qmailstoresql_p.h
@@ -455,10 +455,10 @@ private:
     bool obsoleteContent(const QString& identifier);
 
     template<typename AccessType, typename FunctionType>
-    bool repeatedly(FunctionType func, const QString &description, Transaction *t = Q_NULLPTR) const;
+    bool repeatedly(FunctionType func, const QString &description, Transaction *t = nullptr) const;
 
     quint64 threadId(const QMailMessageId &id);
-    AttemptResult updateLatestInConversation(quint64 threadId, QMailMessageIdList *messagesUpdated, quint64 *updatedTo = Q_NULLPTR);
+    AttemptResult updateLatestInConversation(quint64 threadId, QMailMessageIdList *messagesUpdated, quint64 *updatedTo = nullptr);
     AttemptResult updateLatestInConversation(const QSet<quint64> &threadIds, QMailMessageIdList *messagesUpdated);
 
     AttemptResult addCustomFields(quint64 id, const QMap<QString, QString> &fields, const QString &tableName);
diff --git a/src/libraries/qmfclient/qmailthreadlistmodel.h b/src/libraries/qmfclient/qmailthreadlistmodel.h
index 28ec7ca1..6d6e2e1d 100644
--- a/src/libraries/qmfclient/qmailthreadlistmodel.h
+++ b/src/libraries/qmfclient/qmailthreadlistmodel.h
@@ -56,7 +56,7 @@ public:
         ThreadIdRole
     };
 
-    QMailThreadListModel(QObject *parent = Q_NULLPTR);
+    QMailThreadListModel(QObject *parent = nullptr);
     virtual ~QMailThreadListModel();
 
     int rowCount(const QModelIndex& index = QModelIndex()) const override;
diff --git a/src/libraries/qmfclient/support/qmailnamespace.h b/src/libraries/qmfclient/support/qmailnamespace.h
index f51a96c7..32a3199b 100644
--- a/src/libraries/qmfclient/support/qmailnamespace.h
+++ b/src/libraries/qmfclient/support/qmailnamespace.h
@@ -36,7 +36,6 @@
 
 #include "qmailglobal.h"
 #include "qmailaccount.h"
-#include "qmailfolder.h"
 
 #include <QDate>
 #include <QString>
diff --git a/src/libraries/qmfmessageserver/qmailcredentials.h b/src/libraries/qmfmessageserver/qmailcredentials.h
index 1de02ff6..5aa0b41f 100644
--- a/src/libraries/qmfmessageserver/qmailcredentials.h
+++ b/src/libraries/qmfmessageserver/qmailcredentials.h
@@ -94,6 +94,7 @@ protected:
 private:
     QScopedPointer<QMailCredentialsInterfacePrivate> d;
 };
+
 QT_BEGIN_NAMESPACE
 Q_DECLARE_INTERFACE(QMailCredentialsInterface, "org.qt-project.Qt.QMailCredentialsInterface")
 QT_END_NAMESPACE
@@ -109,6 +110,7 @@ public:
     virtual QString key() const = 0;
     virtual QMailCredentialsInterface *createCredentialsHandler(QObject *parent = nullptr) = 0;
 };
+
 QT_BEGIN_NAMESPACE
 Q_DECLARE_INTERFACE(QMailCredentialsPlugin, "org.qt-project.Qt.QMailCredentialsPlugin")
 QT_END_NAMESPACE
diff --git a/src/libraries/qmfmessageserver/qmailmessagebuffer.h b/src/libraries/qmfmessageserver/qmailmessagebuffer.h
index 6792c3d0..dde042e2 100644
--- a/src/libraries/qmfmessageserver/qmailmessagebuffer.h
+++ b/src/libraries/qmfmessageserver/qmailmessagebuffer.h
@@ -55,7 +55,7 @@ class MESSAGESERVER_EXPORT QMailMessageBuffer : public QObject
 {
     Q_OBJECT
 public:
-    QMailMessageBuffer(QObject *parent = Q_NULLPTR);
+    QMailMessageBuffer(QObject *parent = nullptr);
     virtual ~QMailMessageBuffer();
 
     static QMailMessageBuffer *instance();
diff --git a/src/libraries/qmfmessageserver/qmailmessageserverplugin.h b/src/libraries/qmfmessageserver/qmailmessageserverplugin.h
index 7dacf042..0303d044 100644
--- a/src/libraries/qmfmessageserver/qmailmessageserverplugin.h
+++ b/src/libraries/qmfmessageserver/qmailmessageserverplugin.h
@@ -52,7 +52,7 @@ class MESSAGESERVER_EXPORT QMailMessageServerPlugin : public QObject
     Q_OBJECT
 
 public:
-    QMailMessageServerPlugin(QObject* parent = Q_NULLPTR);
+    QMailMessageServerPlugin(QObject* parent = nullptr);
     ~QMailMessageServerPlugin();
 
     virtual QString key() const = 0;
diff --git a/src/libraries/qmfmessageserver/qmailmessageservice.cpp b/src/libraries/qmfmessageserver/qmailmessageservice.cpp
index b41aa061..aa689c35 100644
--- a/src/libraries/qmfmessageserver/qmailmessageservice.cpp
+++ b/src/libraries/qmfmessageserver/qmailmessageservice.cpp
@@ -78,7 +78,7 @@ QMailMessageServicePlugin *mapping(const QString &key)
         return it.value();
 
     qCWarning(lcMessaging) << "Unable to map service for key:" << key;
-    return 0;
+    return nullptr;
 }
 
 }
@@ -159,7 +159,7 @@ QMailMessageService *QMailMessageServiceFactory::createService(const QString &ke
     if (QMailMessageServicePlugin* plugin = mapping(key))
         return plugin->createService(accountId);
 
-    return 0;
+    return nullptr;
 }
 
 /*!
@@ -293,7 +293,7 @@ bool appendErrorText(QString* message, int code, const ErrorMap& map)
 {
     const ErrorEntry *it = map.first, *end = map.first + map.second; // ptr arithmetic!
 
-    for ( ; it != end; ++it)
+    for ( ; it != end; ++it) {
         if (it->code == code) {
             QString extra(qApp->translate("QMailServiceAction", it->text));
             if (!extra.isEmpty()) {
@@ -305,6 +305,7 @@ bool appendErrorText(QString* message, int code, const ErrorMap& map)
             }
             return true;
         }
+    }
 
     return false;
 }
@@ -327,7 +328,8 @@ void decorate(QString* message, int code, const ErrorSet& errorSet)
         message->append(QChar::fromLatin1(' ')
                         + (QObject::tr("Storage for messages is full. Some new messages could not be retrieved.")));
     } else if (code == QMailServiceAction::Status::ErrEnqueueFailed) {
-        message->append(QString::fromLatin1("\n").append(qApp->translate("QMailServiceAction", "Unable to send; message moved to Drafts folder")));
+        message->append(QString::fromLatin1("\n").append(qApp->translate("QMailServiceAction",
+                                                                         "Unable to send; message moved to Drafts folder")));
     } else if (code == QMailServiceAction::Status::ErrUnknownResponse) {
         message->prepend(qApp->translate("QMailServiceAction", "Unexpected response from server: "));
     } else {
@@ -420,7 +422,8 @@ QMailStore::MessageRemovalOption QMailMessageSource::messageRemovalOption() cons
 
     \sa retrieveMessageList(), retrieveMessageLists()
 */
-bool QMailMessageSource::retrieveFolderList(const QMailAccountId &accountId, const QMailFolderId &folderId, bool descending)
+bool QMailMessageSource::retrieveFolderList(const QMailAccountId &accountId, const QMailFolderId &folderId,
+                                            bool descending)
 {
     Q_UNUSED(accountId)
     Q_UNUSED(folderId)
@@ -463,7 +466,8 @@ bool QMailMessageSource::retrieveFolderList(const QMailAccountId &accountId, con
 
     \sa QMailAccount::lastSynchronized(), retrieveMessageLists()
 */
-bool QMailMessageSource::retrieveMessageList(const QMailAccountId &accountId, const QMailFolderId &folderId, uint minimum, const QMailMessageSortKey &sort)
+bool QMailMessageSource::retrieveMessageList(const QMailAccountId &accountId, const QMailFolderId &folderId,
+                                             uint minimum, const QMailMessageSortKey &sort)
 {
     Q_UNUSED(accountId)
     Q_UNUSED(folderId)
@@ -507,7 +511,8 @@ bool QMailMessageSource::retrieveMessageList(const QMailAccountId &accountId, co
 
     \sa QMailAccount::lastSynchronized(), retrieveMessageList()
 */
-bool QMailMessageSource::retrieveMessageLists(const QMailAccountId &accountId, const QMailFolderIdList &folderIds, uint minimum, const QMailMessageSortKey &sort)
+bool QMailMessageSource::retrieveMessageLists(const QMailAccountId &accountId, const QMailFolderIdList &folderIds,
+                                              uint minimum, const QMailMessageSortKey &sort)
 {
     Q_UNUSED(accountId)
     Q_UNUSED(folderIds)
@@ -560,7 +565,8 @@ bool QMailMessageSource::retrieveNewMessages(const QMailAccountId &accountId, co
 
     Returns true if an operation is initiated.
 */
-bool QMailMessageSource::retrieveMessages(const QMailMessageIdList &ids, QMailRetrievalAction::RetrievalSpecification spec)
+bool QMailMessageSource::retrieveMessages(const QMailMessageIdList &ids,
+                                          QMailRetrievalAction::RetrievalSpecification spec)
 {
     Q_UNUSED(ids)
     Q_UNUSED(spec)
@@ -890,7 +896,8 @@ bool QMailMessageSource::moveFolder(const QMailFolderId &folderId, const QMailFo
 
     \sa matchingMessageIds(), retrieveMessages()
 */
-bool QMailMessageSource::searchMessages(const QMailMessageKey &searchCriteria, const QString &bodyText, quint64 limit, const QMailMessageSortKey &sort)
+bool QMailMessageSource::searchMessages(const QMailMessageKey &searchCriteria, const QString &bodyText,
+                                        quint64 limit, const QMailMessageSortKey &sort)
 {
     Q_UNUSED(searchCriteria)
     Q_UNUSED(bodyText)
@@ -920,7 +927,8 @@ bool QMailMessageSource::searchMessages(const QMailMessageKey &searchCriteria, c
 
     \sa matchingMessageIds(), retrieveMessages()
 */
-bool QMailMessageSource::searchMessages(const QMailMessageKey &searchCriteria, const QString &bodyText, const QMailMessageSortKey &sort)
+bool QMailMessageSource::searchMessages(const QMailMessageKey &searchCriteria, const QString &bodyText,
+                                        const QMailMessageSortKey &sort)
 {
     Q_UNUSED(searchCriteria)
     Q_UNUSED(bodyText)
@@ -1138,7 +1146,8 @@ void QMailMessageSource::copyMessages()
             message.setParentFolderId(d->_destinationId);
 
             if (!QMailStore::instance()->addMessage(&message)) {
-                qCWarning(lcMailStore) << "Unable to copy messages to folder:" << d->_destinationId << "for account:" << message.parentAccountId();
+                qCWarning(lcMailStore) << "Unable to copy messages to folder:" << d->_destinationId
+                                       << "for account:" << message.parentAccountId();
 
                 emit d->_service->statusChanged(
                     QMailServiceAction::Status(QMailServiceAction::Status::ErrFrameworkFault,
@@ -1882,7 +1891,8 @@ bool QMailMessageSource::moveFolder(const QMailFolderId &folderId, const QMailFo
 
     The request has the identifier \a action.
 */
-bool QMailMessageSource::searchMessages(const QMailMessageKey &searchCriteria, const QString& bodyText, quint64 limit, const QMailMessageSortKey &sort, quint64 action)
+bool QMailMessageSource::searchMessages(const QMailMessageKey &searchCriteria, const QString& bodyText, quint64 limit,
+                                        const QMailMessageSortKey &sort, quint64 action)
 {
     Q_UNUSED(searchCriteria)
     Q_UNUSED(bodyText)
@@ -1901,7 +1911,8 @@ bool QMailMessageSource::searchMessages(const QMailMessageKey &searchCriteria, c
 
     The request has the identifier \a action.
 */
-bool QMailMessageSource::searchMessages(const QMailMessageKey &searchCriteria, const QString& bodyText, const QMailMessageSortKey &sort, quint64 action)
+bool QMailMessageSource::searchMessages(const QMailMessageKey &searchCriteria, const QString& bodyText,
+                                        const QMailMessageSortKey &sort, quint64 action)
 {
     Q_UNUSED(searchCriteria)
     Q_UNUSED(bodyText)
@@ -1951,7 +1962,8 @@ bool QMailMessageSource::cancelSearch(quint64 action)
 
     The request has the identifier \a action.
 */
-bool QMailMessageSource::prepareMessages(const QList<QPair<QMailMessagePart::Location, QMailMessagePart::Location> > &ids, quint64 action)
+bool QMailMessageSource::prepareMessages(const QList<QPair<QMailMessagePart::Location, QMailMessagePart::Location> > &ids,
+                                         quint64 action)
 {
     Q_UNUSED(ids)
     Q_UNUSED(action)
@@ -1967,7 +1979,8 @@ bool QMailMessageSource::prepareMessages(const QList<QPair<QMailMessagePart::Loc
 
     The request has the identifier \a action.
 */
-bool QMailMessageSource::protocolRequest(const QMailAccountId &accountId, const QString &request, const QVariantMap &data, quint64 action)
+bool QMailMessageSource::protocolRequest(const QMailAccountId &accountId, const QString &request, const QVariantMap &data,
+                                         quint64 action)
 {
     Q_UNUSED(accountId)
     Q_UNUSED(request)
diff --git a/src/libraries/qmfmessageserver/qmailserviceconfiguration.cpp b/src/libraries/qmfmessageserver/qmailserviceconfiguration.cpp
index b391c1b6..52820065 100644
--- a/src/libraries/qmfmessageserver/qmailserviceconfiguration.cpp
+++ b/src/libraries/qmfmessageserver/qmailserviceconfiguration.cpp
@@ -72,7 +72,8 @@
     within the account configuration object \a config.
 */
 QMailServiceConfiguration::QMailServiceConfiguration(QMailAccountConfiguration *config, const QString &service)
-    : _config(config->services().contains(service) ? &config->serviceConfiguration(service) : 0)
+    : _config(config->services().contains(service) ? &config->serviceConfiguration(service)
+                                                   : nullptr)
 {
 }
 
@@ -81,7 +82,9 @@ QMailServiceConfiguration::QMailServiceConfiguration(QMailAccountConfiguration *
     within the account configuration object \a config.
 */
 QMailServiceConfiguration::QMailServiceConfiguration(const QMailAccountConfiguration &config, const QString &service)
-    : _config(const_cast<QMailAccountConfiguration::ServiceConfiguration*>(config.services().contains(service) ? &config.serviceConfiguration(service) : 0))
+    : _config(const_cast<QMailAccountConfiguration::ServiceConfiguration*>(config.services().contains(service)
+                                                                           ? &config.serviceConfiguration(service)
+                                                                           : nullptr))
 {
 }
 
diff --git a/src/libraries/qmfwidgets/emailfoldermodel.h b/src/libraries/qmfwidgets/emailfoldermodel.h
index f6acbe9e..01d779d1 100644
--- a/src/libraries/qmfwidgets/emailfoldermodel.h
+++ b/src/libraries/qmfwidgets/emailfoldermodel.h
@@ -144,7 +144,7 @@ public:
         FolderRenamePermittedRole
     };
 
-    EmailFolderModel(QObject *parent = Q_NULLPTR);
+    EmailFolderModel(QObject *parent = nullptr);
     ~EmailFolderModel();
 
     virtual void init();
@@ -172,7 +172,7 @@ class QMFUTIL_EXPORT AccountFolderModel : public EmailFolderModel
     Q_OBJECT
 
 public:
-    explicit AccountFolderModel(const QMailAccountId &id, QObject *parent = Q_NULLPTR);
+    explicit AccountFolderModel(const QMailAccountId &id, QObject *parent = nullptr);
 
     void init() override;
 
diff --git a/src/libraries/qmfwidgets/emailfolderview.h b/src/libraries/qmfwidgets/emailfolderview.h
index 495349f6..5fba71e2 100644
--- a/src/libraries/qmfwidgets/emailfolderview.h
+++ b/src/libraries/qmfwidgets/emailfolderview.h
@@ -63,7 +63,7 @@ class EmailFolderDelegate : public FolderDelegate
     Q_OBJECT
 
 public:
-    EmailFolderDelegate(EmailFolderView *parent = Q_NULLPTR);
+    EmailFolderDelegate(EmailFolderView *parent = nullptr);
 
     void drawDisplay(QPainter *painter, const QStyleOptionViewItem &option,
                      const QRect &rect, const QString &text) const override;
diff --git a/src/libraries/qmfwidgets/folderdelegate.h b/src/libraries/qmfwidgets/folderdelegate.h
index caa537bf..3921fa55 100644
--- a/src/libraries/qmfwidgets/folderdelegate.h
+++ b/src/libraries/qmfwidgets/folderdelegate.h
@@ -49,7 +49,7 @@ class FolderDelegate : public QItemDelegate
     Q_OBJECT
 
 public:
-    FolderDelegate(QAbstractItemView *parent = Q_NULLPTR);
+    FolderDelegate(QAbstractItemView *parent = nullptr);
     FolderDelegate(QWidget *parent);
 
     void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
diff --git a/src/libraries/qmfwidgets/foldermodel.h b/src/libraries/qmfwidgets/foldermodel.h
index 8b750422..aec485b9 100644
--- a/src/libraries/qmfwidgets/foldermodel.h
+++ b/src/libraries/qmfwidgets/foldermodel.h
@@ -53,7 +53,7 @@ public:
         FolderIdRole
     };
 
-    FolderModel(QObject *parent = Q_NULLPTR);
+    FolderModel(QObject *parent = nullptr);
     ~FolderModel();
 
     static QString excessIndicator();
diff --git a/src/libraries/qmfwidgets/selectfolder.h b/src/libraries/qmfwidgets/selectfolder.h
index c956e155..485ee51c 100644
--- a/src/libraries/qmfwidgets/selectfolder.h
+++ b/src/libraries/qmfwidgets/selectfolder.h
@@ -55,7 +55,7 @@ class QMFUTIL_EXPORT SelectFolderDialog : public QDialog
     Q_OBJECT
 
 public:
-    explicit SelectFolderDialog(FolderModel *model, QWidget *parent = Q_NULLPTR);
+    explicit SelectFolderDialog(FolderModel *model, QWidget *parent = nullptr);
 
     void setInvalidSelections(const QList<QMailMessageSet*> &invalid);
 
diff --git a/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.cpp b/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.cpp
index cb75f987..c3167088 100644
--- a/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.cpp
+++ b/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.cpp
@@ -607,7 +607,7 @@ struct PartStorer
     bool allowRename;
 
     PartStorer(QMailMessage *m, const QString &f, const QString &e, QList< QSharedPointer<QFile> > *o, bool ar)
-     : message(m), fileName(f), existing(e), openParts(o), allowRename(ar) {}
+        : message(m), fileName(f), existing(e), openParts(o), allowRename(ar) {}
 
     bool operator()(const QMailMessagePart &part)
     {
diff --git a/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.h b/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.h
index 2e07db02..ba3d29b3 100644
--- a/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.h
+++ b/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.h
@@ -54,7 +54,7 @@ class QmfStorageManager : public QObject, public QMailContentManager
     Q_OBJECT
 
 public:
-    QmfStorageManager(QObject *parent = Q_NULLPTR);
+    QmfStorageManager(QObject *parent = nullptr);
     ~QmfStorageManager();
 
     QMailStore::ErrorCode add(QMailMessage *message, QMailContentManager::DurabilityRequirement durability) override;
@@ -76,6 +76,7 @@ public:
     static QString messagePartUndecodedFilePath(const QMailMessagePart &part, const QString &fileName);
 
     ManagerRole role() const override { return StorageRole; }
+
 protected slots:
     void clearAccountPath(const QMailAccountIdList&);
 
diff --git a/src/plugins/crypto/common/qgpgme.cpp b/src/plugins/crypto/common/qgpgme.cpp
index a1fb18ed..dfdb3e3a 100644
--- a/src/plugins/crypto/common/qgpgme.cpp
+++ b/src/plugins/crypto/common/qgpgme.cpp
@@ -39,7 +39,8 @@
 
 #include <QCryptographicHash>
 
-QMailCryptoGPGME::QMailCryptoGPGME(gpgme_protocol_t protocol): m_protocol(protocol), m_cb(0)
+QMailCryptoGPGME::QMailCryptoGPGME(gpgme_protocol_t protocol)
+    : m_protocol(protocol), m_cb(0)
 {
     gpgme_error_t err;
 
@@ -75,11 +76,10 @@ QMailCryptoGPGME::QMailCryptoGPGME(gpgme_protocol_t protocol): m_protocol(protoc
 
 static QByteArray canonicalizeStr(const char *str)
 {
-    const char *p;
-
     QByteArray out;
     out.reserve(strlen(str) * 1.1);
-    for (p = str; *p != '\0'; ++p) {
+
+    for (const char *p = str; *p != '\0'; ++p) {
         if (*p != '\r') {
             if (*p == '\n')
                 out.append('\r');
@@ -237,9 +237,9 @@ struct GPGmeData {
 };
 
 QMailCrypto::SignatureResult QMailCryptoGPGME::getSignature(const QByteArray &message,
-                                                               const QStringList &keys,
-                                                               QByteArray &result,
-                                                               QByteArray &micalg) const
+                                                            const QStringList &keys,
+                                                            QByteArray &result,
+                                                            QByteArray &micalg) const
 {
     result.clear();
     micalg.clear();
@@ -333,9 +333,9 @@ QMailCrypto::SignatureResult QMailCryptoGPGME::getSignature(const QByteArray &me
 }
 
 QMailCrypto::SignatureResult QMailCryptoGPGME::computeSignature(QMailMessagePartContainer &part,
-                                                                   const QStringList &keys,
-                                                                   QByteArray &signedData,
-                                                                   QByteArray &micalg) const
+                                                                const QStringList &keys,
+                                                                QByteArray &signedData,
+                                                                QByteArray &micalg) const
 {
     /* Generate the transfer output corresponding to part. */
     QMailMessagePart data;
@@ -376,8 +376,8 @@ QMailCrypto::SignatureResult QMailCryptoGPGME::computeSignature(QMailMessagePart
 }
 
 QMailCrypto::SignatureResult QMailCryptoGPGME::verify(const QByteArray &sigData,
-                                                         const QByteArray &messageData,
-                                                         QList<QMailCrypto::KeyResult> &keyResults) const
+                                                      const QByteArray &messageData,
+                                                      QList<QMailCrypto::KeyResult> &keyResults) const
 {
     keyResults.clear();
 
diff --git a/src/plugins/crypto/common/qgpgme.h b/src/plugins/crypto/common/qgpgme.h
index 69b94415..89e44f91 100644
--- a/src/plugins/crypto/common/qgpgme.h
+++ b/src/plugins/crypto/common/qgpgme.h
@@ -54,8 +54,8 @@ class QMailCryptoGPGME: public QObject, public QMailCryptographicServiceInterfac
  public:
     ~QMailCryptoGPGME() {}
 
-    void setPassphraseCallback(QMailCrypto::PassphraseCallback cb) Q_DECL_OVERRIDE;
-    QString passphraseCallback(const QString &info) const Q_DECL_OVERRIDE;
+    void setPassphraseCallback(QMailCrypto::PassphraseCallback cb) override;
+    QString passphraseCallback(const QString &info) const override;
 
 protected:
     QMailCryptoGPGME(gpgme_protocol_t protocol);
diff --git a/src/plugins/crypto/gpgme/gpgmeplugin.cpp b/src/plugins/crypto/gpgme/gpgmeplugin.cpp
index 7f7a037e..ee762129 100644
--- a/src/plugins/crypto/gpgme/gpgmeplugin.cpp
+++ b/src/plugins/crypto/gpgme/gpgmeplugin.cpp
@@ -72,8 +72,7 @@ QMailCrypto::VerificationResult QMailCryptoGPG::verifySignature(const QMailMessa
     return result;
 }
 
-QMailCrypto::SignatureResult QMailCryptoGPG::sign(QMailMessagePartContainer *part,
-                                                     const QStringList &keys) const
+QMailCrypto::SignatureResult QMailCryptoGPG::sign(QMailMessagePartContainer *part, const QStringList &keys) const
 {
     if (!part) {
         qCWarning(lcMessaging) << "unable to sign a NULL part.";
diff --git a/src/plugins/crypto/gpgme/gpgmeplugin.h b/src/plugins/crypto/gpgme/gpgmeplugin.h
index 1ecb0a86..a73c4f30 100644
--- a/src/plugins/crypto/gpgme/gpgmeplugin.h
+++ b/src/plugins/crypto/gpgme/gpgmeplugin.h
@@ -48,12 +48,12 @@ public:
     QMailCryptoGPG();
     ~QMailCryptoGPG() {}
 
-    bool partHasSignature(const QMailMessagePartContainer &part) const Q_DECL_OVERRIDE;
-    QMailCrypto::VerificationResult verifySignature(const QMailMessagePartContainer &part) const Q_DECL_OVERRIDE;
-    QMailCrypto::SignatureResult sign(QMailMessagePartContainer *part, const QStringList &keys) const Q_DECL_OVERRIDE;
+    bool partHasSignature(const QMailMessagePartContainer &part) const override;
+    QMailCrypto::VerificationResult verifySignature(const QMailMessagePartContainer &part) const override;
+    QMailCrypto::SignatureResult sign(QMailMessagePartContainer *part, const QStringList &keys) const override;
 
-    bool canDecrypt(const QMailMessagePartContainer &part) const Q_DECL_OVERRIDE;
-    QMailCrypto::DecryptionResult decrypt(QMailMessagePartContainer *part) const Q_DECL_OVERRIDE;
+    bool canDecrypt(const QMailMessagePartContainer &part) const override;
+    QMailCrypto::DecryptionResult decrypt(QMailMessagePartContainer *part) const override;
 };
 
 #endif
diff --git a/src/plugins/crypto/smime/smimeplugin.cpp b/src/plugins/crypto/smime/smimeplugin.cpp
index bfd7c9f4..0b386337 100644
--- a/src/plugins/crypto/smime/smimeplugin.cpp
+++ b/src/plugins/crypto/smime/smimeplugin.cpp
@@ -71,7 +71,7 @@ QMailCrypto::VerificationResult QMailCryptoSMIME::verifySignature(const QMailMes
 }
 
 QMailCrypto::SignatureResult QMailCryptoSMIME::sign(QMailMessagePartContainer *part,
-                                                       const QStringList &keys) const
+                                                    const QStringList &keys) const
 {
     if (!part) {
         qCWarning(lcMessaging) << "unable to sign a NULL part.";
diff --git a/src/plugins/crypto/smime/smimeplugin.h b/src/plugins/crypto/smime/smimeplugin.h
index 54e7ed1c..691cba74 100644
--- a/src/plugins/crypto/smime/smimeplugin.h
+++ b/src/plugins/crypto/smime/smimeplugin.h
@@ -48,13 +48,13 @@ public:
     QMailCryptoSMIME();
     ~QMailCryptoSMIME() {}
 
-    bool partHasSignature(const QMailMessagePartContainer &part) const Q_DECL_OVERRIDE;
-    QMailCrypto::VerificationResult verifySignature(const QMailMessagePartContainer &part) const Q_DECL_OVERRIDE;
+    bool partHasSignature(const QMailMessagePartContainer &part) const override;
+    QMailCrypto::VerificationResult verifySignature(const QMailMessagePartContainer &part) const override;
     QMailCrypto::SignatureResult sign(QMailMessagePartContainer *part,
-                                      const QStringList &keys) const Q_DECL_OVERRIDE;
+                                      const QStringList &keys) const override;
 
-    bool canDecrypt(const QMailMessagePartContainer &part) const Q_DECL_OVERRIDE;
-    QMailCrypto::DecryptionResult decrypt(QMailMessagePartContainer *part) const Q_DECL_OVERRIDE;
+    bool canDecrypt(const QMailMessagePartContainer &part) const override;
+    QMailCrypto::DecryptionResult decrypt(QMailMessagePartContainer *part) const override;
 };
 
 #endif
diff --git a/src/plugins/messageservices/imap/imapservice.cpp b/src/plugins/messageservices/imap/imapservice.cpp
index c432216e..a0a88241 100644
--- a/src/plugins/messageservices/imap/imapservice.cpp
+++ b/src/plugins/messageservices/imap/imapservice.cpp
@@ -169,9 +169,9 @@ private:
                           quint64 limit, const QMailMessageSortKey &sort, bool count);
 
 
-    virtual bool setStrategy(ImapStrategy *strategy, const char *signal = Q_NULLPTR);
+    virtual bool setStrategy(ImapStrategy *strategy, const char *signal = nullptr);
 
-    virtual void appendStrategy(ImapStrategy *strategy, const char *signal = Q_NULLPTR);
+    virtual void appendStrategy(ImapStrategy *strategy, const char *signal = nullptr);
     virtual bool initiateStrategy();
     void queueDisconnectedOperations(const QMailAccountId &accountId);
 
@@ -1425,7 +1425,8 @@ void ImapService::enable()
     connect(_client, SIGNAL(progressChanged(uint, uint)), this, SIGNAL(progressChanged(uint, uint)));
     connect(_client, SIGNAL(progressChanged(uint, uint)), _source, SLOT(resetExpiryTimer()));
     connect(_client, SIGNAL(errorOccurred(int, QString)), this, SLOT(errorOccurred(int, QString)));
-    connect(_client, SIGNAL(errorOccurred(QMailServiceAction::Status::ErrorCode, QString)), this, SLOT(errorOccurred(QMailServiceAction::Status::ErrorCode, QString)));
+    connect(_client, SIGNAL(errorOccurred(QMailServiceAction::Status::ErrorCode, QString)),
+            this, SLOT(errorOccurred(QMailServiceAction::Status::ErrorCode, QString)));
     connect(_client, SIGNAL(updateStatus(QString)), this, SLOT(updateStatus(QString)));
     connect(_client, &ImapClient::pushEmailError, this, &ImapService::retryPushEmail);
 
diff --git a/src/plugins/messageservices/imap/imapstructure.cpp b/src/plugins/messageservices/imap/imapstructure.cpp
index fef38512..ce836a25 100644
--- a/src/plugins/messageservices/imap/imapstructure.cpp
+++ b/src/plugins/messageservices/imap/imapstructure.cpp
@@ -185,7 +185,8 @@ struct ElementDecomposer
             }
         } else if (c == '(') {
             if (it == begin) {
-                if (reportDepth > 0) return false;
+                if (reportDepth > 0)
+                    return false;
 
                 ++reportDepth;
                 return true;
diff --git a/src/plugins/messageservices/imap/imaptransport.cpp b/src/plugins/messageservices/imap/imaptransport.cpp
index 7511afa5..95d57904 100644
--- a/src/plugins/messageservices/imap/imaptransport.cpp
+++ b/src/plugins/messageservices/imap/imaptransport.cpp
@@ -231,8 +231,8 @@ public:
 ImapTransport::ImapTransport(const char* name)
     : QMailTransport(name)
     , _compress(false)
-    , _decompressor(0)
-    , _compressor(0)
+    , _decompressor(nullptr)
+    , _compressor(nullptr)
 {
     test();
 }
@@ -313,9 +313,9 @@ void ImapTransport::imapClose()
     close();
     _compress = false;
     delete _decompressor;
-    _decompressor = 0;
+    _decompressor = nullptr;
     delete _compressor;
-    _compressor = 0;
+    _compressor = nullptr;
 }
 
 void ImapTransport::test()
diff --git a/src/plugins/messageservices/pop/popclient.cpp b/src/plugins/messageservices/pop/popclient.cpp
index 1196baaa..4c322071 100644
--- a/src/plugins/messageservices/pop/popclient.cpp
+++ b/src/plugins/messageservices/pop/popclient.cpp
@@ -128,12 +128,12 @@ void PopClient::deleteTransport()
         disconnect(transport, SIGNAL(errorOccurred(int,QString)), this, SLOT(transportError(int,QString)));
         disconnect(transport, SIGNAL(readyRead()), this, SLOT(incomingData()));
         disconnect(transport, SIGNAL(sslErrorOccured(QMailServiceAction::Status::ErrorCode,QString)),
-                this, SIGNAL(connectionError(QMailServiceAction::Status::ErrorCode,QString)));
+                   this, SIGNAL(connectionError(QMailServiceAction::Status::ErrorCode,QString)));
 
         // A Qt socket remains in an unusuable state for a short time after closing,
         // thus it can't be immediately reused
         transport->deleteLater();
-        transport = 0;
+        transport = nullptr;
     }
 }
 
diff --git a/src/plugins/messageservices/pop/popservice.cpp b/src/plugins/messageservices/pop/popservice.cpp
index 7eeb3868..be05bd0b 100644
--- a/src/plugins/messageservices/pop/popservice.cpp
+++ b/src/plugins/messageservices/pop/popservice.cpp
@@ -310,7 +310,8 @@ PopService::PopService(const QMailAccountId &accountId)
     connect(&_client, SIGNAL(progressChanged(uint, uint)), this, SIGNAL(progressChanged(uint, uint)));
 
     connect(&_client, SIGNAL(errorOccurred(int, QString)), this, SLOT(errorOccurred(int, QString)));
-    connect(&_client, SIGNAL(errorOccurred(QMailServiceAction::Status::ErrorCode, QString)), this, SLOT(errorOccurred(QMailServiceAction::Status::ErrorCode, QString)));
+    connect(&_client, SIGNAL(errorOccurred(QMailServiceAction::Status::ErrorCode, QString)),
+            this, SLOT(errorOccurred(QMailServiceAction::Status::ErrorCode, QString)));
     connect(&_client, SIGNAL(updateStatus(QString)), this, SLOT(updateStatus(QString)));
     connect(QMailStore::instance(), SIGNAL(accountsUpdated(const QMailAccountIdList&)),
             this, SLOT(accountsUpdated(const QMailAccountIdList&)));
diff --git a/src/tools/messageserver/messageserver.h b/src/tools/messageserver/messageserver.h
index 06447e37..0bde161b 100644
--- a/src/tools/messageserver/messageserver.h
+++ b/src/tools/messageserver/messageserver.h
@@ -49,7 +49,7 @@ class MessageServer : public QObject
     Q_OBJECT
 
 public:
-    MessageServer(QObject *parent = Q_NULLPTR);
+    MessageServer(QObject *parent = nullptr);
     ~MessageServer();
 
     bool init();
diff --git a/tests/tst_qmailaccountkey/tst_qmailaccountkey.cpp b/tests/tst_qmailaccountkey/tst_qmailaccountkey.cpp
index 919f480a..e12468df 100644
--- a/tests/tst_qmailaccountkey/tst_qmailaccountkey.cpp
+++ b/tests/tst_qmailaccountkey/tst_qmailaccountkey.cpp
@@ -62,9 +62,11 @@ void tst_qmailaccountkey::testQMailAccountKey()
     QMailAccountKey secondKey(QMailAccountKey::id(QMailAccountId(1)));
     QMailAccountKey testKey;
     testKey = firstKey;
-    QVERIFY (firstKey != secondKey);
+    QVERIFY(firstKey != secondKey);
+
     testKey &= firstKey;
     QCOMPARE(firstKey, testKey);
+
     testKey |= secondKey;
     QVERIFY((testKey | firstKey) == secondKey);
 }
author	Pekka Vuorela <pvuorela@iki.fi>	2025-12-05 11:18:23 +0200
committer	Pekka Vuorela <pvuorela@iki.fi>	2025-12-05 12:37:19 +0200
commit	d3cc588c0e8290ad22e7cc07e50702524c95c967 (patch)
tree	8c92030658a07c6b2a1bdfc3b8cbed51259fb2cd
parent	8313f48cfdaa543ec581229404130b3c2be5a616 (diff)