PubSubManager: Make requestFeatures() API private

This kind of task should be done by the DiscoveryManager. For now we
still need it, but I don't want to make it official API.

2 files changed, 11 insertions, 2 deletions

diff --git a/src/client/QXmppPubSubManager.cpp b/src/client/QXmppPubSubManager.cpp
index 07dbff35..9b416a26 100644
--- a/src/client/QXmppPubSubManager.cpp
+++ b/src/client/QXmppPubSubManager.cpp
@@ -196,6 +196,7 @@ QXmppPubSubManager::~QXmppPubSubManager()
 {
 }
 
+/// \cond
 ///
 /// Requests all features of a pubsub service and checks the identities via service discovery.
 ///
@@ -247,6 +248,7 @@ QFuture<QXmppPubSubManager::FeaturesResult> QXmppPubSubManager::requestFeatures(
         return InvalidServiceType();
     });
 }
+/// \endcond
 
 ///
 /// Requests all listed nodes of a pubsub service via service discovery.
@@ -759,6 +761,7 @@ QFuture<QXmppPubSubManager::Result> QXmppPubSubManager::unsubscribeFromNode(cons
     return client()->sendGenericIq(std::move(request));
 }
 
+/// \cond
 ///
 /// \fn QXmppPubSubManager::requestPepFeatures()
 ///
@@ -769,6 +772,7 @@ QFuture<QXmppPubSubManager::Result> QXmppPubSubManager::unsubscribeFromNode(cons
 ///
 /// \warning THIS API IS NOT FINALIZED YET!
 ///
+/// \endcond
 
 ///
 ///
diff --git a/src/client/QXmppPubSubManager.h b/src/client/QXmppPubSubManager.h
index 37649358..0d031664 100644
--- a/src/client/QXmppPubSubManager.h
+++ b/src/client/QXmppPubSubManager.h
@@ -75,7 +75,6 @@ public:
     ~QXmppPubSubManager();
 
     // Generic PubSub (the PubSub service is the given entity)
-    QFuture<FeaturesResult> requestFeatures(const QString &serviceJid, ServiceType serviceType = PubSubOrPep);
     QFuture<NodesResult> fetchNodes(const QString &jid);
     QFuture<Result> createNode(const QString &jid, const QString &nodeName);
     QFuture<Result> createNode(const QString &jid, const QString &nodeName, const QXmppPubSubNodeConfig &config);
@@ -118,7 +117,6 @@ public:
     QFuture<Result> unsubscribeFromNode(const QString &serviceJid, const QString &nodeName, const QString &subscriberJid);
 
     // PEP-specific (the PubSub service is the current account)
-    inline QFuture<FeaturesResult> requestPepFeatures() { return requestFeatures(client()->configuration().jidBare(), Pep); };
     inline QFuture<NodesResult> fetchPepNodes() { return fetchNodes(client()->configuration().jidBare()); };
     inline QFuture<Result> createPepNode(const QString &nodeName) { return createNode(client()->configuration().jidBare(), nodeName); }
     inline QFuture<Result> createPepNode(const QString &nodeName, const QXmppPubSubNodeConfig &config) { return createNode(client()->configuration().jidBare(), nodeName, config); }
@@ -153,6 +151,13 @@ public:
     /// \endcond
 
 private:
+    // for private requestFeatures() API
+    friend class tst_QXmppPubSubManager;
+    friend class QXmppOmemoManagerPrivate;
+
+    QFuture<FeaturesResult> requestFeatures(const QString &serviceJid, ServiceType serviceType = PubSubOrPep);
+    QFuture<FeaturesResult> requestPepFeatures() { return requestFeatures(client()->configuration().jidBare(), Pep); };
+
     QFuture<PublishItemResult> publishItem(QXmpp::Private::PubSubIqBase &&iq);
     QFuture<PublishItemsResult> publishItems(QXmpp::Private::PubSubIqBase &&iq);
     static QXmpp::Private::PubSubIq<> requestItemsIq(const QString &jid, const QString &nodeName, const QStringList &itemIds);