From 26547c296ba89d20872eeda9d334fc1e07ddb43e Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Thu, 16 Jul 2020 15:13:36 +0200 Subject: Purge qalgorithm.h of deprecated API A large slice of it has been deprecated since 5.2. Reflowed a doc paragraph pointed out, in the deprecation commit, as having been left ragged by its edits. Note: qSwap() is documented as \deprecated but not marked, where it's defined, as deprecated. Change-Id: Iaff10ac0c4c38e5b85f10eca4eedeab861f09959 Reviewed-by: Thiago Macieira --- tests/benchmarks/corelib/tools/CMakeLists.txt | 1 - .../corelib/tools/qalgorithms/.gitignore | 1 - .../corelib/tools/qalgorithms/CMakeLists.txt | 12 -- .../corelib/tools/qalgorithms/qalgorithms.pro | 5 - .../corelib/tools/qalgorithms/tst_qalgorithms.cpp | 127 --------------------- tests/benchmarks/corelib/tools/tools.pro | 3 +- 6 files changed, 1 insertion(+), 148 deletions(-) delete mode 100644 tests/benchmarks/corelib/tools/qalgorithms/.gitignore delete mode 100644 tests/benchmarks/corelib/tools/qalgorithms/CMakeLists.txt delete mode 100644 tests/benchmarks/corelib/tools/qalgorithms/qalgorithms.pro delete mode 100644 tests/benchmarks/corelib/tools/qalgorithms/tst_qalgorithms.cpp (limited to 'tests/benchmarks') diff --git a/tests/benchmarks/corelib/tools/CMakeLists.txt b/tests/benchmarks/corelib/tools/CMakeLists.txt index 6aed3d0f90..c1b5cad1aa 100644 --- a/tests/benchmarks/corelib/tools/CMakeLists.txt +++ b/tests/benchmarks/corelib/tools/CMakeLists.txt @@ -10,4 +10,3 @@ add_subdirectory(qrect) add_subdirectory(qringbuffer) add_subdirectory(qstack) add_subdirectory(qvector) -add_subdirectory(qalgorithms) diff --git a/tests/benchmarks/corelib/tools/qalgorithms/.gitignore b/tests/benchmarks/corelib/tools/qalgorithms/.gitignore deleted file mode 100644 index 379c13eb9b..0000000000 --- a/tests/benchmarks/corelib/tools/qalgorithms/.gitignore +++ /dev/null @@ -1 +0,0 @@ -tst_qalgorithms diff --git a/tests/benchmarks/corelib/tools/qalgorithms/CMakeLists.txt b/tests/benchmarks/corelib/tools/qalgorithms/CMakeLists.txt deleted file mode 100644 index 949dda2167..0000000000 --- a/tests/benchmarks/corelib/tools/qalgorithms/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -# Generated from qalgorithms.pro. - -##################################################################### -## tst_bench_qalgorithms Binary: -##################################################################### - -qt_add_benchmark(tst_bench_qalgorithms - SOURCES - tst_qalgorithms.cpp - PUBLIC_LIBRARIES - Qt::Test -) diff --git a/tests/benchmarks/corelib/tools/qalgorithms/qalgorithms.pro b/tests/benchmarks/corelib/tools/qalgorithms/qalgorithms.pro deleted file mode 100644 index 0bde3ac66a..0000000000 --- a/tests/benchmarks/corelib/tools/qalgorithms/qalgorithms.pro +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG += benchmark -QT = core testlib - -TARGET = tst_bench_qalgorithms -SOURCES = tst_qalgorithms.cpp diff --git a/tests/benchmarks/corelib/tools/qalgorithms/tst_qalgorithms.cpp b/tests/benchmarks/corelib/tools/qalgorithms/tst_qalgorithms.cpp deleted file mode 100644 index ea116a4006..0000000000 --- a/tests/benchmarks/corelib/tools/qalgorithms/tst_qalgorithms.cpp +++ /dev/null @@ -1,127 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Copyright (C) 2012 Robin Burchell -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -using namespace std; - -class tst_QAlgorithms : public QObject -{ - Q_OBJECT -private slots: - void stableSort_data(); - void stableSort(); - - void sort_data(); - void sort(); -}; - -template -QList generateData(QString dataSetType, const int length) -{ - QList container; - if (dataSetType == "Random") { - for (int i = 0; i < length; ++i) - container.append(QRandomGenerator::global()->generate()); - } else if (dataSetType == "Ascending") { - for (int i = 0; i < length; ++i) - container.append(i); - } else if (dataSetType == "Descending") { - for (int i = 0; i < length; ++i) - container.append(length - i); - } else if (dataSetType == "Equal") { - for (int i = 0; i < length; ++i) - container.append(43); - } else if (dataSetType == "Duplicates") { - for (int i = 0; i < length; ++i) - container.append(i % 10); - } else if (dataSetType == "Almost Sorted") { - for (int i = 0; i < length; ++i) - container.append(i); - for (int i = 0; i<= length / 10; ++i) { - const int iswap = i * 9; - DataType tmp = container.at(iswap); - container[iswap] = container.at(iswap + 1); - container[iswap + 1] = tmp; - } - } - - return container; -} - - -void tst_QAlgorithms::stableSort_data() -{ - const int dataSize = 5000; - QTest::addColumn>("unsorted"); - QTest::newRow("Equal") << (generateData("Equal", dataSize)); - QTest::newRow("Ascending") << (generateData("Ascending", dataSize)); - QTest::newRow("Descending") << (generateData("Descending", dataSize)); - QTest::newRow("Duplicates") << (generateData("Duplicates", dataSize)); - QTest::newRow("Almost Sorted") << (generateData("Almost Sorted", dataSize)); -} - -void tst_QAlgorithms::stableSort() -{ - QFETCH(QList, unsorted); - - QBENCHMARK { - QList sorted = unsorted; - qStableSort(sorted.begin(), sorted.end()); - } -} - -void tst_QAlgorithms::sort_data() -{ - stableSort_data(); -} - -void tst_QAlgorithms::sort() -{ - QFETCH(QList, unsorted); - - QBENCHMARK { - QList sorted = unsorted; - qSort(sorted.begin(), sorted.end()); - } -} - - -QTEST_MAIN(tst_QAlgorithms) -#include "tst_qalgorithms.moc" - diff --git a/tests/benchmarks/corelib/tools/tools.pro b/tests/benchmarks/corelib/tools/tools.pro index b4ee0520a6..8abb9feefb 100644 --- a/tests/benchmarks/corelib/tools/tools.pro +++ b/tests/benchmarks/corelib/tools/tools.pro @@ -9,5 +9,4 @@ SUBDIRS = \ qrect \ qringbuffer \ qstack \ - qvector \ - qalgorithms + qvector -- cgit v1.2.3