PubSubManager: Make 'standardItemIdToString()' public

This is needed if the IDs of incoming items should be checked externally.

2 files changed, 18 insertions, 11 deletions

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::Result> 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<PublishItemResult>
 {
     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<Result> configurePepNode(const QString &nodeName, const QXmppPubSubNodeConfig &config) { return configureNode(client()->configuration().jidBare(), nodeName, config); }
     inline QFuture<Result> 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<PublishItemsResult> 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;
 };