Run 'clang-format' on all files

58 files changed, 591 insertions, 579 deletions

diff --git a/examples/example_2_rosterHandling/example_2_rosterHandling.h b/examples/example_2_rosterHandling/example_2_rosterHandling.h
index f9343fad..fc195cae 100644
--- a/examples/example_2_rosterHandling/example_2_rosterHandling.h
+++ b/examples/example_2_rosterHandling/example_2_rosterHandling.h
@@ -14,16 +14,16 @@ class xmppClient : public QXmppClient
     Q_OBJECT
 
 public:
-    xmppClient(QObject* parent = nullptr);
+    xmppClient(QObject *parent = nullptr);
     ~xmppClient() override;
 
 public slots:
     void clientConnected();
     void rosterReceived();
-    void presenceChanged(const QString& bareJid, const QString& resource);
+    void presenceChanged(const QString &bareJid, const QString &resource);
 
 private:
-    QXmppRosterManager* m_rosterManager;
+    QXmppRosterManager *m_rosterManager;
 };
 
 #endif  // XMPPCLIENT_H
diff --git a/examples/example_7_archiveHandling/example_7_archiveHandling.cpp b/examples/example_7_archiveHandling/example_7_archiveHandling.cpp
index d845e021..cfc445f0 100644
--- a/examples/example_7_archiveHandling/example_7_archiveHandling.cpp
+++ b/examples/example_7_archiveHandling/example_7_archiveHandling.cpp
@@ -88,7 +88,7 @@ void xmppClient::archiveListReceived(const QList<QXmppArchiveChat> &chats, const
         for (const auto &chat : chats) {
             qDebug("chat start %s", qPrintable(chat.start().toString()));
             // NOTE: to actually retrieve conversations, uncomment this
-            //archiveManager->retrieveCollection(chat.with(), chat.start());
+            // archiveManager->retrieveCollection(chat.with(), chat.start());
         }
         if (!rsmReply.isNull()) {
             // fetch next page
diff --git a/src/base/QXmppArchiveIq.cpp b/src/base/QXmppArchiveIq.cpp
index 92fc5ef9..592f788c 100644
--- a/src/base/QXmppArchiveIq.cpp
+++ b/src/base/QXmppArchiveIq.cpp
@@ -239,7 +239,7 @@ bool QXmppArchiveChatIq::isArchiveChatIq(const QDomElement &element)
 {
     QDomElement chatElement = element.firstChildElement(QStringLiteral("chat"));
     return !chatElement.attribute(QStringLiteral("with")).isEmpty();
-    //return (chatElement.namespaceURI() == ns_archive);
+    // return (chatElement.namespaceURI() == ns_archive);
 }
 
 void QXmppArchiveChatIq::parseElementFromChild(const QDomElement &element)
diff --git a/src/base/QXmppConstants.cpp b/src/base/QXmppConstants.cpp
index ce5b47b0..d6e46ae6 100644
--- a/src/base/QXmppConstants.cpp
+++ b/src/base/QXmppConstants.cpp
@@ -4,169 +4,169 @@
 
 #include "QXmppConstants_p.h"
 
-const char* ns_stream = "http://etherx.jabber.org/streams";
-const char* ns_client = "jabber:client";
-const char* ns_server = "jabber:server";
-const char* ns_roster = "jabber:iq:roster";
-const char* ns_tls = "urn:ietf:params:xml:ns:xmpp-tls";
-const char* ns_sasl = "urn:ietf:params:xml:ns:xmpp-sasl";
-const char* ns_bind = "urn:ietf:params:xml:ns:xmpp-bind";
-const char* ns_session = "urn:ietf:params:xml:ns:xmpp-session";
-const char* ns_stanza = "urn:ietf:params:xml:ns:xmpp-stanzas";
-const char* ns_pre_approval = "urn:xmpp:features:pre-approval";
-const char* ns_rosterver = "urn:xmpp:features:rosterver";
+const char *ns_stream = "http://etherx.jabber.org/streams";
+const char *ns_client = "jabber:client";
+const char *ns_server = "jabber:server";
+const char *ns_roster = "jabber:iq:roster";
+const char *ns_tls = "urn:ietf:params:xml:ns:xmpp-tls";
+const char *ns_sasl = "urn:ietf:params:xml:ns:xmpp-sasl";
+const char *ns_bind = "urn:ietf:params:xml:ns:xmpp-bind";
+const char *ns_session = "urn:ietf:params:xml:ns:xmpp-session";
+const char *ns_stanza = "urn:ietf:params:xml:ns:xmpp-stanzas";
+const char *ns_pre_approval = "urn:xmpp:features:pre-approval";
+const char *ns_rosterver = "urn:xmpp:features:rosterver";
 // XEP-0009: Jabber-RPC
-const char* ns_rpc = "jabber:iq:rpc";
+const char *ns_rpc = "jabber:iq:rpc";
 // XEP-0020: Feature Negotiation
-const char* ns_feature_negotiation = "http://jabber.org/protocol/feature-neg";
+const char *ns_feature_negotiation = "http://jabber.org/protocol/feature-neg";
 // XEP-0027: Current Jabber OpenPGP Usage
-const char* ns_legacy_openpgp = "jabber:x:encrypted";
+const char *ns_legacy_openpgp = "jabber:x:encrypted";
 // XEP-0030: Service Discovery
-const char* ns_disco_info = "http://jabber.org/protocol/disco#info";
-const char* ns_disco_items = "http://jabber.org/protocol/disco#items";
+const char *ns_disco_info = "http://jabber.org/protocol/disco#info";
+const char *ns_disco_items = "http://jabber.org/protocol/disco#items";
 // XEP-0033: Extended Stanza Addressing
-const char* ns_extended_addressing = "http://jabber.org/protocol/address";
+const char *ns_extended_addressing = "http://jabber.org/protocol/address";
 // XEP-0045: Multi-User Chat
-const char* ns_muc = "http://jabber.org/protocol/muc";
-const char* ns_muc_admin = "http://jabber.org/protocol/muc#admin";
-const char* ns_muc_owner = "http://jabber.org/protocol/muc#owner";
-const char* ns_muc_user = "http://jabber.org/protocol/muc#user";
+const char *ns_muc = "http://jabber.org/protocol/muc";
+const char *ns_muc_admin = "http://jabber.org/protocol/muc#admin";
+const char *ns_muc_owner = "http://jabber.org/protocol/muc#owner";
+const char *ns_muc_user = "http://jabber.org/protocol/muc#user";
 // XEP-0047: In-Band Bytestreams
-const char* ns_ibb = "http://jabber.org/protocol/ibb";
+const char *ns_ibb = "http://jabber.org/protocol/ibb";
 // XEP-0049: Private XML Storage
-const char* ns_private = "jabber:iq:private";
+const char *ns_private = "jabber:iq:private";
 // XEP-0054: vcard-temp
-const char* ns_vcard = "vcard-temp";
+const char *ns_vcard = "vcard-temp";
 // XEP-0059: Result Set Management
-const char* ns_rsm = "http://jabber.org/protocol/rsm";
+const char *ns_rsm = "http://jabber.org/protocol/rsm";
 // XEP-0060: Publish-Subscribe
-const char* ns_pubsub = "http://jabber.org/protocol/pubsub";
-const char* ns_pubsub_errors = "http://jabber.org/protocol/pubsub#errors";
-const char* ns_pubsub_event = "http://jabber.org/protocol/pubsub#event";
-const char* ns_pubsub_owner = "http://jabber.org/protocol/pubsub#owner";
-const char* ns_pubsub_rsm = "http://jabber.org/protocol/pubsub#rsm";
+const char *ns_pubsub = "http://jabber.org/protocol/pubsub";
+const char *ns_pubsub_errors = "http://jabber.org/protocol/pubsub#errors";
+const char *ns_pubsub_event = "http://jabber.org/protocol/pubsub#event";
+const char *ns_pubsub_owner = "http://jabber.org/protocol/pubsub#owner";
+const char *ns_pubsub_rsm = "http://jabber.org/protocol/pubsub#rsm";
 // XEP-0065: SOCKS5 Bytestreams
-const char* ns_bytestreams = "http://jabber.org/protocol/bytestreams";
+const char *ns_bytestreams = "http://jabber.org/protocol/bytestreams";
 // XEP-0066: Out of Band Data
-const char* ns_oob = "jabber:x:oob";
+const char *ns_oob = "jabber:x:oob";
 // XEP-0071: XHTML-IM
-const char* ns_xhtml = "http://www.w3.org/1999/xhtml";
-const char* ns_xhtml_im = "http://jabber.org/protocol/xhtml-im";
+const char *ns_xhtml = "http://www.w3.org/1999/xhtml";
+const char *ns_xhtml_im = "http://jabber.org/protocol/xhtml-im";
 // XEP-0077: In-Band Registration
-const char* ns_register = "jabber:iq:register";
-const char* ns_register_feature = "http://jabber.org/features/iq-register";
+const char *ns_register = "jabber:iq:register";
+const char *ns_register_feature = "http://jabber.org/features/iq-register";
 // XEP-0078: Non-SASL Authentication
-const char* ns_auth = "jabber:iq:auth";
-const char* ns_authFeature = "http://jabber.org/features/iq-auth";
+const char *ns_auth = "jabber:iq:auth";
+const char *ns_authFeature = "http://jabber.org/features/iq-auth";
 // XEP-0085: Chat State Notifications
-const char* ns_chat_states = "http://jabber.org/protocol/chatstates";
+const char *ns_chat_states = "http://jabber.org/protocol/chatstates";
 // XEP-0091: Legacy Delayed Delivery
-const char* ns_legacy_delayed_delivery = "jabber:x:delay";
+const char *ns_legacy_delayed_delivery = "jabber:x:delay";
 // XEP-0092: Software Version
-const char* ns_version = "jabber:iq:version";
-const char* ns_data = "jabber:x:data";
+const char *ns_version = "jabber:iq:version";
+const char *ns_data = "jabber:x:data";
 // XEP-0095: Stream Initiation
-const char* ns_stream_initiation = "http://jabber.org/protocol/si";
-const char* ns_stream_initiation_file_transfer = "http://jabber.org/protocol/si/profile/file-transfer";
+const char *ns_stream_initiation = "http://jabber.org/protocol/si";
+const char *ns_stream_initiation_file_transfer = "http://jabber.org/protocol/si/profile/file-transfer";
 // XEP-0108: User Activity
-const char* ns_activity = "http://jabber.org/protocol/activity";
+const char *ns_activity = "http://jabber.org/protocol/activity";
 // XEP-0115: Entity Capabilities
-const char* ns_capabilities = "http://jabber.org/protocol/caps";
+const char *ns_capabilities = "http://jabber.org/protocol/caps";
 // XEP-0118: User Tune
-const char* ns_tune = "http://jabber.org/protocol/tune";
-const char* ns_tune_notify = "http://jabber.org/protocol/tune+notify";
+const char *ns_tune = "http://jabber.org/protocol/tune";
+const char *ns_tune_notify = "http://jabber.org/protocol/tune+notify";
 // XEP-0136: Message Archiving
-const char* ns_archive = "urn:xmpp:archive";
+const char *ns_archive = "urn:xmpp:archive";
 // XEP-0138: Stream Compression
-const char* ns_compress = "http://jabber.org/protocol/compress";
-const char* ns_compressFeature = "http://jabber.org/features/compress";
+const char *ns_compress = "http://jabber.org/protocol/compress";
+const char *ns_compressFeature = "http://jabber.org/features/compress";
 // XEP-0145: Annotations
-const char* ns_rosternotes = "storage:rosternotes";
+const char *ns_rosternotes = "storage:rosternotes";
 // XEP-0153: vCard-Based Avatars
-const char* ns_vcard_update = "vcard-temp:x:update";
+const char *ns_vcard_update = "vcard-temp:x:update";
 // XEP-0158: CAPTCHA Forms
-const char* ns_captcha = "urn:xmpp:captcha";
+const char *ns_captcha = "urn:xmpp:captcha";
 // XEP-0166: Jingle
-const char* ns_jingle = "urn:xmpp:jingle:1";
-const char* ns_jingle_raw_udp = "urn:xmpp:jingle:transports:raw-udp:1";
-const char* ns_jingle_ice_udp = "urn:xmpp:jingle:transports:ice-udp:1";
-const char* ns_jingle_rtp = "urn:xmpp:jingle:apps:rtp:1";
-const char* ns_jingle_rtp_audio = "urn:xmpp:jingle:apps:rtp:audio";
-const char* ns_jingle_rtp_video = "urn:xmpp:jingle:apps:rtp:video";
+const char *ns_jingle = "urn:xmpp:jingle:1";
+const char *ns_jingle_raw_udp = "urn:xmpp:jingle:transports:raw-udp:1";
+const char *ns_jingle_ice_udp = "urn:xmpp:jingle:transports:ice-udp:1";
+const char *ns_jingle_rtp = "urn:xmpp:jingle:apps:rtp:1";
+const char *ns_jingle_rtp_audio = "urn:xmpp:jingle:apps:rtp:audio";
+const char *ns_jingle_rtp_video = "urn:xmpp:jingle:apps:rtp:video";
 // XEP-0184: Message Receipts
-const char* ns_message_receipts = "urn:xmpp:receipts";
+const char *ns_message_receipts = "urn:xmpp:receipts";
 // XEP-0198: Stream Management
-const char* ns_stream_management = "urn:xmpp:sm:3";
+const char *ns_stream_management = "urn:xmpp:sm:3";
 // XEP-0199: XMPP Ping
-const char* ns_ping = "urn:xmpp:ping";
+const char *ns_ping = "urn:xmpp:ping";
 // XEP-0202: Entity Time
-const char* ns_entity_time = "urn:xmpp:time";
+const char *ns_entity_time = "urn:xmpp:time";
 // XEP-0203: Delayed Delivery
-const char* ns_delayed_delivery = "urn:xmpp:delay";
+const char *ns_delayed_delivery = "urn:xmpp:delay";
 // XEP-0220: Server Dialback
-const char* ns_server_dialback = "jabber:server:dialback";
+const char *ns_server_dialback = "jabber:server:dialback";
 // XEP-0221: Data Forms Media Element
-const char* ns_media_element = "urn:xmpp:media-element";
+const char *ns_media_element = "urn:xmpp:media-element";
 // XEP-0224: Attention
-const char* ns_attention = "urn:xmpp:attention:0";
+const char *ns_attention = "urn:xmpp:attention:0";
 // XEP-0231: Bits of Binary
-const char* ns_bob = "urn:xmpp:bob";
+const char *ns_bob = "urn:xmpp:bob";
 // XEP-0249: Direct MUC Invitations
-const char* ns_conference = "jabber:x:conference";
+const char *ns_conference = "jabber:x:conference";
 // XEP-0280: Message Carbons
-const char* ns_carbons = "urn:xmpp:carbons:2";
+const char *ns_carbons = "urn:xmpp:carbons:2";
 // XEP-0297: Stanza Forwarding
-const char* ns_forwarding = "urn:xmpp:forward:0";
+const char *ns_forwarding = "urn:xmpp:forward:0";
 // XEP-0308: Last Message Correction
-const char* ns_message_correct = "urn:xmpp:message-correct:0";
+const char *ns_message_correct = "urn:xmpp:message-correct:0";
 // XEP-0313: Message Archive Management
-const char* ns_mam = "urn:xmpp:mam:2";
+const char *ns_mam = "urn:xmpp:mam:2";
 // XEP-0319: Last User Interaction in Presence
-const char* ns_idle = "urn:xmpp:idle:1";
+const char *ns_idle = "urn:xmpp:idle:1";
 // XEP-0333: Chat Markers
-const char* ns_chat_markers = "urn:xmpp:chat-markers:0";
+const char *ns_chat_markers = "urn:xmpp:chat-markers:0";
 // XEP-0334: Message Processing Hints
-const char* ns_message_processing_hints = "urn:xmpp:hints";
+const char *ns_message_processing_hints = "urn:xmpp:hints";
 // XEP-0352: Client State Indication
-const char* ns_csi = "urn:xmpp:csi:0";
+const char *ns_csi = "urn:xmpp:csi:0";
 // XEP-0357: Push Notifications
-const char* ns_push = "urn:xmpp:push:0";
+const char *ns_push = "urn:xmpp:push:0";
 // XEP-0359: Unique and Stable Stanza IDs
-const char* ns_sid = "urn:xmpp:sid:0";
+const char *ns_sid = "urn:xmpp:sid:0";
 // XEP-0363: HTTP File Upload
-const char* ns_http_upload = "urn:xmpp:http:upload:0";
+const char *ns_http_upload = "urn:xmpp:http:upload:0";
 // XEP-0364: Current Off-the-Record Messaging Usage
-const char* ns_otr = "urn:xmpp:otr:0";
+const char *ns_otr = "urn:xmpp:otr:0";
 // XEP-0367: Message Attaching
-const char* ns_message_attaching = "urn:xmpp:message-attaching:1";
+const char *ns_message_attaching = "urn:xmpp:message-attaching:1";
 // XEP-0369: Mediated Information eXchange (MIX)
-const char* ns_mix = "urn:xmpp:mix:core:1";
-const char* ns_mix_create_channel = "urn:xmpp:mix:core:1#create-channel";
-const char* ns_mix_searchable = "urn:xmpp:mix:core:1#searchable";
-const char* ns_mix_node_messages = "urn:xmpp:mix:nodes:messages";
-const char* ns_mix_node_participants = "urn:xmpp:mix:nodes:participants";
-const char* ns_mix_node_presence = "urn:xmpp:mix:nodes:presence";
-const char* ns_mix_node_config = "urn:xmpp:mix:nodes:config";
-const char* ns_mix_node_info = "urn:xmpp:mix:nodes:info";
+const char *ns_mix = "urn:xmpp:mix:core:1";
+const char *ns_mix_create_channel = "urn:xmpp:mix:core:1#create-channel";
+const char *ns_mix_searchable = "urn:xmpp:mix:core:1#searchable";
+const char *ns_mix_node_messages = "urn:xmpp:mix:nodes:messages";
+const char *ns_mix_node_participants = "urn:xmpp:mix:nodes:participants";
+const char *ns_mix_node_presence = "urn:xmpp:mix:nodes:presence";
+const char *ns_mix_node_config = "urn:xmpp:mix:nodes:config";
+const char *ns_mix_node_info = "urn:xmpp:mix:nodes:info";
 // XEP-0373: OpenPGP for XMPP
-const char* ns_ox = "urn:xmpp:openpgp:0";
+const char *ns_ox = "urn:xmpp:openpgp:0";
 // XEP-0380: Explicit Message Encryption
-const char* ns_eme = "urn:xmpp:eme:0";
+const char *ns_eme = "urn:xmpp:eme:0";
 // XEP-0382: Spoiler messages
-const char* ns_spoiler = "urn:xmpp:spoiler:0";
+const char *ns_spoiler = "urn:xmpp:spoiler:0";
 // XEP-0384: OMEMO Encryption
-const char* ns_omemo = "eu.siacs.conversations.axolotl";
-const char* ns_omemo_1 = "urn:xmpp:omemo:1";
-const char* ns_omemo_2 = "urn:xmpp:omemo:2";
+const char *ns_omemo = "eu.siacs.conversations.axolotl";
+const char *ns_omemo_1 = "urn:xmpp:omemo:1";
+const char *ns_omemo_2 = "urn:xmpp:omemo:2";
 // XEP-0405: Mediated Information eXchange (MIX): Participant Server Requirements
-const char* ns_mix_pam = "urn:xmpp:mix:pam:1";
-const char* ns_mix_roster = "urn:xmpp:mix:roster:0";
-const char* ns_mix_presence = "urn:xmpp:presence:0";
+const char *ns_mix_pam = "urn:xmpp:mix:pam:1";
+const char *ns_mix_roster = "urn:xmpp:mix:roster:0";
+const char *ns_mix_presence = "urn:xmpp:presence:0";
 // XEP-0407: Mediated Information eXchange (MIX): Miscellaneous Capabilities
-const char* ns_mix_misc = "urn:xmpp:mix:misc:0";
+const char *ns_mix_misc = "urn:xmpp:mix:misc:0";
 // XEP-0428: Fallback Indication
-const char* ns_fallback_indication = "urn:xmpp:fallback:0";
+const char *ns_fallback_indication = "urn:xmpp:fallback:0";
 // XEP-0434: Trust Messages (TM)
-const char* ns_tm = "urn:xmpp:tm:1";
+const char *ns_tm = "urn:xmpp:tm:1";
 // XEP-0450: Automatic Trust Management (ATM)
-const char* ns_atm = "urn:xmpp:atm:1";
+const char *ns_atm = "urn:xmpp:atm:1";
diff --git a/src/base/QXmppConstants_p.h b/src/base/QXmppConstants_p.h
index 5de41f7b..7fa7afd5 100644
--- a/src/base/QXmppConstants_p.h
+++ b/src/base/QXmppConstants_p.h
@@ -16,171 +16,171 @@
 // We mean it.
 //
 
-extern const char* ns_stream;
-extern const char* ns_client;
-extern const char* ns_server;
-extern const char* ns_roster;
-extern const char* ns_tls;
-extern const char* ns_sasl;
-extern const char* ns_bind;
-extern const char* ns_session;
-extern const char* ns_stanza;
-extern const char* ns_pre_approval;
-extern const char* ns_rosterver;
+extern const char *ns_stream;
+extern const char *ns_client;
+extern const char *ns_server;
+extern const char *ns_roster;
+extern const char *ns_tls;
+extern const char *ns_sasl;
+extern const char *ns_bind;
+extern const char *ns_session;
+extern const char *ns_stanza;
+extern const char *ns_pre_approval;
+extern const char *ns_rosterver;
 // XEP-0009: Jabber-RPC
-extern const char* ns_rpc;
+extern const char *ns_rpc;
 // XEP-0020: Feature Negotiation
-extern const char* ns_feature_negotiation;
+extern const char *ns_feature_negotiation;
 // XEP-0027: Current Jabber OpenPGP Usage
-extern const char* ns_legacy_openpgp;
+extern const char *ns_legacy_openpgp;
 // XEP-0030: Service Discovery
-extern const char* ns_disco_info;
-extern const char* ns_disco_items;
+extern const char *ns_disco_info;
+extern const char *ns_disco_items;
 // XEP-0033: Extended Stanza Addressing
-extern const char* ns_extended_addressing;
+extern const char *ns_extended_addressing;
 // XEP-0045: Multi-User Chat
-extern const char* ns_muc;
-extern const char* ns_muc_admin;
-extern const char* ns_muc_owner;
-extern const char* ns_muc_user;
+extern const char *ns_muc;
+extern const char *ns_muc_admin;
+extern const char *ns_muc_owner;
+extern const char *ns_muc_user;
 // XEP-0047: In-Band Bytestreams
-extern const char* ns_ibb;
+extern const char *ns_ibb;
 // XEP-0049: Private XML Storage
-extern const char* ns_private;
+extern const char *ns_private;
 // XEP-0054: vcard-temp
-extern const char* ns_vcard;
+extern const char *ns_vcard;
 // XEP-0059: Result Set Management
-extern const char* ns_rsm;
+extern const char *ns_rsm;
 // XEP-0060: Publish-Subscribe
-extern const char* ns_pubsub;
-extern const char* ns_pubsub_errors;
-extern const char* ns_pubsub_event;
-extern const char* ns_pubsub_owner;
-extern const char* ns_pubsub_rsm;
+extern const char *ns_pubsub;
+extern const char *ns_pubsub_errors;
+extern const char *ns_pubsub_event;
+extern const char *ns_pubsub_owner;
+extern const char *ns_pubsub_rsm;
 // XEP-0065: SOCKS5 Bytestreams
-extern const char* ns_bytestreams;
+extern const char *ns_bytestreams;
 // XEP-0066: Out of Band Data
-extern const char* ns_oob;
+extern const char *ns_oob;
 // XEP-0071: XHTML-IM
-extern const char* ns_xhtml;
-extern const char* ns_xhtml_im;
+extern const char *ns_xhtml;
+extern const char *ns_xhtml_im;
 // XEP-0077: In-Band Registration
-extern const char* ns_register;
-extern const char* ns_register_feature;
+extern const char *ns_register;
+extern const char *ns_register_feature;
 // XEP-0078: Non-SASL Authentication
-extern const char* ns_auth;
-extern const char* ns_authFeature;
+extern const char *ns_auth;
+extern const char *ns_authFeature;
 // XEP-0085: Chat State Notifications
-extern const char* ns_chat_states;
+extern const char *ns_chat_states;
 // XEP-0091: Legacy Delayed Delivery
-extern const char* ns_legacy_delayed_delivery;
+extern const char *ns_legacy_delayed_delivery;
 // XEP-0092: Software Version
-extern const char* ns_version;
-extern const char* ns_data;
+extern const char *ns_version;
+extern const char *ns_data;
 // XEP-0095: Stream Initiation
-extern const char* ns_stream_initiation;
-extern const char* ns_stream_initiation_file_transfer;
+extern const char *ns_stream_initiation;
+extern const char *ns_stream_initiation_file_transfer;
 // XEP-0108: User Activity
-extern const char* ns_activity;
+extern const char *ns_activity;
 // XEP-0115: Entity Capabilities
-extern const char* ns_capabilities;
+extern const char *ns_capabilities;
 // XEP-0118: User Tune
-extern const char* ns_tune;
-extern const char* ns_tune_notify;
+extern const char *ns_tune;
+extern const char *ns_tune_notify;
 // XEP-0136: Message Archiving
-extern const char* ns_archive;
+extern const char *ns_archive;
 // XEP-0138: Stream Compression
-extern const char* ns_compress;
-extern const char* ns_compressFeature;
+extern const char *ns_compress;
+extern const char *ns_compressFeature;
 // XEP-0145: Annotations
-extern const char* ns_rosternotes;
+extern const char *ns_rosternotes;
 // XEP-0153: vCard-Based Avatars
-extern const char* ns_vcard_update;
+extern const char *ns_vcard_update;
 // XEP-0158: CAPTCHA Forms
-extern const char* ns_captcha;
+extern const char *ns_captcha;
 // XEP-0166: Jingle
-extern const char* ns_jingle;
-extern const char* ns_jingle_ice_udp;
-extern const char* ns_jingle_raw_udp;
-extern const char* ns_jingle_rtp;
-extern const char* ns_jingle_rtp_audio;
-extern const char* ns_jingle_rtp_video;
+extern const char *ns_jingle;
+extern const char *ns_jingle_ice_udp;
+extern const char *ns_jingle_raw_udp;
+extern const char *ns_jingle_rtp;
+extern const char *ns_jingle_rtp_audio;
+extern const char *ns_jingle_rtp_video;
 // XEP-0184: Message Receipts
-extern const char* ns_message_receipts;
+extern const char *ns_message_receipts;
 // XEP-0198: Stream Management
-extern const char* ns_stream_management;
+extern const char *ns_stream_management;
 // XEP-0199: XMPP Ping
-extern const char* ns_ping;
+extern const char *ns_ping;
 // XEP-0202: Entity Time
-extern const char* ns_entity_time;
+extern const char *ns_entity_time;
 // XEP-0203: Delayed Delivery
-extern const char* ns_delayed_delivery;
+extern const char *ns_delayed_delivery;
 // XEP-0220: Server Dialback
-extern const char* ns_server_dialback;
+extern const char *ns_server_dialback;
 // XEP-0221: Data Forms Media Element
-extern const char* ns_media_element;
+extern const char *ns_media_element;
 // XEP-0224: Attention
-extern const char* ns_attention;
+extern const char *ns_attention;
 // XEP-0231: Bits of Binary
-extern const char* ns_bob;
+extern const char *ns_bob;
 // XEP-0249: Direct MUC Invitations
-extern const char* ns_conference;
+extern const char *ns_conference;
 // XEP-0280: Message Carbons
-extern const char* ns_carbons;
+extern const char *ns_carbons;
 // XEP-0297: Stanza Forwarding
-extern const char* ns_forwarding;
+extern const char *ns_forwarding;
 // XEP-0308: Last Message Correction
-extern const char* ns_message_correct;
+extern const char *ns_message_correct;
 // XEP-0313: Message Archive Management
-extern const char* ns_mam;
+extern const char *ns_mam;
 // XEP-0319: Last User Interaction in Presence
-extern const char* ns_idle;
+extern const char *ns_idle;
 // XEP-0333: Char Markers
-extern const char* ns_chat_markers;
+extern const char *ns_chat_markers;
 // XEP-0334: Message Processing Hints:
-extern const char* ns_message_processing_hints;
+extern const char *ns_message_processing_hints;
 // XEP-0352: Client State Indication
-extern const char* ns_csi;
+extern const char *ns_csi;
 // XEP-0357: Push Notifications
-extern const char* ns_push;
+extern const char *ns_push;
 // XEP-0359: Unique and Stable Stanza IDs
-extern const char* ns_sid;
+extern const char *ns_sid;
 // XEP-0363: HTTP File Upload
-extern const char* ns_http_upload;
+extern const char *ns_http_upload;
 // XEP-0364: Current Off-the-Record Messaging Usage
-extern const char* ns_otr;
+extern const char *ns_otr;
 // XEP-0367: Message Attaching
-extern const char* ns_message_attaching;
+extern const char *ns_message_attaching;
 // XEP-0369: Mediated Information eXchange (MIX)
-extern const char* ns_mix;
-extern const char* ns_mix_create_channel;
-extern const char* ns_mix_searchable;
-extern const char* ns_mix_node_messages;
-extern const char* ns_mix_node_participants;
-extern const char* ns_mix_node_presence;
-extern const char* ns_mix_node_config;
-extern const char* ns_mix_node_info;
+extern const char *ns_mix;
+extern const char *ns_mix_create_channel;
+extern const char *ns_mix_searchable;
+extern const char *ns_mix_node_messages;
+extern const char *ns_mix_node_participants;
+extern const char *ns_mix_node_presence;
+extern const char *ns_mix_node_config;
+extern const char *ns_mix_node_info;
 // XEP-0373: OpenPGP for XMPP
-extern const char* ns_ox;
+extern const char *ns_ox;
 // XEP-0380: Explicit Message Encryption
-extern const char* ns_eme;
+extern const char *ns_eme;
 // XEP-0382: Spoiler messages
-extern const char* ns_spoiler;
+extern const char *ns_spoiler;
 // XEP-0384: OMEMO Encryption
-extern const char* ns_omemo;
-extern const char* ns_omemo_1;
-extern const char* ns_omemo_2;
+extern const char *ns_omemo;
+extern const char *ns_omemo_1;
+extern const char *ns_omemo_2;
 // XEP-0405: Mediated Information eXchange (MIX): Participant Server Requirements
-extern const char* ns_mix_pam;
-extern const char* ns_mix_roster;
-extern const char* ns_mix_presence;
+extern const char *ns_mix_pam;
+extern const char *ns_mix_roster;
+extern const char *ns_mix_presence;
 // XEP-0407: Mediated Information eXchange (MIX): Miscellaneous Capabilities
-extern const char* ns_mix_misc;
+extern const char *ns_mix_misc;
 // XEP-0428: Fallback Indication
-extern const char* ns_fallback_indication;
+extern const char *ns_fallback_indication;
 // XEP-0434: Trust Messages (TM)
-extern const char* ns_tm;
+extern const char *ns_tm;
 // XEP-0450: Automatic Trust Management (ATM)
-extern const char* ns_atm;
+extern const char *ns_atm;
 
 #endif  // QXMPPCONSTANTS_H
diff --git a/src/base/QXmppDataForm.cpp b/src/base/QXmppDataForm.cpp
index af05c9b1..2b165aec 100644
--- a/src/base/QXmppDataForm.cpp
+++ b/src/base/QXmppDataForm.cpp
@@ -19,7 +19,8 @@
 #include <QStringList>
 #include <QUrl>
 
-struct field_type {
+struct field_type
+{
     QXmppDataForm::Field::Type type;
     const char *str;
 };
diff --git a/src/base/QXmppDataFormBase.cpp b/src/base/QXmppDataFormBase.cpp
index 5aacbc7c..754c13ee 100644
--- a/src/base/QXmppDataFormBase.cpp
+++ b/src/base/QXmppDataFormBase.cpp
@@ -194,8 +194,8 @@ void QXmppExtensibleDataFormBase::parseForm(const QXmppDataForm &form)
     for (const auto &field : fields) {
         // FORM_TYPE fields are not saved (override this function to save them)
         if (!parseField(field) &&
-                !(field.type() == QXmppDataForm::Field::HiddenField &&
-                  field.key() == QStringLiteral("FORM_TYPE"))) {
+            !(field.type() == QXmppDataForm::Field::HiddenField &&
+              field.key() == QStringLiteral("FORM_TYPE"))) {
             d->unknownFields << field;
         }
     }
diff --git a/src/base/QXmppDataFormBase.h b/src/base/QXmppDataFormBase.h
index 866f647c..b5751f1d 100644
--- a/src/base/QXmppDataFormBase.h
+++ b/src/base/QXmppDataFormBase.h
@@ -74,7 +74,8 @@ protected:
     }
 
     template<typename T, typename ValueConverter = T (*)(T)>
-    static void serializeOptional(QXmppDataForm &form, QXmppDataForm::Field::Type type, const QString &name, const std::optional<T> &optional, ValueConverter convert = [](T a) { return a; })
+    static void serializeOptional(
+        QXmppDataForm &form, QXmppDataForm::Field::Type type, const QString &name, const std::optional<T> &optional, ValueConverter convert = [](T a) { return a; })
     {
         if (optional.has_value()) {
             serializeValue(form, type, name, convert(*optional));
@@ -118,4 +119,4 @@ private:
     QSharedDataPointer<QXmppExtensibleDataFormBasePrivate> d;
 };
 
-#endif // QXMPPDATAFORMBASED_H
+#endif  // QXMPPDATAFORMBASED_H
diff --git a/src/base/QXmppEntityTimeIq.h b/src/base/QXmppEntityTimeIq.h
index aac9de51..1d9f5b15 100644
--- a/src/base/QXmppEntityTimeIq.h
+++ b/src/base/QXmppEntityTimeIq.h
@@ -37,4 +37,4 @@ private:
     QDateTime m_utc;
 };
 
-#endif  //QXMPPENTITYTIMEIQ_H
+#endif  // QXMPPENTITYTIMEIQ_H
diff --git a/src/base/QXmppFutureUtils_p.h b/src/base/QXmppFutureUtils_p.h
index 6becf879..61a9075b 100644
--- a/src/base/QXmppFutureUtils_p.h
+++ b/src/base/QXmppFutureUtils_p.h
@@ -28,7 +28,8 @@ namespace QXmpp::Private {
 
 // helper for std::visit
 template<class... Ts>
-struct overloaded : Ts... {
+struct overloaded : Ts...
+{
     using Ts::operator()...;
 };
 // explicit deduction guide (not needed as of C++20)
@@ -42,7 +43,8 @@ template<typename F, typename Ret, typename A, typename... Rest>
 A lambda_helper(Ret (F::*)(A, Rest...) const);
 
 template<typename F>
-struct first_argument {
+struct first_argument
+{
     using type = decltype(lambda_helper(&F::operator()));
 };
 
@@ -70,10 +72,10 @@ void awaitLast(const QFuture<T> &future, QObject *context, Handler handler)
     auto *watcher = new QFutureWatcher<T>(context);
     QObject::connect(watcher, &QFutureWatcherBase::finished,
                      context, [watcher, handler { std::move(handler) }]() {
-        auto future = watcher->future();
-        handler(future.resultAt(future.resultCount() - 1));
-        watcher->deleteLater();
-    });
+                         auto future = watcher->future();
+                         handler(future.resultAt(future.resultCount() - 1));
+                         watcher->deleteLater();
+                     });
     watcher->setFuture(future);
 }
 
@@ -83,9 +85,9 @@ void await(const QFuture<T> &future, QObject *context, Handler handler)
     auto *watcher = new QFutureWatcher<T>(context);
     QObject::connect(watcher, &QFutureWatcherBase::finished,
                      context, [watcher, handler { std::move(handler) }]() {
-        handler(watcher->result());
-        watcher->deleteLater();
-    });
+                         handler(watcher->result());
+                         watcher->deleteLater();
+                     });
     watcher->setFuture(future);
 }
 
