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/qfontsubset.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/qfontsubset.cpp')
| -rw-r--r-- | src/gui/text/qfontsubset.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/text/qfontsubset.cpp b/src/gui/text/qfontsubset.cpp index 3c39272d11..01ae5888e2 100644 --- a/src/gui/text/qfontsubset.cpp +++ b/src/gui/text/qfontsubset.cpp @@ -48,6 +48,8 @@ #include "qfontsubset_agl.cpp" +#include <algorithm> + QT_BEGIN_NAMESPACE // This map is used for symbol fonts to get the correct glyph names for the latin range @@ -998,7 +1000,7 @@ static QList<QTtfTable> generateGlyphTables(qttf_font_tables &tables, const QLis { const int max_size_small = 65536*2; QList<QTtfGlyph> glyphs = _glyphs; - qSort(glyphs); + std::sort(glyphs.begin(), glyphs.end()); Q_ASSERT(tables.maxp.numGlyphs == glyphs.at(glyphs.size()-1).index + 1); int nGlyphs = tables.maxp.numGlyphs; @@ -1076,7 +1078,7 @@ static QByteArray bindFont(const QList<QTtfTable>& _tables) { QList<QTtfTable> tables = _tables; - qSort(tables); + std::sort(tables.begin(), tables.end()); QByteArray font; const int header_size = sizeof(qint32) + 4*sizeof(quint16); |