MixInvitation*Iq: Do not use d-pointer

olomono · Mar 24, 2024 · dd32673 · dd32673
1 parent 9ceadc4
commit dd32673
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 28 deletions.
diff --git a/src/base/QXmppMixIq.cpp b/src/base/QXmppMixIq.cpp
@@ -148,12 +148,6 @@ void QXmppMixSubscriptionUpdateIq::toXmlElementFromChild(QXmlStreamWriter *write
 }
 /// \endcond
 
-class QXmppMixInvitationRequestIqPrivate : public QSharedData
-{
-public:
-    QString inviteeJid;
-};
-
 ///
 /// \class QXmppMixInvitationRequestIq
 ///
@@ -170,7 +164,6 @@ class QXmppMixInvitationRequestIqPrivate : public QSharedData
 /// Constructs a MIX invitation request IQ.
 ///
 QXmppMixInvitationRequestIq::QXmppMixInvitationRequestIq()
-    : d(new QXmppMixInvitationRequestIqPrivate)
 {
 }
 
@@ -183,7 +176,7 @@ QXMPP_PRIVATE_DEFINE_RULE_OF_SIX(QXmppMixInvitationRequestIq)
 ///
 QString QXmppMixInvitationRequestIq::inviteeJid() const
 {
-    return d->inviteeJid;
+    return m_inviteeJid;
 }
 
 ///
@@ -193,7 +186,7 @@ QString QXmppMixInvitationRequestIq::inviteeJid() const
 ///
 void QXmppMixInvitationRequestIq::setInviteeJid(const QString &inviteeJid)
 {
-    d->inviteeJid = inviteeJid;
+    m_inviteeJid = inviteeJid;
 }
 
 bool QXmppMixInvitationRequestIq::isMixInvitationRequestIq(const QDomElement &element)
@@ -206,24 +199,18 @@ void QXmppMixInvitationRequestIq::parseElementFromChild(const QDomElement &eleme
 {
     QDomElement child = element.firstChildElement();
     const auto subChild = child.firstChildElement(QStringLiteral("invitee"));
-    d->inviteeJid = subChild.text();
+    m_inviteeJid = subChild.text();
 }
 
 void QXmppMixInvitationRequestIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
 {
     writer->writeStartElement(QSL65("invite"));
     writer->writeDefaultNamespace(toString65(ns_mix_misc));
-    writeXmlTextElement(writer, u"invitee", d->inviteeJid);
+    writeXmlTextElement(writer, u"invitee", m_inviteeJid);
     writer->writeEndElement();
 }
 /// \endcond
 
-class QXmppMixInvitationResponseIqPrivate : public QSharedData
-{
-public:
-    QXmppMixInvitation invitation;
-};
-
 ///
 /// \class QXmppMixInvitationResponseIq
 ///
@@ -240,7 +227,6 @@ class QXmppMixInvitationResponseIqPrivate : public QSharedData
 /// Constructs a MIX invitation response IQ.
 ///
 QXmppMixInvitationResponseIq::QXmppMixInvitationResponseIq()
-    : d(new QXmppMixInvitationResponseIqPrivate)
 {
 }
 
@@ -253,7 +239,7 @@ QXMPP_PRIVATE_DEFINE_RULE_OF_SIX(QXmppMixInvitationResponseIq)
 ///
 QXmppMixInvitation QXmppMixInvitationResponseIq::invitation() const
 {
-    return d->invitation;
+    return m_invitation;
 }
 
 ///
@@ -263,7 +249,7 @@ QXmppMixInvitation QXmppMixInvitationResponseIq::invitation() const
 ///
 void QXmppMixInvitationResponseIq::setInvitation(const QXmppMixInvitation &invitation)
 {
-    d->invitation = invitation;
+    m_invitation = invitation;
 }
 
 bool QXmppMixInvitationResponseIq::isMixInvitationResponseIq(const QDomElement &element)
@@ -276,15 +262,15 @@ void QXmppMixInvitationResponseIq::parseElementFromChild(const QDomElement &elem
 {
     QDomElement child = element.firstChildElement();
     const auto subChild = child.firstChildElement(QStringLiteral("invitation"));
-    d->invitation = QXmppMixInvitation();
-    d->invitation.parse(subChild);
+    m_invitation = QXmppMixInvitation();
+    m_invitation.parse(subChild);
 }
 
 void QXmppMixInvitationResponseIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
 {
     writer->writeStartElement(QSL65("invite"));
     writer->writeDefaultNamespace(toString65(ns_mix_misc));
-    d->invitation.toXml(writer);
+    m_invitation.toXml(writer);
     writer->writeEndElement();
 }
 /// \endcond

diff --git a/src/base/QXmppMixIq_p.h b/src/base/QXmppMixIq_p.h
@@ -9,9 +9,6 @@
 #include "QXmppMixConfigItem.h"
 #include "QXmppMixInvitation.h"
 
-class QXmppMixInvitationRequestIqPrivate;
-class QXmppMixInvitationResponseIqPrivate;
-
 class QXMPP_EXPORT QXmppMixSubscriptionUpdateIq : public QXmppIq
 {
 public:
@@ -57,7 +54,7 @@ class QXMPP_EXPORT QXmppMixInvitationRequestIq : public QXmppIq
     /// \endcond
 
 private:
-    QSharedDataPointer<QXmppMixInvitationRequestIqPrivate> d;
+    QString m_inviteeJid;
 };
 
 class QXMPP_EXPORT QXmppMixInvitationResponseIq : public QXmppIq
@@ -79,7 +76,7 @@ class QXMPP_EXPORT QXmppMixInvitationResponseIq : public QXmppIq
     /// \endcond
 
 private:
-    QSharedDataPointer<QXmppMixInvitationResponseIqPrivate> d;
+    QXmppMixInvitation m_invitation;
 };
 
 namespace QXmpp::Private {