@@ -95,9 +97,9 @@ void await(const QFuture<void> &future, QObject *context, Handler handler)
     auto *watcher = new QFutureWatcher<void>(context);
     QObject::connect(watcher, &QFutureWatcherBase::finished,
                      context, [watcher, handler { std::move(handler) }]() {
-        handler();
-        watcher->deleteLater();
-    });
+                         handler();
+                         watcher->deleteLater();
+                     });
     watcher->setFuture(future);
 }
 
diff --git a/src/base/QXmppGlobal.h.in b/src/base/QXmppGlobal.h.in
index 1ecfc554..61b2e965 100644
--- a/src/base/QXmppGlobal.h.in
+++ b/src/base/QXmppGlobal.h.in
@@ -77,9 +77,9 @@ namespace QXmpp {
 /// \since QXmpp 1.5
 ///
 enum SceMode : uint8_t {
-    SceAll,         ///< Processes all known elements.
-    ScePublic,      ///< Only processes 'public' elements (e.g. needed for routing).
-    SceSensitive,   ///< Only processes sensitive elements that should be encrypted.
+    SceAll,        ///< Processes all known elements.
+    ScePublic,     ///< Only processes 'public' elements (e.g. needed for routing).
+    SceSensitive,  ///< Only processes sensitive elements that should be encrypted.
 };
 
 ///
@@ -100,7 +100,9 @@ inline constexpr bool operator&(SceMode mode1, SceMode mode2)
 ///
 /// \since QXmpp 1.5
 ///
-struct Success {};
+struct Success
+{
+};
 
 }
 
