[Kde-bindings] Fwd: [kdelibs/KDE/4.8] kdecore/network: Added functions for retreiving and setting QSslConfiguration information.
Allen Winter
winter at kde.org
Wed May 30 12:35:13 UTC 2012
This looks like a public API change.
We are in soft API freeze so this is allowed, but we also need to notify kde-bindings just in case.
-Allen
On Wednesday 30 May 2012 2:32:20 AM Dawit Alemayehu wrote:
> Git commit f5939816dec4f5f86ce5c1c94b6891a24b71ef12 by Dawit Alemayehu.
> Committed on 19/05/2012 at 08:04.
> Pushed by adawit into branch 'KDE/4.8'.
>
> Added functions for retreiving and setting QSslConfiguration information.
>
> REVIEW: 104958
>
> M +10 -0 kdecore/network/ktcpsocket.cpp
> M +15 -1 kdecore/network/ktcpsocket.h
>
> http://commits.kde.org/kdelibs/f5939816dec4f5f86ce5c1c94b6891a24b71ef12
>
> diff --git a/kdecore/network/ktcpsocket.cpp b/kdecore/network/ktcpsocket.cpp
> index 57d54a9..8da620a 100644
> --- a/kdecore/network/ktcpsocket.cpp
> +++ b/kdecore/network/ktcpsocket.cpp
> @@ -807,6 +807,16 @@ void KTcpSocket::setSocketOption(QAbstractSocket::SocketOption options, const QV
> d->sock.setSocketOption(options, value);
> }
>
> +QSslConfiguration KTcpSocket::sslConfiguration() const
> +{
> + return d->sock.sslConfiguration();
> +}
> +
> +void KTcpSocket::setSslConfiguration (const QSslConfiguration& configuration)
> +{
> + d->sock.setSslConfiguration(configuration);
> +}
> +
> //slot
> void KTcpSocket::ignoreSslErrors()
> {
> diff --git a/kdecore/network/ktcpsocket.h b/kdecore/network/ktcpsocket.h
> index 982e5b1..58dfa2c 100644
> --- a/kdecore/network/ktcpsocket.h
> +++ b/kdecore/network/ktcpsocket.h
> @@ -22,7 +22,7 @@
> #define KTCPSOCKET_H
>
> #include <QtNetwork/QSslSocket>
> -//#include <QtCore/QRegExp>
> +#include <QtNetwork/QSslConfiguration>
>
> #include "kdecore_export.h"
>
> @@ -336,6 +336,20 @@ public:
> */
> void setSocketOption(QAbstractSocket::SocketOption options, const QVariant &value);
>
> + /**
> + * Returns the socket's SSL configuration.
> + *
> + * @since 4.8.4
> + */
> + QSslConfiguration sslConfiguration() const;
> +
> + /**
> + * Sets the socket's SSL configuration.
> + *
> + * @since 4.8.4
> + */
> + void setSslConfiguration(const QSslConfiguration& configuration);
> +
> Q_SIGNALS:
> //from QAbstractSocket
> void connected();
>
>
More information about the Kde-bindings
mailing list