Reformat code

21 files changed, 362 insertions, 201 deletions

diff --git a/src/client/QXmppArchiveManager.cpp b/src/client/QXmppArchiveManager.cpp
index c3caaf73..6cca75d3 100644
--- a/src/client/QXmppArchiveManager.cpp
+++ b/src/client/QXmppArchiveManager.cpp
@@ -19,8 +19,9 @@ QStringList QXmppArchiveManager::discoveryFeatures() const
 
 bool QXmppArchiveManager::handleStanza(const QDomElement &element)
 {
-    if (element.tagName() != "iq")
+    if (element.tagName() != "iq") {
         return false;
+    }
 
     // XEP-0136: Message Archiving
     if (QXmppArchiveChatIq::isArchiveChatIq(element)) {
diff --git a/src/client/QXmppAttentionManager.cpp b/src/client/QXmppAttentionManager.cpp
index b797911b..461aae65 100644
--- a/src/client/QXmppAttentionManager.cpp
+++ b/src/client/QXmppAttentionManager.cpp
@@ -177,8 +177,9 @@ QString QXmppAttentionManager::requestAttention(const QString &jid, const QStrin
     msg.setBody(message);
     msg.setAttentionRequested(true);
 
-    if (client()->sendPacket(msg))
+    if (client()->sendPacket(msg)) {
         return msg.id();
+    }
     return {};
 }
 
@@ -200,14 +201,16 @@ bool QXmppAttentionManager::handleStanza(const QDomElement &)
 
 void QXmppAttentionManager::handleMessageReceived(const QXmppMessage &message)
 {
-    if (!message.isAttentionRequested() || !message.stamp().isNull())
+    if (!message.isAttentionRequested() || !message.stamp().isNull()) {
         return;
+    }
 
     const QString bareJid = QXmppUtils::jidToBareJid(message.from());
 
     // ignore messages from our own bare JID (e.g. carbon or IM-NG message)
-    if (bareJid == client()->configuration().jidBare())
+    if (bareJid == client()->configuration().jidBare()) {
         return;
+    }
 
     // check rate limit
     if (!d->checkRateLimit(bareJid)) {
@@ -242,8 +245,9 @@ bool QXmppAttentionManagerPrivate::checkRateLimit(const QString &bareJid)
     previousRequests << PastRequest { bareJid, QDateTime::currentDateTimeUtc() };
 
     // start timer to remove request again
-    if (!cleanUpTimer->isActive())
+    if (!cleanUpTimer->isActive()) {
         cleanUpTimer->start(allowedAttemptsTimeInterval.msecsSinceStartOfDay());
+    }
 
     // check whether there are too many requests
     int count = std::count_if(previousRequests.cbegin(), previousRequests.cend(), [=](const PastRequest &request) {
@@ -264,9 +268,10 @@ void QXmppAttentionManagerPrivate::cleanUp()
         int next = allowedAttemptsTimeInterval.msecsSinceStartOfDay() -
             previousRequests.first().timestamp.msecsTo(QDateTime::currentDateTimeUtc());
 
-        if (next < 1)
+        if (next < 1) {
             cleanUp();
-        else
+        } else {
             cleanUpTimer->start(next);
+        }
     }
 }
diff --git a/src/client/QXmppBookmarkManager.cpp b/src/client/QXmppBookmarkManager.cpp
index c9a1e793..d1038382 100644
--- a/src/client/QXmppBookmarkManager.cpp
+++ b/src/client/QXmppBookmarkManager.cpp
@@ -112,8 +112,9 @@ bool QXmppBookmarkManager::setBookmarks(const QXmppBookmarkSet &bookmarks)
     QXmppPrivateStorageIq iq;
     iq.setType(QXmppIq::Set);
     iq.setBookmarks(bookmarks);
-    if (!client()->sendPacket(iq))
+    if (!client()->sendPacket(iq)) {
         return false;
+    }
 
     d->pendingBookmarks = bookmarks;
     d->pendingId = iq.id();
diff --git a/src/client/QXmppCall.cpp b/src/client/QXmppCall.cpp
index 2b4cff7e..16949657 100644
--- a/src/client/QXmppCall.cpp
+++ b/src/client/QXmppCall.cpp
@@ -212,8 +212,9 @@ void QXmppCallPrivate::handleAck(const QXmppIq &ack)
             q->debug(QString("Received ACK for packet %1").arg(id));
 
             // handle termination
-            if (request.action() == QXmppJingleIq::SessionTerminate)
+            if (request.action() == QXmppJingleIq::SessionTerminate) {
                 q->terminated();
+            }
             return;
         }
     }
@@ -351,13 +352,15 @@ void QXmppCallPrivate::handleRequest(const QXmppJingleIq &iq)
 
         // check media stream does not exist yet
         QXmppCallStream *stream = findStreamByName(content.name());
-        if (stream)
+        if (stream) {
             return;
+        }
 
         // create media stream
         stream = createStream(content.descriptionMedia(), content.creator(), content.name());
-        if (!stream)
+        if (!stream) {
             return;
+        }
         streams << stream;
 
         // check content description
@@ -510,10 +513,11 @@ void QXmppCallPrivate::setState(QXmppCall::State newState)
         state = newState;
         Q_EMIT q->stateChanged(state);
 
-        if (state == QXmppCall::ActiveState)
+        if (state == QXmppCall::ActiveState) {
             Q_EMIT q->connected();
-        else if (state == QXmppCall::FinishedState)
+        } else if (state == QXmppCall::FinishedState) {
             Q_EMIT q->finished();
+        }
     }
 }
 
@@ -523,8 +527,9 @@ void QXmppCallPrivate::setState(QXmppCall::State newState)
 void QXmppCallPrivate::terminate(QXmppJingleIq::Reason::Type reasonType)
 {
     if (state == QXmppCall::DisconnectingState ||
-        state == QXmppCall::FinishedState)
+        state == QXmppCall::FinishedState) {
         return;
+    }
 
     // hangup call
     QXmppJingleIq iq;
@@ -662,8 +667,9 @@ void QXmppCall::localCandidatesChanged()
             break;
         }
     }
-    if (!stream)
+    if (!stream) {
         return;
+    }
 
     QXmppJingleIq iq;
     iq.setTo(d->jid);
diff --git a/src/client/QXmppCallManager.cpp b/src/client/QXmppCallManager.cpp
index da60f7e2..807e09ad 100644
--- a/src/client/QXmppCallManager.cpp
+++ b/src/client/QXmppCallManager.cpp
@@ -29,17 +29,21 @@ QXmppCallManagerPrivate::QXmppCallManagerPrivate(QXmppCallManager *qq)
 
 QXmppCall *QXmppCallManagerPrivate::findCall(const QString &sid) const
 {
-    for (auto *call : calls)
-        if (call->sid() == sid)
+    for (auto *call : calls) {
+        if (call->sid() == sid) {
             return call;
+        }
+    }
     return nullptr;
 }
 
 QXmppCall *QXmppCallManagerPrivate::findCall(const QString &sid, QXmppCall::Direction direction) const
 {
-    for (auto *call : calls)
-        if (call->sid() == sid && call->direction() == direction)
+    for (auto *call : calls) {
+        if (call->sid() == sid && call->direction() == direction) {
             return call;
+        }
+    }
     return nullptr;
 }
 /// \endcond
