Add a .clang-format somewhat close to the current style

20 files changed, 167 insertions, 179 deletions

diff --git a/src/client/QXmppArchiveManager.h b/src/client/QXmppArchiveManager.h
index 03fd1d91..8c057c86 100644
--- a/src/client/QXmppArchiveManager.h
+++ b/src/client/QXmppArchiveManager.h
@@ -70,11 +70,11 @@ public:
 signals:
     /// This signal is emitted when archive list is received
     /// after calling listCollections()
-    void archiveListReceived(const QList<QXmppArchiveChat>&, const QXmppResultSetReply &rsm = QXmppResultSetReply());
+    void archiveListReceived(const QList<QXmppArchiveChat> &, const QXmppResultSetReply &rsm = QXmppResultSetReply());
 
     /// This signal is emitted when archive chat is received
     /// after calling retrieveCollection()
-    void archiveChatReceived(const QXmppArchiveChat&, const QXmppResultSetReply &rsm = QXmppResultSetReply());
+    void archiveChatReceived(const QXmppArchiveChat &, const QXmppResultSetReply &rsm = QXmppResultSetReply());
 };
 
 #endif
diff --git a/src/client/QXmppBookmarkManager.h b/src/client/QXmppBookmarkManager.h
index 71e2c1ae..dd1378bd 100644
--- a/src/client/QXmppBookmarkManager.h
+++ b/src/client/QXmppBookmarkManager.h
@@ -57,7 +57,7 @@ signals:
 
 protected:
     /// \cond
-    void setClient(QXmppClient* client) override;
+    void setClient(QXmppClient *client) override;
     /// \endcond
 
 private slots:
@@ -65,7 +65,7 @@ private slots:
     void slotDisconnected();
 
 private:
-    QXmppBookmarkManagerPrivate * const d;
+    QXmppBookmarkManagerPrivate *const d;
 };
 
 #endif
diff --git a/src/client/QXmppCallManager.h b/src/client/QXmppCallManager.h
index 9f6290e4..3b0eceab 100644
--- a/src/client/QXmppCallManager.h
+++ b/src/client/QXmppCallManager.h
@@ -63,17 +63,17 @@ class QXMPP_EXPORT QXmppCall : public QXmppLoggable
 public:
     /// This enum is used to describe the direction of a call.
     enum Direction {
-        IncomingDirection, ///< The call is incoming.
-        OutgoingDirection  ///< The call is outgoing.
+        IncomingDirection,  ///< The call is incoming.
+        OutgoingDirection   ///< The call is outgoing.
     };
     Q_ENUM(Direction)
 
     /// This enum is used to describe the state of a call.
     enum State {
-        ConnectingState = 0,    ///< The call is being connected.
-        ActiveState = 1,        ///< The call is active.
-        DisconnectingState = 2, ///< The call is being disconnected.
-        FinishedState = 3       ///< The call is finished.
+        ConnectingState = 0,     ///< The call is being connected.
+        ActiveState = 1,         ///< The call is active.
+        DisconnectingState = 2,  ///< The call is being disconnected.
+        FinishedState = 3        ///< The call is finished.
     };
     Q_ENUM(State)
 
@@ -188,7 +188,7 @@ public slots:
 
 protected:
     /// \cond
-    void setClient(QXmppClient* client) override;
+    void setClient(QXmppClient *client) override;
     /// \endcond
 
 private slots:
diff --git a/src/client/QXmppCarbonManager.h b/src/client/QXmppCarbonManager.h
index 821c56df..073769f9 100644
--- a/src/client/QXmppCarbonManager.h
+++ b/src/client/QXmppCarbonManager.h
@@ -21,7 +21,6 @@
  *
  */
 
-
 #ifndef QXMPPCARBONMANAGER_H
 #define QXMPPCARBONMANAGER_H
 
@@ -58,14 +57,14 @@ signals:
     /// and directed to another resource.
     /// If you connect this signal to the \s QXmppClient::messageReceived
     /// signal, they will appear as normal messages.
-    void messageReceived(const QXmppMessage&);
+    void messageReceived(const QXmppMessage &);
 
     /// \brief Emitted when another resource sent a message to
     /// someone else
-    void messageSent(const QXmppMessage&);
+    void messageSent(const QXmppMessage &);
 
 private:
     bool m_carbonsEnabled;
 };
 