diff --git a/src/base/QXmppMixIq.cpp b/src/base/QXmppMixIq.cpp
index 11cd49ea..d137ddea 100644
--- a/src/base/QXmppMixIq.cpp
+++ b/src/base/QXmppMixIq.cpp
@@ -39,12 +39,12 @@ QXmppMixIq::QXmppMixIq()
 }
 
 /// Default copy-constructor
-QXmppMixIq::QXmppMixIq(const QXmppMixIq&) = default;
+QXmppMixIq::QXmppMixIq(const QXmppMixIq &) = default;
 
 QXmppMixIq::~QXmppMixIq() = default;
 
 /// Default assignment operator
-QXmppMixIq& QXmppMixIq::operator=(const QXmppMixIq&) = default;
+QXmppMixIq &QXmppMixIq::operator=(const QXmppMixIq &) = default;
 
 /// Returns the channel JID. It also contains a participant id for Join/
 /// ClientJoin results.
@@ -57,7 +57,7 @@ QString QXmppMixIq::jid() const
 /// Sets the channel JID. For results of Join/ClientJoin queries this also
 /// needs to contain a participant id.
 
-void QXmppMixIq::setJid(const QString& jid)
+void QXmppMixIq::setJid(const QString &jid)
 {
     d->jid = jid;
 }