@@ -221,8 +225,9 @@ void QXmppCallManager::_q_disconnected()
 ///
 void QXmppCallManager::_q_iqReceived(const QXmppIq &ack)
 {
-    if (ack.type() != QXmppIq::Result)
+    if (ack.type() != QXmppIq::Result) {
         return;
+    }
 
     // find request
     for (auto *call : std::as_const(d->calls)) {
@@ -236,8 +241,9 @@ void QXmppCallManager::_q_iqReceived(const QXmppIq &ack)
 void QXmppCallManager::_q_jingleIqReceived(const QXmppJingleIq &iq)
 {
 
-    if (iq.type() != QXmppIq::Set)
+    if (iq.type() != QXmppIq::Set) {
         return;
+    }
 
     if (iq.action() == QXmppJingleIq::SessionInitiate) {
         // build call
@@ -247,8 +253,9 @@ void QXmppCallManager::_q_jingleIqReceived(const QXmppJingleIq &iq)
         const auto content = iq.contents().isEmpty() ? QXmppJingleIq::Content()
                                                      : iq.contents().constFirst();
         auto *stream = call->d->createStream(content.descriptionMedia(), content.creator(), content.name());
-        if (!stream)
+        if (!stream) {
             return;
+        }
         call->d->streams << stream;
 
         // send ack
@@ -300,8 +307,9 @@ void QXmppCallManager::_q_jingleIqReceived(const QXmppJingleIq &iq)
 ///
 void QXmppCallManager::_q_presenceReceived(const QXmppPresence &presence)
 {
-    if (presence.type() != QXmppPresence::Unavailable)
+    if (presence.type() != QXmppPresence::Unavailable) {
         return;
+    }
 
     for (auto *call : std::as_const(d->calls)) {
         if (presence.from() == call->jid()) {
diff --git a/src/client/QXmppCarbonManager.cpp b/src/client/QXmppCarbonManager.cpp
index fbc2cff1..61a19778 100644
--- a/src/client/QXmppCarbonManager.cpp
+++ b/src/client/QXmppCarbonManager.cpp
@@ -41,8 +41,9 @@ bool QXmppCarbonManager::carbonsEnabled() const
 ///
 void QXmppCarbonManager::setCarbonsEnabled(bool enabled)
 {
-    if (m_carbonsEnabled == enabled)
+    if (m_carbonsEnabled == enabled) {
         return;
+    }
 
     m_carbonsEnabled = enabled;
 
@@ -65,8 +66,9 @@ QStringList QXmppCarbonManager::discoveryFeatures() const
 
 bool QXmppCarbonManager::handleStanza(const QDomElement &element)
 {
-    if (element.tagName() != "message")
+    if (element.tagName() != "message") {
         return false;
+    }
 
     bool sent = true;
     QDomElement carbon = element.firstChildElement("sent");
@@ -75,8 +77,9 @@ bool QXmppCarbonManager::handleStanza(const QDomElement &element)
         sent = false;
     }
 
-    if (carbon.isNull() || carbon.namespaceURI() != ns_carbons)
+    if (carbon.isNull() || carbon.namespaceURI() != ns_carbons) {
         return false;
+    }
 
     // carbon copies must always come from our bare JID
     if (element.attribute("from") != client()->configuration().jidBare()) {
@@ -86,17 +89,19 @@ bool QXmppCarbonManager::handleStanza(const QDomElement &element)
 
     auto forwarded = carbon.firstChildElement("forwarded");
     auto messageElement = forwarded.firstChildElement("message");
-    if (messageElement.isNull())
+    if (messageElement.isNull()) {
         return false;
+    }
 
     QXmppMessage message;
     message.parse(messageElement);
     message.setCarbonForwarded(true);
 
-    if (sent)
+    if (sent) {
         emit messageSent(message);
-    else
+    } else {
         emit messageReceived(message);
+    }
 
     return true;
 }
diff --git a/src/client/QXmppClient.cpp b/src/client/QXmppClient.cpp
index f4587063..f8be81b0 100644
--- a/src/client/QXmppClient.cpp
+++ b/src/client/QXmppClient.cpp
@@ -66,14 +66,15 @@ void QXmppClientPrivate::addProperCapability(QXmppPresence &presence)
 
 int QXmppClientPrivate::getNextReconnectTime() const
 {
-    if (reconnectionTries < 5)
+    if (reconnectionTries < 5) {
         return 10 * 1000;
-    else if (reconnectionTries < 10)
+    } else if (reconnectionTries < 10) {
         return 20 * 1000;
-    else if (reconnectionTries < 15)
+    } else if (reconnectionTries < 15) {
         return 40 * 1000;
-    else
+    } else {
         return 60 * 1000;
+    }
 }
 
 QStringList QXmppClientPrivate::discoveryFeatures()
@@ -342,8 +343,9 @@ void QXmppClient::connectToServer(const QXmppConfiguration &config,
                                   const QXmppPresence &initialPresence)
 {
     // reset package cache from last connection
-    if (d->stream->configuration().jidBare() != config.jidBare())
+    if (d->stream->configuration().jidBare() != config.jidBare()) {
         d->stream->resetPacketCache();
+    }
 
     d->stream->configuration() = config;
     d->clientPresence = initialPresence;
@@ -610,8 +612,9 @@ void QXmppClient::disconnectFromServer()
 
     d->clientPresence.setType(QXmppPresence::Unavailable);
     d->clientPresence.setStatusText("Logged out");
-    if (d->stream->isConnected())
+    if (d->stream->isConnected()) {
         sendPacket(d->clientPresence);
+    }
 
     d->stream->disconnectFromHost();
 }
@@ -671,8 +674,9 @@ void QXmppClient::setActive(bool active)
 QXmppClient::StreamManagementState QXmppClient::streamManagementState() const
 {
     if (d->stream->isStreamManagementEnabled()) {
-        if (d->stream->isStreamResumed())
+        if (d->stream->isStreamResumed()) {
             return ResumedStream;
+        }
         return NewStream;
     }
     return NoStreamManagement;
@@ -725,13 +729,14 @@ void QXmppClient::sendMessage(const QString &bareJid, const QString &message)
 
 QXmppClient::State QXmppClient::state() const
 {
-    if (d->stream->isConnected())
+    if (d->stream->isConnected()) {
         return QXmppClient::ConnectedState;
-    else if (d->stream->socket()->state() != QAbstractSocket::UnconnectedState &&
-             d->stream->socket()->state() != QAbstractSocket::ClosingState)
+    } else if (d->stream->socket()->state() != QAbstractSocket::UnconnectedState &&
+               d->stream->socket()->state() != QAbstractSocket::ClosingState) {
         return QXmppClient::ConnectingState;
-    else
+    } else {
         return QXmppClient::DisconnectedState;
+    }
 }
 
 /// Returns the client's current presence.
@@ -766,14 +771,16 @@ void QXmppClient::setClientPresence(const QXmppPresence &presence)
 
         // NOTE: we can't call disconnect() because it alters
         // the client presence
-        if (d->stream->isConnected())
+        if (d->stream->isConnected()) {
             sendPacket(d->clientPresence);
+        }
 
         d->stream->disconnectFromHost();
-    } else if (d->stream->isConnected())
+    } else if (d->stream->isConnected()) {
         sendPacket(d->clientPresence);
-    else
+    } else {
         connectToServer(d->stream->configuration(), presence);
+    }
 }
 
 /// Returns the socket error if error() is QXmppClient::SocketError.
@@ -897,8 +904,9 @@ void QXmppClient::_q_streamConnected()
     emit stateChanged(QXmppClient::ConnectedState);
 
     // send initial presence
-    if (d->stream->isAuthenticated())
+    if (d->stream->isAuthenticated()) {
         sendPacket(d->clientPresence);
+    }
 }
 
 void QXmppClient::_q_streamDisconnected()
@@ -913,8 +921,9 @@ void QXmppClient::_q_streamError(QXmppClient::Error err)
     if (d->stream->configuration().autoReconnectionEnabled()) {
         if (err == QXmppClient::XmppStreamError) {
             // if we receive a resource conflict, inhibit reconnection
-            if (d->stream->xmppStreamError() == QXmppStanza::Error::Conflict)
+            if (d->stream->xmppStreamError() == QXmppStanza::Error::Conflict) {
                 d->receivedConflict = true;
+            }
         } else if (err == QXmppClient::SocketError && !d->receivedConflict) {
             // schedule reconnect
             d->reconnectionTimer->start(d->getNextReconnectTime());
diff --git a/src/client/QXmppClient.h b/src/client/QXmppClient.h
index 43ac7d15..daca8cc9 100644
--- a/src/client/QXmppClient.h
+++ b/src/client/QXmppClient.h
@@ -159,8 +159,9 @@ public:
         const QList<QXmppClientExtension *> list = extensions();
         for (auto ext : list) {
             T *extension = qobject_cast<T *>(ext);
-            if (extension)
+            if (extension) {
                 return extension;
+            }
         }
         return nullptr;
     }
@@ -185,8 +186,9 @@ public:
     {
         auto list = extensions();
         for (int i = 0; i < list.size(); ++i) {
-            if (qobject_cast<T *>(list.at(i)) != nullptr)
+            if (qobject_cast<T *>(list.at(i)) != nullptr) {
                 return i;
+            }
         }
         return -1;
     }
diff --git a/src/client/QXmppConfiguration.cpp b/src/client/QXmppConfiguration.cpp
index 0b51c1cc..a5ee0cd2 100644
--- a/src/client/QXmppConfiguration.cpp
+++ b/src/client/QXmppConfiguration.cpp
@@ -176,8 +176,9 @@ void QXmppConfiguration::setJid(const QString &jid)
     d->user = QXmppUtils::jidToUser(jid);
     d->domain = QXmppUtils::jidToDomain(jid);
     const QString resource = QXmppUtils::jidToResource(jid);
-    if (!resource.isEmpty())
+    if (!resource.isEmpty()) {
         d->resource = resource;
+    }
 }
 
 /// Returns the host name.
@@ -248,10 +249,11 @@ QString QXmppConfiguration::resource() const
 
 QString QXmppConfiguration::jid() const
 {
-    if (d->user.isEmpty())
+    if (d->user.isEmpty()) {
         return d->domain;
-    else
+    } else {
         return jidBare() + "/" + d->resource;
+    }
 }
 
 /// Returns the bare jabber id (jid), without the resource identifier.
@@ -262,10 +264,11 @@ QString QXmppConfiguration::jid() const
 
 QString QXmppConfiguration::jidBare() const
 {
-    if (d->user.isEmpty())
+    if (d->user.isEmpty()) {
         return d->domain;
-    else
+    } else {
         return d->user + "@" + d->domain;
+    }
 }
 
 /// Returns the access token used for X-FACEBOOK-PLATFORM authentication.
diff --git a/src/client/QXmppDiscoveryManager.cpp b/src/client/QXmppDiscoveryManager.cpp
index 78575e94..40263bbe 100644
--- a/src/client/QXmppDiscoveryManager.cpp
+++ b/src/client/QXmppDiscoveryManager.cpp
@@ -56,10 +56,11 @@ QXmppDiscoveryManager::QXmppDiscoveryManager()
 #else
     d->clientType = "pc";
 #endif
-    if (qApp->applicationName().isEmpty() && qApp->applicationVersion().isEmpty())
+    if (qApp->applicationName().isEmpty() && qApp->applicationVersion().isEmpty()) {
         d->clientName = QString("%1 %2").arg("Based on QXmpp", QXmppVersion());
-    else
+    } else {
         d->clientName = QString("%1 %2").arg(qApp->applicationName(), qApp->applicationVersion());
+    }
 }
 
 QXmppDiscoveryManager::~QXmppDiscoveryManager() = default;
@@ -75,12 +76,14 @@ QString QXmppDiscoveryManager::requestInfo(const QString &jid, const QString &no
     request.setType(QXmppIq::Get);
     request.setQueryType(QXmppDiscoveryIq::InfoQuery);
     request.setTo(jid);
-    if (!node.isEmpty())
+    if (!node.isEmpty()) {
         request.setQueryNode(node);
-    if (client()->sendPacket(request))
+    }
+    if (client()->sendPacket(request)) {
         return request.id();
-    else
+    } else {
         return QString();
+    }
 }
 
 /// Requests items from the specified XMPP entity.
@@ -94,12 +97,14 @@ QString QXmppDiscoveryManager::requestItems(const QString &jid, const QString &n
     request.setType(QXmppIq::Get);
     request.setQueryType(QXmppDiscoveryIq::ItemsQuery);
     request.setTo(jid);
-    if (!node.isEmpty())
+    if (!node.isEmpty()) {
         request.setQueryNode(node);
-    if (client()->sendPacket(request))
+    }
+    if (client()->sendPacket(request)) {
         return request.id();
-    else
+    } else {
         return QString();
+    }
 }
 
 ///
@@ -167,8 +172,9 @@ QXmppDiscoveryIq QXmppDiscoveryManager::capabilities()
     // add features of all registered extensions
     const auto extensions = client()->extensions();
     for (auto *extension : extensions) {
-        if (extension)
+        if (extension) {
             features << extension->discoveryFeatures();
+        }
     }
 
     iq.setFeatures(features);
@@ -183,15 +189,17 @@ QXmppDiscoveryIq QXmppDiscoveryManager::capabilities()
     identities << identity;
 
     for (auto *extension : client()->extensions()) {
-        if (extension)
+        if (extension) {
             identities << extension->discoveryIdentities();
+        }
     }
 
     iq.setIdentities(identities);
 
     // extended information
-    if (!d->clientInfoForm.isNull())
+    if (!d->clientInfoForm.isNull()) {
         iq.setForm(d->clientInfoForm);
+    }
 
     return iq;
 }
diff --git a/src/client/QXmppEntityTimeManager.cpp b/src/client/QXmppEntityTimeManager.cpp
index b7916ed6..0dd1d4cc 100644
--- a/src/client/QXmppEntityTimeManager.cpp
+++ b/src/client/QXmppEntityTimeManager.cpp
@@ -36,10 +36,11 @@ QString QXmppEntityTimeManager::requestTime(const QString &jid)
     QXmppEntityTimeIq request;
     request.setType(QXmppIq::Get);
     request.setTo(jid);
-    if (client()->sendPacket(request))
+    if (client()->sendPacket(request)) {
         return request.id();
-    else
+    } else {
         return QString();
+    }
 }
 
 ///
diff --git a/src/client/QXmppInvokable.cpp b/src/client/QXmppInvokable.cpp
index f995b2c2..518d3b19 100644
--- a/src/client/QXmppInvokable.cpp
+++ b/src/client/QXmppInvokable.cpp
@@ -28,12 +28,14 @@ QVariant QXmppInvokable::dispatch(const QByteArray &method, const QList<QVariant
 {
     buildMethodHash();
 
-    if (!m_methodHash.contains(method))
+    if (!m_methodHash.contains(method)) {
         return QVariant();
+    }
 
     int idx = m_methodHash[method];
-    if (paramTypes(args) != metaObject()->method(idx).parameterTypes())
+    if (paramTypes(args) != metaObject()->method(idx).parameterTypes()) {
         return QVariant();
+    }
 
     const char *typeName = metaObject()->method(idx).typeName();
     int resultType = QMetaType::type(typeName);
@@ -77,16 +79,18 @@ QVariant QXmppInvokable::dispatch(const QByteArray &method, const QList<QVariant
 QList<QByteArray> QXmppInvokable::paramTypes(const QList<QVariant> &params)
 {
     QList<QByteArray> types;
-    for (const auto &variant : std::as_const(params))
+    for (const auto &variant : std::as_const(params)) {
         types << variant.typeName();
+    }
     return types;
 }
 
 void QXmppInvokable::buildMethodHash()
 {
     QWriteLocker locker(&m_lock);
-    if (m_methodHash.size() > 0)
+    if (m_methodHash.size() > 0) {
         return;
+    }
 
     int methodCount = metaObject()->methodCount();
     for (int idx = 0; idx < methodCount; ++idx) {
diff --git a/src/client/QXmppMucManager.cpp b/src/client/QXmppMucManager.cpp
index 59b7cdcc..0076122b 100644
--- a/src/client/QXmppMucManager.cpp
+++ b/src/client/QXmppMucManager.cpp
@@ -95,8 +95,9 @@ bool QXmppMucManager::handleStanza(const QDomElement &element)
                 const auto items = iq.items();
                 for (const auto &item : items) {
                     const QString jid = item.jid();
-                    if (!room->d->permissions.contains(jid))
+                    if (!room->d->permissions.contains(jid)) {
                         room->d->permissions.insert(jid, item);
+                    }
                 }
                 if (room->d->permissionsQueue.isEmpty()) {
                     emit room->permissionsReceived(room->d->permissions.values());
@@ -128,8 +129,9 @@ void QXmppMucManager::setClient(QXmppClient *client)
 
 void QXmppMucManager::_q_messageReceived(const QXmppMessage &msg)
 {
-    if (msg.type() != QXmppMessage::Normal)
+    if (msg.type() != QXmppMessage::Normal) {
         return;
+    }
 
     // process room invitations
     const QString roomJid = msg.mucInvitationJid();
@@ -226,8 +228,9 @@ QString QXmppMucRoom::jid() const
 
 bool QXmppMucRoom::join()
 {
-    if (isJoined() || d->nickName.isEmpty())
+    if (isJoined() || d->nickName.isEmpty()) {
         return false;
+    }
 
     // reflect our current presence in the chat room
     QXmppPresence packet = d->client->clientPresence();
@@ -327,8 +330,9 @@ bool QXmppMucRoom::sendMessage(const QString &text)
 
 void QXmppMucRoom::setNickName(const QString &nickName)
 {
-    if (nickName == d->nickName)
+    if (nickName == d->nickName) {
         return;
+    }
 
     // if we had already joined the room, request nickname change
     if (isJoined()) {
@@ -348,10 +352,11 @@ void QXmppMucRoom::setNickName(const QString &nickName)
 
 QString QXmppMucRoom::participantFullJid(const QString &jid) const
 {
-    if (d->participants.contains(jid))
+    if (d->participants.contains(jid)) {
         return d->participants.value(jid).mucItem().jid();
-    else
+    } else {
         return QString();
+    }
 }
 
 /// Returns the presence for the given participant.
@@ -360,8 +365,9 @@ QString QXmppMucRoom::participantFullJid(const QString &jid) const
 
 QXmppPresence QXmppMucRoom::participantPresence(const QString &jid) const
 {
-    if (d->participants.contains(jid))
+    if (d->participants.contains(jid)) {
         return d->participants.value(jid);
+    }
 
     QXmppPresence presence;
     presence.setFrom(jid);
@@ -457,8 +463,9 @@ bool QXmppMucRoom::requestPermissions()
         QXmppMucAdminIq iq;
         iq.setTo(d->jid);
         iq.setItems(QList<QXmppMucItem>() << item);
-        if (!d->client->sendPacket(iq))
+        if (!d->client->sendPacket(iq)) {
             return false;
+        }
         d->permissionsQueue += iq.id();
     }
     return true;
@@ -477,8 +484,9 @@ bool QXmppMucRoom::setPermissions(const QList<QXmppMucItem> &permissions)
     // Process changed members
     for (const auto &item : std::as_const(permissions)) {
         const QString jid = item.jid();
-        if (d->permissions.value(jid).affiliation() != item.affiliation())
+        if (d->permissions.value(jid).affiliation() != item.affiliation()) {
             items << item;
+        }
         d->permissions.remove(jid);
     }
 
@@ -493,8 +501,9 @@ bool QXmppMucRoom::setPermissions(const QList<QXmppMucItem> &permissions)
     }
 
     // Don't send request if there are no changes
-    if (items.isEmpty())
+    if (items.isEmpty()) {
         return false;
+    }
 
     QXmppMucAdminIq iq;
     iq.setTo(d->jid);
@@ -510,8 +519,9 @@ void QXmppMucRoom::_q_disconnected()
     // clear chat room participants
     const QStringList removed = d->participants.keys();
     d->participants.clear();
-    for (const auto &jid : removed)
+    for (const auto &jid : removed) {
         emit participantRemoved(jid);
+    }
     emit participantsChanged();
 
     // update available actions
@@ -521,8 +531,9 @@ void QXmppMucRoom::_q_disconnected()
     }
 
     // emit "left" signal if we had joined the room
-    if (wasJoined)
+    if (wasJoined) {
         emit left();
+    }
 }
 
 void QXmppMucRoom::_q_discoveryInfoReceived(const QXmppDiscoveryIq &iq)
@@ -546,8 +557,9 @@ void QXmppMucRoom::_q_discoveryInfoReceived(const QXmppDiscoveryIq &iq)
 
 void QXmppMucRoom::_q_messageReceived(const QXmppMessage &message)
 {
-    if (QXmppUtils::jidToBareJid(message.from()) != d->jid)
+    if (QXmppUtils::jidToBareJid(message.from()) != d->jid) {
         return;
+    }
 
     // handle message subject
     const QString subject = message.subject();
@@ -570,8 +582,9 @@ void QXmppMucRoom::_q_presenceReceived(const QXmppPresence &presence)
         d->client->sendPacket(packet);
     }
 
-    if (QXmppUtils::jidToBareJid(jid) != d->jid)
+    if (QXmppUtils::jidToBareJid(jid) != d->jid) {
         return;
+    }
 
     if (presence.type() == QXmppPresence::Available) {
         const bool added = !d->participants.contains(jid);
@@ -584,14 +597,16 @@ void QXmppMucRoom::_q_presenceReceived(const QXmppPresence &presence)
             Actions newActions = NoAction;
 
             // role
-            if (mucItem.role() == QXmppMucItem::ModeratorRole)
+            if (mucItem.role() == QXmppMucItem::ModeratorRole) {
                 newActions |= (KickAction | SubjectAction);
+            }
 
             // affiliation
-            if (mucItem.affiliation() == QXmppMucItem::OwnerAffiliation)
+            if (mucItem.affiliation() == QXmppMucItem::OwnerAffiliation) {
                 newActions |= (ConfigurationAction | PermissionsAction | SubjectAction);
-            else if (mucItem.affiliation() == QXmppMucItem::AdminAffiliation)
+            } else if (mucItem.affiliation() == QXmppMucItem::AdminAffiliation) {
                 newActions |= (PermissionsAction | SubjectAction);
+            }
 
             if (newActions != d->allowedActions) {
                 d->allowedActions = newActions;
@@ -604,8 +619,9 @@ void QXmppMucRoom::_q_presenceReceived(const QXmppPresence &presence)
             emit participantsChanged();
             if (jid == d->ownJid()) {
                 // request room information
-                if (d->discoManager)
+                if (d->discoManager) {
                     d->discoManager->requestInfo(d->jid);
+                }
 
                 emit joined();
             }
@@ -639,8 +655,9 @@ void QXmppMucRoom::_q_presenceReceived(const QXmppPresence &presence)
                 // clear chat room participants
                 const QStringList removed = d->participants.keys();
                 d->participants.clear();
-                for (const auto &jid : removed)
+                for (const auto &jid : removed) {
                     emit participantRemoved(jid);
+                }
                 emit participantsChanged();
 
                 // update available actions
diff --git a/src/client/QXmppOutgoingClient.cpp b/src/client/QXmppOutgoingClient.cpp
index 69f7680b..271ec8b9 100644
--- a/src/client/QXmppOutgoingClient.cpp
+++ b/src/client/QXmppOutgoingClient.cpp
@@ -333,15 +333,17 @@ void QXmppOutgoingClient::socketSslErrors(const QList<QSslError> &errors)
 {
     // log errors
     warning("SSL errors");
-    for (int i = 0; i < errors.count(); ++i)
+    for (int i = 0; i < errors.count(); ++i) {
         warning(errors.at(i).errorString());
+    }
 
     // relay signal
     emit sslErrors(errors);
 
     // if configured, ignore the errors
-    if (configuration().ignoreSslErrors())
+    if (configuration().ignoreSslErrors()) {
         socket()->ignoreSslErrors();
+    }
 }
 
 void QXmppOutgoingClient::socketError(QAbstractSocket::SocketError socketError)
@@ -351,8 +353,9 @@ void QXmppOutgoingClient::socketError(QAbstractSocket::SocketError socketError)
         (d->dns.serviceRecords().count() > d->nextSrvRecordIdx)) {
         // some network error occurred during startup -> try next available SRV record server
         d->connectToNextDNSHost();
-    } else
+    } else {
         emit error(QXmppClient::SocketError);
+    }
 }
 
 /// \cond
@@ -390,10 +393,12 @@ void QXmppOutgoingClient::handleStart()
 
 void QXmppOutgoingClient::handleStream(const QDomElement &streamElement)
 {
-    if (d->streamId.isEmpty())
+    if (d->streamId.isEmpty()) {
         d->streamId = streamElement.attribute("id");
-    if (d->streamFrom.isEmpty())
+    }
+    if (d->streamFrom.isEmpty()) {
         d->streamFrom = streamElement.attribute("from");
+    }
     if (d->streamVersion.isEmpty()) {
         d->streamVersion = streamElement.attribute("version");
 
@@ -415,15 +420,17 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv)
     // give client opportunity to handle stanza
     bool handled = false;
     emit elementReceived(nodeRecv, handled);
-    if (handled)
+    if (handled) {
         return;
+    }
 
     if (QXmppStreamFeatures::isStreamFeatures(nodeRecv)) {
         QXmppStreamFeatures features;
         features.parse(nodeRecv);
 
-        if (features.clientStateIndicationMode() == QXmppStreamFeatures::Enabled)
+        if (features.clientStateIndicationMode() == QXmppStreamFeatures::Enabled) {
             d->clientStateIndicationEnabled = true;
+        }
 
         // handle authentication
         const bool nonSaslAvailable = features.nonSaslAuthMode() != QXmppStreamFeatures::Disabled;
@@ -436,19 +443,23 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv)
                 supportedMechanisms.removeAll(preferredMechanism);
                 supportedMechanisms.prepend(preferredMechanism);
             }
-            if (configuration().facebookAppId().isEmpty() || configuration().facebookAccessToken().isEmpty())
+            if (configuration().facebookAppId().isEmpty() || configuration().facebookAccessToken().isEmpty()) {
                 supportedMechanisms.removeAll("X-FACEBOOK-PLATFORM");
-            if (configuration().windowsLiveAccessToken().isEmpty())
+            }
+            if (configuration().windowsLiveAccessToken().isEmpty()) {
                 supportedMechanisms.removeAll("X-MESSENGER-OAUTH2");
-            if (configuration().googleAccessToken().isEmpty())
+            }
+            if (configuration().googleAccessToken().isEmpty()) {
                 supportedMechanisms.removeAll("X-OAUTH2");
+            }
 
             // determine SASL Authentication mechanism to use
             QStringList commonMechanisms;
             QString usedMechanism;
             for (const auto &mechanism : std::as_const(supportedMechanisms)) {
-                if (features.authMechanisms().contains(mechanism))
+                if (features.authMechanisms().contains(mechanism)) {
                     commonMechanisms << mechanism;
+                }
             }
             if (commonMechanisms.isEmpty()) {
                 warning("No supported SASL Authentication mechanism available");
@@ -533,12 +544,13 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv)
             return;
         }
 
-        if (!nodeRecv.firstChildElement("conflict").isNull())
+        if (!nodeRecv.firstChildElement("conflict").isNull()) {
             d->xmppStreamError = QXmppStanza::Error::Conflict;
-        else if (!nodeRecv.firstChildElement("not-authorized").isNull())
+        } else if (!nodeRecv.firstChildElement("not-authorized").isNull()) {
             d->xmppStreamError = QXmppStanza::Error::NotAuthorized;
-        else
+        } else {
             d->xmppStreamError = QXmppStanza::Error::UndefinedCondition;
+        }
         emit error(QXmppClient::XmppStreamError);
     } else if (ns == ns_sasl) {
         if (!d->saslClient) {
@@ -567,10 +579,11 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv)
             // RFC3920 defines the error condition as "not-authorized", but
             // some broken servers use "bad-auth" instead. We tolerate this
             // by remapping the error to "not-authorized".
-            if (failure.condition() == "not-authorized" || failure.condition() == "bad-auth")
+            if (failure.condition() == "not-authorized" || failure.condition() == "bad-auth") {
                 d->xmppStreamError = QXmppStanza::Error::NotAuthorized;
-            else
+            } else {
                 d->xmppStreamError = QXmppStanza::Error::UndefinedCondition;
+            }
             emit error(QXmppClient::XmppStreamError);
 
             warning("Authentication failure");
@@ -582,8 +595,9 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv)
             QDomElement element = nodeRecv.firstChildElement();
             QString id = nodeRecv.attribute("id");
             QString type = nodeRecv.attribute("type");
-            if (type.isEmpty())
+            if (type.isEmpty()) {
                 warning("QXmppStream: iq type can't be empty");
+            }
 
             if (id == d->sessionId) {
                 QXmppSessionIq session;
@@ -652,15 +666,16 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv)
 
                     if (plain && digest) {
                         if (configuration().nonSASLAuthMechanism() ==
-                            QXmppConfiguration::NonSASLDigest)
+                            QXmppConfiguration::NonSASLDigest) {
                             plainText = false;
-                        else
+                        } else {
                             plainText = true;
-                    } else if (plain)
+                        }
+                    } else if (plain) {
                         plainText = true;
-                    else if (digest)
+                    } else if (digest) {
                         plainText = false;
-                    else {
+                    } else {
                         warning("No supported Non-SASL Authentication mechanism available");
                         disconnectFromHost();
                         return;
@@ -833,10 +848,11 @@ void QXmppOutgoingClientPrivate::sendNonSASLAuth(bool plainText)
     QXmppNonSASLAuthIq authQuery;
     authQuery.setType(QXmppIq::Set);
     authQuery.setUsername(q->configuration().user());
-    if (plainText)
+    if (plainText) {
         authQuery.setPassword(q->configuration().password());
-    else
+    } else {
         authQuery.setDigest(streamId, q->configuration().password());
+    }
     authQuery.setResource(q->configuration().resource());
     nonSASLAuthId = authQuery.id();
     q->sendPacket(authQuery);
diff --git a/src/client/QXmppRegistrationManager.cpp b/src/client/QXmppRegistrationManager.cpp
index 24504010..71c2f39e 100644
--- a/src/client/QXmppRegistrationManager.cpp
+++ b/src/client/QXmppRegistrationManager.cpp
@@ -292,8 +292,9 @@ void QXmppRegistrationManager::handleDiscoInfo(const QXmppDiscoveryIq &iq)
 {
     // check features of own server
     if (iq.from().isEmpty() || iq.from() == client()->configuration().domain()) {
-        if (iq.features().contains(ns_register))
+        if (iq.features().contains(ns_register)) {
             setSupportedByServer(true);
+        }
     }
 }
 
diff --git a/src/client/QXmppRosterManager.cpp b/src/client/QXmppRosterManager.cpp
index 51a8b44a..bb4eb435 100644
--- a/src/client/QXmppRosterManager.cpp
+++ b/src/client/QXmppRosterManager.cpp
@@ -123,8 +123,9 @@ void QXmppRosterManager::_q_connected()
         roster.setMixAnnotate(true);
 
         d->rosterReqId = roster.id();
-        if (client()->isAuthenticated())
+        if (client()->isAuthenticated()) {
             client()->sendPacket(roster);
+        }
     }
 }
 
@@ -139,21 +140,24 @@ void QXmppRosterManager::_q_disconnected()
 /// \cond
 bool QXmppRosterManager::handleStanza(const QDomElement &element)
 {
-    if (element.tagName() != "iq" || !QXmppRosterIq::isRosterIq(element))
+    if (element.tagName() != "iq" || !QXmppRosterIq::isRosterIq(element)) {
         return false;
+    }
 
     // Security check: only server should send this iq
     // from() should be either empty or bareJid of the user
     const auto fromJid = element.attribute("from");
-    if (!fromJid.isEmpty() && QXmppUtils::jidToBareJid(fromJid) != client()->configuration().jidBare())
+    if (!fromJid.isEmpty() && QXmppUtils::jidToBareJid(fromJid) != client()->configuration().jidBare()) {
         return false;
+    }
 
     QXmppRosterIq rosterIq;
     rosterIq.parse(element);
 
     bool isInitial = (d->rosterReqId == rosterIq.id());
-    if (isInitial)
+    if (isInitial) {
         d->rosterReqId.clear();
+    }
 
     switch (rosterIq.type()) {
     case QXmppIq::Set: {
@@ -210,8 +214,9 @@ void QXmppRosterManager::_q_presenceReceived(const QXmppPresence &presence)
     const auto bareJid = QXmppUtils::jidToBareJid(jid);
     const auto resource = QXmppUtils::jidToResource(jid);
 
-    if (bareJid.isEmpty())
+    if (bareJid.isEmpty()) {
         return;
+    }
 
     switch (presence.type()) {
     case QXmppPresence::Available:
@@ -424,15 +429,17 @@ bool QXmppRosterManager::removeItem(const QString &bareJid)
 ///
 bool QXmppRosterManager::renameItem(const QString &bareJid, const QString &name)
 {
-    if (!d->entries.contains(bareJid))
+    if (!d->entries.contains(bareJid)) {
         return false;
+    }
 
     auto item = d->entries.value(bareJid);
     item.setName(name);
 
     // If there is a pending subscription, do not include the corresponding attribute in the stanza.
-    if (!item.subscriptionStatus().isEmpty())
+    if (!item.subscriptionStatus().isEmpty()) {
         item.setSubscriptionStatus({});
+    }
 
     QXmppRosterIq iq;
     iq.setType(QXmppIq::Set);
@@ -490,8 +497,9 @@ QXmppRosterIq::Item QXmppRosterManager::getRosterEntry(
     const QString &bareJid) const
 {
     // will return blank entry if bareJid doesn't exist
-    if (d->entries.contains(bareJid))
+    if (d->entries.contains(bareJid)) {
         return d->entries.value(bareJid);
+    }
     return {};
 }
 
@@ -503,8 +511,9 @@ QXmppRosterIq::Item QXmppRosterManager::getRosterEntry(
 ///
 QStringList QXmppRosterManager::getResources(const QString &bareJid) const
 {
-    if (d->presences.contains(bareJid))
+    if (d->presences.contains(bareJid)) {
         return d->presences[bareJid].keys();
+    }
     return {};
 }
 
@@ -519,8 +528,9 @@ QStringList QXmppRosterManager::getResources(const QString &bareJid) const
 QMap<QString, QXmppPresence> QXmppRosterManager::getAllPresencesForBareJid(
     const QString &bareJid) const
 {
-    if (d->presences.contains(bareJid))
+    if (d->presences.contains(bareJid)) {
         return d->presences.value(bareJid);
+    }
     return {};
 }
 
diff --git a/src/client/QXmppRpcManager.cpp b/src/client/QXmppRpcManager.cpp
index 21aaff26..2d92f314 100644
--- a/src/client/QXmppRpcManager.cpp
+++ b/src/client/QXmppRpcManager.cpp
@@ -34,8 +34,9 @@ void QXmppRpcManager::invokeInterfaceMethod(const QXmppRpcInvokeIq &iq)
     QXmppStanza::Error error;
 
     const QStringList methodBits = iq.method().split('.');
-    if (methodBits.size() != 2)
+    if (methodBits.size() != 2) {
         return;
+    }
     const QString interface = methodBits.first();
     const QString method = methodBits.last();
     QXmppInvokable *iface = m_interfaces.value(interface);
@@ -90,26 +91,36 @@ QXmppRemoteMethodResult QXmppRpcManager::callRemoteMethod(const QString &jid,
                                                           const QVariant &arg10)
 {
     QVariantList args;
-    if (arg1.isValid())
+    if (arg1.isValid()) {
         args << arg1;
-    if (arg2.isValid())
+    }
+    if (arg2.isValid()) {
         args << arg2;
-    if (arg3.isValid())
+    }
+    if (arg3.isValid()) {
         args << arg3;
-    if (arg4.isValid())
+    }
+    if (arg4.isValid()) {
         args << arg4;
-    if (arg5.isValid())
+    }
+    if (arg5.isValid()) {
         args << arg5;
-    if (arg6.isValid())
+    }
+    if (arg6.isValid()) {
         args << arg6;
-    if (arg7.isValid())
+    }
+    if (arg7.isValid()) {
         args << arg7;
-    if (arg8.isValid())
+    }
+    if (arg8.isValid()) {
         args << arg8;
-    if (arg9.isValid())
+    }
+    if (arg9.isValid()) {
         args << arg9;
-    if (arg10.isValid())
+    }
+    if (arg10.isValid()) {
         args << arg10;
+    }
 
     bool check;
     Q_UNUSED(check)
diff --git a/src/client/QXmppTransferManager.cpp b/src/client/QXmppTransferManager.cpp
index b1f9be83..ac138986 100644
--- a/src/client/QXmppTransferManager.cpp
+++ b/src/client/QXmppTransferManager.cpp
@@ -180,16 +180,21 @@ void QXmppTransferFileInfo::toXml(QXmlStreamWriter *writer) const
 {
     writer->writeStartElement("file");
     writer->writeDefaultNamespace(ns_stream_initiation_file_transfer);
-    if (d->date.isValid())
+    if (d->date.isValid()) {
         writer->writeAttribute("date", QXmppUtils::datetimeToString(d->date));
-    if (!d->hash.isEmpty())
+    }
+    if (!d->hash.isEmpty()) {
         writer->writeAttribute("hash", d->hash.toHex());
-    if (!d->name.isEmpty())
+    }
+    if (!d->name.isEmpty()) {
         writer->writeAttribute("name", d->name);
-    if (d->size > 0)
+    }
+    if (d->size > 0) {
         writer->writeAttribute("size", QString::number(d->size));
-    if (!d->description.isEmpty())
+    }
+    if (!d->description.isEmpty()) {
         writer->writeTextElement("desc", d->description);
+    }
     writer->writeEndElement();
 }
 /// \endcond
@@ -389,8 +394,9 @@ QString QXmppTransferJob::sid() const
 qint64 QXmppTransferJob::speed() const
 {
     qint64 elapsed = d->transferStart.elapsed();
-    if (d->state != QXmppTransferJob::TransferState || !elapsed)
+    if (d->state != QXmppTransferJob::TransferState || !elapsed) {
         return 0;
+    }
     return (d->done * 1000.0) / elapsed;
 }
 
@@ -403,8 +409,9 @@ void QXmppTransferJob::setState(QXmppTransferJob::State state)
 {
     if (d->state != state) {
         d->state = state;
-        if (d->state == QXmppTransferJob::TransferState)
+        if (d->state == QXmppTransferJob::TransferState) {
             d->transferStart.start();
+        }
         emit stateChanged(d->state);
     }
 }
@@ -412,23 +419,26 @@ void QXmppTransferJob::setState(QXmppTransferJob::State state)
 void QXmppTransferJob::_q_terminated()
 {
     emit stateChanged(d->state);
-    if (d->error != NoError)
+    if (d->error != NoError) {
         emit error(d->error);
+    }
     emit finished();
 }
 
 void QXmppTransferJob::terminate(QXmppTransferJob::Error cause)
 {
-    if (d->state == FinishedState)
+    if (d->state == FinishedState) {
         return;
+    }
 
     // change state
     d->error = cause;
     d->state = FinishedState;
 
     // close IO device
-    if (d->iodevice && d->deviceIsOwn)
+    if (d->iodevice && d->deviceIsOwn) {
         d->iodevice->close();
+    }
 
     // close socket
     if (d->socksSocket) {
@@ -451,10 +461,11 @@ QXmppTransferIncomingJob::QXmppTransferIncomingJob(const QString &jid, QXmppClie
 void QXmppTransferIncomingJob::checkData()
 {
     if ((d->fileInfo.size() && d->done != d->fileInfo.size()) ||
-        (!d->fileInfo.hash().isEmpty() && d->hash.result() != d->fileInfo.hash()))
+        (!d->fileInfo.hash().isEmpty() && d->hash.result() != d->fileInfo.hash())) {
         terminate(QXmppTransferJob::FileCorruptError);
-    else
+    } else {
         terminate(QXmppTransferJob::NoError);
+    }
 }
 
 void QXmppTransferIncomingJob::connectToNextHost()
@@ -510,19 +521,22 @@ void QXmppTransferIncomingJob::connectToHosts(const QXmppByteStreamIq &iq)
 bool QXmppTransferIncomingJob::writeData(const QByteArray &data)
 {
     const qint64 written = d->iodevice->write(data);
-    if (written < 0)
+    if (written < 0) {
         return false;
+    }
     d->done += written;
-    if (!d->fileInfo.hash().isEmpty())
+    if (!d->fileInfo.hash().isEmpty()) {
         d->hash.addData(data);
+    }
     emit progress(d->done, d->fileInfo.size());
     return true;
 }
 
 void QXmppTransferIncomingJob::_q_candidateReady()
 {
-    if (!m_candidateClient)
+    if (!m_candidateClient) {
         return;
+    }
 
     info(QString("Connected to streamhost: %1 (%2 %3)").arg(m_candidateHost.jid(), m_candidateHost.host(), QString::number(m_candidateHost.port())));
 
@@ -546,8 +560,9 @@ void QXmppTransferIncomingJob::_q_candidateReady()
 
 void QXmppTransferIncomingJob::_q_candidateDisconnected()
 {
-    if (!m_candidateClient)
+    if (!m_candidateClient) {
         return;
+    }
 
     warning(QString("Failed to connect to streamhost: %1 (%2 %3)").arg(m_candidateHost.jid(), m_candidateHost.host(), QString::number(m_candidateHost.port())));
 
@@ -562,24 +577,27 @@ void QXmppTransferIncomingJob::_q_candidateDisconnected()
 
 void QXmppTransferIncomingJob::_q_disconnected()
 {
-    if (d->state == QXmppTransferJob::FinishedState)
+    if (d->state == QXmppTransferJob::FinishedState) {
         return;
+    }
 
     checkData();
 }
 
 void QXmppTransferIncomingJob::_q_receiveData()
 {
-    if (d->state != QXmppTransferJob::TransferState)
+    if (d->state != QXmppTransferJob::TransferState) {
         return;
+    }
 
     // receive data block
     if (d->direction == QXmppTransferJob::IncomingDirection) {
         writeData(d->socksSocket->readAll());
 
         // if we have received all the data, stop here
-        if (fileSize() && d->done >= fileSize())
+        if (fileSize() && d->done >= fileSize()) {
             checkData();
+        }
     }
 }
 
@@ -617,13 +635,15 @@ void QXmppTransferOutgoingJob::startSending()
 
 void QXmppTransferOutgoingJob::_q_disconnected()
 {
-    if (d->state == QXmppTransferJob::FinishedState)
+    if (d->state == QXmppTransferJob::FinishedState) {
         return;
+    }
 
-    if (fileSize() && d->done != fileSize())
+    if (fileSize() && d->done != fileSize()) {
         terminate(QXmppTransferJob::ProtocolError);
-    else
+    } else {
         terminate(QXmppTransferJob::NoError);
+    }
 }
 
 void QXmppTransferOutgoingJob::_q_proxyReady()
@@ -641,17 +661,20 @@ void QXmppTransferOutgoingJob::_q_proxyReady()
 
 void QXmppTransferOutgoingJob::_q_sendData()
 {
-    if (d->state != QXmppTransferJob::TransferState)
+    if (d->state != QXmppTransferJob::TransferState) {
         return;
+    }
 
     // don't saturate the outgoing socket
-    if (d->socksSocket->bytesToWrite() > 2 * d->blockSize)
+    if (d->socksSocket->bytesToWrite() > 2 * d->blockSize) {
         return;
+    }
 
     // check whether we have written the whole file
     if (d->fileInfo.size() && d->done >= d->fileInfo.size()) {
-        if (!d->socksSocket->bytesToWrite())
+        if (!d->socksSocket->bytesToWrite()) {
             terminate(QXmppTransferJob::NoError);
+        }
         return;
     }
 
@@ -703,8 +726,9 @@ QXmppTransferJob *QXmppTransferManagerPrivate::getJobByRequestId(QXmppTransferJo
     for (auto *job : std::as_const(jobs)) {
         if (job->d->direction == direction &&
             job->d->jid == jid &&
-            job->d->requestId == id)
+            job->d->requestId == id) {
             return job;
+        }
     }
     return nullptr;
 }
@@ -719,8 +743,9 @@ QXmppTransferIncomingJob *QXmppTransferManagerPrivate::getIncomingJobBySid(const
     for (auto *job : std::as_const(jobs)) {
         if (job->d->direction == QXmppTransferJob::IncomingDirection &&
             job->d->jid == jid &&
-            job->d->sid == sid)
+            job->d->sid == sid) {
             return static_cast<QXmppTransferIncomingJob *>(job);
+        }
     }
     return nullptr;
 }
@@ -799,11 +824,13 @@ void QXmppTransferManager::byteStreamResponseReceived(const QXmppIq &iq)
     QXmppTransferJob *job = d->getIncomingJobByRequestId(iq.from(), iq.id());
     if (!job ||
         job->method() != QXmppTransferJob::SocksMethod ||
-        job->state() != QXmppTransferJob::StartState)
+        job->state() != QXmppTransferJob::StartState) {
         return;
+    }
 
-    if (iq.type() == QXmppIq::Error)
+    if (iq.type() == QXmppIq::Error) {
         job->terminate(QXmppTransferJob::ProtocolError);
+    }
 }
 
 ///
@@ -815,8 +842,9 @@ void QXmppTransferManager::byteStreamResultReceived(const QXmppByteStreamIq &iq)
     auto *job = d->getOutgoingJobByRequestId(iq.from(), iq.id());
     if (!job ||
         job->method() != QXmppTransferJob::SocksMethod ||
-        job->state() != QXmppTransferJob::StartState)
+        job->state() != QXmppTransferJob::StartState) {
         return;
+    }
 
     // check the stream host
     if (iq.streamHostUsed() == job->d->socksProxy.jid()) {
@@ -874,8 +902,9 @@ QStringList QXmppTransferManager::discoveryFeatures() const
 
 bool QXmppTransferManager::handleStanza(const QDomElement &element)
 {
-    if (element.tagName() != "iq")
+    if (element.tagName() != "iq") {
         return false;
+    }
 
     // XEP-0047 In-Band Bytestreams
     if (QXmppIbbCloseIq::isIbbCloseIq(element)) {
@@ -1021,12 +1050,14 @@ void QXmppTransferManager::ibbResponseReceived(const QXmppIq &iq)
     auto *job = d->getOutgoingJobByRequestId(iq.from(), iq.id());
     if (!job ||
         job->method() != QXmppTransferJob::InBandMethod ||
-        job->state() == QXmppTransferJob::FinishedState)
+        job->state() == QXmppTransferJob::FinishedState) {
         return;
+    }
 
     // if the IO device is closed, do nothing
-    if (!job->d->iodevice->isOpen())
+    if (!job->d->iodevice->isOpen()) {
         return;
+    }
 
     if (iq.type() == QXmppIq::Result) {
         const QByteArray buffer = job->d->iodevice->read(job->d->blockSize);
@@ -1083,8 +1114,9 @@ void QXmppTransferManager::_q_iqReceived(const QXmppIq &iq)
                 }
             } else {
                 // we could not get host/port from proxy, proceed without a proxy
-                if (iq.type() == QXmppIq::Error)
+                if (iq.type() == QXmppIq::Error) {
                     socksServerSendOffer(job);
+                }
             }
             return;
         }
@@ -1118,8 +1150,9 @@ void QXmppTransferManager::_q_jobDestroyed(QObject *object)
 void QXmppTransferManager::_q_jobError(QXmppTransferJob::Error error)
 {
     auto *job = qobject_cast<QXmppTransferJob *>(sender());
-    if (!job || !d->jobs.contains(job))
+    if (!job || !d->jobs.contains(job)) {
         return;
+    }
 
     if (job->direction() == QXmppTransferJob::OutgoingDirection &&
         job->method() == QXmppTransferJob::InBandMethod &&
@@ -1136,8 +1169,9 @@ void QXmppTransferManager::_q_jobError(QXmppTransferJob::Error error)
 void QXmppTransferManager::_q_jobFinished()
 {
     auto *job = qobject_cast<QXmppTransferJob *>(sender());
-    if (!job || !d->jobs.contains(job))
+    if (!job || !d->jobs.contains(job)) {
         return;
+    }
 
     emit jobFinished(job);
 }
@@ -1145,11 +1179,13 @@ void QXmppTransferManager::_q_jobFinished()
 void QXmppTransferManager::_q_jobStateChanged(QXmppTransferJob::State state)
 {
     auto *job = qobject_cast<QXmppTransferJob *>(sender());
-    if (!job || !d->jobs.contains(job))
+    if (!job || !d->jobs.contains(job)) {
         return;
+    }
 
-    if (job->direction() != QXmppTransferJob::IncomingDirection)
+    if (job->direction() != QXmppTransferJob::IncomingDirection) {
         return;
+    }
 
     // disconnect from the signal
     disconnect(job, &QXmppTransferJob::stateChanged,
@@ -1179,10 +1215,11 @@ void QXmppTransferManager::_q_jobStateChanged(QXmppTransferJob::State state)
 
     QXmppDataForm::Field methodField(QXmppDataForm::Field::ListSingleField);
     methodField.setKey("stream-method");
-    if (job->method() == QXmppTransferJob::InBandMethod)
+    if (job->method() == QXmppTransferJob::InBandMethod) {
         methodField.setValue(ns_ibb);
-    else if (job->method() == QXmppTransferJob::SocksMethod)
+    } else if (job->method() == QXmppTransferJob::SocksMethod) {
         methodField.setValue(ns_bytestreams);
+    }
     form.setFields(QList<QXmppDataForm::Field>() << methodField);
 
     QXmppStreamInitiationIq response;
@@ -1292,10 +1329,12 @@ QXmppTransferJob *QXmppTransferManager::sendFile(const QString &jid, QIODevice *
 
     QXmppDataForm::Field methodField(QXmppDataForm::Field::ListSingleField);
     methodField.setKey("stream-method");
-    if (d->supportedMethods & QXmppTransferJob::InBandMethod)
+    if (d->supportedMethods & QXmppTransferJob::InBandMethod) {
         methodField.setOptions(methodField.options() << qMakePair(QString(), QString::fromLatin1(ns_ibb)));
-    if (d->supportedMethods & QXmppTransferJob::SocksMethod)
+    }
+    if (d->supportedMethods & QXmppTransferJob::SocksMethod) {
         methodField.setOptions(methodField.options() << qMakePair(QString(), QString::fromLatin1(ns_bytestreams)));
+    }
     form.setFields(QList<QXmppDataForm::Field>() << methodField);
 
     // start job
@@ -1352,8 +1391,9 @@ void QXmppTransferManager::socksServerSendOffer(QXmppTransferJob *job)
     }
 
     // add proxy
-    if (!job->d->socksProxy.jid().isEmpty())
+    if (!job->d->socksProxy.jid().isEmpty()) {
         streamHosts.append(job->d->socksProxy);
+    }
 
     // check we have some stream hosts
     if (!streamHosts.size()) {
@@ -1374,10 +1414,11 @@ void QXmppTransferManager::socksServerSendOffer(QXmppTransferJob *job)
 
 void QXmppTransferManager::streamInitiationIqReceived(const QXmppStreamInitiationIq &iq)
 {
-    if (iq.type() == QXmppIq::Result)
+    if (iq.type() == QXmppIq::Result) {
         streamInitiationResultReceived(iq);
-    else if (iq.type() == QXmppIq::Set)
+    } else if (iq.type() == QXmppIq::Set) {
         streamInitiationSetReceived(iq);
+    }
 }
 
 // The remote party has accepted an outgoing transfer.
@@ -1385,8 +1426,9 @@ void QXmppTransferManager::streamInitiationResultReceived(const QXmppStreamIniti
 {
     auto *job = d->getOutgoingJobByRequestId(iq.from(), iq.id());
     if (!job ||
-        job->state() != QXmppTransferJob::OfferState)
+        job->state() != QXmppTransferJob::OfferState) {
         return;
+    }
 
     const auto &form = iq.featureForm();
     const auto &fields = form.fields();
@@ -1394,11 +1436,12 @@ void QXmppTransferManager::streamInitiationResultReceived(const QXmppStreamIniti
     for (const auto &field : fields) {
         if (field.key() == "stream-method") {
             if ((field.value().toString() == ns_ibb) &&
-                (d->supportedMethods & QXmppTransferJob::InBandMethod))
+                (d->supportedMethods & QXmppTransferJob::InBandMethod)) {
                 job->d->method = QXmppTransferJob::InBandMethod;
-            else if ((field.value().toString() == ns_bytestreams) &&
-                     (d->supportedMethods & QXmppTransferJob::SocksMethod))
+            } else if ((field.value().toString() == ns_bytestreams) &&
+                       (d->supportedMethods & QXmppTransferJob::SocksMethod)) {
                 job->d->method = QXmppTransferJob::SocksMethod;
+            }
         }
     }
 
@@ -1479,21 +1522,22 @@ void QXmppTransferManager::streamInitiationSetReceived(const QXmppStreamInitiati
             QPair<QString, QString> option;
             const auto &options = field.options();
             for (const auto &option : options) {
-                if (option.second == ns_ibb)
+                if (option.second == ns_ibb) {
                     offeredMethods = offeredMethods | QXmppTransferJob::InBandMethod;
-                else if (option.second == ns_bytestreams)
+                } else if (option.second == ns_bytestreams) {
                     offeredMethods = offeredMethods | QXmppTransferJob::SocksMethod;
+                }
             }
         }
     }
 
     // select a method supported by both parties
     int sharedMethods = (offeredMethods & d->supportedMethods);
-    if (sharedMethods & QXmppTransferJob::SocksMethod)
+    if (sharedMethods & QXmppTransferJob::SocksMethod) {
         job->d->method = QXmppTransferJob::SocksMethod;
-    else if (sharedMethods & QXmppTransferJob::InBandMethod)
+    } else if (sharedMethods & QXmppTransferJob::InBandMethod) {
         job->d->method = QXmppTransferJob::InBandMethod;
-    else {
+    } else {
         // FIXME : we should add:
         // <no-valid-streams xmlns='http://jabber.org/protocol/si'/>
         QXmppStanza::Error error(QXmppStanza::Error::Cancel, QXmppStanza::Error::BadRequest);
diff --git a/src/client/QXmppUploadRequestManager.cpp b/src/client/QXmppUploadRequestManager.cpp
index 1ade2fbc..e40233ae 100644
--- a/src/client/QXmppUploadRequestManager.cpp
+++ b/src/client/QXmppUploadRequestManager.cpp
@@ -151,21 +151,24 @@ QString QXmppUploadRequestManager::requestUploadSlot(const QString &fileName,
                                                      const QMimeType &mimeType,
                                                      const QString &uploadService)
 {
-    if (!serviceFound() && uploadService.isEmpty())
+    if (!serviceFound() && uploadService.isEmpty()) {
         return {};
+    }
 
     QXmppHttpUploadRequestIq iq;
-    if (uploadService.isEmpty())
+    if (uploadService.isEmpty()) {
         iq.setTo(d->uploadServices.first().jid());
-    else
+    } else {
         iq.setTo(uploadService);
+    }
     iq.setType(QXmppIq::Get);
     iq.setFileName(fileName);
     iq.setSize(fileSize);
     iq.setContentType(mimeType);
 
-    if (client()->sendPacket(iq))
+    if (client()->sendPacket(iq)) {
         return iq.id();
+    }
     return {};
 }
 
@@ -239,10 +242,11 @@ auto QXmppUploadRequestManager::requestSlot(const QString &fileName,
     }
 
     QXmppHttpUploadRequestIq iq;
-    if (uploadService.isEmpty())
+    if (uploadService.isEmpty()) {
         iq.setTo(d->uploadServices.first().jid());
-    else
+    } else {
         iq.setTo(uploadService);
+    }
     iq.setType(QXmppIq::Get);
     iq.setFileName(fileName);
     iq.setSize(fileSize);
@@ -285,8 +289,9 @@ bool QXmppUploadRequestManager::handleStanza(const QDomElement &element)
 
 void QXmppUploadRequestManager::handleDiscoInfo(const QXmppDiscoveryIq &iq)
 {
-    if (!iq.features().contains(ns_http_upload))
+    if (!iq.features().contains(ns_http_upload)) {
         return;
+    }
 
     const auto identities = iq.identities();
     for (const QXmppDiscoveryIq::Identity &identity : identities) {
diff --git a/src/client/QXmppVCardManager.cpp b/src/client/QXmppVCardManager.cpp
index b6cdff0b..fa5a5f02 100644
--- a/src/client/QXmppVCardManager.cpp
+++ b/src/client/QXmppVCardManager.cpp
@@ -32,10 +32,11 @@ QXmppVCardManager::~QXmppVCardManager() = default;
 QString QXmppVCardManager::requestVCard(const QString &jid)
 {
     QXmppVCardIq request(jid);
-    if (client()->sendPacket(request))
+    if (client()->sendPacket(request)) {
         return request.id();
-    else
+    } else {
         return QString();
+    }
 }
 
 /// Returns the vCard of the connected client.
diff --git a/src/client/QXmppVersionManager.cpp b/src/client/QXmppVersionManager.cpp
index 79c9f098..a42e3328 100644
--- a/src/client/QXmppVersionManager.cpp
+++ b/src/client/QXmppVersionManager.cpp
@@ -24,13 +24,15 @@ QXmppVersionManager::QXmppVersionManager()
     : d(std::make_unique<QXmppVersionManagerPrivate>())
 {
     d->clientName = qApp->applicationName();
-    if (d->clientName.isEmpty())
+    if (d->clientName.isEmpty()) {
         d->clientName = "Based on QXmpp";
+    }
 
     d->clientOs = QSysInfo::prettyProductName();
     d->clientVersion = qApp->applicationVersion();
-    if (d->clientVersion.isEmpty())
+    if (d->clientVersion.isEmpty()) {
         d->clientVersion = QXmppVersion();
+    }
 }
 
 QXmppVersionManager::~QXmppVersionManager() = default;
@@ -44,10 +46,11 @@ QString QXmppVersionManager::requestVersion(const QString &jid)
     QXmppVersionIq request;
     request.setType(QXmppIq::Get);
     request.setTo(jid);
-    if (client()->sendPacket(request))
+    if (client()->sendPacket(request)) {
         return request.id();
-    else
+    } else {
         return QString();
+    }
 }
 
 /// Sets the local XMPP client's name.