AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove qSort usages from qdoc

Browse Source 
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>
This commit is contained in:
Giuseppe D'Angelo 2013-09-03 00:43:13 +02:00 committed by The Qt Project
parent 173ce3ab93
commit 1119eb5742
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/qdoc/main.cpp
View File

@ -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

4
src/tools/qdoc/qdocindexfiles.cpp
View File

@ -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) {
/*