From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Wed, 25 Sep 2013 09:45:35 +0000 (+0200)
Subject: Remove QtAlgorithms usage from Qt Linguist and its tools.
X-Git-Tag: accepted/tizen/20131212.181521~74
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b81b952f1c41c1ab5292fdf68c7e3436075954b7;p=platform%2Fupstream%2Fqttools.git

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 <giuseppe.dangelo@kdab.com>
---

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 <QtCore/QXmlStreamReader>
 
+#include <algorithm>
+
 #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<QString, int> currentLine;
     QString currentFile;