7 files changed, 75 insertions, 83 deletions
diff --git a/src/libraries/qmfclient/qmailmessageset.cpp b/src/libraries/qmfclient/qmailmessageset.cpp
index 867826cb..72242950 100644
--- a/src/libraries/qmfclient/qmailmessageset.cpp
+++ b/src/libraries/qmfclient/qmailmessageset.cpp
@@ -1179,7 +1179,7 @@ QMailMessageSetModel::QMailMessageSetModel(QObject *parent)
     : QAbstractItemModel(parent),
       QMailMessageSetContainer(new QMailMessageSetModelPrivate)
 {
-    QTimer::singleShot(0, this, SLOT(delayedInit()));
+    QTimer::singleShot(0, this, &QMailMessageSetModel::delayedInit);
 }
 
 /*! \internal */
@@ -1438,7 +1438,7 @@ void QMailMessageSetModel::testForResync()
     Q_D(QMailMessageSetModel);
 
     if (d->_updateState == QMailMessageSetModelPrivate::Detect) {
-        QTimer::singleShot(0, this, SLOT(ceasePropagatingUpdates()));
+        QTimer::singleShot(0, this, &QMailMessageSetModel::ceasePropagatingUpdates);
         d->_updateState = QMailMessageSetModelPrivate::Detected;
     }
 }
