Run clang-format also on all cpp files

8 files changed, 106 insertions, 150 deletions

diff --git a/src/server/QXmppDialback.cpp b/src/server/QXmppDialback.cpp
index 852edc5b..28c00f61 100644
--- a/src/server/QXmppDialback.cpp
+++ b/src/server/QXmppDialback.cpp
@@ -87,8 +87,8 @@ void QXmppDialback::setType(const QString &type)
 bool QXmppDialback::isDialback(const QDomElement &element)
 {
     return element.namespaceURI() == ns_server_dialback &&
-           (element.tagName() == QLatin1String("result") ||
-           element.tagName() == QLatin1String("verify"));
+        (element.tagName() == QLatin1String("result") ||
+         element.tagName() == QLatin1String("verify"));
 }
 
 void QXmppDialback::parse(const QDomElement &element)
diff --git a/src/server/QXmppIncomingClient.cpp b/src/server/QXmppIncomingClient.cpp
index 6142faab..919b2561 100644
--- a/src/server/QXmppIncomingClient.cpp
+++ b/src/server/QXmppIncomingClient.cpp
@@ -59,10 +59,7 @@ private:
 };
 
 QXmppIncomingClientPrivate::QXmppIncomingClientPrivate(QXmppIncomingClient *qq)
-    : idleTimer(nullptr)
-    , passwordChecker(nullptr)
-    , saslServer(nullptr)
-    , q(qq)
+    : idleTimer(nullptr), passwordChecker(nullptr), saslServer(nullptr), q(qq)
 {
 }
 
@@ -114,7 +111,7 @@ QXmppIncomingClient::QXmppIncomingClient(QSslSocket *socket, const QString &doma
 
     if (socket) {
         connect(socket, &QAbstractSocket::disconnected,
-                        this, &QXmppIncomingClient::onSocketDisconnected);
+                this, &QXmppIncomingClient::onSocketDisconnected);
 
         setSocket(socket);
     }
@@ -125,7 +122,7 @@ QXmppIncomingClient::QXmppIncomingClient(QSslSocket *socket, const QString &doma
     d->idleTimer = new QTimer(this);
     d->idleTimer->setSingleShot(true);
     connect(d->idleTimer, &QTimer::timeout,
-                    this, &QXmppIncomingClient::onTimeout);
+            this, &QXmppIncomingClient::onTimeout);
 }
 
 /// Destroys the current stream.
@@ -143,8 +140,8 @@ QXmppIncomingClient::~QXmppIncomingClient()
 bool QXmppIncomingClient::isConnected() const
 {
     return QXmppStream::isConnected() &&
-           !d->jid.isEmpty() &&
-           !d->resource.isEmpty();
+        !d->jid.isEmpty() &&
+        !d->resource.isEmpty();
 }
 
 /// Returns the client's JID.
@@ -189,23 +186,24 @@ void QXmppIncomingClient::handleStream(const QDomElement &streamElement)
     // start stream
     const QByteArray sessionId = QXmppUtils::generateStanzaHash().toLatin1();
     QString response = QString("<?xml version='1.0'?><stream:stream"
-        " xmlns=\"%1\" xmlns:stream=\"%2\""
-        " id=\"%3\" from=\"%4\" version=\"1.0\" xml:lang=\"en\">").arg(
-        ns_client,
-        ns_stream,
-        sessionId,
-        d->domain.toLatin1());
+                               " xmlns=\"%1\" xmlns:stream=\"%2\""
+                               " id=\"%3\" from=\"%4\" version=\"1.0\" xml:lang=\"en\">")
+                           .arg(
+                               ns_client,
+                               ns_stream,
+                               sessionId,
+                               d->domain.toLatin1());
     sendData(response.toUtf8());
 
     // check requested domain
