summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorPeter Hartmann <peter.hartmann@nokia.com>2011-07-11 11:35:53 +0200
committerQt by Nokia <qt-info@nokia.com>2011-07-11 15:52:33 +0200
commitc299b4deac512f3d80c840e5eef2f18b2bc0b43c (patch)
tree584a831de6a1ba80f09d65964d97dcce00ae98be /src/network
parent968596588b2b919aeccef64c2f932dca3e12b72a (diff)
SSL internals: rename methods in the SSL backend to reflect public ones
Change-Id: I234c740b1acbfea670d6170332626f5e3ba49328 Reviewed-on: http://codereview.qt.nokia.com/1437 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
Diffstat (limited to 'src/network')
-rw-r--r--src/network/ssl/qsslsocket.cpp4
-rw-r--r--src/network/ssl/qsslsocket_openssl.cpp4
-rw-r--r--src/network/ssl/qsslsocket_p.h4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
index 20e520a3d5..294e2508d8 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -1606,7 +1606,7 @@ bool QSslSocket::supportsSsl()
*/
long QSslSocket::sslLibraryVersionNumber()
{
- return QSslSocketPrivate::opensslVersionNumber();
+ return QSslSocketPrivate::sslLibraryVersionNumber();
}
/*!
@@ -1616,7 +1616,7 @@ long QSslSocket::sslLibraryVersionNumber()
*/
QString QSslSocket::sslLibraryVersionString()
{
- return QSslSocketPrivate::opensslVersionString();
+ return QSslSocketPrivate::sslLibraryVersionString();
}
/*!
diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
index b87570b7bf..c7e938a705 100644
--- a/src/network/ssl/qsslsocket_openssl.cpp
+++ b/src/network/ssl/qsslsocket_openssl.cpp
@@ -602,12 +602,12 @@ void QSslSocketPrivate::ensureInitialized()
ensureCiphersAndCertsLoaded();
}
-long QSslSocketPrivate::opensslVersionNumber()
+long QSslSocketPrivate::sslLibraryVersionNumber()
{
return q_SSLeay();
}
-QString QSslSocketPrivate::opensslVersionString()
+QString QSslSocketPrivate::sslLibraryVersionString()
{
if (!supportsSsl())
return QString();
diff --git a/src/network/ssl/qsslsocket_p.h b/src/network/ssl/qsslsocket_p.h
index c8ab820639..b1dc656e88 100644
--- a/src/network/ssl/qsslsocket_p.h
+++ b/src/network/ssl/qsslsocket_p.h
@@ -116,8 +116,8 @@ public:
bool allowRootCertOnDemandLoading;
static bool supportsSsl();
- static long opensslVersionNumber();
- static QString opensslVersionString();
+ static long sslLibraryVersionNumber();
+ static QString sslLibraryVersionString();
static void ensureInitialized();
static void deinitialize();
static QList<QSslCipher> defaultCiphers();