From b81b952f1c41c1ab5292fdf68c7e3436075954b7 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 25 Sep 2013 11:45:35 +0200 Subject: [PATCH] Remove QtAlgorithms usage from Qt Linguist and its tools. QtAlgorithms is getting deprecated, see http://www.mail-archive.com/development@qt-project.org/msg01603.html Change-Id: I3d74510693a5144b536cf515077d870e380d47df Reviewed-by: Giuseppe D'Angelo --- src/linguist/shared/ts.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/linguist/shared/ts.cpp b/src/linguist/shared/ts.cpp index b2744c9..27b8bee 100644 --- a/src/linguist/shared/ts.cpp +++ b/src/linguist/shared/ts.cpp @@ -48,6 +48,8 @@ #include +#include + #define STRINGIFY_INTERNAL(x) #x #define STRINGIFY(x) STRINGIFY_INTERNAL(x) #define STRING(s) static QString str##s(QLatin1String(STRINGIFY(s))) @@ -571,7 +573,7 @@ bool saveTS(const Translator &translator, QIODevice &dev, ConversionData &cd) context.append(msg); } if (cd.sortContexts()) - qSort(contextOrder); + std::sort(contextOrder.begin(), contextOrder.end()); QHash currentLine; QString currentFile; -- 2.7.4