diff options
| author | Linus Jahn <lnj@kaidan.im> | 2023-03-09 18:48:21 +0100 |
|---|---|---|
| committer | Linus Jahn <lnj@kaidan.im> | 2023-03-09 20:16:42 +0100 |
| commit | fcd8224256e38d50d4ec67b71c504dcb6e480e95 (patch) | |
| tree | 5753ff003919d3815698c630d96f92d824df546a /src/omemo | |
| parent | 18353901a2215376e2f0274a408ce2213c180f16 (diff) | |
| download | qxmpp-fcd8224256e38d50d4ec67b71c504dcb6e480e95.tar.gz | |
Rename PubSubItem -> PubSubBaseItem to be able to include old PubSubItem
Diffstat (limited to 'src/omemo')
| -rw-r--r-- | src/omemo/QXmppOmemoData.cpp | 4 | ||||
| -rw-r--r-- | src/omemo/QXmppOmemoItems_p.h | 6 | ||||
| -rw-r--r-- | src/omemo/QXmppOmemoManager_p.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/omemo/QXmppOmemoData.cpp b/src/omemo/QXmppOmemoData.cpp index 6bc1815b..43e00c35 100644 --- a/src/omemo/QXmppOmemoData.cpp +++ b/src/omemo/QXmppOmemoData.cpp @@ -424,7 +424,7 @@ void QXmppOmemoDeviceBundleItem::setDeviceBundle(const QXmppOmemoDeviceBundle &d bool QXmppOmemoDeviceBundleItem::isItem(const QDomElement &itemElement) { - return QXmppPubSubItem::isItem(itemElement, QXmppOmemoDeviceBundle::isOmemoDeviceBundle); + return QXmppPubSubBaseItem::isItem(itemElement, QXmppOmemoDeviceBundle::isOmemoDeviceBundle); } void QXmppOmemoDeviceBundleItem::parsePayload(const QDomElement &payloadElement) @@ -449,7 +449,7 @@ void QXmppOmemoDeviceListItem::setDeviceList(const QXmppOmemoDeviceList &deviceL bool QXmppOmemoDeviceListItem::isItem(const QDomElement &itemElement) { - return QXmppPubSubItem::isItem(itemElement, QXmppOmemoDeviceList::isOmemoDeviceList); + return QXmppPubSubBaseItem::isItem(itemElement, QXmppOmemoDeviceList::isOmemoDeviceList); } void QXmppOmemoDeviceListItem::parsePayload(const QDomElement &payloadElement) diff --git a/src/omemo/QXmppOmemoItems_p.h b/src/omemo/QXmppOmemoItems_p.h index 9b816ed8..abc6a65f 100644 --- a/src/omemo/QXmppOmemoItems_p.h +++ b/src/omemo/QXmppOmemoItems_p.h @@ -7,9 +7,9 @@ #include "QXmppOmemoDeviceBundle_p.h" #include "QXmppOmemoDeviceList_p.h" -#include "QXmppPubSubItem.h" +#include "QXmppPubSubBaseItem.h" -class QXmppOmemoDeviceBundleItem : public QXmppPubSubItem +class QXmppOmemoDeviceBundleItem : public QXmppPubSubBaseItem { public: QXmppOmemoDeviceBundle deviceBundle() const; @@ -25,7 +25,7 @@ private: QXmppOmemoDeviceBundle m_deviceBundle; }; -class QXmppOmemoDeviceListItem : public QXmppPubSubItem +class QXmppOmemoDeviceListItem : public QXmppPubSubBaseItem { public: QXmppOmemoDeviceList deviceList() const; diff --git a/src/omemo/QXmppOmemoManager_p.cpp b/src/omemo/QXmppOmemoManager_p.cpp index 8da77f5f..d8830d0d 100644 --- a/src/omemo/QXmppOmemoManager_p.cpp +++ b/src/omemo/QXmppOmemoManager_p.cpp @@ -12,7 +12,7 @@ #include "QXmppOmemoEnvelope_p.h" #include "QXmppOmemoIq_p.h" #include "QXmppOmemoItems_p.h" -#include "QXmppPubSubItem.h" +#include "QXmppPubSubBaseItem.h" #include "QXmppSceEnvelope_p.h" #include "QXmppTrustManager.h" #include "QXmppUtils.h" |