QTestLib: Replace typedef by 'using'

Apply Fixits by Qt Creator with some amendments.

Task-number: QTBUG-69413
Change-Id: I366cca6e5755719e8241e76774af6be2b5312627
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
 

4 files changed, 7 insertions, 9 deletions

diff --git a/src/testlib/qtestaccessible.h b/src/testlib/qtestaccessible.h
index d14dcec031..bd77ee77a1 100644
--- a/src/testlib/qtestaccessible.h
+++ b/src/testlib/qtestaccessible.h
@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
 class QObject;
 
 // Use pointers since we subclass QAccessibleEvent
-typedef QList<QAccessibleEvent*> EventList;
+using EventList = QList<QAccessibleEvent*>;
 
 bool operator==(const QAccessibleEvent &l, const QAccessibleEvent &r)
 {
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index ac309374e3..10477238cb 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -301,7 +301,7 @@ class TestMethods {
 public:
     Q_DISABLE_COPY_MOVE(TestMethods)
 
-    typedef std::vector<QMetaMethod> MetaMethods;
+    using MetaMethods = std::vector<QMetaMethod>;
 
     explicit TestMethods(const QObject *o, const MetaMethods &m = MetaMethods());
 
diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h
index 794283ff78..af7c0f43b9 100644
--- a/src/testlib/qtestcase.h
+++ b/src/testlib/qtestcase.h
@@ -336,7 +336,7 @@ namespace QTest
     template <typename T>
     inline void addColumn(const char *name, T * = nullptr)
     {
-        typedef std::is_same<T, const char*> QIsSameTConstChar;
+        using QIsSameTConstChar = std::is_same<T, const char*>;
         Q_STATIC_ASSERT_X(!QIsSameTConstChar::value, "const char* is not allowed as a test data format.");
         addColumnInternal(qMetaTypeId<T>(), name);
     }
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;
 }