diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-07-06 16:37:47 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-07-07 11:48:45 +0200 |
commit | d33655a9531b750e1574742ff575f871c19ed808 (patch) | |
tree | 8b90d1878dd5f0d9ea38bc048b22f718273bb802 /tests/auto | |
parent | a02d2d3f22acbf9afb349964f5da00d0e91af887 (diff) |
Use QList instead of QVector in other qtbase tests
Task-number: QTBUG-84469
Change-Id: Ie0455c890c048c52eacad1badd6d21df999badf9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/cmake/test_import_plugins/main.cpp | 4 | ||||
-rw-r--r-- | tests/auto/network/access/hsts/tst_qhsts.cpp | 4 | ||||
-rw-r--r-- | tests/auto/network/ssl/qdtls/tst_qdtls.cpp | 6 | ||||
-rw-r--r-- | tests/auto/tools/moc/template-gtgt.h | 4 | ||||
-rw-r--r-- | tests/auto/widgets/itemviews/qitemview/viewstotest.cpp | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/tests/auto/cmake/test_import_plugins/main.cpp b/tests/auto/cmake/test_import_plugins/main.cpp index 9fcc81754b..2918d557d9 100644 --- a/tests/auto/cmake/test_import_plugins/main.cpp +++ b/tests/auto/cmake/test_import_plugins/main.cpp @@ -48,10 +48,10 @@ ** ****************************************************************************/ +#include <QList> #include <QPluginLoader> #include <QSet> #include <QString> -#include <QVector> #include <cstddef> #include <iostream> @@ -67,7 +67,7 @@ int main(int argc, char **argv) expectedPluginSet.insert(expectedPlugins[i]); } - QVector<QStaticPlugin> plugins = QPluginLoader::staticPlugins(); + QList<QStaticPlugin> plugins = QPluginLoader::staticPlugins(); QSet<QString> actualPluginSet; for (QStaticPlugin plugin : plugins) { actualPluginSet.insert(plugin.metaData()["className"].toString()); diff --git a/tests/auto/network/access/hsts/tst_qhsts.cpp b/tests/auto/network/access/hsts/tst_qhsts.cpp index d72991a2eb..b81ea31c03 100644 --- a/tests/auto/network/access/hsts/tst_qhsts.cpp +++ b/tests/auto/network/access/hsts/tst_qhsts.cpp @@ -29,10 +29,10 @@ #include <QtTest/QtTest> #include <QtCore/qdatetime.h> -#include <QtCore/qvector.h> +#include <QtCore/qdir.h> +#include <QtCore/qlist.h> #include <QtCore/qpair.h> #include <QtCore/qurl.h> -#include <QtCore/qdir.h> #include <QtNetwork/private/qhstsstore_p.h> #include <QtNetwork/private/qhsts_p.h> diff --git a/tests/auto/network/ssl/qdtls/tst_qdtls.cpp b/tests/auto/network/ssl/qdtls/tst_qdtls.cpp index 9faa17e929..0607a4b656 100644 --- a/tests/auto/network/ssl/qdtls/tst_qdtls.cpp +++ b/tests/auto/network/ssl/qdtls/tst_qdtls.cpp @@ -39,11 +39,11 @@ #include <QtNetwork/qdtls.h> #include <QtNetwork/qssl.h> -#include <QtCore/qcryptographichash.h> #include <QtCore/qbytearray.h> -#include <QtCore/qvector.h> -#include <QtCore/qstring.h> +#include <QtCore/qcryptographichash.h> +#include <QtCore/qlist.h> #include <QtCore/qobject.h> +#include <QtCore/qstring.h> #include <algorithm> diff --git a/tests/auto/tools/moc/template-gtgt.h b/tests/auto/tools/moc/template-gtgt.h index 411b8c4266..3f504c053b 100644 --- a/tests/auto/tools/moc/template-gtgt.h +++ b/tests/auto/tools/moc/template-gtgt.h @@ -31,13 +31,13 @@ template<class TYPE, size_t COUNT> class myTemplate : QString, - QVector<TYPE, QList<COUNT>> + QList<TYPE, QList<COUNT>> {}; template<class TYPE, size_t COUNT> class myTemplate2 : QString, - QVector<TYPE, QList< (4 >> 2) >> + QList<TYPE, QList< (4 >> 2) >> {}; class Widget : public QWidget diff --git a/tests/auto/widgets/itemviews/qitemview/viewstotest.cpp b/tests/auto/widgets/itemviews/qitemview/viewstotest.cpp index c55cc865fc..19f0b80cc6 100644 --- a/tests/auto/widgets/itemviews/qitemview/viewstotest.cpp +++ b/tests/auto/widgets/itemviews/qitemview/viewstotest.cpp @@ -58,7 +58,7 @@ public: Display display; }; - QVector<test> tests; + QList<test> tests; }; |