qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Peter Hartmann 2011-07-11 11:35:53 +02:00 committed by Qt by Nokia
parent 968596588b
commit c299b4deac
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/network/ssl/qsslsocket.cpp
View File

@ -1606,7 +1606,7 @@ bool QSslSocket::supportsSsl()
*/ */
long QSslSocket::sslLibraryVersionNumber() long QSslSocket::sslLibraryVersionNumber()
{ {
return QSslSocketPrivate::opensslVersionNumber(); return QSslSocketPrivate::sslLibraryVersionNumber();
} }
/*! /*!
@ -1616,7 +1616,7 @@ long QSslSocket::sslLibraryVersionNumber()
*/ */
QString QSslSocket::sslLibraryVersionString() QString QSslSocket::sslLibraryVersionString()
{ {
return QSslSocketPrivate::opensslVersionString(); return QSslSocketPrivate::sslLibraryVersionString();
} }
/*! /*!

4
src/network/ssl/qsslsocket_openssl.cpp
View File

@ -602,12 +602,12 @@ void QSslSocketPrivate::ensureInitialized()
ensureCiphersAndCertsLoaded(); ensureCiphersAndCertsLoaded();
} }
long QSslSocketPrivate::opensslVersionNumber() long QSslSocketPrivate::sslLibraryVersionNumber()
{ {
return q_SSLeay(); return q_SSLeay();
} }
QString QSslSocketPrivate::opensslVersionString() QString QSslSocketPrivate::sslLibraryVersionString()
{ {
if (!supportsSsl()) if (!supportsSsl())
return QString(); return QString();

4
src/network/ssl/qsslsocket_p.h
View File

@ -116,8 +116,8 @@ public:
bool allowRootCertOnDemandLoading; bool allowRootCertOnDemandLoading;
static bool supportsSsl(); static bool supportsSsl();
static long opensslVersionNumber(); static long sslLibraryVersionNumber();
static QString opensslVersionString(); static QString sslLibraryVersionString();
static void ensureInitialized(); static void ensureInitialized();
static void deinitialize(); static void deinitialize();
static QList<QSslCipher> defaultCiphers(); static QList<QSslCipher> defaultCiphers();