diff --git a/src/libraries/qmfmessageserver/qmailmessagebuffer.cpp b/src/libraries/qmfmessageserver/qmailmessagebuffer.cpp
index 48d7915c..54b68ea1 100644
--- a/src/libraries/qmfmessageserver/qmailmessagebuffer.cpp
+++ b/src/libraries/qmfmessageserver/qmailmessagebuffer.cpp
@@ -64,7 +64,8 @@ QMailMessageBuffer::QMailMessageBuffer(QObject *parent)
     : QObject(parent), d(new QMailMessageBufferPrivate)
 {
     d->messageTimer.setSingleShot(true);
-    connect(&d->messageTimer, SIGNAL(timeout()), this, SLOT(messageTimeout()));
+    connect(&d->messageTimer, &QTimer::timeout,
+            this, &QMailMessageBuffer::messageTimeout);
 
     d->lastFlushTimePerMessage = 0;
 
diff --git a/src/libraries/qmfmessageserver/qmailmessageservice.cpp b/src/libraries/qmfmessageserver/qmailmessageservice.cpp
index ff399ac0..b999b299 100644
--- a/src/libraries/qmfmessageserver/qmailmessageservice.cpp
+++ b/src/libraries/qmfmessageserver/qmailmessageservice.cpp
@@ -746,7 +746,7 @@ bool QMailMessageSource::synchronize(const QMailAccountId &accountId)
 bool QMailMessageSource::deleteMessages(const QMailMessageIdList &ids)
 {
     d->_ids = ids;
-    QTimer::singleShot(0, this, SLOT(deleteMessages()));
+    QTimer::singleShot(0, this, &QMailMessageSource::deletePendingMessages);
     return true;
 }
 
@@ -765,7 +765,7 @@ bool QMailMessageSource::copyMessages(const QMailMessageIdList &ids, const QMail
 {
     d->_ids = ids;
     d->_destinationId = destinationId;
-    QTimer::singleShot(0, this, SLOT(copyMessages()));
+    QTimer::singleShot(0, this, &QMailMessageSource::copyPendingMessages);
     return true;
 }
 
@@ -784,7 +784,7 @@ bool QMailMessageSource::moveMessages(const QMailMessageIdList &ids, const QMail
 {
     d->_ids = ids;
     d->_destinationId = destinationId;
-    QTimer::singleShot(0, this, SLOT(moveMessages()));
+    QTimer::singleShot(0, this, &QMailMessageSource::movePendingMessages);
     return true;
 }
 
@@ -807,7 +807,7 @@ bool QMailMessageSource::flagMessages(const QMailMessageIdList &ids, quint64 set
     d->_ids = ids;
     d->_setMask = setMask;
     d->_unsetMask = unsetMask;
-    QTimer::singleShot(0, this, SLOT(flagMessages()));
+    QTimer::singleShot(0, this, &QMailMessageSource::flagPendingMessages);
     return true;
 }
 
@@ -1112,7 +1112,7 @@ void QMailMessageSource::notImplemented()
 }
 
 /*! \internal */
-void QMailMessageSource::deleteMessages()
+void QMailMessageSource::deletePendingMessages()
 {
     uint total = d->_ids.count();
     emit d->_service->progressChanged(0, total);
@@ -1136,7 +1136,7 @@ void QMailMessageSource::deleteMessages()
 }
 
 /*! \internal */
-void QMailMessageSource::copyMessages()
+void QMailMessageSource::copyPendingMessages()
 {
     bool successful(true);
 
@@ -1191,7 +1191,7 @@ void QMailMessageSource::copyMessages()
 }
 
 /*! \internal */
-void QMailMessageSource::moveMessages()
+void QMailMessageSource::movePendingMessages()
 {
     uint total = d->_ids.count();
     emit d->_service->progressChanged(0, total);
@@ -1218,7 +1218,7 @@ void QMailMessageSource::moveMessages()
 }
 
 /*! \internal */
-void QMailMessageSource::flagMessages()
+void QMailMessageSource::flagPendingMessages()
 {
     uint total = d->_ids.count();
     emit d->_service->progressChanged(0, total);
diff --git a/src/libraries/qmfmessageserver/qmailmessageservice.h b/src/libraries/qmfmessageserver/qmailmessageservice.h
index 4de2d6e3..a4483f6c 100644
--- a/src/libraries/qmfmessageserver/qmailmessageservice.h
+++ b/src/libraries/qmfmessageserver/qmailmessageservice.h
@@ -206,10 +206,10 @@ Q_SIGNALS:
     void protocolResponse(const QString &response, const QVariantMap &data, quint64 action);
 
 protected Q_SLOTS:
-    void deleteMessages();
-    void copyMessages();
-    void moveMessages();
-    void flagMessages();
+    void deletePendingMessages();
+    void copyPendingMessages();
+    void movePendingMessages();
+    void flagPendingMessages();
 
 protected:
     QMailMessageSource(QMailMessageService *service);
diff --git a/src/libraries/qmfmessageserver/qmailstoreaccountfilter.cpp b/src/libraries/qmfmessageserver/qmailstoreaccountfilter.cpp
index b9a9a675..a7c9097c 100644
--- a/src/libraries/qmfmessageserver/qmailstoreaccountfilter.cpp
+++ b/src/libraries/qmfmessageserver/qmailstoreaccountfilter.cpp
@@ -249,21 +249,21 @@ bool QMailStoreEvents::initConnections()
     }
 
     if (QMailStore *store = QMailStore::instance()) {
-        connect(store, SIGNAL(accountsUpdated(QMailAccountIdList)), this, SLOT(accountsUpdated(QMailAccountIdList)));
-        connect(store, SIGNAL(accountContentsModified(QMailAccountIdList)), this, SLOT(accountContentsModified(QMailAccountIdList)));
+        connect(store, &QMailStore::accountsUpdated, this, &QMailStoreEvents::accountsUpdated);
+        connect(store, &QMailStore::accountContentsModified, this, &QMailStoreEvents::accountContentsModified);
 
-        connect(store, SIGNAL(messagesAdded(QMailMessageIdList)), this, SLOT(messagesAdded(QMailMessageIdList)));
-        connect(store, SIGNAL(messagesRemoved(QMailMessageIdList)), this, SLOT(messagesRemoved(QMailMessageIdList)));
-        connect(store, SIGNAL(messagesUpdated(QMailMessageIdList)), this, SLOT(messagesUpdated(QMailMessageIdList)));
-        connect(store, SIGNAL(messageContentsModified(QMailMessageIdList)), this, SLOT(messageContentsModified(QMailMessageIdList)));
+        connect(store, &QMailStore::messagesAdded, this, &QMailStoreEvents::messagesAdded);
+        connect(store, &QMailStore::messagesRemoved, this, &QMailStoreEvents::messagesRemoved);
+        connect(store, &QMailStore::messagesUpdated, this, &QMailStoreEvents::messagesUpdated);
+        connect(store, &QMailStore::messageContentsModified, this, &QMailStoreEvents::messageContentsModified);
 
-        connect(store, SIGNAL(foldersAdded(QMailFolderIdList)), this, SLOT(foldersAdded(QMailFolderIdList)));
-        connect(store, SIGNAL(foldersRemoved(QMailFolderIdList)), this, SLOT(foldersRemoved(QMailFolderIdList)));
-        connect(store, SIGNAL(foldersUpdated(QMailFolderIdList)), this, SLOT(foldersUpdated(QMailFolderIdList)));
-        connect(store, SIGNAL(folderContentsModified(QMailFolderIdList)), this, SLOT(folderContentsModified(QMailFolderIdList)));
+        connect(store, &QMailStore::foldersAdded, this, &QMailStoreEvents::foldersAdded);
+        connect(store, &QMailStore::foldersRemoved, this, &QMailStoreEvents::foldersRemoved);
+        connect(store, &QMailStore::foldersUpdated, this, &QMailStoreEvents::foldersUpdated);
+        connect(store, &QMailStore::folderContentsModified, this, &QMailStoreEvents::folderContentsModified);
 
-        connect(store, SIGNAL(messageRemovalRecordsAdded(QMailAccountIdList)), this, SLOT(messageRemovalRecordsAdded(QMailAccountIdList)));
-        connect(store, SIGNAL(messageRemovalRecordsRemoved(QMailAccountIdList)), this, SLOT(messageRemovalRecordsRemoved(QMailAccountIdList)));
+        connect(store, &QMailStore::messageRemovalRecordsAdded, this, &QMailStoreEvents::messageRemovalRecordsAdded);
+        connect(store, &QMailStore::messageRemovalRecordsRemoved, this, &QMailStoreEvents::messageRemovalRecordsRemoved);
     }
 
     return true;
diff --git a/src/libraries/qmfmessageserver/qmailtransport.cpp b/src/libraries/qmfmessageserver/qmailtransport.cpp
index 34fbe237..b469f69a 100644
--- a/src/libraries/qmfmessageserver/qmailtransport.cpp
+++ b/src/libraries/qmfmessageserver/qmailtransport.cpp
@@ -33,13 +33,8 @@
 
 #include "qmailtransport.h"
 
-#include <QFile>
-#include <QTimer>
-#include <QSslSocket>
 #include <QSslError>
-
 #include <QNetworkProxy>
-#include <QUrl>
 
 #include <qmaillog.h>
 #include <qmailnamespace.h>
@@ -126,15 +121,16 @@ qint64 QMailTransport::Socket::bytesSinceMark() const
     Creates a transport object with the supplied object \a name.
 */
 QMailTransport::QMailTransport(const char* name)
-    : mName(name),
-      mConnected(false),
-      mInUse(false),
-      mAcceptUntrustedCertificates(false)
+    : mSocket(nullptr)
+    , encryption(Encrypt_NONE)
+    , mStream(nullptr)
+    , mName(name)
+    , mConnected(false)
+    , mInUse(false)
+    , mAcceptUntrustedCertificates(false)
 {
-    encryption = Encrypt_NONE;
-    mSocket = 0;
-    mStream = 0;
-    connect( &connectToHostTimeOut, SIGNAL(timeout()), this, SLOT(hostConnectionTimeOut()) );
+    connect(&connectToHostTimeOut, &QTimer::timeout,
+            this, &QMailTransport::hostConnectionTimeOut);
 }
 
 /*! \internal */
@@ -190,9 +186,9 @@ void QMailTransport::createSocket(EncryptType encryptType)
     encryption = encryptType;
     connect(mSocket, &QSslSocket::encrypted, this, &QMailTransport::encryptionEstablished);
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    connect(mSocket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(connectionFailed(QList<QSslError>)));
+    connect(mSocket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(handleSslErrors(QList<QSslError>)));
 #else
-    connect(mSocket, &QSslSocket::sslErrors, this, &QMailTransport::connectionFailed);
+    connect(mSocket, &QSslSocket::sslErrors, this, &QMailTransport::handleSslErrors);
 #endif
 
     const int bufferLimit = 101*1024; // Limit memory used when downloading
@@ -200,9 +196,9 @@ void QMailTransport::createSocket(EncryptType encryptType)
     mSocket->setObjectName(QString::fromUtf8(mName) + QString::fromLatin1("-socket"));
     connect(mSocket, &QAbstractSocket::connected, this, &QMailTransport::connectionEstablished);
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    connect(mSocket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(socketError(QAbstractSocket::SocketError)));
+    connect(mSocket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(handleSocketError(QAbstractSocket::SocketError)));
 #else
-    connect(mSocket, &QAbstractSocket::errorOccurred, this, &QMailTransport::socketError);
+    connect(mSocket, &QAbstractSocket::errorOccurred, this, &QMailTransport::handleSocketError);
 #endif
     connect(mSocket, &QAbstractSocket::readyRead, this, &QMailTransport::readyRead);
     connect(mSocket, &QAbstractSocket::bytesWritten, this, &QMailTransport::bytesWritten);
@@ -211,9 +207,9 @@ void QMailTransport::createSocket(EncryptType encryptType)
 }
 
 /*!
-    Opens a connection to the supplied \a url and \a port, using the specified \a encryptionType.
+    Opens a connection to the supplied \a hostName and \a port, using the specified \a encryptionType.
 */
-void QMailTransport::open(const QString& url, int port, EncryptType encryptionType)
+void QMailTransport::open(const QString &hostName, int port, EncryptType encryptionType)
 {
     if (mSocket && mSocket->isOpen()) {
         qCWarning(lcMessaging) << "Failed to open connection - already open!";
@@ -225,14 +221,14 @@ void QMailTransport::open(const QString& url, int port, EncryptType encryptionTy
     const int threeMin = 3 * 60 * 1000;
     connectToHostTimeOut.start(threeMin); // even this seems way too long?
     createSocket(encryptionType);
-    emit updateStatus(tr("DNS lookup"));
+    emit statusChanged(tr("DNS lookup"));
 
-    qCDebug(lcMessaging) << "Opening connection - " << url << ':' << port
+    qCDebug(lcMessaging) << "Opening connection - " << hostName << ':' << port
                          << (encryptionType == Encrypt_SSL ? " SSL" : (encryptionType == Encrypt_TLS ? " TLS" : ""));
     if (mailEncryption() == Encrypt_SSL)
-        mSocket->connectToHostEncrypted(url, port);
+        mSocket->connectToHostEncrypted(hostName, port);
     else
-        mSocket->connectToHost(url, port);
+        mSocket->connectToHost(hostName, port);
 }
 
 void QMailTransport::setAcceptUntrustedCertificates(bool accept)
@@ -275,7 +271,7 @@ void QMailTransport::close()
 /*!
     Returns true if a connection has been established.
 */
-bool QMailTransport::connected() const
+bool QMailTransport::isConnected() const
 {
     return mConnected;
 }
@@ -311,7 +307,7 @@ QDataStream& QMailTransport::stream()
 /*!
     Returns the socket object allowing state to be accessed and manipulated.
 */
-QAbstractSocket& QMailTransport::socket()
+QSslSocket& QMailTransport::socket()
 {
     Q_ASSERT(mSocket);
     return *mSocket;
@@ -355,7 +351,7 @@ void QMailTransport::connectionEstablished()
     connectToHostTimeOut.stop();
     if (mailEncryption() == Encrypt_NONE) {
         mConnected = true;
-        emit updateStatus(tr("Connected"));
+        emit statusChanged(tr("Connected"));
     }
 
     qCDebug(lcMessaging) << mName << ": connection established";
@@ -366,7 +362,7 @@ void QMailTransport::connectionEstablished()
 void QMailTransport::hostConnectionTimeOut()
 {
     connectToHostTimeOut.stop();
-    errorHandling(QAbstractSocket::SocketTimeoutError, tr("Connection timed out"));
+    reportSocketError(QAbstractSocket::SocketTimeoutError, tr("Connection timed out"));
 }
 
 /*! \internal */
@@ -374,7 +370,7 @@ void QMailTransport::encryptionEstablished()
 {
     if (mailEncryption() != Encrypt_NONE) {
         mConnected = true;
-        emit updateStatus(tr("Connected"));
+        emit statusChanged(tr("Connected"));
     }
 
     qCDebug(lcMessaging) << mName << ": Secure connection established";
@@ -382,7 +378,7 @@ void QMailTransport::encryptionEstablished()
 }
 
 /*! \internal */
-void QMailTransport::connectionFailed(const QList<QSslError>& errors)
+void QMailTransport::handleSslErrors(const QList<QSslError>& errors)
 {
     QMailServiceAction::Status::ErrorCode errorCode = classifyCertificateErrors(errors);
 
@@ -395,8 +391,8 @@ void QMailTransport::connectionFailed(const QList<QSslError>& errors)
         mInUse = false;
         mSocket->abort();
 
-        emit updateStatus(tr("Error occurred"));
-        emit sslErrorOccured(errorCode, tr("Socket error"));
+        emit statusChanged(tr("Error occurred"));
+        emit sslErrorOccurred(errorCode);
     }
 }
 
@@ -433,25 +429,25 @@ QMailServiceAction::Status::ErrorCode QMailTransport::classifyCertificateErrors(
 }
 
 /*! \internal */
-void QMailTransport::errorHandling(int status, QString msg)
+void QMailTransport::reportSocketError(int status, QString msg)
 {
     connectToHostTimeOut.stop();
     mConnected = false;
     mInUse = false;
     mSocket->abort();
 
-    emit updateStatus(tr("Error occurred"));
+    emit statusChanged(tr("Error occurred"));
 
     // Socket errors run from -1; offset this value by +2
-    emit errorOccurred(status + 2, msg);
+    emit socketErrorOccurred(status + 2, msg);
 }
 
 /*! \internal */
-void QMailTransport::socketError(QAbstractSocket::SocketError status)
+void QMailTransport::handleSocketError(QAbstractSocket::SocketError status)
 {
     qCWarning(lcMessaging) << "socketError:" << static_cast<int>(status)
                            << ':' << mSocket->errorString();
-    errorHandling(static_cast<int>(status), tr("Socket error"));
+    reportSocketError(static_cast<int>(status), tr("Socket error"));
 }
 
 /*!
@@ -485,15 +481,15 @@ QMailTransport::EncryptType QMailTransport::mailEncryption() const
 */
 
 /*!
-    \fn void QMailTransport::errorOccurred(int status, QString text);
+    \fn void QMailTransport::socketErrorOccurred(int status, const QString &text);
 
     This signal is emitted when an error is encountered.
-    The value of \a status corresponds to a value of QSslSocket::SocketError, and \a text
+    The value of \a status corresponds to a value of QAbstractSocket::SocketError, and \a text
     contains a textual annotation where possible.
 */
 
 /*!
-    \fn void QMailTransport::updateStatus(const QString &status);
+    \fn void QMailTransport::statusChanged(const QString &status);
 
     This signal is emitted when a change in status is reported.  The new status is described by \a status.
 */
diff --git a/src/libraries/qmfmessageserver/qmailtransport.h b/src/libraries/qmfmessageserver/qmailtransport.h
index 7d6a92fc..0abd91d4 100644
--- a/src/libraries/qmfmessageserver/qmailtransport.h
+++ b/src/libraries/qmfmessageserver/qmailtransport.h
@@ -38,7 +38,7 @@
 #include <qmailserviceaction.h>
 
 #include <QObject>
-#include <QAbstractSocket>
+#include <QSslSocket>
 #include <QTimer>
 #include <QSslError>
 
@@ -64,7 +64,7 @@ public:
     virtual ~QMailTransport();
 
     // Open a connection to the specified server
-    void open(const QString& url, int port, EncryptType encryptionType);
+    void open(const QString &hostName, int port, EncryptType encryptionType);
 
     void setAcceptUntrustedCertificates(bool accept);
     bool acceptUntrustedCertificates() const;
@@ -76,7 +76,7 @@ public:
     void close();
 
     // True if a connection has been established with the desired enryption type
-    bool connected() const;
+    bool isConnected() const;
 
     bool isEncrypted() const;
 
@@ -85,7 +85,7 @@ public:
 
     // Access a stream to write to the mail server (must have an open connection)
     QDataStream& stream();
-    QAbstractSocket& socket();
+    QSslSocket& socket();
 
     // Read line-oriented data from the transport (must have an open connection)
     bool canReadLine() const;
@@ -102,25 +102,20 @@ Q_SIGNALS:
     void readyRead();
     void bytesWritten(qint64 transmitted);
 
-    void errorOccurred(int status, QString);
-    void updateStatus(const QString &);
-    void sslErrorOccured(QMailServiceAction::Status::ErrorCode, QString);
+    void statusChanged(const QString &statusText);
+    void socketErrorOccurred(int status, const QString &message);
+    void sslErrorOccurred(QMailServiceAction::Status::ErrorCode error);
 
-public Q_SLOTS:
-    void errorHandling(int errorCode, QString msg);
-    void socketError(QAbstractSocket::SocketError error);
-
-protected Q_SLOTS:
+private Q_SLOTS:
+    void handleSocketError(QAbstractSocket::SocketError error);
     void connectionEstablished();
     void hostConnectionTimeOut();
     void encryptionEstablished();
-    void connectionFailed(const QList<QSslError>& errors);
-
-protected:
-    // Override to modify certificate error handling
-    virtual QMailServiceAction::Status::ErrorCode classifyCertificateErrors(const QList<QSslError>& errors);
+    void handleSslErrors(const QList<QSslError>& errors);
 
 private:
+    void reportSocketError(int errorCode, QString msg);
+    QMailServiceAction::Status::ErrorCode classifyCertificateErrors(const QList<QSslError>& errors);
     void createSocket(EncryptType encryptType);
     EncryptType mailEncryption() const;