diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2010-08-12 09:16:13 +0000 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2010-08-12 09:16:13 +0000 |
| commit | 724793e1a93c7be64b9324baa8a11662e61d3066 (patch) | |
| tree | a746f99ad0d8c9348ca7dbb61ae908e5f21a9b24 /src | |
| parent | 73bf9fb779ee4cb2c203caea847fd524b7c9ba3e (diff) | |
| download | qxmpp-724793e1a93c7be64b9324baa8a11662e61d3066.tar.gz | |
make it possible to specify the QSslSocket that a stream operates on
Diffstat (limited to 'src')
| -rw-r--r-- | src/QXmppClient.cpp | 2 | ||||
| -rw-r--r-- | src/QXmppStream.cpp | 4 | ||||
| -rw-r--r-- | src/QXmppStream.h | 2 |
3 files changed, 4 insertions, 4 deletions
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); |
