summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2013-09-20 16:22:12 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-24 10:20:57 +0200
commite4ce1790b1a07d263dbbd22329c2b98a0322358c (patch)
tree6c6b07ed044465c06d503449b80ec75782ea6762 /src
parent72d6717b268e66e3ba8d222deb74513337368a60 (diff)
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 <jlayt@kde.org>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/tools/qtimezone.cpp8
1 files changed, 5 insertions, 3 deletions
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 <qdebug.h>
+#include <algorithm>
+
QT_BEGIN_NAMESPACE
// Create default time zone using appropriate backend
@@ -781,7 +783,7 @@ QList<QByteArray> QTimeZone::availableTimeZoneIds()
QSet<QByteArray> set = QUtcTimeZonePrivate().availableTimeZoneIds()
+ global_tz->backend->availableTimeZoneIds();
QList<QByteArray> list = set.toList();
- qSort(list);
+ std::sort(list.begin(), list.end());
return list;
}
@@ -801,7 +803,7 @@ QList<QByteArray> QTimeZone::availableTimeZoneIds(QLocale::Country country)
QSet<QByteArray> set = QUtcTimeZonePrivate().availableTimeZoneIds(country)
+ global_tz->backend->availableTimeZoneIds(country);
QList<QByteArray> list = set.toList();
- qSort(list);
+ std::sort(list.begin(), list.end());
return list;
}
@@ -817,7 +819,7 @@ QList<QByteArray> QTimeZone::availableTimeZoneIds(int offsetSeconds)
QSet<QByteArray> set = QUtcTimeZonePrivate().availableTimeZoneIds(offsetSeconds)
+ global_tz->backend->availableTimeZoneIds(offsetSeconds);
QList<QByteArray> list = set.toList();
- qSort(list);
+ std::sort(list.begin(), list.end());
return list;
}