From 170df5addb5334befc8c61130c748fb77de46600 Mon Sep 17 00:00:00 2001
From: Sergio Ahumada <sahumada@blackberry.com>
Date: Mon, 17 Feb 2014 23:37:05 +0100
Subject: [PATCH] Remove qSort usages from gui tests

QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html

Change-Id: Idf0fc471f8ab7b30a097d8faf93c93d5ebbb03ef
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
---
 tests/auto/gui/image/qicon/tst_qicon.cpp               | 4 +++-
 tests/auto/gui/image/qimagereader/tst_qimagereader.cpp | 6 ++++--
 tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp | 6 ++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/tests/auto/gui/image/qicon/tst_qicon.cpp b/tests/auto/gui/image/qicon/tst_qicon.cpp
index bfe2fbc9f73..0f642bcc104 100644
--- a/tests/auto/gui/image/qicon/tst_qicon.cpp
+++ b/tests/auto/gui/image/qicon/tst_qicon.cpp
@@ -45,6 +45,8 @@
 #include <qicon.h>
 #include <qiconengine.h>
 
+#include <algorithm>
+
 
 class tst_QIcon : public QObject
 {
@@ -421,7 +423,7 @@ void tst_QIcon::availableSizes()
 
         QList<QSize> availableSizes = icon.availableSizes();
         QCOMPARE(availableSizes.size(), 3);
-        qSort(availableSizes.begin(), availableSizes.end(), sizeLess);
+        std::sort(availableSizes.begin(), availableSizes.end(), sizeLess);
         QCOMPARE(availableSizes.at(0), QSize(32,32));
         QCOMPARE(availableSizes.at(1), QSize(64,64));
         QCOMPARE(availableSizes.at(2), QSize(128,128));
diff --git a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
index b684231e108..5decbc86fc9 100644
--- a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
+++ b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
@@ -55,6 +55,8 @@
 #include <QTimer>
 #include <QTemporaryDir>
 
+#include <algorithm>
+
 typedef QMap<QString, QString> QStringMap;
 typedef QList<int> QIntList;
 Q_DECLARE_METATYPE(QImage::Format)
@@ -559,7 +561,7 @@ void tst_QImageReader::supportedFormats()
 {
     QList<QByteArray> formats = QImageReader::supportedImageFormats();
     QList<QByteArray> sortedFormats = formats;
-    qSort(sortedFormats);
+    std::sort(sortedFormats.begin(), sortedFormats.end());
 
     // check that the list is sorted
     QCOMPARE(formats, sortedFormats);
@@ -576,7 +578,7 @@ void tst_QImageReader::supportedMimeTypes()
 {
     QList<QByteArray> mimeTypes = QImageReader::supportedMimeTypes();
     QList<QByteArray> sortedMimeTypes = mimeTypes;
-    qSort(sortedMimeTypes);
+    std::sort(sortedMimeTypes.begin(), sortedMimeTypes.end());
 
     // check that the list is sorted
     QCOMPARE(mimeTypes, sortedMimeTypes);
diff --git a/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
index b10b5704c31..c9f8a1f681a 100644
--- a/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
+++ b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
@@ -57,6 +57,8 @@
 # include <unistd.h>
 #endif
 
+#include <algorithm>
+
 typedef QMap<QString, QString> QStringMap;
 typedef QList<int> QIntList;
 Q_DECLARE_METATYPE(QImageWriter::ImageWriterError)
@@ -342,7 +344,7 @@ void tst_QImageWriter::supportedFormats()
 {
     QList<QByteArray> formats = QImageWriter::supportedImageFormats();
     QList<QByteArray> sortedFormats = formats;
-    qSort(sortedFormats);
+    std::sort(sortedFormats.begin(), sortedFormats.end());
 
     // check that the list is sorted
     QCOMPARE(formats, sortedFormats);
@@ -359,7 +361,7 @@ void tst_QImageWriter::supportedMimeTypes()
 {
     QList<QByteArray> mimeTypes = QImageWriter::supportedMimeTypes();
     QList<QByteArray> sortedMimeTypes = mimeTypes;
-    qSort(sortedMimeTypes);
+    std::sort(sortedMimeTypes.begin(), sortedMimeTypes.end());
 
     // check that the list is sorted
     QCOMPARE(mimeTypes, sortedMimeTypes);