From 724793e1a93c7be64b9324baa8a11662e61d3066 Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Thu, 12 Aug 2010 09:16:13 +0000
Subject: make it possible to specify the QSslSocket that a stream operates on

---
 src/QXmppClient.cpp | 2 +-
 src/QXmppStream.cpp | 4 ++--
 src/QXmppStream.h   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/QXmppClient.cpp b/src/QXmppClient.cpp
index e64b5648..b97d1780 100644
--- a/src/QXmppClient.cpp
+++ b/src/QXmppClient.cpp
@@ -97,7 +97,7 @@ QXmppClient::QXmppClient(QObject *parent)
     : QObject(parent),
     d(new QXmppClientPrivate)
 {
-    d->stream = new QXmppStream(this);
+    d->stream = new QXmppStream(new QSslSocket(this), this);
     d->clientPresence.setExtensions(d->stream->presenceExtensions());
 
     bool check = connect(d->stream, SIGNAL(elementReceived(const QDomElement&, bool&)),
diff --git a/src/QXmppStream.cpp b/src/QXmppStream.cpp
index af266cc5..c0eb8bdc 100644
--- a/src/QXmppStream.cpp
+++ b/src/QXmppStream.cpp
@@ -97,7 +97,7 @@ QXmppStreamPrivate::QXmppStreamPrivate()
 {
 }
 
-QXmppStream::QXmppStream(QObject *parent)
+QXmppStream::QXmppStream(QSslSocket *socket, QObject *parent)
     : QObject(parent),
     d(new QXmppStreamPrivate)
 {
@@ -108,7 +108,7 @@ QXmppStream::QXmppStream(QObject *parent)
     setLogger(QXmppLogger::getLogger());
 
     // create socket
-    d->socket = new QSslSocket(this);
+    d->socket = socket;
 
     bool check = QObject::connect(d->socket, SIGNAL(hostFound()),
                                   this, SLOT(socketHostFound()));
diff --git a/src/QXmppStream.h b/src/QXmppStream.h
index 0a597c2f..70fa7cc1 100644
--- a/src/QXmppStream.h
+++ b/src/QXmppStream.h
@@ -64,7 +64,7 @@ class QXmppStream : public QObject
     Q_OBJECT
 
 public:
-    QXmppStream(QObject *parent);
+    QXmppStream(QSslSocket *socket, QObject *parent);
     ~QXmppStream();
     void connect();
     void acceptSubscriptionRequest(const QString& from, bool accept = true);
-- 
cgit v1.2.3