-#endif // QXMPPCARBONMANAGER_H
+#endif  // QXMPPCARBONMANAGER_H
diff --git a/src/client/QXmppClient.h b/src/client/QXmppClient.h
index 91e9f11d..16f634b4 100644
--- a/src/client/QXmppClient.h
+++ b/src/client/QXmppClient.h
@@ -80,17 +80,17 @@ class QXmppVersionManager;
 class QXMPP_EXPORT QXmppClient : public QXmppLoggable
 {
     Q_OBJECT
-    Q_PROPERTY(QXmppLogger* logger READ logger WRITE setLogger NOTIFY loggerChanged)
+    Q_PROPERTY(QXmppLogger *logger READ logger WRITE setLogger NOTIFY loggerChanged)
     Q_PROPERTY(State state READ state NOTIFY stateChanged)
 
 public:
     /// An enumeration for type of error.
     /// Error could come due a TCP socket or XML stream or due to various stanzas.
     enum Error {
-        NoError,            ///< No error.
-        SocketError,        ///< Error due to TCP socket.
-        KeepAliveError,     ///< Error due to no response to a keep alive.
-        XmppStreamError     ///< Error due to XML stream.
+        NoError,         ///< No error.
+        SocketError,     ///< Error due to TCP socket.
+        KeepAliveError,  ///< Error due to no response to a keep alive.
+        XmppStreamError  ///< Error due to XML stream.
     };
     Q_ENUM(Error)
 
@@ -105,11 +105,11 @@ public:
     QXmppClient(QObject *parent = nullptr);
     ~QXmppClient() override;
 
-    bool addExtension(QXmppClientExtension* extension);
-    bool insertExtension(int index, QXmppClientExtension* extension);
-    bool removeExtension(QXmppClientExtension* extension);
+    bool addExtension(QXmppClientExtension *extension);
+    bool insertExtension(int index, QXmppClientExtension *extension);
+    bool removeExtension(QXmppClientExtension *extension);
 
-    QList<QXmppClientExtension*> extensions();
+    QList<QXmppClientExtension *> extensions();
 
     /// \brief Returns the extension which can be cast into type T*, or 0
     /// if there is no such extension.
@@ -124,13 +124,12 @@ public:
     /// \endcode
     ///
     template<typename T>
-    T* findExtension()
+    T *findExtension()
     {
-        const QList<QXmppClientExtension*> list = extensions();
-        for (auto ext : list)
-        {
-            T* extension = qobject_cast<T*>(ext);
-            if(extension)
+        const QList<QXmppClientExtension *> list = extensions();
+        for (auto ext : list) {
+            T *extension = qobject_cast<T *>(ext);
+            if (extension)
                 return extension;
         }
         return nullptr;
@@ -156,13 +155,13 @@ public:
 
 #if QXMPP_DEPRECATED_SINCE(1, 1)
     QT_DEPRECATED_X("Use QXmppClient::findExtension<QXmppRosterManager>() instead")
-    QXmppRosterManager& rosterManager();
+    QXmppRosterManager &rosterManager();
 
     QT_DEPRECATED_X("Use QXmppClient::findExtension<QXmppVCardManager>() instead")
-    QXmppVCardManager& vCardManager();
+    QXmppVCardManager &vCardManager();
 
     QT_DEPRECATED_X("Use QXmppClient::findExtension<QXmppVersionManager>() instead")
-    QXmppVersionManager& versionManager();
+    QXmppVersionManager &versionManager();
 #endif
 
 signals:
@@ -228,14 +227,14 @@ signals:
     void stateChanged(QXmppClient::State state);
 
 public slots:
-    void connectToServer(const QXmppConfiguration&,
-                         const QXmppPresence& initialPresence =
-                         QXmppPresence());
+    void connectToServer(const QXmppConfiguration &,
+                         const QXmppPresence &initialPresence =
+                             QXmppPresence());
     void connectToServer(const QString &jid,
                          const QString &password);
     void disconnectFromServer();
-    bool sendPacket(const QXmppStanza&);
-    void sendMessage(const QString& bareJid, const QString& message);
+    bool sendPacket(const QXmppStanza &);
+    void sendMessage(const QString &bareJid, const QString &message);
 
 private slots:
     void _q_elementReceived(const QDomElement &element, bool &handled);
@@ -246,7 +245,7 @@ private slots:
     void _q_streamError(QXmppClient::Error error);
 
 private:
-    QXmppClientPrivate * const d;
+    QXmppClientPrivate *const d;
 };
 
-#endif // QXMPPCLIENT_H
+#endif  // QXMPPCLIENT_H
diff --git a/src/client/QXmppClientExtension.h b/src/client/QXmppClientExtension.h
index 9f777194..fae45c3f 100644
--- a/src/client/QXmppClientExtension.h
+++ b/src/client/QXmppClientExtension.h
@@ -68,7 +68,7 @@ protected:
     virtual void setClient(QXmppClient *client);
 
 private:
-    QXmppClientExtensionPrivate * const d;
+    QXmppClientExtensionPrivate *const d;
 
     friend class QXmppClient;
 };
diff --git a/src/client/QXmppConfiguration.h b/src/client/QXmppConfiguration.h
index a55e046c..17d91619 100644
--- a/src/client/QXmppConfiguration.h
+++ b/src/client/QXmppConfiguration.h
@@ -21,7 +21,6 @@
  *
  */
 
-
 #ifndef QXMPPCONFIGURATION_H
 #define QXMPPCONFIGURATION_H
 
@@ -51,22 +50,20 @@ public:
     /// An enumeration for type of the Security Mode that is stream is encrypted or not.
     /// The server may or may not have TLS feature. Server may force the encryption.
     /// Depending upon all this user can specify following options.
-    enum StreamSecurityMode
-    {
-        TLSEnabled = 0, ///< Encryption is used if available (default).
-        TLSDisabled,    ///< No encryption even if the server offers it.
-        TLSRequired,    ///< Encryption must be available, otherwise the
-                        ///< connection will not be established.
-        LegacySSL       ///< Use only legacy SSL mode.
+    enum StreamSecurityMode {
+        TLSEnabled = 0,  ///< Encryption is used if available (default).
+        TLSDisabled,     ///< No encryption even if the server offers it.
+        TLSRequired,     ///< Encryption must be available, otherwise the
+                         ///< connection will not be established.
+        LegacySSL        ///< Use only legacy SSL mode.
     };
 
     /// An enumeration for various Non-SASL authentication mechanisms available.
     /// The server may or may not allow QXmppConfiguration::Plain mechanism. So
     /// specifying the mechanism is just a hint to the library.
-    enum NonSASLAuthMechanism
-    {
-        NonSASLPlain = 0,///< Plain
-        NonSASLDigest    ///< Digest (default)
+    enum NonSASLAuthMechanism {
+        NonSASLPlain = 0,  ///< Plain
+        NonSASLDigest      ///< Digest (default)
     };
 
     /// An enumeration for various SASL authentication mechanisms available.
@@ -77,25 +74,25 @@ public:
     QXmppConfiguration();
     QXmppConfiguration(const QXmppConfiguration &other);
     ~QXmppConfiguration();
-    QXmppConfiguration& operator=(const QXmppConfiguration &other);
+    QXmppConfiguration &operator=(const QXmppConfiguration &other);
 
     QString host() const;
-    void setHost(const QString&);
+    void setHost(const QString &);
 
     QString domain() const;
-    void setDomain(const QString&);
+    void setDomain(const QString &);
 
     int port() const;
     void setPort(int);
 
     QString user() const;
-    void setUser(const QString&);
+    void setUser(const QString &);
 
     QString password() const;
-    void setPassword(const QString&);
+    void setPassword(const QString &);
 
     QString resource() const;
-    void setResource(const QString&);
+    void setResource(const QString &);
 
     QString jid() const;
     void setJid(const QString &jid);
@@ -103,10 +100,10 @@ public:
     QString jidBare() const;
 
     QString facebookAccessToken() const;
-    void setFacebookAccessToken(const QString&);
+    void setFacebookAccessToken(const QString &);
 
     QString facebookAppId() const;
-    void setFacebookAppId(const QString&);
+    void setFacebookAppId(const QString &);
 
     QString googleAccessToken() const;
     void setGoogleAccessToken(const QString &accessToken);
@@ -139,7 +136,7 @@ public:
     void setSaslAuthMechanism(const QString &mechanism);
 
     QNetworkProxy networkProxy() const;
-    void setNetworkProxy(const QNetworkProxy& proxy);
+    void setNetworkProxy(const QNetworkProxy &proxy);
 
     int keepAliveInterval() const;
     void setKeepAliveInterval(int secs);
@@ -154,4 +151,4 @@ private:
     QSharedDataPointer<QXmppConfigurationPrivate> d;
 };
 
-#endif // QXMPPCONFIGURATION_H
+#endif  // QXMPPCONFIGURATION_H
diff --git a/src/client/QXmppDiscoveryManager.h b/src/client/QXmppDiscoveryManager.h
index 33c8a660..4483b055 100644
--- a/src/client/QXmppDiscoveryManager.h
+++ b/src/client/QXmppDiscoveryManager.h
@@ -62,11 +62,11 @@ public:
     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
 
 signals:
@@ -77,7 +77,7 @@ signals:
     void itemsReceived(const QXmppDiscoveryIq&);
 
 private:
-    QXmppDiscoveryManagerPrivate *d;
+    QXmppDiscoveryManagerPrivate* d;
 };
 
-#endif // QXMPPDISCOVERYMANAGER_H
+#endif  // QXMPPDISCOVERYMANAGER_H
diff --git a/src/client/QXmppEntityTimeManager.h b/src/client/QXmppEntityTimeManager.h
index 7f16cb17..6c0b4896 100644
--- a/src/client/QXmppEntityTimeManager.h
+++ b/src/client/QXmppEntityTimeManager.h
@@ -21,7 +21,6 @@
  *
  */
 
-
 #ifndef QXMPPENTITYTIMEMANAGER_H
 #define QXMPPENTITYTIMEMANAGER_H
 
@@ -43,7 +42,7 @@ public:
 
     /// \cond
     QStringList discoveryFeatures() const override;
-    bool handleStanza(const QDomElement &element) override;
+    bool handleStanza(const QDomElement& element) override;
     /// \endcond
 
 signals:
@@ -51,4 +50,4 @@ signals:
     void timeReceived(const QXmppEntityTimeIq&);
 };
 
