diff options
Diffstat (limited to 'tests/auto/corelib/tools')
-rw-r--r-- | tests/auto/corelib/tools/collections/tst_collections.cpp | 4 | ||||
-rw-r--r-- | tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp | 16 |
2 files changed, 1 insertions, 19 deletions
diff --git a/tests/auto/corelib/tools/collections/tst_collections.cpp b/tests/auto/corelib/tools/collections/tst_collections.cpp index 748b32fb30..2cab6312aa 100644 --- a/tests/auto/corelib/tools/collections/tst_collections.cpp +++ b/tests/auto/corelib/tools/collections/tst_collections.cpp @@ -2737,14 +2737,12 @@ void instantiatePairAssociative() { instantiateMutableIterationContainer<ContainerType, KeyType>(); - typename ContainerType::iterator it; - typename ContainerType::const_iterator constIt; const KeyType key = KeyType(); const ValueType value = ValueType(); ContainerType container; const ContainerType constContainer(container); - it = container.insert(key, value); + auto it = container.insert(key, value); container.erase(it); container.find(key); container.constFind(key); diff --git a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp index ccba312807..6e32ba8039 100644 --- a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp +++ b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp @@ -1041,22 +1041,6 @@ void tst_QArrayData::arrayOps2() Q_DECLARE_METATYPE(QArrayDataPointer<int>) -static inline bool arrayIsFilledWith(const QArrayDataPointer<int> &array, - int fillValue, size_t size) -{ - const int *iter = array->begin(); - const int *const end = array->end(); - - for (size_t i = 0; i < size; ++i, ++iter) - if (*iter != fillValue) - return false; - - if (iter != end) - return false; - - return true; -} - struct ResetOnDtor { ResetOnDtor() |