Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

Change-Id: I715b1d743d5f11560e7b3fbeb8fd64a5e5ddb277

1 files changed, 4 insertions, 6 deletions

diff --git a/src/testlib/qtesttable.cpp b/src/testlib/qtesttable.cpp
index 8d42668a5b..20e0702d44 100644
--- a/src/testlib/qtesttable.cpp
+++ b/src/testlib/qtesttable.cpp
@@ -65,10 +65,10 @@ public:
         int type;
     };
 
-    typedef std::vector<Element> ElementList;
+    using ElementList = std::vector<Element>;
     ElementList elementList;
 
-    typedef std::vector<QTestData *> DataList;
+    using DataList = std::vector<QTestData *>;
     DataList dataList;
 
     void addColumn(int elemType, const char *elemName) { elementList.push_back(Element(elemName, elemType)); }
@@ -152,14 +152,12 @@ private:
 
 int QTestTable::indexOf(const char *elementName) const
 {
-    typedef QTestTablePrivate::ElementList::const_iterator It;
-
     QTEST_ASSERT(elementName);
 
     const QTestTablePrivate::ElementList &elementList = d->elementList;
 
-    const It it = std::find_if(elementList.begin(), elementList.end(),
-                               NamePredicate(elementName));
+    const auto it = std::find_if(elementList.begin(), elementList.end(),
+                                 NamePredicate(elementName));
     return it != elementList.end() ?
         int(it - elementList.begin()) : -1;
 }