From ce1aef34b88b4d4f6666ee47e32d0a6ae78a1088 Mon Sep 17 00:00:00 2001
From: Melvin Keskin <melvo@olomono.de>
Date: Sun, 10 Apr 2022 12:55:36 +0200
Subject: Fix PubSub methods with a standard item ID parameter

---
 src/client/QXmppPubSubManager.cpp | 9 ---------
 src/client/QXmppPubSubManager.h   | 7 ++-----
 2 files changed, 2 insertions(+), 14 deletions(-)

(limited to 'src/client')

diff --git a/src/client/QXmppPubSubManager.cpp b/src/client/QXmppPubSubManager.cpp
index c27b5fcb..859c6f73 100644
--- a/src/client/QXmppPubSubManager.cpp
+++ b/src/client/QXmppPubSubManager.cpp
@@ -424,9 +424,6 @@ auto QXmppPubSubManager::retractItem(const QString &jid, const QString &nodeName
 ///
 /// Deletes an item from a pubsub node.
 ///
-/// The default value of itemId is used for singleton nodes (i.e., the node's
-/// single item is deleted).
-///
 /// \param jid Jabber ID of the entity hosting the pubsub service
 /// \param nodeName the name of the node to delete the item from
 /// \param itemId the ID of the item to delete
@@ -827,9 +824,6 @@ QFuture<QXmppPubSubManager::Result> QXmppPubSubManager::unsubscribeFromNode(cons
 ///
 /// Requests a specific item of a PEP node.
 ///
-/// The default value of itemId is used for singleton nodes (i.e., the node's
-/// single item is requested).
-///
 /// This is a convenience method equivalent to calling
 /// QXmppPubSubManager::requestItem on the current account's bare JID.
 ///
@@ -877,9 +871,6 @@ QFuture<QXmppPubSubManager::Result> QXmppPubSubManager::unsubscribeFromNode(cons
 ///
 /// Deletes an item from a PEP node.
 ///
-/// The default value of itemId is used for singleton nodes (i.e., the node's
-/// single item is deleted).
-///
 /// This is a convenience method equivalent to calling
 /// QXmppPubSubManager::retractItem on the current account's bare JID.
 ///
diff --git a/src/client/QXmppPubSubManager.h b/src/client/QXmppPubSubManager.h
index 9a4e192e..e3ee062f 100644
--- a/src/client/QXmppPubSubManager.h
+++ b/src/client/QXmppPubSubManager.h
@@ -38,7 +38,7 @@ public:
     /// Pre-defined ID of a PubSub item
     ///
     enum StandardItemId {
-        Current  ///< Item of a singleton node
+        Current  ///< Item of a singleton node (i.e., the node's single item)
     };
 
     ///
@@ -126,7 +126,7 @@ public:
     template<typename T = QXmppPubSubItem>
     inline QFuture<ItemResult<T>> requestPepItem(const QString &nodeName, const QString &itemId) { return requestItem<T>(client()->configuration().jidBare(), nodeName, itemId); }
     template<typename T = QXmppPubSubItem>
-    inline QFuture<ItemResult<T>> requestPepItem(const QString &nodeName, StandardItemId itemId = Current) { return requestItem<T>(client()->configuration().jidBare(), nodeName, itemId); }
+    inline QFuture<ItemResult<T>> requestPepItem(const QString &nodeName, StandardItemId itemId) { return requestItem<T>(client()->configuration().jidBare(), nodeName, itemId); }
     template<typename T = QXmppPubSubItem>
     inline QFuture<ItemsResult<T>> requestPepItems(const QString &nodeName) { return requestItems(client()->configuration().jidBare(), nodeName); }
     inline QFuture<ItemIdsResult> requestPepItemIds(const QString &nodeName) { return requestItemIds(client()->configuration().jidBare(), nodeName); }
@@ -189,9 +189,6 @@ QFuture<QXmppPubSubManager::ItemResult<T>> QXmppPubSubManager::requestItem(const
 ///
 /// Requests a specific item of an entity's node.
 ///
-/// The default value of itemId is used for singleton nodes (i.e., the node's
-/// single item is requested).
-///
 /// \param jid Jabber ID of the entity hosting the pubsub service. For PEP this
 /// should be an account's bare JID
 /// \param nodeName the name of the node to query
-- 
cgit v1.2.3