Adjust some cosmetic details, again

Change-Id: I061ae75d0196ee08380cf3763b1b12d55b631795 Reviewed-by: Pekka Vuorela <pvuorela@iki.fi> Reviewed-by: Damien Caliste <dcaliste@free.fr> Reviewed-by: <matti.viljanen@kapsi.fi>
author: Pekka Vuorela <pvuorela@iki.fi> 2025-10-01 16:44:42 +0300
committer: Pekka Vuorela <pvuorela@iki.fi> 2025-10-01 18:19:22 +0300
commit: bb91a5089a6b2cb31ba75bb06f646967072c348e (patch)
tree: 83cc503893175b43df68530bbe2f63c9d65bff02 /src
parent: 56c0dd3382e190a020d6e482531484a16bbe34a1 (diff)
12 files changed, 22 insertions, 13 deletions
diff --git a/src/libraries/qmfclient/qmailaction.h b/src/libraries/qmfclient/qmailaction.h
index a48a947c..0ea2ddb4 100644
--- a/src/libraries/qmfclient/qmailaction.h
+++ b/src/libraries/qmfclient/qmailaction.h
@@ -31,11 +31,13 @@
 **
 ****************************************************************************/
 
-#ifndef QMAILACTIONFWD_H
-#define QMAILACTIONFWD_H
+#ifndef QMAILACTION_H
+#define QMAILACTION_H
+
 #include "qmailglobal.h"
 #include "qmailipc.h"
 #include "qmailid.h"
+
 #include <QString>
 #include <QList>
 #include <QSharedDataPointer>
diff --git a/src/libraries/qmfclient/qmailcodec.h b/src/libraries/qmfclient/qmailcodec.h
index 357fe4a9..1e3f2d36 100644
--- a/src/libraries/qmfclient/qmailcodec.h
+++ b/src/libraries/qmfclient/qmailcodec.h
@@ -35,12 +35,14 @@
 #define QMAILCODEC_H
 
 #include "qmailglobal.h"
+
 #include <QByteArray>
 #include <QDataStream>
 #include <QString>
 #include <QTextStream>
 
 class QTextCodec;
+
 class QMF_EXPORT QMailCodec
 {
 public:
diff --git a/src/libraries/qmfclient/qmailcontentmanager.h b/src/libraries/qmfclient/qmailcontentmanager.h
index 57dc127b..075ab966 100644
--- a/src/libraries/qmfclient/qmailcontentmanager.h
+++ b/src/libraries/qmfclient/qmailcontentmanager.h
@@ -57,7 +57,6 @@ public:
     static void clearContent();
 };
 
-
 struct QMF_EXPORT QMailContentManagerPluginInterface : public QFactoryInterface
 {
     virtual QString key() const = 0;
diff --git a/src/libraries/qmfclient/qmailmessage.cpp b/src/libraries/qmfclient/qmailmessage.cpp
index 60c085ee..2575585f 100644
--- a/src/libraries/qmfclient/qmailmessage.cpp
+++ b/src/libraries/qmfclient/qmailmessage.cpp
@@ -1127,6 +1127,7 @@ namespace findAttachments
             // In any case, the default strategy wins, even if there are no attachments
             return true;
         }
