From 70a8585a38797d24537b8109354bb83cd9262176 Mon Sep 17 00:00:00 2001
From: Linus Jahn <lnj@kaidan.im>
Date: Thu, 9 Mar 2023 21:07:05 +0100
Subject: PubSubIq_p: Rename Private class to avoid conflicts

---
 src/base/QXmppPubSubIq.cpp | 8 ++++++--
 src/base/QXmppPubSubIq_p.h | 5 +++--
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'src/base')

diff --git a/src/base/QXmppPubSubIq.cpp b/src/base/QXmppPubSubIq.cpp
index d45df2d3..27da0e4b 100644
--- a/src/base/QXmppPubSubIq.cpp
+++ b/src/base/QXmppPubSubIq.cpp
@@ -81,7 +81,9 @@ static const QStringList PUBSUB_QUERIES = {
     QStringLiteral("unsubscribe"),
 };
 
-class QXmppPubSubIqPrivate : public QSharedData
+namespace QXmpp::Private {
+
+class PubSubIqPrivate : public QSharedData
 {
 public:
     PubSubIqBase::QueryType queryType = PubSubIqBase::Items;
@@ -95,11 +97,13 @@ public:
     std::optional<QXmppResultSetReply> itemsContinuation;
 };
 
+}
+
 ///
 /// Constructs a PubSub IQ.
 ///
 PubSubIqBase::PubSubIqBase()
-    : d(new QXmppPubSubIqPrivate)
+    : d(new PubSubIqPrivate)
 {
 }
 
diff --git a/src/base/QXmppPubSubIq_p.h b/src/base/QXmppPubSubIq_p.h
index 6868eb84..c8828579 100644
--- a/src/base/QXmppPubSubIq_p.h
+++ b/src/base/QXmppPubSubIq_p.h
@@ -14,7 +14,6 @@
 #include <QSharedDataPointer>
 
 class QXmppDataForm;
-class QXmppPubSubIqPrivate;
 class QXmppPubSubBaseItem;
 class QXmppPubSubSubscription;
 class QXmppPubSubAffiliation;
@@ -22,6 +21,8 @@ class QXmppResultSetReply;
 
 namespace QXmpp::Private {
 
+class PubSubIqPrivate;
+
 class QXMPP_EXPORT PubSubIqBase : public QXmppIq
 {
 public:
@@ -100,7 +101,7 @@ private:
     static std::optional<QueryType> queryTypeFromDomElement(const QDomElement &element);
     static bool queryTypeIsOwnerIq(QueryType type);
 
-    QSharedDataPointer<QXmppPubSubIqPrivate> d;
+    QSharedDataPointer<PubSubIqPrivate> d;
 };
 
 template<typename T = QXmppPubSubBaseItem>
-- 
cgit v1.2.3