Merge branch '1.5'

6 files changed, 9 insertions, 7 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);
diff --git a/src/client/QXmppPubSubManager.cpp b/src/client/QXmppPubSubManager.cpp
index de7a9db0..a8334d97 100644
--- a/src/client/QXmppPubSubManager.cpp
+++ b/src/client/QXmppPubSubManager.cpp
@@ -9,8 +9,8 @@
 #include "QXmppClient.h"
 #include "QXmppConstants_p.h"
 #include "QXmppPubSubAffiliation.h"
-#include "QXmppPubSubEventHandler.h"
 #include "QXmppPubSubBaseItem.h"
+#include "QXmppPubSubEventHandler.h"
 #include "QXmppPubSubSubscribeOptions.h"
 #include "QXmppPubSubSubscription.h"
 #include "QXmppStanza.h"
diff --git a/tests/qxmpppubsubevent/tst_qxmpppubsubevent.cpp b/tests/qxmpppubsubevent/tst_qxmpppubsubevent.cpp
index 8f37d943..e2f64649 100644
--- a/tests/qxmpppubsubevent/tst_qxmpppubsubevent.cpp
+++ b/tests/qxmpppubsubevent/tst_qxmpppubsubevent.cpp
@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
 #include "QXmppDataForm.h"
-#include "QXmppPubSubEvent.h"
 #include "QXmppPubSubBaseItem.h"
+#include "QXmppPubSubEvent.h"
 
 #include "pubsubutil.h"
 #include "util.h"
diff --git a/tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp b/tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp
index bb6c0768..e4c816aa 100644
--- a/tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp
+++ b/tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp
@@ -3,8 +3,8 @@
 //
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
-#include "QXmppPubSubIq_p.h"
 #include "QXmppPubSubBaseItem.h"
+#include "QXmppPubSubIq_p.h"
 #include "QXmppPubSubSubscription.h"
 #include "QXmppResultSet.h"
 
diff --git a/tests/qxmpppubsubmanager/tst_qxmpppubsubmanager.cpp b/tests/qxmpppubsubmanager/tst_qxmpppubsubmanager.cpp
index 6589b92e..f7f57f9d 100644
--- a/tests/qxmpppubsubmanager/tst_qxmpppubsubmanager.cpp
+++ b/tests/qxmpppubsubmanager/tst_qxmpppubsubmanager.cpp
@@ -7,8 +7,8 @@
 #include "QXmppClient.h"
 #include "QXmppMessage.h"
 #include "QXmppPubSubAffiliation.h"
-#include "QXmppPubSubEventHandler.h"
 #include "QXmppPubSubBaseItem.h"
+#include "QXmppPubSubEventHandler.h"
 #include "QXmppPubSubManager.h"
 #include "QXmppPubSubPublishOptions.h"
 #include "QXmppPubSubSubscribeOptions.h"