diff options
| author | Jonas M. Gastal <jgastal@profusion.mobi> | 2011-12-29 12:47:21 -0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-09 19:17:47 +0100 |
| commit | 4669d657d29ae883db746b7cbfed367758943ee9 (patch) | |
| tree | 70821f1e14132dcf2ce89a19b9031578328f9fa2 /src/network/ssl | |
| parent | f74c49bbaf7979a4df15eb13556d91be20e9483e (diff) | |
Make (dis)connectTo(From)Host virtual in QAbstractSocket.
Change-Id: Ib1dfae4031f00fb331108152a259f6a2756381c9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/network/ssl')
| -rw-r--r-- | src/network/ssl/qsslsocket.cpp | 10 | ||||
| -rw-r--r-- | src/network/ssl/qsslsocket.h | 8 |
2 files changed, 8 insertions, 10 deletions
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index ef80dbdc54..b428316a77 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -1733,16 +1733,16 @@ void QSslSocket::ignoreSslErrors(const QList<QSslError> &errors) /*! \internal */ -void QSslSocket::connectToHostImplementation(const QString &hostName, quint16 port, - OpenMode openMode) +void QSslSocket::connectToHost(const QString &hostName, quint16 port, OpenMode openMode, NetworkLayerProtocol protocol) { Q_D(QSslSocket); + d->preferredNetworkLayerProtocol = protocol; if (!d->initialized) d->init(); d->initialized = false; #ifdef QSSLSOCKET_DEBUG - qDebug() << "QSslSocket::connectToHostImplementation(" + qDebug() << "QSslSocket::connectToHost(" << hostName << ',' << port << ',' << openMode << ')'; #endif if (!d->plainSocket) { @@ -1762,11 +1762,11 @@ void QSslSocket::connectToHostImplementation(const QString &hostName, quint16 po /*! \internal */ -void QSslSocket::disconnectFromHostImplementation() +void QSslSocket::disconnectFromHost() { Q_D(QSslSocket); #ifdef QSSLSOCKET_DEBUG - qDebug() << "QSslSocket::disconnectFromHostImplementation()"; + qDebug() << "QSslSocket::disconnectFromHost()"; #endif if (!d->plainSocket) return; diff --git a/src/network/ssl/qsslsocket.h b/src/network/ssl/qsslsocket.h index 7dc888b155..936f27905a 100644 --- a/src/network/ssl/qsslsocket.h +++ b/src/network/ssl/qsslsocket.h @@ -90,6 +90,9 @@ public: bool setSocketDescriptor(qintptr socketDescriptor, SocketState state = ConnectedState, OpenMode openMode = ReadWrite); + void connectToHost(const QString &hostName, quint16 port, OpenMode openMode = ReadWrite, NetworkLayerProtocol protocol = AnyIPProtocol); + void disconnectFromHost(); + // ### Qt 5: Make virtual void setSocketOption(QAbstractSocket::SocketOption option, const QVariant &value); QVariant socketOption(QAbstractSocket::SocketOption option); @@ -193,11 +196,6 @@ Q_SIGNALS: void modeChanged(QSslSocket::SslMode newMode); void encryptedBytesWritten(qint64 totalBytes); -protected Q_SLOTS: - void connectToHostImplementation(const QString &hostName, quint16 port, - OpenMode openMode); - void disconnectFromHostImplementation(); - protected: qint64 readData(char *data, qint64 maxlen); qint64 writeData(const char *data, qint64 len); |