-#endif // QXMPPENTITYTIMEMANAGER_H
+#endif  // QXMPPENTITYTIMEMANAGER_H
diff --git a/src/client/QXmppInvokable.h b/src/client/QXmppInvokable.h
index fbb52978..bd69cd74 100644
--- a/src/client/QXmppInvokable.h
+++ b/src/client/QXmppInvokable.h
@@ -39,41 +39,40 @@ This is the base class for all objects that will be invokable via RPC.  All publ
 */
 class QXMPP_EXPORT QXmppInvokable : public QObject
 {
-        Q_OBJECT
+    Q_OBJECT
 public:
-        QXmppInvokable( QObject *parent = nullptr );
+    QXmppInvokable(QObject *parent = nullptr);
 
-        ~QXmppInvokable() override;
+    ~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.
          */
-        QVariant dispatch( const QByteArray &method, const QList<QVariant> &args = QList<QVariant>() );
+    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.
          */
-        static QList<QByteArray> paramTypes( const QList<QVariant> &params );
+    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.
           */
-        virtual bool isAuthorized( const QString &jid ) const = 0;
+    virtual bool isAuthorized(const QString &jid) const = 0;
 
 public slots:
-        /**
+    /**
           * This provides a list of interfaces for introspection of the presented interface.
           */
-        QStringList interfaces() const;
+    QStringList interfaces() const;
 
 private:
-        void buildMethodHash();
-        QHash<QByteArray,int> m_methodHash;
-        QReadWriteLock m_lock;
+    void buildMethodHash();
+    QHash<QByteArray, int> m_methodHash;
+    QReadWriteLock m_lock;
 };
 
