diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-09-25 11:45:35 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-25 11:47:48 +0200 |
| commit | b81b952f1c41c1ab5292fdf68c7e3436075954b7 (patch) | |
| tree | 2fb80dceba9c609ac9aa78abf477780ec86ad958 /src/linguist/shared/ts.cpp | |
| parent | 7c4fc9bfd2adef62d03c77fc5ca438164a5364dc (diff) | |
| download | qttools-b81b952f1c41c1ab5292fdf68c7e3436075954b7.tar.gz | |
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>
Diffstat (limited to 'src/linguist/shared/ts.cpp')
| -rw-r--r-- | src/linguist/shared/ts.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/linguist/shared/ts.cpp b/src/linguist/shared/ts.cpp index b2744c97d..27b8beea3 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; |