diff options
author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-09-03 00:04:10 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-05 23:20:09 +0200 |
commit | aa3f358d433ec7fbe0237141c22297f3d8d4120d (patch) | |
tree | 924e0f4387f601cf1183d0dbfa5433f641dc7a96 /src/gui/text/qfontdatabase.cpp | |
parent | 50a8a5e7959ca315e812413661a76576b7c3bbb8 (diff) |
Remove deprecated QtAlgorithms calls from QtGui
QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html
Change-Id: I324ddf6129fe8884ecea97ef47abb7c071dfb34c
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'src/gui/text/qfontdatabase.cpp')
-rw-r--r-- | src/gui/text/qfontdatabase.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index 97ac604197..6da103e931 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -57,6 +57,7 @@ #include <stdlib.h> #include <limits.h> +#include <algorithm> // #define QFONTDATABASE_DEBUG @@ -1119,7 +1120,7 @@ QList<QFontDatabase::WritingSystem> QFontDatabase::writingSystems() const list.append(writingSystem); } } - qSort(list); + std::sort(list.begin(), list.end()); return list; } @@ -1411,7 +1412,7 @@ QList<int> QFontDatabase::pointSizes(const QString &family, if (smoothScalable) return standardSizes(); - qSort(sizes); + std::sort(sizes.begin(), sizes.end()); return sizes; } @@ -1514,7 +1515,7 @@ QList<int> QFontDatabase::smoothSizes(const QString &family, if (smoothScalable) return QFontDatabase::standardSizes(); - qSort(sizes); + std::sort(sizes.begin(), sizes.end()); return sizes; } |