-    if (streamElement.attribute("to") != d->domain)
-    {
+    if (streamElement.attribute("to") != d->domain) {
         QString response = QString("<stream:error>"
-            "<host-unknown xmlns=\"urn:ietf:params:xml:ns:xmpp-streams\"/>"
-            "<text xmlns=\"urn:ietf:params:xml:ns:xmpp-streams\">"
-                "This server does not serve %1"
-            "</text>"
-            "</stream:error>").arg(streamElement.attribute("to"));
+                                   "<host-unknown xmlns=\"urn:ietf:params:xml:ns:xmpp-streams\"/>"
+                                   "<text xmlns=\"urn:ietf:params:xml:ns:xmpp-streams\">"
+                                   "This server does not serve %1"
+                                   "</text>"
+                                   "</stream:error>")
+                               .arg(streamElement.attribute("to"));
         sendData(response.toUtf8());
         disconnectFromHost();
         return;
@@ -215,13 +213,10 @@ void QXmppIncomingClient::handleStream(const QDomElement &streamElement)
     QXmppStreamFeatures features;
     if (socket() && !socket()->isEncrypted() && !socket()->localCertificate().isNull() && !socket()->privateKey().isNull())
         features.setTlsMode(QXmppStreamFeatures::Enabled);
-    if (!d->jid.isEmpty())
-    {
+    if (!d->jid.isEmpty()) {
         features.setBindMode(QXmppStreamFeatures::Required);
         features.setSessionMode(QXmppStreamFeatures::Enabled);
-    }
-    else if (d->passwordChecker)
-    {
+    } else if (d->passwordChecker) {
         QStringList mechanisms;
         mechanisms << "PLAIN";
         if (d->passwordChecker->hasGetPassword())
@@ -278,9 +273,7 @@ void QXmppIncomingClient::handleStanza(const QDomElement &nodeRecv)
                 disconnectFromHost();
                 return;
             }
-        }
-        else if (nodeRecv.tagName() == QLatin1String("response"))
-        {
+        } else if (nodeRecv.tagName() == QLatin1String("response")) {
             QXmppSaslResponse response;
             response.parse(nodeRecv);
 
@@ -309,14 +302,10 @@ void QXmppIncomingClient::handleStanza(const QDomElement &nodeRecv)
                 disconnectFromHost();
             }
         }