@@ -74,7 +74,7 @@ QString QXmppMixIq::channelName() const
 /// create a new channel, this can also be left empty to let the server
 /// generate a name.
 
-void QXmppMixIq::setChannelName(const QString& channelName)
+void QXmppMixIq::setChannelName(const QString &channelName)
 {
     d->channelName = channelName;
 }
@@ -89,7 +89,7 @@ QStringList QXmppMixIq::nodes() const
 /// Sets the nodes to subscribe to. Note that for UpdateSubscription queries
 /// you only need to include the new subscriptions.
 
-void QXmppMixIq::setNodes(const QStringList& nodes)
+void QXmppMixIq::setNodes(const QStringList &nodes)
 {
     d->nodes = nodes;
 }
@@ -103,7 +103,7 @@ QString QXmppMixIq::nick() const
 
 /// Sets the nickname for the channel.
 
-void QXmppMixIq::setNick(const QString& nick)
+void QXmppMixIq::setNick(const QString &nick)
 {
     d->nick = nick;
 }
@@ -123,13 +123,13 @@ void QXmppMixIq::setActionType(QXmppMixIq::Type type)
 }
 
 /// \cond
-bool QXmppMixIq::isMixIq(const QDomElement& element)
+bool QXmppMixIq::isMixIq(const QDomElement &element)
 {
-    const QDomElement& child = element.firstChildElement();
+    const QDomElement &child = element.firstChildElement();
     return !child.isNull() && (child.namespaceURI() == ns_mix || child.namespaceURI() == ns_mix_pam);
 }
 
-void QXmppMixIq::parseElementFromChild(const QDomElement& element)
+void QXmppMixIq::parseElementFromChild(const QDomElement &element)
 {
     QDomElement child = element.firstChildElement();
     // determine action type
@@ -160,7 +160,7 @@ void QXmppMixIq::parseElementFromChild(const QDomElement& element)
     }
 }
 
