diff options
Diffstat (limited to 'tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp')
| -rw-r--r-- | tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp b/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp index 2c7c8f6514..fe6e82e19c 100644 --- a/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp +++ b/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp @@ -29,7 +29,6 @@ #include <QtTest/QtTest> #include "qbytearray.h" -#include "qlinkedlist.h" #include "qlist.h" #include "qstring.h" #include "qvarlengtharray.h" @@ -324,12 +323,6 @@ private Q_SLOTS: #endif } -#if QT_DEPRECATED_SINCE(5, 15) - void ranged_ctor_QLinkedList_int(); - void ranged_ctor_QLinkedList_Movable(); - void ranged_ctor_QLinkedList_Complex(); - void ranged_ctor_QLinkedList_duplicates_strategy(); -#endif void ranged_ctor_std_set_int() { ranged_ctor_non_associative_impl<std::set<int>>(); } void ranged_ctor_std_set_Movable() { ranged_ctor_non_associative_impl<std::set<Movable>>(); } void ranged_ctor_std_set_Complex() { ranged_ctor_non_associative_impl<std::set<Complex>>(); } @@ -483,9 +476,6 @@ private Q_SLOTS: void front_back_std_vector() { front_back_impl<std::vector<int>>(); } void front_back_QVector() { front_back_impl<QVector<int>>(); } void front_back_QList() { front_back_impl<QList<qintptr>>(); } -#if QT_DEPRECATED_SINCE(5, 15) - void front_back_QLinkedList(); -#endif void front_back_QVarLengthArray() { front_back_impl<QVarLengthArray<int>>(); } void front_back_QString() { front_back_impl<QString>(); } void front_back_QStringRef() { front_back_impl<QStringRef>(); } @@ -583,9 +573,6 @@ template<typename ... T> struct ContainerDuplicatedValuesStrategy<VarLengthArray<T...>> : ContainerAcceptsDuplicateValues {}; template<typename ... T> -struct ContainerDuplicatedValuesStrategy<QList<T...>> : ContainerAcceptsDuplicateValues {}; - -template<typename ... T> struct ContainerDuplicatedValuesStrategy<std::list<T...>> : ContainerAcceptsDuplicateValues {}; #if COMPILER_HAS_STDLIB_INCLUDE(<forward_list>) @@ -593,14 +580,6 @@ template<typename ... T> struct ContainerDuplicatedValuesStrategy<std::forward_list<T...>> : ContainerAcceptsDuplicateValues {}; #endif -#if QT_DEPRECATED_SINCE(5, 15) -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED -template<typename ... T> -struct ContainerDuplicatedValuesStrategy<QLinkedList<T...>> : ContainerAcceptsDuplicateValues {}; -QT_WARNING_POP -#endif - // assuming https://cplusplus.github.io/LWG/lwg-active.html#2844 resolution template<typename ... T> struct ContainerDuplicatedValuesStrategy<std::set<T...>> : ContainerRejectsDuplicateValues {}; @@ -806,8 +785,6 @@ template <> QStringView make(int size) { return QStringView(s_string).left(siz template <> QLatin1String make(int size) { return QLatin1String("\1\2\3\4\5\6\7", size); } template <typename T> T clean(T &&t) { return std::forward<T>(t); } -inline QChar clean(QCharRef ch) { return ch; } -inline char clean(QByteRef ch) { return ch; } inline char clean(QLatin1Char ch) { return ch.toLatin1(); } template <typename Container> @@ -827,35 +804,5 @@ void tst_ContainerApiSymmetry::front_back_impl() const QCOMPARE(clean(qAsConst(c2).back()), V(2)); } -#if QT_DEPRECATED_SINCE(5, 15) -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED -void tst_ContainerApiSymmetry::ranged_ctor_QLinkedList_int() -{ - ranged_ctor_non_associative_impl<QLinkedList<int>>(); -} - -void tst_ContainerApiSymmetry::ranged_ctor_QLinkedList_Movable() -{ - ranged_ctor_non_associative_impl<QLinkedList<Movable>>(); -} - -void tst_ContainerApiSymmetry::ranged_ctor_QLinkedList_Complex() -{ - ranged_ctor_non_associative_impl<QLinkedList<Complex>>(); -} - -void tst_ContainerApiSymmetry::ranged_ctor_QLinkedList_duplicates_strategy() -{ - non_associative_container_duplicates_strategy<QLinkedList>(); -} - -void tst_ContainerApiSymmetry::front_back_QLinkedList() -{ - front_back_impl<QLinkedList<int>>(); -} -QT_WARNING_POP -#endif - QTEST_APPLESS_MAIN(tst_ContainerApiSymmetry) #include "tst_containerapisymmetry.moc" |