diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2012-11-02 00:04:13 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-08 15:06:03 +0100 |
| commit | 33ffbf21e0a35debd30579e1bd7f55cb5cae37bc (patch) | |
| tree | a8926ae6cd5705e1f0f810e9ee1fa813f78b91c5 /src/network/ssl | |
| parent | 6e7ab54862e299dcc0de40c9541f340273d91de1 (diff) | |
Remove qSort usages from SSL code
Change-Id: Ie080cd3d0a6ac37fad625759946a71134c989c83
Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'src/network/ssl')
| -rw-r--r-- | src/network/ssl/qsslsocket_openssl_symbols.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp index 398a3d447e..eeae9d461f 100644 --- a/src/network/ssl/qsslsocket_openssl_symbols.cpp +++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp @@ -57,6 +57,8 @@ #include <link.h> #endif +#include <algorithm> + QT_BEGIN_NAMESPACE /* @@ -410,7 +412,7 @@ static QStringList findAllLibSsl() QDir dir(path); QStringList entryList = dir.entryList(QStringList() << QLatin1String("libssl.*"), QDir::Files); - qSort(entryList.begin(), entryList.end(), libGreaterThan); + std::sort(entryList.begin(), entryList.end(), libGreaterThan); foreach (const QString &entry, entryList) foundSsls << path + QLatin1Char('/') + entry; } @@ -427,7 +429,7 @@ static QStringList findAllLibCrypto() QDir dir(path); QStringList entryList = dir.entryList(QStringList() << QLatin1String("libcrypto.*"), QDir::Files); - qSort(entryList.begin(), entryList.end(), libGreaterThan); + std::sort(entryList.begin(), entryList.end(), libGreaterThan); foreach (const QString &entry, entryList) foundCryptos << path + QLatin1Char('/') + entry; } |