client module: Move deprecated functions into new removed_api.cpp

src/CMakeLists.txt

@@ -274,6 +274,7 @@ set(SOURCE_FILES
     client/QXmppUserTuneManager.cpp
     client/QXmppVCardManager.cpp
     client/QXmppVersionManager.cpp
+    client/compat/removed_api.cpp
 
     # Server
     server/QXmppDialback.cpp

src/client/QXmppClient.cpp

@@ -717,19 +717,6 @@ QXmppClient::StreamManagementState QXmppClient::streamManagementState() const
     return NoStreamManagement;
 }
 
-/// Returns the reference to QXmppRosterManager object of the client.
-///
-/// \return Reference to the roster object of the connected client. Use this to
-/// get the list of friends in the roster and their presence information.
-///
-/// \deprecated This method is deprecated since QXmpp 1.1. Use
-/// \c QXmppClient::findExtension<QXmppRosterManager>() instead.
-
-QXmppRosterManager &QXmppClient::rosterManager()
-{
-    return *findExtension<QXmppRosterManager>();
-}
-
 /// Utility function to send message to all the resources associated with the
 /// specified bareJid. If there are no resources available, that is the contact
 /// is offline or not present in the roster, it will still send a message to
@@ -840,30 +827,6 @@ QXmppStanza::Error::Condition QXmppClient::xmppStreamError()
     return d->stream->xmppStreamError();
 }
 
-///
-/// Returns the reference to QXmppVCardManager, implementation of \xep{0054}.
-/// http://xmpp.org/extensions/xep-0054.html
-///
-/// \deprecated This method is deprecated since QXmpp 1.1. Use
-/// \c QXmppClient::findExtension<QXmppVCardManager>() instead.
-///
-QXmppVCardManager &QXmppClient::vCardManager()
-{
-    return *findExtension<QXmppVCardManager>();
-}
-
-///
-/// Returns the reference to QXmppVersionManager, implementation of \xep{0092}.
-/// http://xmpp.org/extensions/xep-0092.html
-///
-/// \deprecated This method is deprecated since QXmpp 1.1. Use
-/// \c QXmppClient::findExtension<QXmppVersionManager>() instead.
-///
-QXmppVersionManager &QXmppClient::versionManager()
-{
-    return *findExtension<QXmppVersionManager>();
-}
-
 void QXmppClient::injectIq(const QDomElement &element, const std::optional<QXmppE2eeMetadata> &e2eeMetadata)
 {
     if (element.tagName() != u"iq") {

src/client/QXmppClientExtension.cpp

@@ -32,27 +32,6 @@ QList<QXmppDiscoveryIq::Identity> QXmppClientExtension::discoveryIdentities() co
     return QList<QXmppDiscoveryIq::Identity>();
 }
 
-///
-/// \brief You need to implement this method to process incoming XMPP
-/// stanzas.
-///
-/// You should return true if the stanza was handled and no further
-/// processing should occur, or false to let other extensions process
-/// the stanza.
-///
-/// End-to-end encrypted stanzas are not passed to this overload, for that
-/// purpose use the new overload instead.
-///
-/// \deprecated This is deprecated since QXmpp 1.5. Please use
-/// QXmppClientExtension::handleStanza(const QDomElement &stanza,
-/// const std::optional<QXmppE2eeMetadata> &e2eeMetadata).
-/// Currently both methods are called by the client, so only implement one!
-///
-bool QXmppClientExtension::handleStanza(const QDomElement &)
-{
-    return false;
-}
-
 ///
 /// \brief You need to implement this method to process incoming XMPP
 /// stanzas.

src/client/compat/removed_api.cpp

@@ -0,0 +1,65 @@
+// SPDX-FileCopyrightText: 2009 Manjeet Dahiya <[email protected]>
+//
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+#include "QXmppClient.h"
+#include "QXmppRosterManager.h"
+#include "QXmppVCardManager.h"
+#include "QXmppVersionManager.h"
+
+///
+/// \brief You need to implement this method to process incoming XMPP
+/// stanzas.
+///
+/// You should return true if the stanza was handled and no further
+/// processing should occur, or false to let other extensions process
+/// the stanza.
+///
+/// End-to-end encrypted stanzas are not passed to this overload, for that
+/// purpose use the new overload instead.
+///
+/// \deprecated This is deprecated since QXmpp 1.5. Please use
+/// QXmppClientExtension::handleStanza(const QDomElement &stanza,
+/// const std::optional<QXmppE2eeMetadata> &e2eeMetadata).
+/// Currently both methods are called by the client, so only implement one!
+///
+bool QXmppClientExtension::handleStanza(const QDomElement &)
+{
+    return false;
+}
+
+///
+/// Returns the reference to QXmppRosterManager object of the client.
+///
+/// \return Reference to the roster object of the connected client. Use this to
+/// get the list of friends in the roster and their presence information.
+///
+/// \deprecated This method is deprecated since QXmpp 1.1. Use
+/// \c QXmppClient::findExtension<QXmppRosterManager>() instead.
+///
+QXmppRosterManager &QXmppClient::rosterManager()
+{
+    return *findExtension<QXmppRosterManager>();
+}
+
+///
+/// Returns the reference to QXmppVCardManager, implementation of \xep{0054}.
+///
+/// \deprecated This method is deprecated since QXmpp 1.1. Use
+/// \c QXmppClient::findExtension<QXmppVCardManager>() instead.
+///
+QXmppVCardManager &QXmppClient::vCardManager()
+{
+    return *findExtension<QXmppVCardManager>();
+}
+
+///
+/// Returns the reference to QXmppVersionManager, implementation of \xep{0092}.
+///
+/// \deprecated This method is deprecated since QXmpp 1.1. Use
+/// \c QXmppClient::findExtension<QXmppVersionManager>() instead.
+///
+QXmppVersionManager &QXmppClient::versionManager()
+{
+    return *findExtension<QXmppVersionManager>();
+}