make QXmppStream independent from QXmppClient

1 files changed, 5 insertions, 19 deletions

diff --git a/source/QXmppClient.cpp b/source/QXmppClient.cpp
index 3b514214..41e3d1b6 100644
--- a/source/QXmppClient.cpp
+++ b/source/QXmppClient.cpp
@@ -47,7 +47,11 @@ QXmppClient::QXmppClient(QObject *parent)
 {
     m_stream = new QXmppStream(this);
 
-    bool check = connect(m_stream, SIGNAL(messageReceived(const QXmppMessage&)),
+    bool check = connect(m_stream, SIGNAL(elementReceived(const QDomElement&, bool&)),
+                         this, SIGNAL(elementReceived(const QDomElement&, bool&)));
+    Q_ASSERT(check);
+
+    check = connect(m_stream, SIGNAL(messageReceived(const QXmppMessage&)),
                          this, SIGNAL(messageReceived(const QXmppMessage&)));
     Q_ASSERT(check);
 
@@ -536,24 +540,6 @@ QXmppTransferManager& QXmppClient::getTransferManager()
     return *m_transferManager;
 }
 
-/// Reimplement in your subclass of QXmppClient if you want to handle
-/// raw XML elements yourself.
-///
-/// WARNING: you can seriously disrupt packet handling when doing this,
-/// so use with care and at your own risk.
-/// 
-/// Return true if you handled the element yourself, or false if
-/// you want to use the default handling for the element.
-///
-/// If you handle the element yourself, QXmpp will do absolutely no
-/// processing itself, so do not expect the usual signals to trigger.
-
-bool QXmppClient::handleStreamElement(const QDomElement &element)
-{
-    Q_UNUSED(element);
-    return false;
-}
-
 /// Returns the QXmppLogger associated with the current QXmppClient.
 
 QXmppLogger *QXmppClient::logger()