From 523030f0751d69e4f33ee7dc3a4078e213ee94aa Mon Sep 17 00:00:00 2001 From: Linus Jahn Date: Thu, 10 Mar 2022 09:33:02 +0100 Subject: Split up MixItem.h into Mix{Info,Participant}Item.h --- src/CMakeLists.txt | 3 +- src/base/QXmppMixInfoItem.h | 42 +++++++++++++++++++++++ src/base/QXmppMixItem.cpp | 4 +-- src/base/QXmppMixItem.h | 70 -------------------------------------- src/base/QXmppMixParticipantItem.h | 39 +++++++++++++++++++++ 5 files changed, 85 insertions(+), 73 deletions(-) create mode 100644 src/base/QXmppMixInfoItem.h delete mode 100644 src/base/QXmppMixItem.h create mode 100644 src/base/QXmppMixParticipantItem.h (limited to 'src') 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/QXmppMixInfoItem.h b/src/base/QXmppMixInfoItem.h new file mode 100644 index 00000000..53556e10 --- /dev/null +++ b/src/base/QXmppMixInfoItem.h @@ -0,0 +1,42 @@ +// SPDX-FileCopyrightText: 2019 Linus Jahn +// +// SPDX-License-Identifier: LGPL-2.1-or-later + +#ifndef QXMPPMIXINFOITEM_H +#define QXMPPMIXINFOITEM_H + +#include "QXmppPubSubItem.h" + +class QXmppMixInfoItemPrivate; + +class QXMPP_EXPORT QXmppMixInfoItem : public QXmppPubSubItem +{ +public: + QXmppMixInfoItem(); + QXmppMixInfoItem(const QXmppMixInfoItem &); + ~QXmppMixInfoItem(); + + QXmppMixInfoItem &operator=(const QXmppMixInfoItem &); + + const QString &name() const; + void setName(QString); + + const QString &description() const; + void setDescription(QString); + + const QStringList &contactJids() const; + void setContactJids(QStringList); + + static bool isItem(const QDomElement &itemElement); + +protected: + /// \cond + void parsePayload(const QDomElement &payloadElement) override; + void serializePayload(QXmlStreamWriter *writer) const override; + /// \endcond + +private: + QSharedDataPointer d; +}; + +#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/QXmppMixItem.h b/src/base/QXmppMixItem.h deleted file mode 100644 index f0f13e1f..00000000 --- a/src/base/QXmppMixItem.h +++ /dev/null @@ -1,70 +0,0 @@ -// SPDX-FileCopyrightText: 2019 Linus Jahn -// -// SPDX-License-Identifier: LGPL-2.1-or-later - -#ifndef QXMPPMIXITEM_H -#define QXMPPMIXITEM_H - -#include "QXmppPubSubItem.h" - -class QXmppMixInfoItemPrivate; -class QXmppMixParticipantItemPrivate; - -class QXMPP_EXPORT QXmppMixInfoItem : public QXmppPubSubItem -{ -public: - QXmppMixInfoItem(); - QXmppMixInfoItem(const QXmppMixInfoItem &); - ~QXmppMixInfoItem(); - - QXmppMixInfoItem &operator=(const QXmppMixInfoItem &); - - const QString &name() const; - void setName(QString); - - const QString &description() const; - void setDescription(QString); - - const QStringList &contactJids() const; - void setContactJids(QStringList); - - static bool isItem(const QDomElement &itemElement); - -protected: - /// \cond - void parsePayload(const QDomElement &payloadElement) override; - void serializePayload(QXmlStreamWriter *writer) const override; - /// \endcond - -private: - QSharedDataPointer 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 d; -}; - -#endif // QXMPPMIXITEM_H 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 +// +// 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 d; +}; + +#endif // QXMPPMIXPARTICIPANTITEM_H -- cgit v1.2.3