diff options
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/kernel/qdnslookup.cpp | 6 | ||||
| -rw-r--r-- | src/network/ssl/qsslsocket_openssl_symbols.cpp | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/network/kernel/qdnslookup.cpp b/src/network/kernel/qdnslookup.cpp index a49301f27b..85aaa096c1 100644 --- a/src/network/kernel/qdnslookup.cpp +++ b/src/network/kernel/qdnslookup.cpp @@ -47,6 +47,8 @@ #include <qthreadstorage.h> #include <qurl.h> +#include <algorithm> + QT_BEGIN_NAMESPACE Q_GLOBAL_STATIC(QDnsLookupThreadPool, theDnsLookupThreadPool); @@ -69,7 +71,7 @@ static void qt_qdnsmailexchangerecord_sort(QList<QDnsMailExchangeRecord> &record return; // Order the records by preference. - qSort(records.begin(), records.end(), qt_qdnsmailexchangerecord_less_than); + std::sort(records.begin(), records.end(), qt_qdnsmailexchangerecord_less_than); int i = 0; while (i < records.size()) { @@ -112,7 +114,7 @@ static void qt_qdnsservicerecord_sort(QList<QDnsServiceRecord> &records) // Order the records by priority, and for records with an equal // priority, put records with a zero weight first. - qSort(records.begin(), records.end(), qt_qdnsservicerecord_less_than); + std::sort(records.begin(), records.end(), qt_qdnsservicerecord_less_than); int i = 0; while (i < records.size()) { 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; } |