Split up MixItem.h into Mix{Info,Participant}Item.h

4 files changed, 46 insertions, 34 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2e9d587a..fad9a885 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -45,9 +45,10 @@ set(INSTALL_HEADER_FILES
     base/QXmppLogger.h
     base/QXmppMamIq.h
     base/QXmppMessage.h
+    base/QXmppMixInfoItem.h
     base/QXmppMixInvitation.h
     base/QXmppMixIq.h
-    base/QXmppMixItem.h
+    base/QXmppMixParticipantItem.h
     base/QXmppMucIq.h
     base/QXmppNonza.h
     base/QXmppNonSASLAuth.h
diff --git a/src/base/QXmppMixItem.h b/src/base/QXmppMixInfoItem.h
index f0f13e1f..53556e10 100644
--- a/src/base/QXmppMixItem.h
+++ b/src/base/QXmppMixInfoItem.h
@@ -2,13 +2,12 @@
 //
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
-#ifndef QXMPPMIXITEM_H
-#define QXMPPMIXITEM_H
+#ifndef QXMPPMIXINFOITEM_H
+#define QXMPPMIXINFOITEM_H
 
 #include "QXmppPubSubItem.h"
 
 class QXmppMixInfoItemPrivate;
-class QXmppMixParticipantItemPrivate;
 
 class QXMPP_EXPORT QXmppMixInfoItem : public QXmppPubSubItem
 {
@@ -40,31 +39,4 @@ private:
     QSharedDataPointer<QXmppMixInfoItemPrivate> d;
 };
 
-class QXMPP_EXPORT QXmppMixParticipantItem : public QXmppPubSubItem
-{
-public:
-    QXmppMixParticipantItem();
-    QXmppMixParticipantItem(const QXmppMixParticipantItem &);
-    ~QXmppMixParticipantItem();
-
-    QXmppMixParticipantItem &operator=(const QXmppMixParticipantItem &);
-
-    const QString &nick() const;
-    void setNick(QString);
-
-    const QString &jid() const;
-    void setJid(QString);
-
-    static bool isItem(const QDomElement &);
-
-protected:
-    /// \cond
-    void parsePayload(const QDomElement &payloadElement) override;
-    void serializePayload(QXmlStreamWriter *writer) const override;
-    /// \endcond
-
-private:
-    QSharedDataPointer<QXmppMixParticipantItemPrivate> d;
-};
-
-#endif  // QXMPPMIXITEM_H
+#endif  // QXMPPMIXINFOITEM_H
diff --git a/src/base/QXmppMixItem.cpp b/src/base/QXmppMixItem.cpp
index 4dcef62d..35ed3335 100644
--- a/src/base/QXmppMixItem.cpp
+++ b/src/base/QXmppMixItem.cpp
@@ -2,10 +2,10 @@
 //
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
-#include "QXmppMixItem.h"
-
 #include "QXmppConstants_p.h"
 #include "QXmppDataFormBase.h"
+#include "QXmppMixInfoItem.h"
+#include "QXmppMixParticipantItem.h"
 
 static const auto NAME = QStringLiteral("Name");
 static const auto DESCRIPTION = QStringLiteral("Description");
diff --git a/src/base/QXmppMixParticipantItem.h b/src/base/QXmppMixParticipantItem.h
new file mode 100644
index 00000000..1320d467
--- /dev/null
+++ b/src/base/QXmppMixParticipantItem.h
@@ -0,0 +1,39 @@
+// SPDX-FileCopyrightText: 2019 Linus Jahn <lnj@kaidan.im>
+//
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+#ifndef QXMPPMIXPARTICIPANTITEM_H
+#define QXMPPMIXPARTICIPANTITEM_H
+
+#include "QXmppPubSubItem.h"
+
+class QXmppMixParticipantItemPrivate;
+
+class QXMPP_EXPORT QXmppMixParticipantItem : public QXmppPubSubItem
+{
+public:
+    QXmppMixParticipantItem();
+    QXmppMixParticipantItem(const QXmppMixParticipantItem &);
+    ~QXmppMixParticipantItem();
+
+    QXmppMixParticipantItem &operator=(const QXmppMixParticipantItem &);
+
+    const QString &nick() const;
+    void setNick(QString);
+
+    const QString &jid() const;
+    void setJid(QString);
+
+    static bool isItem(const QDomElement &);
+
+protected:
+    /// \cond
+    void parsePayload(const QDomElement &payloadElement) override;
+    void serializePayload(QXmlStreamWriter *writer) const override;
+    /// \endcond
+
+private:
+    QSharedDataPointer<QXmppMixParticipantItemPrivate> d;
+};
+
+#endif  // QXMPPMIXPARTICIPANTITEM_H