Merge branch '1.5'

2 files changed, 5 insertions, 3 deletions

diff --git a/src/base/QXmppPubSubIq.cpp b/src/base/QXmppPubSubIq.cpp
index 27da0e4b..1abb11ee 100644
--- a/src/base/QXmppPubSubIq.cpp
+++ b/src/base/QXmppPubSubIq.cpp
@@ -97,7 +97,7 @@ public:
     std::optional<QXmppResultSetReply> itemsContinuation;
 };
 
-}
+}  // namespace QXmpp::Private
 
 ///
 /// Constructs a PubSub IQ.
diff --git a/src/base/compat/QXmppPubSubIq.cpp b/src/base/compat/QXmppPubSubIq.cpp
index 9df2fdf1..88c0665f 100644
--- a/src/base/compat/QXmppPubSubIq.cpp
+++ b/src/base/compat/QXmppPubSubIq.cpp
@@ -149,8 +149,9 @@ void QXmppPubSubIq::parseElementFromChild(const QDomElement &element)
     // determine query type
     const QString tagName = queryElement.tagName();
     int queryType = PUBSUB_QUERIES.indexOf(queryElement.tagName());
-    if (queryType > -1)
+    if (queryType > -1) {
         d->queryType = QueryType(queryType);
+    }
 
     d->queryJid = queryElement.attribute(QStringLiteral("jid"));
     d->queryNode = queryElement.attribute(QStringLiteral("node"));
@@ -193,8 +194,9 @@ void QXmppPubSubIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
     case QXmppPubSubIq::ItemsQuery:
     case QXmppPubSubIq::PublishQuery:
     case QXmppPubSubIq::RetractQuery:
-        for (const auto &item : d->items)
+        for (const auto &item : d->items) {
             item.toXml(writer);
+        }
         break;
     case QXmppPubSubIq::SubscriptionQuery:
         helperToXmlAddAttribute(writer, QStringLiteral("subid"), d->subscriptionId);