From e4ce1790b1a07d263dbbd22329c2b98a0322358c Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Fri, 20 Sep 2013 16:22:12 +0200 Subject: Remove some qSort usages from QTimeZone This is done per the mailing list discussion at http://www.mail-archive.com/development@qt-project.org/msg01603.html Change-Id: I974d41e986c67d1883c7d8dec879edd1fcbd08c2 Reviewed-by: John Layt --- src/corelib/tools/qtimezone.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/tools/qtimezone.cpp b/src/corelib/tools/qtimezone.cpp index f5f2b28b88..cdd0aba102 100644 --- a/src/corelib/tools/qtimezone.cpp +++ b/src/corelib/tools/qtimezone.cpp @@ -47,6 +47,8 @@ #include +#include + QT_BEGIN_NAMESPACE // Create default time zone using appropriate backend @@ -781,7 +783,7 @@ QList QTimeZone::availableTimeZoneIds() QSet set = QUtcTimeZonePrivate().availableTimeZoneIds() + global_tz->backend->availableTimeZoneIds(); QList list = set.toList(); - qSort(list); + std::sort(list.begin(), list.end()); return list; } @@ -801,7 +803,7 @@ QList QTimeZone::availableTimeZoneIds(QLocale::Country country) QSet set = QUtcTimeZonePrivate().availableTimeZoneIds(country) + global_tz->backend->availableTimeZoneIds(country); QList list = set.toList(); - qSort(list); + std::sort(list.begin(), list.end()); return list; } @@ -817,7 +819,7 @@ QList QTimeZone::availableTimeZoneIds(int offsetSeconds) QSet set = QUtcTimeZonePrivate().availableTimeZoneIds(offsetSeconds) + global_tz->backend->availableTimeZoneIds(offsetSeconds); QList list = set.toList(); - qSort(list); + std::sort(list.begin(), list.end()); return list; } -- cgit v1.2.3