Remove PubSubEventManager (in favour of EventHandler)

7 files changed, 25 insertions, 42 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 564a4443..85efa926 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -109,7 +109,6 @@ set(INSTALL_HEADER_FILES
     client/QXmppOutgoingClient.h
     client/QXmppRegistrationManager.h
     client/QXmppPubSubEventHandler.h
-    client/QXmppPubSubEventManager.h
     client/QXmppPubSubManager.h
     client/QXmppRemoteMethod.h
     client/QXmppRosterManager.h
@@ -224,7 +223,6 @@ set(SOURCE_FILES
     client/QXmppRosterManager.cpp
     client/QXmppRegistrationManager.cpp
     client/QXmppPubSubManager.cpp
-    client/QXmppPubSubEventManager.h # for MOC
     client/QXmppRemoteMethod.cpp
     client/QXmppRpcManager.cpp
     client/QXmppSendStanzaParams.cpp
diff --git a/src/client/QXmppPubSubEventManager.h b/src/client/QXmppPubSubEventManager.h
deleted file mode 100644
index d5a4e4e7..00000000
--- a/src/client/QXmppPubSubEventManager.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// SPDX-FileCopyrightText: 2020 Linus Jahn <lnj@kaidan.im>
-//
-// SPDX-License-Identifier: LGPL-2.1-or-later
-
-#ifndef QXMPPPUBSUBEVENTMANAGER_H
-#define QXMPPPUBSUBEVENTMANAGER_H
-
-#include "QXmppClient.h"
-#include "QXmppClientExtension.h"
-#include "QXmppPubSubEventHandler.h"
-
-class QXmppPubSubManager;
-
-class QXMPP_EXPORT QXmppPubSubEventManager : public QXmppClientExtension, public QXmppPubSubEventHandler
-{
-    Q_OBJECT
-
-public:
-    inline bool handleStanza(const QDomElement &) override
-    {
-        return false;
-    }
-
-protected:
-    inline QXmppPubSubManager *pubSub()
-    {
-        return client()->findExtension<QXmppPubSubManager>();
-    }
-};
-
-#endif
diff --git a/src/client/QXmppPubSubManager.cpp b/src/client/QXmppPubSubManager.cpp
index 2b7b4d71..7d21db80 100644
--- a/src/client/QXmppPubSubManager.cpp
+++ b/src/client/QXmppPubSubManager.cpp
@@ -9,7 +9,7 @@
 #include "QXmppClient.h"
 #include "QXmppConstants_p.h"
 #include "QXmppPubSubAffiliation.h"
-#include "QXmppPubSubEventManager.h"
+#include "QXmppPubSubEventHandler.h"
 #include "QXmppPubSubItem.h"
 #include "QXmppPubSubSubscribeOptions.h"
 #include "QXmppPubSubSubscription.h"
diff --git a/src/client/QXmppUserLocationManager.cpp b/src/client/QXmppUserLocationManager.cpp
index d85a47d5..5c79e6b7 100644
--- a/src/client/QXmppUserLocationManager.cpp
+++ b/src/client/QXmppUserLocationManager.cpp
@@ -11,6 +11,11 @@
 
 using namespace QXmpp::Private;
 
+static QXmppPubSubManager *pubSub(QXmppClient *client)
+{
+    return client->findExtension<QXmppPubSubManager>();
+}
+
 ///
 /// \class QXmppUserLocationManager
 ///
@@ -74,7 +79,7 @@ QStringList QXmppUserLocationManager::discoveryFeatures() const
 auto QXmppUserLocationManager::request(const QString &jid)
     -> QFuture<GetResult>
 {
-    return Pep::request<Item>(pubSub(), jid, ns_geoloc, this);
+    return Pep::request<Item>(pubSub(client()), jid, ns_geoloc, this);
 }
 
 ///
@@ -85,7 +90,7 @@ auto QXmppUserLocationManager::request(const QString &jid)
 auto QXmppUserLocationManager::publish(const QXmppGeolocItem &item)
     -> QFuture<PublishResult>
 {
-    return pubSub()->publishPepItem(ns_geoloc, item);
+    return pubSub(client())->publishPepItem(ns_geoloc, item);
 }
 
 /// \cond
diff --git a/src/client/QXmppUserLocationManager.h b/src/client/QXmppUserLocationManager.h
index 9033d512..bc455d86 100644
--- a/src/client/QXmppUserLocationManager.h
+++ b/src/client/QXmppUserLocationManager.h
@@ -6,13 +6,16 @@
 #ifndef QXMPPUSERLOCATIONMANAGER_H
 #define QXMPPUSERLOCATIONMANAGER_H
 
-#include "QXmppPubSubEventManager.h"
+#include "QXmppClientExtension.h"
+#include "QXmppPubSubEventHandler.h"
 
 #include <variant>
 
+template<typename T>
+class QFuture;
 class QXmppGeolocItem;
 
-class QXMPP_EXPORT QXmppUserLocationManager : public QXmppPubSubEventManager
+class QXMPP_EXPORT QXmppUserLocationManager : public QXmppClientExtension, public QXmppPubSubEventHandler
 {
     Q_OBJECT
 
diff --git a/src/client/QXmppUserTuneManager.cpp b/src/client/QXmppUserTuneManager.cpp
index 848d62c1..f9b527a0 100644
--- a/src/client/QXmppUserTuneManager.cpp
+++ b/src/client/QXmppUserTuneManager.cpp
@@ -10,6 +10,11 @@
 
 using namespace QXmpp::Private;
 
+static QXmppPubSubManager *pubSub(QXmppClient *client)
+{
+    return client->findExtension<QXmppPubSubManager>();
+}
+
 ///
 /// \class QXmppUserTuneManager
 ///
@@ -75,7 +80,7 @@ QStringList QXmppUserTuneManager::discoveryFeatures() const
 auto QXmppUserTuneManager::request(const QString &jid)
     -> QFuture<GetResult>
 {
-    return Pep::request<Item>(pubSub(), jid, ns_tune, this);
+    return Pep::request<Item>(pubSub(client()), jid, ns_tune, this);
 }
 
 ///
@@ -86,7 +91,7 @@ auto QXmppUserTuneManager::request(const QString &jid)
 auto QXmppUserTuneManager::publish(const QXmppTuneItem &item)
     -> QFuture<PublishResult>
 {
-    return pubSub()->publishPepItem(ns_tune, item);
+    return pubSub(client())->publishPepItem(ns_tune, item);
 }
 
 /// \cond
diff --git a/src/client/QXmppUserTuneManager.h b/src/client/QXmppUserTuneManager.h
index 21013e33..b25d1b00 100644
--- a/src/client/QXmppUserTuneManager.h
+++ b/src/client/QXmppUserTuneManager.h
@@ -5,13 +5,16 @@
 #ifndef QXMPPUSERTUNEMANAGER_H
 #define QXMPPUSERTUNEMANAGER_H
 
-#include "QXmppPubSubEventManager.h"
+#include "QXmppClientExtension.h"
+#include "QXmppPubSubEventHandler.h"
 
 #include <variant>
 
 class QXmppTuneItem;
+template<typename T>
+class QFuture;
 
-class QXMPP_EXPORT QXmppUserTuneManager : public QXmppPubSubEventManager
+class QXMPP_EXPORT QXmppUserTuneManager : public QXmppClientExtension, public QXmppPubSubEventHandler
 {
     Q_OBJECT