-void QXmppMixIq::toXmlElementFromChild(QXmlStreamWriter* writer) const
+void QXmppMixIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
 {
     if (d->actionType == None)
         return;
@@ -182,7 +182,7 @@ void QXmppMixIq::toXmlElementFromChild(QXmlStreamWriter* writer) const
     if (type() == Result)
         helperToXmlAddAttribute(writer, QStringLiteral("jid"), d->jid);
 
-    for (const auto& node : d->nodes) {
+    for (const auto &node : d->nodes) {
         writer->writeStartElement(QStringLiteral("subscribe"));
         writer->writeAttribute(QStringLiteral("node"), node);
         writer->writeEndElement();
diff --git a/src/base/QXmppMixItem.cpp b/src/base/QXmppMixItem.cpp
index 1174fdbe..329b1cce 100644
--- a/src/base/QXmppMixItem.cpp
+++ b/src/base/QXmppMixItem.cpp
@@ -38,10 +38,10 @@ QXmppMixInfoItem::QXmppMixInfoItem()
 }
 
 /// Default copy-constructor
-QXmppMixInfoItem::QXmppMixInfoItem(const QXmppMixInfoItem&) = default;
+QXmppMixInfoItem::QXmppMixInfoItem(const QXmppMixInfoItem &) = default;
 
 /// Default assignment operator
-QXmppMixInfoItem& QXmppMixInfoItem::operator=(const QXmppMixInfoItem&) = default;
+QXmppMixInfoItem &QXmppMixInfoItem::operator=(const QXmppMixInfoItem &) = default;
 
 QXmppMixInfoItem::~QXmppMixInfoItem() = default;
 
@@ -57,7 +57,7 @@ QString QXmppMixInfoItem::name() const
 ///
 /// Sets the name of the channel.
 ///
-void QXmppMixInfoItem::setName(const QString& name)
+void QXmppMixInfoItem::setName(const QString &name)
 {
     d->name = name;
 }
@@ -73,7 +73,7 @@ QString QXmppMixInfoItem::description() const
 ///
 /// Sets the longer channel description.
 ///
-void QXmppMixInfoItem::setDescription(const QString& description)
+void QXmppMixInfoItem::setDescription(const QString &description)
 {
     d->description = description;
 }
@@ -89,7 +89,7 @@ QStringList QXmppMixInfoItem::contactJids() const
 ///
 /// Sets a list of public JIDs that are responsible for this channel.
 ///
-void QXmppMixInfoItem::setContactJids(const QStringList& contactJids)
+void QXmppMixInfoItem::setContactJids(const QStringList &contactJids)
 {
     d->contactJids = contactJids;
 }
@@ -97,11 +97,11 @@ void QXmppMixInfoItem::setContactJids(const QStringList& contactJids)
 ///
 /// Returns true, if the given dom element is a MIX channel info item.
 ///
-bool QXmppMixInfoItem::isMixChannelInfo(const QDomElement& element)
+bool QXmppMixInfoItem::isMixChannelInfo(const QDomElement &element)
 {
     QXmppDataForm form;
     form.parse(element);
-    for (const auto& field : form.fields()) {
+    for (const auto &field : form.fields()) {
         if (field.key() == QStringLiteral("FORM_TYPE"))
             return field.value() == ns_mix;
     }
@@ -109,12 +109,12 @@ bool QXmppMixInfoItem::isMixChannelInfo(const QDomElement& element)
 }
 
 /// \cond
-void QXmppMixInfoItem::parse(const QXmppElement& element)
+void QXmppMixInfoItem::parse(const QXmppElement &element)
 {
     QXmppDataForm form;
     form.parse(element.sourceDomElement());
 
-    for (auto& field : form.fields()) {
+    for (auto &field : form.fields()) {
         if (field.key() == QStringLiteral("Name"))
             d->name = field.value().toString();
         else if (field.key() == QStringLiteral("Description"))
@@ -190,10 +190,10 @@ QXmppMixParticipantItem::QXmppMixParticipantItem()
 }
 
 /// Default copy-constructor
-QXmppMixParticipantItem::QXmppMixParticipantItem(const QXmppMixParticipantItem&) = default;
+QXmppMixParticipantItem::QXmppMixParticipantItem(const QXmppMixParticipantItem &) = default;
 
 /// Default assignment operator
-QXmppMixParticipantItem& QXmppMixParticipantItem::operator=(const QXmppMixParticipantItem&) = default;
+QXmppMixParticipantItem &QXmppMixParticipantItem::operator=(const QXmppMixParticipantItem &) = default;
 
 QXmppMixParticipantItem::~QXmppMixParticipantItem() = default;
 
@@ -208,7 +208,7 @@ QString QXmppMixParticipantItem::nick() const
 ///
 /// Sets the participants nickname.
 ///
-void QXmppMixParticipantItem::setNick(const QString& nick)
+void QXmppMixParticipantItem::setNick(const QString &nick)
 {
     d->nick = nick;
 }
@@ -224,13 +224,13 @@ QString QXmppMixParticipantItem::jid() const
 ///
 /// Sets the participant's JID.
 ///
-void QXmppMixParticipantItem::setJid(const QString& jid)
+void QXmppMixParticipantItem::setJid(const QString &jid)
 {
     d->jid = jid;
 }
 
 /// \cond
-void QXmppMixParticipantItem::parse(const QXmppElement& itemContent)
+void QXmppMixParticipantItem::parse(const QXmppElement &itemContent)
 {
     d->nick = itemContent.firstChildElement(QStringLiteral("nick")).value();
     d->jid = itemContent.firstChildElement(QStringLiteral("jid")).value();
@@ -259,7 +259,7 @@ QXmppElement QXmppMixParticipantItem::toElement() const
 ///
 /// Returns true, if this dom element is a MIX participant item.
 ///
-bool QXmppMixParticipantItem::isMixParticipantItem(const QDomElement& element)
+bool QXmppMixParticipantItem::isMixParticipantItem(const QDomElement &element)
 {
     return element.tagName() == QStringLiteral("participant") && element.namespaceURI() == ns_mix;
 }
diff --git a/src/base/QXmppNonza.h b/src/base/QXmppNonza.h
index 6a9584d4..03517d2b 100644
--- a/src/base/QXmppNonza.h
+++ b/src/base/QXmppNonza.h
@@ -21,4 +21,4 @@ public:
     virtual void toXml(QXmlStreamWriter *writer) const = 0;
 };
 
-#endif // QXMPPNONZA_H
+#endif  // QXMPPNONZA_H
diff --git a/src/base/QXmppPacket.cpp b/src/base/QXmppPacket.cpp
index d228b57d..f058a569 100644
--- a/src/base/QXmppPacket.cpp
+++ b/src/base/QXmppPacket.cpp
@@ -2,8 +2,8 @@
 //
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
-#include "QXmppPacket_p.h"
 #include "QXmppNonza.h"
+#include "QXmppPacket_p.h"
 
 #include <QFuture>
 #include <QXmlStreamWriter>
diff --git a/src/base/QXmppPubSubEvent.cpp b/src/base/QXmppPubSubEvent.cpp
index 0e780903..a0809389 100644
--- a/src/base/QXmppPubSubEvent.cpp
+++ b/src/base/QXmppPubSubEvent.cpp
@@ -292,8 +292,8 @@ bool QXmppPubSubEventBase::isPubSubEvent(const QDomElement &stanza, std::functio
 bool QXmppPubSubEventBase::parseExtension(const QDomElement &eventElement, QXmpp::SceMode sceMode)
 {
     if (sceMode & QXmpp::SceSensitive &&
-            eventElement.tagName() == QStringLiteral("event") &&
-            eventElement.namespaceURI() == ns_pubsub_event) {
+        eventElement.tagName() == QStringLiteral("event") &&
+        eventElement.namespaceURI() == ns_pubsub_event) {
         // check that the query type is valid
         const auto eventTypeElement = eventElement.firstChildElement();
         if (const auto index = PUBSUB_EVENTS.indexOf(eventTypeElement.tagName());
diff --git a/src/base/QXmppPubSubMetadata.cpp b/src/base/QXmppPubSubMetadata.cpp
index 09f971b9..3b5a3a0a 100644
--- a/src/base/QXmppPubSubMetadata.cpp
+++ b/src/base/QXmppPubSubMetadata.cpp
@@ -8,7 +8,8 @@
 
 // helper for std::visit
 template<class... Ts>
-struct overloaded : Ts... {
+struct overloaded : Ts...
+{
     using Ts::operator()...;
 };
 // explicit deduction guide (not needed as of C++20)
diff --git a/src/base/QXmppPubSubMetadata.h b/src/base/QXmppPubSubMetadata.h
index 9bb5a200..ac830164 100644
--- a/src/base/QXmppPubSubMetadata.h
+++ b/src/base/QXmppPubSubMetadata.h
@@ -15,9 +15,11 @@ class QXmppPubSubMetadataPrivate;
 class QXMPP_EXPORT QXmppPubSubMetadata : public QXmppExtensibleDataFormBase
 {
 public:
-    struct Unset {
+    struct Unset
+    {
     };
-    struct Max {
+    struct Max
+    {
     };
     using ItemLimit = std::variant<Unset, quint64, Max>;
 
diff --git a/src/base/QXmppPubSubSubAuthorization.cpp b/src/base/QXmppPubSubSubAuthorization.cpp
index d81acc73..9905e640 100644
--- a/src/base/QXmppPubSubSubAuthorization.cpp
+++ b/src/base/QXmppPubSubSubAuthorization.cpp
@@ -35,7 +35,7 @@ public:
 std::optional<QXmppPubSubSubAuthorization> QXmppPubSubSubAuthorization::fromDataForm(const QXmppDataForm &form)
 {
     if (auto parsed = QXmppPubSubSubAuthorization();
-            QXmppDataFormBase::fromDataForm(form, parsed)) {
+        QXmppDataFormBase::fromDataForm(form, parsed)) {
         return parsed;
     }
     return std::nullopt;
diff --git a/src/base/QXmppPubSubSubAuthorization.h b/src/base/QXmppPubSubSubAuthorization.h
index dad820a3..fdc23b3a 100644
--- a/src/base/QXmppPubSubSubAuthorization.h
+++ b/src/base/QXmppPubSubSubAuthorization.h
@@ -41,4 +41,4 @@ private:
     QSharedDataPointer<QXmppPubSubSubAuthorizationPrivate> d;
 };
 
-#endif // QXMPPPUBSUBSUBAUTHORIZATION_H
+#endif  // QXMPPPUBSUBSUBAUTHORIZATION_H
diff --git a/src/base/QXmppResultSet.cpp b/src/base/QXmppResultSet.cpp
index f3b6f75d..d0e0fa2a 100644
--- a/src/base/QXmppResultSet.cpp
+++ b/src/base/QXmppResultSet.cpp
@@ -65,7 +65,7 @@ QString QXmppResultSetQuery::before() const
 ///
 /// This is used for for paging backwards through results.
 
-void QXmppResultSetQuery::setBefore(const QString& before)
+void QXmppResultSetQuery::setBefore(const QString &before)
 {
     m_before = before;
 }
@@ -83,7 +83,7 @@ QString QXmppResultSetQuery::after() const
 ///
 /// This is used for for paging forwards through results.
 
-void QXmppResultSetQuery::setAfter(const QString& after)
+void QXmppResultSetQuery::setAfter(const QString &after)
 {
     m_after = after;
 }
@@ -96,7 +96,7 @@ bool QXmppResultSetQuery::isNull() const
 }
 
 /// \cond
-void QXmppResultSetQuery::parse(const QDomElement& element)
+void QXmppResultSetQuery::parse(const QDomElement &element)
 {
     QDomElement setElement = (element.tagName() == QStringLiteral("set")) ? element : element.firstChildElement(QStringLiteral("set"));
     if (setElement.namespaceURI() == ns_rsm) {
@@ -112,7 +112,7 @@ void QXmppResultSetQuery::parse(const QDomElement& element)
     }
 }
 
-void QXmppResultSetQuery::toXml(QXmlStreamWriter* writer) const
+void QXmppResultSetQuery::toXml(QXmlStreamWriter *writer) const
 {
     if (isNull())
         return;
@@ -144,7 +144,7 @@ QString QXmppResultSetReply::first() const
 
 /// Sets the UID of the first result in the page.
 
-void QXmppResultSetReply::setFirst(const QString& first)
+void QXmppResultSetReply::setFirst(const QString &first)
 {
     m_first = first;
 }
@@ -158,7 +158,7 @@ QString QXmppResultSetReply::last() const
 
 /// Sets the UID of the last result in the page.
 
-void QXmppResultSetReply::setLast(const QString& last)
+void QXmppResultSetReply::setLast(const QString &last)
 {
     m_last = last;
 }
@@ -211,7 +211,7 @@ bool QXmppResultSetReply::isNull() const
 }
 
 /// \cond
-void QXmppResultSetReply::parse(const QDomElement& element)
+void QXmppResultSetReply::parse(const QDomElement &element)
 {
     QDomElement setElement = (element.tagName() == "set") ? element : element.firstChildElement("set");
     if (setElement.namespaceURI() == ns_rsm) {
@@ -226,7 +226,7 @@ void QXmppResultSetReply::parse(const QDomElement& element)
     }
 }
 
-void QXmppResultSetReply::toXml(QXmlStreamWriter* writer) const
+void QXmppResultSetReply::toXml(QXmlStreamWriter *writer) const
 {
     if (isNull())
         return;
diff --git a/src/base/QXmppSendResult.h b/src/base/QXmppSendResult.h
index aa288438..eeb9bc9e 100644
--- a/src/base/QXmppSendResult.h
+++ b/src/base/QXmppSendResult.h
@@ -20,9 +20,9 @@ struct SendError
 {
     /// Describes the type of an error.
     enum Type : uint8_t {
-        SocketWriteError, ///< The packet was written to the socket with no success (only happens when Stream Management is disabled).
-        Disconnected,     ///< The packet couldn't be sent because the connection hasn't been (re)established.
-        EncryptionError,  ///< The packet couldn't be sent because prior encryption failed.
+        SocketWriteError,  ///< The packet was written to the socket with no success (only happens when Stream Management is disabled).
+        Disconnected,      ///< The packet couldn't be sent because the connection hasn't been (re)established.
+        EncryptionError,   ///< The packet couldn't be sent because prior encryption failed.
     };
 
     /// Text describing the error.
@@ -36,7 +36,7 @@ struct SendError
 ///
 /// \since QXmpp 1.5
 ///
-struct SendSuccess 
+struct SendSuccess
 {
     /// Indicates whether the packet has been acknowledged by the other peer.
     bool acknowledged = false;
@@ -49,4 +49,4 @@ using SendResult = std::variant<SendSuccess, SendError>;
 
 }
 
-#endif // QXMPPSENDRESULT_H
+#endif  // QXMPPSENDRESULT_H
diff --git a/src/base/QXmppStream.cpp b/src/base/QXmppStream.cpp
index 54319e54..25dea1b7 100644
--- a/src/base/QXmppStream.cpp
+++ b/src/base/QXmppStream.cpp
@@ -235,8 +235,7 @@ QFuture<QXmppStream::IqResult> QXmppStream::sendIq(QXmppPacket &&packet, const Q
     if (id.isEmpty() || d->runningIqs.contains(id)) {
         return makeReadyFuture<IqResult>(QXmpp::SendError {
             QStringLiteral("Invalid IQ id: empty or in use."),
-            SendError::Disconnected
-        });
+            SendError::Disconnected });
     }
 
     auto sendFuture = send(std::move(packet));
@@ -273,8 +272,7 @@ void QXmppStream::cancelOngoingIqs()
     for (auto &state : d->runningIqs) {
         state.reportResult(QXmpp::SendError {
             QStringLiteral("IQ has been cancelled."),
-            QXmpp::SendError::Disconnected
-        });
+            QXmpp::SendError::Disconnected });
         state.reportFinished();
     }
     d->runningIqs.clear();
diff --git a/src/base/QXmppStream.h b/src/base/QXmppStream.h
index d6180baa..aba73785 100644
--- a/src/base/QXmppStream.h
+++ b/src/base/QXmppStream.h
@@ -9,8 +9,8 @@
 #include "QXmppLogger.h"
 #include "QXmppSendResult.h"
 
-#include <variant>
 #include <memory>
+#include <variant>
 
 #include <QAbstractSocket>
 #include <QObject>
diff --git a/src/base/QXmppStreamManagement.cpp b/src/base/QXmppStreamManagement.cpp
index 47f77868..63c6e3fd 100644
--- a/src/base/QXmppStreamManagement.cpp
+++ b/src/base/QXmppStreamManagement.cpp
@@ -350,8 +350,7 @@ void QXmppStreamManager::handlePacketSent(QXmppPacket &packet, bool sentData)
         } else {
             packet.reportResult(QXmpp::SendError {
                 QStringLiteral("Couldn't write data to socket. No stream management enabled."),
-                QXmpp::SendError::SocketWriteError
-            });
+                QXmpp::SendError::SocketWriteError });
         }
         packet.reportFinished();
     }
diff --git a/src/base/QXmppStun.cpp b/src/base/QXmppStun.cpp
index fe766a33..dd031a93 100644
--- a/src/base/QXmppStun.cpp
+++ b/src/base/QXmppStun.cpp
@@ -1738,7 +1738,8 @@ QXmppIcePrivate::QXmppIcePrivate()
     tieBreaker = QXmppUtils::generateRandomBytes(8);
 }
 
-struct QXmppIceTransportDetails {
+struct QXmppIceTransportDetails
+{
     QXmppIceTransport *transport;
     QHostAddress stunHost;
     quint16 stunPort;
diff --git a/src/base/QXmppUtils.h b/src/base/QXmppUtils.h
index b5772c7a..455f3d96 100644
--- a/src/base/QXmppUtils.h
+++ b/src/base/QXmppUtils.h
@@ -25,28 +25,28 @@ class QXMPP_EXPORT QXmppUtils
 {
 public:
     // XEP-0082: XMPP Date and Time Profiles
-    static QDateTime datetimeFromString(const QString& str);
-    static QString datetimeToString(const QDateTime& dt);
-    static int timezoneOffsetFromString(const QString& str);
+    static QDateTime datetimeFromString(const QString &str);
+    static QString datetimeToString(const QDateTime &dt);
+    static int timezoneOffsetFromString(const QString &str);
     static QString timezoneOffsetToString(int secs);
 
-    static QString jidToDomain(const QString& jid);
-    static QString jidToResource(const QString& jid);
-    static QString jidToUser(const QString& jid);
-    static QString jidToBareJid(const QString& jid);
+    static QString jidToDomain(const QString &jid);
+    static QString jidToResource(const QString &jid);
+    static QString jidToUser(const QString &jid);
+    static QString jidToBareJid(const QString &jid);
 
-    static quint32 generateCrc32(const QByteArray& input);
-    static QByteArray generateHmacMd5(const QByteArray& key, const QByteArray& text);
-    static QByteArray generateHmacSha1(const QByteArray& key, const QByteArray& text);
+    static quint32 generateCrc32(const QByteArray &input);
+    static QByteArray generateHmacMd5(const QByteArray &key, const QByteArray &text);
+    static QByteArray generateHmacSha1(const QByteArray &key, const QByteArray &text);
     static int generateRandomInteger(int N);
     static QByteArray generateRandomBytes(int length);
     static QString generateStanzaUuid();
     static QString generateStanzaHash(int length = 36);
 };
 
-void helperToXmlAddAttribute(QXmlStreamWriter* stream, const QString& name,
-                             const QString& value);
-void helperToXmlAddTextElement(QXmlStreamWriter* stream, const QString& name,
-                               const QString& value);
+void helperToXmlAddAttribute(QXmlStreamWriter *stream, const QString &name,
+                             const QString &value);
+void helperToXmlAddTextElement(QXmlStreamWriter *stream, const QString &name,
+                               const QString &value);
 
 #endif  // QXMPPUTILS_H
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;
diff --git a/tests/IntegrationTesting.h b/tests/IntegrationTesting.h
index e8db182c..9733295e 100644
--- a/tests/IntegrationTesting.h
+++ b/tests/IntegrationTesting.h
@@ -5,21 +5,21 @@
 #ifndef INTEGRATIONTESTING_H
 #define INTEGRATIONTESTING_H
 
-#include <QtGlobal>
-#include <QDebug>
-
 #include "QXmppConfiguration.h"
 
+#include <QDebug>
+#include <QtGlobal>
+
 #define ENV_ENABLED "QXMPP_TESTS_INTEGRATION_ENABLED"
 #define ENV_JID "QXMPP_TESTS_JID"
 #define ENV_PASSWORD "QXMPP_TESTS_PASSWORD"
 
-#define SKIP_IF_INTEGRATION_TESTS_DISABLED() \
-    if (!IntegrationTests::enabled()) { \
+#define SKIP_IF_INTEGRATION_TESTS_DISABLED()                            \
+    if (!IntegrationTests::enabled()) {                                 \
         QSKIP("Export 'QXMPP_TESTS_INTEGRATION_ENABLED=1' to enable."); \
-    } else if (!IntegrationTests::credentialsAvailable()) { \
-        QFAIL("No credentials for integration tests provided! " \
-              "Export 'QXMPP_TESTS_JID' and 'QXMPP_TESTS_PASSWORD'."); \
+    } else if (!IntegrationTests::credentialsAvailable()) {             \
+        QFAIL("No credentials for integration tests provided! "         \
+              "Export 'QXMPP_TESTS_JID' and 'QXMPP_TESTS_PASSWORD'.");  \
     }
 
 class IntegrationTests
@@ -57,4 +57,4 @@ public:
 #undef ENV_JID
 #undef ENV_PASSWORD
 
-#endif // INTEGRATIONTESTING_H
+#endif  // INTEGRATIONTESTING_H
diff --git a/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp b/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp
index a4426ac6..81230d6c 100644
--- a/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp
+++ b/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp
@@ -15,15 +15,15 @@ class QXmppCarbonTestHelper : public QObject
     Q_OBJECT
 
 public slots:
-    void messageSent(const QXmppMessage& msg);
-    void messageReceived(const QXmppMessage& msg);
+    void messageSent(const QXmppMessage &msg);
+    void messageReceived(const QXmppMessage &msg);
 
 public:
     QXmppMessage m_expectedMessage;
     bool m_expectSent;
     bool m_signalTriggered;
 
-    void compareMessages(const QXmppMessage& lhs, const QXmppMessage& rhs);
+    void compareMessages(const QXmppMessage &lhs, const QXmppMessage &rhs);
 };
 
 class tst_QXmppCarbonManager : public QObject
@@ -215,7 +215,7 @@ void tst_QXmppCarbonManager::testHandleStanza()
     QCOMPARE(m_helper.m_signalTriggered, accept);
 }
 
-void QXmppCarbonTestHelper::messageSent(const QXmppMessage& msg)
+void QXmppCarbonTestHelper::messageSent(const QXmppMessage &msg)
 {
     m_signalTriggered = true;
     QCOMPARE(m_expectSent, true);
@@ -223,7 +223,7 @@ void QXmppCarbonTestHelper::messageSent(const QXmppMessage& msg)
     compareMessages(m_expectedMessage, msg);
 }
 
-void QXmppCarbonTestHelper::messageReceived(const QXmppMessage& msg)
+void QXmppCarbonTestHelper::messageReceived(const QXmppMessage &msg)
 {
     m_signalTriggered = true;
     QCOMPARE(m_expectSent, false);
@@ -231,7 +231,7 @@ void QXmppCarbonTestHelper::messageReceived(const QXmppMessage& msg)
     compareMessages(m_expectedMessage, msg);
 }
 
-void QXmppCarbonTestHelper::compareMessages(const QXmppMessage& lhs, const QXmppMessage& rhs)
+void QXmppCarbonTestHelper::compareMessages(const QXmppMessage &lhs, const QXmppMessage &rhs)
 {
     QCOMPARE(lhs.body(), rhs.body());
     QCOMPARE(lhs.from(), rhs.from());
diff --git a/tests/qxmppiceconnection/tst_qxmppiceconnection.cpp b/tests/qxmppiceconnection/tst_qxmppiceconnection.cpp
index f73b7b72..bfd03771 100644
--- a/tests/qxmppiceconnection/tst_qxmppiceconnection.cpp
+++ b/tests/qxmppiceconnection/tst_qxmppiceconnection.cpp
@@ -61,7 +61,7 @@ void tst_QXmppIceConnection::testBindStun()
     client.setIceControlling(true);
     QList<QPair<QHostAddress, quint16>> stunServers;
     for (auto &address : stunInfo.addresses()) {
-        stunServers.push_back({address, 19302});
+        stunServers.push_back({ address, 19302 });
     }
     client.setStunServers(stunServers);
     client.addComponent(componentId);
diff --git a/tests/qxmppmessagereceiptmanager/tst_qxmppmessagereceiptmanager.cpp b/tests/qxmppmessagereceiptmanager/tst_qxmppmessagereceiptmanager.cpp
index 54d45f7c..97ba48f4 100644
--- a/tests/qxmppmessagereceiptmanager/tst_qxmppmessagereceiptmanager.cpp
+++ b/tests/qxmppmessagereceiptmanager/tst_qxmppmessagereceiptmanager.cpp
@@ -18,19 +18,19 @@ private slots:
     void testReceipt_data();
     void testReceipt();
 
-    void handleMessageDelivered(const QString&, const QString&)
+    void handleMessageDelivered(const QString &, const QString &)
     {
         m_messageDelivered = true;
     }
-    void onLoggerMessage(QXmppLogger::MessageType type, const QString& text)
+    void onLoggerMessage(QXmppLogger::MessageType type, const QString &text)
     {
         m_receiptSent = true;
     }
 
 private:
-    QXmppMessageReceiptManager* m_manager;
+    QXmppMessageReceiptManager *m_manager;
     QXmppClient m_client;
-    QXmppLogger* m_logger;
+    QXmppLogger *m_logger;
     bool m_messageDelivered = false;
     bool m_receiptSent = false;
 };
diff --git a/tests/qxmpppubsubmanager/tst_qxmpppubsubmanager.cpp b/tests/qxmpppubsubmanager/tst_qxmpppubsubmanager.cpp
index 90893333..1f17d870 100644
--- a/tests/qxmpppubsubmanager/tst_qxmpppubsubmanager.cpp
+++ b/tests/qxmpppubsubmanager/tst_qxmpppubsubmanager.cpp
@@ -50,7 +50,7 @@ public:
 
 struct Client
 {
-    Client() {}
+    Client() { }
     Client(const QString &jid)
     {
         test.configuration().setJid(jid);
@@ -100,7 +100,7 @@ void tst_QXmppPubSubManager::testDiscoFeatures()
 {
     // so the coverage report is happy:
     PSManager manager;
-    QCOMPARE(manager.discoveryFeatures(), QStringList {"http://jabber.org/protocol/pubsub#rsm"});
+    QCOMPARE(manager.discoveryFeatures(), QStringList { "http://jabber.org/protocol/pubsub#rsm" });
 }
 
 void tst_QXmppPubSubManager::testFetchNodes()
@@ -904,71 +904,71 @@ void tst_QXmppPubSubManager::testEventNotifications_data()
     QTest::addColumn<bool>("accepted");
 
     QTest::addRow("default")
-            << QStringLiteral(
-                   "<message from='pubsub.shakespeare.lit' to='francisco@denmark.lit' id='foo'>"
-                   "<event xmlns='http://jabber.org/protocol/pubsub#event'>"
-                   "<items node='princely_musings'>"
-                   "<item id='ae890ac52d0df67ed7cfdf51b644e901'>"
-                   "<entry xmlns='http://www.w3.org/2005/Atom'>"
-                   "<title>Soliloquy</title>"
-                   "<summary>"
-                   "To be, or not to be: that is the question:"
-                   "Whether 'tis nobler in the mind to suffer"
-                   "The slings and arrows of outrageous fortune,"
-                   "Or to take arms against a sea of troubles,"
-                   "And by opposing end them?"
-                   "</summary>"
-                   "<link rel='alternate' type='text/html' href='http://denmark.lit/2003/12/13/atom03'/>"
-                   "<id>tag:denmark.lit,2003:entry-32397</id>"
-                   "<published>2003-12-13T18:30:02Z</published>"
-                   "<updated>2003-12-13T18:30:02Z</updated>"
-                   "</entry>"
-                   "</item>"
-                   "</items>"
-                   "</event>"
-                   "</message>")
-            << true;
+        << QStringLiteral(
+               "<message from='pubsub.shakespeare.lit' to='francisco@denmark.lit' id='foo'>"
+               "<event xmlns='http://jabber.org/protocol/pubsub#event'>"
+               "<items node='princely_musings'>"
+               "<item id='ae890ac52d0df67ed7cfdf51b644e901'>"
+               "<entry xmlns='http://www.w3.org/2005/Atom'>"
+               "<title>Soliloquy</title>"
+               "<summary>"
+               "To be, or not to be: that is the question:"
+               "Whether 'tis nobler in the mind to suffer"
+               "The slings and arrows of outrageous fortune,"
+               "Or to take arms against a sea of troubles,"
+               "And by opposing end them?"
+               "</summary>"
+               "<link rel='alternate' type='text/html' href='http://denmark.lit/2003/12/13/atom03'/>"
+               "<id>tag:denmark.lit,2003:entry-32397</id>"
+               "<published>2003-12-13T18:30:02Z</published>"
+               "<updated>2003-12-13T18:30:02Z</updated>"
+               "</entry>"
+               "</item>"
+               "</items>"
+               "</event>"
+               "</message>")
+        << true;
     QTest::addRow("additional-subelement")
-            << QStringLiteral(
-                   "<message from='pubsub.shakespeare.lit' to='francisco@denmark.lit' id='foo'>"
-                   "<always-store xmlns='hints2'/>"
-                   "<event xmlns='http://jabber.org/protocol/pubsub#event'>"
-                   "<items node='princely_musings'>"
-                   "<item id='ae890ac52d0df67ed7cfdf51b644e901'>"
-                   "<entry xmlns='http://www.w3.org/2005/Atom'>"
-                   "<title>Soliloquy</title>"
-                   "<summary>"
-                   "To be, or not to be: that is the question:"
-                   "Whether 'tis nobler in the mind to suffer"
-                   "The slings and arrows of outrageous fortune,"
-                   "Or to take arms against a sea of troubles,"
-                   "And by opposing end them?"
-                   "</summary>"
-                   "<link rel='alternate' type='text/html' href='http://denmark.lit/2003/12/13/atom03'/>"
-                   "<id>tag:denmark.lit,2003:entry-32397</id>"
-                   "<published>2003-12-13T18:30:02Z</published>"
-                   "<updated>2003-12-13T18:30:02Z</updated>"
-                   "</entry>"
-                   "</item>"
-                   "</items>"
-                   "</event>"
-                   "</message>")
-            << true;
+        << QStringLiteral(
+               "<message from='pubsub.shakespeare.lit' to='francisco@denmark.lit' id='foo'>"
+               "<always-store xmlns='hints2'/>"
+               "<event xmlns='http://jabber.org/protocol/pubsub#event'>"
+               "<items node='princely_musings'>"
+               "<item id='ae890ac52d0df67ed7cfdf51b644e901'>"
+               "<entry xmlns='http://www.w3.org/2005/Atom'>"
+               "<title>Soliloquy</title>"
+               "<summary>"
+               "To be, or not to be: that is the question:"
+               "Whether 'tis nobler in the mind to suffer"
+               "The slings and arrows of outrageous fortune,"
+               "Or to take arms against a sea of troubles,"
+               "And by opposing end them?"
+               "</summary>"
+               "<link rel='alternate' type='text/html' href='http://denmark.lit/2003/12/13/atom03'/>"
+               "<id>tag:denmark.lit,2003:entry-32397</id>"
+               "<published>2003-12-13T18:30:02Z</published>"
+               "<updated>2003-12-13T18:30:02Z</updated>"
+               "</entry>"
+               "</item>"
+               "</items>"
+               "</event>"
+               "</message>")
+        << true;
     QTest::addRow("wrong-event-namespace")
-            << QStringLiteral(
-                   "<message from='pubsub.shakespeare.lit' to='francisco@denmark.lit' id='foo'>"
-                   "<always-store xmlns='hints2'/>"
-                   "<event xmlns='pubsub2#event'>"
-                   "<items node='princely_musings'>"
-                   "<item id='ae890ac52d0df67ed7cfdf51b644e901'>"
-                   "<entry xmlns='http://www.w3.org/2005/Atom'>"
-                   "<title>Soliloquy</title>"
-                   "</entry>"
-                   "</item>"
-                   "</items>"
-                   "</event>"
-                   "</message>")
-            << false;
+        << QStringLiteral(
+               "<message from='pubsub.shakespeare.lit' to='francisco@denmark.lit' id='foo'>"
+               "<always-store xmlns='hints2'/>"
+               "<event xmlns='pubsub2#event'>"
+               "<items node='princely_musings'>"
+               "<item id='ae890ac52d0df67ed7cfdf51b644e901'>"
+               "<entry xmlns='http://www.w3.org/2005/Atom'>"
+               "<title>Soliloquy</title>"
+               "</entry>"
+               "</item>"
+               "</items>"
+               "</event>"
+               "</message>")
+        << false;
 }
 
 void tst_QXmppPubSubManager::testEventNotifications()
diff --git a/tests/qxmpppushenableiq/tst_qxmpppushenableiq.cpp b/tests/qxmpppushenableiq/tst_qxmpppushenableiq.cpp
index 4d561359..8cef930c 100644
--- a/tests/qxmpppushenableiq/tst_qxmpppushenableiq.cpp
+++ b/tests/qxmpppushenableiq/tst_qxmpppushenableiq.cpp
@@ -2,10 +2,11 @@
 //
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
-#include <QObject>
-#include "util.h"
-#include <QXmppPushEnableIq.h>
 #include <QXmppDataForm.h>
+#include <QXmppPushEnableIq.h>
+
+#include "util.h"
+#include <QObject>
 
 class tst_QXmppPushEnableIq : public QObject
 {
@@ -112,7 +113,7 @@ void tst_QXmppPushEnableIq::testDataForm()
 
     QXmppDataForm form;
     form.setType(QXmppDataForm::Submit);
-    form.setFields({field0, field1});
+    form.setFields({ field0, field1 });
 
     sIq.setDataForm(form);
 
diff --git a/tests/qxmpprosteriq/tst_qxmpprosteriq.cpp b/tests/qxmpprosteriq/tst_qxmpprosteriq.cpp
index 12a54712..728bd9ee 100644
--- a/tests/qxmpprosteriq/tst_qxmpprosteriq.cpp
+++ b/tests/qxmpprosteriq/tst_qxmpprosteriq.cpp
@@ -166,12 +166,11 @@ void tst_QXmppRosterIq::testMixAnnotate()
 {
     const QByteArray xml(
         "<iq from=\"juliet@example.com/balcony\" "
-            "type=\"get\">"
-            "<query xmlns=\"jabber:iq:roster\">"
-                "<annotate xmlns=\"urn:xmpp:mix:roster:0\"/>"
-            "</query>"
-        "</iq>"
-    );
+        "type=\"get\">"
+        "<query xmlns=\"jabber:iq:roster\">"
+        "<annotate xmlns=\"urn:xmpp:mix:roster:0\"/>"
+        "</query>"
+        "</iq>");
 
     QXmppRosterIq iq;
     parsePacket(iq, xml);
@@ -186,9 +185,8 @@ void tst_QXmppRosterIq::testMixChannel()
 {
     const QByteArray xml(
         "<item jid=\"balcony@example.net\">"
-            "<channel xmlns=\"urn:xmpp:mix:roster:0\" participant-id=\"123456\"/>"
-        "</item>"
-    );
+        "<channel xmlns=\"urn:xmpp:mix:roster:0\" participant-id=\"123456\"/>"
+        "</item>");
 
     QXmppRosterIq::Item item;
     parsePacket(item, xml);
diff --git a/tests/qxmppsceenvelope/tst_qxmppsceenvelope.cpp b/tests/qxmppsceenvelope/tst_qxmppsceenvelope.cpp
index 2909f052..a490a5c0 100644
--- a/tests/qxmppsceenvelope/tst_qxmppsceenvelope.cpp
+++ b/tests/qxmppsceenvelope/tst_qxmppsceenvelope.cpp
@@ -31,7 +31,7 @@ void tst_QXmppSceEnvelope::testReader()
     QXmppSceEnvelopeReader reader(dom);
     QCOMPARE(reader.from(), QStringLiteral("opportunity@mars.planet"));
     QCOMPARE(reader.to(), QStringLiteral("missioncontrol@houston.nasa.gov"));
-    QCOMPARE(reader.timestamp(), QDateTime({2004, 01, 25}, {05, 05, 00}, Qt::UTC));
+    QCOMPARE(reader.timestamp(), QDateTime({ 2004, 01, 25 }, { 05, 05, 00 }, Qt::UTC));
     QCOMPARE(reader.contentElement().firstChildElement().tagName(), QStringLiteral("body"));
 }
 
@@ -60,7 +60,7 @@ void tst_QXmppSceEnvelope::testWriter()
         writer.writeTextElement("url", "https://en.wikipedia.org/wiki/Fight_Club#Plot");
         writer.writeEndElement();
     });
-    envelope.writeTimestamp(QDateTime({2004, 01, 25}, {05, 05, 00}, Qt::UTC));
+    envelope.writeTimestamp(QDateTime({ 2004, 01, 25 }, { 05, 05, 00 }, Qt::UTC));
     envelope.writeTo("missioncontrol@houston.nasa.gov");
     envelope.writeFrom("opportunity@mars.planet");
     envelope.writeRpad("C1DHN9HK-9A25tSmwK4hU!Jji9%GKYK^syIlHJT9TnI4");
diff --git a/tests/qxmppserver/tst_qxmppserver.cpp b/tests/qxmppserver/tst_qxmppserver.cpp
index 34376f96..8715d205 100644
--- a/tests/qxmppserver/tst_qxmppserver.cpp
+++ b/tests/qxmppserver/tst_qxmppserver.cpp
@@ -56,7 +56,7 @@ void tst_QXmppServer::testConnect()
     const quint16 testPort = 12345;
 
     QXmppLogger logger;
-    //logger.setLoggingType(QXmppLogger::StdoutLogging);
+    // logger.setLoggingType(QXmppLogger::StdoutLogging);
 
     // prepare server
     TestPasswordChecker passwordChecker;
diff --git a/tests/qxmppstanza/tst_qxmppstanza.cpp b/tests/qxmppstanza/tst_qxmppstanza.cpp
index ac11b05a..cff33e43 100644
--- a/tests/qxmppstanza/tst_qxmppstanza.cpp
+++ b/tests/qxmppstanza/tst_qxmppstanza.cpp
@@ -71,19 +71,19 @@ void tst_QXmppStanza::testErrorCases_data()
     QTest::addColumn<QString>("by");
 
 #define ROW(name, xml, type, condition, text, redirect, by) \
-    QTest::newRow(QT_STRINGIFY(name)) \
-        << QByteArrayLiteral(xml) \
-        << QXmppStanza::Error::type \
-        << QXmppStanza::Error::condition \
-        << text \
-        << redirect \
+    QTest::newRow(QT_STRINGIFY(name))                       \
+        << QByteArrayLiteral(xml)                           \
+        << QXmppStanza::Error::type                         \
+        << QXmppStanza::Error::condition                    \
+        << text                                             \
+        << redirect                                         \
         << by
 
 #define BASIC(xml, type, condition) \
     ROW(condition, xml, type, condition, QString(), QString(), QString())
 
     ROW(
-        empty-text,
+        empty - text,
         "<error type=\"modify\">"
         "<bad-request xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"
         "</error>",
@@ -93,7 +93,7 @@ void tst_QXmppStanza::testErrorCases_data()
         QString(),
         QString());
     ROW(
-        redirection-uri-gone,
+        redirection - uri - gone,
         "<error by=\"example.net\" type=\"cancel\">"
         "<gone xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\">"
         "xmpp:romeo@afterlife.example.net"
@@ -105,7 +105,7 @@ void tst_QXmppStanza::testErrorCases_data()
         "xmpp:romeo@afterlife.example.net",
         "example.net");
     ROW(
-        redirection-uri-redirect,
+        redirection - uri - redirect,
         "<error type=\"cancel\">"
         "<redirect xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\">"
         "xmpp:rms@afterlife.example.net"
@@ -117,7 +117,7 @@ void tst_QXmppStanza::testErrorCases_data()
         "xmpp:rms@afterlife.example.net",
         QString());
     ROW(
-        redirection-uri-empty,
+        redirection - uri - empty,
         "<error type=\"cancel\">"
         "<redirect xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"
         "</error>",
@@ -127,7 +127,7 @@ void tst_QXmppStanza::testErrorCases_data()
         QString(),
         QString());
     ROW(
-        policy-violation-text,
+        policy - violation - text,
         "<error by=\"example.net\" type=\"modify\">"
         "<policy-violation xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"
         "<text xml:lang=\"en\" xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\">The used words are not allowed on this server.</text>"
@@ -138,7 +138,7 @@ void tst_QXmppStanza::testErrorCases_data()
         QString(),
         "example.net");
     ROW(
-        jid-malformed-with-by,
+        jid - malformed - with - by,
         "<error by=\"muc.example.com\" type=\"modify\">"
         "<jid-malformed xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"
         "</error>",
diff --git a/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp b/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp
index 117cd028..4440b1ae 100644
--- a/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp
+++ b/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp
@@ -70,7 +70,7 @@ void tst_QXmppTransferManager::testSendFile()
     const quint16 testPort = 12345;
 
     QXmppLogger logger;
-    //logger.setLoggingType(QXmppLogger::StdoutLogging);
+    // logger.setLoggingType(QXmppLogger::StdoutLogging);
 
     // prepare server
     TestPasswordChecker passwordChecker;
diff --git a/tests/qxmppuploadrequestmanager/tst_qxmppuploadrequestmanager.cpp b/tests/qxmppuploadrequestmanager/tst_qxmppuploadrequestmanager.cpp
index 86e4d8a6..9306f4da 100644
--- a/tests/qxmppuploadrequestmanager/tst_qxmppuploadrequestmanager.cpp
+++ b/tests/qxmppuploadrequestmanager/tst_qxmppuploadrequestmanager.cpp
@@ -23,8 +23,8 @@ public:
     ~TestHelper();
 
 public slots:
-    void onSlotReceived(const QXmppHttpUploadSlotIq& slot);
-    void onRequestFailed(const QXmppHttpUploadRequestIq& request);
+    void onSlotReceived(const QXmppHttpUploadSlotIq &slot);
+    void onRequestFailed(const QXmppHttpUploadRequestIq &request);
 
 private:
     bool expectedEvent;
@@ -47,13 +47,13 @@ TestHelper::~TestHelper()
     QCOMPARE(error, expectedError);
 }
 
-void TestHelper::onRequestFailed(const QXmppHttpUploadRequestIq& request)
+void TestHelper::onRequestFailed(const QXmppHttpUploadRequestIq &request)
 {
     event = true;
     error = true;
 }
 
-void TestHelper::onSlotReceived(const QXmppHttpUploadSlotIq& slot)
+void TestHelper::onSlotReceived(const QXmppHttpUploadSlotIq &slot)
 {
     event = true;
     error = false;
@@ -64,7 +64,7 @@ class tst_QXmppUploadRequestManager : public QObject
     Q_OBJECT
 
 protected slots:
-    void onLoggerMessage(QXmppLogger::MessageType type, const QString& text) const;
+    void onLoggerMessage(QXmppLogger::MessageType type, const QString &text) const;
 
 private slots:
     void initTestCase();
@@ -81,9 +81,9 @@ private slots:
     void testUploadService();
 
 private:
-    QXmppUploadRequestManager* manager;
+    QXmppUploadRequestManager *manager;
     QXmppClient client;
-    QXmppDiscoveryManager* discovery;
+    QXmppDiscoveryManager *discovery;
     QString uploadServiceName;
     qint64 maxFileSize;
 
@@ -92,7 +92,7 @@ private:
     qint64 lastFileSize;
 };
 
-void tst_QXmppUploadRequestManager::onLoggerMessage(QXmppLogger::MessageType type, const QString& text) const
+void tst_QXmppUploadRequestManager::onLoggerMessage(QXmppLogger::MessageType type, const QString &text) const
 {
     QCOMPARE(type, QXmppLogger::SentMessage);
 
@@ -293,7 +293,7 @@ void tst_QXmppUploadRequestManager::testSending()
     QFETCH(qint64, fileSize);
     QFETCH(QString, fileType);
 
-    QXmppLogger* logger = new QXmppLogger();
+    QXmppLogger *logger = new QXmppLogger();
     logger->setLoggingType(QXmppLogger::SignalLogging);
     client.setLogger(logger);
 
diff --git a/tests/qxmppvcardmanager/tst_qxmppvcardmanager.cpp b/tests/qxmppvcardmanager/tst_qxmppvcardmanager.cpp
index 369be5fa..c49e9808 100644
--- a/tests/qxmppvcardmanager/tst_qxmppvcardmanager.cpp
+++ b/tests/qxmppvcardmanager/tst_qxmppvcardmanager.cpp
@@ -48,9 +48,9 @@ void tst_QXmppVCardManager::testHandleStanza_data()
     auto iqFromFull = iq;
     iqFromFull.setFrom("stpeter@jabber.org/roundabout");
 
-    ROW(client-vcard-from-empty, iq, true);
-    ROW(client-vcard-from-bare, iqFromBare, true);
-    ROW(client-vcard-from-full, iqFromFull, false);
+    ROW(client - vcard - from - empty, iq, true);
+    ROW(client - vcard - from - bare, iqFromBare, true);
+    ROW(client - vcard - from - full, iqFromFull, false);
 
 #undef ROW
 }
diff --git a/tests/util.h b/tests/util.h
index 830f56dd..cfad6e1d 100644
--- a/tests/util.h
+++ b/tests/util.h
@@ -42,7 +42,7 @@ static QByteArray packetToXml(const T &packet)
 template<class T>
 static void parsePacket(T &packet, const QByteArray &xml)
 {
-    //qDebug() << "parsing" << xml;
+    // qDebug() << "parsing" << xml;
     packet.parse(xmlToDom(xml));
 }