-
 #endif
diff --git a/src/client/QXmppMessageReceiptManager.h b/src/client/QXmppMessageReceiptManager.h
index cef7ca27..5243df67 100644
--- a/src/client/QXmppMessageReceiptManager.h
+++ b/src/client/QXmppMessageReceiptManager.h
@@ -51,4 +51,4 @@ signals:
     void messageDelivered(const QString &jid, const QString &id);
 };
 
-#endif // QXMPPMESSAGERECEIPTMANAGER_H
+#endif  // QXMPPMESSAGERECEIPTMANAGER_H
diff --git a/src/client/QXmppMucManager.h b/src/client/QXmppMucManager.h
index ca9ea1cb..d8821f80 100644
--- a/src/client/QXmppMucManager.h
+++ b/src/client/QXmppMucManager.h
@@ -59,14 +59,14 @@ class QXmppMucRoomPrivate;
 class QXMPP_EXPORT QXmppMucManager : public QXmppClientExtension
 {
     Q_OBJECT
-    Q_PROPERTY(QList<QXmppMucRoom*> rooms READ rooms NOTIFY roomAdded)
+    Q_PROPERTY(QList<QXmppMucRoom *> rooms READ rooms NOTIFY roomAdded)
 
 public:
     QXmppMucManager();
     ~QXmppMucManager() override;
 
     QXmppMucRoom *addRoom(const QString &roomJid);
-    QList<QXmppMucRoom*> rooms() const;
+    QList<QXmppMucRoom *> rooms() const;
 
     /// \cond
     QStringList discoveryFeatures() const override;
@@ -82,7 +82,7 @@ signals:
 
 protected:
     /// \cond
-    void setClient(QXmppClient* client) override;
+    void setClient(QXmppClient *client) override;
     /// \endcond
 
 private slots:
@@ -112,14 +112,13 @@ class QXMPP_EXPORT QXmppMucRoom : public QObject
     Q_PROPERTY(QString subject READ subject WRITE setSubject NOTIFY subjectChanged)
 
 public:
-
     /// This enum is used to describe chat room actions.
     enum Action {
-        NoAction = 0,               ///< no action
-        SubjectAction = 1,          ///< change the room's subject
-        ConfigurationAction = 2,    ///< change the room's configuration
-        PermissionsAction = 4,      ///< change the room's permissions
-        KickAction = 8              ///< kick users from the room
+        NoAction = 0,             ///< no action
+        SubjectAction = 1,        ///< change the room's subject
+        ConfigurationAction = 2,  ///< change the room's configuration
+        PermissionsAction = 4,    ///< change the room's permissions
+        KickAction = 8            ///< kick users from the room
     };
     Q_DECLARE_FLAGS(Actions, Action)
 
diff --git a/src/client/QXmppOutgoingClient.h b/src/client/QXmppOutgoingClient.h
index 52dae4a1..06bd0854 100644
--- a/src/client/QXmppOutgoingClient.h
+++ b/src/client/QXmppOutgoingClient.h
@@ -22,7 +22,6 @@
  *
  */
 
-
 #ifndef QXMPPOUTGOINGCLIENT_H
 #define QXMPPOUTGOINGCLIENT_H
 
@@ -60,7 +59,7 @@ public:
     QSslSocket *socket() const { return QXmppStream::socket(); };
     QXmppStanza::Error::Condition xmppStreamError();
 
-    QXmppConfiguration& configuration();
+    QXmppConfiguration &configuration();
 
 signals:
     /// This signal is emitted when an error is encountered.
@@ -70,13 +69,13 @@ signals:
     void elementReceived(const QDomElement &element, bool &handled);
 
     /// This signal is emitted when a presence is received.
-    void presenceReceived(const QXmppPresence&);
+    void presenceReceived(const QXmppPresence &);
 
     /// This signal is emitted when a message is received.
-    void messageReceived(const QXmppMessage&);
+    void messageReceived(const QXmppMessage &);
 
     /// This signal is emitted when an IQ is received.
-    void iqReceived(const QXmppIq&);
+    void iqReceived(const QXmppIq &);
 
     /// This signal is emitted when SSL errors are encountered.
     void sslErrors(const QList<QSslError> &errors);
@@ -96,7 +95,7 @@ private slots:
     void _q_dnsLookupFinished();
     void _q_socketDisconnected();
     void socketError(QAbstractSocket::SocketError);
-    void socketSslErrors(const QList<QSslError>&);
+    void socketSslErrors(const QList<QSslError> &);
 
     void pingStart();
     void pingStop();
@@ -105,7 +104,7 @@ private slots:
 
 private:
     friend class QXmppOutgoingClientPrivate;
-    QXmppOutgoingClientPrivate * const d;
+    QXmppOutgoingClientPrivate *const d;
 };
 
