From b3115a90b058d05b2580f0f34b402c94e605fc92 Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Mon, 13 Dec 2010 08:23:09 +0000
Subject: remove traces of RPC code from QXmppClient

---
 src/QXmppClient.cpp | 32 ++------------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

(limited to 'src/QXmppClient.cpp')

diff --git a/src/QXmppClient.cpp b/src/QXmppClient.cpp
index 2a02c390..96f5e27f 100644
--- a/src/QXmppClient.cpp
+++ b/src/QXmppClient.cpp
@@ -24,25 +24,22 @@
 
 #include "QXmppClient.h"
 #include "QXmppClientExtension.h"
+#include "QXmppConstants.h"
 #include "QXmppLogger.h"
 #include "QXmppOutgoingClient.h"
 #include "QXmppMessage.h"
+#include "QXmppUtils.h"
 
 #include "QXmppArchiveManager.h"
-#include "QXmppInvokable.h"
 #include "QXmppMucManager.h"
 #include "QXmppReconnectionManager.h"
-#include "QXmppRpcManager.h"
-#include "QXmppRemoteMethod.h"
 #include "QXmppRosterManager.h"
-#include "QXmppUtils.h"
 #include "QXmppTransferManager.h"
 #include "QXmppVCardManager.h"
 #include "QXmppVersionManager.h"
 #include "QXmppEntityTimeManager.h"
 #include "QXmppDiscoveryManager.h"
 #include "QXmppDiscoveryIq.h"
-#include "QXmppConstants.h"
 
 class QXmppClientPrivate
 {
@@ -59,7 +56,6 @@ public:
     QXmppMucManager *mucManager;          ///< Pointer to the multi-user chat manager
     QXmppReconnectionManager *reconnectionManager;    ///< Pointer to the reconnection manager
     QXmppRosterManager *rosterManager;    ///< Pointer to the roster manager
-    QXmppRpcManager *rpcManager;    ///< Pointer to the RPC manager
     QXmppTransferManager *transferManager;///< Pointer to the transfer manager
     QXmppVCardManager *vCardManager;      ///< Pointer to the vCard manager
     QXmppVersionManager *versionManager;      ///< Pointer to the version manager
@@ -183,9 +179,6 @@ QXmppClient::QXmppClient(QObject *parent)
     d->rosterManager = new QXmppRosterManager(this);
     addExtension(d->rosterManager);
 
-    d->rpcManager = new QXmppRpcManager;
-    addExtension(d->rpcManager);
-
     d->archiveManager = new QXmppArchiveManager;
     addExtension(d->archiveManager);
 
@@ -592,27 +585,6 @@ void QXmppClient::slotElementReceived(const QDomElement &element, bool &handled)
     }
 }
 
-void QXmppClient::addInvokableInterface( QXmppInvokable *interface )
-{
-    d->rpcManager->addInvokableInterface(interface);
-}
-
-QXmppRemoteMethodResult QXmppClient::callRemoteMethod( const QString &jid,
-                                          const QString &interface,
-                                          const QVariant &arg1,
-                                          const QVariant &arg2,
-                                          const QVariant &arg3,
-                                          const QVariant &arg4,
-                                          const QVariant &arg5,
-                                          const QVariant &arg6,
-                                          const QVariant &arg7,
-                                          const QVariant &arg8,
-                                          const QVariant &arg9,
-                                          const QVariant &arg10 )
-{
-    return d->rpcManager->callRemoteMethod(jid, interface, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
-}
-
 /// Returns the reference to QXmppArchiveManager, implementation of XEP-0136.
 /// http://xmpp.org/extensions/xep-0136.html
 ///
-- 
cgit v1.2.3