PubSubManager: Inline PEP requests

2 files changed, 15 insertions, 23 deletions

diff --git a/src/client/QXmppPubSubManager.cpp b/src/client/QXmppPubSubManager.cpp
index 1b188c64..c28df7f3 100644
--- a/src/client/QXmppPubSubManager.cpp
+++ b/src/client/QXmppPubSubManager.cpp
@@ -473,6 +473,8 @@ QFuture<QXmppPubSubManager::Result> QXmppPubSubManager::setSubscribeOptions(cons
 }
 
 ///
+/// \fn QXmppPubSubManager::createPepNode
+///
 /// Creates an empty PEP node with the default configuration.
 ///
 /// This is a convenience method equivalent to calling
@@ -485,12 +487,10 @@ QFuture<QXmppPubSubManager::Result> QXmppPubSubManager::setSubscribeOptions(cons
 /// \param nodeName the name of the PEP node to be created
 /// \return
 ///
-auto QXmppPubSubManager::createPepNode(const QString &nodeName) -> QFuture<Result>
-{
-    return createNode(client()->configuration().jidBare(), nodeName);
-}
 
 ///
+/// \fn QXmppPubSubManager::deletePepNode
+///
 /// Deletes a PEP node.
 ///
 /// This is a convenience method equivalent to calling
@@ -500,12 +500,10 @@ auto QXmppPubSubManager::createPepNode(const QString &nodeName) -> QFuture<Resul
 /// items
 /// \return
 ///
-auto QXmppPubSubManager::deletePepNode(const QString &nodeName) -> QFuture<Result>
-{
-    return deleteNode(client()->configuration().jidBare(), nodeName);
-}
 
 ///
+/// \fn QXmppPubSubManager::retractPepItem
+///
 /// Deletes an item from a PEP node.
 ///
 /// This is a convenience method equivalent to calling
@@ -515,12 +513,10 @@ auto QXmppPubSubManager::deletePepNode(const QString &nodeName) -> QFuture<Resul
 /// \param itemId the ID of the item to delete
 /// \return
 ///
-auto QXmppPubSubManager::retractPepItem(const QString &nodeName, const QString &itemId) -> QFuture<Result>
-{
-    return retractItem(client()->configuration().jidBare(), nodeName, itemId);
-}
 
 ///
+/// \fn QXmppPubSubManager::purgePepItems
+///
 /// Purges all items from a PEP node.
 ///
 /// This is a convenience method equivalent to calling
@@ -530,10 +526,6 @@ auto QXmppPubSubManager::retractPepItem(const QString &nodeName, const QString &
 /// items
 /// \return
 ///
-auto QXmppPubSubManager::purgePepItems(const QString &nodeName) -> QFuture<Result>
-{
-    return purgeItems(client()->configuration().jidBare(), nodeName);
-}
 
 /// \cond
 QStringList QXmppPubSubManager::discoveryFeatures() const
diff --git a/src/client/QXmppPubSubManager.h b/src/client/QXmppPubSubManager.h
index 81112353..26ff7aaf 100644
--- a/src/client/QXmppPubSubManager.h
+++ b/src/client/QXmppPubSubManager.h
@@ -98,8 +98,8 @@ public:
     QFuture<Result> setSubscribeOptions(const QString &service, const QString &nodeName, const QXmppPubSubSubscribeOptions &options, const QString &subscriberJid);
 
     // PEP-specific (the PubSub service is the current account)
-    QFuture<Result> createPepNode(const QString &nodeName);
-    QFuture<Result> deletePepNode(const QString &nodeName);
+    inline QFuture<Result> createPepNode(const QString &nodeName) { return createNode(client()->configuration().jidBare(), nodeName); }
+    inline QFuture<Result> deletePepNode(const QString &nodeName) { return deleteNode(client()->configuration().jidBare(), nodeName); }
     template<typename T>
     QFuture<PublishItemResult> publishPepItem(const QString &nodeName, const T &item, const QXmppPubSubPublishOptions &publishOptions);
     template<typename T>
@@ -108,8 +108,8 @@ public:
     QFuture<PublishItemsResult> publishPepItems(const QString &nodeName, const QVector<T> &items, const QXmppPubSubPublishOptions &publishOptions);
     template<typename T>
     QFuture<PublishItemsResult> publishPepItems(const QString &nodeName, const QVector<T> &items);
-    QFuture<Result> retractPepItem(const QString &nodeName, const QString &itemId);
-    QFuture<Result> purgePepItems(const QString &nodeName);
+    inline QFuture<Result> retractPepItem(const QString &nodeName, const QString &itemId) { return retractItem(client()->configuration().jidBare(), nodeName, itemId); }
+    inline QFuture<Result> purgePepItems(const QString &nodeName) { return purgeItems(client()->configuration().jidBare(), nodeName); }
 
     /// \cond
     QStringList discoveryFeatures() const override;
@@ -210,7 +210,7 @@ QFuture<QXmppPubSubManager::PublishItemResult> QXmppPubSubManager::publishItem(c
 {
     QXmppPubSubIq<T> request;
     request.setTo(jid);
-    request.setItems({item});
+    request.setItems({ item });
     request.setQueryNode(nodeName);
     return publishItem(std::move(request));
 }
@@ -235,7 +235,7 @@ QFuture<QXmppPubSubManager::PublishItemResult> QXmppPubSubManager::publishItem(c
 {
     QXmppPubSubIq<T> request;
     request.setTo(jid);
-    request.setItems({item});
+    request.setItems({ item });
     request.setQueryNode(nodeName);
     request.setDataForm(publishOptions.toDataForm());
     return publishItem(std::move(request));
@@ -339,4 +339,4 @@ QFuture<QXmppPubSubManager::PublishItemsResult> QXmppPubSubManager::publishPepIt
     return publishItems(client()->configuration().jidBare(), nodeName, items);
 }
 
-#endif // QXMPPPUBSUBMANAGER_H
+#endif  // QXMPPPUBSUBMANAGER_H