Reduce QList usage

Prepare for migration to Qt 6 by using QVector where possible.
Otherwise, use auto or typedefs like QVariantList.

Change-Id: I6d385efe1a45a0519cf4bb06a1f6d1ea869e890e
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

16 files changed, 85 insertions, 89 deletions

diff --git a/examples/activeqt/comapp/main.cpp b/examples/activeqt/comapp/main.cpp
index 74b7fa3..62f92b8 100644
--- a/examples/activeqt/comapp/main.cpp
+++ b/examples/activeqt/comapp/main.cpp
@@ -53,6 +53,7 @@
 #include <QTabWidget>
 #include <QScopedPointer>
 #include <QTimer>
+#include <QVector>
 
 class Application;
 class DocumentList;
@@ -104,7 +105,7 @@ public slots:
     Document *item(int index) const;
 
 private:
-    QList<Document *> m_list;
+    QVector<Document *> m_list;
 };
 //! [1]
 
diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
index 1262944..d578438 100644
--- a/src/activeqt/container/qaxbase.cpp
+++ b/src/activeqt/container/qaxbase.cpp
@@ -143,7 +143,7 @@ struct QAxMetaObject : public QMetaObject
 private:
     friend class MetaObjectGenerator;
     // save information about QAxEventSink connections, and connect when found in cache
-    QList<QUuid> connectionInterfaces;
+    QVector<QUuid> connectionInterfaces;
     // DISPID -> signal name
     QMap< QUuid, QMap<DISPID, QByteArray> > sigs;
     // DISPID -> property changed signal name
@@ -152,7 +152,7 @@ private:
     QMap< QUuid, QMap<DISPID, QByteArray> > props;
 
     // Prototype -> member info
-    QHash<QByteArray, QList<QByteArray> > memberInfo;
+    QHash<QByteArray, QByteArrayList> memberInfo;
     QMap<QByteArray, QByteArray> realPrototype;
 
     // DISPID cache
@@ -165,12 +165,10 @@ void QAxMetaObject::parsePrototype(const QByteArray &prototype)
     QByteArray parameters = realProto.mid(realProto.indexOf('(') + 1);
     parameters.truncate(parameters.length() - 1);
 
-    if (parameters.isEmpty()) {
-        memberInfo.insert(prototype, QList<QByteArray>());
-    } else {
-        QList<QByteArray> plist = parameters.split(',');
-        memberInfo.insert(prototype, plist);
-    }
+    if (parameters.isEmpty())
+        memberInfo.insert(prototype, {});
+    else
+        memberInfo.insert(prototype, parameters.split(','));
 }
 
 inline QByteArray QAxMetaObject::propertyType(const QByteArray &propertyName)
@@ -194,7 +192,7 @@ QByteArray QAxMetaObject::paramType(const QByteArray &prototype, int index, bool
     if (out)
         *out = false;
 
-    QList<QByteArray> plist = memberInfo.value(prototype);
+    const auto plist = memberInfo.value(prototype);
     if (index > plist.count() - 1)
         return QByteArray();
 
@@ -1570,8 +1568,8 @@ private:
 
     QMetaObject *tryCache();
 
-    QByteArray createPrototype(FUNCDESC *funcdesc, ITypeInfo *typeinfo, const QList<QByteArray> &names,
-        QByteArray &type, QList<QByteArray> &parameters);
+    QByteArray createPrototype(FUNCDESC *funcdesc, ITypeInfo *typeinfo, const QByteArrayList &names,
+                               QByteArray &type, QByteArrayList &parameters);
 
     QByteArray usertypeToString(const TYPEDESC &tdesc, ITypeInfo *info, const QByteArray &function);
     QByteArray guessTypes(const TYPEDESC &tdesc, ITypeInfo *info, const QByteArray &function);
@@ -1583,12 +1581,12 @@ private:
         Bindable                = 0x02000000
     };
 
-    static inline QList<QByteArray> paramList(const QByteArray &prototype)
+    static inline QByteArrayList paramList(const QByteArray &prototype)
     {
         QByteArray parameters = prototype.mid(prototype.indexOf('(') + 1);
         parameters.truncate(parameters.length() - 1);
         if (parameters.isEmpty() || parameters == "void")
-            return QList<QByteArray>();
+            return {};
         return parameters.split(',');
     }
 