+
     private:
         void inMultipartNone(const QMailMessagePart &part,
                              Locations* found,
diff --git a/src/libraries/qmfclient/qmailserviceaction_p.h b/src/libraries/qmfclient/qmailserviceaction_p.h
index c97d0eeb..1601e99a 100644
--- a/src/libraries/qmfclient/qmailserviceaction_p.h
+++ b/src/libraries/qmfclient/qmailserviceaction_p.h
@@ -428,6 +428,7 @@ private slots:
     void onActivityChanged(quint64 id, QMailServiceAction::Activity activity);
     void actionsListed(const QMailActionDataList &actions);
     void actionStarted(const QMailActionData &action);
+
 private:
     QSharedPointer<QMailActionInfo> addAction(const QMailActionData &action);
     QMap< QMailActionId, QSharedPointer<QMailActionInfo> > _runningActions;
diff --git a/src/libraries/qmfclient/qmailstoresql_p.cpp b/src/libraries/qmfclient/qmailstoresql_p.cpp
index e1a9c6ac..4540bc58 100644
--- a/src/libraries/qmfclient/qmailstoresql_p.cpp
+++ b/src/libraries/qmfclient/qmailstoresql_p.cpp
@@ -1349,6 +1349,7 @@ public:
     QMailTimeStamp lastSynchronized() const { return QMailTimeStamp(value<QDateTime>(QMailAccountKey::LastSynchronized)); }
 
     QString iconPath() const { return value<QString>(QMailAccountKey::IconPath); }
+
 private:
     int fieldIndex(const QString &field, int props) const override
     {
diff --git a/src/libraries/qmfclient/qmailstoresql_p.h b/src/libraries/qmfclient/qmailstoresql_p.h
index 5446764b..b2ba6daf 100644
--- a/src/libraries/qmfclient/qmailstoresql_p.h
+++ b/src/libraries/qmfclient/qmailstoresql_p.h
@@ -339,6 +339,7 @@ private:
         quint64 id() const { return _id; }
         QString name() const { return _name; }
         quint64 status() const { return _status; }
+
     private:
         quint64 _id;
         QString _name;
diff --git a/src/libraries/qmfclient/qmailthreadsortkey.h b/src/libraries/qmfclient/qmailthreadsortkey.h
index 98ad859e..cb1449c8 100644
--- a/src/libraries/qmfclient/qmailthreadsortkey.h
+++ b/src/libraries/qmfclient/qmailthreadsortkey.h
@@ -92,8 +92,8 @@ public:
     static QMailThreadSortKey preview(Qt::SortOrder order = Qt::AscendingOrder);
     static QMailThreadSortKey startedDate(Qt::SortOrder order = Qt::AscendingOrder);
     static QMailThreadSortKey lastDate(Qt::SortOrder order = Qt::AscendingOrder);
-
     static QMailThreadSortKey status(quint64 mask, Qt::SortOrder order = Qt::DescendingOrder);
+
 private:
     QMailThreadSortKey(Property p, Qt::SortOrder order, quint64 mask = 0);
     QMailThreadSortKey(const QmfList<ArgumentType> &args);
diff --git a/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.cpp b/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.cpp
index ab03d41b..f42a916e 100644
--- a/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.cpp
+++ b/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.cpp
@@ -77,11 +77,11 @@ QString randomString(int length)
 
     int i = 0;
     while (length--) {
-        int r=QRandomGenerator::global()->generate() % 62;
-        r+=48;
+        int r = QRandomGenerator::global()->generate() % 62;
+        r += 48;
         if (r>57) r+=7;
         if (r>90) r+=6;
-        str[i++] =  char(r);
+        str[i++] = char(r);
     }
 
     return str;
diff --git a/src/plugins/messageservices/imap/imapprotocol.cpp b/src/plugins/messageservices/imap/imapprotocol.cpp
index 220c0e16..ec72217c 100644
--- a/src/plugins/messageservices/imap/imapprotocol.cpp
+++ b/src/plugins/messageservices/imap/imapprotocol.cpp
@@ -866,7 +866,8 @@ QString RenameState::transmit(ImapContext *c)
     }
 
     QString from = _mailboxNames.last().first.path();
-    QString to =  buildNewPath(c, _mailboxNames.last().first, _mailboxNames.last().second);
+    QString to = buildNewPath(c, _mailboxNames.last().first, _mailboxNames.last().second);
+
     if (_mailboxNames.last().second.contains(c->protocol()->delimiter())) {
         qCWarning(lcIMAP) << "Unsupported: new name contains IMAP delimiter" << _mailboxNames.last().second
                    << c->protocol()->delimiter();
@@ -953,7 +954,7 @@ QString MoveState::transmit(ImapContext *c)
     }
 
     QString from = _mailboxParents.last().first.path();
-    QString to =  buildNewPath(c, _mailboxParents.last().first, _mailboxParents.last().second);
+    QString to = buildNewPath(c, _mailboxParents.last().first, _mailboxParents.last().second);
     QString cmd(QString("RENAME %1 %2").arg(ImapProtocol::quoteString(from)).arg( ImapProtocol::quoteString(to)));
     return c->sendCommand(cmd);
 }