-#endif // QXMPPOUTGOINGCLIENT_H
+#endif  // QXMPPOUTGOINGCLIENT_H
diff --git a/src/client/QXmppRemoteMethod.h b/src/client/QXmppRemoteMethod.h
index 8b72726f..ffd59265 100644
--- a/src/client/QXmppRemoteMethod.h
+++ b/src/client/QXmppRemoteMethod.h
@@ -32,7 +32,7 @@
 class QXmppClient;
 
 struct QXmppRemoteMethodResult {
-    QXmppRemoteMethodResult() : hasError(false), code(0) { }
+    QXmppRemoteMethodResult() : hasError(false), code(0) {}
     bool hasError;
     int code;
     QString errorMessage;
@@ -44,11 +44,11 @@ class QXMPP_EXPORT QXmppRemoteMethod : public QObject
     Q_OBJECT
 public:
     QXmppRemoteMethod(const QString &jid, const QString &method, const QVariantList &args, QXmppClient *client);
-    QXmppRemoteMethodResult call( );
+    QXmppRemoteMethodResult call();
 
 private slots:
-    void gotError( const QXmppRpcErrorIq &iq );
-    void gotResult( const QXmppRpcResponseIq &iq );
+    void gotError(const QXmppRpcErrorIq &iq);
+    void gotResult(const QXmppRpcResponseIq &iq);
 
 signals:
     void callDone();
@@ -57,7 +57,6 @@ private:
     QXmppRpcInvokeIq m_payload;
     QXmppClient *m_client;
     QXmppRemoteMethodResult m_result;
-
 };
 
