Run clang-format also on all cpp files

41 files changed, 992 insertions, 1282 deletions

diff --git a/src/base/QXmppArchiveIq.cpp b/src/base/QXmppArchiveIq.cpp
index 9f919c1d..290a3ef0 100644
--- a/src/base/QXmppArchiveIq.cpp
+++ b/src/base/QXmppArchiveIq.cpp
@@ -97,10 +97,8 @@ void QXmppArchiveChat::parse(const QDomElement &element)
     QDateTime timeAccu = m_start;
 
     QDomElement child = element.firstChildElement();
-    while (!child.isNull())
-    {
-        if ((child.tagName() == "from") || (child.tagName() == "to"))
-        {
+    while (!child.isNull()) {
+        if ((child.tagName() == "from") || (child.tagName() == "to")) {
             QXmppArchiveMessage message;
             message.setBody(child.firstChildElement("body").text());
             timeAccu = timeAccu.addSecs(child.attribute("secs").toInt());
@@ -250,7 +248,7 @@ QXmppResultSetReply QXmppArchiveChatIq::resultSetReply() const
 ///
 /// This is used for paging through messages.
 
-void QXmppArchiveChatIq::setResultSetReply(const QXmppResultSetReply& rsm)
+void QXmppArchiveChatIq::setResultSetReply(const QXmppResultSetReply &rsm)
 {
     m_rsmReply = rsm;
 }
@@ -361,7 +359,7 @@ QXmppResultSetQuery QXmppArchiveListIq::resultSetQuery() const
 ///
 /// This is used for paging through conversations.
 
-void QXmppArchiveListIq::setResultSetQuery(const QXmppResultSetQuery& rsm)
+void QXmppArchiveListIq::setResultSetQuery(const QXmppResultSetQuery &rsm)
 {
     m_rsmQuery = rsm;
 }
@@ -379,7 +377,7 @@ QXmppResultSetReply QXmppArchiveListIq::resultSetReply() const
 ///
 /// This is used for paging through conversations.
 
-void QXmppArchiveListIq::setResultSetReply(const QXmppResultSetReply& rsm)
+void QXmppArchiveListIq::setResultSetReply(const QXmppResultSetReply &rsm)
 {
     m_rsmReply = rsm;
 }
@@ -402,10 +400,8 @@ void QXmppArchiveListIq::parseElementFromChild(const QDomElement &element)
     m_rsmReply.parse(listElement);
 
     QDomElement child = listElement.firstChildElement();
-    while (!child.isNull())
-    {
-        if (child.tagName() == "chat")
-        {
+    while (!child.isNull()) {
+        if (child.tagName() == "chat") {
             QXmppArchiveChat chat;
             chat.parse(child);
             m_chats << chat;
@@ -585,7 +581,7 @@ QXmppResultSetQuery QXmppArchiveRetrieveIq::resultSetQuery() const
 ///
 /// This is used for paging through messages.
 
-void QXmppArchiveRetrieveIq::setResultSetQuery(const QXmppResultSetQuery& rsm)
+void QXmppArchiveRetrieveIq::setResultSetQuery(const QXmppResultSetQuery &rsm)
 {
     m_rsmQuery = rsm;
 }
diff --git a/src/base/QXmppBindIq.cpp b/src/base/QXmppBindIq.cpp
index 3eb6d908..0089b860 100644
--- a/src/base/QXmppBindIq.cpp
+++ b/src/base/QXmppBindIq.cpp
@@ -43,7 +43,7 @@ QString QXmppBindIq::jid() const
 ///
 /// \param jid
 
-void QXmppBindIq::setJid(const QString& jid)
+void QXmppBindIq::setJid(const QString &jid)
 {
     m_jid = jid;
 }
@@ -60,7 +60,7 @@ QString QXmppBindIq::resource() const
 ///
 /// \param resource
 
-void QXmppBindIq::setResource(const QString& resource)
+void QXmppBindIq::setResource(const QString &resource)
 {
     m_resource = resource;
 }
diff --git a/src/base/QXmppBitsOfBinaryContentId.cpp b/src/base/QXmppBitsOfBinaryContentId.cpp
index 21968a22..24f9cbcd 100644
--- a/src/base/QXmppBitsOfBinaryContentId.cpp
+++ b/src/base/QXmppBitsOfBinaryContentId.cpp
@@ -34,18 +34,18 @@
 #define CONTENTID_HASH_SEPARATOR QStringLiteral("+")
 
 static const QMap<QCryptographicHash::Algorithm, QString> HASH_ALGORITHMS = {
-    {QCryptographicHash::Sha1, QStringLiteral("sha1")},
+    { QCryptographicHash::Sha1, QStringLiteral("sha1") },
 #ifndef QT_CRYPTOGRAPHICHASH_ONLY_SHA1
-    {QCryptographicHash::Md4, QStringLiteral("md4")},
-    {QCryptographicHash::Md5, QStringLiteral("md5")},
-    {QCryptographicHash::Sha224, QStringLiteral("sha224")},
-    {QCryptographicHash::Sha256, QStringLiteral("sha256")},
-    {QCryptographicHash::Sha384, QStringLiteral("sha384")},
-    {QCryptographicHash::Sha512, QStringLiteral("sha512")},
-    {QCryptographicHash::Sha3_224, QStringLiteral("sha3-224")},
-    {QCryptographicHash::Sha3_256, QStringLiteral("sha3-256")},
-    {QCryptographicHash::Sha3_384, QStringLiteral("sha3-384")},
-    {QCryptographicHash::Sha3_512, QStringLiteral("sha3-512")},
+    { QCryptographicHash::Md4, QStringLiteral("md4") },
+    { QCryptographicHash::Md5, QStringLiteral("md5") },
+    { QCryptographicHash::Sha224, QStringLiteral("sha224") },
+    { QCryptographicHash::Sha256, QStringLiteral("sha256") },
+    { QCryptographicHash::Sha384, QStringLiteral("sha384") },
+    { QCryptographicHash::Sha512, QStringLiteral("sha512") },
+    { QCryptographicHash::Sha3_224, QStringLiteral("sha3-224") },
+    { QCryptographicHash::Sha3_256, QStringLiteral("sha3-256") },
+    { QCryptographicHash::Sha3_384, QStringLiteral("sha3-384") },
+    { QCryptographicHash::Sha3_512, QStringLiteral("sha3-512") },
 #endif
 };
 
@@ -205,7 +205,7 @@ void QXmppBitsOfBinaryContentId::setAlgorithm(QCryptographicHash::Algorithm algo
 /// later.
 ///
 /// \returns True, if the set hashing algorithm is supported, a hash value is
-/// set and its length is correct, false otherwise. 
+/// set and its length is correct, false otherwise.
 
 bool QXmppBitsOfBinaryContentId::isValid() const
 {
diff --git a/src/base/QXmppBitsOfBinaryData.cpp b/src/base/QXmppBitsOfBinaryData.cpp
index 89c83cf6..dd69a763 100644
--- a/src/base/QXmppBitsOfBinaryData.cpp
+++ b/src/base/QXmppBitsOfBinaryData.cpp
@@ -161,8 +161,7 @@ void QXmppBitsOfBinaryData::toXmlElementFromChild(QXmlStreamWriter *writer) cons
 bool QXmppBitsOfBinaryData::operator==(const QXmppBitsOfBinaryData &other) const
 {
     return d->cid == other.cid() &&
-           d->maxAge == other.maxAge() &&
-           d->contentType == other.contentType() &&
-           d->data == other.data();
+        d->maxAge == other.maxAge() &&
+        d->contentType == other.contentType() &&
+        d->data == other.data();
 }
-
diff --git a/src/base/QXmppBookmarkSet.cpp b/src/base/QXmppBookmarkSet.cpp
index d4fd4daf..e32f2eb8 100644
--- a/src/base/QXmppBookmarkSet.cpp
+++ b/src/base/QXmppBookmarkSet.cpp
@@ -179,25 +179,21 @@ void QXmppBookmarkSet::setUrls(const QList<QXmppBookmarkUrl> &urls)
 bool QXmppBookmarkSet::isBookmarkSet(const QDomElement &element)
 {
     return element.tagName() == "storage" &&
-           element.namespaceURI() == ns_bookmarks;
+        element.namespaceURI() == ns_bookmarks;
 }
 
 void QXmppBookmarkSet::parse(const QDomElement &element)
 {
     QDomElement childElement = element.firstChildElement();
-    while (!childElement.isNull())
-    {
-        if (childElement.tagName() == "conference")
-        {
+    while (!childElement.isNull()) {
+        if (childElement.tagName() == "conference") {
             QXmppBookmarkConference conference;
             conference.setAutoJoin(childElement.attribute("autojoin") == "true" || childElement.attribute("autojoin") == "1");
             conference.setJid(childElement.attribute("jid"));
             conference.setName(childElement.attribute("name"));
             conference.setNickName(childElement.firstChildElement("nick").text());
             m_conferences << conference;
-        }
-        else if (childElement.tagName() == "url")
-        {
+        } else if (childElement.tagName() == "url") {
             QXmppBookmarkUrl url;
             url.setName(childElement.attribute("name"));
             url.setUrl(childElement.attribute("url"));
diff --git a/src/base/QXmppByteStreamIq.cpp b/src/base/QXmppByteStreamIq.cpp
index 2a8d3d8c..378364ff 100644
--- a/src/base/QXmppByteStreamIq.cpp
+++ b/src/base/QXmppByteStreamIq.cpp
@@ -63,7 +63,7 @@ QString QXmppByteStreamIq::StreamHost::zeroconf() const
     return m_zeroconf;
 }
 
-void  QXmppByteStreamIq::StreamHost::setZeroconf(const QString &zeroconf)
+void QXmppByteStreamIq::StreamHost::setZeroconf(const QString &zeroconf)
 {
     m_zeroconf = zeroconf;
 }
@@ -137,8 +137,7 @@ void QXmppByteStreamIq::parseElementFromChild(const QDomElement &element)
         m_mode = None;
 
     QDomElement hostElement = queryElement.firstChildElement("streamhost");
-    while (!hostElement.isNull())
-    {
+    while (!hostElement.isNull()) {
         StreamHost streamHost;
         streamHost.setHost(hostElement.attribute("host"));
         streamHost.setJid(hostElement.attribute("jid"));
@@ -173,8 +172,7 @@ void QXmppByteStreamIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
     }
     if (!m_activate.isEmpty())
         helperToXmlAddTextElement(writer, "activate", m_activate);
-    if (!m_streamHostUsed.isEmpty())
-    {
+    if (!m_streamHostUsed.isEmpty()) {
         writer->writeStartElement("streamhost-used");
         helperToXmlAddAttribute(writer, "jid", m_streamHostUsed);
         writer->writeEndElement();
diff --git a/src/base/QXmppCodec.cpp b/src/base/QXmppCodec.cpp
index 0a4cfb73..d6396bee 100644
--- a/src/base/QXmppCodec.cpp
+++ b/src/base/QXmppCodec.cpp
@@ -51,20 +51,20 @@
 
 #ifdef QXMPP_USE_VPX
 #define VPX_CODEC_DISABLE_COMPAT 1
-#include <vpx/vpx_decoder.h>
-#include <vpx/vpx_encoder.h>
 #include <vpx/vp8cx.h>
 #include <vpx/vp8dx.h>
+#include <vpx/vpx_decoder.h>
+#include <vpx/vpx_encoder.h>
 #endif
 
-#define BIAS        (0x84)  /* Bias for linear code. */
-#define CLIP        8159
+#define BIAS (0x84) /* Bias for linear code. */
+#define CLIP 8159
 
-#define SIGN_BIT    (0x80)  /* Sign bit for a A-law byte. */
-#define QUANT_MASK  (0xf)   /* Quantization field mask. */
-#define NSEGS       (8)     /* Number of A-law segments. */
-#define SEG_SHIFT   (4)     /* Left shift for segment number. */
-#define SEG_MASK    (0x70)  /* Segment field mask. */
+#define SIGN_BIT (0x80)  /* Sign bit for a A-law byte. */
+#define QUANT_MASK (0xf) /* Quantization field mask. */
+#define NSEGS (8)        /* Number of A-law segments. */
+#define SEG_SHIFT (4)    /* Left shift for segment number. */
+#define SEG_MASK (0x70)  /* Segment field mask. */
 
 // Distance (in frames) between two key frames (video only).
 #define GOPSIZE 32
@@ -76,20 +76,20 @@ enum FragmentType {
     EndFragment
 };
 
-static qint16 seg_aend[8] = {0x1F, 0x3F, 0x7F, 0xFF,
-                0x1FF, 0x3FF, 0x7FF, 0xFFF};
-static qint16 seg_uend[8] = {0x3F, 0x7F, 0xFF, 0x1FF,
-                0x3FF, 0x7FF, 0xFFF, 0x1FFF};
+static qint16 seg_aend[8] = { 0x1F, 0x3F, 0x7F, 0xFF,
+                              0x1FF, 0x3FF, 0x7FF, 0xFFF };
+static qint16 seg_uend[8] = { 0x3F, 0x7F, 0xFF, 0x1FF,
+                              0x3FF, 0x7FF, 0xFFF, 0x1FFF };
 
 static qint16 search(qint16 val, qint16 *table, qint16 size)
 {
-   qint16 i;
+    qint16 i;
 
-   for (i = 0; i < size; i++) {
-      if (val <= *table++)
-     return (i);
-   }
-   return (size);
+    for (i = 0; i < size; i++) {
+        if (val <= *table++)
+            return (i);
+    }
+    return (size);
 }
 
 /*
@@ -113,34 +113,34 @@ static qint16 search(qint16 val, qint16 *table, qint16 size)
  */
 static quint8 linear2alaw(qint16 pcm_val)
 {
-   qint16 mask;
-   qint16 seg;
-   quint8 aval;
-
-   pcm_val = pcm_val >> 3;
-
-   if (pcm_val >= 0) {
-      mask = 0xD5;      /* sign (7th) bit = 1 */
-   } else {
-      mask = 0x55;      /* sign bit = 0 */
-      pcm_val = -pcm_val - 1;
-   }
-
-   /* Convert the scaled magnitude to segment number. */
-   seg = search(pcm_val, seg_aend, 8);
-
-   /* Combine the sign, segment, and quantization bits. */
-
-   if (seg >= 8)        /* out of range, return maximum value. */
-      return (quint8) (0x7F ^ mask);
-   else {
-      aval = (quint8) seg << SEG_SHIFT;
-      if (seg < 2)
-     aval |= (pcm_val >> 1) & QUANT_MASK;
-      else
-     aval |= (pcm_val >> seg) & QUANT_MASK;
-      return (aval ^ mask);
-   }
+    qint16 mask;
+    qint16 seg;
+    quint8 aval;
+
+    pcm_val = pcm_val >> 3;
+
+    if (pcm_val >= 0) {
+        mask = 0xD5; /* sign (7th) bit = 1 */
+    } else {
+        mask = 0x55; /* sign bit = 0 */
+        pcm_val = -pcm_val - 1;
+    }
+
+    /* Convert the scaled magnitude to segment number. */
+    seg = search(pcm_val, seg_aend, 8);
+
+    /* Combine the sign, segment, and quantization bits. */
+
+    if (seg >= 8) /* out of range, return maximum value. */
+        return (quint8)(0x7F ^ mask);
+    else {
+        aval = (quint8)seg << SEG_SHIFT;
+        if (seg < 2)
+            aval |= (pcm_val >> 1) & QUANT_MASK;
+        else
+            aval |= (pcm_val >> seg) & QUANT_MASK;
+        return (aval ^ mask);
+    }
 }
 
 /*
@@ -149,25 +149,25 @@ static quint8 linear2alaw(qint16 pcm_val)
  */
 static qint16 alaw2linear(quint8 a_val)
 {
-   qint16 t;
-   qint16 seg;
-
-   a_val ^= 0x55;
-
-   t = (a_val & QUANT_MASK) << 4;
-   seg = ((qint16)a_val & SEG_MASK) >> SEG_SHIFT;
-   switch (seg) {
-   case 0:
-      t += 8;
-      break;
-   case 1:
-      t += 0x108;
-      break;
-   default:
-      t += 0x108;
-      t <<= seg - 1;
-   }
-   return ((a_val & SIGN_BIT) ? t : -t);
+    qint16 t;
+    qint16 seg;
+
+    a_val ^= 0x55;
+
+    t = (a_val & QUANT_MASK) << 4;
+    seg = ((qint16)a_val & SEG_MASK) >> SEG_SHIFT;
+    switch (seg) {
+    case 0:
+        t += 8;
+        break;
+    case 1:
+        t += 0x108;
+        break;
+    default:
+        t += 0x108;
+        t <<= seg - 1;
+    }
+    return ((a_val & SIGN_BIT) ? t : -t);
 }
 
 /*
@@ -201,34 +201,35 @@ static qint16 alaw2linear(quint8 a_val)
  */
 static quint8 linear2ulaw(qint16 pcm_val)
 {
-   qint16 mask;
-   qint16 seg;
-   quint8 uval;
-
-   /* Get the sign and the magnitude of the value. */
-   pcm_val = pcm_val >> 2;
-   if (pcm_val < 0) {
-      pcm_val = -pcm_val;
-      mask = 0x7F;
-   } else {
-      mask = 0xFF;
-   }
-   if (pcm_val > CLIP) pcm_val = CLIP;        /* clip the magnitude */
-   pcm_val += (BIAS >> 2);
-
-   /* Convert the scaled magnitude to segment number. */
-   seg = search(pcm_val, seg_uend, 8);
-
-   /*
+    qint16 mask;
+    qint16 seg;
+    quint8 uval;
+
+    /* Get the sign and the magnitude of the value. */
+    pcm_val = pcm_val >> 2;
+    if (pcm_val < 0) {
+        pcm_val = -pcm_val;
+        mask = 0x7F;
+    } else {
+        mask = 0xFF;
+    }
+    if (pcm_val > CLIP)
+        pcm_val = CLIP; /* clip the magnitude */
+    pcm_val += (BIAS >> 2);
+
+    /* Convert the scaled magnitude to segment number. */
+    seg = search(pcm_val, seg_uend, 8);
+
+    /*
    * Combine the sign, segment, quantization bits;
    * and complement the code word.
    */
-   if (seg >= 8)        /* out of range, return maximum value. */
-      return (quint8) (0x7F ^ mask);
-   else {
-      uval = (quint8) (seg << 4) | ((pcm_val >> (seg + 1)) & 0xF);
-      return (uval ^ mask);
-   }
+    if (seg >= 8) /* out of range, return maximum value. */
+        return (quint8)(0x7F ^ mask);
+    else {
+        uval = (quint8)(seg << 4) | ((pcm_val >> (seg + 1)) & 0xF);
+        return (uval ^ mask);
+    }
 }
 
 /*
@@ -242,19 +243,19 @@ static quint8 linear2ulaw(qint16 pcm_val)
  */
 static qint16 ulaw2linear(quint8 u_val)
 {
-   qint16 t;
+    qint16 t;
 
-   /* Complement to obtain normal u-law value. */
-   u_val = ~u_val;
+    /* Complement to obtain normal u-law value. */
+    u_val = ~u_val;
 
-   /*
+    /*
     * Extract and bias the quantization bits. Then
     * shift up by the segment number and subtract out the bias.
     */
-   t = ((u_val & QUANT_MASK) << 3) + BIAS;
-   t <<= ((unsigned)u_val & SEG_MASK) >> SEG_SHIFT;
+    t = ((u_val & QUANT_MASK) << 3) + BIAS;
+    t <<= ((unsigned)u_val & SEG_MASK) >> SEG_SHIFT;
 
-   return ((u_val & SIGN_BIT) ? (BIAS - t) : (t - BIAS));
+    return ((u_val & SIGN_BIT) ? (BIAS - t) : (t - BIAS));
 }
 
 QXmppCodec::~QXmppCodec()
@@ -278,8 +279,7 @@ qint64 QXmppG711aCodec::encode(QDataStream &input, QDataStream &output)
 {
     qint64 samples = 0;
     qint16 pcm;
-    while (!input.atEnd())
-    {
+    while (!input.atEnd()) {
         input >> pcm;
         output << linear2alaw(pcm);
         ++samples;
@@ -291,8 +291,7 @@ qint64 QXmppG711aCodec::decode(QDataStream &input, QDataStream &output)
 {
     qint64 samples = 0;
     quint8 g711;
-    while (!input.atEnd())
-    {
+    while (!input.atEnd()) {
         input >> g711;
         output << alaw2linear(g711);
         ++samples;
@@ -309,8 +308,7 @@ qint64 QXmppG711uCodec::encode(QDataStream &input, QDataStream &output)
 {
     qint64 samples = 0;
     qint16 pcm;
-    while (!input.atEnd())
-    {
+    while (!input.atEnd()) {
         input >> pcm;
         output << linear2ulaw(pcm);
         ++samples;
@@ -322,8 +320,7 @@ qint64 QXmppG711uCodec::decode(QDataStream &input, QDataStream &output)
 {
     qint64 samples = 0;
     quint8 g711;
-    while (!input.atEnd())
-    {
+    while (!input.atEnd()) {
         input >> g711;
         output << ulaw2linear(g711);
         ++samples;
@@ -368,13 +365,12 @@ qint64 QXmppSpeexCodec::encode(QDataStream &input, QDataStream &output)
 {
     QByteArray pcm_buffer(frame_samples * 2, 0);
     const int length = input.readRawData(pcm_buffer.data(), pcm_buffer.size());
-    if (length != pcm_buffer.size())
-    {
+    if (length != pcm_buffer.size()) {
         qWarning() << "Read only read" << length << "bytes";
         return 0;
     }
     speex_bits_reset(encoder_bits);
-    speex_encode_int(encoder_state, (short*)pcm_buffer.data(), encoder_bits);
+    speex_encode_int(encoder_state, (short *)pcm_buffer.data(), encoder_bits);
     QByteArray speex_buffer(speex_bits_nbytes(encoder_bits), 0);
     speex_bits_write(encoder_bits, speex_buffer.data(), speex_buffer.size());
     output.writeRawData(speex_buffer.data(), speex_buffer.size());
@@ -388,7 +384,7 @@ qint64 QXmppSpeexCodec::decode(QDataStream &input, QDataStream &output)
     input.readRawData(speex_buffer.data(), speex_buffer.size());
     speex_bits_read_from(decoder_bits, speex_buffer.data(), speex_buffer.size());
     QByteArray pcm_buffer(frame_samples * 2, 0);
-    speex_decode_int(decoder_state, decoder_bits, (short*)pcm_buffer.data());
+    speex_decode_int(decoder_state, decoder_bits, (short *)pcm_buffer.data());
     output.writeRawData(pcm_buffer.data(), pcm_buffer.size());
     return frame_samples;
 }
@@ -396,9 +392,8 @@ qint64 QXmppSpeexCodec::decode(QDataStream &input, QDataStream &output)
 #endif
 
 #ifdef QXMPP_USE_OPUS
-QXmppOpusCodec::QXmppOpusCodec(int clockrate, int channels):
-    sampleRate(clockrate),
-    nChannels(channels)
+QXmppOpusCodec::QXmppOpusCodec(int clockrate, int channels) : sampleRate(clockrate),
+                                                              nChannels(channels)
 {
     int error;
     encoder = opus_encoder_create(clockrate, channels, OPUS_APPLICATION_VOIP, &error);
@@ -411,8 +406,7 @@ QXmppOpusCodec::QXmppOpusCodec(int clockrate, int channels):
 #ifdef OPUS_SET_PREDICTION_DISABLED
         opus_encoder_ctl(encoder, OPUS_SET_PREDICTION_DISABLED(1));
 #endif
-    }
-    else
+    } else
         qCritical() << "Opus encoder initialization error:" << opus_strerror(error);
 
     // Here, clockrate is synonym of sampleRate.
@@ -470,9 +464,9 @@ qint64 QXmppOpusCodec::encode(QDataStream &input, QDataStream &output)
     QByteArray opus_buffer(sampleBuffer.size(), 0);
 
     length = opus_encode(encoder,
-                         (opus_int16 *) sampleBuffer.constData(),
+                         (opus_int16 *)sampleBuffer.constData(),
                          samples,
-                         (uchar *) opus_buffer.data(),
+                         (uchar *)opus_buffer.data(),
                          opus_buffer.size());
 
     if (length < 1)
@@ -504,9 +498,9 @@ qint64 QXmppOpusCodec::decode(QDataStream &input, QDataStream &output)
     // The last argumment must be 1 to enable FEC, but I don't why it results
     // in a SIGSEV.
     int samples = opus_decode(decoder,
-                              (uchar *) opus_buffer.constData(),
+                              (uchar *)opus_buffer.constData(),
                               length,
-                              (opus_int16 *) pcm_buffer.data(),
+                              (opus_int16 *)pcm_buffer.data(),
                               pcm_buffer.size(),
                               0);
 
@@ -561,7 +555,7 @@ bool QXmppTheoraDecoderPrivate::decodeFrame(const QByteArray &buffer, QXmppVideo
         return false;
 
     ogg_packet packet;
-    packet.packet = (unsigned char*) buffer.data();
+    packet.packet = (unsigned char *)buffer.data();
     packet.bytes = buffer.size();
     packet.b_o_s = 1;
     packet.e_o_s = 0;
@@ -580,14 +574,12 @@ bool QXmppTheoraDecoderPrivate::decodeFrame(const QByteArray &buffer, QXmppVideo
 
     if (info.pixel_fmt == TH_PF_420) {
         if (!frame->isValid()) {
-            const int bytes = ycbcr_buffer[0].stride * ycbcr_buffer[0].height
-                            + ycbcr_buffer[1].stride * ycbcr_buffer[1].height
-                            + ycbcr_buffer[2].stride * ycbcr_buffer[2].height;
+            const int bytes = ycbcr_buffer[0].stride * ycbcr_buffer[0].height + ycbcr_buffer[1].stride * ycbcr_buffer[1].height + ycbcr_buffer[2].stride * ycbcr_buffer[2].height;
 
             *frame = QXmppVideoFrame(bytes,
-                QSize(ycbcr_buffer[0].width, ycbcr_buffer[0].height),
-                ycbcr_buffer[0].stride,
-                QXmppVideoFrame::Format_YUV420P);
+                                     QSize(ycbcr_buffer[0].width, ycbcr_buffer[0].height),
+                                     ycbcr_buffer[0].stride,
+                                     QXmppVideoFrame::Format_YUV420P);
         }
         uchar *output = frame->bits();
         for (int i = 0; i < 3; ++i) {
@@ -601,9 +593,9 @@ bool QXmppTheoraDecoderPrivate::decodeFrame(const QByteArray &buffer, QXmppVideo
             const int bytes = ycbcr_buffer[0].width * ycbcr_buffer[0].height * 2;
 
             *frame = QXmppVideoFrame(bytes,
-                QSize(ycbcr_buffer[0].width, ycbcr_buffer[0].height),
-                ycbcr_buffer[0].width * 2,
-                QXmppVideoFrame::Format_YUYV);
+                                     QSize(ycbcr_buffer[0].width, ycbcr_buffer[0].height),
+                                     ycbcr_buffer[0].width * 2,
+                                     QXmppVideoFrame::Format_YUYV);
         }
 
         // YUV 4:2:2 packing
@@ -808,7 +800,7 @@ bool QXmppTheoraDecoder::setParameters(const QMap<QString, QString> &parameters)
                 return false;
             }
 
-            packet.packet = (unsigned char*) (config.data() + device->pos());
+            packet.packet = (unsigned char *)(config.data() + device->pos());
             packet.bytes = h_size;
             int ret = th_decode_headerin(&d->info, &d->comment, &d->setup_info, &packet);
             if (ret < 0) {
@@ -828,13 +820,13 @@ bool QXmppTheoraDecoder::setParameters(const QMap<QString, QString> &parameters)
 
 #ifdef QXMPP_DEBUG_THEORA
     qDebug("Theora frame_width %i, frame_height %i, colorspace %i, pixel_fmt: %i, target_bitrate: %i, quality: %i, keyframe_granule_shift: %i",
-        d->info.frame_width,
-        d->info.frame_height,
-        d->info.colorspace,
-        d->info.pixel_fmt,
-        d->info.target_bitrate,
-        d->info.quality,
-        d->info.keyframe_granule_shift);
+           d->info.frame_width,
+           d->info.frame_height,
+           d->info.colorspace,
+           d->info.pixel_fmt,
+           d->info.target_bitrate,
+           d->info.quality,
+           d->info.keyframe_granule_shift);
 #endif
     if (d->info.pixel_fmt != TH_PF_420 && d->info.pixel_fmt != TH_PF_422) {
         qWarning("Theora frames have an unsupported pixel format %d", d->info.pixel_fmt);
@@ -869,7 +861,7 @@ public:
 void QXmppTheoraEncoderPrivate::writeFragment(QDataStream &stream, FragmentType frag_type, quint8 theora_packets, const char *data, quint16 length)
 {
     // theora framing: draft-ietf-avt-rtp-theora-00
-    const quint8 theora_type = 0; // raw data
+    const quint8 theora_type = 0;  // raw data
     stream.writeRawData(ident.constData(), ident.size());
     stream << quint8(((frag_type << 6) & 0xc0) |
                      ((theora_type << 4) & 0x30) |
@@ -937,7 +929,7 @@ bool QXmppTheoraEncoder::setFormat(const QXmppVideoFormat &format)
         d->ycbcr_buffer[0].width = d->info.frame_width;
         d->ycbcr_buffer[0].height = d->info.frame_height;
         d->ycbcr_buffer[0].stride = d->info.frame_width;
-        d->ycbcr_buffer[0].data = (uchar*) d->buffer.data();
+        d->ycbcr_buffer[0].data = (uchar *)d->buffer.data();
         d->ycbcr_buffer[1].width = d->ycbcr_buffer[0].width / 2;
         d->ycbcr_buffer[1].height = d->ycbcr_buffer[0].height;
         d->ycbcr_buffer[1].stride = d->ycbcr_buffer[0].stride / 2;
@@ -963,7 +955,7 @@ bool QXmppTheoraEncoder::setFormat(const QXmppVideoFormat &format)
     QList<QByteArray> headers;
     ogg_packet packet;
     while (th_encode_flushheader(d->ctx, &d->comment, &packet) > 0)
-        headers << QByteArray((const char*)packet.packet, packet.bytes);
+        headers << QByteArray((const char *)packet.packet, packet.bytes);
 
     // store configuration
     d->configuration.clear();
@@ -1015,7 +1007,7 @@ QList<QByteArray> QXmppTheoraEncoder::handleFrame(const QXmppVideoFrame &frame)
 
     if (d->info.pixel_fmt == TH_PF_420) {
         d->ycbcr_buffer[0].stride = frame.bytesPerLine();
-        d->ycbcr_buffer[0].data = (unsigned char*) frame.bits();
+        d->ycbcr_buffer[0].data = (unsigned char *)frame.bits();
         d->ycbcr_buffer[1].stride = d->ycbcr_buffer[0].stride / 2;
         d->ycbcr_buffer[1].data = d->ycbcr_buffer[0].data + d->ycbcr_buffer[0].stride * d->ycbcr_buffer[0].height;
         d->ycbcr_buffer[2].stride = d->ycbcr_buffer[1].stride;
@@ -1056,7 +1048,7 @@ QList<QByteArray> QXmppTheoraEncoder::handleFrame(const QXmppVideoFrame &frame)
         qDebug("Theora encoded packet %d bytes", packet.bytes);
 #endif
         QDataStream stream(&payload, QIODevice::WriteOnly);
-        const char *data = (const char*) packet.packet;
+        const char *data = (const char *)packet.packet;
         int size = packet.bytes;
         if (size <= PACKET_MAX) {
             // no fragmentation
@@ -1064,7 +1056,7 @@ QList<QByteArray> QXmppTheoraEncoder::handleFrame(const QXmppVideoFrame &frame)
             payload.resize(0);
             d->writeFragment(stream, NoFragment, 1, data, size);
             packets << payload;
-       } else {
+        } else {
             // fragmentation
             FragmentType frag_type = StartFragment;
             while (size) {
@@ -1111,7 +1103,7 @@ bool QXmppVpxDecoderPrivate::decodeFrame(const QByteArray &buffer, QXmppVideoFra
     // With the VPX_DL_REALTIME option, tries to decode the frame as quick as
     // possible, if not possible discard it.
     if (vpx_codec_decode(&codec,
-                         (const uint8_t*)buffer.constData(),
+                         (const uint8_t *)buffer.constData(),
                          buffer.size(),
                          NULL,
                          VPX_DL_REALTIME) != VPX_CODEC_OK) {
@@ -1127,9 +1119,9 @@ bool QXmppVpxDecoderPrivate::decodeFrame(const QByteArray &buffer, QXmppVideoFra
                 const int bytes = img->d_w * img->d_h * 3 / 2;
 
                 *frame = QXmppVideoFrame(bytes,
-                    QSize(img->d_w, img->d_h),
-                    img->d_w,
-                    QXmppVideoFrame::Format_YUV420P);
+                                         QSize(img->d_w, img->d_h),
+                                         img->d_w,
+                                         QXmppVideoFrame::Format_YUV420P);
             }
             uchar *output = frame->bits();
 
@@ -1217,7 +1209,7 @@ QList<QXmppVideoFrame> QXmppVpxDecoder::handlePacket(const QXmppRtpPacket &packe
 
     if (frag_type == NoFragment) {
         // unfragmented packet
-        if ((payload[1] & 0x1) == 0 // is key frame
+        if ((payload[1] & 0x1) == 0  // is key frame
             || packet.sequence() == sequence) {
             if (d->decodeFrame(payload.mid(1), &frame))
                 frames << frame;
@@ -1230,7 +1222,7 @@ QList<QXmppVideoFrame> QXmppVpxDecoder::handlePacket(const QXmppRtpPacket &packe
         // fragments
         if (frag_type == StartFragment) {
             // start fragment
-            if ((payload[1] & 0x1) == 0 // is key frame
+            if ((payload[1] & 0x1) == 0  // is key frame
                 || packet.sequence() == sequence) {
                 d->packetBuffer = payload.mid(1);
                 sequence = packet.sequence() + 1;
@@ -1282,7 +1274,7 @@ void QXmppVpxEncoderPrivate::writeFragment(QDataStream &stream, FragmentType fra
     qDebug("Vpx encoder writing packet frag: %i, size: %u", frag_type, length);
 #endif
     stream << quint8(((frag_type << 1) & 0x6) |
-                      (frag_type == NoFragment || frag_type == StartFragment));
+                     (frag_type == NoFragment || frag_type == StartFragment));
     stream.writeRawData(data, length);
 }
 
@@ -1300,8 +1292,7 @@ QXmppVpxEncoder::QXmppVpxEncoder(uint clockrate)
         d->cfg.g_threads = nThreads - 1;
 
     // Make stream error resiliant
-    d->cfg.g_error_resilient = VPX_ERROR_RESILIENT_DEFAULT
-                               | VPX_ERROR_RESILIENT_PARTITIONS;
+    d->cfg.g_error_resilient = VPX_ERROR_RESILIENT_DEFAULT | VPX_ERROR_RESILIENT_PARTITIONS;
 
     d->cfg.g_pass = VPX_RC_ONE_PASS;
     d->cfg.kf_mode = VPX_KF_AUTO;
@@ -1337,7 +1328,7 @@ bool QXmppVpxEncoder::setFormat(const QXmppVideoFormat &format)
     }
 
     d->imageBuffer = vpx_img_alloc(NULL, VPX_IMG_FMT_I420,
-            format.frameSize().width(), format.frameSize().height(), 1);
+                                   format.frameSize().width(), format.frameSize().height(), 1);
     return true;
 }
 
@@ -1390,7 +1381,7 @@ QList<QByteArray> QXmppVpxEncoder::handleFrame(const QXmppVideoFrame &frame)
         return packets;
     }
 
-    if (vpx_codec_encode(&d->codec, d->imageBuffer, d->frameCount, 1,  0, VPX_DL_REALTIME) != VPX_CODEC_OK) {
+    if (vpx_codec_encode(&d->codec, d->imageBuffer, d->frameCount, 1, 0, VPX_DL_REALTIME) != VPX_CODEC_OK) {
         qWarning("Vpx encoder could not handle frame: %s", vpx_codec_error_detail(&d->codec));
         return packets;
     }
@@ -1405,7 +1396,7 @@ QList<QByteArray> QXmppVpxEncoder::handleFrame(const QXmppVideoFrame &frame)
             qDebug("Vpx encoded packet %lu bytes", pkt->data.frame.sz);
 #endif
             QDataStream stream(&payload, QIODevice::WriteOnly);
-            const char *data = (const char*) pkt->data.frame.buf;
+            const char *data = (const char *)pkt->data.frame.buf;
             int size = pkt->data.frame.sz;
             if (size <= PACKET_MAX) {
                 // no fragmentation
@@ -1413,7 +1404,7 @@ QList<QByteArray> QXmppVpxEncoder::handleFrame(const QXmppVideoFrame &frame)
                 payload.resize(0);
                 d->writeFragment(stream, NoFragment, data, size);
                 packets << payload;
-           } else {
+            } else {
                 // fragmentation
                 FragmentType frag_type = StartFragment;
                 while (size) {
diff --git a/src/base/QXmppConstants.cpp b/src/base/QXmppConstants.cpp
index 0ff845f8..a9d5612d 100644
--- a/src/base/QXmppConstants.cpp
+++ b/src/base/QXmppConstants.cpp
@@ -57,14 +57,14 @@ const char* ns_vcard = "vcard-temp";
 // XEP-0059: Result Set Management
 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 = "http://jabber.org/protocol/pubsub";
 // XEP-0065: SOCKS5 Bytestreams
 const char* ns_bytestreams = "http://jabber.org/protocol/bytestreams";
 // XEP-0066: Out of Band Data
 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";
diff --git a/src/base/QXmppDataForm.cpp b/src/base/QXmppDataForm.cpp
index f162268e..54442cb5 100644
--- a/src/base/QXmppDataForm.cpp
+++ b/src/base/QXmppDataForm.cpp
@@ -35,27 +35,23 @@
 #include <QStringList>
 #include <QUrl>
 
-#include "QXmppConstants_p.h"
-#include "QXmppDataForm.h"
-#include "QXmppUtils.h"
-
 struct field_type {
     QXmppDataForm::Field::Type type;
     const char *str;
 };
 
 static field_type field_types[] = {
-    {QXmppDataForm::Field::BooleanField, "boolean"},
-    {QXmppDataForm::Field::FixedField, "fixed"},
-    {QXmppDataForm::Field::HiddenField, "hidden"},
-    {QXmppDataForm::Field::JidMultiField, "jid-multi"},
-    {QXmppDataForm::Field::JidSingleField, "jid-single"},
-    {QXmppDataForm::Field::ListMultiField, "list-multi"},
-    {QXmppDataForm::Field::ListSingleField, "list-single"},
-    {QXmppDataForm::Field::TextMultiField, "text-multi"},
-    {QXmppDataForm::Field::TextPrivateField, "text-private"},
-    {QXmppDataForm::Field::TextSingleField, "text-single"},
-    {static_cast<QXmppDataForm::Field::Type>(-1), nullptr},
+    { QXmppDataForm::Field::BooleanField, "boolean" },
+    { QXmppDataForm::Field::FixedField, "fixed" },
+    { QXmppDataForm::Field::HiddenField, "hidden" },
+    { QXmppDataForm::Field::JidMultiField, "jid-multi" },
+    { QXmppDataForm::Field::JidSingleField, "jid-single" },
+    { QXmppDataForm::Field::ListMultiField, "list-multi" },
+    { QXmppDataForm::Field::ListSingleField, "list-single" },
+    { QXmppDataForm::Field::TextMultiField, "text-multi" },
+    { QXmppDataForm::Field::TextPrivateField, "text-private" },
+    { QXmppDataForm::Field::TextSingleField, "text-single" },
+    { static_cast<QXmppDataForm::Field::Type>(-1), nullptr },
 };
 
 class QXmppDataFormMediaSourcePrivate : public QSharedData
@@ -77,11 +73,11 @@ QXmppDataForm::MediaSource::MediaSource(const QUrl &uri, const QMimeType &conten
     d->contentType = contentType;
 }
 
-QXmppDataForm::MediaSource::MediaSource(const QXmppDataForm::MediaSource&) = default;
+QXmppDataForm::MediaSource::MediaSource(const QXmppDataForm::MediaSource &) = default;
 
 QXmppDataForm::MediaSource::~MediaSource() = default;
 
-QXmppDataForm::MediaSource &QXmppDataForm::MediaSource::operator=(const QXmppDataForm::MediaSource&) = default;
+QXmppDataForm::MediaSource &QXmppDataForm::MediaSource::operator=(const QXmppDataForm::MediaSource &) = default;
 
 /// Returns the media URI as QUrl. This can be i.e. a \c http:// URL or a
 /// \c cid: Bits of Binary URI.
@@ -93,7 +89,7 @@ QUrl QXmppDataForm::MediaSource::uri() const
 
 /// Sets the URI.
 
-void QXmppDataForm::MediaSource::setUri(const QUrl& uri)
+void QXmppDataForm::MediaSource::setUri(const QUrl &uri)
 {
     d->uri = uri;
 }
@@ -151,7 +147,7 @@ QXmppDataForm::Media::~Media() = default;
 ///
 /// \deprecated This class is deprecated since QXmpp 1.1.
 
-QXmppDataForm::Media& QXmppDataForm::Media::operator=(const QXmppDataForm::Media &other) = default;
+QXmppDataForm::Media &QXmppDataForm::Media::operator=(const QXmppDataForm::Media &other) = default;
 
 /// Returns media's height.
 ///
@@ -198,7 +194,7 @@ void QXmppDataForm::Media::setWidth(int width)
 /// \deprecated This method is deprecated since QXmpp 1.1. Use
 /// \c QXmppDataForm::Field::mediaSources() instead.
 
-QList< QPair< QString, QString > > QXmppDataForm::Media::uris() const
+QList<QPair<QString, QString>> QXmppDataForm::Media::uris() const
 {
     return d->uris;
 }
@@ -208,7 +204,7 @@ QList< QPair< QString, QString > > QXmppDataForm::Media::uris() const
 /// \deprecated This method is deprecated since QXmpp 1.1. Use
 /// \c QXmppDataForm::Media::setMediaSources() instead.
 
-void QXmppDataForm::Media::setUris(const QList< QPair< QString, QString > > &uris)
+void QXmppDataForm::Media::setUris(const QList<QPair<QString, QString>> &uris)
 {
     d->uris = uris;
 }
@@ -228,7 +224,7 @@ public:
     QString description;
     QString key;
     QString label;
-    QList<QPair<QString, QString> > options;
+    QList<QPair<QString, QString>> options;
     bool required;
     QXmppDataForm::Field::Type type;
     QVariant value;
@@ -237,8 +233,7 @@ public:
 };
 
 QXmppDataFormFieldPrivate::QXmppDataFormFieldPrivate()
-    : required(false)
-    , type(QXmppDataForm::Field::TextSingleField)
+    : required(false), type(QXmppDataForm::Field::TextSingleField)
 {
 }
 
@@ -265,7 +260,7 @@ QXmppDataForm::Field::~Field()
 
 /// Assigns \a other to this field.
 
-QXmppDataForm::Field& QXmppDataForm::Field::operator=(const QXmppDataForm::Field &other)
+QXmppDataForm::Field &QXmppDataForm::Field::operator=(const QXmppDataForm::Field &other)
 {
     d = other.d;
     return *this;
@@ -334,8 +329,7 @@ QXmppDataForm::Media QXmppDataForm::Field::media() const
     for (const auto &source : qAsConst(d->mediaSources)) {
         pairUris << qMakePair<QString, QString>(
             source.contentType().name(),
-            source.uri().toString()
-        );
+            source.uri().toString());
     }
 
     media.setHeight(d->mediaSize.height());
@@ -360,8 +354,7 @@ void QXmppDataForm::Field::setMedia(const QXmppDataForm::Media &media)
     for (const auto &pairUri : uris) {
         sources << QXmppDataForm::MediaSource(
             QUrl(pairUri.second),
-            QMimeDatabase().mimeTypeForName(pairUri.first)
-        );
+            QMimeDatabase().mimeTypeForName(pairUri.first));
     }
 
     d->mediaSources = sources;
@@ -370,7 +363,7 @@ void QXmppDataForm::Field::setMedia(const QXmppDataForm::Media &media)
 
 /// Returns the field's options.
 
-QList<QPair<QString, QString> > QXmppDataForm::Field::options() const
+QList<QPair<QString, QString>> QXmppDataForm::Field::options() const
 {
     return d->options;
 }
@@ -379,7 +372,7 @@ QList<QPair<QString, QString> > QXmppDataForm::Field::options() const
 ///
 /// \param options
 
-void QXmppDataForm::Field::setOptions(const QList<QPair<QString, QString> > &options)
+void QXmppDataForm::Field::setOptions(const QList<QPair<QString, QString>> &options)
 {
     d->options = options;
 }
@@ -496,17 +489,17 @@ void QXmppDataForm::Field::setMediaSources(const QVector<QXmppDataForm::MediaSou
 ///
 /// \since QXmpp 1.1
 
-bool QXmppDataForm::Field::operator==(const QXmppDataForm::Field& other) const
+bool QXmppDataForm::Field::operator==(const QXmppDataForm::Field &other) const
 {
     return d->description == other.description() &&
-           d->key == other.key() &&
-           d->label == other.label() &&
-           d->options == other.options() &&
-           d->required == other.isRequired() &&
-           d->type == other.type() &&
-           d->value == other.value() &&
-           d->mediaSources == other.mediaSources() &&
-           d->mediaSize == other.mediaSize();
+        d->key == other.key() &&
+        d->label == other.label() &&
+        d->options == other.options() &&
+        d->required == other.isRequired() &&
+        d->type == other.type() &&
+        d->value == other.value() &&
+        d->mediaSources == other.mediaSources() &&
+        d->mediaSize == other.mediaSize();
 }
 
 class QXmppDataFormPrivate : public QSharedData
@@ -548,7 +541,7 @@ QXmppDataForm::~QXmppDataForm()
 
 /// Assigns \a other to this form.
 
-QXmppDataForm& QXmppDataForm::operator=(const QXmppDataForm &other)
+QXmppDataForm &QXmppDataForm::operator=(const QXmppDataForm &other)
 {
     d = other.d;
     return *this;
@@ -648,8 +641,7 @@ void QXmppDataForm::parse(const QDomElement &element)
         d->type = QXmppDataForm::Cancel;
     else if (typeStr == "result")
         d->type = QXmppDataForm::Result;
-    else
-    {
+    else {
         qWarning() << "Unknown form type" << typeStr;
         return;
     }
@@ -659,18 +651,15 @@ void QXmppDataForm::parse(const QDomElement &element)
     d->instructions = element.firstChildElement("instructions").text();
 
     QDomElement fieldElement = element.firstChildElement("field");
-    while (!fieldElement.isNull())
-    {
+    while (!fieldElement.isNull()) {
         QXmppDataForm::Field field;
 
         /* field type */
         QXmppDataForm::Field::Type type = QXmppDataForm::Field::TextSingleField;
         const QString typeStr = fieldElement.attribute("type");
         struct field_type *ptr;
-        for (ptr = field_types; ptr->str; ptr++)
-        {
-            if (typeStr == ptr->str)
-            {
+        for (ptr = field_types; ptr->str; ptr++) {
+            if (typeStr == ptr->str) {
                 type = ptr->type;
                 break;
             }
@@ -682,26 +671,20 @@ void QXmppDataForm::parse(const QDomElement &element)
         field.setKey(fieldElement.attribute("var"));
 
         /* field value(s) */
-        if (type == QXmppDataForm::Field::BooleanField)
-        {
+        if (type == QXmppDataForm::Field::BooleanField) {
             const QString valueStr = fieldElement.firstChildElement("value").text();
             field.setValue(valueStr == "1" || valueStr == "true");
-        }
-        else if (type == QXmppDataForm::Field::ListMultiField ||
-            type == QXmppDataForm::Field::JidMultiField ||
-            type == QXmppDataForm::Field::TextMultiField)
-        {
+        } else if (type == QXmppDataForm::Field::ListMultiField ||
+                   type == QXmppDataForm::Field::JidMultiField ||
+                   type == QXmppDataForm::Field::TextMultiField) {
             QStringList values;
             QDomElement valueElement = fieldElement.firstChildElement("value");
-            while (!valueElement.isNull())
-            {
+            while (!valueElement.isNull()) {
                 values.append(valueElement.text());
                 valueElement = valueElement.nextSiblingElement("value");
             }
             field.setValue(values);
-        }
-        else
-        {
+        } else {
             field.setValue(fieldElement.firstChildElement("value").text());
         }
 
@@ -717,23 +700,19 @@ void QXmppDataForm::parse(const QDomElement &element)
                 field.mediaSources() << MediaSource(
                     QUrl(uriElement.text()),
                     QMimeDatabase().mimeTypeForName(
-                        uriElement.attribute(QStringLiteral("type"))
-                    )
-                );
+                        uriElement.attribute(QStringLiteral("type"))));
                 uriElement = uriElement.nextSiblingElement(QStringLiteral("uri"));
             }
         }
 
         /* field options */
         if (type == QXmppDataForm::Field::ListMultiField ||
-            type == QXmppDataForm::Field::ListSingleField)
-        {
-            QList<QPair<QString, QString> > options;
+            type == QXmppDataForm::Field::ListSingleField) {
+            QList<QPair<QString, QString>> options;
             QDomElement optionElement = fieldElement.firstChildElement("option");
-            while (!optionElement.isNull())
-            {
+            while (!optionElement.isNull()) {
                 options.append(QPair<QString, QString>(optionElement.attribute("label"),
-                    optionElement.firstChildElement("value").text()));
+                                                       optionElement.firstChildElement("value").text()));
                 optionElement = optionElement.nextSiblingElement("option");
             }
             field.setOptions(options);
@@ -782,10 +761,8 @@ void QXmppDataForm::toXml(QXmlStreamWriter *writer) const
         const QXmppDataForm::Field::Type type = field.type();
         QString typeStr;
         struct field_type *ptr;
-        for (ptr = field_types; ptr->str; ptr++)
-        {
-            if (type == ptr->type)
-            {
+        for (ptr = field_types; ptr->str; ptr++) {
+            if (type == ptr->type) {
                 typeStr = ptr->str;
                 break;
             }
@@ -797,19 +774,14 @@ void QXmppDataForm::toXml(QXmlStreamWriter *writer) const
         helperToXmlAddAttribute(writer, "var", field.key());
 
         /* field value(s) */
-        if (type == QXmppDataForm::Field::BooleanField)
-        {
+        if (type == QXmppDataForm::Field::BooleanField) {
             helperToXmlAddTextElement(writer, "value", field.value().toBool() ? "1" : "0");
-        }
-        else if (type == QXmppDataForm::Field::ListMultiField ||
-            type == QXmppDataForm::Field::JidMultiField ||
-            type == QXmppDataForm::Field::TextMultiField)
-        {
+        } else if (type == QXmppDataForm::Field::ListMultiField ||
+                   type == QXmppDataForm::Field::JidMultiField ||
+                   type == QXmppDataForm::Field::TextMultiField) {
             for (const QString &value : field.value().toStringList())
                 helperToXmlAddTextElement(writer, "value", value);
-        }
-        else if (!field.value().isNull())
-        {
+        } else if (!field.value().isNull()) {
             helperToXmlAddTextElement(writer, "value", field.value().toString());
         }
 
@@ -823,14 +795,12 @@ void QXmppDataForm::toXml(QXmlStreamWriter *writer) const
                 helperToXmlAddAttribute(
                     writer,
                     QStringLiteral("width"),
-                    QString::number(field.mediaSize().width())
-                );
+                    QString::number(field.mediaSize().width()));
             if (field.mediaSize().height() > 0)
                 helperToXmlAddAttribute(
                     writer,
                     QStringLiteral("height"),
-                    QString::number(field.mediaSize().height())
-                );
+                    QString::number(field.mediaSize().height()));
 
             const QVector<MediaSource> &sources = field.mediaSources();
             for (const auto &source : sources) {
@@ -845,8 +815,7 @@ void QXmppDataForm::toXml(QXmlStreamWriter *writer) const
 
         /* field options */
         if (type == QXmppDataForm::Field::ListMultiField ||
-            type == QXmppDataForm::Field::ListSingleField)
-        {
+            type == QXmppDataForm::Field::ListSingleField) {
             QPair<QString, QString> option;
             for (const auto &option : field.options()) {
                 writer->writeStartElement("option");
diff --git a/src/base/QXmppDiscoveryIq.cpp b/src/base/QXmppDiscoveryIq.cpp
index b38eec52..1451c674 100644
--- a/src/base/QXmppDiscoveryIq.cpp
+++ b/src/base/QXmppDiscoveryIq.cpp
@@ -261,14 +261,10 @@ void QXmppDiscoveryIq::parseElementFromChild(const QDomElement &element)
         m_queryType = InfoQuery;
 
     QDomElement itemElement = queryElement.firstChildElement();
-    while (!itemElement.isNull())
-    {
-        if (itemElement.tagName() == "feature")
-        {
+    while (!itemElement.isNull()) {
+        if (itemElement.tagName() == "feature") {
             m_features.append(itemElement.attribute("var"));
-        }
-        else if (itemElement.tagName() == "identity")
-        {
+        } else if (itemElement.tagName() == "identity") {
             QXmppDiscoveryIq::Identity identity;
             identity.setLanguage(itemElement.attribute("xml:lang"));
             identity.setCategory(itemElement.attribute("category"));
@@ -286,18 +282,14 @@ void QXmppDiscoveryIq::parseElementFromChild(const QDomElement &element)
             }
 
             m_identities.append(identity);
-        }
-        else if (itemElement.tagName() == "item")
-        {
+        } else if (itemElement.tagName() == "item") {
             QXmppDiscoveryIq::Item item;
             item.setJid(itemElement.attribute("jid"));
             item.setName(itemElement.attribute("name"));
             item.setNode(itemElement.attribute("node"));
             m_items.append(item);
-        }
-        else if (itemElement.tagName() == "x" &&
-                 itemElement.namespaceURI() == ns_data)
-        {
+        } else if (itemElement.tagName() == "x" &&
+                   itemElement.namespaceURI() == ns_data) {
             m_form.parse(itemElement);
         }
         itemElement = itemElement.nextSiblingElement();
diff --git a/src/base/QXmppElement.cpp b/src/base/QXmppElement.cpp
index 1e3ec7fb..9ca84d46 100644
--- a/src/base/QXmppElement.cpp
+++ b/src/base/QXmppElement.cpp
@@ -39,7 +39,7 @@ public:
 
     QXmppElementPrivate *parent;
     QMap<QString, QString> attributes;
-    QList<QXmppElementPrivate*> children;
+    QList<QXmppElementPrivate *> children;
     QString name;
     QString value;
 
@@ -63,17 +63,14 @@ QXmppElementPrivate::QXmppElementPrivate(const QDomElement &element)
     if (!xmlns.isEmpty() && xmlns != parentns)
         attributes.insert("xmlns", xmlns);
     QDomNamedNodeMap attrs = element.attributes();
-    for (int i = 0; i < attrs.size(); i++)
-    {
+    for (int i = 0; i < attrs.size(); i++) {
         QDomAttr attr = attrs.item(i).toAttr();
         attributes.insert(attr.name(), attr.value());
     }
 
     QDomNode childNode = element.firstChild();
-    while (!childNode.isNull())
-    {
-        if (childNode.isElement())
-        {
+    while (!childNode.isNull()) {
+        if (childNode.isElement()) {
             QXmppElementPrivate *child = new QXmppElementPrivate(childNode.toElement());
             child->parent = this;
             children.append(child);
@@ -124,7 +121,7 @@ QXmppElement::~QXmppElement()
 
 QXmppElement &QXmppElement::operator=(const QXmppElement &other)
 {
-    if (this != &other) // self-assignment check
+    if (this != &other)  // self-assignment check
     {
         other.d->counter.ref();
         if (!d->counter.deref())
@@ -140,8 +137,7 @@ QDomElement QXmppElement::sourceDomElement() const
         return QDomElement();
 
     QDomDocument doc;
-    if (!doc.setContent(d->serializedSource, true))
-    {
+    if (!doc.setContent(d->serializedSource, true)) {
         qWarning("[QXmpp] QXmppElement::sourceDomElement(): cannot parse source element");
         return QDomElement();
     }
@@ -189,7 +185,7 @@ QXmppElement QXmppElement::nextSiblingElement(const QString &name) const
 {
     if (!d->parent)
         return QXmppElement();
-    const QList<QXmppElementPrivate*> &siblings_d = d->parent->children;
+    const QList<QXmppElementPrivate *> &siblings_d = d->parent->children;
     for (int i = siblings_d.indexOf(d) + 1; i < siblings_d.size(); i++)
         if (name.isEmpty() || siblings_d[i]->name == name)
             return QXmppElement(siblings_d[i]);
diff --git a/src/base/QXmppEntityTimeIq.cpp b/src/base/QXmppEntityTimeIq.cpp
index 938517bc..c41b72a3 100644
--- a/src/base/QXmppEntityTimeIq.cpp
+++ b/src/base/QXmppEntityTimeIq.cpp
@@ -81,8 +81,7 @@ void QXmppEntityTimeIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
     writer->writeStartElement("time");
     writer->writeDefaultNamespace(ns_entity_time);
 
-    if(m_utc.isValid())
-    {
+    if (m_utc.isValid()) {
         helperToXmlAddTextElement(writer, "tzo", QXmppUtils::timezoneOffsetToString(m_tzo));
         helperToXmlAddTextElement(writer, "utc", QXmppUtils::datetimeToString(m_utc));
     }
diff --git a/src/base/QXmppIbbIq.cpp b/src/base/QXmppIbbIq.cpp
index 13928d88..c603dbef 100644
--- a/src/base/QXmppIbbIq.cpp
+++ b/src/base/QXmppIbbIq.cpp
@@ -38,17 +38,17 @@ long QXmppIbbOpenIq::blockSize() const
     return m_block_size;
 }
 
-void QXmppIbbOpenIq::setBlockSize( long block_size )
+void QXmppIbbOpenIq::setBlockSize(long block_size)
 {
     m_block_size = block_size;
 }
 
 QString QXmppIbbOpenIq::sid() const
 {
-   return  m_sid;
+    return m_sid;
 }
 
-void QXmppIbbOpenIq::setSid( const QString &sid )
+void QXmppIbbOpenIq::setSid(const QString &sid)
 {
     m_sid = sid;
 }
@@ -63,31 +63,30 @@ bool QXmppIbbOpenIq::isIbbOpenIq(const QDomElement &element)
 void QXmppIbbOpenIq::parseElementFromChild(const QDomElement &element)
 {
     QDomElement openElement = element.firstChildElement("open");
-    m_sid = openElement.attribute( "sid" );
-    m_block_size = openElement.attribute( "block-size" ).toLong();
+    m_sid = openElement.attribute("sid");
+    m_block_size = openElement.attribute("block-size").toLong();
 }
 
 void QXmppIbbOpenIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
 {
     writer->writeStartElement("open");
     writer->writeDefaultNamespace(ns_ibb);
-    writer->writeAttribute( "sid",m_sid);
-    writer->writeAttribute( "block-size",QString::number(m_block_size) );
+    writer->writeAttribute("sid", m_sid);
+    writer->writeAttribute("block-size", QString::number(m_block_size));
     writer->writeEndElement();
 }
 /// \endcond
 
 QXmppIbbCloseIq::QXmppIbbCloseIq() : QXmppIq(QXmppIq::Set)
 {
-
 }
 
 QString QXmppIbbCloseIq::sid() const
 {
-   return  m_sid;
+    return m_sid;
 }
 
-void QXmppIbbCloseIq::setSid( const QString &sid )
+void QXmppIbbCloseIq::setSid(const QString &sid)
 {
     m_sid = sid;
 }
@@ -102,19 +101,19 @@ bool QXmppIbbCloseIq::isIbbCloseIq(const QDomElement &element)
 void QXmppIbbCloseIq::parseElementFromChild(const QDomElement &element)
 {
     QDomElement openElement = element.firstChildElement("close");
-    m_sid = openElement.attribute( "sid" );
+    m_sid = openElement.attribute("sid");
 }
 
 void QXmppIbbCloseIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
 {
     writer->writeStartElement("close");
     writer->writeDefaultNamespace(ns_ibb);
-    writer->writeAttribute( "sid",m_sid);
+    writer->writeAttribute("sid", m_sid);
     writer->writeEndElement();
 }
 /// \endcond
 
-QXmppIbbDataIq::QXmppIbbDataIq() : QXmppIq( QXmppIq::Set ), m_seq(0)
+QXmppIbbDataIq::QXmppIbbDataIq() : QXmppIq(QXmppIq::Set), m_seq(0)
 {
 }
 
@@ -123,7 +122,7 @@ quint16 QXmppIbbDataIq::sequence() const
     return m_seq;
 }
 
-void QXmppIbbDataIq::setSequence( quint16 seq )
+void QXmppIbbDataIq::setSequence(quint16 seq)
 {
     m_seq = seq;
 }
@@ -133,7 +132,7 @@ QString QXmppIbbDataIq::sid() const
     return m_sid;
 }
 
-void QXmppIbbDataIq::setSid( const QString &sid )
+void QXmppIbbDataIq::setSid(const QString &sid)
 {
     m_sid = sid;
 }
@@ -143,7 +142,7 @@ QByteArray QXmppIbbDataIq::payload() const
     return m_payload;
 }
 
-void QXmppIbbDataIq::setPayload( const QByteArray &data )
+void QXmppIbbDataIq::setPayload(const QByteArray &data)
 {
     m_payload = data;
 }
@@ -158,18 +157,18 @@ bool QXmppIbbDataIq::isIbbDataIq(const QDomElement &element)
 void QXmppIbbDataIq::parseElementFromChild(const QDomElement &element)
 {
     QDomElement dataElement = element.firstChildElement("data");
-    m_sid = dataElement.attribute( "sid" );
-    m_seq = dataElement.attribute( "seq" ).toLong();
-    m_payload = QByteArray::fromBase64( dataElement.text().toLatin1() );
+    m_sid = dataElement.attribute("sid");
+    m_seq = dataElement.attribute("seq").toLong();
+    m_payload = QByteArray::fromBase64(dataElement.text().toLatin1());
 }
 
 void QXmppIbbDataIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
 {
     writer->writeStartElement("data");
     writer->writeDefaultNamespace(ns_ibb);
-    writer->writeAttribute( "sid",m_sid);
-    writer->writeAttribute( "seq",QString::number(m_seq) );
-    writer->writeCharacters( m_payload.toBase64() );
+    writer->writeAttribute("sid", m_sid);
+    writer->writeAttribute("seq", QString::number(m_seq));
+    writer->writeCharacters(m_payload.toBase64());
     writer->writeEndElement();
 }
 /// \endcond
diff --git a/src/base/QXmppIq.cpp b/src/base/QXmppIq.cpp
index 4d862378..5cc51791 100644
--- a/src/base/QXmppIq.cpp
+++ b/src/base/QXmppIq.cpp
@@ -28,7 +28,7 @@
 #include <QDomElement>
 #include <QXmlStreamWriter>
 
-static const char* iq_types[] = {
+static const char *iq_types[] = {
     "error",
     "get",
     "set",
@@ -46,8 +46,7 @@ public:
 /// \param type
 
 QXmppIq::QXmppIq(QXmppIq::Type type)
-    : QXmppStanza()
-    , d(new QXmppIqPrivate)
+    : QXmppStanza(), d(new QXmppIqPrivate)
 {
     d->type = type;
     generateAndSetNextId();
@@ -56,8 +55,7 @@ QXmppIq::QXmppIq(QXmppIq::Type type)
 /// Constructs a copy of \a other.
 
 QXmppIq::QXmppIq(const QXmppIq &other)
-    : QXmppStanza(other)
-    , d(other.d)
+    : QXmppStanza(other), d(other.d)
 {
 }
 
@@ -67,7 +65,7 @@ QXmppIq::~QXmppIq()
 
 /// Assigns \a other to this IQ.
 
-QXmppIq& QXmppIq::operator=(const QXmppIq &other)
+QXmppIq &QXmppIq::operator=(const QXmppIq &other)
 {
     QXmppStanza::operator=(other);
     d = other.d;
@@ -119,15 +117,14 @@ void QXmppIq::parseElementFromChild(const QDomElement &element)
 {
     QXmppElementList extensions;
     QDomElement itemElement = element.firstChildElement();
-    while (!itemElement.isNull())
-    {
+    while (!itemElement.isNull()) {
         extensions.append(QXmppElement(itemElement));
         itemElement = itemElement.nextSiblingElement();
     }
     setExtensions(extensions);
 }
 
-void QXmppIq::toXml( QXmlStreamWriter *xmlWriter ) const
+void QXmppIq::toXml(QXmlStreamWriter *xmlWriter) const
 {
     xmlWriter->writeStartElement("iq");
 
@@ -140,7 +137,7 @@ void QXmppIq::toXml( QXmlStreamWriter *xmlWriter ) const
     xmlWriter->writeEndElement();
 }
 
-void QXmppIq::toXmlElementFromChild( QXmlStreamWriter *writer ) const
+void QXmppIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
 {
     for (const QXmppElement &extension : extensions())
         extension.toXml(writer);
diff --git a/src/base/QXmppJingleIq.cpp b/src/base/QXmppJingleIq.cpp
index 00b1c0c1..8920c781 100644
--- a/src/base/QXmppJingleIq.cpp
+++ b/src/base/QXmppJingleIq.cpp
@@ -33,10 +33,10 @@
 
 static const int RTP_COMPONENT = 1;
 
-static const char* ns_jingle_rtp_info = "urn:xmpp:jingle:apps:rtp:info:1";
-static const char* ns_jingle_dtls = "urn:xmpp:jingle:apps:dtls:0";
+static const char *ns_jingle_rtp_info = "urn:xmpp:jingle:apps:rtp:info:1";
+static const char *ns_jingle_dtls = "urn:xmpp:jingle:apps:dtls:0";
 
-static const char* jingle_actions[] = {
+static const char *jingle_actions[] = {
     "content-accept",
     "content-add",
     "content-modify",
@@ -54,7 +54,7 @@ static const char* jingle_actions[] = {
     "transport-replace",
 };
 
-static const char* jingle_reasons[] = {
+static const char *jingle_reasons[] = {
     "",
     "alternative-session",
     "busy",
@@ -79,7 +79,7 @@ static QString formatFingerprint(const QByteArray &digest)
 {
     QString fingerprint;
     const QString hx = digest.toHex().toUpper();
-    for (int i = 0; i < hx.size(); i+=2) {
+    for (int i = 0; i < hx.size(); i += 2) {
         if (!fingerprint.isEmpty())
             fingerprint += ':';
         fingerprint += hx.mid(i, 2);
@@ -96,9 +96,7 @@ static QByteArray parseFingerprint(const QString &fingerprint)
 
 static QString addressToSdp(const QHostAddress &host)
 {
-    return QString("IN %1 %2").arg(
-        host.protocol() == QAbstractSocket::IPv6Protocol ? "IP6" : "IP4",
-        host.toString());
+    return QString("IN %1 %2").arg(host.protocol() == QAbstractSocket::IPv6Protocol ? "IP6" : "IP4", host.toString());
 }
 
 static bool candidateParseSdp(QXmppJingleCandidate *candidate, const QString &sdp)
@@ -134,16 +132,7 @@ static bool candidateParseSdp(QXmppJingleCandidate *candidate, const QString &sd
 
 static QString candidateToSdp(const QXmppJingleCandidate &candidate)
 {
-    return QString("candidate:%1 %2 %3 %4 %5 %6 typ %7 generation %8").arg(
-        candidate.foundation(),
-        QString::number(candidate.component()),
-        candidate.protocol(),
-        QString::number(candidate.priority()),
-        candidate.host().toString(),
-        QString::number(candidate.port()),
-        QXmppJingleCandidate::typeToString(candidate.type()),
-        QString::number(candidate.generation())
-    );
+    return QString("candidate:%1 %2 %3 %4 %5 %6 typ %7 generation %8").arg(candidate.foundation(), QString::number(candidate.component()), candidate.protocol(), QString::number(candidate.priority()), candidate.host().toString(), QString::number(candidate.port()), QXmppJingleCandidate::typeToString(candidate.type()), QString::number(candidate.generation()));
 }
 
 class QXmppJingleIqContentPrivate : public QSharedData
@@ -196,7 +185,7 @@ QXmppJingleIq::Content::Content(const QXmppJingleIq::Content &other)
 ///
 /// \param other
 
-QXmppJingleIq::Content& QXmppJingleIq::Content::operator=(const QXmppJingleIq::Content& other)
+QXmppJingleIq::Content &QXmppJingleIq::Content::operator=(const QXmppJingleIq::Content &other)
 {
     d = other.d;
     return *this;
@@ -378,8 +367,7 @@ void QXmppJingleIq::Content::parse(const QDomElement &element)
     d->descriptionMedia = descriptionElement.attribute("media");
     d->descriptionSsrc = descriptionElement.attribute("ssrc").toULong();
     QDomElement child = descriptionElement.firstChildElement("payload-type");
-    while (!child.isNull())
-    {
+    while (!child.isNull()) {
         QXmppJinglePayloadType payload;
         payload.parse(child);
         d->payloadTypes << payload;
@@ -420,8 +408,7 @@ void QXmppJingleIq::Content::toXml(QXmlStreamWriter *writer) const
     helperToXmlAddAttribute(writer, "senders", d->senders);
 
     // description
-    if (!d->descriptionType.isEmpty() || !d->payloadTypes.isEmpty())
-    {
+    if (!d->descriptionType.isEmpty() || !d->payloadTypes.isEmpty()) {
         writer->writeStartElement("description");
         writer->writeDefaultNamespace(d->descriptionType);
         helperToXmlAddAttribute(writer, "media", d->descriptionMedia);
@@ -433,8 +420,7 @@ void QXmppJingleIq::Content::toXml(QXmlStreamWriter *writer) const
     }
 
     // transport
-    if (!d->transportType.isEmpty() || !d->transportCandidates.isEmpty())
-    {
+    if (!d->transportType.isEmpty() || !d->transportCandidates.isEmpty()) {
         writer->writeStartElement("transport");
         writer->writeDefaultNamespace(d->transportType);
         helperToXmlAddAttribute(writer, "ufrag", d->transportUser);
@@ -624,9 +610,7 @@ QString QXmppJingleIq::Content::toSdp() const
     if (!d->transportPassword.isEmpty())
         sdp << QString("a=ice-pwd:%1").arg(d->transportPassword);
     if (!d->transportFingerprint.isEmpty() && !d->transportFingerprintHash.isEmpty())
-        sdp << QString("a=fingerprint:%1 %2").arg(
-            d->transportFingerprintHash,
-            formatFingerprint(d->transportFingerprint));
+        sdp << QString("a=fingerprint:%1 %2").arg(d->transportFingerprintHash, formatFingerprint(d->transportFingerprint));
     if (!d->transportFingerprintSetup.isEmpty())
         sdp << QString("a=setup:%1").arg(d->transportFingerprintSetup);
 
@@ -672,10 +656,8 @@ void QXmppJingleIq::Reason::setType(QXmppJingleIq::Reason::Type type)
 void QXmppJingleIq::Reason::parse(const QDomElement &element)
 {
     m_text = element.firstChildElement("text").text();
-    for (int i = AlternativeSession; i <= UnsupportedTransports; i++)
-    {
-        if (!element.firstChildElement(jingle_reasons[i]).isNull())
-        {
+    for (int i = AlternativeSession; i <= UnsupportedTransports; i++) {
+        if (!element.firstChildElement(jingle_reasons[i]).isNull()) {
             m_type = static_cast<Type>(i);
             break;
         }
@@ -711,8 +693,7 @@ public:
 };
 
 QXmppJingleIqPrivate::QXmppJingleIqPrivate()
-    : action(QXmppJingleIq::ContentAccept)
-    , ringing(false)
+    : action(QXmppJingleIq::ContentAccept), ringing(false)
 {
 }
 
@@ -728,8 +709,7 @@ QXmppJingleIq::QXmppJingleIq()
 /// \param other
 
 QXmppJingleIq::QXmppJingleIq(const QXmppJingleIq &other)
-    : QXmppIq(other)
-    , d(other.d)
+    : QXmppIq(other), d(other.d)
 {
 }
 
@@ -741,7 +721,7 @@ QXmppJingleIq::~QXmppJingleIq()
 ///
 /// \param other
 
-QXmppJingleIq& QXmppJingleIq::operator=(const QXmppJingleIq& other)
+QXmppJingleIq &QXmppJingleIq::operator=(const QXmppJingleIq &other)
 {
     d = other.d;
     return *this;
@@ -802,14 +782,14 @@ void QXmppJingleIq::setInitiator(const QString &initiator)
 
 /// Returns a reference to the IQ's reason element.
 
-QXmppJingleIq::Reason& QXmppJingleIq::reason()
+QXmppJingleIq::Reason &QXmppJingleIq::reason()
 {
     return d->reason;
 }
 
 /// Returns a const reference to the IQ's reason element.
 
-const QXmppJingleIq::Reason& QXmppJingleIq::reason() const
+const QXmppJingleIq::Reason &QXmppJingleIq::reason() const
 {
     return d->reason;
 }
@@ -941,12 +921,7 @@ public:
 };
 
 QXmppJingleCandidatePrivate::QXmppJingleCandidatePrivate()
-    : component(0)
-    , generation(0)
-    , network(0)
-    , port(0)
-    , priority(0)
-    , type(QXmppJingleCandidate::HostType)
+    : component(0), generation(0), network(0), port(0), priority(0), type(QXmppJingleCandidate::HostType)
 {
 }
 
@@ -974,7 +949,7 @@ QXmppJingleCandidate::~QXmppJingleCandidate()
 ///
 /// \param other
 
-QXmppJingleCandidate& QXmppJingleCandidate::operator=(const QXmppJingleCandidate& other)
+QXmppJingleCandidate &QXmppJingleCandidate::operator=(const QXmppJingleCandidate &other)
 {
     d = other.d;
     return *this;
@@ -1211,8 +1186,7 @@ QXmppJingleCandidate::Type QXmppJingleCandidate::typeFromString(const QString &t
 QString QXmppJingleCandidate::typeToString(QXmppJingleCandidate::Type type)
 {
     QString typeStr;
-    switch (type)
-    {
+    switch (type) {
     case HostType:
         typeStr = "host";
         break;
@@ -1245,11 +1219,7 @@ public:
 };
 
 QXmppJinglePayloadTypePrivate::QXmppJinglePayloadTypePrivate()
-    : channels(1)
-    , clockrate(0)
-    , id(0)
-    , maxptime(0)
-    , ptime(0)
+    : channels(1), clockrate(0), id(0), maxptime(0), ptime(0)
 {
 }
 
@@ -1358,7 +1328,7 @@ void QXmppJinglePayloadType::setName(const QString &name)
 
 /// Returns the payload parameters.
 
-QMap<QString,QString> QXmppJinglePayloadType::parameters() const
+QMap<QString, QString> QXmppJinglePayloadType::parameters() const
 {
     return d->parameters;
 }
@@ -1434,7 +1404,7 @@ void QXmppJinglePayloadType::toXml(QXmlStreamWriter *writer) const
 ///
 /// \param other
 
-QXmppJinglePayloadType& QXmppJinglePayloadType::operator=(const QXmppJinglePayloadType& other)
+QXmppJinglePayloadType &QXmppJinglePayloadType::operator=(const QXmppJinglePayloadType &other)
 {
     d = other.d;
     return *this;
@@ -1451,6 +1421,6 @@ bool QXmppJinglePayloadType::operator==(const QXmppJinglePayloadType &other) con
         return other.d->id == d->id && other.d->clockrate == d->clockrate;
     else
         return other.d->channels == d->channels &&
-               other.d->clockrate == d->clockrate &&
-               other.d->name.toLower() == d->name.toLower();
+            other.d->clockrate == d->clockrate &&
+            other.d->name.toLower() == d->name.toLower();
 }
diff --git a/src/base/QXmppLogger.cpp b/src/base/QXmppLogger.cpp
index d1f2e57b..8162d118 100644
--- a/src/base/QXmppLogger.cpp
+++ b/src/base/QXmppLogger.cpp
@@ -32,14 +32,11 @@
 #include <QMetaType>
 #include <QTextStream>
 
-#include "QXmppLogger.h"
-
-QXmppLogger* QXmppLogger::m_logger = nullptr;
+QXmppLogger *QXmppLogger::m_logger = nullptr;
 
 static const char *typeName(QXmppLogger::MessageType type)
 {
-    switch (type)
-    {
+    switch (type) {
     case QXmppLogger::DebugMessage:
         return "DEBUG";
     case QXmppLogger::InformationMessage:
@@ -55,7 +52,7 @@ static const char *typeName(QXmppLogger::MessageType type)
     }
 }
 
-static QString formatted(QXmppLogger::MessageType type, const QString& text)
+static QString formatted(QXmppLogger::MessageType type, const QString &text)
 {
     return QDateTime::currentDateTime().toString() + " " +
         QString::fromLatin1(typeName(type)) + " " +
@@ -79,7 +76,7 @@ static void relaySignals(QXmppLoggable *from, QXmppLoggable *to)
 QXmppLoggable::QXmppLoggable(QObject *parent)
     : QObject(parent)
 {
-    auto *logParent = qobject_cast<QXmppLoggable*>(parent);
+    auto *logParent = qobject_cast<QXmppLoggable *>(parent);
     if (logParent) {
         relaySignals(this, logParent);
     }
@@ -88,7 +85,7 @@ QXmppLoggable::QXmppLoggable(QObject *parent)
 /// \cond
 void QXmppLoggable::childEvent(QChildEvent *event)
 {
-    auto *child = qobject_cast<QXmppLoggable*>(event->child());
+    auto *child = qobject_cast<QXmppLoggable *>(event->child());
     if (!child)
         return;
 
@@ -96,11 +93,11 @@ void QXmppLoggable::childEvent(QChildEvent *event)
         relaySignals(child, this);
     } else if (event->removed()) {
         disconnect(child, &QXmppLoggable::logMessage,
-                this, &QXmppLoggable::logMessage);
+                   this, &QXmppLoggable::logMessage);
         disconnect(child, &QXmppLoggable::setGauge,
-                this, &QXmppLoggable::setGauge);
+                   this, &QXmppLoggable::setGauge);
         disconnect(child, &QXmppLoggable::updateCounter,
-                this, &QXmppLoggable::updateCounter);
+                   this, &QXmppLoggable::updateCounter);
     }
 }
 /// \endcond
@@ -117,10 +114,7 @@ public:
 };
 
 QXmppLoggerPrivate::QXmppLoggerPrivate()
-    : loggingType(QXmppLogger::NoLogging)
-    , logFile(nullptr)
-    , logFilePath("QXmppClientLog.log")
-    , messageTypes(QXmppLogger::AnyMessage)
+    : loggingType(QXmppLogger::NoLogging), logFile(nullptr), logFilePath("QXmppClientLog.log"), messageTypes(QXmppLogger::AnyMessage)
 {
 }
 
@@ -129,11 +123,10 @@ QXmppLoggerPrivate::QXmppLoggerPrivate()
 /// \param parent
 
 QXmppLogger::QXmppLogger(QObject *parent)
-    : QObject(parent)
-    , d(new QXmppLoggerPrivate())
+    : QObject(parent), d(new QXmppLoggerPrivate())
 {
     // make it possible to pass QXmppLogger::MessageType between threads
-    qRegisterMetaType< QXmppLogger::MessageType >("QXmppLogger::MessageType");
+    qRegisterMetaType<QXmppLogger::MessageType>("QXmppLogger::MessageType");
 }
 
 QXmppLogger::~QXmppLogger()
@@ -144,9 +137,9 @@ QXmppLogger::~QXmppLogger()
 /// Returns the default logger.
 ///
 
-QXmppLogger* QXmppLogger::getLogger()
+QXmppLogger *QXmppLogger::getLogger()
 {
-    if(!m_logger)
+    if (!m_logger)
         m_logger = new QXmppLogger();
 
     return m_logger;
@@ -194,14 +187,13 @@ void QXmppLogger::setMessageTypes(QXmppLogger::MessageTypes types)
 /// \param type
 /// \param text
 
-void QXmppLogger::log(QXmppLogger::MessageType type, const QString& text)
+void QXmppLogger::log(QXmppLogger::MessageType type, const QString &text)
 {
     // filter messages
     if (!d->messageTypes.testFlag(type))
         return;
 
-    switch(d->loggingType)
-    {
+    switch (d->loggingType) {
     case QXmppLogger::FileLogging:
         if (!d->logFile) {
             d->logFile = new QFile(d->logFilePath);
@@ -273,4 +265,3 @@ void QXmppLogger::reopen()
         d->logFile = nullptr;
     }
 }
-
diff --git a/src/base/QXmppMessage.cpp b/src/base/QXmppMessage.cpp
index 2d4ee40a..3544c55b 100644
--- a/src/base/QXmppMessage.cpp
+++ b/src/base/QXmppMessage.cpp
@@ -88,8 +88,7 @@ static bool checkElement(const QDomElement &element, const QString &tagName, con
     return element.tagName() == tagName && element.namespaceURI() == xmlns;
 }
 
-enum StampType
-{
+enum StampType {
     LegacyDelayedDelivery,  // XEP-0091: Legacy Delayed Delivery
     DelayedDelivery         // XEP-0203: Delayed Delivery
 };
@@ -179,10 +178,8 @@ QXmppMessagePrivate::QXmppMessagePrivate()
 /// \param body
 /// \param thread
 
-QXmppMessage::QXmppMessage(const QString& from, const QString& to, const
-                           QString& body, const QString& thread)
-    : QXmppStanza(from, to)
-    , d(new QXmppMessagePrivate)
+QXmppMessage::QXmppMessage(const QString &from, const QString &to, const QString &body, const QString &thread)
+    : QXmppStanza(from, to), d(new QXmppMessagePrivate)
 {
     d->type = Chat;
     d->body = body;
@@ -197,7 +194,7 @@ QXmppMessage::~QXmppMessage() = default;
 
 /// Assigns \a other to this message.
 
-QXmppMessage& QXmppMessage::operator=(const QXmppMessage &other) = default;
+QXmppMessage &QXmppMessage::operator=(const QXmppMessage &other) = default;
 
 /// Indicates if the QXmppStanza is a stanza in the XMPP sense (i. e. a message,
 /// iq or presence)
@@ -218,7 +215,7 @@ QString QXmppMessage::body() const
 ///
 /// \param body
 
-void QXmppMessage::setBody(const QString& body)
+void QXmppMessage::setBody(const QString &body)
 {
     d->body = body;
 }
@@ -385,7 +382,7 @@ QString QXmppMessage::subject() const
 ///
 /// \param subject
 
-void QXmppMessage::setSubject(const QString& subject)
+void QXmppMessage::setSubject(const QString &subject)
 {
     d->subject = subject;
 }
@@ -401,7 +398,7 @@ QString QXmppMessage::thread() const
 ///
 /// \param thread
 
-void QXmppMessage::setThread(const QString& thread)
+void QXmppMessage::setThread(const QString &thread)
 {
     d->thread = thread;
 }
@@ -642,7 +639,7 @@ QString QXmppMessage::mixUserJid() const
 ///
 /// \since QXmpp 1.1
 
-void QXmppMessage::setMixUserJid(const QString& mixUserJid)
+void QXmppMessage::setMixUserJid(const QString &mixUserJid)
 {
     d->mixUserJid = mixUserJid;
 }
@@ -660,7 +657,7 @@ QString QXmppMessage::mixUserNick() const
 ///
 /// \since QXmpp 1.1
 
-void QXmppMessage::setMixUserNick(const QString& mixUserNick)
+void QXmppMessage::setMixUserNick(const QString &mixUserNick)
 {
     d->mixUserNick = mixUserNick;
 }
@@ -820,8 +817,8 @@ void QXmppMessage::parse(const QDomElement &element)
             d->subject = childElement.text();
         } else if (childElement.tagName() == QStringLiteral("thread")) {
             d->thread = childElement.text();
-        // parse message extensions
-        // XEP-0033: Extended Stanza Addressing and errors are parsed by QXmppStanza
+            // parse message extensions
+            // XEP-0033: Extended Stanza Addressing and errors are parsed by QXmppStanza
         } else if (!checkElement(childElement, QStringLiteral("addresses"), ns_extended_addressing) &&
                    childElement.tagName() != QStringLiteral("error")) {
             parseExtension(childElement, extensions);
@@ -1018,7 +1015,7 @@ void QXmppMessage::parseExtension(const QDomElement &element, QXmppElementList &
 {
     if (element.tagName() == QStringLiteral("x")) {
         parseXElement(element, unknownExtensions);
-    // XEP-0071: XHTML-IM
+        // XEP-0071: XHTML-IM
     } else if (checkElement(element, QStringLiteral("html"), ns_xhtml_im)) {
         QDomElement bodyElement = element.firstChildElement(QStringLiteral("body"));
         if (!bodyElement.isNull() && bodyElement.namespaceURI() == ns_xhtml) {
@@ -1028,17 +1025,16 @@ void QXmppMessage::parseExtension(const QDomElement &element, QXmppElementList &
             d->xhtml = d->xhtml.mid(d->xhtml.indexOf('>') + 1);
             d->xhtml.replace(
                 QStringLiteral(" xmlns=\"http://www.w3.org/1999/xhtml\""),
-                QString()
-            );
+                QString());
             d->xhtml.replace(QStringLiteral("</body>"), QString());
             d->xhtml = d->xhtml.trimmed();
         }
-    // XEP-0085: Chat State Notifications
+        // XEP-0085: Chat State Notifications
     } else if (element.namespaceURI() == ns_chat_states) {
         int i = CHAT_STATES.indexOf(element.tagName());
         if (i > 0)
             d->state = static_cast<QXmppMessage::State>(i);
-    // XEP-0184: Message Delivery Receipts
+        // XEP-0184: Message Delivery Receipts
     } else if (checkElement(element, QStringLiteral("received"), ns_message_receipts)) {
         d->receiptId = element.attribute(QStringLiteral("id"));
 
@@ -1047,27 +1043,26 @@ void QXmppMessage::parseExtension(const QDomElement &element, QXmppElementList &
             d->receiptId = id();
     } else if (checkElement(element, QStringLiteral("request"), ns_message_receipts)) {
         d->receiptRequested = true;
-    // XEP-0203: Delayed Delivery
+        // XEP-0203: Delayed Delivery
     } else if (checkElement(element, QStringLiteral("delay"), ns_delayed_delivery)) {
         d->stamp = QXmppUtils::datetimeFromString(
-            element.attribute(QStringLiteral("stamp"))
-        );
+            element.attribute(QStringLiteral("stamp")));
         d->stampType = DelayedDelivery;
-    // XEP-0224: Attention
+        // XEP-0224: Attention
     } else if (checkElement(element, QStringLiteral("attention"), ns_attention)) {
         d->attentionRequested = true;
-    // XEP-0231: Bits of Binary
+        // XEP-0231: Bits of Binary
     } else if (QXmppBitsOfBinaryData::isBitsOfBinaryData(element)) {
         QXmppBitsOfBinaryData data;
         data.parseElementFromChild(element);
         d->bitsOfBinaryData << data;
-    // XEP-0280: Message Carbons
+        // XEP-0280: Message Carbons
     } else if (checkElement(element, QStringLiteral("private"), ns_carbons)) {
         d->privatemsg = true;
-    // XEP-0308: Last Message Correction
+        // XEP-0308: Last Message Correction
     } else if (checkElement(element, QStringLiteral("replace"), ns_message_correct)) {
         d->replaceId = element.attribute(QStringLiteral("id"));
-    // XEP-0333: Chat Markers
+        // XEP-0333: Chat Markers
     } else if (element.namespaceURI() == ns_chat_markers) {
         if (element.tagName() == QStringLiteral("markable")) {
             d->markable = true;
@@ -1079,22 +1074,22 @@ void QXmppMessage::parseExtension(const QDomElement &element, QXmppElementList &
                 d->markedThread = element.attribute(QStringLiteral("thread"));
             }
         }
-    // XEP-0334: Message Processing Hints
+        // XEP-0334: Message Processing Hints
     } else if (element.namespaceURI() == ns_message_processing_hints &&
                HINT_TYPES.contains(element.tagName())) {
         addHint(Hint(1 << HINT_TYPES.indexOf(element.tagName())));
-    // XEP-0367: Message Attaching
+        // XEP-0367: Message Attaching
     } else if (checkElement(element, QStringLiteral("attach-to"), ns_message_attaching)) {
         d->attachId = element.attribute(QStringLiteral("id"));
-    // XEP-0369: Mediated Information eXchange (MIX)
+        // XEP-0369: Mediated Information eXchange (MIX)
     } else if (checkElement(element, QStringLiteral("mix"), ns_mix)) {
         d->mixUserJid = element.firstChildElement(QStringLiteral("jid")).text();
         d->mixUserNick = element.firstChildElement(QStringLiteral("nick")).text();
-    // XEP-0380: Explicit Message Encryption
+        // XEP-0380: Explicit Message Encryption
     } else if (checkElement(element, QStringLiteral("encryption"), ns_eme)) {
         d->encryptionMethod = element.attribute(QStringLiteral("namespace"));
         d->encryptionName = element.attribute(QStringLiteral("name"));
-    // XEP-0382: Spoiler messages
+        // XEP-0382: Spoiler messages
     } else if (checkElement(element, QStringLiteral("spoiler"), ns_spoiler)) {
         d->isSpoiler = true;
         d->spoilerHint = element.text();
@@ -1118,8 +1113,7 @@ void QXmppMessage::parseXElement(const QDomElement &element, QXmppElementList &u
             // XEP-0091: Legacy Delayed Delivery
             d->stamp = QDateTime::fromString(
                 element.attribute(QStringLiteral("stamp")),
-                QStringLiteral("yyyyMMddThh:mm:ss")
-            );
+                QStringLiteral("yyyyMMddThh:mm:ss"));
             d->stamp.setTimeSpec(Qt::UTC);
             d->stampType = LegacyDelayedDelivery;
         }
diff --git a/src/base/QXmppMixIq.cpp b/src/base/QXmppMixIq.cpp
index 1ed02176..9362f0e7 100644
--- a/src/base/QXmppMixIq.cpp
+++ b/src/base/QXmppMixIq.cpp
@@ -57,11 +57,11 @@ QXmppMixIq::QXmppMixIq()
 {
 }
 
-QXmppMixIq::QXmppMixIq(const QXmppMixIq &) = default;
+QXmppMixIq::QXmppMixIq(const QXmppMixIq&) = default;
 
 QXmppMixIq::~QXmppMixIq() = default;
 
-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.
@@ -143,15 +143,14 @@ void QXmppMixIq::setActionType(QXmppMixIq::Type type)
 bool QXmppMixIq::isMixIq(const QDomElement& element)
 {
     const QDomElement& child = element.firstChildElement();
-    return !child.isNull() && (child.namespaceURI() == ns_mix
-           || child.namespaceURI() == ns_mix_pam);
+    return !child.isNull() && (child.namespaceURI() == ns_mix || child.namespaceURI() == ns_mix_pam);
 }
 
 void QXmppMixIq::parseElementFromChild(const QDomElement& element)
 {
     QDomElement child = element.firstChildElement();
     // determine action type
-    d->actionType = (QXmppMixIq::Type) MIX_ACTION_TYPES.indexOf(child.tagName());
+    d->actionType = (QXmppMixIq::Type)MIX_ACTION_TYPES.indexOf(child.tagName());
 
     if (child.namespaceURI() == ns_mix_pam) {
         if (child.hasAttribute("channel"))
@@ -200,7 +199,7 @@ void QXmppMixIq::toXmlElementFromChild(QXmlStreamWriter* writer) const
     if (type() == Result)
         helperToXmlAddAttribute(writer, "jid", d->jid);
 
-    for (const auto &node : d->nodes) {
+    for (const auto& node : d->nodes) {
         writer->writeStartElement("subscribe");
         writer->writeAttribute("node", node);
         writer->writeEndElement();
diff --git a/src/base/QXmppMixItem.cpp b/src/base/QXmppMixItem.cpp
index 882a3b99..2cee43d6 100644
--- a/src/base/QXmppMixItem.cpp
+++ b/src/base/QXmppMixItem.cpp
@@ -44,9 +44,9 @@ QXmppMixInfoItem::QXmppMixInfoItem()
 {
 }
 
-QXmppMixInfoItem::QXmppMixInfoItem(const QXmppMixInfoItem &) = default;
+QXmppMixInfoItem::QXmppMixInfoItem(const QXmppMixInfoItem&) = default;
 
-QXmppMixInfoItem &QXmppMixInfoItem::operator=(const QXmppMixInfoItem &) = default;
+QXmppMixInfoItem& QXmppMixInfoItem::operator=(const QXmppMixInfoItem&) = default;
 
 QXmppMixInfoItem::~QXmppMixInfoItem() = default;
 
@@ -99,7 +99,7 @@ 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() == "FORM_TYPE")
             return field.value() == ns_mix;
     }
@@ -174,9 +174,9 @@ QXmppMixParticipantItem::QXmppMixParticipantItem()
 {
 }
 
-QXmppMixParticipantItem::QXmppMixParticipantItem(const QXmppMixParticipantItem &) = default;
+QXmppMixParticipantItem::QXmppMixParticipantItem(const QXmppMixParticipantItem&) = default;
 
-QXmppMixParticipantItem &QXmppMixParticipantItem::operator=(const QXmppMixParticipantItem &) = default;
+QXmppMixParticipantItem& QXmppMixParticipantItem::operator=(const QXmppMixParticipantItem&) = default;
 
 QXmppMixParticipantItem::~QXmppMixParticipantItem() = default;
 
@@ -235,7 +235,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() == "participant" && element.namespaceURI() == ns_mix;
 }
diff --git a/src/base/QXmppMucIq.cpp b/src/base/QXmppMucIq.cpp
index d0c50fc2..5019cb40 100644
--- a/src/base/QXmppMucIq.cpp
+++ b/src/base/QXmppMucIq.cpp
@@ -30,7 +30,7 @@
 
 QXmppMucItem::QXmppMucItem()
     : m_affiliation(QXmppMucItem::UnspecifiedAffiliation),
-    m_role(QXmppMucItem::UnspecifiedRole)
+      m_role(QXmppMucItem::UnspecifiedRole)
 {
 }
 
@@ -39,11 +39,11 @@ QXmppMucItem::QXmppMucItem()
 bool QXmppMucItem::isNull() const
 {
     return m_actor.isEmpty() &&
-           m_affiliation == UnspecifiedAffiliation &&
-           m_jid.isEmpty() &&
-           m_nick.isEmpty() &&
-           m_reason.isEmpty() &&
-           m_role == UnspecifiedRole;
+        m_affiliation == UnspecifiedAffiliation &&
+        m_jid.isEmpty() &&
+        m_nick.isEmpty() &&
+        m_reason.isEmpty() &&
+        m_role == UnspecifiedRole;
 }
 
 /// Returns the actor for this item, for instance the admin who kicked
@@ -266,8 +266,7 @@ void QXmppMucAdminIq::parseElementFromChild(const QDomElement &element)
 {
     QDomElement queryElement = element.firstChildElement("query");
     QDomElement child = queryElement.firstChildElement("item");
-    while (!child.isNull())
-    {
+    while (!child.isNull()) {
         QXmppMucItem item;
         item.parse(child);
         m_items << item;
diff --git a/src/base/QXmppNonSASLAuth.cpp b/src/base/QXmppNonSASLAuth.cpp
index 4acee23b..44e8b348 100644
--- a/src/base/QXmppNonSASLAuth.cpp
+++ b/src/base/QXmppNonSASLAuth.cpp
@@ -40,7 +40,7 @@ QString QXmppNonSASLAuthIq::username() const
     return m_username;
 }
 
-void QXmppNonSASLAuthIq::setUsername( const QString &username )
+void QXmppNonSASLAuthIq::setUsername(const QString &username)
 {
     m_username = username;
 }
@@ -60,7 +60,7 @@ QString QXmppNonSASLAuthIq::password() const
     return m_password;
 }
 
-void QXmppNonSASLAuthIq::setPassword( const QString &password )
+void QXmppNonSASLAuthIq::setPassword(const QString &password)
 {
     m_password = password;
 }
diff --git a/src/base/QXmppPingIq.cpp b/src/base/QXmppPingIq.cpp
index 3a8d49fe..50e3463f 100644
--- a/src/base/QXmppPingIq.cpp
+++ b/src/base/QXmppPingIq.cpp
@@ -45,4 +45,3 @@ void QXmppPingIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
     writer->writeDefaultNamespace(ns_ping);
     writer->writeEndElement();
 }
-
diff --git a/src/base/QXmppPresence.cpp b/src/base/QXmppPresence.cpp
index f7959aa6..0a8e33cd 100644
--- a/src/base/QXmppPresence.cpp
+++ b/src/base/QXmppPresence.cpp
@@ -53,7 +53,7 @@ class QXmppPresencePrivate : public QSharedData
 {
 public:
     QXmppPresencePrivate();
-    
+
     QXmppPresence::Type type;
     QXmppPresence::AvailableStatusType availableStatusType;
     QString statusText;
@@ -167,7 +167,7 @@ QString QXmppPresence::statusText() const
 ///
 /// \param statusText The status text, for example "Gone fishing".
 
-void QXmppPresence::setStatusText(const QString& statusText)
+void QXmppPresence::setStatusText(const QString &statusText)
 {
     d->statusText = statusText;
 }
@@ -206,7 +206,7 @@ QByteArray QXmppPresence::photoHash() const
 ///
 /// \param photoHash as QByteArray
 
-void QXmppPresence::setPhotoHash(const QByteArray& photoHash)
+void QXmppPresence::setPhotoHash(const QByteArray &photoHash)
 {
     d->photoHash = photoHash;
 }
@@ -236,7 +236,7 @@ QString QXmppPresence::capabilityHash() const
 }
 
 /// XEP-0115: Entity Capabilities
-void QXmppPresence::setCapabilityHash(const QString& hash)
+void QXmppPresence::setCapabilityHash(const QString &hash)
 {
     d->capabilityHash = hash;
 }
@@ -248,7 +248,7 @@ QString QXmppPresence::capabilityNode() const
 }
 
 /// XEP-0115: Entity Capabilities
-void QXmppPresence::setCapabilityNode(const QString& node)
+void QXmppPresence::setCapabilityNode(const QString &node)
 {
     d->capabilityNode = node;
 }
@@ -260,7 +260,7 @@ QByteArray QXmppPresence::capabilityVer() const
 }
 
 /// XEP-0115: Entity Capabilities
-void QXmppPresence::setCapabilityVer(const QByteArray& ver)
+void QXmppPresence::setCapabilityVer(const QByteArray &ver)
 {
     d->capabilityVer = ver;
 }
@@ -342,7 +342,7 @@ QDateTime QXmppPresence::lastUserInteraction() const
 /// Sets the time of the last user interaction as defined in XEP-0319: Last
 /// User Interaction in Presence.
 
-void QXmppPresence::setLastUserInteraction(const QDateTime& lastUserInteraction)
+void QXmppPresence::setLastUserInteraction(const QDateTime &lastUserInteraction)
 {
     d->lastUserInteraction = lastUserInteraction;
 }
@@ -360,7 +360,7 @@ QString QXmppPresence::mixUserJid() const
 ///
 /// \since QXmpp 1.1
 
-void QXmppPresence::setMixUserJid(const QString& mixUserJid)
+void QXmppPresence::setMixUserJid(const QString &mixUserJid)
 {
     d->mixUserJid = mixUserJid;
 }
@@ -378,7 +378,7 @@ QString QXmppPresence::mixUserNick() const
 ///
 /// \since QXmpp 1.1
 
-void QXmppPresence::setMixUserNick(const QString& mixUserNick)
+void QXmppPresence::setMixUserNick(const QString &mixUserNick)
 {
     d->mixUserNick = mixUserNick;
 }
@@ -405,8 +405,8 @@ void QXmppPresence::parse(const QDomElement &element)
             d->statusText = childElement.text();
         } else if (childElement.tagName() == QStringLiteral("priority")) {
             d->priority = childElement.text().toInt();
-        // parse presence extensions
-        // XEP-0033: Extended Stanza Addressing and errors are parsed by QXmppStanza
+            // parse presence extensions
+            // XEP-0033: Extended Stanza Addressing and errors are parsed by QXmppStanza
         } else if (!(childElement.tagName() == QStringLiteral("addresses") && childElement.namespaceURI() == ns_extended_addressing) &&
                    childElement.tagName() != "error") {
             parseExtension(childElement, unknownElements);
@@ -433,13 +433,13 @@ void QXmppPresence::parseExtension(const QDomElement &element, QXmppElementList
             d->mucStatusCodes << statusElement.attribute(QStringLiteral("code")).toInt();
             statusElement = statusElement.nextSiblingElement(QStringLiteral("status"));
         }
-    // XEP-0115: Entity Capabilities
+        // XEP-0115: Entity Capabilities
     } else if (element.tagName() == QStringLiteral("c") && element.namespaceURI() == ns_capabilities) {
         d->capabilityNode = element.attribute(QStringLiteral("node"));
         d->capabilityVer = QByteArray::fromBase64(element.attribute(QStringLiteral("ver")).toLatin1());
         d->capabilityHash = element.attribute(QStringLiteral("hash"));
         d->capabilityExt = element.attribute(QStringLiteral("ext")).split(' ', QString::SkipEmptyParts);
-    // XEP-0153: vCard-Based Avatars
+        // XEP-0153: vCard-Based Avatars
     } else if (element.namespaceURI() == ns_vcard_update) {
         QDomElement photoElement = element.firstChildElement(QStringLiteral("photo"));
         if (photoElement.isNull()) {
@@ -452,13 +452,13 @@ void QXmppPresence::parseExtension(const QDomElement &element, QXmppElementList
             else
                 d->vCardUpdateType = VCardUpdateValidPhoto;
         }
-    // XEP-0319: Last User Interaction in Presence
+        // XEP-0319: Last User Interaction in Presence
     } else if (element.tagName() == QStringLiteral("idle") && element.namespaceURI() == ns_idle) {
         if (element.hasAttribute(QStringLiteral("since"))) {
             const QString since = element.attribute(QStringLiteral("since"));
             d->lastUserInteraction = QXmppUtils::datetimeFromString(since);
         }
-    // XEP-0405: Mediated Information eXchange (MIX): Participant Server Requirements
+        // XEP-0405: Mediated Information eXchange (MIX): Participant Server Requirements
     } else if (element.tagName() == QStringLiteral("mix") && element.namespaceURI() == ns_mix_presence) {
         d->mixUserJid = element.firstChildElement(QStringLiteral("jid")).text();
         d->mixUserNick = element.firstChildElement(QStringLiteral("nick")).text();
@@ -510,8 +510,8 @@ void QXmppPresence::toXml(QXmlStreamWriter *xmlWriter) const
 
     // XEP-0115: Entity Capabilities
     if (!d->capabilityNode.isEmpty() &&
-            !d->capabilityVer.isEmpty() &&
-            !d->capabilityHash.isEmpty()) {
+        !d->capabilityVer.isEmpty() &&
+        !d->capabilityHash.isEmpty()) {
         xmlWriter->writeStartElement(QStringLiteral("c"));
         xmlWriter->writeDefaultNamespace(ns_capabilities);
         helperToXmlAddAttribute(xmlWriter, QStringLiteral("hash"), d->capabilityHash);
@@ -524,7 +524,7 @@ void QXmppPresence::toXml(QXmlStreamWriter *xmlWriter) const
     if (d->vCardUpdateType != VCardUpdateNone) {
         xmlWriter->writeStartElement(QStringLiteral("x"));
         xmlWriter->writeDefaultNamespace(ns_vcard_update);
-        switch(d->vCardUpdateType) {
+        switch (d->vCardUpdateType) {
         case VCardUpdateNoPhoto:
             xmlWriter->writeEmptyElement(QStringLiteral("photo"));
             break;
diff --git a/src/base/QXmppPubSubIq.cpp b/src/base/QXmppPubSubIq.cpp
index 9ef3c952..29155fbf 100644
--- a/src/base/QXmppPubSubIq.cpp
+++ b/src/base/QXmppPubSubIq.cpp
@@ -178,8 +178,7 @@ void QXmppPubSubIq::parseElementFromChild(const QDomElement &element)
     case QXmppPubSubIq::PublishQuery:
     case QXmppPubSubIq::RetractQuery:
         childElement = queryElement.firstChildElement("item");
-        while (!childElement.isNull())
-        {
+        while (!childElement.isNull()) {
             QXmppPubSubItem item;
             item.parse(childElement);
             d->items << item;
@@ -206,8 +205,7 @@ void QXmppPubSubIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
     helperToXmlAddAttribute(writer, "node", d->queryNode);
 
     // write contents
-    switch (d->queryType)
-    {
+    switch (d->queryType) {
     case QXmppPubSubIq::ItemsQuery:
     case QXmppPubSubIq::PublishQuery:
     case QXmppPubSubIq::RetractQuery:
diff --git a/src/base/QXmppResultSet.cpp b/src/base/QXmppResultSet.cpp
index 5e52cba8..37d4f1db 100644
--- a/src/base/QXmppResultSet.cpp
+++ b/src/base/QXmppResultSet.cpp
@@ -30,9 +30,9 @@
 #include <QDomElement>
 
 QXmppResultSetQuery::QXmppResultSetQuery()
-    : m_index(-1)
-    , m_max(-1)
-{}
+    : m_index(-1), m_max(-1)
+{
+}
 
 /// Returns the maximum number of results.
 ///
@@ -68,7 +68,7 @@ int QXmppResultSetQuery::index() const
 
 void QXmppResultSetQuery::setIndex(int index)
 {
-    m_index=index;
+    m_index = index;
 }
 
 /// Returns the UID of the first result in the next page.
@@ -86,7 +86,7 @@ QString QXmppResultSetQuery::before() const
 
 void QXmppResultSetQuery::setBefore(const QString& before)
 {
-    m_before=before;
+    m_before = before;
 }
 
 /// Returns the UID of the last result in the previous page.
@@ -104,7 +104,7 @@ QString QXmppResultSetQuery::after() const
 
 void QXmppResultSetQuery::setAfter(const QString& after)
 {
-    m_after=after;
+    m_after = after;
 }
 
 /// Returns true if no result set information is present.
@@ -121,11 +121,13 @@ void QXmppResultSetQuery::parse(const QDomElement& element)
     if (setElement.namespaceURI() == ns_rsm) {
         bool ok = false;
         m_max = setElement.firstChildElement("max").text().toInt(&ok);
-        if (!ok) m_max = -1;
+        if (!ok)
+            m_max = -1;
         m_after = setElement.firstChildElement("after").text();
         m_before = setElement.firstChildElement("before").text();
         m_index = setElement.firstChildElement("index").text().toInt(&ok);
-        if (!ok) m_index = -1;
+        if (!ok)
+            m_index = -1;
     }
 }
 
@@ -148,9 +150,9 @@ void QXmppResultSetQuery::toXml(QXmlStreamWriter* writer) const
 /// \endcond
 
 QXmppResultSetReply::QXmppResultSetReply()
-    : m_count(-1)
-    , m_index(-1)
-{}
+    : m_count(-1), m_index(-1)
+{
+}
 
 /// Returns the UID of the first result in the page.
 
@@ -163,7 +165,7 @@ QString QXmppResultSetReply::first() const
 
 void QXmppResultSetReply::setFirst(const QString& first)
 {
-    m_first=first;
+    m_first = first;
 }
 
 /// Returns the UID of the last result in the page.
@@ -177,7 +179,7 @@ QString QXmppResultSetReply::last() const
 
 void QXmppResultSetReply::setLast(const QString& last)
 {
-    m_last=last;
+    m_last = last;
 }
 
 /// Returns the total number of items in the set.
@@ -237,7 +239,8 @@ void QXmppResultSetReply::parse(const QDomElement& element)
         m_first = firstElem.text();
         bool ok = false;
         m_index = firstElem.attribute("index").toInt(&ok);
-        if(!ok) m_index = -1;
+        if (!ok)
+            m_index = -1;
         m_last = setElement.firstChildElement("last").text();
     }
 }
diff --git a/src/base/QXmppRosterIq.cpp b/src/base/QXmppRosterIq.cpp
index f37f4a68..a930a3ca 100644
--- a/src/base/QXmppRosterIq.cpp
+++ b/src/base/QXmppRosterIq.cpp
@@ -52,7 +52,7 @@ QXmppRosterIq &QXmppRosterIq::operator=(const QXmppRosterIq &) = default;
 ///
 /// \param item
 
-void QXmppRosterIq::addItem(const Item& item)
+void QXmppRosterIq::addItem(const Item &item)
 {
     d->items.append(item);
 }
@@ -96,8 +96,7 @@ void QXmppRosterIq::parseElementFromChild(const QDomElement &element)
     QDomElement itemElement = queryElement.firstChildElement("item");
 
     setVersion(queryElement.attribute("ver"));
-    while(!itemElement.isNull())
-    {
+    while (!itemElement.isNull()) {
         QXmppRosterIq::Item item;
         item.parse(itemElement);
         d->items.append(item);
@@ -111,9 +110,9 @@ void QXmppRosterIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
     writer->writeDefaultNamespace(ns_roster);
 
     // XEP-0237 roster versioning - If the server does not advertise support for roster versioning, the client MUST NOT include the 'ver' attribute.
-    if(!version().isEmpty())
-        writer->writeAttribute( "ver", version());
-    for(int i = 0; i < d->items.count(); ++i)
+    if (!version().isEmpty())
+        writer->writeAttribute("ver", version());
+    for (int i = 0; i < d->items.count(); ++i)
         d->items.at(i).toXml(writer);
     writer->writeEndElement();
 }
@@ -142,7 +141,7 @@ QXmppRosterIq::Item::Item(const QXmppRosterIq::Item &other) = default;
 
 QXmppRosterIq::Item::~Item() = default;
 
-QXmppRosterIq::Item& QXmppRosterIq::Item::operator=(const Item &other) = default;
+QXmppRosterIq::Item &QXmppRosterIq::Item::operator=(const Item &other) = default;
 
 /// Returns the bareJid of the roster entry.
 ///
@@ -179,7 +178,7 @@ QSet<QString> QXmppRosterIq::Item::groups() const
 /// \param groups list of all the groups as a QSet<QString>
 ///
 
-void QXmppRosterIq::Item::setGroups(const QSet<QString>& groups)
+void QXmppRosterIq::Item::setGroups(const QSet<QString> &groups)
 {
     d->groups = groups;
 }
@@ -233,7 +232,7 @@ void QXmppRosterIq::Item::setSubscriptionStatus(const QString &status)
 ///
 
 QXmppRosterIq::Item::SubscriptionType
-        QXmppRosterIq::Item::subscriptionType() const
+QXmppRosterIq::Item::subscriptionType() const
 {
     return d->type;
 }
@@ -250,8 +249,7 @@ void QXmppRosterIq::Item::setSubscriptionType(SubscriptionType type)
 
 QString QXmppRosterIq::Item::getSubscriptionTypeStr() const
 {
-    switch(d->type)
-    {
+    switch (d->type) {
     case NotSet:
         return "";
     case None:
@@ -264,27 +262,26 @@ QString QXmppRosterIq::Item::getSubscriptionTypeStr() const
         return "to";
     case Remove:
         return "remove";
-    default:
-        {
-            qWarning("QXmppRosterIq::Item::getTypeStr(): invalid type");
-            return "";
-        }
+    default: {
+        qWarning("QXmppRosterIq::Item::getTypeStr(): invalid type");
+        return "";
+    }
     }
 }
 
-void QXmppRosterIq::Item::setSubscriptionTypeFromStr(const QString& type)
+void QXmppRosterIq::Item::setSubscriptionTypeFromStr(const QString &type)
 {
-    if(type == "")
+    if (type == "")
         setSubscriptionType(NotSet);
-    else if(type == "none")
+    else if (type == "none")
         setSubscriptionType(None);
-    else if(type == "both")
+    else if (type == "both")
         setSubscriptionType(Both);
-    else if(type == "from")
+    else if (type == "from")
         setSubscriptionType(From);
-    else if(type == "to")
+    else if (type == "to")
         setSubscriptionType(To);
-    else if(type == "remove")
+    else if (type == "remove")
         setSubscriptionType(Remove);
     else
         qWarning("QXmppRosterIq::Item::setTypeFromStr(): invalid type");
@@ -299,8 +296,7 @@ void QXmppRosterIq::Item::parse(const QDomElement &element)
     setSubscriptionStatus(element.attribute("ask"));
 
     QDomElement groupElement = element.firstChildElement("group");
-    while(!groupElement.isNull())
-    {
+    while (!groupElement.isNull()) {
         d->groups << groupElement.text();
         groupElement = groupElement.nextSiblingElement("group");
     }
@@ -309,15 +305,14 @@ void QXmppRosterIq::Item::parse(const QDomElement &element)
 void QXmppRosterIq::Item::toXml(QXmlStreamWriter *writer) const
 {
     writer->writeStartElement("item");
-    helperToXmlAddAttribute(writer,"jid", d->bareJid);
-    helperToXmlAddAttribute(writer,"name", d->name);
-    helperToXmlAddAttribute(writer,"subscription", getSubscriptionTypeStr());
+    helperToXmlAddAttribute(writer, "jid", d->bareJid);
+    helperToXmlAddAttribute(writer, "name", d->name);
+    helperToXmlAddAttribute(writer, "subscription", getSubscriptionTypeStr());
     helperToXmlAddAttribute(writer, "ask", subscriptionStatus());
 
     QSet<QString>::const_iterator i = d->groups.constBegin();
-    while(i != d->groups.constEnd())
-    {
-        helperToXmlAddTextElement(writer,"group", *i);
+    while (i != d->groups.constEnd()) {
+        helperToXmlAddTextElement(writer, "group", *i);
         ++i;
     }
     writer->writeEndElement();
diff --git a/src/base/QXmppRpcIq.cpp b/src/base/QXmppRpcIq.cpp
index b69aef48..a769af07 100644
--- a/src/base/QXmppRpcIq.cpp
+++ b/src/base/QXmppRpcIq.cpp
@@ -22,172 +22,149 @@
  *
  */
 
-#include <QDomElement>
-#include <QMap>
-#include <QVariant>
-#include <QDateTime>
-#include <QStringList>
+#include "QXmppRpcIq.h"
 
 #include "QXmppConstants_p.h"
-#include "QXmppRpcIq.h"
 #include "QXmppUtils.h"
 
+#include <QDateTime>
+#include <QDomElement>
+#include <QMap>
+#include <QStringList>
+#include <QVariant>
+
 void QXmppRpcMarshaller::marshall(QXmlStreamWriter *writer, const QVariant &value)
 {
     writer->writeStartElement("value");
-    switch( value.type() )
-    {
-        case QVariant::Int:
-        case QVariant::UInt:
-        case QVariant::LongLong:
-        case QVariant::ULongLong:
-            writer->writeTextElement("i4", value.toString());
-            break;
-        case QVariant::Double:
-            writer->writeTextElement("double", value.toString());
-            break;
-        case QVariant::Bool:
-            writer->writeTextElement("boolean", value.toBool() ? "1" : "0");
-            break;
-        case QVariant::Date:
-            writer->writeTextElement("dateTime.iso8601", value.toDate().toString( Qt::ISODate ) );
-            break;
-        case QVariant::DateTime:
-            writer->writeTextElement("dateTime.iso8601", value.toDateTime().toString( Qt::ISODate ) );
-            break;
-        case QVariant::Time:
-            writer->writeTextElement("dateTime.iso8601", value.toTime().toString( Qt::ISODate ) );
-            break;
-        case QVariant::StringList:
-        case QVariant::List:
-        {
-            writer->writeStartElement("array");
-            writer->writeStartElement("data");
-            for (const auto &item : value.toList())
-                marshall(writer, item);
-            writer->writeEndElement();
-            writer->writeEndElement();
-            break;
-        }
-        case QVariant::Map:
-        {
-            writer->writeStartElement("struct");
-            QMap<QString, QVariant> map = value.toMap();
-            QMap<QString, QVariant>::ConstIterator index = map.begin();
-            while( index != map.end() )
-            {
-                writer->writeStartElement("member");
-                writer->writeTextElement("name", index.key());
-                marshall( writer, *index );
-                writer->writeEndElement();
-                ++index;
-            }
+    switch (value.type()) {
+    case QVariant::Int:
+    case QVariant::UInt:
+    case QVariant::LongLong:
+    case QVariant::ULongLong:
+        writer->writeTextElement("i4", value.toString());
+        break;
+    case QVariant::Double:
+        writer->writeTextElement("double", value.toString());
+        break;
+    case QVariant::Bool:
+        writer->writeTextElement("boolean", value.toBool() ? "1" : "0");
+        break;
+    case QVariant::Date:
+        writer->writeTextElement("dateTime.iso8601", value.toDate().toString(Qt::ISODate));
+        break;
+    case QVariant::DateTime:
+        writer->writeTextElement("dateTime.iso8601", value.toDateTime().toString(Qt::ISODate));
+        break;
+    case QVariant::Time:
+        writer->writeTextElement("dateTime.iso8601", value.toTime().toString(Qt::ISODate));
+        break;
+    case QVariant::StringList:
+    case QVariant::List: {
+        writer->writeStartElement("array");
+        writer->writeStartElement("data");
+        for (const auto &item : value.toList())
+            marshall(writer, item);
+        writer->writeEndElement();
+        writer->writeEndElement();
+        break;
+    }
+    case QVariant::Map: {
+        writer->writeStartElement("struct");
+        QMap<QString, QVariant> map = value.toMap();
+        QMap<QString, QVariant>::ConstIterator index = map.begin();
+        while (index != map.end()) {
+            writer->writeStartElement("member");
+            writer->writeTextElement("name", index.key());
+            marshall(writer, *index);
             writer->writeEndElement();
-            break;
-        }
-        case QVariant::ByteArray:
-        {
-            writer->writeTextElement("base64", value.toByteArray().toBase64() );
-            break;
+            ++index;
         }
-        default:
-        {
-            if (value.isNull())
-                writer->writeEmptyElement("nil");
-            else if( value.canConvert(QVariant::String) )
-            {
-                writer->writeTextElement("string", value.toString() );
-            }
-            break;
+        writer->writeEndElement();
+        break;
+    }
+    case QVariant::ByteArray: {
+        writer->writeTextElement("base64", value.toByteArray().toBase64());
+        break;
+    }
+    default: {
+        if (value.isNull())
+            writer->writeEmptyElement("nil");
+        else if (value.canConvert(QVariant::String)) {
+            writer->writeTextElement("string", value.toString());
         }
+        break;
+    }
     }
     writer->writeEndElement();
 }
 
 QVariant QXmppRpcMarshaller::demarshall(const QDomElement &elem, QStringList &errors)
 {
-    if ( elem.tagName().toLower() != "value" )
-    {
+    if (elem.tagName().toLower() != "value") {
         errors << "Bad param value";
         return QVariant();
     }
 
-    if ( !elem.firstChild().isElement() )
-    {
-        return QVariant( elem.text() );
+    if (!elem.firstChild().isElement()) {
+        return QVariant(elem.text());
     }
 
     const QDomElement typeData = elem.firstChild().toElement();
     const QString typeName = typeData.tagName().toLower();
 
-    if (typeName == "nil")
-    {
+    if (typeName == "nil") {
         return QVariant();
     }
-    if ( typeName == "string" )
-    {
-        return QVariant( typeData.text() );
-    }
-    else if (typeName == "int" || typeName == "i4" )
-    {
+    if (typeName == "string") {
+        return QVariant(typeData.text());
+    } else if (typeName == "int" || typeName == "i4") {
         bool ok = false;
-        QVariant val( typeData.text().toInt( &ok ) );
+        QVariant val(typeData.text().toInt(&ok));
         if (ok)
             return val;
         errors << "I was looking for an integer but data was courupt";
         return QVariant();
-    }
-    else if( typeName == "double" )
-    {
+    } else if (typeName == "double") {
         bool ok = false;
-        QVariant val( typeData.text().toDouble( &ok ) );
+        QVariant val(typeData.text().toDouble(&ok));
         if (ok)
             return val;
-        errors <<  "I was looking for an double but data was corrupt";
-    }
-    else if( typeName == "boolean" )
-        return QVariant( typeData.text() == "1" || typeData.text().toLower() == "true" );
-    else if( typeName == "datetime" || typeName == "datetime.iso8601" )
-        return QVariant( QDateTime::fromString( typeData.text(), Qt::ISODate ) );
-    else if( typeName == "array" )
-    {
+        errors << "I was looking for an double but data was corrupt";
+    } else if (typeName == "boolean")
+        return QVariant(typeData.text() == "1" || typeData.text().toLower() == "true");
+    else if (typeName == "datetime" || typeName == "datetime.iso8601")
+        return QVariant(QDateTime::fromString(typeData.text(), Qt::ISODate));
+    else if (typeName == "array") {
         QVariantList arr;
         QDomElement valueNode = typeData.firstChildElement("data").firstChildElement();
-        while (!valueNode.isNull() && errors.isEmpty())
-        {
+        while (!valueNode.isNull() && errors.isEmpty()) {
             arr.append(demarshall(valueNode, errors));
             valueNode = valueNode.nextSiblingElement();
         }
-        return QVariant( arr );
-    }
-    else if( typeName == "struct" )
-    {
-        QMap<QString,QVariant> stct;
+        return QVariant(arr);
+    } else if (typeName == "struct") {
+        QMap<QString, QVariant> stct;
         QDomNode valueNode = typeData.firstChild();
-        while(!valueNode.isNull() && errors.isEmpty())
-        {
+        while (!valueNode.isNull() && errors.isEmpty()) {
             const QDomElement memberNode = valueNode.toElement().elementsByTagName("name").item(0).toElement();
             const QDomElement dataNode = valueNode.toElement().elementsByTagName("value").item(0).toElement();
-            stct[ memberNode.text() ] = demarshall(dataNode, errors);
+            stct[memberNode.text()] = demarshall(dataNode, errors);
             valueNode = valueNode.nextSibling();
         }
         return QVariant(stct);
-    }
-    else if( typeName == "base64" )
-    {
+    } else if (typeName == "base64") {
         QVariant returnVariant;
         QByteArray dest;
         QByteArray src = typeData.text().toLatin1();
         return QVariant(QByteArray::fromBase64(src));
     }
 
-    errors << QString( "Cannot handle type %1").arg(typeName);
+    errors << QString("Cannot handle type %1").arg(typeName);
     return QVariant();
 }
 
-QXmppRpcErrorIq::QXmppRpcErrorIq() : QXmppIq( QXmppIq::Error )
+QXmppRpcErrorIq::QXmppRpcErrorIq() : QXmppIq(QXmppIq::Error)
 {
-
 }
 
 QXmppRpcInvokeIq QXmppRpcErrorIq::query() const
@@ -207,8 +184,8 @@ bool QXmppRpcErrorIq::isRpcErrorIq(const QDomElement &element)
     QDomElement errorElement = element.firstChildElement("error");
     QDomElement queryElement = element.firstChildElement("query");
     return (type == "error") &&
-            !errorElement.isNull() &&
-            queryElement.namespaceURI() == ns_rpc;
+        !errorElement.isNull() &&
+        queryElement.namespaceURI() == ns_rpc;
 }
 
 void QXmppRpcErrorIq::parseElementFromChild(const QDomElement &element)
@@ -224,7 +201,7 @@ void QXmppRpcErrorIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
 
 QXmppRpcResponseIq::QXmppRpcResponseIq()
     : QXmppIq(QXmppIq::Result),
-    m_faultCode(0)
+      m_faultCode(0)
 {
 }
 
@@ -257,7 +234,7 @@ QString QXmppRpcResponseIq::faultString() const
 ///
 /// \param faultString
 
-void QXmppRpcResponseIq::setFaultString(const QString& faultString)
+void QXmppRpcResponseIq::setFaultString(const QString &faultString)
 {
     m_faultString = faultString;
 }
@@ -285,7 +262,7 @@ bool QXmppRpcResponseIq::isRpcResponseIq(const QDomElement &element)
     QString type = element.attribute("type");
     QDomElement dataElement = element.firstChildElement("query");
     return dataElement.namespaceURI() == ns_rpc &&
-           type == "result";
+        type == "result";
 }
 
 void QXmppRpcResponseIq::parseElementFromChild(const QDomElement &element)
@@ -294,11 +271,9 @@ void QXmppRpcResponseIq::parseElementFromChild(const QDomElement &element)
     QDomElement methodElement = queryElement.firstChildElement("methodResponse");
 
     const QDomElement contents = methodElement.firstChildElement();
-    if( contents.tagName().toLower() == "params")
-    {
+    if (contents.tagName().toLower() == "params") {
         QDomNode param = contents.firstChildElement("param");
-        while (!param.isNull())
-        {
+        while (!param.isNull()) {
             QStringList errors;
             const QVariant value = QXmppRpcMarshaller::demarshall(param.firstChildElement("value"), errors);
             if (!errors.isEmpty())
@@ -306,9 +281,7 @@ void QXmppRpcResponseIq::parseElementFromChild(const QDomElement &element)
             m_values << value;
             param = param.nextSiblingElement("param");
         }
-    }
-    else if( contents.tagName().toLower() == "fault")
-    {
+    } else if (contents.tagName().toLower() == "fault") {
         QStringList errors;
         const QDomElement errElement = contents.firstChildElement("value");
         const QVariant error = QXmppRpcMarshaller::demarshall(errElement, errors);
@@ -325,17 +298,14 @@ void QXmppRpcResponseIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
     writer->writeDefaultNamespace(ns_rpc);
 
     writer->writeStartElement("methodResponse");
-    if (m_faultCode)
-    {
+    if (m_faultCode) {
         writer->writeStartElement("fault");
-        QMap<QString,QVariant> fault;
+        QMap<QString, QVariant> fault;
         fault["faultCode"] = m_faultCode;
         fault["faultString"] = m_faultString;
         QXmppRpcMarshaller::marshall(writer, fault);
         writer->writeEndElement();
-    }
-    else if (!m_values.isEmpty())
-    {
+    } else if (!m_values.isEmpty()) {
         writer->writeStartElement("params");
         for (const auto &arg : m_values) {
             writer->writeStartElement("param");
@@ -395,7 +365,7 @@ bool QXmppRpcInvokeIq::isRpcInvokeIq(const QDomElement &element)
     QString type = element.attribute("type");
     QDomElement dataElement = element.firstChildElement("query");
     return dataElement.namespaceURI() == ns_rpc &&
-           type == "set";
+        type == "set";
 }
 
 void QXmppRpcInvokeIq::parseElementFromChild(const QDomElement &element)
@@ -407,11 +377,9 @@ void QXmppRpcInvokeIq::parseElementFromChild(const QDomElement &element)
 
     const QDomElement methodParams = methodElement.firstChildElement("params");
     m_arguments.clear();
-    if( !methodParams.isNull() )
-    {
+    if (!methodParams.isNull()) {
         QDomNode param = methodParams.firstChildElement("param");
-        while (!param.isNull())
-        {
+        while (!param.isNull()) {
             QStringList errors;
             QVariant arg = QXmppRpcMarshaller::demarshall(param.firstChildElement("value"), errors);
             if (!errors.isEmpty())
@@ -429,8 +397,7 @@ void QXmppRpcInvokeIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
 
     writer->writeStartElement("methodCall");
     writer->writeTextElement("methodName", m_method);
-    if (!m_arguments.isEmpty())
-    {
+    if (!m_arguments.isEmpty()) {
         writer->writeStartElement("params");
         for (const auto &arg : m_arguments) {
             writer->writeStartElement("param");
diff --git a/src/base/QXmppRtcpPacket.cpp b/src/base/QXmppRtcpPacket.cpp
index 3b3be8b3..5ddb96f0 100644
--- a/src/base/QXmppRtcpPacket.cpp
+++ b/src/base/QXmppRtcpPacket.cpp
@@ -30,7 +30,7 @@
 
 enum DescriptionType {
     CnameType = 1,
-    NameType  = 2
+    NameType = 2
 };
 
 class QXmppRtcpPacketPrivate : public QSharedData
@@ -349,9 +349,7 @@ void QXmppRtcpPacket::setType(quint8 type)
 }
 
 QXmppRtcpPacketPrivate::QXmppRtcpPacketPrivate()
-    : count(0)
-    , type(0)
-    , ssrc(0)
+    : count(0), type(0), ssrc(0)
 {
 }
 
@@ -436,13 +434,7 @@ void QXmppRtcpReceiverReport::setTotalLost(quint32 totalLost)
 }
 
 QXmppRtcpReceiverReportPrivate::QXmppRtcpReceiverReportPrivate()
-    : ssrc(0)
-    , fractionLost(0)
-    , totalLost(0)
-    , highestSequence(0)
-    , jitter(0)
-    , lsr(0)
-    , dlsr(0)
+    : ssrc(0), fractionLost(0), totalLost(0), highestSequence(0), jitter(0), lsr(0), dlsr(0)
 {
 }
 
@@ -531,10 +523,7 @@ void QXmppRtcpSenderInfo::setPacketCount(quint32 count)
 }
 
 QXmppRtcpSenderInfoPrivate::QXmppRtcpSenderInfoPrivate()
-    : ntpStamp(0)
-    , rtpStamp(0)
-    , packetCount(0)
-    , octetCount(0)
+    : ntpStamp(0), rtpStamp(0), packetCount(0), octetCount(0)
 {
 }
 
diff --git a/src/base/QXmppRtpChannel.cpp b/src/base/QXmppRtpChannel.cpp
index 7fc69eb9..848cd3d3 100644
--- a/src/base/QXmppRtpChannel.cpp
+++ b/src/base/QXmppRtpChannel.cpp
@@ -121,8 +121,7 @@ enum CodecId {
     G729 = 18
 };
 
-struct ToneInfo
-{
+struct ToneInfo {
     QXmppRtpAudioChannel::Tone tone;
     quint32 incomingStart;
     quint32 outgoingStart;
@@ -132,29 +131,45 @@ struct ToneInfo
 static QPair<int, int> toneFreqs(QXmppRtpAudioChannel::Tone tone)
 {
     switch (tone) {
-    case QXmppRtpAudioChannel::Tone_1: return qMakePair(697, 1209);
-    case QXmppRtpAudioChannel::Tone_2: return qMakePair(697, 1336);
-    case QXmppRtpAudioChannel::Tone_3: return qMakePair(697, 1477);
-    case QXmppRtpAudioChannel::Tone_A: return qMakePair(697, 1633);
-    case QXmppRtpAudioChannel::Tone_4: return qMakePair(770, 1209);
-    case QXmppRtpAudioChannel::Tone_5: return qMakePair(770, 1336);
-    case QXmppRtpAudioChannel::Tone_6: return qMakePair(770, 1477);
-    case QXmppRtpAudioChannel::Tone_B: return qMakePair(770, 1633);
-    case QXmppRtpAudioChannel::Tone_7: return qMakePair(852, 1209);
-    case QXmppRtpAudioChannel::Tone_8: return qMakePair(852, 1336);
-    case QXmppRtpAudioChannel::Tone_9: return qMakePair(852, 1477);
-    case QXmppRtpAudioChannel::Tone_C: return qMakePair(852, 1633);
-    case QXmppRtpAudioChannel::Tone_Star: return qMakePair(941, 1209);
-    case QXmppRtpAudioChannel::Tone_0: return qMakePair(941, 1336);
-    case QXmppRtpAudioChannel::Tone_Pound: return qMakePair(941, 1477);
-    case QXmppRtpAudioChannel::Tone_D: return qMakePair(941, 1633);
+    case QXmppRtpAudioChannel::Tone_1:
+        return qMakePair(697, 1209);
+    case QXmppRtpAudioChannel::Tone_2:
+        return qMakePair(697, 1336);
+    case QXmppRtpAudioChannel::Tone_3:
+        return qMakePair(697, 1477);
+    case QXmppRtpAudioChannel::Tone_A:
+        return qMakePair(697, 1633);
+    case QXmppRtpAudioChannel::Tone_4:
+        return qMakePair(770, 1209);
+    case QXmppRtpAudioChannel::Tone_5:
+        return qMakePair(770, 1336);
+    case QXmppRtpAudioChannel::Tone_6:
+        return qMakePair(770, 1477);
+    case QXmppRtpAudioChannel::Tone_B:
+        return qMakePair(770, 1633);
+    case QXmppRtpAudioChannel::Tone_7:
+        return qMakePair(852, 1209);
+    case QXmppRtpAudioChannel::Tone_8:
+        return qMakePair(852, 1336);
+    case QXmppRtpAudioChannel::Tone_9:
+        return qMakePair(852, 1477);
+    case QXmppRtpAudioChannel::Tone_C:
+        return qMakePair(852, 1633);
+    case QXmppRtpAudioChannel::Tone_Star:
+        return qMakePair(941, 1209);
+    case QXmppRtpAudioChannel::Tone_0:
+        return qMakePair(941, 1336);
+    case QXmppRtpAudioChannel::Tone_Pound:
+        return qMakePair(941, 1477);
+    case QXmppRtpAudioChannel::Tone_D:
+        return qMakePair(941, 1633);
     }
     return qMakePair(0, 0);
 }
 
 QByteArray renderTone(QXmppRtpAudioChannel::Tone tone, int clockrate, quint32 clockTick, qint64 samples)
 {
-    QPair<int,int> tf = toneFreqs(tone);
+    QPair<int, int> tf = toneFreqs(tone);
     const float clockMult = 2.0 * M_PI / float(clockrate);
     QByteArray chunk;
     chunk.reserve(samples * SAMPLE_BYTES);
@@ -184,7 +199,7 @@ public:
 
     QByteArray incomingBuffer;
     bool incomingBuffering;
-    QMap<int, QXmppCodec*> incomingCodecs;
+    QMap<int, QXmppCodec *> incomingCodecs;
     int incomingMinimum;
     int incomingMaximum;
     // position of the head of the incoming buffer, in bytes
@@ -206,19 +221,7 @@ public:
 };
 
 QXmppRtpAudioChannelPrivate::QXmppRtpAudioChannelPrivate()
-    : signalsEmitted(false)
-    , writtenSinceLastEmit(0)
-    , incomingBuffering(true)
-    , incomingMinimum(0)
-    , incomingMaximum(0)
-    , incomingPos(0)
-    , incomingSequence(0)
-    , outgoingCodec(nullptr)
-    , outgoingMarker(true)
-    , outgoingPayloadNumbered(false)
-    , outgoingSequence(1)
-    , outgoingStamp(0)
-    , outgoingTimer(nullptr)
+    : signalsEmitted(false), writtenSinceLastEmit(0), incomingBuffering(true), incomingMinimum(0), incomingMaximum(0), incomingPos(0), incomingSequence(0), outgoingCodec(nullptr), outgoingMarker(true), outgoingPayloadNumbered(false), outgoingSequence(1), outgoingStamp(0), outgoingTimer(nullptr)
 {
     qRegisterMetaType<QXmppRtpAudioChannel::Tone>("QXmppRtpAudioChannel::Tone");
 }
@@ -246,10 +249,9 @@ QXmppCodec *QXmppRtpAudioChannelPrivate::codecForPayloadType(const QXmppJinglePa
 /// Constructs a new RTP audio channel with the given \a parent.
 
 QXmppRtpAudioChannel::QXmppRtpAudioChannel(QObject *parent)
-    : QIODevice(parent)
-    , d(new QXmppRtpAudioChannelPrivate())
+    : QIODevice(parent), d(new QXmppRtpAudioChannelPrivate())
 {
-    auto *logParent = qobject_cast<QXmppLoggable*>(parent);
+    auto *logParent = qobject_cast<QXmppLoggable *>(parent);
     if (logParent) {
         connect(this, &QXmppRtpAudioChannel::logMessage,
                 logParent, &QXmppLoggable::logMessage);
@@ -261,7 +263,7 @@ QXmppRtpAudioChannel::QXmppRtpAudioChannel(QObject *parent)
     QXmppJinglePayloadType payload;
 
 #ifdef QXMPP_USE_OPUS
-    payload.setId(100); // NOTE: I don't know if this Id is ok for Opus.
+    payload.setId(100);  // NOTE: I don't know if this Id is ok for Opus.
     payload.setChannels(1);
     payload.setName("opus");
     payload.setClockrate(8000);
@@ -375,8 +377,8 @@ void QXmppRtpAudioChannel::datagramReceived(const QByteArray &ba)
         if (packetOffset < 0) {
 #ifdef QXMPP_DEBUG_RTP_BUFFER
             warning(QString("RTP packet stamp %1 is too old, buffer start is %2")
-                    .arg(QString::number(packet.stamp()))
-                    .arg(QString::number(d->incomingPos)));
+                        .arg(QString::number(packet.stamp()))
+                        .arg(QString::number(d->incomingPos)));
 #endif
             return;
         }
@@ -396,15 +398,14 @@ void QXmppRtpAudioChannel::datagramReceived(const QByteArray &ba)
     codec->decode(input, output);
 
     // check whether we are running late
-    if (d->incomingBuffer.size() > d->incomingMaximum)
-    {
+    if (d->incomingBuffer.size() > d->incomingMaximum) {
         qint64 droppedSize = d->incomingBuffer.size() - d->incomingMinimum;
         const int remainder = droppedSize % SAMPLE_BYTES;
         if (remainder)
             droppedSize -= remainder;
 #ifdef QXMPP_DEBUG_RTP_BUFFER
         warning(QString("Incoming RTP buffer is too full, dropping %1 bytes")
-                .arg(QString::number(droppedSize)));
+                    .arg(QString::number(droppedSize)));
 #endif
         d->incomingBuffer.remove(0, droppedSize);
         d->incomingPos += droppedSize;
@@ -449,11 +450,10 @@ QXmppJinglePayloadType QXmppRtpAudioChannel::payloadType() const
 }
 
 /// \cond
-qint64 QXmppRtpAudioChannel::readData(char * data, qint64 maxSize)
+qint64 QXmppRtpAudioChannel::readData(char *data, qint64 maxSize)
 {
     // if we are filling the buffer, return empty samples
-    if (d->incomingBuffering)
-    {
+    if (d->incomingBuffering) {
         // FIXME: if we are asked for a non-integer number of samples,
         // we will return junk on next read as we don't increment d->incomingPos
         memset(data, 0, maxSize);
@@ -463,8 +463,7 @@ qint64 QXmppRtpAudioChannel::readData(char * data, qint64 maxSize)
     qint64 readSize = qMin(maxSize, qint64(d->incomingBuffer.size()));
     memcpy(data, d->incomingBuffer.constData(), readSize);
     d->incomingBuffer.remove(0, readSize);
-    if (readSize < maxSize)
-    {
+    if (readSize < maxSize) {
 #ifdef QXMPP_DEBUG_RTP
         debug(QString("QXmppRtpAudioChannel::readData missing %1 bytes").arg(QString::number(maxSize - readSize)));
 #endif
@@ -503,8 +502,7 @@ void QXmppRtpAudioChannel::payloadTypesChanged()
         // check for telephony events
         if (outgoingType.name() == "telephone-event") {
             d->outgoingTonesType = outgoingType;
-        }
-        else if (!d->outgoingCodec) {
+        } else if (!d->outgoingCodec) {
             QXmppCodec *codec = d->codecForPayloadType(outgoingType);
             if (codec) {
                 d->payloadType = outgoingType;
@@ -578,7 +576,7 @@ void QXmppRtpAudioChannel::stopTone(QXmppRtpAudioChannel::Tone tone)
 }
 
 /// \cond
-qint64 QXmppRtpAudioChannel::writeData(const char * data, qint64 maxSize)
+qint64 QXmppRtpAudioChannel::writeData(const char *data, qint64 maxSize)
 {
     if (!d->outgoingCodec) {
         warning("QXmppRtpAudioChannel::writeData before codec was set");
@@ -650,8 +648,7 @@ void QXmppRtpAudioChannel::writeDatagram()
     if (sendAudio) {
         // send audio data
         QXmppRtpPacket packet;
-        if (d->outgoingMarker)
-        {
+        if (d->outgoingMarker) {
             packet.setMarker(true);
             d->outgoingMarker = false;
         } else {
@@ -690,10 +687,10 @@ void QXmppRtpAudioChannel::writeDatagram()
  */
 QXmppVideoFrame::QXmppVideoFrame()
     : m_bytesPerLine(0),
-    m_height(0),
-    m_mappedBytes(0),
-    m_pixelFormat(Format_Invalid),
-    m_width(0)
+      m_height(0),
+      m_mappedBytes(0),
+      m_pixelFormat(Format_Invalid),
+      m_width(0)
 {
 }
 
@@ -706,10 +703,10 @@ QXmppVideoFrame::QXmppVideoFrame()
  */
 QXmppVideoFrame::QXmppVideoFrame(int bytes, const QSize &size, int bytesPerLine, PixelFormat format)
     : m_bytesPerLine(bytesPerLine),
-    m_height(size.height()),
-    m_mappedBytes(bytes),
-    m_pixelFormat(format),
-    m_width(size.width())
+      m_height(size.height()),
+      m_mappedBytes(bytes),
+      m_pixelFormat(format),
+      m_width(size.width())
 {
     m_data.resize(bytes);
 }
@@ -718,14 +715,14 @@ QXmppVideoFrame::QXmppVideoFrame(int bytes, const QSize &size, int bytesPerLine,
 
 uchar *QXmppVideoFrame::bits()
 {
-    return (uchar*)m_data.data();
+    return (uchar *)m_data.data();
 }
 
 /// Returns a pointer to the start of the frame data buffer.
 
 const uchar *QXmppVideoFrame::bits() const
 {
-    return (const uchar*)m_data.constData();
+    return (const uchar *)m_data.constData();
 }
 
 /// Returns the number of bytes in a scan line.
@@ -747,8 +744,8 @@ int QXmppVideoFrame::height() const
 bool QXmppVideoFrame::isValid() const
 {
     return m_pixelFormat != Format_Invalid &&
-           m_height > 0 && m_width > 0 &&
-           m_mappedBytes > 0;
+        m_height > 0 && m_width > 0 &&
+        m_mappedBytes > 0;
 }
 
 /// Returns the number of bytes occupied by the mapped frame data.
@@ -783,7 +780,7 @@ class QXmppRtpVideoChannelPrivate
 {
 public:
     QXmppRtpVideoChannelPrivate();
-    QMap<int, QXmppVideoDecoder*> decoders;
+    QMap<int, QXmppVideoDecoder *> decoders;
     QXmppVideoEncoder *encoder;
     QList<QXmppVideoFrame> frames;
 
@@ -796,9 +793,9 @@ public:
 
 QXmppRtpVideoChannelPrivate::QXmppRtpVideoChannelPrivate()
     : encoder(nullptr),
-    outgoingId(0),
-    outgoingSequence(1),
-    outgoingStamp(0)
+      outgoingId(0),
+      outgoingSequence(1),
+      outgoingStamp(0)
 {
 }
 
@@ -923,8 +920,8 @@ void QXmppRtpVideoChannel::payloadTypesChanged()
 
     for (const auto &payload : qAsConst(m_incomingPayloadTypes)) {
         QXmppVideoDecoder *decoder = nullptr;
-        if (false)
-            {}
+        if (false) {
+        }
 #ifdef QXMPP_USE_THEORA
         else if (payload.name().toLower() == "theora")
             decoder = new QXmppTheoraDecoder;
@@ -946,8 +943,8 @@ void QXmppRtpVideoChannel::payloadTypesChanged()
     }
     for (const auto &payload : m_outgoingPayloadTypes) {
         QXmppVideoEncoder *encoder = nullptr;
-        if (false)
-            {}
+        if (false) {
+        }
 #ifdef QXMPP_USE_THEORA
         else if (payload.name().toLower() == "theora")
             encoder = new QXmppTheoraEncoder;
@@ -1000,4 +997,3 @@ void QXmppRtpVideoChannel::writeFrame(const QXmppVideoFrame &frame)
     }
     d->outgoingStamp += 1;
 }
-
diff --git a/src/base/QXmppRtpPacket.cpp b/src/base/QXmppRtpPacket.cpp
index d8bb668b..0a467a7f 100644
--- a/src/base/QXmppRtpPacket.cpp
+++ b/src/base/QXmppRtpPacket.cpp
@@ -50,11 +50,7 @@ public:
 };
 
 QXmppRtpPacketPrivate::QXmppRtpPacketPrivate()
-    : marker(false)
-    , type(0)
-    , ssrc(0)
-    , sequence(0)
-    , stamp(0)
+    : marker(false), type(0), ssrc(0), sequence(0), stamp(0)
 {
 }
 
@@ -82,7 +78,7 @@ QXmppRtpPacket::~QXmppRtpPacket()
 ///
 /// \param other
 ///
-QXmppRtpPacket& QXmppRtpPacket::operator=(const QXmppRtpPacket& other)
+QXmppRtpPacket &QXmppRtpPacket::operator=(const QXmppRtpPacket &other)
 {
     d = other.d;
     return *this;
@@ -224,10 +220,5 @@ void QXmppRtpPacket::setType(quint8 type)
 
 QString QXmppRtpPacket::toString() const
 {
-    return QString("RTP packet seq %1 stamp %2 marker %3 type %4 size %5").arg(
-        QString::number(d->sequence),
-        QString::number(d->stamp),
-        QString::number(d->marker),
-        QString::number(d->type),
-        QString::number(d->payload.size()));
+    return QString("RTP packet seq %1 stamp %2 marker %3 type %4 size %5").arg(QString::number(d->sequence), QString::number(d->stamp), QString::number(d->marker), QString::number(d->type), QString::number(d->payload.size()));
 }
diff --git a/src/base/QXmppSasl.cpp b/src/base/QXmppSasl.cpp
index 93edaf0a..97bb77c9 100644
--- a/src/base/QXmppSasl.cpp
+++ b/src/base/QXmppSasl.cpp
@@ -62,7 +62,7 @@ static QByteArray deriveKeyPbkdf2(QCryptographicHash::Algorithm algorithm,
     QByteArray index(4, Qt::Uninitialized);
     while (quint64(key.length()) < dkLen) {
         hmac.addData(salt);
-        qToBigEndian(currentIteration, reinterpret_cast<uchar*>(index.data()));
+        qToBigEndian(currentIteration, reinterpret_cast<uchar *>(index.data()));
         hmac.addData(index);
         QByteArray u = hmac.result();
         hmac.reset();
@@ -104,8 +104,7 @@ static QMap<char, QByteArray> parseGS2(const QByteArray &ba)
 }
 
 QXmppSaslAuth::QXmppSaslAuth(const QString &mechanism, const QByteArray &value)
-    : m_mechanism(mechanism)
-    , m_value(value)
+    : m_mechanism(mechanism), m_value(value)
 {
 }
 
@@ -258,8 +257,7 @@ public:
 };
 
 QXmppSaslClient::QXmppSaslClient(QObject *parent)
-    : QXmppLoggable(parent)
-    , d(new QXmppSaslClientPrivate)
+    : QXmppLoggable(parent), d(new QXmppSaslClientPrivate)
 {
 }
 
@@ -272,14 +270,19 @@ QXmppSaslClient::~QXmppSaslClient()
 
 QStringList QXmppSaslClient::availableMechanisms()
 {
-    return QStringList() << "SCRAM-SHA-256" << "SCRAM-SHA-1" << "DIGEST-MD5"
-                         << "PLAIN" << "ANONYMOUS"
-                         << "X-FACEBOOK-PLATFORM" << "X-MESSENGER-OAUTH2" << "X-OAUTH2";
+    return QStringList() << "SCRAM-SHA-256"
+                         << "SCRAM-SHA-1"
+                         << "DIGEST-MD5"
+                         << "PLAIN"
+                         << "ANONYMOUS"
+                         << "X-FACEBOOK-PLATFORM"
+                         << "X-MESSENGER-OAUTH2"
+                         << "X-OAUTH2";
 }
 
 /// Creates an SASL client for the given mechanism.
 
-QXmppSaslClient* QXmppSaslClient::create(const QString &mechanism, QObject *parent)
+QXmppSaslClient *QXmppSaslClient::create(const QString &mechanism, QObject *parent)
 {
     if (mechanism == "PLAIN") {
         return new QXmppSaslClientPlain(parent);
@@ -359,8 +362,7 @@ void QXmppSaslClient::setPassword(const QString &password)
 }
 
 QXmppSaslClientAnonymous::QXmppSaslClientAnonymous(QObject *parent)
-    : QXmppSaslClient(parent)
-    , m_step(0)
+    : QXmppSaslClient(parent), m_step(0)
 {
 }
 
@@ -383,9 +385,7 @@ bool QXmppSaslClientAnonymous::respond(const QByteArray &challenge, QByteArray &
 }
 
 QXmppSaslClientDigestMd5::QXmppSaslClientDigestMd5(QObject *parent)
-    : QXmppSaslClient(parent)
-    , m_nc("00000001")
-    , m_step(0)
+    : QXmppSaslClient(parent), m_nc("00000001"), m_step(0)
 {
     m_cnonce = generateNonce();
 }
@@ -462,8 +462,7 @@ bool QXmppSaslClientDigestMd5::respond(const QByteArray &challenge, QByteArray &
 }
 
 QXmppSaslClientFacebook::QXmppSaslClientFacebook(QObject *parent)
-    : QXmppSaslClient(parent)
-    , m_step(0)
+    : QXmppSaslClient(parent), m_step(0)
 {
 }
 
@@ -507,8 +506,7 @@ bool QXmppSaslClientFacebook::respond(const QByteArray &challenge, QByteArray &r
 }
 
 QXmppSaslClientGoogle::QXmppSaslClientGoogle(QObject *parent)
-    : QXmppSaslClient(parent)
-    , m_step(0)
+    : QXmppSaslClient(parent), m_step(0)
 {
 }
 
@@ -532,8 +530,7 @@ bool QXmppSaslClientGoogle::respond(const QByteArray &challenge, QByteArray &res
 }
 
 QXmppSaslClientPlain::QXmppSaslClientPlain(QObject *parent)
-    : QXmppSaslClient(parent)
-    , m_step(0)
+    : QXmppSaslClient(parent), m_step(0)
 {
 }
 
@@ -556,9 +553,7 @@ bool QXmppSaslClientPlain::respond(const QByteArray &challenge, QByteArray &resp
 }
 
 QXmppSaslClientScram::QXmppSaslClientScram(QCryptographicHash::Algorithm algorithm, QObject *parent)
-    : QXmppSaslClient(parent)
-    , m_algorithm(algorithm)
-    , m_step(0)
+    : QXmppSaslClient(parent), m_algorithm(algorithm), m_step(0)
 {
     Q_ASSERT(m_algorithm == QCryptographicHash::Sha1 || m_algorithm == QCryptographicHash::Sha256);
     m_nonce = generateNonce();
@@ -626,8 +621,7 @@ bool QXmppSaslClientScram::respond(const QByteArray &challenge, QByteArray &resp
 }
 
 QXmppSaslClientWindowsLive::QXmppSaslClientWindowsLive(QObject *parent)
-    : QXmppSaslClient(parent)
-    , m_step(0)
+    : QXmppSaslClient(parent), m_step(0)
 {
 }
 
@@ -660,8 +654,7 @@ public:
 };
 
 QXmppSaslServer::QXmppSaslServer(QObject *parent)
-    : QXmppLoggable(parent)
-    , d(new QXmppSaslServerPrivate)
+    : QXmppLoggable(parent), d(new QXmppSaslServerPrivate)
 {
 }
 
@@ -672,7 +665,7 @@ QXmppSaslServer::~QXmppSaslServer()
 
 /// Creates an SASL server for the given mechanism.
 
-QXmppSaslServer* QXmppSaslServer::create(const QString &mechanism, QObject *parent)
+QXmppSaslServer *QXmppSaslServer::create(const QString &mechanism, QObject *parent)
 {
     if (mechanism == "PLAIN") {
         return new QXmppSaslServerPlain(parent);
@@ -742,8 +735,7 @@ void QXmppSaslServer::setRealm(const QString &realm)
 }
 
 QXmppSaslServerAnonymous::QXmppSaslServerAnonymous(QObject *parent)
-    : QXmppSaslServer(parent)
-    , m_step(0)
+    : QXmppSaslServer(parent), m_step(0)
 {
 }
 
@@ -766,8 +758,7 @@ QXmppSaslServer::Response QXmppSaslServerAnonymous::respond(const QByteArray &re
 }
 
 QXmppSaslServerDigestMd5::QXmppSaslServerDigestMd5(QObject *parent)
-    : QXmppSaslServer(parent)
-    , m_step(0)
+    : QXmppSaslServer(parent), m_step(0)
 {
     m_nonce = generateNonce();
 }
@@ -835,8 +826,7 @@ QXmppSaslServer::Response QXmppSaslServerDigestMd5::respond(const QByteArray &re
 }
 
 QXmppSaslServerPlain::QXmppSaslServerPlain(QObject *parent)
-    : QXmppSaslServer(parent)
-    , m_step(0)
+    : QXmppSaslServer(parent), m_step(0)
 {
 }
 
@@ -880,23 +870,20 @@ QMap<QByteArray, QByteArray> QXmppSaslDigestMd5::parseMessage(const QByteArray &
     QMap<QByteArray, QByteArray> map;
     int startIndex = 0;
     int pos = 0;
-    while ((pos = ba.indexOf("=", startIndex)) >= 0)
-    {
+    while ((pos = ba.indexOf("=", startIndex)) >= 0) {
         // key get name and skip equals
         const QByteArray key = ba.mid(startIndex, pos - startIndex).trimmed();
         pos++;
 
         // check whether string is quoted
-        if (ba.at(pos) == '"')
-        {
+        if (ba.at(pos) == '"') {
             // skip opening quote
             pos++;
             int endPos = ba.indexOf('"', pos);
             // skip quoted quotes
             while (endPos >= 0 && ba.at(endPos - 1) == '\\')
                 endPos = ba.indexOf('"', endPos + 1);
-            if (endPos < 0)
-            {
+            if (endPos < 0) {
                 qWarning("Unfinished quoted string");
                 return map;
             }
@@ -936,13 +923,11 @@ QByteArray QXmppSaslDigestMd5::serializeMessage(const QMap<QByteArray, QByteArra
                 break;
             }
         }
-        if (quote)
-        {
+        if (quote) {
             value.replace("\\", "\\\\");
             value.replace("\"", "\\\"");
             ba.append("\"" + value + "\"");
-        }
-        else
+        } else
             ba.append(value);
     }
     return ba;
diff --git a/src/base/QXmppSessionIq.cpp b/src/base/QXmppSessionIq.cpp
index f4ce9cf2..1b27cf7e 100644
--- a/src/base/QXmppSessionIq.cpp
+++ b/src/base/QXmppSessionIq.cpp
@@ -39,7 +39,8 @@ bool QXmppSessionIq::isSessionIq(const QDomElement &element)
 
 void QXmppSessionIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
 {
-    writer->writeStartElement("session");;
+    writer->writeStartElement("session");
+    ;
     writer->writeDefaultNamespace(ns_session);
     writer->writeEndElement();
 }
diff --git a/src/base/QXmppSocks.cpp b/src/base/QXmppSocks.cpp
index 43a36bf1..cf07a740 100644
--- a/src/base/QXmppSocks.cpp
+++ b/src/base/QXmppSocks.cpp
@@ -100,9 +100,9 @@ static bool parseHostAndPort(QDataStream &stream, quint8 &type, QByteArray &host
 
 QXmppSocksClient::QXmppSocksClient(const QString &proxyHost, quint16 proxyPort, QObject *parent)
     : QTcpSocket(parent),
-    m_proxyHost(proxyHost),
-    m_proxyPort(proxyPort),
-    m_step(ConnectState)
+      m_proxyHost(proxyHost),
+      m_proxyPort(proxyPort),
+      m_step(ConnectState)
 {
     connect(this, &QAbstractSocket::connected, this, &QXmppSocksClient::slotConnected);
     connect(this, &QIODevice::readyRead, this, &QXmppSocksClient::slotReadyRead);
@@ -126,19 +126,17 @@ void QXmppSocksClient::slotConnected()
     QByteArray buffer;
     buffer.resize(3);
     buffer[0] = SocksVersion;
-    buffer[1] = 0x01; // number of methods
+    buffer[1] = 0x01;  // number of methods
     buffer[2] = NoAuthentication;
     write(buffer);
 }
 
 void QXmppSocksClient::slotReadyRead()
 {
-    if (m_step == ConnectState)
-    {
+    if (m_step == ConnectState) {
         // receive connect to server response
         QByteArray buffer = readAll();
-        if (buffer.size() != 2 || buffer.at(0) != SocksVersion || buffer.at(1) != NoAuthentication)
-        {
+        if (buffer.size() != 2 || buffer.at(0) != SocksVersion || buffer.at(1) != NoAuthentication) {
             qWarning("QXmppSocksClient received an invalid response during handshake");
             close();
             return;
@@ -151,7 +149,7 @@ void QXmppSocksClient::slotReadyRead()
         buffer.resize(3);
         buffer[0] = SocksVersion;
         buffer[1] = ConnectCommand;
-        buffer[2] = 0x00; // reserved
+        buffer[2] = 0x00;  // reserved
         buffer.append(encodeHostAndPort(
             DomainName,
             m_hostName.toLatin1(),
@@ -167,8 +165,7 @@ void QXmppSocksClient::slotReadyRead()
         if (buffer.size() != 3 ||
             buffer.at(0) != SocksVersion ||
             buffer.at(1) != Succeeded ||
-            buffer.at(2) != 0)
-        {
+            buffer.at(2) != 0) {
             qWarning("QXmppSocksClient received an invalid response to CONNECT command");
             close();
             return;
@@ -179,8 +176,7 @@ void QXmppSocksClient::slotReadyRead()
         QByteArray hostName;
         quint16 hostPort;
         QDataStream stream(this);
-        if (!parseHostAndPort(stream, hostType, hostName, hostPort))
-        {
+        if (!parseHostAndPort(stream, hostType, hostName, hostPort)) {
             qWarning("QXmppSocksClient could not parse type/host/port");
             close();
             return;
@@ -226,7 +222,7 @@ quint16 QXmppSocksServer::serverPort() const
 
 void QXmppSocksServer::slotNewConnection()
 {
-    auto *server = qobject_cast<QTcpServer*>(sender());
+    auto *server = qobject_cast<QTcpServer *>(sender());
     if (!server)
         return;
 
@@ -241,18 +237,16 @@ void QXmppSocksServer::slotNewConnection()
 
 void QXmppSocksServer::slotReadyRead()
 {
-    auto *socket = qobject_cast<QTcpSocket*>(sender());
+    auto *socket = qobject_cast<QTcpSocket *>(sender());
     if (!socket || !m_states.contains(socket))
         return;
 
-    if (m_states.value(socket) == ConnectState)
-    {
+    if (m_states.value(socket) == ConnectState) {
         // receive connect to server request
         QByteArray buffer = socket->readAll();
         if (buffer.size() < 3 ||
             buffer.at(0) != SocksVersion ||
-            buffer.at(1) + 2 != buffer.size())
-        {
+            buffer.at(1) + 2 != buffer.size()) {
             qWarning("QXmppSocksServer received invalid handshake");
             socket->close();
             return;
@@ -260,16 +254,13 @@ void QXmppSocksServer::slotReadyRead()
 
         // check authentication method
         bool foundMethod = false;
-        for (int i = 2; i < buffer.size(); i++)
-        {
-            if (buffer.at(i) == NoAuthentication)
-            {
+        for (int i = 2; i < buffer.size(); i++) {
+            if (buffer.at(i) == NoAuthentication) {
                 foundMethod = true;
                 break;
             }
         }
-        if (!foundMethod)
-        {
+        if (!foundMethod) {
             qWarning("QXmppSocksServer received bad authentication method");
 
             buffer.resize(2);
@@ -299,8 +290,7 @@ void QXmppSocksServer::slotReadyRead()
         if (buffer.size() != 3 ||
             buffer.at(0) != SocksVersion ||
             buffer.at(1) != ConnectCommand ||
-            buffer.at(2) != 0x00)
-        {
+            buffer.at(2) != 0x00) {
             qWarning("QXmppSocksServer received an invalid command");
             socket->close();
             return;
@@ -311,8 +301,7 @@ void QXmppSocksServer::slotReadyRead()
         QByteArray hostName;
         quint16 hostPort;
         QDataStream stream(socket);
-        if (!parseHostAndPort(stream, hostType, hostName, hostPort))
-        {
+        if (!parseHostAndPort(stream, hostType, hostName, hostPort)) {
             qWarning("QXmppSocksServer could not parse type/host/port");
             socket->close();
             return;
@@ -334,4 +323,3 @@ void QXmppSocksServer::slotReadyRead()
         socket->write(buffer);
     }
 }
-
diff --git a/src/base/QXmppStanza.cpp b/src/base/QXmppStanza.cpp
index ffd6687d..c4db071b 100644
--- a/src/base/QXmppStanza.cpp
+++ b/src/base/QXmppStanza.cpp
@@ -69,7 +69,7 @@ QXmppExtendedAddress::~QXmppExtendedAddress()
 ///
 /// \param other
 ///
-QXmppExtendedAddress& QXmppExtendedAddress::operator=(const QXmppExtendedAddress& other)
+QXmppExtendedAddress &QXmppExtendedAddress::operator=(const QXmppExtendedAddress &other)
 {
     d = other.d;
     return *this;
@@ -192,7 +192,7 @@ QXmppStanza::Error::Error()
 
 QXmppStanza::Error::Error(const QXmppStanza::Error &) = default;
 
-QXmppStanza::Error::Error(Type type, Condition cond, const QString& text)
+QXmppStanza::Error::Error(Type type, Condition cond, const QString &text)
     : d(new QXmppStanzaErrorPrivate)
 {
     d->type = type;
@@ -200,8 +200,8 @@ QXmppStanza::Error::Error(Type type, Condition cond, const QString& text)
     d->text = text;
 }
 
-QXmppStanza::Error::Error(const QString& type, const QString& cond,
-                          const QString& text)
+QXmppStanza::Error::Error(const QString &type, const QString &cond,
+                          const QString &text)
     : d(new QXmppStanzaErrorPrivate)
 {
     d->text = text;
@@ -218,7 +218,7 @@ QString QXmppStanza::Error::text() const
     return d->text;
 }
 
-void QXmppStanza::Error::setText(const QString& text)
+void QXmppStanza::Error::setText(const QString &text)
 {
     d->text = text;
 }
@@ -314,8 +314,7 @@ void QXmppStanza::Error::setRetryDate(const QDateTime &retryDate)
 /// \cond
 QString QXmppStanza::Error::getTypeStr() const
 {
-    switch(d->type)
-    {
+    switch (d->type) {
     case Cancel:
         return "cancel";
     case Continue:
@@ -336,23 +335,23 @@ QString QXmppStanza::Error::getConditionStr() const
     return strFromCondition(d->condition);
 }
 
-void QXmppStanza::Error::setTypeFromStr(const QString& type)
+void QXmppStanza::Error::setTypeFromStr(const QString &type)
 {
-    if(type == "cancel")
+    if (type == "cancel")
         setType(Cancel);
-    else if(type == "continue")
+    else if (type == "continue")
         setType(Continue);
-    else if(type == "modify")
+    else if (type == "modify")
         setType(Modify);
-    else if(type == "auth")
+    else if (type == "auth")
         setType(Auth);
-    else if(type == "wait")
+    else if (type == "wait")
         setType(Wait);
     else
         setType(static_cast<QXmppStanza::Error::Type>(-1));
 }
 
-void QXmppStanza::Error::setConditionFromStr(const QString& type)
+void QXmppStanza::Error::setConditionFromStr(const QString &type)
 {
     setCondition(conditionFromStr(type));
 }
@@ -363,24 +362,24 @@ void QXmppStanza::Error::parse(const QDomElement &errorElement)
     setTypeFromStr(errorElement.attribute("type"));
 
     QDomElement element = errorElement.firstChildElement();
-    while(!element.isNull())
-    {
+    while (!element.isNull()) {
         if (element.namespaceURI() == ns_stanza) {
             if (element.tagName() == "text")
                 setText(element.text());
             else
                 setConditionFromStr(element.tagName());
-        // XEP-0363: HTTP File Upload
+            // XEP-0363: HTTP File Upload
         } else if (element.namespaceURI() == ns_http_upload) {
             // file is too large
             if (element.tagName() == "file-too-large") {
                 d->fileTooLarge = true;
                 d->maxFileSize = element.firstChildElement("max-file-size")
-                                 .text().toLongLong();
-            // retry later
+                                     .text()
+                                     .toLongLong();
+                // retry later
             } else if (element.tagName() == "retry") {
                 d->retryDate = QXmppUtils::datetimeFromString(
-                                element.attribute("stamp"));
+                    element.attribute("stamp"));
             }
         }
         element = element.nextSiblingElement();
@@ -450,7 +449,7 @@ public:
 /// \param from
 /// \param to
 
-QXmppStanza::QXmppStanza(const QString& from, const QString& to)
+QXmppStanza::QXmppStanza(const QString &from, const QString &to)
     : d(new QXmppStanzaPrivate)
 {
     d->to = to;
@@ -472,7 +471,7 @@ QXmppStanza::~QXmppStanza()
 
 /// Assigns \a other to this stanza.
 
-QXmppStanza& QXmppStanza::operator=(const QXmppStanza &other)
+QXmppStanza &QXmppStanza::operator=(const QXmppStanza &other)
 {
     d = other.d;
     return *this;
@@ -490,7 +489,7 @@ QString QXmppStanza::to() const
 ///
 /// \param to
 
-void QXmppStanza::setTo(const QString& to)
+void QXmppStanza::setTo(const QString &to)
 {
     d->to = to;
 }
@@ -506,7 +505,7 @@ QString QXmppStanza::from() const
 ///
 /// \param from
 
-void QXmppStanza::setFrom(const QString& from)
+void QXmppStanza::setFrom(const QString &from)
 {
     d->from = from;
 }
@@ -522,7 +521,7 @@ QString QXmppStanza::id() const
 ///
 /// \param id
 
-void QXmppStanza::setId(const QString& id)
+void QXmppStanza::setId(const QString &id)
 {
     d->id = id;
 }
@@ -538,7 +537,7 @@ QString QXmppStanza::lang() const
 ///
 /// \param lang
 
-void QXmppStanza::setLang(const QString& lang)
+void QXmppStanza::setLang(const QString &lang)
 {
     d->lang = lang;
 }
@@ -554,7 +553,7 @@ QXmppStanza::Error QXmppStanza::error() const
 ///
 /// \param error
 
-void QXmppStanza::setError(const QXmppStanza::Error& error)
+void QXmppStanza::setError(const QXmppStanza::Error &error)
 {
     d->error = error;
 }
@@ -617,7 +616,7 @@ void QXmppStanza::parse(const QDomElement &element)
     d->lang = element.attribute("lang");
 
     QDomElement errorElement = element.firstChildElement("error");
-    if(!errorElement.isNull())
+    if (!errorElement.isNull())
         d->error.parse(errorElement);
 
     // XEP-0033: Extended Stanza Addressing
diff --git a/src/base/QXmppStream.cpp b/src/base/QXmppStream.cpp
index 676465af..a97b7407 100644
--- a/src/base/QXmppStream.cpp
+++ b/src/base/QXmppStream.cpp
@@ -49,7 +49,7 @@ public:
     QXmppStreamPrivate();
 
     QByteArray dataBuffer;
-    QSslSocket* socket;
+    QSslSocket *socket;
 
     // incoming stream state
     QByteArray streamStart;
@@ -71,12 +71,11 @@ QXmppStreamPrivate::QXmppStreamPrivate()
 
 QXmppStream::QXmppStream(QObject *parent)
     : QXmppLoggable(parent),
-    d(new QXmppStreamPrivate)
+      d(new QXmppStreamPrivate)
 {
     // Make sure the random number generator is seeded
-    if (!randomSeeded)
-    {
-        qsrand(QTime(0,0,0).msecsTo(QTime::currentTime()) ^ reinterpret_cast<quintptr>(this));
+    if (!randomSeeded) {
+        qsrand(QTime(0, 0, 0).msecsTo(QTime::currentTime()) ^ reinterpret_cast<quintptr>(this));
         randomSeeded = true;
     }
 }
@@ -123,7 +122,7 @@ void QXmppStream::handleStart()
 bool QXmppStream::isConnected() const
 {
     return d->socket &&
-           d->socket->state() == QAbstractSocket::ConnectedState;
+        d->socket->state() == QAbstractSocket::ConnectedState;
 }
 
 /// Sends raw data to the peer.
@@ -186,9 +185,7 @@ void QXmppStream::setSocket(QSslSocket *socket)
 
 void QXmppStream::_q_socketConnected()
 {
-    info(QString("Socket connected to %1 %2").arg(
-        d->socket->peerAddress().toString(),
-        QString::number(d->socket->peerPort())));
+    info(QString("Socket connected to %1 %2").arg(d->socket->peerAddress().toString(), QString::number(d->socket->peerPort())));
     handleStart();
 }
 
@@ -261,9 +258,9 @@ void QXmppStream::_q_socketReadyRead()
             sendAcknowledgement();
         else {
             handleStanza(nodeRecv);
-            if(nodeRecv.tagName() == QLatin1String("message") ||
-               nodeRecv.tagName() == QLatin1String("presence") ||
-               nodeRecv.tagName() == QLatin1String("iq"))
+            if (nodeRecv.tagName() == QLatin1String("message") ||
+                nodeRecv.tagName() == QLatin1String("presence") ||
+                nodeRecv.tagName() == QLatin1String("iq"))
                 ++d->lastIncomingSequenceNumber;
         }
         nodeRecv = nodeRecv.nextSiblingElement();
@@ -315,7 +312,7 @@ unsigned QXmppStream::lastIncomingSequenceNumber() const
 /// Sets the last acknowledged sequence number for outgoing stanzas (XEP-0198).
 void QXmppStream::setAcknowledgedSequenceNumber(unsigned sequenceNumber)
 {
-    for (QMap<unsigned, QByteArray>::iterator it = d->unacknowledgedStanzas.begin(); it != d->unacknowledgedStanzas.end(); ) {
+    for (QMap<unsigned, QByteArray>::iterator it = d->unacknowledgedStanzas.begin(); it != d->unacknowledgedStanzas.end();) {
         if (it.key() <= sequenceNumber)
             it = d->unacknowledgedStanzas.erase(it);
         else
diff --git a/src/base/QXmppStreamFeatures.cpp b/src/base/QXmppStreamFeatures.cpp
index a921937e..8c4a45c1 100644
--- a/src/base/QXmppStreamFeatures.cpp
+++ b/src/base/QXmppStreamFeatures.cpp
@@ -29,11 +29,11 @@
 
 QXmppStreamFeatures::QXmppStreamFeatures()
     : m_bindMode(Disabled),
-    m_sessionMode(Disabled),
-    m_nonSaslAuthMode(Disabled),
-    m_tlsMode(Disabled),
-    m_streamManagementMode(Disabled),
-    m_csiMode(Disabled)
+      m_sessionMode(Disabled),
+      m_nonSaslAuthMode(Disabled),
+      m_tlsMode(Disabled),
+      m_streamManagementMode(Disabled),
+      m_csiMode(Disabled)
 {
 }
 
@@ -131,7 +131,7 @@ void QXmppStreamFeatures::setRegisterMode(const QXmppStreamFeatures::Mode &regis
 bool QXmppStreamFeatures::isStreamFeatures(const QDomElement &element)
 {
     return element.namespaceURI() == ns_stream &&
-           element.tagName() == "features";
+        element.tagName() == "features";
 }
 
 static QXmppStreamFeatures::Mode readFeature(const QDomElement &element, const char *tagName, const char *tagNs)
@@ -139,8 +139,7 @@ static QXmppStreamFeatures::Mode readFeature(const QDomElement &element, const c
     QDomElement subElement = element.firstChildElement(tagName);
     QXmppStreamFeatures::Mode mode = QXmppStreamFeatures::Disabled;
     while (!subElement.isNull()) {
-        if (subElement.namespaceURI() == tagNs)
-        {
+        if (subElement.namespaceURI() == tagNs) {
             if (!subElement.firstChildElement("required").isNull())
                 mode = QXmppStreamFeatures::Required;
             else if (mode != QXmppStreamFeatures::Required)
@@ -163,11 +162,9 @@ void QXmppStreamFeatures::parse(const QDomElement &element)
 
     // parse advertised compression methods
     QDomElement compression = element.firstChildElement("compression");
-    if (compression.namespaceURI() == ns_compressFeature)
-    {
+    if (compression.namespaceURI() == ns_compressFeature) {
         QDomElement subElement = compression.firstChildElement("method");
-        while(!subElement.isNull())
-        {
+        while (!subElement.isNull()) {
             m_compressionMethods << subElement.text();
             subElement = subElement.nextSiblingElement("method");
         }
@@ -175,10 +172,9 @@ void QXmppStreamFeatures::parse(const QDomElement &element)
 
     // parse advertised SASL Authentication mechanisms
     QDomElement mechs = element.firstChildElement("mechanisms");
-    if (mechs.namespaceURI() == ns_sasl)
-    {
+    if (mechs.namespaceURI() == ns_sasl) {
         QDomElement subElement = mechs.firstChildElement("mechanism");
-        while(!subElement.isNull()) {
+        while (!subElement.isNull()) {
             m_authMechanisms << subElement.text();
             subElement = subElement.nextSiblingElement("mechanism");
         }
@@ -187,8 +183,7 @@ void QXmppStreamFeatures::parse(const QDomElement &element)
 
 static void writeFeature(QXmlStreamWriter *writer, const char *tagName, const char *tagNs, QXmppStreamFeatures::Mode mode)
 {
-    if (mode != QXmppStreamFeatures::Disabled)
-    {
+    if (mode != QXmppStreamFeatures::Disabled) {
         writer->writeStartElement(tagName);
         writer->writeDefaultNamespace(tagNs);
         if (mode == QXmppStreamFeatures::Required)
@@ -208,20 +203,18 @@ void QXmppStreamFeatures::toXml(QXmlStreamWriter *writer) const
     writeFeature(writer, "csi", ns_csi, m_csiMode);
     writeFeature(writer, "register", ns_register_feature, m_registerMode);
 
-    if (!m_compressionMethods.isEmpty())
-    {
+    if (!m_compressionMethods.isEmpty()) {
         writer->writeStartElement("compression");
         writer->writeDefaultNamespace(ns_compressFeature);
         for (const auto &method : m_compressionMethods)
             writer->writeTextElement("method", method);
         writer->writeEndElement();
     }
-    if (!m_authMechanisms.isEmpty())
-    {
+    if (!m_authMechanisms.isEmpty()) {
         writer->writeStartElement("mechanisms");
         writer->writeDefaultNamespace(ns_sasl);
         for (const auto &mechanism : m_authMechanisms)
-            writer->writeTextElement("mechanism",  mechanism);
+            writer->writeTextElement("mechanism", mechanism);
         writer->writeEndElement();
     }
     writer->writeEndElement();
diff --git a/src/base/QXmppStreamInitiationIq.cpp b/src/base/QXmppStreamInitiationIq.cpp
index acc52c66..9d15c027 100644
--- a/src/base/QXmppStreamInitiationIq.cpp
+++ b/src/base/QXmppStreamInitiationIq.cpp
@@ -95,8 +95,7 @@ void QXmppStreamInitiationIq::parseElementFromChild(const QDomElement &element)
         m_profile = None;
 
     QDomElement itemElement = siElement.firstChildElement();
-    while (!itemElement.isNull())
-    {
+    while (!itemElement.isNull()) {
         if (itemElement.tagName() == "feature" && itemElement.namespaceURI() == ns_feature_negotiation) {
             m_featureForm.parse(itemElement.firstChildElement());
         } else if (itemElement.tagName() == "file" && itemElement.namespaceURI() == ns_stream_initiation_file_transfer) {
diff --git a/src/base/QXmppStreamManagement.cpp b/src/base/QXmppStreamManagement.cpp
index ed91a30a..8f27f3c0 100644
--- a/src/base/QXmppStreamManagement.cpp
+++ b/src/base/QXmppStreamManagement.cpp
@@ -53,7 +53,7 @@ void QXmppStreamManagementEnable::setMax(const unsigned max)
 bool QXmppStreamManagementEnable::isStreamManagementEnable(const QDomElement &element)
 {
     return element.tagName() == QLatin1String("enable") &&
-           element.namespaceURI() == ns_stream_management;
+        element.namespaceURI() == ns_stream_management;
 }
 
 void QXmppStreamManagementEnable::parse(const QDomElement &element)
@@ -122,7 +122,7 @@ void QXmppStreamManagementEnabled::setLocation(const QString location)
 bool QXmppStreamManagementEnabled::isStreamManagementEnabled(const QDomElement &element)
 {
     return element.tagName() == QLatin1String("enabled") &&
-           element.namespaceURI() == ns_stream_management;
+        element.namespaceURI() == ns_stream_management;
 }
 
 void QXmppStreamManagementEnabled::parse(const QDomElement &element)
@@ -146,7 +146,7 @@ void QXmppStreamManagementEnabled::toXml(QXmlStreamWriter *writer) const
     writer->writeEndElement();
 }
 
-QXmppStreamManagementResume::QXmppStreamManagementResume(const unsigned h, const QString& previd)
+QXmppStreamManagementResume::QXmppStreamManagementResume(const unsigned h, const QString &previd)
     : m_h(h), m_previd(previd)
 {
 }
@@ -166,7 +166,7 @@ QString QXmppStreamManagementResume::prevId() const
     return m_previd;
 }
 
-void QXmppStreamManagementResume::setPrevId(const QString& previd)
+void QXmppStreamManagementResume::setPrevId(const QString &previd)
 {
     m_previd = previd;
 }
@@ -174,7 +174,7 @@ void QXmppStreamManagementResume::setPrevId(const QString& previd)
 bool QXmppStreamManagementResume::isStreamManagementResume(const QDomElement &element)
 {
     return element.tagName() == QLatin1String("resume") &&
-           element.namespaceURI() == ns_stream_management;
+        element.namespaceURI() == ns_stream_management;
 }
 
 void QXmppStreamManagementResume::parse(const QDomElement &element)
@@ -191,7 +191,7 @@ void QXmppStreamManagementResume::toXml(QXmlStreamWriter *writer) const
     writer->writeEndElement();
 }
 
-QXmppStreamManagementResumed::QXmppStreamManagementResumed(const unsigned h, const QString& previd)
+QXmppStreamManagementResumed::QXmppStreamManagementResumed(const unsigned h, const QString &previd)
     : m_h(h), m_previd(previd)
 {
 }
@@ -211,7 +211,7 @@ QString QXmppStreamManagementResumed::prevId() const
     return m_previd;
 }
 
-void QXmppStreamManagementResumed::setPrevId(const QString& previd)
+void QXmppStreamManagementResumed::setPrevId(const QString &previd)
 {
     m_previd = previd;
 }
@@ -219,7 +219,7 @@ void QXmppStreamManagementResumed::setPrevId(const QString& previd)
 bool QXmppStreamManagementResumed::isStreamManagementResumed(const QDomElement &element)
 {
     return element.tagName() == QLatin1String("resumed") &&
-           element.namespaceURI() == ns_stream_management;
+        element.namespaceURI() == ns_stream_management;
 }
 
 void QXmppStreamManagementResumed::parse(const QDomElement &element)
@@ -254,13 +254,13 @@ void QXmppStreamManagementFailed::setError(const QXmppStanza::Error::Condition e
 bool QXmppStreamManagementFailed::isStreamManagementFailed(const QDomElement &element)
 {
     return element.tagName() == QLatin1String("failed") &&
-           element.namespaceURI() == ns_stream_management;
+        element.namespaceURI() == ns_stream_management;
 }
 
 void QXmppStreamManagementFailed::parse(const QDomElement &element)
 {
     QDomElement childElement = element.firstChildElement();
-    if(!childElement.isNull() && childElement.namespaceURI() == ns_stanza) {
+    if (!childElement.isNull() && childElement.namespaceURI() == ns_stanza) {
         m_error = conditionFromStr(childElement.tagName());
     }
 }
@@ -307,13 +307,13 @@ void QXmppStreamManagementAck::toXml(QXmlStreamWriter *writer) const
 bool QXmppStreamManagementAck::isStreamManagementAck(const QDomElement &element)
 {
     return element.tagName() == QLatin1String("a") &&
-           element.namespaceURI() == ns_stream_management;
+        element.namespaceURI() == ns_stream_management;
 }
 
 bool QXmppStreamManagementReq::isStreamManagementReq(const QDomElement &element)
 {
     return element.tagName() == QLatin1String("r") &&
-           element.namespaceURI() == ns_stream_management;
+        element.namespaceURI() == ns_stream_management;
 }
 
 void QXmppStreamManagementReq::toXml(QXmlStreamWriter *writer)
diff --git a/src/base/QXmppStun.cpp b/src/base/QXmppStun.cpp
index 2d4bbdc5..703ca962 100644
--- a/src/base/QXmppStun.cpp
+++ b/src/base/QXmppStun.cpp
@@ -42,13 +42,13 @@ static const quint16 STUN_HEADER = 20;
 static const quint8 STUN_IPV4 = 0x01;
 static const quint8 STUN_IPV6 = 0x02;
 
-static const char* gathering_states[] = {
+static const char *gathering_states[] = {
     "new",
     "gathering",
     "complete"
 };
 
-static const char* pair_states[] = {
+static const char *pair_states[] = {
     "frozen",
     "waiting",
     "in-progress",
@@ -57,31 +57,31 @@ static const char* pair_states[] = {
 };
 
 enum AttributeType {
-    MappedAddress    = 0x0001, // RFC5389
-    ChangeRequest    = 0x0003, // RFC5389
-    SourceAddress    = 0x0004, // RFC5389
-    ChangedAddress   = 0x0005, // RFC5389
-    Username         = 0x0006, // RFC5389
-    MessageIntegrity = 0x0008, // RFC5389
-    ErrorCode        = 0x0009, // RFC5389
-    ChannelNumber    = 0x000c, // RFC5766 : TURN
-    Lifetime         = 0x000d, // RFC5766 : TURN
-    XorPeerAddress   = 0x0012, // RFC5766 : TURN
-    DataAttr         = 0x0013, // RFC5766 : TURN
-    Realm            = 0x0014, // RFC5389
-    Nonce            = 0x0015, // RFC5389
-    XorRelayedAddress= 0x0016, // RFC5766 : TURN
-    EvenPort         = 0x0018, // RFC5766 : TURN
-    RequestedTransport=0x0019, // RFC5766 : TURN
-    XorMappedAddress = 0x0020, // RFC5389
-    ReservationToken = 0x0022, // RFC5766 : TURN
-    Priority         = 0x0024, // RFC5245
-    UseCandidate     = 0x0025, // RFC5245
-    Software         = 0x8022, // RFC5389
-    Fingerprint      = 0x8028, // RFC5389
-    IceControlled    = 0x8029, // RFC5245
-    IceControlling   = 0x802a, // RFC5245
-    OtherAddress     = 0x802c  // RFC5780
+    MappedAddress = 0x0001,       // RFC5389
+    ChangeRequest = 0x0003,       // RFC5389
+    SourceAddress = 0x0004,       // RFC5389
+    ChangedAddress = 0x0005,      // RFC5389
+    Username = 0x0006,            // RFC5389
+    MessageIntegrity = 0x0008,    // RFC5389
+    ErrorCode = 0x0009,           // RFC5389
+    ChannelNumber = 0x000c,       // RFC5766 : TURN
+    Lifetime = 0x000d,            // RFC5766 : TURN
+    XorPeerAddress = 0x0012,      // RFC5766 : TURN
+    DataAttr = 0x0013,            // RFC5766 : TURN
+    Realm = 0x0014,               // RFC5389
+    Nonce = 0x0015,               // RFC5389
+    XorRelayedAddress = 0x0016,   // RFC5766 : TURN
+    EvenPort = 0x0018,            // RFC5766 : TURN
+    RequestedTransport = 0x0019,  // RFC5766 : TURN
+    XorMappedAddress = 0x0020,    // RFC5389
+    ReservationToken = 0x0022,    // RFC5766 : TURN
+    Priority = 0x0024,            // RFC5245
+    UseCandidate = 0x0025,        // RFC5245
+    Software = 0x8022,            // RFC5389
+    Fingerprint = 0x8028,         // RFC5389
+    IceControlled = 0x8029,       // RFC5245
+    IceControlling = 0x802a,      // RFC5245
+    OtherAddress = 0x802c         // RFC5780
 };
 
 // FIXME : we need to set local preference to discriminate between
@@ -89,8 +89,7 @@ enum AttributeType {
 static quint32 candidatePriority(const QXmppJingleCandidate &candidate, int localPref = 65535)
 {
     int typePref;
-    switch (candidate.type())
-    {
+    switch (candidate.type()) {
     case QXmppJingleCandidate::HostType:
         typePref = 126;
         break;
@@ -104,9 +103,9 @@ static quint32 candidatePriority(const QXmppJingleCandidate &candidate, int loca
         typePref = 0;
     }
 
-    return (1 << 24) * typePref + \
-           (1 << 8) * localPref + \
-           (256 - candidate.component());
+    return (1 << 24) * typePref +
+        (1 << 8) * localPref +
+        (256 - candidate.component());
 }
 
 static QString computeFoundation(QXmppJingleCandidate::Type type, const QString &protocol, const QHostAddress &baseAddress)
@@ -133,7 +132,7 @@ static bool isLoopbackAddress(const QHostAddress &addr)
 static bool isCompatibleAddress(const QHostAddress &a1, const QHostAddress &a2)
 {
     return a1.protocol() == a2.protocol() &&
-           isIPv6LinkLocalAddress(a1) == isIPv6LinkLocalAddress(a2);
+        isIPv6LinkLocalAddress(a1) == isIPv6LinkLocalAddress(a2);
 }
 
 static bool decodeAddress(QDataStream &stream, quint16 a_length, QHostAddress &address, quint16 &port, const QByteArray &xorId = QByteArray())
@@ -149,8 +148,7 @@ static bool decodeAddress(QDataStream &stream, quint16 a_length, QHostAddress &a
         port = rawPort;
     else
         port = rawPort ^ (STUN_MAGIC >> 16);
-    if (protocol == STUN_IPV4)
-    {
+    if (protocol == STUN_IPV4) {
         if (a_length != 8)
             return false;
         quint32 addr;
@@ -163,9 +161,8 @@ static bool decodeAddress(QDataStream &stream, quint16 a_length, QHostAddress &a
         if (a_length != 20)
             return false;
         Q_IPV6ADDR addr;
-        stream.readRawData((char*)&addr, sizeof(addr));
-        if (!xorId.isEmpty())
-        {
+        stream.readRawData((char *)&addr, sizeof(addr));
+        if (!xorId.isEmpty()) {
             QByteArray xpad;
             QDataStream(&xpad, QIODevice::WriteOnly) << STUN_MAGIC;
             xpad += xorId;
@@ -182,15 +179,13 @@ static bool decodeAddress(QDataStream &stream, quint16 a_length, QHostAddress &a
 static void encodeAddress(QDataStream &stream, quint16 type, const QHostAddress &address, quint16 port, const QByteArray &xorId = QByteArray())
 {
     const quint8 reserved = 0;
-    if (address.protocol() == QAbstractSocket::IPv4Protocol)
-    {
+    if (address.protocol() == QAbstractSocket::IPv4Protocol) {
         stream << type;
         stream << quint16(8);
         stream << reserved;
         stream << quint8(STUN_IPV4);
         quint32 addr = address.toIPv4Address();
-        if (!xorId.isEmpty())
-        {
+        if (!xorId.isEmpty()) {
             port ^= (STUN_MAGIC >> 16);
             addr ^= STUN_MAGIC;
         }
@@ -202,8 +197,7 @@ static void encodeAddress(QDataStream &stream, quint16 type, const QHostAddress
         stream << reserved;
         stream << quint8(STUN_IPV6);
         Q_IPV6ADDR addr = address.toIPv6Address();
-        if (!xorId.isEmpty())
-        {
+        if (!xorId.isEmpty()) {
             port ^= (STUN_MAGIC >> 16);
             QByteArray xpad;
             QDataStream(&xpad, QIODevice::WriteOnly) << STUN_MAGIC;
@@ -212,7 +206,7 @@ static void encodeAddress(QDataStream &stream, quint16 type, const QHostAddress
                 addr[i] ^= xpad[i];
         }
         stream << port;
-        stream.writeRawData((char*)&addr, sizeof(addr));
+        stream.writeRawData((char *)&addr, sizeof(addr));
     } else {
         qWarning("Cannot write STUN attribute for unknown IP version");
     }
@@ -222,8 +216,7 @@ static void addAddress(QDataStream &stream, quint16 type, const QHostAddress &ho
 {
     if (port && !host.isNull() &&
         (host.protocol() == QAbstractSocket::IPv4Protocol ||
-         host.protocol() == QAbstractSocket::IPv6Protocol))
-    {
+         host.protocol() == QAbstractSocket::IPv6Protocol)) {
         encodeAddress(stream, type, host, port, xorId);
     }
 }
@@ -234,8 +227,7 @@ static void encodeString(QDataStream &stream, quint16 type, const QString &strin
     stream << type;
     stream << quint16(utf8string.size());
     stream.writeRawData(utf8string.data(), utf8string.size());
-    if (utf8string.size() % 4)
-    {
+    if (utf8string.size() % 4) {
         const QByteArray padding(4 - (utf8string.size() % 4), 0);
         stream.writeRawData(padding.data(), padding.size());
     }
@@ -252,20 +244,20 @@ static void setBodyLength(QByteArray &buffer, qint16 length)
 
 QXmppStunMessage::QXmppStunMessage()
     : errorCode(0),
-    changedPort(0),
-    mappedPort(0),
-    otherPort(0),
-    sourcePort(0),
-    xorMappedPort(0),
-    xorPeerPort(0),
-    xorRelayedPort(0),
-    useCandidate(false),
-    m_cookie(STUN_MAGIC),
-    m_type(0),
-    m_changeRequest(0),
-    m_channelNumber(0),
-    m_lifetime(0),
-    m_priority(0)
+      changedPort(0),
+      mappedPort(0),
+      otherPort(0),
+      sourcePort(0),
+      xorMappedPort(0),
+      xorPeerPort(0),
+      xorRelayedPort(0),
+      useCandidate(false),
+      m_cookie(STUN_MAGIC),
+      m_type(0),
+      m_changeRequest(0),
+      m_channelNumber(0),
+      m_lifetime(0),
+      m_priority(0)
 {
     m_id = QByteArray(STUN_ID_SIZE, 0);
 }
@@ -519,8 +511,7 @@ bool QXmppStunMessage::decode(const QByteArray &buffer, const QByteArray &key, Q
     if (!errors)
         errors = &silent;
 
-    if (buffer.size() < STUN_HEADER)
-    {
+    if (buffer.size() < STUN_HEADER) {
         *errors << QLatin1String("Received a truncated STUN packet");
         return false;
     }
@@ -533,8 +524,7 @@ bool QXmppStunMessage::decode(const QByteArray &buffer, const QByteArray &key, Q
     stream >> m_cookie;
     stream.readRawData(m_id.data(), m_id.size());
 
-    if (length != buffer.size() - STUN_HEADER)
-    {
+    if (length != buffer.size() - STUN_HEADER) {
         *errors << QLatin1String("Received an invalid STUN packet");
         return false;
     }
@@ -542,24 +532,21 @@ bool QXmppStunMessage::decode(const QByteArray &buffer, const QByteArray &key, Q
     // parse STUN attributes
     int done = 0;
     bool after_integrity = false;
-    while (done < length)
-    {
+    while (done < length) {
         quint16 a_type, a_length;
         stream >> a_type;
         stream >> a_length;
         const int pad_length = 4 * ((a_length + 3) / 4) - a_length;
 
         // only FINGERPRINT is allowed after MESSAGE-INTEGRITY
-        if (after_integrity && a_type != Fingerprint)
-        {
+        if (after_integrity && a_type != Fingerprint) {
             *errors << QString("Skipping attribute %1 after MESSAGE-INTEGRITY").arg(QString::number(a_type));
             stream.skipRawData(a_length + pad_length);
             done += 4 + a_length + pad_length;
             continue;
         }
 
-        if (a_type == Priority)
-        {
+        if (a_type == Priority) {
             // PRIORITY
             if (a_length != sizeof(m_priority))
                 return false;
@@ -664,8 +651,7 @@ bool QXmppStunMessage::decode(const QByteArray &buffer, const QByteArray &key, Q
         } else if (a_type == MappedAddress) {
 
             // MAPPED-ADDRESS
-            if (!decodeAddress(stream, a_length, mappedHost, mappedPort))
-            {
+            if (!decodeAddress(stream, a_length, mappedHost, mappedPort)) {
                 *errors << QLatin1String("Bad MAPPED-ADDRESS");
                 return false;
             }
@@ -681,8 +667,7 @@ bool QXmppStunMessage::decode(const QByteArray &buffer, const QByteArray &key, Q
         } else if (a_type == SourceAddress) {
 
             // SOURCE-ADDRESS
-            if (!decodeAddress(stream, a_length, sourceHost, sourcePort))
-            {
+            if (!decodeAddress(stream, a_length, sourceHost, sourcePort)) {
                 *errors << QLatin1String("Bad SOURCE-ADDRESS");
                 return false;
             }
@@ -690,8 +675,7 @@ bool QXmppStunMessage::decode(const QByteArray &buffer, const QByteArray &key, Q
         } else if (a_type == ChangedAddress) {
 
             // CHANGED-ADDRESS
-            if (!decodeAddress(stream, a_length, changedHost, changedPort))
-            {
+            if (!decodeAddress(stream, a_length, changedHost, changedPort)) {
                 *errors << QLatin1String("Bad CHANGED-ADDRESS");
                 return false;
             }
@@ -699,8 +683,7 @@ bool QXmppStunMessage::decode(const QByteArray &buffer, const QByteArray &key, Q
         } else if (a_type == OtherAddress) {
 
             // OTHER-ADDRESS
-            if (!decodeAddress(stream, a_length, otherHost, otherPort))
-            {
+            if (!decodeAddress(stream, a_length, otherHost, otherPort)) {
                 *errors << QLatin1String("Bad OTHER-ADDRESS");
                 return false;
             }
@@ -708,8 +691,7 @@ bool QXmppStunMessage::decode(const QByteArray &buffer, const QByteArray &key, Q
         } else if (a_type == XorMappedAddress) {
 
             // XOR-MAPPED-ADDRESS
-            if (!decodeAddress(stream, a_length, xorMappedHost, xorMappedPort, m_id))
-            {
+            if (!decodeAddress(stream, a_length, xorMappedHost, xorMappedPort, m_id)) {
                 *errors << QLatin1String("Bad XOR-MAPPED-ADDRESS");
                 return false;
             }
@@ -717,8 +699,7 @@ bool QXmppStunMessage::decode(const QByteArray &buffer, const QByteArray &key, Q
         } else if (a_type == XorPeerAddress) {
 
             // XOR-PEER-ADDRESS
-            if (!decodeAddress(stream, a_length, xorPeerHost, xorPeerPort, m_id))
-            {
+            if (!decodeAddress(stream, a_length, xorPeerHost, xorPeerPort, m_id)) {
                 *errors << QLatin1String("Bad XOR-PEER-ADDRESS");
                 return false;
             }
@@ -726,8 +707,7 @@ bool QXmppStunMessage::decode(const QByteArray &buffer, const QByteArray &key, Q
         } else if (a_type == XorRelayedAddress) {
 
             // XOR-RELAYED-ADDRESS
-            if (!decodeAddress(stream, a_length, xorRelayedHost, xorRelayedPort, m_id))
-            {
+            if (!decodeAddress(stream, a_length, xorRelayedHost, xorRelayedPort, m_id)) {
                 *errors << QLatin1String("Bad XOR-RELAYED-ADDRESS");
                 return false;
             }
@@ -741,12 +721,10 @@ bool QXmppStunMessage::decode(const QByteArray &buffer, const QByteArray &key, Q
             stream.readRawData(integrity.data(), integrity.size());
 
             // check HMAC-SHA1
-            if (!key.isEmpty())
-            {
+            if (!key.isEmpty()) {
                 QByteArray copy = buffer.left(STUN_HEADER + done);
                 setBodyLength(copy, done + 24);
-                if (integrity != QXmppUtils::generateHmacSha1(key, copy))
-                {
+                if (integrity != QXmppUtils::generateHmacSha1(key, copy)) {
                     *errors << QLatin1String("Bad message integrity");
                     return false;
                 }
@@ -767,8 +745,7 @@ bool QXmppStunMessage::decode(const QByteArray &buffer, const QByteArray &key, Q
             QByteArray copy = buffer.left(STUN_HEADER + done);
             setBodyLength(copy, done + 8);
             const quint32 expected = QXmppUtils::generateCrc32(copy) ^ 0x5354554eL;
-            if (fingerprint != expected)
-            {
+            if (fingerprint != expected) {
                 *errors << QLatin1String("Bad fingerprint");
                 return false;
             }
@@ -784,7 +761,7 @@ bool QXmppStunMessage::decode(const QByteArray &buffer, const QByteArray &key, Q
             iceControlling.resize(a_length);
             stream.readRawData(iceControlling.data(), iceControlling.size());
 
-         } else if (a_type == IceControlled) {
+        } else if (a_type == IceControlled) {
 
             /// ICE-CONTROLLED
             if (a_length != 8)
@@ -797,7 +774,6 @@ bool QXmppStunMessage::decode(const QByteArray &buffer, const QByteArray &key, Q
             // Unknown attribute
             stream.skipRawData(a_length);
             *errors << QString("Skipping unknown attribute %1").arg(QString::number(a_type));
-
         }
         stream.skipRawData(pad_length);
         done += 4 + a_length + pad_length;
@@ -852,8 +828,7 @@ QByteArray QXmppStunMessage::encode(const QByteArray &key, bool addFingerprint)
     addAddress(stream, XorRelayedAddress, xorRelayedHost, xorRelayedPort, m_id);
 
     // ERROR-CODE
-    if (errorCode)
-    {
+    if (errorCode) {
         const quint16 reserved = 0;
         const quint8 errorCodeHigh = errorCode / 100;
         const quint8 errorCodeLow = errorCode % 100;
@@ -864,24 +839,21 @@ QByteArray QXmppStunMessage::encode(const QByteArray &key, bool addFingerprint)
         stream << errorCodeHigh;
         stream << errorCodeLow;
         stream.writeRawData(phrase.data(), phrase.size());
-        if (phrase.size() % 4)
-        {
-            const QByteArray padding(4 - (phrase.size() %  4), 0);
+        if (phrase.size() % 4) {
+            const QByteArray padding(4 - (phrase.size() % 4), 0);
             stream.writeRawData(padding.data(), padding.size());
         }
     }
 
     // PRIORITY
-    if (m_attributes.contains(Priority))
-    {
+    if (m_attributes.contains(Priority)) {
         stream << quint16(Priority);
         stream << quint16(sizeof(m_priority));
         stream << m_priority;
     }
 
     // USE-CANDIDATE
-    if (useCandidate)
-    {
+    if (useCandidate) {
         stream << quint16(UseCandidate);
         stream << quint16(0);
     }
@@ -900,7 +872,7 @@ QByteArray QXmppStunMessage::encode(const QByteArray &key, bool addFingerprint)
         stream << quint16(m_data.size());
         stream.writeRawData(m_data.data(), m_data.size());
         if (m_data.size() % 4) {
-            const QByteArray padding(4 - (m_data.size() %  4), 0);
+            const QByteArray padding(4 - (m_data.size() % 4), 0);
             stream.writeRawData(padding.data(), padding.size());
         }
     }
@@ -948,8 +920,7 @@ QByteArray QXmppStunMessage::encode(const QByteArray &key, bool addFingerprint)
         encodeString(stream, Username, m_username);
 
     // ICE-CONTROLLING or ICE-CONTROLLED
-    if (!iceControlling.isEmpty())
-    {
+    if (!iceControlling.isEmpty()) {
         stream << quint16(IceControlling);
         stream << quint16(iceControlling.size());
         stream.writeRawData(iceControlling.data(), iceControlling.size());
@@ -963,8 +934,7 @@ QByteArray QXmppStunMessage::encode(const QByteArray &key, bool addFingerprint)
     setBodyLength(buffer, buffer.size() - STUN_HEADER);
 
     // MESSAGE-INTEGRITY
-    if (!key.isEmpty())
-    {
+    if (!key.isEmpty()) {
         setBodyLength(buffer, buffer.size() - STUN_HEADER + 24);
         QByteArray integrity = QXmppUtils::generateHmacSha1(key, buffer);
         stream << quint16(MessageIntegrity);
@@ -973,8 +943,7 @@ QByteArray QXmppStunMessage::encode(const QByteArray &key, bool addFingerprint)
     }
 
     // FINGERPRINT
-    if (addFingerprint)
-    {
+    if (addFingerprint) {
         setBodyLength(buffer, buffer.size() - STUN_HEADER + 8);
         quint32 fingerprint = QXmppUtils::generateCrc32(buffer) ^ 0x5354554eL;
         stream << quint16(Fingerprint);
@@ -1017,29 +986,54 @@ QString QXmppStunMessage::toString() const
 {
     QStringList dumpLines;
     QString typeName;
-    switch (messageMethod())
-    {
-        case Binding: typeName = "Binding"; break;
-        case SharedSecret: typeName = "Shared Secret"; break;
-        case Allocate: typeName = "Allocate"; break;
-        case Refresh: typeName = "Refresh"; break;
-        case Send: typeName = "Send"; break;
-        case Data: typeName = "Data"; break;
-        case CreatePermission: typeName = "CreatePermission"; break;
-        case ChannelBind: typeName = "ChannelBind"; break;
-        default: typeName = "Unknown"; break;
-    }
-    switch (messageClass())
-    {
-        case Request: typeName += " Request"; break;
-        case Indication: typeName += " Indication"; break;
-        case Response: typeName += " Response"; break;
-        case Error: typeName += " Error"; break;
-        default: break;
+    switch (messageMethod()) {
+    case Binding:
+        typeName = "Binding";
+        break;
+    case SharedSecret:
+        typeName = "Shared Secret";
+        break;
+    case Allocate:
+        typeName = "Allocate";
+        break;
+    case Refresh:
+        typeName = "Refresh";
+        break;
+    case Send:
+        typeName = "Send";
+        break;
+    case Data:
+        typeName = "Data";
+        break;
+    case CreatePermission:
+        typeName = "CreatePermission";
+        break;
+    case ChannelBind:
+        typeName = "ChannelBind";
+        break;
+    default:
+        typeName = "Unknown";
+        break;
+    }
+    switch (messageClass()) {
+    case Request:
+        typeName += " Request";
+        break;
+    case Indication:
+        typeName += " Indication";
+        break;
+    case Response:
+        typeName += " Response";
+        break;
+    case Error:
+        typeName += " Error";
+        break;
+    default:
+        break;
     }
     dumpLines << QString(" type %1 (%2)")
-        .arg(typeName)
-        .arg(QString::number(m_type));
+                     .arg(typeName)
+                     .arg(QString::number(m_type));
     dumpLines << QString(" id %1").arg(QString::fromLatin1(m_id.toHex()));
 
     // attributes
@@ -1047,7 +1041,7 @@ QString QXmppStunMessage::toString() const
         dumpLines << QString(" * CHANNEL-NUMBER %1").arg(QString::number(m_channelNumber));
     if (errorCode)
         dumpLines << QString(" * ERROR-CODE %1 %2")
-            .arg(QString::number(errorCode), errorPhrase);
+                         .arg(QString::number(errorCode), errorPhrase);
     if (m_attributes.contains(Lifetime))
         dumpLines << QString(" * LIFETIME %1").arg(QString::number(m_lifetime));
     if (m_attributes.contains(Nonce))
@@ -1064,36 +1058,36 @@ QString QXmppStunMessage::toString() const
         dumpLines << QString(" * USERNAME %1").arg(m_username);
     if (mappedPort)
         dumpLines << QString(" * MAPPED-ADDRESS %1 %2")
-            .arg(mappedHost.toString(), QString::number(mappedPort));
+                         .arg(mappedHost.toString(), QString::number(mappedPort));
     if (m_attributes.contains(ChangeRequest))
         dumpLines << QString(" * CHANGE-REQUEST %1")
-            .arg(QString::number(m_changeRequest));
+                         .arg(QString::number(m_changeRequest));
     if (sourcePort)
         dumpLines << QString(" * SOURCE-ADDRESS %1 %2")
-            .arg(sourceHost.toString(), QString::number(sourcePort));
+                         .arg(sourceHost.toString(), QString::number(sourcePort));
     if (changedPort)
         dumpLines << QString(" * CHANGED-ADDRESS %1 %2")
-            .arg(changedHost.toString(), QString::number(changedPort));
+                         .arg(changedHost.toString(), QString::number(changedPort));
     if (otherPort)
         dumpLines << QString(" * OTHER-ADDRESS %1 %2")
-            .arg(otherHost.toString(), QString::number(otherPort));
+                         .arg(otherHost.toString(), QString::number(otherPort));
     if (xorMappedPort)
         dumpLines << QString(" * XOR-MAPPED-ADDRESS %1 %2")
-            .arg(xorMappedHost.toString(), QString::number(xorMappedPort));
+                         .arg(xorMappedHost.toString(), QString::number(xorMappedPort));
     if (xorPeerPort)
         dumpLines << QString(" * XOR-PEER-ADDRESS %1 %2")
-            .arg(xorPeerHost.toString(), QString::number(xorPeerPort));
+                         .arg(xorPeerHost.toString(), QString::number(xorPeerPort));
     if (xorRelayedPort)
         dumpLines << QString(" * XOR-RELAYED-ADDRESS %1 %2")
-            .arg(xorRelayedHost.toString(), QString::number(xorRelayedPort));
+                         .arg(xorRelayedHost.toString(), QString::number(xorRelayedPort));
     if (m_attributes.contains(Priority))
         dumpLines << QString(" * PRIORITY %1").arg(QString::number(m_priority));
     if (!iceControlling.isEmpty())
         dumpLines << QString(" * ICE-CONTROLLING %1")
-            .arg(QString::fromLatin1(iceControlling.toHex()));
+                         .arg(QString::fromLatin1(iceControlling.toHex()));
     if (!iceControlled.isEmpty())
         dumpLines << QString(" * ICE-CONTROLLED %1")
-            .arg(QString::fromLatin1(iceControlled.toHex()));
+                         .arg(QString::fromLatin1(iceControlled.toHex()));
     if (useCandidate)
         dumpLines << QString(" * USE-CANDIDATE");
 
@@ -1107,8 +1101,8 @@ QString QXmppStunMessage::toString() const
 
 QXmppStunTransaction::QXmppStunTransaction(const QXmppStunMessage &request, QObject *receiver)
     : QXmppLoggable(receiver),
-    m_request(request),
-    m_tries(0)
+      m_request(request),
+      m_tries(0)
 {
     bool check;
     Q_UNUSED(check)
@@ -1125,7 +1119,7 @@ QXmppStunTransaction::QXmppStunTransaction(const QXmppStunMessage &request, QObj
     m_retryTimer = new QTimer(this);
     m_retryTimer->setSingleShot(true);
     connect(m_retryTimer, &QTimer::timeout,
-                    this, &QXmppStunTransaction::retry);
+            this, &QXmppStunTransaction::retry);
 
     // send packet immediately
     m_retryTimer->start(0);
@@ -1176,27 +1170,27 @@ void QXmppStunTransaction::retry()
 
 QXmppTurnAllocation::QXmppTurnAllocation(QObject *parent)
     : QXmppIceTransport(parent),
-    m_relayedPort(0),
-    m_turnPort(0),
-    m_channelNumber(0x4000),
-    m_lifetime(600),
-    m_state(UnconnectedState)
+      m_relayedPort(0),
+      m_turnPort(0),
+      m_channelNumber(0x4000),
+      m_lifetime(600),
+      m_state(UnconnectedState)
 {
 
     socket = new QUdpSocket(this);
     connect(socket, &QIODevice::readyRead,
-                    this, &QXmppTurnAllocation::readyRead);
+            this, &QXmppTurnAllocation::readyRead);
 
     m_timer = new QTimer(this);
     m_timer->setSingleShot(true);
     connect(m_timer, &QTimer::timeout,
-                    this, &QXmppTurnAllocation::refresh);
+            this, &QXmppTurnAllocation::refresh);
 
     // channels are valid 600s, we refresh every 500s
     m_channelTimer = new QTimer(this);
     m_channelTimer->setInterval(500 * 1000);
     connect(m_channelTimer, &QTimer::timeout,
-                    this, &QXmppTurnAllocation::refreshChannels);
+            this, &QXmppTurnAllocation::refreshChannels);
 }
 
 /// Destroys the TURN allocation.
@@ -1304,7 +1298,7 @@ void QXmppTurnAllocation::handleDatagram(const QByteArray &buffer, const QHostAd
         stream >> length;
         if (m_state == ConnectedState && m_channels.contains(channel) && length <= buffer.size() - 4) {
             emit datagramReceived(buffer.mid(4, length), m_channels[channel].first,
-                m_channels[channel].second);
+                                  m_channels[channel].second);
         }
         return;
     }
@@ -1319,10 +1313,7 @@ void QXmppTurnAllocation::handleDatagram(const QByteArray &buffer, const QHostAd
     }
 
 #ifdef QXMPP_DEBUG_STUN
-    logReceived(QString("TURN packet from %1 port %2\n%3").arg(
-            remoteHost.toString(),
-            QString::number(remotePort),
-            message.toString()));
+    logReceived(QString("TURN packet from %1 port %2\n%3").arg(remoteHost.toString(), QString::number(remotePort), message.toString()));
 #endif
 
     // find transaction
@@ -1434,7 +1425,7 @@ void QXmppTurnAllocation::setState(AllocationState state)
 
 void QXmppTurnAllocation::transactionFinished()
 {
-    auto *transaction = qobject_cast<QXmppStunTransaction*>(sender());
+    auto *transaction = qobject_cast<QXmppStunTransaction *>(sender());
     if (!transaction || !m_transactions.removeAll(transaction))
         return;
     transaction->deleteLater();
@@ -1443,8 +1434,7 @@ void QXmppTurnAllocation::transactionFinished()
     const QXmppStunMessage reply = transaction->response();
     if (reply.messageClass() == QXmppStunMessage::Error &&
         reply.errorCode == 401 &&
-        (reply.nonce() != m_nonce && reply.realm() != m_realm))
-    {
+        (reply.nonce() != m_nonce && reply.realm() != m_realm)) {
         // update long-term credentials
         m_nonce = reply.nonce();
         m_realm = reply.realm();
@@ -1466,8 +1456,7 @@ void QXmppTurnAllocation::transactionFinished()
     if (method == QXmppStunMessage::Allocate) {
 
         if (reply.messageClass() == QXmppStunMessage::Error) {
-            warning(QString("Allocation failed: %1 %2").arg(
-                QString::number(reply.errorCode), reply.errorPhrase));
+            warning(QString("Allocation failed: %1 %2").arg(QString::number(reply.errorCode), reply.errorPhrase));
             setState(UnconnectedState);
             return;
         }
@@ -1492,8 +1481,7 @@ void QXmppTurnAllocation::transactionFinished()
     } else if (method == QXmppStunMessage::ChannelBind) {
 
         if (reply.messageClass() == QXmppStunMessage::Error) {
-            warning(QString("ChannelBind failed: %1 %2").arg(
-                QString::number(reply.errorCode), reply.errorPhrase));
+            warning(QString("ChannelBind failed: %1 %2").arg(QString::number(reply.errorCode), reply.errorPhrase));
 
             // remove channel
             m_channels.remove(transaction->request().channelNumber());
@@ -1505,8 +1493,7 @@ void QXmppTurnAllocation::transactionFinished()
     } else if (method == QXmppStunMessage::Refresh) {
 
         if (reply.messageClass() == QXmppStunMessage::Error) {
-            warning(QString("Refresh failed: %1 %2").arg(
-                QString::number(reply.errorCode), reply.errorPhrase));
+            warning(QString("Refresh failed: %1 %2").arg(QString::number(reply.errorCode), reply.errorPhrase));
             setState(UnconnectedState);
             return;
         }
@@ -1519,7 +1506,6 @@ void QXmppTurnAllocation::transactionFinished()
         // schedule refresh
         m_lifetime = reply.lifetime();
         m_timer->start((m_lifetime - 60) * 1000);
-
     }
 }
 
@@ -1569,16 +1555,12 @@ void QXmppTurnAllocation::writeStun(const QXmppStunMessage &message)
 {
     socket->writeDatagram(message.encode(m_key), m_turnHost, m_turnPort);
 #ifdef QXMPP_DEBUG_STUN
-    logSent(QString("TURN packet to %1 port %2\n%3").arg(
-            m_turnHost.toString(),
-            QString::number(m_turnPort),
-            message.toString()));
+    logSent(QString("TURN packet to %1 port %2\n%3").arg(m_turnHost.toString(), QString::number(m_turnPort), message.toString()));
 #endif
 }
 
 QXmppUdpTransport::QXmppUdpTransport(QUdpSocket *socket, QObject *parent)
-    : QXmppIceTransport(parent)
-    , m_socket(socket)
+    : QXmppIceTransport(parent), m_socket(socket)
 {
 
     connect(m_socket, &QIODevice::readyRead, this, &QXmppUdpTransport::readyRead);
@@ -1672,14 +1654,7 @@ static bool candidatePairPtrLessThan(const CandidatePair *p1, const CandidatePai
 }
 
 CandidatePair::CandidatePair(int component, bool controlling, QObject *parent)
-    : QXmppLoggable(parent)
-    , nominated(false)
-    , nominating(false)
-    , transport(nullptr)
-    , transaction(nullptr)
-    , m_component(component)
-    , m_controlling(controlling)
-    , m_state(WaitingState)
+    : QXmppLoggable(parent), nominated(false), nominating(false), transport(nullptr), transaction(nullptr), m_component(component), m_controlling(controlling), m_state(WaitingState)
 {
 }
 
@@ -1733,8 +1708,7 @@ public:
 };
 
 QXmppIcePrivate::QXmppIcePrivate()
-    : iceControlling(false)
-    , stunPort(0)
+    : iceControlling(false), stunPort(0)
 {
     localUser = QXmppUtils::generateStanzaHash(4);
     localPassword = QXmppUtils::generateStanzaHash(22);
@@ -1746,9 +1720,9 @@ class QXmppIceComponentPrivate
 public:
     QXmppIceComponentPrivate(int component, QXmppIcePrivate *config, QXmppIceComponent *qq);
     bool addRemoteCandidate(const QXmppJingleCandidate &candidate);
-    CandidatePair* findPair(QXmppStunTransaction *transaction);
+    CandidatePair *findPair(QXmppStunTransaction *transaction);
     void performCheck(CandidatePair *pair, bool nominate);
-    void setSockets(QList<QUdpSocket*> sockets);
+    void setSockets(QList<QUdpSocket *> sockets);
     void setTurnServer(const QHostAddress &host, quint16 port);
     void setTurnUser(const QString &user);
     void setTurnPassword(const QString &password);
@@ -1756,7 +1730,7 @@ public:
 
     CandidatePair *activePair;
     const int component;
-    const QXmppIcePrivate* const config;
+    const QXmppIcePrivate *const config;
     CandidatePair *fallbackPair;
 
     QXmppIceConnection::GatheringState gatheringState;
@@ -1766,12 +1740,12 @@ public:
     quint32 peerReflexivePriority;
     QList<QXmppJingleCandidate> remoteCandidates;
 
-    QList<CandidatePair*> pairs;
-    QList<QXmppIceTransport*> transports;
+    QList<CandidatePair *> pairs;
+    QList<QXmppIceTransport *> transports;
     QTimer *timer;
 
     // STUN server
-    QMap<QXmppStunTransaction*, QXmppIceTransport*> stunTransactions;
+    QMap<QXmppStunTransaction *, QXmppIceTransport *> stunTransactions;
 
     // TURN server
     QXmppTurnAllocation *turnAllocation;
@@ -1782,16 +1756,7 @@ private:
 };
 
 QXmppIceComponentPrivate::QXmppIceComponentPrivate(int component_, QXmppIcePrivate *config_, QXmppIceComponent *qq)
-    : activePair(nullptr)
-    , component(component_)
-    , config(config_)
-    , fallbackPair(nullptr)
-    , gatheringState(QXmppIceConnection::NewGatheringState)
-    , peerReflexivePriority(0)
-    , timer(nullptr)
-    , turnAllocation(nullptr)
-    , turnConfigured(false)
-    , q(qq)
+    : activePair(nullptr), component(component_), config(config_), fallbackPair(nullptr), gatheringState(QXmppIceConnection::NewGatheringState), peerReflexivePriority(0), timer(nullptr), turnAllocation(nullptr), turnConfigured(false), q(qq)
 {
 }
 
@@ -1803,7 +1768,7 @@ bool QXmppIceComponentPrivate::addRemoteCandidate(const QXmppJingleCandidate &ca
          candidate.type() != QXmppJingleCandidate::ServerReflexiveType) ||
         candidate.protocol() != "udp" ||
         (candidate.host().protocol() != QAbstractSocket::IPv4Protocol &&
-        candidate.host().protocol() != QAbstractSocket::IPv6Protocol))
+         candidate.host().protocol() != QAbstractSocket::IPv6Protocol))
         return false;
 
     for (const auto &c : remoteCandidates)
@@ -1831,7 +1796,7 @@ bool QXmppIceComponentPrivate::addRemoteCandidate(const QXmppJingleCandidate &ca
     return true;
 }
 
-CandidatePair* QXmppIceComponentPrivate::findPair(QXmppStunTransaction *transaction)
+CandidatePair *QXmppIceComponentPrivate::findPair(QXmppStunTransaction *transaction)
 {
     for (auto *pair : pairs) {
         if (pair->transaction == transaction)
@@ -1858,7 +1823,7 @@ void QXmppIceComponentPrivate::performCheck(CandidatePair *pair, bool nominate)
     pair->transaction = new QXmppStunTransaction(message, q);
 }
 
-void QXmppIceComponentPrivate::setSockets(QList<QUdpSocket*> sockets)
+void QXmppIceComponentPrivate::setSockets(QList<QUdpSocket *> sockets)
 {
 
     // clear previous candidates and sockets
@@ -1875,7 +1840,7 @@ void QXmppIceComponentPrivate::setSockets(QList<QUdpSocket*> sockets)
 
         auto *transport = new QXmppUdpTransport(socket, q);
         QObject::connect(transport, &QXmppIceTransport::datagramReceived,
-                                 q, &QXmppIceComponent::handleDatagram);
+                         q, &QXmppIceComponent::handleDatagram);
 
         QXmppJingleCandidate candidate = transport->localCandidate(component);
 
@@ -1931,10 +1896,7 @@ void QXmppIceComponentPrivate::writeStun(const QXmppStunMessage &message, QXmppI
     const QByteArray data = message.encode(messagePassword.toUtf8());
     transport->writeDatagram(data, address, port);
 #ifdef QXMPP_DEBUG_STUN
-    q->logSent(QString("STUN packet to %1 port %2\n%3").arg(
-               address.toString(),
-               QString::number(port),
-               message.toString()));
+    q->logSent(QString("STUN packet to %1 port %2\n%3").arg(address.toString(), QString::number(port), message.toString()));
 #endif
 }
 
@@ -1951,15 +1913,15 @@ QXmppIceComponent::QXmppIceComponent(int component, QXmppIcePrivate *config, QOb
     d->timer = new QTimer(this);
     d->timer->setInterval(500);
     connect(d->timer, &QTimer::timeout,
-                    this, &QXmppIceComponent::checkCandidates);
+            this, &QXmppIceComponent::checkCandidates);
 
     d->turnAllocation = new QXmppTurnAllocation(this);
     connect(d->turnAllocation, &QXmppTurnAllocation::connected,
-                    this, &QXmppIceComponent::turnConnected);
+            this, &QXmppIceComponent::turnConnected);
     connect(d->turnAllocation, &QXmppIceTransport::datagramReceived,
-                    this, &QXmppIceComponent::handleDatagram);
+            this, &QXmppIceComponent::handleDatagram);
     connect(d->turnAllocation, &QXmppTurnAllocation::disconnected,
-                    this, &QXmppIceComponent::updateGatheringState);
+            this, &QXmppIceComponent::updateGatheringState);
 
     // calculate peer-reflexive candidate priority
     // see RFC 5245 -  7.1.2.1. PRIORITY and USE-CANDIDATE
@@ -2039,7 +2001,7 @@ QList<QXmppJingleCandidate> QXmppIceComponent::localCandidates() const
 
 void QXmppIceComponent::handleDatagram(const QByteArray &buffer, const QHostAddress &remoteHost, quint16 remotePort)
 {
-    auto *transport = qobject_cast<QXmppIceTransport*>(sender());
+    auto *transport = qobject_cast<QXmppIceTransport *>(sender());
     if (!transport)
         return;
 
@@ -2047,8 +2009,7 @@ void QXmppIceComponent::handleDatagram(const QByteArray &buffer, const QHostAddr
     quint32 messageCookie;
     QByteArray messageId;
     quint16 messageType = QXmppStunMessage::peekType(buffer, messageCookie, messageId);
-    if (!messageType || messageCookie != STUN_MAGIC)
-    {
+    if (!messageType || messageCookie != STUN_MAGIC) {
         // use this as an opportunity to flag a potential pair
         for (auto *pair : d->pairs) {
             if (pair->remote.host() == remoteHost &&
@@ -2088,10 +2049,7 @@ void QXmppIceComponent::handleDatagram(const QByteArray &buffer, const QHostAddr
         return;
     }
 #ifdef QXMPP_DEBUG_STUN
-    logReceived(QString("STUN packet from %1 port %2\n%3").arg(
-            remoteHost.toString(),
-            QString::number(remotePort),
-            message.toString()));
+    logReceived(QString("STUN packet from %1 port %2\n%3").arg(remoteHost.toString(), QString::number(remotePort), message.toString()));
 #endif
 
     // we only want binding requests and responses
@@ -2106,8 +2064,7 @@ void QXmppIceComponent::handleDatagram(const QByteArray &buffer, const QHostAddr
 
     // process message from peer
     CandidatePair *pair = nullptr;
-    if (message.messageClass() == QXmppStunMessage::Request)
-    {
+    if (message.messageClass() == QXmppStunMessage::Request) {
         // check for role conflict
         if (d->config->iceControlling && (!message.iceControlling.isEmpty() || message.useCandidate)) {
             warning("Role conflict, expected to be controlling");
@@ -2151,9 +2108,7 @@ void QXmppIceComponent::handleDatagram(const QByteArray &buffer, const QHostAddr
 
         // construct pair
         for (auto *ptr : d->pairs) {
-            if (ptr->transport == transport
-             && ptr->remote.host() == remoteHost
-             && ptr->remote.port() == remotePort) {
+            if (ptr->transport == transport && ptr->remote.host() == remoteHost && ptr->remote.port() == remotePort) {
                 pair = ptr;
                 break;
             }
@@ -2185,8 +2140,7 @@ void QXmppIceComponent::handleDatagram(const QByteArray &buffer, const QHostAddr
             break;
         }
 
-    } else if (message.messageClass() == QXmppStunMessage::Response
-            || message.messageClass() == QXmppStunMessage::Error) {
+    } else if (message.messageClass() == QXmppStunMessage::Response || message.messageClass() == QXmppStunMessage::Error) {
 
         // find the pair for this transaction
         for (auto *ptr : d->pairs) {
@@ -2202,9 +2156,7 @@ void QXmppIceComponent::handleDatagram(const QByteArray &buffer, const QHostAddr
         if (remoteHost != pair->remote.host() || remotePort != pair->remote.port()) {
             QXmppStunMessage error;
             error.setType(QXmppStunMessage::Error);
-            error.errorPhrase = QString("Received response from unexpected %1:%1").arg(
-                remoteHost.toString(),
-                QString::number(remotePort));
+            error.errorPhrase = QString("Received response from unexpected %1:%1").arg(remoteHost.toString(), QString::number(remotePort));
             pair->transaction->readStun(error);
             return;
         }
@@ -2216,8 +2168,7 @@ void QXmppIceComponent::handleDatagram(const QByteArray &buffer, const QHostAddr
     if (pair && pair->nominated) {
         d->timer->stop();
         if (!d->activePair || pair->priority() > d->activePair->priority()) {
-            info(QString("ICE pair selected %1 (priority: %2)").arg(
-                pair->toString(), QString::number(pair->priority())));
+            info(QString("ICE pair selected %1 (priority: %2)").arg(pair->toString(), QString::number(pair->priority())));
             const bool wasConnected = (d->activePair != nullptr);
             d->activePair = pair;
             if (!wasConnected)
@@ -2228,7 +2179,7 @@ void QXmppIceComponent::handleDatagram(const QByteArray &buffer, const QHostAddr
 
 void QXmppIceComponent::transactionFinished()
 {
-    auto *transaction = qobject_cast<QXmppStunTransaction*>(sender());
+    auto *transaction = qobject_cast<QXmppStunTransaction *>(sender());
     transaction->deleteLater();
 
     // ICE checks
@@ -2248,9 +2199,7 @@ void QXmppIceComponent::transactionFinished()
                 pair->nominated = true;
             }
         } else {
-            debug(QString("ICE forward check failed %1 (error %2)").arg(
-                pair->toString(),
-                transaction->response().errorPhrase));
+            debug(QString("ICE forward check failed %1 (error %2)").arg(pair->toString(), transaction->response().errorPhrase));
             pair->setState(CandidatePair::FailedState);
         }
         pair->transaction = nullptr;
@@ -2303,8 +2252,7 @@ void QXmppIceComponent::transactionFinished()
 
             emit localCandidatesChanged();
         } else {
-            debug(QString("STUN test failed (error %1)").arg(
-                transaction->response().errorPhrase));
+            debug(QString("STUN test failed (error %1)").arg(transaction->response().errorPhrase));
         }
         d->stunTransactions.remove(transaction);
         updateGatheringState();
@@ -2317,18 +2265,16 @@ void QXmppIceComponent::turnConnected()
     const QXmppJingleCandidate candidate = d->turnAllocation->localCandidate(d->component);
 
     // add the new local candidate
-    debug(QString("Adding relayed candidate %1 port %2").arg(
-        candidate.host().toString(),
-        QString::number(candidate.port())));
+    debug(QString("Adding relayed candidate %1 port %2").arg(candidate.host().toString(), QString::number(candidate.port())));
     d->localCandidates << candidate;
 
     emit localCandidatesChanged();
     updateGatheringState();
 }
 
-static QList<QUdpSocket*> reservePort(const QList<QHostAddress> &addresses, quint16 port, QObject *parent)
+static QList<QUdpSocket *> reservePort(const QList<QHostAddress> &addresses, quint16 port, QObject *parent)
 {
-    QList<QUdpSocket*> sockets;
+    QList<QUdpSocket *> sockets;
     for (const auto &address : addresses) {
         auto *socket = new QUdpSocket(parent);
         sockets << socket;
@@ -2384,9 +2330,9 @@ QList<QHostAddress> QXmppIceComponent::discoverAddresses()
 /// \param count     The number of ports to reserve.
 /// \param parent    The parent object for the sockets.
 
-QList<QUdpSocket*> QXmppIceComponent::reservePorts(const QList<QHostAddress> &addresses, int count, QObject *parent)
+QList<QUdpSocket *> QXmppIceComponent::reservePorts(const QList<QHostAddress> &addresses, int count, QObject *parent)
 {
-    QList<QUdpSocket*> sockets;
+    QList<QUdpSocket *> sockets;
     if (addresses.isEmpty() || !count)
         return sockets;
 
@@ -2396,7 +2342,7 @@ QList<QUdpSocket*> QXmppIceComponent::reservePorts(const QList<QHostAddress> &ad
         // reserve first port (even number)
         if (port % 2)
             port++;
-        QList<QUdpSocket*> socketChunk;
+        QList<QUdpSocket *> socketChunk;
         while (socketChunk.isEmpty() && port <= 65536 - count) {
             socketChunk = reservePort(addresses, port, parent);
             if (socketChunk.isEmpty())
@@ -2440,8 +2386,7 @@ void QXmppIceComponent::updateGatheringState()
     QXmppIceConnection::GatheringState newGatheringState;
     if (d->transports.isEmpty())
         newGatheringState = QXmppIceConnection::NewGatheringState;
-    else if (!d->stunTransactions.isEmpty()
-           || d->turnAllocation->state() == QXmppTurnAllocation::ConnectingState)
+    else if (!d->stunTransactions.isEmpty() || d->turnAllocation->state() == QXmppTurnAllocation::ConnectingState)
         newGatheringState = QXmppIceConnection::BusyGatheringState;
     else
         newGatheringState = QXmppIceConnection::CompleteGatheringState;
@@ -2454,7 +2399,7 @@ void QXmppIceComponent::updateGatheringState()
 
 void QXmppIceComponent::writeStun(const QXmppStunMessage &message)
 {
-    auto *transaction = qobject_cast<QXmppStunTransaction*>(sender());
+    auto *transaction = qobject_cast<QXmppStunTransaction *>(sender());
 
     // ICE checks
     CandidatePair *pair = d->findPair(transaction);
@@ -2468,10 +2413,7 @@ void QXmppIceComponent::writeStun(const QXmppStunMessage &message)
     if (transport) {
         transport->writeDatagram(message.encode(), d->config->stunHost, d->config->stunPort);
 #ifdef QXMPP_DEBUG_STUN
-        logSent(QString("STUN packet to %1 port %2\n%3").arg(
-                   d->config->stunHost.toString(),
-                   QString::number(d->config->stunPort),
-                   message.toString()));
+        logSent(QString("STUN packet to %1 port %2\n%3").arg(d->config->stunHost.toString(), QString::number(d->config->stunPort), message.toString()));
 #endif
         return;
     }
@@ -2482,7 +2424,7 @@ class QXmppIceConnectionPrivate : public QXmppIcePrivate
 public:
     QXmppIceConnectionPrivate();
 
-    QMap<int, QXmppIceComponent*> components;
+    QMap<int, QXmppIceComponent *> components;
     QTimer *connectTimer;
 
     QXmppIceConnection::GatheringState gatheringState;
@@ -2494,9 +2436,7 @@ public:
 };
 
 QXmppIceConnectionPrivate::QXmppIceConnectionPrivate()
-    : connectTimer(nullptr)
-    , gatheringState(QXmppIceConnection::NewGatheringState)
-    , turnPort(0)
+    : connectTimer(nullptr), gatheringState(QXmppIceConnection::NewGatheringState), turnPort(0)
 {
 }
 
@@ -2505,8 +2445,7 @@ QXmppIceConnectionPrivate::QXmppIceConnectionPrivate()
 /// \param parent
 
 QXmppIceConnection::QXmppIceConnection(QObject *parent)
-    : QXmppLoggable(parent)
-    , d(new QXmppIceConnectionPrivate())
+    : QXmppLoggable(parent), d(new QXmppIceConnectionPrivate())
 {
 
     // timer to limit connection time to 30 seconds
@@ -2514,7 +2453,7 @@ QXmppIceConnection::QXmppIceConnection(QObject *parent)
     d->connectTimer->setInterval(30000);
     d->connectTimer->setSingleShot(true);
     connect(d->connectTimer, &QTimer::timeout,
-                    this, &QXmppIceConnection::slotTimeout);
+            this, &QXmppIceConnection::slotTimeout);
 }
 
 QXmppIceConnection::~QXmppIceConnection()
@@ -2550,13 +2489,13 @@ void QXmppIceConnection::addComponent(int component)
     socket->d->setTurnPassword(d->turnPassword);
 
     connect(socket, &QXmppIceComponent::localCandidatesChanged,
-                    this, &QXmppIceConnection::localCandidatesChanged);
+            this, &QXmppIceConnection::localCandidatesChanged);
 
     connect(socket, &QXmppIceComponent::connected,
-                    this, &QXmppIceConnection::slotConnected);
+            this, &QXmppIceConnection::slotConnected);
 
     connect(socket, &QXmppIceComponent::gatheringStateChanged,
-                    this, &QXmppIceConnection::slotGatheringStateChanged);
+            this, &QXmppIceConnection::slotGatheringStateChanged);
 
     d->components[component] = socket;
 }
@@ -2569,8 +2508,7 @@ void QXmppIceConnection::addRemoteCandidate(const QXmppJingleCandidate &candidat
 {
     QXmppIceComponent *socket = d->components.value(candidate.component());
     if (!socket) {
-        warning(QString("Not adding candidate for unknown component %1").arg(
-                QString::number(candidate.component())));
+        warning(QString("Not adding candidate for unknown component %1").arg(QString::number(candidate.component())));
         return;
     }
     socket->d->addRemoteCandidate(candidate);
@@ -2583,7 +2521,7 @@ void QXmppIceConnection::addRemoteCandidate(const QXmppJingleCandidate &candidat
 bool QXmppIceConnection::bind(const QList<QHostAddress> &addresses)
 {
     // reserve ports
-    QList<QUdpSocket*> sockets = QXmppIceComponent::reservePorts(addresses, d->components.size());
+    QList<QUdpSocket *> sockets = QXmppIceComponent::reservePorts(addresses, d->components.size());
     if (sockets.isEmpty() && !addresses.isEmpty())
         return false;
 
@@ -2620,7 +2558,6 @@ void QXmppIceConnection::connectToHost()
     d->connectTimer->start();
 }
 
-
 /// Returns true if ICE negotiation completed, false otherwise.
 
 bool QXmppIceConnection::isConnected() const
@@ -2776,9 +2713,7 @@ void QXmppIceConnection::slotGatheringStateChanged()
         newGatheringState = BusyGatheringState;
 
     if (newGatheringState != d->gatheringState) {
-        info(QString("ICE gathering state changed from '%1' to '%2'").arg(
-            gathering_states[d->gatheringState],
-            gathering_states[newGatheringState]));
+        info(QString("ICE gathering state changed from '%1' to '%2'").arg(gathering_states[d->gatheringState], gathering_states[newGatheringState]));
         d->gatheringState = newGatheringState;
         emit gatheringStateChanged();
     }
diff --git a/src/base/QXmppUtils.cpp b/src/base/QXmppUtils.cpp
index 658e9d8d..7c5f631e 100644
--- a/src/base/QXmppUtils.cpp
+++ b/src/base/QXmppUtils.cpp
@@ -39,8 +39,7 @@
 
 // adapted from public domain source by Ross Williams and Eric Durbin
 // FIXME : is this valid for big-endian machines?
-static quint32 crctable[256] =
-{
+static quint32 crctable[256] = {
     0x00000000L, 0x77073096L, 0xEE0E612CL, 0x990951BAL,
     0x076DC419L, 0x706AF48FL, 0xE963A535L, 0x9E6495A3L,
     0x0EDB8832L, 0x79DCB8A4L, 0xE0D5E91EL, 0x97D2D988L,
@@ -122,15 +121,13 @@ QDateTime QXmppUtils::datetimeFromString(const QString &str)
     dt.setTimeSpec(Qt::UTC);
 
     // process milliseconds
-    if (tzPos > 20 && str.at(19) == '.')
-    {
+    if (tzPos > 20 && str.at(19) == '.') {
         QString millis = (str.mid(20, tzPos - 20) + "000").left(3);
         dt = dt.addMSecs(millis.toInt());
     }
 
     // process time zone
-    if (tzRe.cap(1) != "Z")
-    {
+    if (tzRe.cap(1) != "Z") {
         int offset = tzRe.cap(3).toInt() * 3600 + tzRe.cap(4).toInt() * 60;
         if (tzRe.cap(2) == "+")
             dt = dt.addSecs(-offset);
@@ -167,7 +164,7 @@ int QXmppUtils::timezoneOffsetFromString(const QString &str)
 
     // Calculate offset
     const int offset = tzRe.cap(3).toInt() * 3600 +
-                       tzRe.cap(4).toInt() * 60;
+        tzRe.cap(4).toInt() * 60;
     if (tzRe.cap(2) == "-")
         return -offset;
     else
@@ -195,12 +192,12 @@ QString QXmppUtils::jidToDomain(const QString &jid)
 
 /// Returns the resource for the given \a jid.
 
-QString QXmppUtils::jidToResource(const QString& jid)
+QString QXmppUtils::jidToResource(const QString &jid)
 {
     const int pos = jid.indexOf(QChar('/'));
     if (pos < 0)
         return QString();
-    return jid.mid(pos+1);
+    return jid.mid(pos + 1);
 }
 
 /// Returns the user for the given \a jid.
@@ -215,7 +212,7 @@ QString QXmppUtils::jidToUser(const QString &jid)
 
 /// Returns the bare jid (i.e. without resource) for the given \a jid.
 
-QString QXmppUtils::jidToBareJid(const QString& jid)
+QString QXmppUtils::jidToBareJid(const QString &jid)
 {
     const int pos = jid.indexOf(QChar('/'));
     if (pos < 0)
@@ -228,7 +225,7 @@ QString QXmppUtils::jidToBareJid(const QString& jid)
 quint32 QXmppUtils::generateCrc32(const QByteArray &in)
 {
     quint32 result = 0xffffffff;
-    for(char n : in)
+    for (char n : in)
         result = (result >> 8) ^ (crctable[(result & 0xff) ^ (quint8)n]);
     return result ^= 0xffffffff;
 }
@@ -278,7 +275,7 @@ int QXmppUtils::generateRandomInteger(int N)
 {
     Q_ASSERT(N > 0 && N <= RAND_MAX);
     int val;
-    while (N <= (val = qrand() / (RAND_MAX/N))) {};
+    while (N <= (val = qrand() / (RAND_MAX / N))) { };
     return val;
 }
 
@@ -303,24 +300,23 @@ QString QXmppUtils::generateStanzaHash(int length)
     const QString somechars = "1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
     const int N = somechars.size();
     QString hashResult;
-    for ( int idx = 0; idx < length; ++idx )
+    for (int idx = 0; idx < length; ++idx)
         hashResult += somechars[generateRandomInteger(N)];
     return hashResult;
 }
 
-void helperToXmlAddAttribute(QXmlStreamWriter* stream, const QString& name,
-                             const QString& value)
+void helperToXmlAddAttribute(QXmlStreamWriter *stream, const QString &name,
+                             const QString &value)
 {
-    if(!value.isEmpty())
-        stream->writeAttribute(name,value);
+    if (!value.isEmpty())
+        stream->writeAttribute(name, value);
 }
 
-void helperToXmlAddTextElement(QXmlStreamWriter* stream, const QString& name,
-                           const QString& value)
+void helperToXmlAddTextElement(QXmlStreamWriter *stream, const QString &name,
+                               const QString &value)
 {
-    if(!value.isEmpty())
-        stream->writeTextElement( name, value);
+    if (!value.isEmpty())
+        stream->writeTextElement(name, value);
     else
         stream->writeEmptyElement(name);
 }
-
diff --git a/src/base/QXmppVCardIq.cpp b/src/base/QXmppVCardIq.cpp
index da41db9d..1452b309 100644
--- a/src/base/QXmppVCardIq.cpp
+++ b/src/base/QXmppVCardIq.cpp
@@ -80,7 +80,7 @@ QXmppVCardAddress::~QXmppVCardAddress()
 
 /// Assigns \a other to this address.
 
-QXmppVCardAddress& QXmppVCardAddress::operator=(const QXmppVCardAddress &other)
+QXmppVCardAddress &QXmppVCardAddress::operator=(const QXmppVCardAddress &other)
 {
     d = other.d;
     return *this;
@@ -91,11 +91,11 @@ QXmppVCardAddress& QXmppVCardAddress::operator=(const QXmppVCardAddress &other)
 bool operator==(const QXmppVCardAddress &left, const QXmppVCardAddress &right)
 {
     return left.type() == right.type() &&
-            left.country() == right.country() &&
-            left.locality() == right.locality() &&
-            left.postcode() == right.postcode() &&
-            left.region() == right.region() &&
-            left.street() == right.street();
+        left.country() == right.country() &&
+        left.locality() == right.locality() &&
+        left.postcode() == right.postcode() &&
+        left.region() == right.region() &&
+        left.street() == right.street();
 }
 
 /// \brief Checks if two address objects represent different addresses.
@@ -263,7 +263,7 @@ QXmppVCardEmail::~QXmppVCardEmail()
 
 /// Assigns \a other to this e-mail address.
 
-QXmppVCardEmail& QXmppVCardEmail::operator=(const QXmppVCardEmail &other)
+QXmppVCardEmail &QXmppVCardEmail::operator=(const QXmppVCardEmail &other)
 {
     d = other.d;
     return *this;
@@ -274,7 +274,7 @@ QXmppVCardEmail& QXmppVCardEmail::operator=(const QXmppVCardEmail &other)
 bool operator==(const QXmppVCardEmail &left, const QXmppVCardEmail &right)
 {
     return left.type() == right.type() &&
-            left.address() == right.address();
+        left.address() == right.address();
 }
 
 /// \brief Checks if two email objects represent different email addresses.
@@ -374,7 +374,7 @@ QXmppVCardPhone::~QXmppVCardPhone()
 
 /// Assigns \a other to this phone number.
 
-QXmppVCardPhone& QXmppVCardPhone::operator=(const QXmppVCardPhone &other)
+QXmppVCardPhone &QXmppVCardPhone::operator=(const QXmppVCardPhone &other)
 {
     d = other.d;
     return *this;
@@ -392,7 +392,7 @@ QString QXmppVCardPhone::number() const
 bool operator==(const QXmppVCardPhone &left, const QXmppVCardPhone &right)
 {
     return left.type() == right.type() &&
-            left.number() == right.number();
+        left.number() == right.number();
 }
 
 /// \brief Checks if two phone objects represent different phone numbers.
@@ -518,7 +518,7 @@ QXmppVCardOrganization::~QXmppVCardOrganization()
 
 /// Assigns \a other to this organization info.
 
-QXmppVCardOrganization& QXmppVCardOrganization::operator=(const QXmppVCardOrganization &other)
+QXmppVCardOrganization &QXmppVCardOrganization::operator=(const QXmppVCardOrganization &other)
 {
     d = other.d;
     return *this;
@@ -529,9 +529,9 @@ QXmppVCardOrganization& QXmppVCardOrganization::operator=(const QXmppVCardOrgani
 bool operator==(const QXmppVCardOrganization &left, const QXmppVCardOrganization &right)
 {
     return left.organization() == right.organization() &&
-            left.unit() == right.unit() &&
-            left.title() == right.title() &&
-            left.role() == right.role();
+        left.unit() == right.unit() &&
+        left.title() == right.title() &&
+        left.role() == right.role();
 }
 
 /// \brief Checks if two organization objects represent different organizations.
@@ -610,8 +610,7 @@ void QXmppVCardOrganization::parse(const QDomElement &cardElem)
 
 void QXmppVCardOrganization::toXml(QXmlStreamWriter *stream) const
 {
-    if (!d->unit.isEmpty() || !d->organization.isEmpty())
-    {
+    if (!d->unit.isEmpty() || !d->organization.isEmpty()) {
         stream->writeStartElement("ORG");
         stream->writeTextElement("ORGNAME", d->organization);
         stream->writeTextElement("ORGUNIT", d->unit);
@@ -649,9 +648,8 @@ public:
 ///
 /// \param jid
 
-QXmppVCardIq::QXmppVCardIq(const QString& jid)
-    : QXmppIq()
-    , d(new QXmppVCardIqPrivate)
+QXmppVCardIq::QXmppVCardIq(const QString &jid)
+    : QXmppIq(), d(new QXmppVCardIqPrivate)
 {
     // for self jid should be empty
     setTo(jid);
@@ -660,8 +658,7 @@ QXmppVCardIq::QXmppVCardIq(const QString& jid)
 /// Constructs a copy of \a other.
 
 QXmppVCardIq::QXmppVCardIq(const QXmppVCardIq &other)
-    : QXmppIq(other)
-    , d(other.d)
+    : QXmppIq(other), d(other.d)
 {
 }
 
@@ -671,7 +668,7 @@ QXmppVCardIq::~QXmppVCardIq()
 
 /// Assigns \a other to this vCard IQ.
 
-QXmppVCardIq& QXmppVCardIq::operator=(const QXmppVCardIq &other)
+QXmppVCardIq &QXmppVCardIq::operator=(const QXmppVCardIq &other)
 {
     QXmppIq::operator=(other);
     d = other.d;
@@ -683,20 +680,20 @@ QXmppVCardIq& QXmppVCardIq::operator=(const QXmppVCardIq &other)
 bool operator==(const QXmppVCardIq &left, const QXmppVCardIq &right)
 {
     return left.birthday() == right.birthday() &&
-            left.description() == right.description() &&
-            left.email() == right.email() &&
-            left.firstName() == right.firstName() &&
-            left.fullName() == right.fullName() &&
-            left.lastName() == right.lastName() &&
-            left.middleName() == right.middleName() &&
-            left.nickName() == right.nickName() &&
-            left.photo() == right.photo() &&
-            left.photoType() == right.photoType() &&
-            left.url() == right.url() &&
-            left.addresses() == right.addresses() &&
-            left.emails() == right.emails() &&
-            left.phones() == right.phones() &&
-            left.organization() == right.organization();
+        left.description() == right.description() &&
+        left.email() == right.email() &&
+        left.firstName() == right.firstName() &&
+        left.fullName() == right.fullName() &&
+        left.lastName() == right.lastName() &&
+        left.middleName() == right.middleName() &&
+        left.nickName() == right.nickName() &&
+        left.photo() == right.photo() &&
+        left.photoType() == right.photoType() &&
+        left.url() == right.url() &&
+        left.addresses() == right.addresses() &&
+        left.emails() == right.emails() &&
+        left.phones() == right.phones() &&
+        left.organization() == right.organization();
 }
 
 /// \brief Checks if two VCard objects represent different VCards.
@@ -860,7 +857,7 @@ QString QXmppVCardIq::url() const
 ///
 /// \param url
 
-void QXmppVCardIq::setUrl(const QString& url)
+void QXmppVCardIq::setUrl(const QString &url)
 {
     d->url = url;
 }
@@ -884,7 +881,7 @@ QByteArray QXmppVCardIq::photo() const
 
 /// Sets the photo's binary contents.
 
-void QXmppVCardIq::setPhoto(const QByteArray& photo)
+void QXmppVCardIq::setPhoto(const QByteArray &photo)
 {
     d->photo = photo;
 }
@@ -898,7 +895,7 @@ QString QXmppVCardIq::photoType() const
 
 /// Sets the photo's MIME type.
 
-void QXmppVCardIq::setPhotoType(const QString& photoType)
+void QXmppVCardIq::setPhotoType(const QString &photoType)
 {
     d->photoType = photoType;
 }
@@ -965,7 +962,7 @@ bool QXmppVCardIq::isVCard(const QDomElement &nodeRecv)
     return nodeRecv.firstChildElement("vCard").namespaceURI() == ns_vcard;
 }
 
-void QXmppVCardIq::parseElementFromChild(const QDomElement& nodeRecv)
+void QXmppVCardIq::parseElementFromChild(const QDomElement &nodeRecv)
 {
     // vCard
     QDomElement cardElement = nodeRecv.firstChildElement("vCard");
@@ -979,8 +976,7 @@ void QXmppVCardIq::parseElementFromChild(const QDomElement& nodeRecv)
     d->middleName = nameElement.firstChildElement("MIDDLE").text();
     d->url = cardElement.firstChildElement("URL").text();
     QDomElement photoElement = cardElement.firstChildElement("PHOTO");
-    QByteArray base64data = photoElement.
-                            firstChildElement("BINVAL").text().toLatin1();
+    QByteArray base64data = photoElement.firstChildElement("BINVAL").text().toLatin1();
     d->photo = QByteArray::fromBase64(base64data);
     d->photoType = photoElement.firstChildElement("TYPE").text();
 
@@ -1019,12 +1015,11 @@ void QXmppVCardIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
         email.toXml(writer);
     if (!d->fullName.isEmpty())
         helperToXmlAddTextElement(writer, "FN", d->fullName);
-    if(!d->nickName.isEmpty())
+    if (!d->nickName.isEmpty())
         helperToXmlAddTextElement(writer, "NICKNAME", d->nickName);
     if (!d->firstName.isEmpty() ||
         !d->lastName.isEmpty() ||
-        !d->middleName.isEmpty())
-    {
+        !d->middleName.isEmpty()) {
         writer->writeStartElement("N");
         if (!d->firstName.isEmpty())
             helperToXmlAddTextElement(writer, "GIVEN", d->firstName);
@@ -1037,8 +1032,7 @@ void QXmppVCardIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
 
     for (const QXmppVCardPhone &phone : d->phones)
         phone.toXml(writer);
-    if(!photo().isEmpty())
-    {
+    if (!photo().isEmpty()) {
         writer->writeStartElement("PHOTO");
         QString photoType = d->photoType;
         if (photoType.isEmpty())