From fd81b0d61e00f085bfb813959e24aa523ac143f9 Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Fri, 4 Jun 2010 11:55:51 +0000
Subject: move roster ownership to QXmppClient, so that a QXmppStream can be
 created without a roster manager

---
 source/QXmppStream.cpp | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'source/QXmppStream.cpp')

diff --git a/source/QXmppStream.cpp b/source/QXmppStream.cpp
index 1f99fdfb..7d6a0190 100644
--- a/source/QXmppStream.cpp
+++ b/source/QXmppStream.cpp
@@ -26,26 +26,27 @@
 #include "QXmppPacket.h"
 #include "QXmppUtils.h"
 #include "QXmppClient.h"
-#include "QXmppRoster.h"
 #include "QXmppPresence.h"
 #include "QXmppIq.h"
 #include "QXmppBind.h"
 #include "QXmppSession.h"
-#include "QXmppRosterIq.h"
 #include "QXmppMessage.h"
 #include "QXmppConstants.h"
 #include "QXmppVCard.h"
 #include "QXmppNonSASLAuth.h"
 #include "QXmppInformationRequestResult.h"
-#include "QXmppIbbIq.h"
-#include "QXmppRpcIq.h"
+#include "QXmppTransferManager.h"
+
+// IQ types
 #include "QXmppArchiveIq.h"
 #include "QXmppByteStreamIq.h"
 #include "QXmppDiscoveryIq.h"
-#include "QXmppPingIq.h"
+#include "QXmppIbbIq.h"
 #include "QXmppLogger.h"
+#include "QXmppPingIq.h"
+#include "QXmppRpcIq.h"
+#include "QXmppRosterIq.h"
 #include "QXmppStreamInitiationIq.h"
-#include "QXmppTransferManager.h"
 #include "QXmppVersionIq.h"
 
 #include <QCoreApplication>
@@ -60,7 +61,7 @@ static const QByteArray streamRootElementStart = "<?xml version=\"1.0\"?><stream
 static const QByteArray streamRootElementEnd = "</stream:stream>";
 
 QXmppStream::QXmppStream(QXmppClient* client)
-    : QObject(client), m_client(client), m_roster(this),
+    : QObject(client), m_client(client),
     m_sessionAvaliable(false),
     m_archiveManager(m_client),
     m_transferManager(m_client),
@@ -989,11 +990,6 @@ bool QXmppStream::isConnected() const
     return m_socket.state() == QAbstractSocket::ConnectedState;
 }
 
-QXmppRoster& QXmppStream::getRoster()
-{
-    return m_roster;
-}
-
 bool QXmppStream::sendPacket(const QXmppPacket& packet)
 {
     // prepare packet
-- 
cgit v1.2.3