@@ -1614,9 +1612,8 @@ private:
     {
         QByteArray proto(prototype);
 
-        QList<QByteArray> plist = paramList(prototype);
-        for (int p = 0; p < plist.count(); ++p) {
-            const QByteArray &param = plist.at(p);
+        const auto plist = paramList(prototype);
+        for (const QByteArray &param : plist) {
             if (param != replaceType(param)) {
                 int type = 0;
                 while (type_conversion[type][0]) {
@@ -1902,7 +1899,7 @@ MetaObjectGenerator::~MetaObjectGenerator()
 }
 
 bool qax_dispatchEqualsIDispatch = true;
-QList<QByteArray> qax_qualified_usertypes;
+QByteArrayList qax_qualified_usertypes;
 
 QByteArray MetaObjectGenerator::usertypeToString(const TYPEDESC &tdesc, ITypeInfo *info, const QByteArray &function)
 {
@@ -2401,8 +2398,8 @@ void MetaObjectGenerator::addSetterSlot(const QByteArray &property)
     }
 }
 
-QByteArray MetaObjectGenerator::createPrototype(FUNCDESC *funcdesc, ITypeInfo *typeinfo, const QList<QByteArray> &names,
-                                             QByteArray &type, QList<QByteArray> &parameters)
+QByteArray MetaObjectGenerator::createPrototype(FUNCDESC *funcdesc, ITypeInfo *typeinfo, const QByteArrayList &names,
+                                                QByteArray &type, QByteArrayList &parameters)
 {
     const QByteArray &function = names.at(0);
     const QByteArray hresult("HRESULT");
@@ -2490,7 +2487,7 @@ void MetaObjectGenerator::readFuncsInfo(ITypeInfo *typeinfo, ushort nFuncs)
 
         QByteArray type;
         QByteArray prototype;
-        QList<QByteArray> parameters;
+        QByteArrayList parameters;
 
         // parse function description
         const QByteArrayList names = qaxTypeInfoNames(typeinfo, funcdesc->memid);
@@ -2813,7 +2810,7 @@ void MetaObjectGenerator::readEventInterface(ITypeInfo *eventinfo, IConnectionPo
         }
 
         QByteArray prototype;
-        QList<QByteArray> parameters;
+        QByteArrayList parameters;
 
         // parse event function description, get event function prototype
         const QByteArrayList names = qaxTypeInfoNames(eventinfo, funcdesc->memid);
@@ -3090,9 +3087,9 @@ QMetaObject *MetaObjectGenerator::metaObject(const QMetaObject *parentObject, co
         for (QMap<QByteArray, Method>::ConstIterator it = map.constBegin(); it != map.constEnd(); ++it) {
             QByteArray prototype(QMetaObject::normalizedSignature(it.key()));
             QByteArray name = prototype.left(prototype.indexOf('('));
-            QList<QByteArray> paramTypeNames = paramList(prototype);
-            const QList<QByteArray> paramNames = it.value().parameters.isEmpty() ?
-                                    QList<QByteArray>() : it.value().parameters.split(',');
+            const auto paramTypeNames = paramList(prototype);
+            const QByteArrayList paramNames = it.value().parameters.isEmpty()
+                ? QByteArrayList() : it.value().parameters.split(',');
             Q_ASSERT(paramTypeNames.size() == paramNames.size());
             if (!it.value().realPrototype.isEmpty())
                 metaobj->realPrototype.insert(prototype, it.value().realPrototype);
@@ -4196,7 +4193,7 @@ QAxObject *QAxBase::querySubObject(const char *name,
                                    const QVariant &var7,
                                    const QVariant &var8)
 {
-    QList<QVariant> vars;
+    QVariantList vars;
     QVariant var = var1;
     int argc = 1;
     while(var.isValid()) {
diff --git a/src/activeqt/container/qaxdump.cpp b/src/activeqt/container/qaxdump.cpp
index e2122c3..00b7ca2 100644
--- a/src/activeqt/container/qaxdump.cpp
+++ b/src/activeqt/container/qaxdump.cpp
@@ -96,7 +96,7 @@ static inline QString docuFromName(ITypeInfo *typeInfo, const QString &name)
     return QLatin1String("<p>") + qax_docuFromName(typeInfo, name) + QLatin1String("\n");
 }
 
-static QByteArray namedPrototype(const QList<QByteArray> &parameterTypes, const QList<QByteArray> &parameterNames, int numDefArgs = 0)
+static QByteArray namedPrototype(const QByteArrayList &parameterTypes, const QByteArrayList &parameterNames, int numDefArgs = 0)
 {
     QByteArray prototype("(");
     for (int p = 0; p < parameterTypes.count(); ++p) {
@@ -177,7 +177,8 @@ QString qax_generateDocumentation(QAxBase *that)
     }
     stream << "</ul>" << endl;
 
-    QList<QString> methodDetails, propDetails;
+    QStringList methodDetails;
+    QStringList propDetails;
 
     const int slotCount = mo->methodCount();
     if (slotCount) {
@@ -208,7 +209,7 @@ QString qax_generateDocumentation(QAxBase *that)
                              QLatin1String(returntype.constData()) + QLatin1Char(' ') +
                              QLatin1String(name.constData()) + QLatin1Char(' ') +
                              QString::fromLatin1(prototype.constData()) + QLatin1String("<tt> [slot]</tt></h3>\n");
-            prototype = namedPrototype(slot.parameterTypes(), QList<QByteArray>());
+            prototype = namedPrototype(slot.parameterTypes(), {});
             detail += docuFromName(typeInfo, QString::fromLatin1(name.constData()));
             detail += QLatin1String("<p>Connect a signal to this slot:<pre>\n");
             detail += QString::fromLatin1("\tQObject::connect(sender, SIGNAL(someSignal") + QString::fromLatin1(prototype.constData()) +
@@ -284,7 +285,7 @@ QString qax_generateDocumentation(QAxBase *that)
                     }
                 } while (typeInfo);
             }
-            prototype = namedPrototype(signal.parameterTypes(), QList<QByteArray>());
+            prototype = namedPrototype(signal.parameterTypes(), {});
             detail += QLatin1String("<p>Connect a slot to this signal:<pre>\n");
             detail += QLatin1String("\tQObject::connect(object, SIGNAL(") + QString::fromLatin1(name.constData()) +
                       QString::fromLatin1(prototype.constData()) +
diff --git a/src/activeqt/container/qaxscript.cpp b/src/activeqt/container/qaxscript.cpp
index 5179204..07c0669 100644
--- a/src/activeqt/container/qaxscript.cpp
+++ b/src/activeqt/container/qaxscript.cpp
@@ -63,6 +63,7 @@
 #include <qmetaobject.h>
 #include <quuid.h>
 #include <qwidget.h>
+#include <qvector.h>
 
 #include <qt_windows.h>
 #ifndef QT_NO_QAXSCRIPT
@@ -75,7 +76,7 @@
 QT_BEGIN_NAMESPACE
 
 struct QAxEngineDescriptor { QString name, extension, code; };
-static QList<QAxEngineDescriptor> engines;
+static QVector<QAxEngineDescriptor> engines;
 
 class QAxScriptManagerPrivate
 {
@@ -1187,7 +1188,7 @@ QVariant QAxScriptManager::call(const QString &function, QList<QVariant> &argume
         return QVariant();
     }
 
-    QList<QVariant> args(arguments);
+    QVariantList args(arguments);
     return s->call(function, args);
 }
 
diff --git a/src/activeqt/container/qaxselect.cpp b/src/activeqt/container/qaxselect.cpp
index 1caae35..6a7ab69 100644
--- a/src/activeqt/container/qaxselect.cpp
+++ b/src/activeqt/container/qaxselect.cpp
@@ -208,9 +208,9 @@ static bool querySubKeyValue(HKEY hKey, const QString &subKeyName,  LPBYTE lpDat
     return result;
 }
 
-static QList<Control> readControls(const wchar_t *rootKey, unsigned wordSize)
+static QVector<Control> readControls(const wchar_t *rootKey, unsigned wordSize)
 {
-    QList<Control> controls;
+    QVector<Control> controls;
     HKEY classesKey;
     RegOpenKeyEx(HKEY_CLASSES_ROOT, rootKey, 0, KEY_READ, &classesKey);
     if (!classesKey) {
@@ -282,7 +282,7 @@ public:
     Qt::ItemFlags flags(const QModelIndex &index) const override ;
 
 private:
-    QList<Control> m_controls;
+    QVector<Control> m_controls;
 };
 
 QVariant ControlList::data(const QModelIndex &index, int role) const
diff --git a/src/activeqt/container/qaxwidget.cpp b/src/activeqt/container/qaxwidget.cpp
index 6185b89..89effa0 100644
--- a/src/activeqt/container/qaxwidget.cpp
+++ b/src/activeqt/container/qaxwidget.cpp
@@ -1205,9 +1205,8 @@ HRESULT WINAPI QAxClientSite::InsertMenus(HMENU /*hmenuShared*/, LPOLEMENUGROUPW
     QMenu *fileMenu = nullptr;
     QMenu *viewMenu = nullptr;
     QMenu *windowMenu = nullptr;
-    QList<QAction*> actions = menuBar->actions();
-    for (int i = 0; i < actions.count(); ++i) {
-        QAction *action = actions.at(i);
+    const auto actions = menuBar->actions();
+    for (QAction *action : actions) {
         QString text = action->text().remove(QLatin1Char('&'));
         if (text == QLatin1String("File")) {
             fileMenu = action->menu();
diff --git a/src/activeqt/control/qaxserver.cpp b/src/activeqt/control/qaxserver.cpp
index bc93ee3..3427c02 100644
--- a/src/activeqt/control/qaxserver.cpp
+++ b/src/activeqt/control/qaxserver.cpp
@@ -499,9 +499,9 @@ HRESULT UpdateRegistry(bool bRegister, bool perUser)
 // IDL generator
 /////////////////////////////////////////////////////////////////////////////
 
-static QList<QByteArray> enums;
-static QList<QByteArray> enumValues;
-static QList<QByteArray> subtypes;
+static QByteArrayList enums;
+static QByteArrayList enumValues;
+static QByteArrayList subtypes;
 
 static const char* const type_map[][2] =
 {
@@ -754,7 +754,7 @@ static QString stripCurlyBraces(const QUuid &uuid)
     return result;
 }
 
-static QByteArray prototype(const QList<QByteArray> &parameterTypes, const QList<QByteArray> &parameterNames, bool *ok)
+static QByteArray prototype(const QByteArrayList &parameterTypes, const QByteArrayList &parameterNames, bool *ok)
 {
     QByteArray prototype;
 
@@ -1001,8 +1001,8 @@ static HRESULT classIDL(QObject *o, const QMetaObject *mo, const QString &classN
         if (ignoreSlots(name))
             continue;
 
-        QList<QByteArray> parameterTypes(slot.parameterTypes());
-        QList<QByteArray> parameterNames(slot.parameterNames());
+        const auto parameterTypes = slot.parameterTypes();
+        const auto parameterNames = slot.parameterNames();
 
         bool ok = true;
         QByteArray type = slot.typeName();
@@ -1065,8 +1065,8 @@ static HRESULT classIDL(QObject *o, const QMetaObject *mo, const QString &classN
             signature.remove(0, name.length() + 1);
             signature.truncate(signature.length() - 1);
 
-            QList<QByteArray> parameterTypes(signal.parameterTypes());
-            QList<QByteArray> parameterNames(signal.parameterNames());
+            const auto parameterTypes = signal.parameterTypes();
+            const auto parameterNames = signal.parameterNames();
 
             bool isDefault = defSignal == QLatin1String(name);
             name = renameOverloads(replaceKeyword(name));
diff --git a/src/activeqt/control/qaxserverbase.cpp b/src/activeqt/control/qaxserverbase.cpp
index 4fb5ef3..bbef6b7 100644
--- a/src/activeqt/control/qaxserverbase.cpp
+++ b/src/activeqt/control/qaxserverbase.cpp
@@ -77,6 +77,7 @@
 #include <qabstractnativeeventfilter.h>
 
 #include <qcoreapplication.h>
+#include <qvector.h>
 #include <private/qthread_p.h>
 
 #include "qaxfactory.h"
@@ -424,7 +425,7 @@ private:
 
     IUnknown *m_outerUnknown = nullptr;
     IAdviseSink *m_spAdviseSink = nullptr;
-    QList<STATDATA> adviseSinks;
+    QVector<STATDATA> adviseSinks;
     IOleClientSite *m_spClientSite = nullptr;
     IOleInPlaceSite *m_spInPlaceSite = nullptr;
     IOleInPlaceSiteWindowless *m_spInPlaceSiteWindowless = nullptr;
@@ -641,7 +642,7 @@ public:
     QAxConnection(QAxConnection &&) = delete;
     QAxConnection &operator=(QAxConnection &&) = delete;
 
-    using Connections = QList<CONNECTDATA>;
+    using Connections = QVector<CONNECTDATA>;
 
     QAxConnection(QAxServerBase *parent, const QUuid &uuid)
         : that(parent), iid(uuid)
@@ -1669,10 +1670,8 @@ HMENU QAxServerBase::createPopup(QMenu *popup, HMENU oldMenu)
         DeleteMenu(oldMenu, 0, MF_BYPOSITION);
     }
 
-    const QList<QAction*> actions = popup->actions();
-    for (int i = 0; i < actions.count(); ++i) {
-        QAction *action = actions.at(i);
-
+    const auto actions = popup->actions();
+    for (QAction *action : actions) {
         uint flags = action->isEnabled() ? MF_ENABLED : MF_GRAYED;
         if (action->isSeparator())
             flags |= MF_SEPARATOR;
@@ -1711,10 +1710,8 @@ void QAxServerBase::createMenu(QMenuBar *menuBar)
     int object = 0;
     int help = 0;
 
-    const QList<QAction*> actions = menuBar->actions();
-    for (int i = 0; i < actions.count(); ++i) {
-        QAction *action = actions.at(i);
-
+    const auto actions = menuBar->actions();
+    for (QAction *action : actions) {
         uint flags = action->isEnabled() ? MF_ENABLED : MF_GRAYED;
         if (action->isSeparator())
             flags |= MF_SEPARATOR;
@@ -1966,7 +1963,7 @@ int QAxServerBase::qt_metacall(QMetaObject::Call call, int index, void **argv)
     DISPID eventId = index;
     int pcount = 0;
     QByteArray type;
-    QList<QByteArray> ptypes;
+    QByteArrayList ptypes;
 
     switch(index) {
     case DISPID_KEYDOWN:
@@ -2433,7 +2430,7 @@ HRESULT WINAPI QAxServerBase::Invoke(DISPID dispidMember, REFIID riid,
             nameLength = name.indexOf('(');
             QByteArray prototype = name.mid(nameLength + 1);
             prototype.truncate(prototype.length() - 1);
-            QList<QByteArray> ptypes;
+            QByteArrayList ptypes;
             if (!prototype.isEmpty())
                 ptypes = prototype.split(',');
             UINT pcount = UINT(ptypes.count());
@@ -3839,9 +3836,8 @@ HRESULT QAxServerBase::internalActivate()
         // Gone active by now, take care of UIACTIVATE
         canTakeFocus = qt.widget->focusPolicy() != Qt::NoFocus && !inDesignMode;
         if (!canTakeFocus && !inDesignMode) {
-            QList<QWidget*> widgets = qt.widget->findChildren<QWidget*>();
-            for (int w = 0; w < widgets.count(); ++w) {
-                QWidget *widget = widgets[w];
+            const auto widgets = qt.widget->findChildren<QWidget*>();
+            for (const QWidget *widget : widgets) {
                 canTakeFocus = widget->focusPolicy() != Qt::NoFocus;
                 if (canTakeFocus)
                     break;
diff --git a/src/activeqt/shared/qaxtypefunctions.cpp b/src/activeqt/shared/qaxtypefunctions.cpp
index 6190199..db54ecb 100644
--- a/src/activeqt/shared/qaxtypefunctions.cpp
+++ b/src/activeqt/shared/qaxtypefunctions.cpp
@@ -128,7 +128,7 @@ bool QVariantToVoidStar(const QVariant &var, void *data, const QByteArray &typeN
         break;
 #endif
     case QVariant::List:
-        *reinterpret_cast<QList<QVariant> *>(data) = var.toList();
+        *reinterpret_cast<QVariantList *>(data) = var.toList();
         break;
     case QVariant::StringList:
         *reinterpret_cast<QStringList *>(data) = var.toStringList();
diff --git a/src/activeqt/shared/qaxtypes.cpp b/src/activeqt/shared/qaxtypes.cpp
index b3d422b..3ee12c3 100644
--- a/src/activeqt/shared/qaxtypes.cpp
+++ b/src/activeqt/shared/qaxtypes.cpp
@@ -440,7 +440,7 @@ bool QVariantToVARIANT(const QVariant &var, VARIANT &arg, const QByteArray &type
 
     case QVariant::List:
         {
-            const QList<QVariant> list = qvar.toList();
+            const auto list = qvar.toList();
             const int count = list.count();
             VARTYPE vt = VT_VARIANT;
             QVariant::Type listType = QVariant::Type(QMetaType::QVariant);
diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp
index 86699eb..4ed9aaa 100644
--- a/tools/dumpcpp/main.cpp
+++ b/tools/dumpcpp/main.cpp
@@ -71,7 +71,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(ObjectCategories)
 extern QMetaObject *qax_readEnumInfo(ITypeLib *typeLib, const QMetaObject *parentObject);
 extern QMetaObject *qax_readClassInfo(ITypeLib *typeLib, ITypeInfo *typeInfo, const QMetaObject *parentObject);
 extern QMetaObject *qax_readInterfaceInfo(ITypeLib *typeLib, ITypeInfo *typeInfo, const QMetaObject *parentObject);
-extern QList<QByteArray> qax_qualified_usertypes;
+extern QByteArrayList qax_qualified_usertypes;
 extern QString qax_docuFromName(ITypeInfo *typeInfo, const QString &name);
 extern bool qax_dispatchEqualsIDispatch;
 extern void qax_deleteMetaObject(QMetaObject *mo);
@@ -127,7 +127,7 @@ void generateNameSpace(QTextStream &out, const QMetaObject *mo, const QByteArray
     // don't close on purpose
 }
 
-static QByteArray joinParameterNames(const QList<QByteArray> &parameterNames)
+static QByteArray joinParameterNames(const QByteArrayList &parameterNames)
 {
     QByteArray slotParameters;
     for (int p = 0; p < parameterNames.count(); ++p) {
@@ -214,7 +214,7 @@ void generateClassDecl(QTextStream &out, const QMetaObject *mo,
                        const QByteArray &className, const QByteArray &nameSpace,
                        ObjectCategories category)
 {
-    QList<QByteArray> functions;
+    QByteArrayList functions;
 
     QByteArray indent;
     if (!(category & OnlyInlines))
@@ -274,7 +274,7 @@ void generateClassDecl(QTextStream &out, const QMetaObject *mo,
         }
     }
     // QAxBase public virtual functions.
-    QList<QByteArray> axBase_vfuncs;
+    QByteArrayList axBase_vfuncs;
     axBase_vfuncs.append("metaObject");
     axBase_vfuncs.append("qObject");
     axBase_vfuncs.append("className");
@@ -446,8 +446,8 @@ void generateClassDecl(QTextStream &out, const QMetaObject *mo,
             QByteArray slotSignatureTruncated(slotSignature.mid(slotNamedSignature.length()));
             slotSignatureTruncated.truncate(slotSignatureTruncated.length() - 1);
 
-            QList<QByteArray> signatureSplit = slotSignatureTruncated.split(',');
-            QList<QByteArray> parameterSplit;
+            const auto signatureSplit = slotSignatureTruncated.split(',');
+            QByteArrayList parameterSplit;
             if (slotParameters.isEmpty()) { // generate parameter names
                 for (int i = 0; i < signatureSplit.count(); ++i)
                     parameterSplit << QByteArray("p") + QByteArray::number(i);
@@ -700,7 +700,7 @@ void generateMethodParameters(QTextStream &out, const QMetaObject *mo, const QMe
         out << ',';
 
         // Parameter types
-        const QList<QByteArray> parameterTypes = method.parameterTypes();
+        const auto parameterTypes = method.parameterTypes();
         for (int j = 0; j < argsCount; ++j) {
             out << ' ';
             generateTypeInfo(out, parameterTypes.at(j));
@@ -708,7 +708,7 @@ void generateMethodParameters(QTextStream &out, const QMetaObject *mo, const QMe
         }
 
         // Parameter names
-        const QList<QByteArray> parameterNames = method.parameterNames();
+        const auto parameterNames = method.parameterNames();
         for (int j = 0; j < argsCount; ++j)
             out << ' ' << stridx(parameterNames.at(j)) << ',';
 
@@ -767,8 +767,8 @@ void generateClassImpl(QTextStream &out, const QMetaObject *mo, const QByteArray
             strreg(typeName);
         strreg(method.tag());
 
-        const QList<QByteArray> parameterNames = method.parameterNames();
-        const QList<QByteArray> parameterTypes = method.parameterTypes();
+        const auto parameterNames = method.parameterNames();
+        const auto parameterTypes = method.parameterTypes();
         for (int j = 0; j < argsCount; ++j) {
             if (!QtPrivate::isBuiltinType(parameterTypes.at(j)))
                 strDetachAndRegister(parameterTypes.at(j));
@@ -1054,7 +1054,7 @@ bool generateTypeLibrary(QString typeLibFile, QString outname,
     QByteArray inlines;
     QTextStream inlinesOut(&inlines, QIODevice::WriteOnly);
 
-    QMap<QByteArray, QList<QByteArray> > namespaces;
+    QMap<QByteArray, QByteArrayList> namespaces;
 
     if(!(category & NoDeclaration)) {
         if (!declFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
@@ -1196,7 +1196,7 @@ bool generateTypeLibrary(QString typeLibFile, QString outname,
         declOut << endl;
     }
 
-    QList<QByteArray> subtypes;
+    QByteArrayList subtypes;
 
     UINT typeCount = typelib->GetTypeInfoCount();
     for (UINT index = 0; index < typeCount; ++index) {
@@ -1304,8 +1304,8 @@ bool generateTypeLibrary(QString typeLibFile, QString outname,
         implOut << "struct qt_meta_stringdata_all_t {" << endl;
         implOut << "    QByteArrayData data[" << strings.size() << "];" << endl;
 
-        QVector<QList<QByteArray> > listVector;
-        QList<QByteArray> currentList;
+        QVector<QByteArrayList> listVector;
+        QByteArrayList currentList;
 
         int currentTableLen = 0;
         for (const auto &s : strings) {
diff --git a/tools/testcon/ambientproperties.cpp b/tools/testcon/ambientproperties.cpp
index ae759f5..83ef2e2 100644
--- a/tools/testcon/ambientproperties.cpp
+++ b/tools/testcon/ambientproperties.cpp
@@ -122,7 +122,7 @@ QWidgetList AmbientProperties::mdiAreaWidgets() const
     QWidgetList result;
 
     if (QMdiArea *mdiArea = qobject_cast<QMdiArea*>(container)) {
-        const QList<QMdiSubWindow *> mdiSubWindows = mdiArea->subWindowList();
+        const auto mdiSubWindows = mdiArea->subWindowList();
         for (const QMdiSubWindow *subWindow : mdiSubWindows)
             result.push_back(subWindow->widget());
     }
diff --git a/tools/testcon/changeproperties.cpp b/tools/testcon/changeproperties.cpp
index 4ec1332..e3356ed 100644
--- a/tools/testcon/changeproperties.cpp
+++ b/tools/testcon/changeproperties.cpp
@@ -144,7 +144,7 @@ void ChangeProperties::on_buttonSet_clicked()
     case QVariant::List:
         {
             QStringList txtList = editValue->text().split(QRegularExpression(QLatin1String("[,;]")));
-            QList<QVariant> varList;
+            QVariantList varList;
             for (int i = 0; i < txtList.count(); ++i) {
                 QVariant svar(txtList.at(i));
                 QString str = svar.toString();
@@ -234,7 +234,7 @@ void ChangeProperties::updateProperties()
                 break;
             case QVariant::List:
                 {
-                    const QList<QVariant> varList = var.toList();
+                    const auto varList = var.toList();
                     QStringList strList;
                     for (const auto &var : varList)
                         strList << var.toString();
diff --git a/tools/testcon/invokemethod.cpp b/tools/testcon/invokemethod.cpp
index 796f0e7..2c30705 100644
--- a/tools/testcon/invokemethod.cpp
+++ b/tools/testcon/invokemethod.cpp
@@ -86,7 +86,7 @@ void InvokeMethod::on_buttonInvoke_clicked()
 
     on_buttonSet_clicked();
     QString method = comboMethods->currentText();
-    QList<QVariant> vars;
+    QVariantList vars;
 
     int itemCount = listParameters->topLevelItemCount();
     for (int i = 0; i < itemCount; ++i) {
@@ -117,8 +117,8 @@ void InvokeMethod::on_comboMethods_activated(const QString &method)
     signature.remove(0, signature.indexOf(QLatin1Char('(')) + 1);
     signature.truncate(signature.length()-1);
 
-    QList<QByteArray> pnames = slot.parameterNames();
-    QList<QByteArray> ptypes = slot.parameterTypes();
+    const auto pnames = slot.parameterNames();
+    const auto ptypes = slot.parameterTypes();
 
     for (int p = 0; p < ptypes.count(); ++p) {
         QString ptype(QString::fromLatin1(ptypes.at(p)));
diff --git a/tools/testcon/mainwindow.cpp b/tools/testcon/mainwindow.cpp
index 14db741..8e483b3 100644
--- a/tools/testcon/mainwindow.cpp
+++ b/tools/testcon/mainwindow.cpp
@@ -105,10 +105,10 @@ QAxWidget *MainWindow::activeAxWidget() const
     return nullptr;
 }
 
-QList<QAxWidget *> MainWindow::axWidgets() const
+QVector<QAxWidget *> MainWindow::axWidgets() const
 {
-    QList<QAxWidget *> result;
-    const QList<QMdiSubWindow *> mdiSubWindows = m_mdiArea->subWindowList();
+    QVector<QAxWidget *> result;
+    const auto mdiSubWindows = m_mdiArea->subWindowList();
     for (const QMdiSubWindow *subWindow : mdiSubWindows)
         if (QAxWidget *axWidget = qobject_cast<QAxWidget *>(subWindow->widget()))
             result.push_back(axWidget);
@@ -463,7 +463,7 @@ bool MainWindow::loadScript(const QString &file)
         m_scripts->addObject(this);
     }
 
-    const QList<QAxWidget *> axw = axWidgets();
+    const auto axw = axWidgets();
     for (QAxWidget *axWidget : axw) {
         QAxBase *ax = axWidget;
         m_scripts->addObject(ax);
@@ -547,7 +547,7 @@ void MainWindow::updateGUI()
     if (m_dlgProperties)
         m_dlgProperties->setControl(hasControl ? container : nullptr);
 
-    const QList<QAxWidget *> axw = axWidgets();
+    const auto axw = axWidgets();
     for (QAxWidget *container : axw) {
         container->disconnect(SIGNAL(signal(QString,int,void*)));
         if (actionLogSignals->isChecked())
diff --git a/tools/testcon/mainwindow.h b/tools/testcon/mainwindow.h
index b3be5c0..8975201 100644
--- a/tools/testcon/mainwindow.h
+++ b/tools/testcon/mainwindow.h
@@ -30,6 +30,7 @@
 #define MAINWINDOW_H
 
 #include <ActiveQt/QAxSelect>
+#include <QVector>
 
 #include "ui_mainwindow.h"
 
@@ -96,7 +97,7 @@ protected slots:
 
 private:
     QAxWidget *activeAxWidget() const;
-    QList<QAxWidget *> axWidgets() const;
+    QVector<QAxWidget *> axWidgets() const;
 
     static MainWindow *m_instance;