From 2000431680f4ddf58f3fbe9ea138dd18bc9a1b8c Mon Sep 17 00:00:00 2001 From: Melvin Keskin Date: Sun, 10 Apr 2022 20:24:42 +0200 Subject: PubSubManager: Make 'standardItemIdToString()' public This is needed if the IDs of incoming items should be checked externally. --- src/client/QXmppPubSubManager.cpp | 25 ++++++++++++++++--------- src/client/QXmppPubSubManager.h | 4 ++-- 2 files changed, 18 insertions(+), 11 deletions(-) (limited to 'src/client') diff --git a/src/client/QXmppPubSubManager.cpp b/src/client/QXmppPubSubManager.cpp index 859c6f73..b1f6edf8 100644 --- a/src/client/QXmppPubSubManager.cpp +++ b/src/client/QXmppPubSubManager.cpp @@ -933,6 +933,22 @@ QFuture QXmppPubSubManager::unsubscribeFromNode(cons /// \sa requestPepNodeConfiguration() /// +/// +/// Returns a standard item ID string. +/// +/// \param itemId standard item ID to be translated +/// \return the item ID string or a default-constructed string if there is no +/// corresponding one +/// +QString QXmppPubSubManager::standardItemIdToString(StandardItemId itemId) +{ + switch (itemId) { + case Current: + return QStringLiteral("current"); + } + return {}; +} + /// \cond QStringList QXmppPubSubManager::discoveryFeatures() const { @@ -985,15 +1001,6 @@ QXmppPubSubIq<> QXmppPubSubManager::requestItemsIq(const QString &jid, const QSt return request; } -QString QXmppPubSubManager::standardItemIdToString(StandardItemId itemId) -{ - switch (itemId) { - case Current: - return QStringLiteral("current"); - } - return {}; -} - auto QXmppPubSubManager::publishItem(QXmppPubSubIqBase &&request) -> QFuture { request.setType(QXmppIq::Set); diff --git a/src/client/QXmppPubSubManager.h b/src/client/QXmppPubSubManager.h index 30322591..7b5c050c 100644 --- a/src/client/QXmppPubSubManager.h +++ b/src/client/QXmppPubSubManager.h @@ -145,6 +145,8 @@ public: inline QFuture configurePepNode(const QString &nodeName, const QXmppPubSubNodeConfig &config) { return configureNode(client()->configuration().jidBare(), nodeName, config); } inline QFuture cancelPepNodeConfiguration(const QString &nodeName) { return cancelNodeConfiguration(client()->configuration().jidBare(), nodeName); } + static QString standardItemIdToString(StandardItemId itemId); + /// \cond QStringList discoveryFeatures() const override; bool handleStanza(const QDomElement &element) override; @@ -155,8 +157,6 @@ private: QFuture publishItems(QXmppPubSubIqBase &&iq); static QXmppPubSubIq<> requestItemsIq(const QString &jid, const QString &nodeName, const QStringList &itemIds); - static QString standardItemIdToString(StandardItemId itemId); - // We may need a d-ptr in the future. void *d = nullptr; }; -- cgit v1.2.3