-    }
-    else if (ns == ns_client)
-    {
-        if (nodeRecv.tagName() == QLatin1String("iq"))
-        {
+    } else if (ns == ns_client) {
+        if (nodeRecv.tagName() == QLatin1String("iq")) {
             const QString type = nodeRecv.attribute("type");
-            if (QXmppBindIq::isBindIq(nodeRecv) && type == QLatin1String("set"))
-            {
+            if (QXmppBindIq::isBindIq(nodeRecv) && type == QLatin1String("set")) {
                 QXmppBindIq bindSet;
                 bindSet.parse(nodeRecv);
                 d->resource = bindSet.resource().trimmed();
@@ -333,9 +322,7 @@ void QXmppIncomingClient::handleStanza(const QDomElement &nodeRecv)
                 // bound
                 emit connected();
                 return;
-            }
-            else if (QXmppSessionIq::isSessionIq(nodeRecv) && type == QLatin1String("set"))
-            {
+            } else if (QXmppSessionIq::isSessionIq(nodeRecv) && type == QLatin1String("set")) {
                 QXmppSessionIq sessionSet;
                 sessionSet.parse(nodeRecv);
 
@@ -350,8 +337,7 @@ void QXmppIncomingClient::handleStanza(const QDomElement &nodeRecv)
 
         // check the sender is legitimate
         const QString from = nodeRecv.attribute("from");
-        if (!from.isEmpty() && from != d->jid && from != QXmppUtils::jidToBareJid(d->jid))
-        {
+        if (!from.isEmpty() && from != d->jid && from != QXmppUtils::jidToBareJid(d->jid)) {
             warning(QString("Received a stanza from unexpected JID %1").arg(from));
             return;
         }
@@ -359,16 +345,14 @@ void QXmppIncomingClient::handleStanza(const QDomElement &nodeRecv)
         // process unhandled stanzas
         if (nodeRecv.tagName() == QLatin1String("iq") ||
             nodeRecv.tagName() == QLatin1String("message") ||
-            nodeRecv.tagName() == QLatin1String("presence"))
-        {
+            nodeRecv.tagName() == QLatin1String("presence")) {
             QDomElement nodeFull(nodeRecv);
 
             // if the sender is empty, set it to the appropriate JID
-            if (nodeFull.attribute("from").isEmpty())
-            {
+            if (nodeFull.attribute("from").isEmpty()) {
                 if (nodeFull.tagName() == QLatin1String("presence") &&
                     (nodeFull.attribute("type") == QLatin1String("subscribe") ||
-                    nodeFull.attribute("type") == QLatin1String("subscribed")))
+                     nodeFull.attribute("type") == QLatin1String("subscribed")))
                     nodeFull.setAttribute("from", QXmppUtils::jidToBareJid(d->jid));
                 else
                     nodeFull.setAttribute("from", d->jid);
@@ -387,7 +371,7 @@ void QXmppIncomingClient::handleStanza(const QDomElement &nodeRecv)
 
 void QXmppIncomingClient::onDigestReply()
 {
-    auto *reply = qobject_cast<QXmppPasswordReply*>(sender());
+    auto *reply = qobject_cast<QXmppPasswordReply *>(sender());
     if (!reply)
         return;
     reply->deleteLater();
@@ -418,7 +402,7 @@ void QXmppIncomingClient::onDigestReply()
 
 void QXmppIncomingClient::onPasswordReply()
 {
-    auto *reply = qobject_cast<QXmppPasswordReply*>(sender());
+    auto *reply = qobject_cast<QXmppPasswordReply *>(sender());
     if (!reply)
         return;
     reply->deleteLater();
@@ -461,5 +445,3 @@ void QXmppIncomingClient::onTimeout()
     // make sure disconnected() gets emitted no matter what
     QTimer::singleShot(30, this, &QXmppStream::disconnected);
 }
-
-
diff --git a/src/server/QXmppIncomingServer.cpp b/src/server/QXmppIncomingServer.cpp
index 7e2e8a0b..226c97de 100644
--- a/src/server/QXmppIncomingServer.cpp
+++ b/src/server/QXmppIncomingServer.cpp
@@ -79,7 +79,7 @@ QXmppIncomingServer::QXmppIncomingServer(QSslSocket *socket, const QString &doma
 
     if (socket) {
         connect(socket, &QAbstractSocket::disconnected,
-                        this, &QXmppIncomingServer::slotSocketDisconnected);
+                this, &QXmppIncomingServer::slotSocketDisconnected);
 
         setSocket(socket);
     }
@@ -112,12 +112,13 @@ void QXmppIncomingServer::handleStream(const QDomElement &streamElement)
     // start stream
     d->localStreamId = QXmppUtils::generateStanzaHash().toLatin1();
     QString data = QString("<?xml version='1.0'?><stream:stream"
-        " xmlns='%1' xmlns:db='%2' xmlns:stream='%3'"
-        " id='%4' version=\"1.0\">").arg(
-            ns_server,
-            ns_server_dialback,
-            ns_stream,
-            d->localStreamId);
+                           " xmlns='%1' xmlns:db='%2' xmlns:stream='%3'"
+                           " id='%4' version=\"1.0\">")
+                       .arg(
+                           ns_server,
+                           ns_server_dialback,
+                           ns_stream,
+                           d->localStreamId);
     sendData(data.toUtf8());
 
     // send stream features
@@ -143,33 +144,27 @@ void QXmppIncomingServer::handleStanza(const QDomElement &stanza)
         if (!request.type().isEmpty() ||
             request.from().isEmpty() ||
             request.to() != d->domain ||
-            request.key().isEmpty())
-        {
+            request.key().isEmpty()) {
             warning(QString("Invalid dialback received on %1").arg(d->origin()));
             return;
         }
 
         const QString domain = request.from();
-        if (request.command() == QXmppDialback::Result)
-        {
+        if (request.command() == QXmppDialback::Result) {
             debug(QString("Received a dialback result from '%1' on %2").arg(domain, d->origin()));
 
             // establish dialback connection
             auto *stream = new QXmppOutgoingServer(d->domain, this);
             connect(stream, &QXmppOutgoingServer::dialbackResponseReceived,
-                                 this, &QXmppIncomingServer::slotDialbackResponseReceived);
+                    this, &QXmppIncomingServer::slotDialbackResponseReceived);
             stream->setVerify(d->localStreamId, request.key());
             stream->connectToHost(domain);
-        }
-        else if (request.command() == QXmppDialback::Verify)
-        {
+        } else if (request.command() == QXmppDialback::Verify) {
             debug(QString("Received a dialback verify from '%1' on %2").arg(domain, d->origin()));
             emit dialbackRequestReceived(request);
         }
 
-    }
-    else if (d->authenticated.contains(QXmppUtils::jidToDomain(stanza.attribute("from"))))
-    {
+    } else if (d->authenticated.contains(QXmppUtils::jidToDomain(stanza.attribute("from")))) {
         // relay stanza if the remote party is authenticated
         emit elementReceived(stanza);
     } else {
@@ -195,7 +190,7 @@ bool QXmppIncomingServer::isConnected() const
 
 void QXmppIncomingServer::slotDialbackResponseReceived(const QXmppDialback &dialback)
 {
-    auto *stream = qobject_cast<QXmppOutgoingServer*>(sender());
+    auto *stream = qobject_cast<QXmppOutgoingServer *>(sender());
     if (!stream ||
         dialback.command() != QXmppDialback::Verify ||
         dialback.id() != d->localStreamId ||
@@ -211,8 +206,7 @@ void QXmppIncomingServer::slotDialbackResponseReceived(const QXmppDialback &dial
     sendPacket(response);
 
     // check for success
-    if (response.type() == QLatin1String("valid"))
-    {
+    if (response.type() == QLatin1String("valid")) {
         info(QString("Verified incoming domain '%1' on %2").arg(dialback.from(), d->origin()));
         const bool wasConnected = !d->authenticated.isEmpty();
         d->authenticated.insert(dialback.from());
diff --git a/src/server/QXmppOutgoingServer.cpp b/src/server/QXmppOutgoingServer.cpp
index b0085867..20e2810a 100644
--- a/src/server/QXmppOutgoingServer.cpp
+++ b/src/server/QXmppOutgoingServer.cpp
@@ -59,7 +59,7 @@ public:
 
 QXmppOutgoingServer::QXmppOutgoingServer(const QString &domain, QObject *parent)
     : QXmppStream(parent),
-    d(new QXmppOutgoingServerPrivate)
+      d(new QXmppOutgoingServerPrivate)
 {
     // socket initialisation
     auto *socket = new QSslSocket(this);
@@ -118,7 +118,7 @@ void QXmppOutgoingServer::_q_dnsLookupFinished()
     } else {
         // as a fallback, use domain as the host name
         warning(QString("Lookup for domain %1 failed: %2")
-                .arg(d->dns.name(), d->dns.errorString()));
+                    .arg(d->dns.name(), d->dns.errorString()));
         host = d->remoteDomain;
         port = 5269;
     }
@@ -144,10 +144,11 @@ void QXmppOutgoingServer::handleStart()
     QXmppStream::handleStart();
 
     QString data = QString("<?xml version='1.0'?><stream:stream"
-        " xmlns='%1' xmlns:db='%2' xmlns:stream='%3' version='1.0'>").arg(
-            ns_server,
-            ns_server_dialback,
-            ns_stream);
+                           " xmlns='%1' xmlns:db='%2' xmlns:stream='%3' version='1.0'>")
+                       .arg(
+                           ns_server,
+                           ns_server_dialback,
+                           ns_stream);
     sendData(data.toUtf8());
 }
 
@@ -164,14 +165,14 @@ void QXmppOutgoingServer::handleStanza(const QDomElement &stanza)
 {
     const QString ns = stanza.namespaceURI();
 
-    if(QXmppStreamFeatures::isStreamFeatures(stanza)) {
+    if (QXmppStreamFeatures::isStreamFeatures(stanza)) {
         QXmppStreamFeatures features;
         features.parse(stanza);
 
         if (!socket()->isEncrypted()) {
             // check we can satisfy TLS constraints
             if (!socket()->supportsSsl() &&
-                 features.tlsMode() == QXmppStreamFeatures::Required) {
+                features.tlsMode() == QXmppStreamFeatures::Required) {
                 warning("Disconnecting as TLS is required, but SSL support is not available");
                 disconnectFromHost();
                 return;
@@ -199,15 +200,12 @@ void QXmppOutgoingServer::handleStanza(const QDomElement &stanza)
         // check the request is valid
         if (response.from().isEmpty() ||
             response.to() != d->localDomain ||
-            response.type().isEmpty())
-        {
+            response.type().isEmpty()) {
             warning("Invalid dialback response received");
             return;
         }
-        if (response.command() == QXmppDialback::Result)
-        {
-            if (response.type() == QLatin1String("valid"))
-            {
+        if (response.command() == QXmppDialback::Result) {
+            if (response.type() == QLatin1String("valid")) {
                 info(QString("Outgoing server stream to %1 is ready").arg(response.from()));
                 d->ready = true;
 
@@ -219,12 +217,9 @@ void QXmppOutgoingServer::handleStanza(const QDomElement &stanza)
                 // emit signal
                 emit connected();
             }
-        }
-        else if (response.command() == QXmppDialback::Verify)
-        {
+        } else if (response.command() == QXmppDialback::Verify) {
             emit dialbackResponseReceived(response);
         }
-
     }
 }
 /// \endcond
@@ -285,8 +280,7 @@ QString QXmppOutgoingServer::remoteDomain() const
 
 void QXmppOutgoingServer::sendDialback()
 {
-    if (!d->localStreamKey.isEmpty())
-    {
+    if (!d->localStreamKey.isEmpty()) {
         // send dialback key
         debug(QString("Sending dialback result to %1").arg(d->remoteDomain));
         QXmppDialback dialback;
@@ -295,9 +289,7 @@ void QXmppOutgoingServer::sendDialback()
         dialback.setTo(d->remoteDomain);
         dialback.setKey(d->localStreamKey);
         sendPacket(dialback);
-    }
-    else if (!d->verifyId.isEmpty() && !d->verifyKey.isEmpty())
-    {
+    } else if (!d->verifyId.isEmpty() && !d->verifyKey.isEmpty()) {
         // send dialback verify
         debug(QString("Sending dialback verify to %1").arg(d->remoteDomain));
         QXmppDialback verify;
@@ -313,7 +305,7 @@ void QXmppOutgoingServer::sendDialback()
 void QXmppOutgoingServer::slotSslErrors(const QList<QSslError> &errors)
 {
     warning("SSL errors");
-    for(int i = 0; i < errors.count(); ++i)
+    for (int i = 0; i < errors.count(); ++i)
         warning(errors.at(i).errorString());
     socket()->ignoreSslErrors();
 }
@@ -323,4 +315,3 @@ void QXmppOutgoingServer::socketError(QAbstractSocket::SocketError error)
     Q_UNUSED(error);
     emit disconnected();
 }
-
diff --git a/src/server/QXmppPasswordChecker.cpp b/src/server/QXmppPasswordChecker.cpp
index af03ecb5..2b6e94d9 100644
--- a/src/server/QXmppPasswordChecker.cpp
+++ b/src/server/QXmppPasswordChecker.cpp
@@ -79,8 +79,8 @@ void QXmppPasswordRequest::setUsername(const QString &username)
 
 QXmppPasswordReply::QXmppPasswordReply(QObject *parent)
     : QObject(parent),
-    m_error(QXmppPasswordReply::NoError),
-    m_isFinished(false)
+      m_error(QXmppPasswordReply::NoError),
+      m_isFinished(false)
 {
 }
 
@@ -225,4 +225,3 @@ bool QXmppPasswordChecker::hasGetPassword() const
 {
     return false;
 }
-
diff --git a/src/server/QXmppServer.cpp b/src/server/QXmppServer.cpp
index ea86e124..2ee38fa6 100644
--- a/src/server/QXmppServer.cpp
+++ b/src/server/QXmppServer.cpp
@@ -51,18 +51,15 @@ static void helperToXmlAddDomElement(QXmlStreamWriter *stream, const QDomElement
     if (!xmlns.isEmpty() && !omitNamespaces.contains(xmlns))
         stream->writeDefaultNamespace(xmlns);
     QDomNamedNodeMap attrs = element.attributes();
-    for (int i = 0; i < attrs.size(); i++)
-    {
+    for (int i = 0; i < attrs.size(); i++) {
         QDomAttr attr = attrs.item(i).toAttr();
         stream->writeAttribute(attr.name(), attr.value());
     }
 
     /* children */
     QDomNode childNode = element.firstChild();
-    while (!childNode.isNull())
-    {
-        if (childNode.isElement())
-        {
+    while (!childNode.isNull()) {
+        if (childNode.isElement()) {
             helperToXmlAddDomElement(stream, childNode.toElement(), QStringList() << xmlns);
         } else if (childNode.isText()) {
             stream->writeCharacters(childNode.toText().data());
@@ -85,20 +82,20 @@ public:
     void warning(const QString &message);
 
     QString domain;
-    QList<QXmppServerExtension*> extensions;
+    QList<QXmppServerExtension *> extensions;
     QXmppLogger *logger;
     QXmppPasswordChecker *passwordChecker;
 
     // client-to-server
-    QSet<QXmppIncomingClient*> incomingClients;
-    QHash<QString, QXmppIncomingClient*> incomingClientsByJid;
-    QHash<QString, QSet<QXmppIncomingClient*> > incomingClientsByBareJid;
-    QSet<QXmppSslServer*> serversForClients;
+    QSet<QXmppIncomingClient *> incomingClients;
+    QHash<QString, QXmppIncomingClient *> incomingClientsByJid;
+    QHash<QString, QSet<QXmppIncomingClient *>> incomingClientsByBareJid;
+    QSet<QXmppSslServer *> serversForClients;
 
     // server-to-server
-    QSet<QXmppIncomingServer*> incomingServers;
-    QSet<QXmppOutgoingServer*> outgoingServers;
-    QSet<QXmppSslServer*> serversForServers;
+    QSet<QXmppIncomingServer *> incomingServers;
+    QSet<QXmppOutgoingServer *> outgoingServers;
+    QSet<QXmppSslServer *> serversForServers;
 
     // ssl
     QList<QSslCertificate> caCertificates;
@@ -113,10 +110,10 @@ private:
 
 QXmppServerPrivate::QXmppServerPrivate(QXmppServer *qq)
     : logger(nullptr),
-    passwordChecker(nullptr),
-    loaded(false),
-    started(false),
-    q(qq)
+      passwordChecker(nullptr),
+      loaded(false),
+      started(false),
+      q(qq)
 {
 }
 
@@ -135,7 +132,7 @@ bool QXmppServerPrivate::routeData(const QString &to, const QByteArray &data)
 
     if (toDomain == domain) {
         // look for a client connection
-        QList<QXmppIncomingClient*> found;
+        QList<QXmppIncomingClient *> found;
         if (QXmppUtils::jidToResource(to).isEmpty()) {
             const auto &connections = incomingClientsByBareJid.value(to);
             for (auto *conn : connections)
@@ -153,7 +150,6 @@ bool QXmppServerPrivate::routeData(const QString &to, const QByteArray &data)
 
     } else if (!serversForServers.isEmpty()) {
 
-
         // look for an outgoing S2S connection
         for (auto *conn : qAsConst(outgoingServers)) {
             if (conn->remoteDomain() == toDomain) {
@@ -171,7 +167,7 @@ bool QXmppServerPrivate::routeData(const QString &to, const QByteArray &data)
         conn->setParent(q);
 
         QObject::connect(conn, &QXmppStream::disconnected,
-                                 q, &QXmppServer::_q_outgoingServerDisconnected);
+                         q, &QXmppServer::_q_outgoingServerDisconnected);
 
         // add stream
         outgoingServers.insert(conn);
@@ -186,7 +182,6 @@ bool QXmppServerPrivate::routeData(const QString &to, const QByteArray &data)
 
         // S2S is disabled, failed to route data
         return false;
-
     }
 }
 
@@ -219,7 +214,7 @@ static void handleStanza(QXmppServer *server, const QDomElement &element)
                 response.setFrom(domain);
                 response.setTo(request.from());
                 QXmppStanza::Error error(QXmppStanza::Error::Cancel,
-                    QXmppStanza::Error::FeatureNotImplemented);
+                                         QXmppStanza::Error::FeatureNotImplemented);
                 response.setError(error);
                 server->sendPacket(response);
             }
@@ -237,7 +232,7 @@ static void handleStanza(QXmppServer *server, const QDomElement &element)
             response.setFrom(request.to());
             response.setTo(request.from());
             QXmppStanza::Error error(QXmppStanza::Error::Cancel,
-                QXmppStanza::Error::ServiceUnavailable);
+                                     QXmppStanza::Error::ServiceUnavailable);
             response.setError(error);
             server->sendPacket(response);
         }
@@ -264,7 +259,7 @@ void QXmppServerPrivate::loadExtensions(QXmppServer *server)
 {
     if (!loaded) {
         for (auto *object : QPluginLoader::staticInstances()) {
-            auto *plugin = qobject_cast<QXmppServerPlugin*>(object);
+            auto *plugin = qobject_cast<QXmppServerPlugin *>(object);
             if (!plugin)
                 continue;
 
@@ -305,8 +300,7 @@ void QXmppServerPrivate::stopExtensions()
 /// \param parent
 
 QXmppServer::QXmppServer(QObject *parent)
-    : QXmppLoggable(parent)
-    , d(new QXmppServerPrivate(this))
+    : QXmppLoggable(parent), d(new QXmppServerPrivate(this))
 {
     qRegisterMetaType<QDomElement>("QDomElement");
 }
@@ -346,7 +340,7 @@ void QXmppServer::addExtension(QXmppServerExtension *extension)
 /// Returns the list of loaded extensions.
 ///
 
-QList<QXmppServerExtension*> QXmppServer::extensions()
+QList<QXmppServerExtension *> QXmppServer::extensions()
 {
     d->loadExtensions(this);
     return d->extensions;
@@ -551,8 +545,8 @@ bool QXmppServer::listenForClients(const QHostAddress &address, quint16 port)
     server->setLocalCertificate(d->localCertificate);
     server->setPrivateKey(d->privateKey);
 
-    check = connect(server, SIGNAL(newConnection(QSslSocket*)),
-                    this, SLOT(_q_clientConnection(QSslSocket*)));
+    check = connect(server, SIGNAL(newConnection(QSslSocket *)),
+                    this, SLOT(_q_clientConnection(QSslSocket *)));
     Q_ASSERT(check);
 
     if (!server->listen(address, port)) {
@@ -585,13 +579,13 @@ void QXmppServer::close()
     d->stopExtensions();
 
     // close XMPP streams
-    QSetIterator<QXmppIncomingClient*> itr(d->incomingClients);
+    QSetIterator<QXmppIncomingClient *> itr(d->incomingClients);
     while (itr.hasNext())
         itr.next()->disconnectFromHost();
     for (auto *stream : d->incomingServers)
-       stream->disconnectFromHost();
+        stream->disconnectFromHost();
     for (auto *stream : d->outgoingServers)
-       stream->disconnectFromHost();
+        stream->disconnectFromHost();
 }
 
 /// Listen for incoming XMPP server connections.
@@ -615,8 +609,8 @@ bool QXmppServer::listenForServers(const QHostAddress &address, quint16 port)
     server->setLocalCertificate(d->localCertificate);
     server->setPrivateKey(d->privateKey);
 
-    check = connect(server, SIGNAL(newConnection(QSslSocket*)),
-                    this, SLOT(_q_serverConnection(QSslSocket*)));
+    check = connect(server, SIGNAL(newConnection(QSslSocket *)),
+                    this, SLOT(_q_serverConnection(QSslSocket *)));
     Q_ASSERT(check);
 
     if (!server->listen(address, port)) {
@@ -674,13 +668,13 @@ void QXmppServer::addIncomingClient(QXmppIncomingClient *stream)
     stream->setPasswordChecker(d->passwordChecker);
 
     connect(stream, &QXmppStream::connected,
-                    this, &QXmppServer::_q_clientConnected);
+            this, &QXmppServer::_q_clientConnected);
 
     connect(stream, &QXmppStream::disconnected,
-                    this, &QXmppServer::_q_clientDisconnected);
+            this, &QXmppServer::_q_clientDisconnected);
 
     connect(stream, &QXmppIncomingClient::elementReceived,
-                    this, &QXmppServer::handleElement);
+            this, &QXmppServer::handleElement);
 
     // add stream
     d->incomingClients.insert(stream);
@@ -710,7 +704,7 @@ void QXmppServer::_q_clientConnection(QSslSocket *socket)
 
 void QXmppServer::_q_clientConnected()
 {
-    auto *client = qobject_cast<QXmppIncomingClient*>(sender());
+    auto *client = qobject_cast<QXmppIncomingClient *>(sender());
     if (!client)
         return;
 
@@ -734,7 +728,7 @@ void QXmppServer::_q_clientConnected()
 
 void QXmppServer::_q_clientDisconnected()
 {
-    auto *client  = qobject_cast<QXmppIncomingClient *>(sender());
+    auto *client = qobject_cast<QXmppIncomingClient *>(sender());
     if (!client)
         return;
 
@@ -770,8 +764,7 @@ void QXmppServer::_q_dialbackRequestReceived(const QXmppDialback &dialback)
     if (!stream)
         return;
 
-    if (dialback.command() == QXmppDialback::Verify)
-    {
+    if (dialback.command() == QXmppDialback::Verify) {
         // handle a verify request
         for (auto *out : qAsConst(d->outgoingServers)) {
             if (out->remoteDomain() != dialback.from())
@@ -828,13 +821,13 @@ void QXmppServer::_q_serverConnection(QSslSocket *socket)
     socket->setParent(stream);
 
     connect(stream, &QXmppStream::disconnected,
-                    this, &QXmppServer::_q_serverDisconnected);
+            this, &QXmppServer::_q_serverDisconnected);
 
     connect(stream, &QXmppIncomingServer::dialbackRequestReceived,
-                    this, &QXmppServer::_q_dialbackRequestReceived);
+            this, &QXmppServer::_q_dialbackRequestReceived);
 
     connect(stream, &QXmppIncomingServer::elementReceived,
-                    this, &QXmppServer::handleElement);
+            this, &QXmppServer::handleElement);
 
     // add stream
     d->incomingServers.insert(stream);
@@ -869,7 +862,7 @@ public:
 
 QXmppSslServer::QXmppSslServer(QObject *parent)
     : QTcpServer(parent),
-    d(new QXmppSslServerPrivate)
+      d(new QXmppSslServerPrivate)
 {
 }
 
@@ -925,4 +918,3 @@ void QXmppSslServer::setPrivateKey(const QSslKey &key)
 {
     d->privateKey = key;
 }
-
diff --git a/src/server/QXmppServerExtension.cpp b/src/server/QXmppServerExtension.cpp
index 0db387aa..a52b2121 100644
--- a/src/server/QXmppServerExtension.cpp
+++ b/src/server/QXmppServerExtension.cpp
@@ -149,4 +149,3 @@ void QXmppServerExtension::setServer(QXmppServer *server)
 {
     d->server = server;
 }
-
diff --git a/src/server/QXmppServerPlugin.cpp b/src/server/QXmppServerPlugin.cpp
index a31429c8..90768535 100644
--- a/src/server/QXmppServerPlugin.cpp
+++ b/src/server/QXmppServerPlugin.cpp
@@ -22,4 +22,3 @@
  */
 
 #include "QXmppServerPlugin.h"
-