-#endif // QXMPPREMOTEMETHOD_H
+#endif  // QXMPPREMOTEMETHOD_H
diff --git a/src/client/QXmppRosterManager.h b/src/client/QXmppRosterManager.h
index 6b050197..bdf6a810 100644
--- a/src/client/QXmppRosterManager.h
+++ b/src/client/QXmppRosterManager.h
@@ -69,18 +69,18 @@ class QXMPP_EXPORT QXmppRosterManager : public QXmppClientExtension
     Q_OBJECT
 
 public:
-    QXmppRosterManager(QXmppClient* stream);
+    QXmppRosterManager(QXmppClient *stream);
     ~QXmppRosterManager() override;
 
     bool isRosterReceived() const;
     QStringList getRosterBareJids() const;
-    QXmppRosterIq::Item getRosterEntry(const QString& bareJid) const;
+    QXmppRosterIq::Item getRosterEntry(const QString &bareJid) const;
 
-    QStringList getResources(const QString& bareJid) const;
+    QStringList getResources(const QString &bareJid) const;
     QMap<QString, QXmppPresence> getAllPresencesForBareJid(
-            const QString& bareJid) const;
-    QXmppPresence getPresence(const QString& bareJid,
-                              const QString& resource) const;
+        const QString &bareJid) const;
+    QXmppPresence getPresence(const QString &bareJid,
+                              const QString &resource) const;
 
     /// \cond
     bool handleStanza(const QDomElement &element) override;
@@ -103,7 +103,7 @@ signals:
     void rosterReceived();
 
     /// This signal is emitted when the presence of a particular bareJid and resource changes.
-    void presenceChanged(const QString& bareJid, const QString& resource);
+    void presenceChanged(const QString &bareJid, const QString &resource);
 
     /// This signal is emitted when a contact asks to subscribe to your presence.
     ///
@@ -112,27 +112,27 @@ signals:
     ///
     /// \note If you set QXmppConfiguration::autoAcceptSubscriptions() to true, this
     /// signal will not be emitted.
-    void subscriptionReceived(const QString& bareJid);
+    void subscriptionReceived(const QString &bareJid);
 
     /// This signal is emitted when the roster entry of a particular bareJid is
     /// added as a result of roster push.
-    void itemAdded(const QString& bareJid);
+    void itemAdded(const QString &bareJid);
 
     /// This signal is emitted when the roster entry of a particular bareJid
     /// changes as a result of roster push.
-    void itemChanged(const QString& bareJid);
+    void itemChanged(const QString &bareJid);
 
     /// This signal is emitted when the roster entry of a particular bareJid is
     /// removed as a result of roster push.
-    void itemRemoved(const QString& bareJid);
+    void itemRemoved(const QString &bareJid);
 
 private slots:
     void _q_connected();
     void _q_disconnected();
-    void _q_presenceReceived(const QXmppPresence&);
+    void _q_presenceReceived(const QXmppPresence &);
 
 private:
     QXmppRosterManagerPrivate *d;
 };
 
-#endif // QXMPPROSTER_H
+#endif  // QXMPPROSTER_H
diff --git a/src/client/QXmppRpcManager.h b/src/client/QXmppRpcManager.h
index 0d2afdf0..c927e5f5 100644
--- a/src/client/QXmppRpcManager.h
+++ b/src/client/QXmppRpcManager.h
@@ -58,19 +58,19 @@ class QXMPP_EXPORT QXmppRpcManager : public QXmppClientExtension
 public:
     QXmppRpcManager();
 
-    void addInvokableInterface( QXmppInvokable *interface );
-    QXmppRemoteMethodResult callRemoteMethod( const QString &jid,
-                                              const QString &interface,
-                                              const QVariant &arg1 = QVariant(),
-                                              const QVariant &arg2 = QVariant(),
-                                              const QVariant &arg3 = QVariant(),
-                                              const QVariant &arg4 = QVariant(),
-                                              const QVariant &arg5 = QVariant(),
-                                              const QVariant &arg6 = QVariant(),
-                                              const QVariant &arg7 = QVariant(),
-                                              const QVariant &arg8 = QVariant(),
-                                              const QVariant &arg9 = QVariant(),
-                                              const QVariant &arg10 = QVariant() );
+    void addInvokableInterface(QXmppInvokable *interface);
+    QXmppRemoteMethodResult callRemoteMethod(const QString &jid,
+                                             const QString &interface,
+                                             const QVariant &arg1 = QVariant(),
+                                             const QVariant &arg2 = QVariant(),
+                                             const QVariant &arg3 = QVariant(),
+                                             const QVariant &arg4 = QVariant(),
+                                             const QVariant &arg5 = QVariant(),
+                                             const QVariant &arg6 = QVariant(),
+                                             const QVariant &arg7 = QVariant(),
+                                             const QVariant &arg8 = QVariant(),
+                                             const QVariant &arg9 = QVariant(),
+                                             const QVariant &arg10 = QVariant());
 
     /// \cond
     QStringList discoveryFeatures() const override;
