diff options
author | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-06-20 17:58:21 +0200 |
---|---|---|
committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-06-20 22:10:14 +0200 |
commit | b9b2b6af850a94f2385e137fd4bb54b9b429f8c8 (patch) | |
tree | edcb6479a38d0db684275528727b9d59964980db | |
parent | 2750a510d2f8ef34219906939e5ccb804b9a39d3 (diff) | |
download | qttools-b9b2b6af850a94f2385e137fd4bb54b9b429f8c8.tar.gz |
Remove usages of deprecated qSort
Task-number: QTBUG-76491
Change-Id: Ied0ecb369697b3cc01fef7a2d91aa3940cdcd771
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
-rw-r--r-- | src/kmap2qmap/main.cpp | 4 | ||||
-rw-r--r-- | src/macdeployqt/shared/shared.cpp | 2 | ||||
-rw-r--r-- | src/makeqpf/mainwindow.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/kmap2qmap/main.cpp b/src/kmap2qmap/main.cpp index b03df4aff..0cff817c5 100644 --- a/src/kmap2qmap/main.cpp +++ b/src/kmap2qmap/main.cpp @@ -618,7 +618,7 @@ bool KeymapParser::parseKmap(QFile *f) else parseWarning("keymaps has an invalid range"); } - qSort(keymaps); + std::sort(keymaps.begin(), keymaps.end()); } else parseWarning("keymaps with more than one argument"); @@ -780,7 +780,7 @@ bool KeymapParser::parseKmap(QFile *f) } } } - qSort(m_keymap); + std::sort(m_keymap.begin(), m_keymap.end()); return !m_keymap.isEmpty(); } diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp index 3abc31c72..a248d8ccd 100644 --- a/src/macdeployqt/shared/shared.cpp +++ b/src/macdeployqt/shared/shared.cpp @@ -1294,7 +1294,7 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf // deployQmlImports can consider the module deployed if it has already // deployed one of its sub-module) QVariantList array = doc.array().toVariantList(); - qSort(array.begin(), array.end(), importLessThan); + std::sort(array.begin(), array.end(), importLessThan); // deploy each import foreach (const QVariant &importValue, array) { diff --git a/src/makeqpf/mainwindow.cpp b/src/makeqpf/mainwindow.cpp index 3e74a54c1..215df6d47 100644 --- a/src/makeqpf/mainwindow.cpp +++ b/src/makeqpf/mainwindow.cpp @@ -219,7 +219,7 @@ void MainWindow::on_sampleFile_editingFinished() coverage.insert(text.at(i)); QList<QChar> sortedCoverage = QList<QChar>::fromSet(coverage); - qSort(sortedCoverage); + std::sort(sortedCoverage.begin(), sortedCoverage.end()); // play simple :) for (QChar ch : qAsConst(sortedCoverage)) { QPF::CharacterRange r; |