@@ -1834,8 +1835,9 @@ QStringList SearchMessageState::convertValue(const QVariant &value, const QMailM
         break;
     }
     case QMailMessageKey::Subject: {
-        _utf8 |=  !(isPrintable(value.toString()));
+        _utf8 |= !(isPrintable(value.toString()));
         QString subject = value.toString().toUtf8(); //utf8 is backwards compatible with 7 bit ascii
+
         if (comparer == QMailKey::Equal || comparer == QMailKey::Includes) {
             QStringList result = QStringList(QString("SUBJECT {%1}").arg(subject.size()));
             result.append(QString("%1").arg(QString(subject)));
diff --git a/src/plugins/messageservices/imap/imapstrategy.cpp b/src/plugins/messageservices/imap/imapstrategy.cpp
index 789411c6..ce8809dc 100644
--- a/src/plugins/messageservices/imap/imapstrategy.cpp
+++ b/src/plugins/messageservices/imap/imapstrategy.cpp
@@ -873,7 +873,7 @@ void ImapRenameFolderStrategy::handleRename(ImapStrategyContextBase *context)
 void ImapRenameFolderStrategy::process(ImapStrategyContextBase *context)
 {
     while (_folderNewNames.count() > 0) {
-        const QPair<QMailFolderId, QString> &folderId_name =  _folderNewNames.takeFirst();
+        const QPair<QMailFolderId, QString> &folderId_name = _folderNewNames.takeFirst();
         _inProgress++;
         context->protocol().sendRename(QMailFolder(folderId_name.first), folderId_name.second);
     }
@@ -3059,7 +3059,7 @@ static void updateFolderExportsMap(QMap<QMailFolderId, QStringList > *folderExpo
     QMailMessageKey::Properties props(QMailMessageKey::Id | QMailDisconnected::parentFolderProperties() | QMailMessageKey::ServerUid);
     for (const QMailMessageMetaData &metaData : QMailStore::instance()->messagesMetaData(filter, props)) {
         if (!metaData.serverUid().isEmpty() && metaData.parentFolderId().isValid()) {
-            (*folderExportMap)[metaData.parentFolderId()] +=  metaData.serverUid();
+            (*folderExportMap)[metaData.parentFolderId()] += metaData.serverUid();
         } else {
             qCWarning(lcIMAP) << "Unable to export status change to message" << metaData.id();
             QMailMessageMetaData m(metaData.id());
diff --git a/src/plugins/messageservices/imap/imaptransport.cpp b/src/plugins/messageservices/imap/imaptransport.cpp
index 38c0fe26..421993e9 100644
--- a/src/plugins/messageservices/imap/imaptransport.cpp
+++ b/src/plugins/messageservices/imap/imaptransport.cpp
@@ -199,7 +199,7 @@ QByteArray Rfc1951Decompressor::readLine()
 
 QByteArray Rfc1951Decompressor::readAll()
 {
-    QByteArray result =  _output;
+    QByteArray result = _output;
     _output.clear();
     return result;
 }
author	Pekka Vuorela <pvuorela@iki.fi>	2025-10-01 16:44:42 +0300
committer	Pekka Vuorela <pvuorela@iki.fi>	2025-10-01 18:19:22 +0300
commit	bb91a5089a6b2cb31ba75bb06f646967072c348e (patch)
tree	83cc503893175b43df68530bbe2f63c9d65bff02 /src
parent	56c0dd3382e190a020d6e482531484a16bbe34a1 (diff)