@@ -80,14 +80,14 @@ public:
 
 signals:
     /// \cond
-    void rpcCallResponse(const QXmppRpcResponseIq& result);
+    void rpcCallResponse(const QXmppRpcResponseIq &result);
     void rpcCallError(const QXmppRpcErrorIq &err);
     /// \endcond
 
 private:
     void invokeInterfaceMethod(const QXmppRpcInvokeIq &iq);
 
-    QMap<QString,QXmppInvokable*> m_interfaces;
+    QMap<QString, QXmppInvokable *> m_interfaces;
 };
 
 #endif
diff --git a/src/client/QXmppTransferManager.h b/src/client/QXmppTransferManager.h
index 9a263772..197bc4f1 100644
--- a/src/client/QXmppTransferManager.h
+++ b/src/client/QXmppTransferManager.h
@@ -66,7 +66,7 @@ public:
     void setSize(qint64 size);
 
     bool isNull() const;
-    QXmppTransferFileInfo& operator=(const QXmppTransferFileInfo &other);
+    QXmppTransferFileInfo &operator=(const QXmppTransferFileInfo &other);
     bool operator==(const QXmppTransferFileInfo &other) const;
 
     /// \cond
@@ -99,38 +99,37 @@ class QXMPP_EXPORT QXmppTransferJob : public QXmppLoggable
 public:
     /// This enum is used to describe the direction of a transfer job.
     enum Direction {
-        IncomingDirection, ///< The file is being received.
-        OutgoingDirection  ///< The file is being sent.
+        IncomingDirection,  ///< The file is being received.
+        OutgoingDirection   ///< The file is being sent.
     };
     Q_ENUM(Direction)
 
     /// This enum is used to describe the type of error encountered by a transfer job.
     enum Error {
-        NoError = 0,      ///< No error occurred.
-        AbortError,       ///< The file transfer was aborted.
-        FileAccessError,  ///< An error was encountered trying to access a local file.
-        FileCorruptError, ///< The file is corrupt: the file size or hash do not match.
-        ProtocolError     ///< An error was encountered in the file transfer protocol.
+        NoError = 0,       ///< No error occurred.
+        AbortError,        ///< The file transfer was aborted.
+        FileAccessError,   ///< An error was encountered trying to access a local file.
+        FileCorruptError,  ///< The file is corrupt: the file size or hash do not match.
+        ProtocolError      ///< An error was encountered in the file transfer protocol.
     };
     Q_ENUM(Error)
 
     /// This enum is used to describe a transfer method.
     enum Method {
-        NoMethod = 0,     ///< No transfer method.
-        InBandMethod = 1, ///< XEP-0047: In-Band Bytestreams
-        SocksMethod = 2,  ///< XEP-0065: SOCKS5 Bytestreams
-        AnyMethod = 3     ///< Any supported transfer method.
+        NoMethod = 0,      ///< No transfer method.
+        InBandMethod = 1,  ///< XEP-0047: In-Band Bytestreams
+        SocksMethod = 2,   ///< XEP-0065: SOCKS5 Bytestreams
+        AnyMethod = 3      ///< Any supported transfer method.
     };
     Q_ENUM(Method)
     Q_DECLARE_FLAGS(Methods, Method)
 
     /// This enum is used to describe the state of a transfer job.
