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>
bb10
Giuseppe D'Angelo 2013-09-20 16:22:12 +02:00 committed by The Qt Project
parent 72d6717b26
commit e4ce1790b1
1 changed files with 5 additions and 3 deletions

View File

@ -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;
}