From 1119eb57424478213c911ce260af23842dcf741f Mon Sep 17 00:00:00 2001
From: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Date: Tue, 3 Sep 2013 00:43:13 +0200
Subject: Remove qSort usages from qdoc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

Change-Id: I419d767ea18944917888037899e6ececdb014e82
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
---
 src/tools/qdoc/main.cpp           | 4 +++-
 src/tools/qdoc/qdocindexfiles.cpp | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/tools')

diff --git a/src/tools/qdoc/main.cpp b/src/tools/qdoc/main.cpp
index 912cdad7eb..26aa0a7dc2 100644
--- a/src/tools/qdoc/main.cpp
+++ b/src/tools/qdoc/main.cpp
@@ -64,6 +64,8 @@
 #  include "qcoreapplication.h"
 #endif
 
+#include <algorithm>
+
 QT_BEGIN_NAMESPACE
 
 /*
@@ -220,7 +222,7 @@ static void loadIndexFiles(Config& config)
                             foundIndices.append(tempFileInfo);
                     }
                 }
-                qSort(foundIndices.begin(), foundIndices.end(), creationTimeBefore);
+                std::sort(foundIndices.begin(), foundIndices.end(), creationTimeBefore);
                 if (foundIndices.size() > 1) {
                     /*
                         QDoc should always use the last entry in the multimap when there are
diff --git a/src/tools/qdoc/qdocindexfiles.cpp b/src/tools/qdoc/qdocindexfiles.cpp
index 21731f921b..265142d320 100644
--- a/src/tools/qdoc/qdocindexfiles.cpp
+++ b/src/tools/qdoc/qdocindexfiles.cpp
@@ -50,6 +50,8 @@
 #include "generator.h"
 #include <qdebug.h>
 
+#include <algorithm>
+
 QT_BEGIN_NAMESPACE
 
 /*!
@@ -1202,7 +1204,7 @@ void QDocIndexFiles::generateIndexSections(QXmlStreamWriter& writer,
             const InnerNode* inner = static_cast<const InnerNode*>(node);
 
             NodeList cnodes = inner->childNodes();
-            qSort(cnodes.begin(), cnodes.end(), compareNodes);
+            std::sort(cnodes.begin(), cnodes.end(), compareNodes);
 
             foreach (Node* child, cnodes) {
                 /*
-- 
cgit v1.2.3