-    enum State
-    {
-        OfferState = 0,    ///< The transfer is being offered to the remote party.
-        StartState = 1,    ///< The transfer is being connected.
-        TransferState = 2, ///< The transfer is ongoing.
-        FinishedState = 3  ///< The transfer is finished.
+    enum State {
+        OfferState = 0,     ///< The transfer is being offered to the remote party.
+        StartState = 1,     ///< The transfer is being connected.
+        TransferState = 2,  ///< The transfer is ongoing.
+        FinishedState = 3   ///< The transfer is finished.
     };
     Q_ENUM(State)
 
@@ -262,11 +261,11 @@ public slots:
 
 protected:
     /// \cond
-    void setClient(QXmppClient* client) override;
+    void setClient(QXmppClient *client) override;
     /// \endcond
 
 private slots:
-    void _q_iqReceived(const QXmppIq&);
+    void _q_iqReceived(const QXmppIq &);
     void _q_jobDestroyed(QObject *object);
     void _q_jobError(QXmppTransferJob::Error error);
     void _q_jobFinished();
@@ -276,17 +275,17 @@ private slots:
 private:
     QXmppTransferManagerPrivate *d;
 
-    void byteStreamIqReceived(const QXmppByteStreamIq&);
-    void byteStreamResponseReceived(const QXmppIq&);
-    void byteStreamResultReceived(const QXmppByteStreamIq&);
-    void byteStreamSetReceived(const QXmppByteStreamIq&);
-    void ibbCloseIqReceived(const QXmppIbbCloseIq&);
-    void ibbDataIqReceived(const QXmppIbbDataIq&);
-    void ibbOpenIqReceived(const QXmppIbbOpenIq&);
-    void ibbResponseReceived(const QXmppIq&);
-    void streamInitiationIqReceived(const QXmppStreamInitiationIq&);
-    void streamInitiationResultReceived(const QXmppStreamInitiationIq&);
-    void streamInitiationSetReceived(const QXmppStreamInitiationIq&);
+    void byteStreamIqReceived(const QXmppByteStreamIq &);
+    void byteStreamResponseReceived(const QXmppIq &);
+    void byteStreamResultReceived(const QXmppByteStreamIq &);
+    void byteStreamSetReceived(const QXmppByteStreamIq &);
+    void ibbCloseIqReceived(const QXmppIbbCloseIq &);
+    void ibbDataIqReceived(const QXmppIbbDataIq &);
+    void ibbOpenIqReceived(const QXmppIbbOpenIq &);
+    void ibbResponseReceived(const QXmppIq &);
+    void streamInitiationIqReceived(const QXmppStreamInitiationIq &);
+    void streamInitiationResultReceived(const QXmppStreamInitiationIq &);
+    void streamInitiationSetReceived(const QXmppStreamInitiationIq &);
     void socksServerSendOffer(QXmppTransferJob *job);
 
     friend class QXmppTransferManagerPrivate;
diff --git a/src/client/QXmppUploadRequestManager.h b/src/client/QXmppUploadRequestManager.h
index 05f56984..0450ad52 100644
--- a/src/client/QXmppUploadRequestManager.h
+++ b/src/client/QXmppUploadRequestManager.h
@@ -137,4 +137,4 @@ private:
     QSharedDataPointer<QXmppUploadRequestManagerPrivate> d;
 };
 
-#endif // QXMPPUPLOADREQUESTMANAGER_H
+#endif  // QXMPPUPLOADREQUESTMANAGER_H
diff --git a/src/client/QXmppVCardManager.h b/src/client/QXmppVCardManager.h
index 55a150f7..c65831d5 100644
--- a/src/client/QXmppVCardManager.h
+++ b/src/client/QXmppVCardManager.h
@@ -21,7 +21,6 @@
  *
  */
 
-
 #ifndef QXMPPVCARDMANAGER_H
 #define QXMPPVCARDMANAGER_H
 
@@ -71,7 +70,7 @@ public:
 
     /// \cond
     QStringList discoveryFeatures() const override;
-    bool handleStanza(const QDomElement &element) override;
+    bool handleStanza(const QDomElement& element) override;
     /// \endcond
 
 signals:
@@ -84,7 +83,7 @@ signals:
     void clientVCardReceived();
 
 private:
-    QXmppVCardManagerPrivate *d;
+    QXmppVCardManagerPrivate* d;
 };
 
-#endif // QXMPPVCARDMANAGER_H
+#endif  // QXMPPVCARDMANAGER_H
diff --git a/src/client/QXmppVersionManager.h b/src/client/QXmppVersionManager.h
index 9a6fc7a8..d8ec1b0e 100644
--- a/src/client/QXmppVersionManager.h
+++ b/src/client/QXmppVersionManager.h
@@ -46,11 +46,11 @@ public:
     QXmppVersionManager();
     ~QXmppVersionManager() override;
 
-    QString requestVersion(const QString& jid);
+    QString requestVersion(const QString &jid);
 
-    void setClientName(const QString&);
-    void setClientVersion(const QString&);
-    void setClientOs(const QString&);
+    void setClientName(const QString &);
+    void setClientVersion(const QString &);
+    void setClientOs(const QString &);
 
     QString clientName() const;
     QString clientVersion() const;
@@ -63,10 +63,10 @@ public:
 
 signals:
     /// \brief This signal is emitted when a version response is received.
-    void versionReceived(const QXmppVersionIq&);
+    void versionReceived(const QXmppVersionIq &);
 
 private:
     QXmppVersionManagerPrivate *d;
 };
 
-#endif // QXMPPVERSIONMANAGER_H
+#endif  // QXMPPVERSIONMANAGER_H