Run 'clang-format' on all files

17 files changed, 153 insertions, 147 deletions

diff --git a/src/client/QXmppAttentionManager.cpp b/src/client/QXmppAttentionManager.cpp
index 95ac7626..2e4fa244 100644
--- a/src/client/QXmppAttentionManager.cpp
+++ b/src/client/QXmppAttentionManager.cpp
@@ -57,7 +57,8 @@
 /// rate limiter.
 ///
 
-struct PastRequest {
+struct PastRequest
+{
     QString bareJid;
     QDateTime timestamp;
 };
diff --git a/src/client/QXmppCall_p.h b/src/client/QXmppCall_p.h
index 20c95186..195d65c1 100644
--- a/src/client/QXmppCall_p.h
+++ b/src/client/QXmppCall_p.h
@@ -29,7 +29,8 @@ class QXmppCallPrivate : public QObject
 {
     Q_OBJECT
 public:
-    struct GstCodec {
+    struct GstCodec
+    {
         int pt;
         QString name;
         int channels;
@@ -38,7 +39,8 @@ public:
         QString gstDepay;
         QString gstEnc;
         QString gstDec;
-        struct Property {
+        struct Property
+        {
             QString name;
             int value;
         };
diff --git a/src/client/QXmppClient.cpp b/src/client/QXmppClient.cpp
index b6c31eea..ce036676 100644
--- a/src/client/QXmppClient.cpp
+++ b/src/client/QXmppClient.cpp
@@ -30,7 +30,7 @@
 using namespace QXmpp::Private;
 
 /// \cond
-QXmppClientPrivate::QXmppClientPrivate(QXmppClient* qq)
+QXmppClientPrivate::QXmppClientPrivate(QXmppClient *qq)
     : clientPresence(QXmppPresence::Available),
       logger(nullptr),
       stream(nullptr),
@@ -43,9 +43,9 @@ QXmppClientPrivate::QXmppClientPrivate(QXmppClient* qq)
 {
 }
 
-void QXmppClientPrivate::addProperCapability(QXmppPresence& presence)
+void QXmppClientPrivate::addProperCapability(QXmppPresence &presence)
 {
-    auto* ext = q->findExtension<QXmppDiscoveryManager>();
+    auto *ext = q->findExtension<QXmppDiscoveryManager>();
     if (ext) {
         presence.setCapabilityHash("sha-1");
         presence.setCapabilityNode(ext->clientCapabilitiesNode());
@@ -128,7 +128,7 @@ QStringList QXmppClientPrivate::discoveryFeatures()
 /// \param parent is passed to the QObject's constructor.
 /// The default value is 0.
 
-QXmppClient::QXmppClient(QObject* parent)
+QXmppClient::QXmppClient(QObject *parent)
     : QXmppLoggable(parent),
       d(new QXmppClientPrivate(this))
 {
@@ -202,7 +202,7 @@ QXmppClient::~QXmppClient()
 ///
 /// \param extension
 
-bool QXmppClient::addExtension(QXmppClientExtension* extension)
+bool QXmppClient::addExtension(QXmppClientExtension *extension)
 {
     return insertExtension(d->extensions.size(), extension);
 }
@@ -212,7 +212,7 @@ bool QXmppClient::addExtension(QXmppClientExtension* extension)
 /// \param index
 /// \param extension
 
-bool QXmppClient::insertExtension(int index, QXmppClientExtension* extension)
+bool QXmppClient::insertExtension(int index, QXmppClientExtension *extension)
 {
     if (d->extensions.contains(extension)) {
         qWarning("Cannot add extension, it has already been added");
@@ -230,7 +230,7 @@ bool QXmppClient::insertExtension(int index, QXmppClientExtension* extension)
 ///
 /// \param extension
 
-bool QXmppClient::removeExtension(QXmppClientExtension* extension)
+bool QXmppClient::removeExtension(QXmppClientExtension *extension)
 {
     if (d->extensions.contains(extension)) {
         d->extensions.removeAll(extension);
@@ -265,7 +265,7 @@ void QXmppClient::setEncryptionExtension(QXmppE2eeExtension *extension)
 /// Returns a list containing all the client's extensions.
 ///
 
-QList<QXmppClientExtension*> QXmppClient::extensions()
+QList<QXmppClientExtension *> QXmppClient::extensions()
 {
     return d->extensions;
 }
@@ -273,7 +273,7 @@ QList<QXmppClientExtension*> QXmppClient::extensions()
 /// Returns a modifiable reference to the current configuration of QXmppClient.
 /// \return Reference to the QXmppClient's configuration for the connection.
 
-QXmppConfiguration& QXmppClient::configuration()
+QXmppConfiguration &QXmppClient::configuration()
 {
     return d->stream->configuration();
 }
@@ -288,8 +288,8 @@ QXmppConfiguration& QXmppClient::configuration()
 /// \param initialPresence The initial presence which will be set for this user
 /// after establishing the session. The default value is QXmppPresence::Available
 ///
-void QXmppClient::connectToServer(const QXmppConfiguration& config,
-                                  const QXmppPresence& initialPresence)
+void QXmppClient::connectToServer(const QXmppConfiguration &config,
+                                  const QXmppPresence &initialPresence)
 {
     // reset package cache from last connection
     if (d->stream->configuration().jidBare() != config.jidBare())
@@ -307,7 +307,7 @@ void QXmppClient::connectToServer(const QXmppConfiguration& config,
 /// \param jid JID for the account.
 /// \param password Password for the account.
 
-void QXmppClient::connectToServer(const QString& jid, const QString& password)
+void QXmppClient::connectToServer(const QString &jid, const QString &password)
 {
     QXmppConfiguration config;
     config.setJid(jid);
@@ -467,8 +467,7 @@ QFuture<QXmppClient::IqResult> QXmppClient::sendSensitiveIq(QXmppIq &&iq)
                         } else {
                             interface->reportResult(QXmpp::SendError {
                                 QStringLiteral("No decryption extension found."),
-                                QXmpp::SendError::EncryptionError
-                            });
+                                QXmpp::SendError::EncryptionError });
                             interface->reportFinished();
                         }
                     } else {
@@ -607,7 +606,7 @@ QXmppClient::StreamManagementState QXmppClient::streamManagementState() const
 /// \deprecated This method is deprecated since QXmpp 1.1. Use
 /// \c QXmppClient::findExtension<QXmppRosterManager>() instead.
 
-QXmppRosterManager& QXmppClient::rosterManager()
+QXmppRosterManager &QXmppClient::rosterManager()
 {
     return *findExtension<QXmppRosterManager>();
 }
@@ -626,16 +625,16 @@ QXmppRosterManager& QXmppClient::rosterManager()
 /// \param bareJid bareJid of the receiving entity
 /// \param message Message string to be sent.
 
-void QXmppClient::sendMessage(const QString& bareJid, const QString& message)
+void QXmppClient::sendMessage(const QString &bareJid, const QString &message)
 {
-    QXmppRosterManager* rosterManager = findExtension<QXmppRosterManager>();
+    QXmppRosterManager *rosterManager = findExtension<QXmppRosterManager>();
 
     const QStringList resources = rosterManager
         ? rosterManager->getResources(bareJid)
         : QStringList();
 
     if (!resources.isEmpty()) {
-        for (const auto& resource : resources) {
+        for (const auto &resource : resources) {
             sendPacket(
                 QXmppMessage({}, bareJid + QStringLiteral("/") + resource, message));
         }
@@ -676,7 +675,7 @@ QXmppPresence QXmppClient::clientPresence() const
 /// \param presence QXmppPresence object
 ///
 
-void QXmppClient::setClientPresence(const QXmppPresence& presence)
+void QXmppClient::setClientPresence(const QXmppPresence &presence)
 {
     d->clientPresence = presence;
     d->addProperCapability(d->clientPresence);
@@ -726,7 +725,7 @@ QXmppStanza::Error::Condition QXmppClient::xmppStreamError()
 /// \deprecated This method is deprecated since QXmpp 1.1. Use
 /// \c QXmppClient::findExtension<QXmppVCardManager>() instead.
 ///
-QXmppVCardManager& QXmppClient::vCardManager()
+QXmppVCardManager &QXmppClient::vCardManager()
 {
     return *findExtension<QXmppVCardManager>();
 }
@@ -738,7 +737,7 @@ QXmppVCardManager& QXmppClient::vCardManager()
 /// \deprecated This method is deprecated since QXmpp 1.1. Use
 /// \c QXmppClient::findExtension<QXmppVersionManager>() instead.
 ///
-QXmppVersionManager& QXmppClient::versionManager()
+QXmppVersionManager &QXmppClient::versionManager()
 {
     return *findExtension<QXmppVersionManager>();
 }
@@ -748,9 +747,9 @@ QXmppVersionManager& QXmppClient::versionManager()
 /// \param element
 /// \param handled
 
-void QXmppClient::_q_elementReceived(const QDomElement& element, bool& handled)
+void QXmppClient::_q_elementReceived(const QDomElement &element, bool &handled)
 {
-    for (auto* extension : d->extensions) {
+    for (auto *extension : d->extensions) {
         if (extension->handleStanza(element)) {
             handled = true;
             return;
@@ -816,14 +815,14 @@ void QXmppClient::_q_streamError(QXmppClient::Error err)
     emit error(err);
 }
 
-QXmppLogger* QXmppClient::logger() const
+QXmppLogger *QXmppClient::logger() const
 {
     return d->logger;
 }
 
 /// Sets the QXmppLogger associated with the current QXmppClient.
 
-void QXmppClient::setLogger(QXmppLogger* logger)
+void QXmppClient::setLogger(QXmppLogger *logger)
 {
     if (logger != d->logger) {
         if (d->logger) {
diff --git a/src/client/QXmppConfiguration.cpp b/src/client/QXmppConfiguration.cpp
index 7dfc4347..0b51c1cc 100644
--- a/src/client/QXmppConfiguration.cpp
+++ b/src/client/QXmppConfiguration.cpp
@@ -72,7 +72,7 @@ QXmppConfiguration::QXmppConfiguration()
 
 /// Creates a copy of \a other.
 
-QXmppConfiguration::QXmppConfiguration(const QXmppConfiguration& other)
+QXmppConfiguration::QXmppConfiguration(const QXmppConfiguration &other)
     : d(other.d)
 {
 }
@@ -86,7 +86,7 @@ QXmppConfiguration::~QXmppConfiguration()
 
 /// Assigns \a other to this QXmppConfiguration.
 
-QXmppConfiguration& QXmppConfiguration::operator=(const QXmppConfiguration& other)
+QXmppConfiguration &QXmppConfiguration::operator=(const QXmppConfiguration &other)
 {
     d = other.d;
     return *this;
@@ -99,7 +99,7 @@ QXmppConfiguration& QXmppConfiguration::operator=(const QXmppConfiguration& othe
 /// the form of a string (e.g. "192.168.1.25").
 ///
 
-void QXmppConfiguration::setHost(const QString& host)
+void QXmppConfiguration::setHost(const QString &host)
 {
     d->host = host;
 }
@@ -111,7 +111,7 @@ void QXmppConfiguration::setHost(const QString& host)
 /// domain name is gmail.com and host name is talk.google.com
 ///
 
-void QXmppConfiguration::setDomain(const QString& domain)
+void QXmppConfiguration::setDomain(const QString &domain)
 {
     d->domain = domain;
 }
@@ -134,7 +134,7 @@ void QXmppConfiguration::setPort(int port)
 /// "qxmpp.test1@gmail.com"
 ///
 
-void QXmppConfiguration::setUser(const QString& user)
+void QXmppConfiguration::setUser(const QString &user)
 {
     d->user = user;
 }
@@ -144,7 +144,7 @@ void QXmppConfiguration::setUser(const QString& user)
 /// \param password Password for the specified username
 ///
 
-void QXmppConfiguration::setPassword(const QString& password)
+void QXmppConfiguration::setPassword(const QString &password)
 {
     d->password = password;
 }
@@ -160,7 +160,7 @@ void QXmppConfiguration::setPassword(const QString& password)
 ///
 /// \param resource Resource identifier of the client in connection.
 
-void QXmppConfiguration::setResource(const QString& resource)
+void QXmppConfiguration::setResource(const QString &resource)
 {
     d->resource = resource;
 }
@@ -171,7 +171,7 @@ void QXmppConfiguration::setResource(const QString& resource)
 ///
 /// \param jid
 
-void QXmppConfiguration::setJid(const QString& jid)
+void QXmppConfiguration::setJid(const QString &jid)
 {
     d->user = QXmppUtils::jidToUser(jid);
     d->domain = QXmppUtils::jidToDomain(jid);
@@ -282,7 +282,7 @@ QString QXmppConfiguration::facebookAccessToken() const
 ///
 /// \param accessToken
 
-void QXmppConfiguration::setFacebookAccessToken(const QString& accessToken)
+void QXmppConfiguration::setFacebookAccessToken(const QString &accessToken)
 {
     d->facebookAccessToken = accessToken;
 }
@@ -298,7 +298,7 @@ QString QXmppConfiguration::facebookAppId() const
 ///
 /// \param appId
 
-void QXmppConfiguration::setFacebookAppId(const QString& appId)
+void QXmppConfiguration::setFacebookAppId(const QString &appId)
 {
     d->facebookAppId = appId;
 }
@@ -317,7 +317,7 @@ QString QXmppConfiguration::googleAccessToken() const
 ///
 /// \param accessToken
 
-void QXmppConfiguration::setGoogleAccessToken(const QString& accessToken)
+void QXmppConfiguration::setGoogleAccessToken(const QString &accessToken)
 {
     d->googleAccessToken = accessToken;
 }
@@ -336,7 +336,7 @@ QString QXmppConfiguration::windowsLiveAccessToken() const
 ///
 /// \param accessToken
 
-void QXmppConfiguration::setWindowsLiveAccessToken(const QString& accessToken)
+void QXmppConfiguration::setWindowsLiveAccessToken(const QString &accessToken)
 {
     d->windowsLiveAccessToken = accessToken;
 }
@@ -481,7 +481,7 @@ QString QXmppConfiguration::saslAuthMechanism() const
 /// Valid values: "SCRAM-SHA-256", "SCRAM-SHA-1", "DIGEST-MD5", "PLAIN", "ANONYMOUS",
 //                "X-FACEBOOK-PLATFORM", "X-MESSENGER-OAUTH2", "X-OAUTH2"
 
-void QXmppConfiguration::setSaslAuthMechanism(const QString& mechanism)
+void QXmppConfiguration::setSaslAuthMechanism(const QString &mechanism)
 {
     d->saslAuthMechanism = mechanism;
 }
@@ -492,7 +492,7 @@ void QXmppConfiguration::setSaslAuthMechanism(const QString& mechanism)
 /// QNetworkProxy::setApplicationProxy().
 /// \param proxy QNetworkProxy
 
-void QXmppConfiguration::setNetworkProxy(const QNetworkProxy& proxy)
+void QXmppConfiguration::setNetworkProxy(const QNetworkProxy &proxy)
 {
     d->networkProxy = proxy;
 }
@@ -553,7 +553,7 @@ int QXmppConfiguration::keepAliveTimeout() const
 
 /// Specifies a list of trusted CA certificates.
 
-void QXmppConfiguration::setCaCertificates(const QList<QSslCertificate>& caCertificates)
+void QXmppConfiguration::setCaCertificates(const QList<QSslCertificate> &caCertificates)
 {
     d->caCertificates = caCertificates;
 }
diff --git a/src/client/QXmppDiscoveryManager.cpp b/src/client/QXmppDiscoveryManager.cpp
index 79cae8ed..65e7fa28 100644
--- a/src/client/QXmppDiscoveryManager.cpp
+++ b/src/client/QXmppDiscoveryManager.cpp
@@ -72,7 +72,7 @@ QXmppDiscoveryManager::~QXmppDiscoveryManager()
 /// \param jid  The target entity's JID.
 /// \param node The target node (optional).
 
-QString QXmppDiscoveryManager::requestInfo(const QString& jid, const QString& node)
+QString QXmppDiscoveryManager::requestInfo(const QString &jid, const QString &node)
 {
     QXmppDiscoveryIq request;
     request.setType(QXmppIq::Get);
@@ -91,7 +91,7 @@ QString QXmppDiscoveryManager::requestInfo(const QString& jid, const QString& no
 /// \param jid  The target entity's JID.
 /// \param node The target node (optional).
 
-QString QXmppDiscoveryManager::requestItems(const QString& jid, const QString& node)
+QString QXmppDiscoveryManager::requestItems(const QString &jid, const QString &node)
 {
     QXmppDiscoveryIq request;
     request.setType(QXmppIq::Get);
@@ -169,7 +169,7 @@ QXmppDiscoveryIq QXmppDiscoveryManager::capabilities()
 
     // add features of all registered extensions
     const auto extensions = client()->extensions();
-    for (auto* extension : extensions) {
+    for (auto *extension : extensions) {
         if (extension)
             features << extension->discoveryFeatures();
     }
@@ -185,7 +185,7 @@ QXmppDiscoveryIq QXmppDiscoveryManager::capabilities()
     identity.setName(clientName());
     identities << identity;
 
-    for (auto* extension : client()->extensions()) {
+    for (auto *extension : client()->extensions()) {
         if (extension)
             identities << extension->discoveryIdentities();
     }
@@ -203,7 +203,7 @@ QXmppDiscoveryIq QXmppDiscoveryManager::capabilities()
 ///
 /// \param node
 
-void QXmppDiscoveryManager::setClientCapabilitiesNode(const QString& node)
+void QXmppDiscoveryManager::setClientCapabilitiesNode(const QString &node)
 {
     d->clientCapabilitiesNode = node;
 }
@@ -215,7 +215,7 @@ void QXmppDiscoveryManager::setClientCapabilitiesNode(const QString& node)
 ///
 /// \param category
 
-void QXmppDiscoveryManager::setClientCategory(const QString& category)
+void QXmppDiscoveryManager::setClientCategory(const QString &category)
 {
     d->clientCategory = category;
 }
@@ -227,7 +227,7 @@ void QXmppDiscoveryManager::setClientCategory(const QString& category)
 ///
 /// \param type
 
-void QXmppDiscoveryManager::setClientType(const QString& type)
+void QXmppDiscoveryManager::setClientType(const QString &type)
 {
     d->clientType = type;
 }
@@ -236,7 +236,7 @@ void QXmppDiscoveryManager::setClientType(const QString& type)
 ///
 /// \param name
 
-void QXmppDiscoveryManager::setClientName(const QString& name)
+void QXmppDiscoveryManager::setClientName(const QString &name)
 {
     d->clientName = name;
 }
@@ -289,7 +289,7 @@ QXmppDataForm QXmppDiscoveryManager::clientInfoForm() const
 /// Sets the client's extended information form, as defined
 /// by \xep{0128}: Service Discovery Extensions.
 
-void QXmppDiscoveryManager::setClientInfoForm(const QXmppDataForm& form)
+void QXmppDiscoveryManager::setClientInfoForm(const QXmppDataForm &form)
 {
     d->clientInfoForm = form;
 }
@@ -300,7 +300,7 @@ QStringList QXmppDiscoveryManager::discoveryFeatures() const
     return QStringList() << ns_disco_info;
 }
 
-bool QXmppDiscoveryManager::handleStanza(const QDomElement& element)
+bool QXmppDiscoveryManager::handleStanza(const QDomElement &element)
 {
     if (element.tagName() == "iq" && QXmppDiscoveryIq::isDiscoveryIq(element)) {
         QXmppDiscoveryIq receivedIq;
diff --git a/src/client/QXmppDiscoveryManager.h b/src/client/QXmppDiscoveryManager.h
index 001c1975..d2fcf1a3 100644
--- a/src/client/QXmppDiscoveryManager.h
+++ b/src/client/QXmppDiscoveryManager.h
@@ -30,8 +30,8 @@ public:
 
     QXmppDiscoveryIq capabilities();
 
-    QString requestInfo(const QString& jid, const QString& node = QString());
-    QString requestItems(const QString& jid, const QString& node = QString());
+    QString requestInfo(const QString &jid, const QString &node = QString());
+    QString requestItems(const QString &jid, const QString &node = QString());
 
     using InfoResult = std::variant<QXmppDiscoveryIq, QXmppStanza::Error>;
     using ItemsResult = std::variant<QList<QXmppDiscoveryIq::Item>, QXmppStanza::Error>;
@@ -39,35 +39,35 @@ public:
     QFuture<ItemsResult> requestDiscoItems(const QString &jid, const QString &node = {});
 
     QString clientCapabilitiesNode() const;
-    void setClientCapabilitiesNode(const QString&);
+    void setClientCapabilitiesNode(const QString &);
 
     // http://xmpp.org/registrar/disco-categories.html#client
     QString clientCategory() const;
-    void setClientCategory(const QString&);
+    void setClientCategory(const QString &);
 
-    void setClientName(const QString&);
+    void setClientName(const QString &);
     QString clientName() const;
 
     QString clientType() const;
-    void setClientType(const QString&);
+    void setClientType(const QString &);
 
     QXmppDataForm clientInfoForm() const;
-    void setClientInfoForm(const QXmppDataForm& form);
+    void setClientInfoForm(const QXmppDataForm &form);
 
     /// \cond
     QStringList discoveryFeatures() const override;
-    bool handleStanza(const QDomElement& element) override;
+    bool handleStanza(const QDomElement &element) override;
     /// \endcond
 
 Q_SIGNALS:
     /// This signal is emitted when an information response is received.
-    void infoReceived(const QXmppDiscoveryIq&);
+    void infoReceived(const QXmppDiscoveryIq &);
 
     /// This signal is emitted when an items response is received.
-    void itemsReceived(const QXmppDiscoveryIq&);
+    void itemsReceived(const QXmppDiscoveryIq &);
 
 private:
-    QXmppDiscoveryManagerPrivate* d;
+    QXmppDiscoveryManagerPrivate *d;
 };
 
 #endif  // QXMPPDISCOVERYMANAGER_H
diff --git a/src/client/QXmppE2eeExtension.h b/src/client/QXmppE2eeExtension.h
index ea376c6e..86262782 100644
--- a/src/client/QXmppE2eeExtension.h
+++ b/src/client/QXmppE2eeExtension.h
@@ -16,7 +16,9 @@ class QFuture;
 class QXmppE2eeExtension
 {
 public:
-    struct NotEncrypted {};
+    struct NotEncrypted
+    {
+    };
 
     using EncryptMessageResult = std::variant<QByteArray, QXmpp::SendError>;
     using IqEncryptResult = std::variant<QByteArray, QXmpp::SendError>;
@@ -28,4 +30,4 @@ public:
     virtual QFuture<IqDecryptResult> decryptIq(const QDomElement &) = 0;
 };
 
-#endif // QXMPPE2EEEXTENSION_H
+#endif  // QXMPPE2EEEXTENSION_H
diff --git a/src/client/QXmppInvokable.h b/src/client/QXmppInvokable.h
index d4d6a3d0..f93b8bcc 100644
--- a/src/client/QXmppInvokable.h
+++ b/src/client/QXmppInvokable.h
@@ -27,27 +27,27 @@ public:
     ~QXmppInvokable() override;
 
     /**
-         * Execute a method on an object. with a set of arguments. This method is reentrant, and the method
-         * that is invoked will be done in a thread safe manner.  It should be noted that while this method
-         * is threadsafe and reentrant the side affects of the methods invoked may not be.
-         */
+     * Execute a method on an object. with a set of arguments. This method is reentrant, and the method
+     * that is invoked will be done in a thread safe manner.  It should be noted that while this method
+     * is threadsafe and reentrant the side affects of the methods invoked may not be.
+     */
     QVariant dispatch(const QByteArray &method, const QList<QVariant> &args = QList<QVariant>());
 
     /**
-         * Utility method to convert a QList<QVariant> to a list of types for type
-         * checking.
-         */
+     * Utility method to convert a QList<QVariant> to a list of types for type
+     * checking.
+     */
     static QList<QByteArray> paramTypes(const QList<QVariant> &params);
 
     /**
-          * Reimplement this method to return a true if the invoking JID is allowed to execute the method.
-          */
+     * Reimplement this method to return a true if the invoking JID is allowed to execute the method.
+     */
     virtual bool isAuthorized(const QString &jid) const = 0;
 
 public Q_SLOTS:
     /**
-          * This provides a list of interfaces for introspection of the presented interface.
-          */
+     * This provides a list of interfaces for introspection of the presented interface.
+     */
     QStringList interfaces() const;
 
 private:
diff --git a/src/client/QXmppPubSubManager.cpp b/src/client/QXmppPubSubManager.cpp
index 29dfc472..f00f9d20 100644
--- a/src/client/QXmppPubSubManager.cpp
+++ b/src/client/QXmppPubSubManager.cpp
@@ -256,8 +256,8 @@ QFuture<QXmppPubSubManager::InstantNodeResult> QXmppPubSubManager::createInstant
 
     return chainIq(client()->sendIq(std::move(request)), this,
                    [](const QXmppPubSubIq<> &iq) -> InstantNodeResult {
-        return iq.queryNode();
-    });
+                       return iq.queryNode();
+                   });
 }
 
 ///
@@ -280,8 +280,8 @@ auto QXmppPubSubManager::createInstantNode(const QString &jid, const QXmppPubSub
 
     return chainIq(client()->sendIq(std::move(request)), this,
                    [](const QXmppPubSubIq<> &iq) -> InstantNodeResult {
-        return iq.queryNode();
-    });
+                       return iq.queryNode();
+                   });
 }
 
 ///
@@ -369,8 +369,8 @@ QFuture<QXmppPubSubManager::SubscriptionsResult> QXmppPubSubManager::requestSubs
 
     return chainIq(client()->sendIq(std::move(request)), this,
                    [](const QXmppPubSubIq<> &iq) -> SubscriptionsResult {
-        return iq.subscriptions();
-    });
+                       return iq.subscriptions();
+                   });
 }
 
 ///
@@ -393,8 +393,8 @@ QFuture<QXmppPubSubManager::AffiliationsResult> QXmppPubSubManager::requestNodeA
 
     return chainIq(client()->sendIq(std::move(request)), this,
                    [](const QXmppPubSubIq<> &iq) -> AffiliationsResult {
-        return iq.affiliations();
-    });
+                       return iq.affiliations();
+                   });
 }
 
 ///
@@ -425,8 +425,8 @@ QFuture<QXmppPubSubManager::AffiliationsResult> QXmppPubSubManager::requestAffil
 
     return chainIq(client()->sendIq(std::move(request)), this,
                    [](const QXmppPubSubIq<> &iq) -> AffiliationsResult {
-        return iq.affiliations();
-    });
+                       return iq.affiliations();
+                   });
 }
 
 ///
@@ -460,18 +460,18 @@ QFuture<QXmppPubSubManager::OptionsResult> QXmppPubSubManager::requestSubscribeO
 
     return chainIq(client()->sendIq(std::move(request)), this,
                    [](const QXmppPubSubIq<> &iq) -> OptionsResult {
-        if (const auto form = iq.dataForm()) {
-            if (const auto options = QXmppPubSubSubscribeOptions::fromDataForm(*form)) {
-                return *options;
-            }
-        }
+                       if (const auto form = iq.dataForm()) {
+                           if (const auto options = QXmppPubSubSubscribeOptions::fromDataForm(*form)) {
+                               return *options;
+                           }
+                       }
 
-        // "real" stanza errors are already handled
-        using Error = QXmppStanza::Error;
-        return Error(Error::Cancel,
-                     Error::Condition::InternalServerError,
-                     QStringLiteral("Server returned invalid data form."));
-    });
+                       // "real" stanza errors are already handled
+                       using Error = QXmppStanza::Error;
+                       return Error(Error::Cancel,
+                                    Error::Condition::InternalServerError,
+                                    QStringLiteral("Server returned invalid data form."));
+                   });
 }
 
 ///
@@ -762,12 +762,12 @@ auto QXmppPubSubManager::publishItem(QXmppPubSubIqBase &&request) -> QFuture<Pub
 
     return chainIq(client()->sendIq(std::move(request)), this,
                    [](const QXmppPubSubIq<> &iq) -> PublishItemResult {
-        if (!iq.items().isEmpty()) {
-            return iq.items().constFirst().id();
-        } else {
-            return QString();
-        }
-    });
+                       if (!iq.items().isEmpty()) {
+                           return iq.items().constFirst().id();
+                       } else {
+                           return QString();
+                       }
+                   });
 }
 
 auto QXmppPubSubManager::publishItems(QXmppPubSubIqBase &&request) -> QFuture<PublishItemsResult>
@@ -777,14 +777,14 @@ auto QXmppPubSubManager::publishItems(QXmppPubSubIqBase &&request) -> QFuture<Pu
 
     return chainIq(client()->sendIq(std::move(request)), this,
                    [](const QXmppPubSubIq<> &iq) -> PublishItemsResult {
-        const auto itemToId = [](const QXmppPubSubItem &item) {
-            return item.id();
-        };
-
-        const auto items = iq.items();
-        QVector<QString> ids(items.size());
-        std::transform(items.begin(), items.end(), ids.begin(), itemToId);
-        return ids;
-    });
+                       const auto itemToId = [](const QXmppPubSubItem &item) {
+                           return item.id();
+                       };
+
+                       const auto items = iq.items();
+                       QVector<QString> ids(items.size());
+                       std::transform(items.begin(), items.end(), ids.begin(), itemToId);
+                       return ids;
+                   });
 }
 /// \endcond
diff --git a/src/client/QXmppPubSubManager.h b/src/client/QXmppPubSubManager.h
index c34a1f72..c00064b4 100644
--- a/src/client/QXmppPubSubManager.h
+++ b/src/client/QXmppPubSubManager.h
@@ -136,11 +136,11 @@ QFuture<QXmppPubSubManager::ItemResult<T>> QXmppPubSubManager::requestItem(const
     using Error = QXmppStanza::Error;
     return chainIq(client()->sendIq(requestItemsIq(jid, nodeName, { itemId })), this,
                    [](QXmppPubSubIq<T> &&iq) -> ItemResult<T> {
-        if (!iq.items().isEmpty()) {
-            return iq.items().constFirst();
-        }
-        return Error(Error::Cancel, Error::ItemNotFound, QStringLiteral("No such item has been found."));
-    });
+                       if (!iq.items().isEmpty()) {
+                           return iq.items().constFirst();
+                       }
+                       return Error(Error::Cancel, Error::ItemNotFound, QStringLiteral("No such item has been found."));
+                   });
 }
 
 ///
@@ -176,11 +176,11 @@ QFuture<QXmppPubSubManager::ItemsResult<T>> QXmppPubSubManager::requestItems(con
     using namespace QXmpp::Private;
     return chainIq(client()->sendIq(requestItemsIq(jid, nodeName, itemIds)), this,
                    [](QXmppPubSubIq<T> &&iq) -> ItemsResult<T> {
-        return Items<T> {
-            iq.items(),
-            iq.itemsContinuation(),
-        };
-    });
+                       return Items<T> {
+                           iq.items(),
+                           iq.itemsContinuation(),
+                       };
+                   });
 }
 
 ///
diff --git a/src/client/QXmppRemoteMethod.h b/src/client/QXmppRemoteMethod.h
index b555f540..aad4f90a 100644
--- a/src/client/QXmppRemoteMethod.h
+++ b/src/client/QXmppRemoteMethod.h
@@ -12,7 +12,8 @@
 
 class QXmppClient;
 
-struct QXmppRemoteMethodResult {
+struct QXmppRemoteMethodResult
+{
     QXmppRemoteMethodResult() : hasError(false), code(0) { }
     bool hasError;
     int code;
diff --git a/src/client/QXmppRosterManager.cpp b/src/client/QXmppRosterManager.cpp
index f2fc8a1b..ddbefd05 100644
--- a/src/client/QXmppRosterManager.cpp
+++ b/src/client/QXmppRosterManager.cpp
@@ -306,8 +306,8 @@ QFuture<QXmppRosterManager::Result> QXmppRosterManager::renameRosterItem(const Q
     using Error = QXmppStanza::Error;
     if (!d->entries.contains(bareJid)) {
         return QXmpp::Private::makeReadyFuture<Result>(
-                    Error(Error::Modify, Error::ItemNotFound,
-                          QStringLiteral("The roster doesn't contain this user.")));
+            Error(Error::Modify, Error::ItemNotFound,
+                  QStringLiteral("The roster doesn't contain this user.")));
     }
 
     auto item = d->entries.value(bareJid);
diff --git a/src/client/QXmppSceEnvelope_p.h b/src/client/QXmppSceEnvelope_p.h
index 353c4730..4a92378d 100644
--- a/src/client/QXmppSceEnvelope_p.h
+++ b/src/client/QXmppSceEnvelope_p.h
@@ -17,10 +17,11 @@
 #ifndef QXMPPSCEENVELOPE_P_H
 #define QXMPPSCEENVELOPE_P_H
 
-#include <QDomElement>
-#include <QDateTime>
 #include "QXmppUtils.h"
 
+#include <QDateTime>
+#include <QDomElement>
+
 class QXmppSceEnvelopeReader
 {
 public:
@@ -44,7 +45,7 @@ public:
     inline QDateTime timestamp()
     {
         return QXmppUtils::datetimeFromString(
-                    element.firstChildElement(QStringLiteral("time")).attribute(QStringLiteral("stamp")));
+            element.firstChildElement(QStringLiteral("time")).attribute(QStringLiteral("stamp")));
     }
 
     // rpad is usually not needed (but can be parsed manually if really needed)
@@ -106,4 +107,4 @@ private:
     QXmlStreamWriter &writer;
 };
 
-#endif // QXMPPSCEENVELOPE_P_H
+#endif  // QXMPPSCEENVELOPE_P_H
diff --git a/src/client/QXmppUploadRequestManager.h b/src/client/QXmppUploadRequestManager.h
index 37e32657..2031f667 100644
--- a/src/client/QXmppUploadRequestManager.h
+++ b/src/client/QXmppUploadRequestManager.h
@@ -7,10 +7,10 @@
 
 #include <QXmppClientExtension.h>
 
-#include <QSharedDataPointer>
-
 #include <variant>
 
+#include <QSharedDataPointer>
+
 class QFileInfo;
 template<typename T>
 class QFuture;
diff --git a/src/client/QXmppVCardManager.cpp b/src/client/QXmppVCardManager.cpp
index b425e4f7..5fd6d49f 100644
--- a/src/client/QXmppVCardManager.cpp
+++ b/src/client/QXmppVCardManager.cpp
@@ -32,7 +32,7 @@ QXmppVCardManager::~QXmppVCardManager()
 ///
 /// \param jid Jid of the specific entry in the roster
 ///
-QString QXmppVCardManager::requestVCard(const QString& jid)
+QString QXmppVCardManager::requestVCard(const QString &jid)
 {
     QXmppVCardIq request(jid);
     if (client()->sendPacket(request))
@@ -45,7 +45,7 @@ QString QXmppVCardManager::requestVCard(const QString& jid)
 ///
 /// \return QXmppVCard
 ///
-const QXmppVCardIq& QXmppVCardManager::clientVCard() const
+const QXmppVCardIq &QXmppVCardManager::clientVCard() const
 {
     return d->clientVCard;
 }
@@ -54,7 +54,7 @@ const QXmppVCardIq& QXmppVCardManager::clientVCard() const
 ///
 /// \param clientVCard QXmppVCard
 ///
-void QXmppVCardManager::setClientVCard(const QXmppVCardIq& clientVCard)
+void QXmppVCardManager::setClientVCard(const QXmppVCardIq &clientVCard)
 {
     d->clientVCard = clientVCard;
     d->clientVCard.setTo("");
@@ -88,7 +88,7 @@ QStringList QXmppVCardManager::discoveryFeatures() const
     return QStringList() << ns_vcard;
 }
 
-bool QXmppVCardManager::handleStanza(const QDomElement& element)
+bool QXmppVCardManager::handleStanza(const QDomElement &element)
 {
     if (element.tagName() == "iq" && QXmppVCardIq::isVCard(element)) {
         QXmppVCardIq vCardIq;
diff --git a/src/client/QXmppVCardManager.h b/src/client/QXmppVCardManager.h
index 78d201e1..4c6b742f 100644
--- a/src/client/QXmppVCardManager.h
+++ b/src/client/QXmppVCardManager.h
@@ -42,30 +42,30 @@ public:
     QXmppVCardManager();
     ~QXmppVCardManager() override;
 
-    QString requestVCard(const QString& bareJid = QString());
+    QString requestVCard(const QString &bareJid = QString());
 
-    const QXmppVCardIq& clientVCard() const;
-    void setClientVCard(const QXmppVCardIq&);
+    const QXmppVCardIq &clientVCard() const;
+    void setClientVCard(const QXmppVCardIq &);
 
     QString requestClientVCard();
     bool isClientVCardReceived() const;
 
     /// \cond
     QStringList discoveryFeatures() const override;
-    bool handleStanza(const QDomElement& element) override;
+    bool handleStanza(const QDomElement &element) override;
     /// \endcond
 
 Q_SIGNALS:
     /// This signal is emitted when the requested vCard is received
     /// after calling the requestVCard() function.
-    void vCardReceived(const QXmppVCardIq&);
+    void vCardReceived(const QXmppVCardIq &);
 
     /// This signal is emitted when the client's vCard is received
     /// after calling the requestClientVCard() function.
     void clientVCardReceived();
 
 private:
-    QXmppVCardManagerPrivate* d;
+    QXmppVCardManagerPrivate *d;
 };
 
 #endif  // QXMPPVCARDMANAGER_H
diff --git a/src/client/QXmppVersionManager.cpp b/src/client/QXmppVersionManager.cpp
index 3ef58239..29ae3907 100644
--- a/src/client/QXmppVersionManager.cpp
+++ b/src/client/QXmppVersionManager.cpp
@@ -43,7 +43,7 @@ QXmppVersionManager::~QXmppVersionManager()
 ///
 /// \param jid
 
-QString QXmppVersionManager::requestVersion(const QString& jid)
+QString QXmppVersionManager::requestVersion(const QString &jid)
 {
     QXmppVersionIq request;
     request.setType(QXmppIq::Get);
@@ -58,7 +58,7 @@ QString QXmppVersionManager::requestVersion(const QString& jid)
 ///
 /// \param name
 
-void QXmppVersionManager::setClientName(const QString& name)
+void QXmppVersionManager::setClientName(const QString &name)
 {
     d->clientName = name;
 }
@@ -67,7 +67,7 @@ void QXmppVersionManager::setClientName(const QString& name)
 ///
 /// \param version
 
-void QXmppVersionManager::setClientVersion(const QString& version)
+void QXmppVersionManager::setClientVersion(const QString &version)
 {
     d->clientVersion = version;
 }
@@ -76,7 +76,7 @@ void QXmppVersionManager::setClientVersion(const QString& version)
 ///
 /// \param os
 
-void QXmppVersionManager::setClientOs(const QString& os)
+void QXmppVersionManager::setClientOs(const QString &os)
 {
     d->clientOs = os;
 }
@@ -118,7 +118,7 @@ QStringList QXmppVersionManager::discoveryFeatures() const
     return QStringList() << ns_version;
 }
 
-bool QXmppVersionManager::handleStanza(const QDomElement& element)
+bool QXmppVersionManager::handleStanza(const QDomElement &element)
 {
     if (element.tagName() == "iq" && QXmppVersionIq::isVersionIq(element)) {
         QXmppVersionIq versionIq;