diff options
41 files changed, 119 insertions, 118 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; }; diff --git a/tests/benchmarks/corelib/tools/qhash/main.cpp b/tests/benchmarks/corelib/tools/qhash/main.cpp index 95f2616005..f9b1624fcc 100644 --- a/tests/benchmarks/corelib/tools/qhash/main.cpp +++ b/tests/benchmarks/corelib/tools/qhash/main.cpp @@ -157,7 +157,7 @@ template <typename String> void tst_QHash::hashing_template() // just the hashing function QFETCH(QStringList, items); - QVector<String> realitems; + QList<String> realitems; realitems.reserve(items.size()); foreach (const QString &s, items) realitems.append(s); diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/webview_p.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/webview_p.h index bd4047c134..98817e6762 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/webview_p.h +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/webview_p.h @@ -75,8 +75,8 @@ public: private: - QVector<QRectF> m_tileRects; - QVector<QPixmapCache::Key> m_tilePixmaps; + QList<QRectF> m_tileRects; + QList<QPixmapCache::Key> m_tilePixmaps; QSizeF m_itemSize; QGraphicsWebView *m_webView; diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/chip.h b/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/chip.h index c14f8c41de..1f5142f35f 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/chip.h +++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/chip.h @@ -49,7 +49,7 @@ protected: private: int x, y; QColor color; - QVector<QPointF> stuff; + QList<QPointF> stuff; }; #endif diff --git a/tests/manual/corelib/tools/qlist/main.cpp b/tests/manual/corelib/tools/qlist/main.cpp index 0b54105f5e..1553962d32 100644 --- a/tests/manual/corelib/tools/qlist/main.cpp +++ b/tests/manual/corelib/tools/qlist/main.cpp @@ -26,7 +26,8 @@ ** ****************************************************************************/ #include <QDebug> -#include <QVector> +#include <QList> + void testErase() { QList<int> a, b; diff --git a/tests/manual/diaglib/logwidget.cpp b/tests/manual/diaglib/logwidget.cpp index 18a82d819e..4a6348f03a 100644 --- a/tests/manual/diaglib/logwidget.cpp +++ b/tests/manual/diaglib/logwidget.cpp @@ -35,7 +35,7 @@ #include <QStyle> #include <QtCore/QDebug> -#include <QtCore/QVector> +#include <QtCore/QList> #include <QtCore/QStringList> #include <iostream> @@ -88,9 +88,9 @@ QString LogWidget::startupMessage() return result; } -static const QVector<QString> &messageTypes() +static const QList<QString> &messageTypes() { - static QVector<QString> result; + static QList<QString> result; if (result.isEmpty()) { result << QLatin1String("debug") << QLatin1String("warn") << QLatin1String("critical") << QLatin1String("fatal") diff --git a/tests/manual/diaglib/nativewindowdump_win.cpp b/tests/manual/diaglib/nativewindowdump_win.cpp index d99a3a3d38..8fbd634937 100644 --- a/tests/manual/diaglib/nativewindowdump_win.cpp +++ b/tests/manual/diaglib/nativewindowdump_win.cpp @@ -29,11 +29,11 @@ #include "nativewindowdump.h" #include "qwindowdump.h" -#include <QtCore/QTextStream> -#include <QtCore/QSharedPointer> #include <QtCore/QDebug> +#include <QtCore/QList> #include <QtCore/QRect> -#include <QtCore/QVector> +#include <QtCore/QSharedPointer> +#include <QtCore/QTextStream> #include <QtCore/qt_windows.h> @@ -253,7 +253,7 @@ static void dumpNativeWindowRecursionByZ(HWND hwnd, DumpContext *dc) } } -typedef QVector<WId> WIdVector; +typedef QList<WId> WIdVector; static void dumpNativeWindows(const WIdVector& wins) { diff --git a/tests/manual/foreignwindows/main.cpp b/tests/manual/foreignwindows/main.cpp index 436538df70..cad71d183a 100644 --- a/tests/manual/foreignwindows/main.cpp +++ b/tests/manual/foreignwindows/main.cpp @@ -59,8 +59,8 @@ QT_USE_NAMESPACE using WidgetPtr = QSharedPointer<QWidget>; -using WidgetPtrList = QVector<WidgetPtr>; -using WIdList = QVector<WId>; +using WidgetPtrList = QList<WidgetPtr>; +using WIdList = QList<WId>; // Create some pre-defined Windows controls by class name static WId createInternalWindow(const QString &name) diff --git a/tests/manual/highdpi/main.cpp b/tests/manual/highdpi/main.cpp index 2a9fb6aa0c..d4fe1d00c6 100644 --- a/tests/manual/highdpi/main.cpp +++ b/tests/manual/highdpi/main.cpp @@ -102,7 +102,7 @@ protected: QWidget *m_widget = nullptr; }; -using DemoContainerList = QVector<DemoContainerBase*>; +using DemoContainerList = QList<DemoContainerBase*>; template <class T> class DemoContainer : public DemoContainerBase @@ -551,7 +551,7 @@ QMenu *MainWindow::addNewMenu(const QString &title, int itemCount) void MainWindow::maskActionToggled(bool t) { if (t) { - QVector<QPoint> upperLeftTriangle; + QList<QPoint> upperLeftTriangle; upperLeftTriangle << QPoint(0, 0) << QPoint(width(), 0) << QPoint(0, height()); setMask(QRegion(QPolygon(upperLeftTriangle))); } else { @@ -851,7 +851,7 @@ public: private: QPoint lastMousePoint; - QVector<QPoint> linePoints; + QList<QPoint> linePoints; }; void LinePainter::paintEvent(QPaintEvent *) diff --git a/tests/manual/lance/widgets.h b/tests/manual/lance/widgets.h index 09b2c3e667..d8cc12cab5 100644 --- a/tests/manual/lance/widgets.h +++ b/tests/manual/lance/widgets.h @@ -291,7 +291,7 @@ public: QSize sizeHint() const { return QSize(800, 800); } - QVector<QPointF> m_controlPoints; + QList<QPointF> m_controlPoints; int m_currentPoint; bool m_showControlPoints; diff --git a/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp b/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp index f5c3bfde34..c7fd8b0cf3 100644 --- a/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp +++ b/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp @@ -27,15 +27,15 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <QtCore/QThread> -#include <QtCore/QSemaphore> #include <QtCore/QElapsedTimer> +#include <QtCore/QList> +#include <QtCore/QSemaphore> #include <QtCore/QSharedPointer> -#include <QtCore/QVector> -#include <QtNetwork/QTcpSocket> -#include <QtNetwork/QSslSocket> -#include <QtNetwork/QNetworkReply> +#include <QtCore/QThread> #include <QtNetwork/QNetworkAccessManager> +#include <QtNetwork/QNetworkReply> +#include <QtNetwork/QSslSocket> +#include <QtNetwork/QTcpSocket> #ifdef QT_BUILD_INTERNAL # include <private/qnetworkaccessmanager_p.h> @@ -71,7 +71,7 @@ public: qint64 byteCounter; QNetworkAccessManager manager; - QVector<QUrl> httpUrls, httpsUrls, mixedUrls; + QList<QUrl> httpUrls, httpsUrls, mixedUrls; bool intermediateDebug; private: @@ -125,7 +125,7 @@ tst_NetworkRemoteStressTest::tst_NetworkRemoteStressTest() void tst_NetworkRemoteStressTest::initTestCase_data() { - QTest::addColumn<QVector<QUrl> >("urlList"); + QTest::addColumn<QList<QUrl>>("urlList"); QTest::addColumn<bool>("useSslSocket"); QTest::newRow("no-ssl") << httpUrls << false; @@ -215,7 +215,7 @@ bool nativeSelect(int fd, int timeout, bool selectForWrite) void tst_NetworkRemoteStressTest::blockingSequentialRemoteHosts() { - QFETCH_GLOBAL(QVector<QUrl>, urlList); + QFETCH_GLOBAL(QList<QUrl>, urlList); QFETCH_GLOBAL(bool, useSslSocket); qint64 totalBytes = 0; @@ -280,7 +280,7 @@ void tst_NetworkRemoteStressTest::blockingSequentialRemoteHosts() void tst_NetworkRemoteStressTest::sequentialRemoteHosts() { - QFETCH_GLOBAL(QVector<QUrl>, urlList); + QFETCH_GLOBAL(QList<QUrl>, urlList); QFETCH_GLOBAL(bool, useSslSocket); #ifdef QT_NO_SSL @@ -354,7 +354,7 @@ void tst_NetworkRemoteStressTest::parallelRemoteHosts_data() void tst_NetworkRemoteStressTest::parallelRemoteHosts() { - QFETCH_GLOBAL(QVector<QUrl>, urlList); + QFETCH_GLOBAL(QList<QUrl>, urlList); QFETCH_GLOBAL(bool, useSslSocket); QFETCH(int, parallelAttempts); @@ -367,13 +367,13 @@ void tst_NetworkRemoteStressTest::parallelRemoteHosts() QElapsedTimer outerTimer; outerTimer.start(); - QVector<QUrl>::ConstIterator it = urlList.constBegin(); + auto it = urlList.constBegin(); while (it != urlList.constEnd()) { QElapsedTimer timeout; byteCounter = 0; timeout.start(); - QVector<QSharedPointer<QTcpSocket> > sockets; + QList<QSharedPointer<QTcpSocket> > sockets; sockets.reserve(parallelAttempts); for (int j = 0; j < parallelAttempts && it != urlList.constEnd(); ++j, ++it) { const QUrl &url = *it; @@ -449,7 +449,7 @@ void tst_NetworkRemoteStressTest::namRemoteGet_data() void tst_NetworkRemoteStressTest::namRemoteGet() { - QFETCH_GLOBAL(QVector<QUrl>, urlList); + QFETCH_GLOBAL(QList<QUrl>, urlList); QFETCH(int, parallelAttempts); bool pipelineAllowed = false;// QFETCH(bool, pipelineAllowed); @@ -458,7 +458,7 @@ void tst_NetworkRemoteStressTest::namRemoteGet() QElapsedTimer outerTimer; outerTimer.start(); - QVector<QUrl>::ConstIterator it = urlList.constBegin(); + auto it = urlList.constBegin(); while (it != urlList.constEnd()) { QElapsedTimer timeout; byteCounter = 0; @@ -467,7 +467,7 @@ void tst_NetworkRemoteStressTest::namRemoteGet() QNetworkRequest req; req.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, pipelineAllowed); - QVector<QSharedPointer<QNetworkReply> > replies; + QList<QSharedPointer<QNetworkReply> > replies; replies.reserve(parallelAttempts); for (int j = 0; j < parallelAttempts && it != urlList.constEnd(); ++j) { req.setUrl(*it++); diff --git a/tests/manual/network_stresstest/tst_network_stresstest.cpp b/tests/manual/network_stresstest/tst_network_stresstest.cpp index 5f2fd2b24e..46ad56758d 100644 --- a/tests/manual/network_stresstest/tst_network_stresstest.cpp +++ b/tests/manual/network_stresstest/tst_network_stresstest.cpp @@ -27,14 +27,14 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <QtCore/QThread> -#include <QtCore/QSemaphore> #include <QtCore/QElapsedTimer> +#include <QtCore/QList> +#include <QtCore/QSemaphore> #include <QtCore/QSharedPointer> -#include <QtCore/QVector> -#include <QtNetwork/QTcpSocket> -#include <QtNetwork/QNetworkReply> +#include <QtCore/QThread> #include <QtNetwork/QNetworkAccessManager> +#include <QtNetwork/QNetworkReply> +#include <QtNetwork/QTcpSocket> #ifdef QT_BUILD_INTERNAL # include <private/qnetworkaccessmanager_p.h> @@ -729,7 +729,7 @@ void tst_NetworkStressTest::namGet() QNetworkRequest req(url); req.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, pipelineAllowed); - QVector<QSharedPointer<QNetworkReply> > replies; + QList<QSharedPointer<QNetworkReply> > replies; replies.resize(parallelAttempts); for (int j = 0; j < parallelAttempts; ++j) { QNetworkReply *r = manager.get(req); diff --git a/tests/manual/qopenglcontext/qopenglcontextwindow.cpp b/tests/manual/qopenglcontext/qopenglcontextwindow.cpp index 67898c0028..4a369f8eda 100644 --- a/tests/manual/qopenglcontext/qopenglcontextwindow.cpp +++ b/tests/manual/qopenglcontext/qopenglcontextwindow.cpp @@ -112,7 +112,7 @@ void QOpenGLContextWindow::createForeignContext() QSurfaceFormat fmt = format(); EGLConfig config = q_configFromGLFormat(dpy, fmt); - QVector<EGLint> contextAttrs; + QList<EGLint> contextAttrs; contextAttrs.append(EGL_CONTEXT_CLIENT_VERSION); contextAttrs.append(fmt.majorVersion()); contextAttrs.append(EGL_NONE); diff --git a/tests/manual/qopenglwidget/openglwidget/main.cpp b/tests/manual/qopenglwidget/openglwidget/main.cpp index d2c11fdfd1..4e9ea13267 100644 --- a/tests/manual/qopenglwidget/openglwidget/main.cpp +++ b/tests/manual/qopenglwidget/openglwidget/main.cpp @@ -49,7 +49,7 @@ class Tools : public QObject Q_OBJECT public: - Tools(QWidget *root, QWidget *widgetToTurn, const QVector<QWidget *> glwidgets) + Tools(QWidget *root, QWidget *widgetToTurn, const QWidgetList &glwidgets) : m_root(root), m_widgetToTurn(widgetToTurn), m_glWidgets(glwidgets) { } void dump(); @@ -66,7 +66,7 @@ private: QWidget *m_root; QWidget *m_widgetToTurn; - QVector<QWidget *> m_glWidgets; + QWidgetList m_glWidgets; }; void Tools::turnNative() @@ -212,7 +212,7 @@ int main(int argc, char *argv[]) sw->setWindowTitle("Tabs"); TabWidgetResetter twr(tw); - Tools t(&wnd, glw3, QVector<QWidget *>() << glw << glw2 << glw3 << glw4); + Tools t(&wnd, glw3, QWidgetList { glw, glw2, glw3, glw4 }); QObject::connect(&t, SIGNAL(aboutToShowGLWidgets()), &twr, SLOT(reset())); QMenu *toolsMenu = wnd.menuBar()->addMenu("&Tools"); toolsMenu->addAction("&Turn widgets (or some parent) into native", &t, SLOT(turnNative())); diff --git a/tests/manual/qtabletevent/regular_widgets/main.cpp b/tests/manual/qtabletevent/regular_widgets/main.cpp index 38b8ae816d..056ff88dac 100644 --- a/tests/manual/qtabletevent/regular_widgets/main.cpp +++ b/tests/manual/qtabletevent/regular_widgets/main.cpp @@ -26,19 +26,19 @@ ** ****************************************************************************/ +#include <QAction> #include <QApplication> +#include <QCursor> #include <QDebug> -#include <QMouseEvent> -#include <QTabletEvent> +#include <QList> #include <QMainWindow> -#include <QMenuBar> #include <QMenu> -#include <QAction> -#include <QStatusBar> -#include <QVector> +#include <QMenuBar> +#include <QMouseEvent> #include <QPainter> #include <QPainterPath> -#include <QCursor> +#include <QStatusBar> +#include <QTabletEvent> enum TabletPointType { TabletButtonPress, @@ -125,8 +125,8 @@ private: bool m_lastIsMouseMove = false; bool m_lastIsTabletMove = false; Qt::MouseButton m_lastButton = Qt::NoButton; - QVector<TabletPoint> m_points; - QVector<QPointF> m_touchPoints; + QList<TabletPoint> m_points; + QList<QPointF> m_touchPoints; QPointF m_tabletPos; int m_tabletMoveCount = 0; int m_paintEventCount = 0; diff --git a/tests/manual/qvulkaninstance/main.cpp b/tests/manual/qvulkaninstance/main.cpp index 9b5f0ad072..f1bfa79669 100644 --- a/tests/manual/qvulkaninstance/main.cpp +++ b/tests/manual/qvulkaninstance/main.cpp @@ -178,7 +178,7 @@ void VWindow::init() uint32_t queueCount = 0; f->vkGetPhysicalDeviceQueueFamilyProperties(m_vkPhysDev, &queueCount, nullptr); - QVector<VkQueueFamilyProperties> queueFamilyProps(queueCount); + QList<VkQueueFamilyProperties> queueFamilyProps(queueCount); f->vkGetPhysicalDeviceQueueFamilyProperties(m_vkPhysDev, &queueCount, queueFamilyProps.data()); int gfxQueueFamilyIdx = -1; int presQueueFamilyIdx = -1; @@ -221,11 +221,11 @@ void VWindow::init() queueInfo[1].pQueuePriorities = prio; } - QVector<const char *> devLayers; + QList<const char *> devLayers; if (inst->layers().contains("VK_LAYER_LUNARG_standard_validation")) devLayers.append("VK_LAYER_LUNARG_standard_validation"); - QVector<const char *> devExts; + QList<const char *> devExts; devExts.append("VK_KHR_swapchain"); VkDeviceCreateInfo devInfo; @@ -314,7 +314,7 @@ void VWindow::recreateSwapChain() uint32_t formatCount = 0; m_vkGetPhysicalDeviceSurfaceFormatsKHR(m_vkPhysDev, m_vkSurface, &formatCount, nullptr); if (formatCount) { - QVector<VkSurfaceFormatKHR> formats(formatCount); + QList<VkSurfaceFormatKHR> formats(formatCount); m_vkGetPhysicalDeviceSurfaceFormatsKHR(m_vkPhysDev, m_vkSurface, &formatCount, formats.data()); if (formats[0].format != VK_FORMAT_UNDEFINED) { m_colorFormat = formats[0].format; diff --git a/tests/manual/repaint/shared/shared.h b/tests/manual/repaint/shared/shared.h index 0fb147434a..9ca5cbe2be 100644 --- a/tests/manual/repaint/shared/shared.h +++ b/tests/manual/repaint/shared/shared.h @@ -53,7 +53,7 @@ public: const int rectSize = 10; QRect rect(pos.x() - rectSize, pos.y() - rectSize, rectSize *2, rectSize * 2); - QVector<QRect> updateRects; + QList<QRect> updateRects; updateRects.append(rect.translated(rectSize * 2, rectSize * 2)); updateRects.append(rect.translated(rectSize * 2, -rectSize * 2)); updateRects.append(rect.translated(-rectSize * 2, rectSize * 2)); diff --git a/tests/manual/rhi/computebuffer/computebuffer.cpp b/tests/manual/rhi/computebuffer/computebuffer.cpp index ebff01d278..942de2821b 100644 --- a/tests/manual/rhi/computebuffer/computebuffer.cpp +++ b/tests/manual/rhi/computebuffer/computebuffer.cpp @@ -60,7 +60,7 @@ // everywhere. So in some cases the points will be of size 1. struct { - QVector<QRhiResource *> releasePool; + QList<QRhiResource *> releasePool; QRhiBuffer *sbuf = nullptr; QRhiBuffer *computeUniBuf = nullptr; QRhiShaderResourceBindings *computeBindings = nullptr; diff --git a/tests/manual/rhi/computeimage/computeimage.cpp b/tests/manual/rhi/computeimage/computeimage.cpp index d583778577..35c48a0451 100644 --- a/tests/manual/rhi/computeimage/computeimage.cpp +++ b/tests/manual/rhi/computeimage/computeimage.cpp @@ -54,7 +54,7 @@ // fragment shader is generated by the compute shader. struct { - QVector<QRhiResource *> releasePool; + QList<QRhiResource *> releasePool; QRhiTexture *texIn = nullptr; QRhiTexture *texOut = nullptr; diff --git a/tests/manual/rhi/cubemap/cubemap.cpp b/tests/manual/rhi/cubemap/cubemap.cpp index 84c17918f3..6004c39ea9 100644 --- a/tests/manual/rhi/cubemap/cubemap.cpp +++ b/tests/manual/rhi/cubemap/cubemap.cpp @@ -52,7 +52,7 @@ #include "../shared/cube.h" struct { - QVector<QRhiResource *> releasePool; + QList<QRhiResource *> releasePool; QRhiBuffer *vbuf = nullptr; QRhiBuffer *ubuf = nullptr; QRhiTexture *tex = nullptr; diff --git a/tests/manual/rhi/cubemap_render/cubemap_render.cpp b/tests/manual/rhi/cubemap_render/cubemap_render.cpp index 97c831f1f9..3417fbf7c2 100644 --- a/tests/manual/rhi/cubemap_render/cubemap_render.cpp +++ b/tests/manual/rhi/cubemap_render/cubemap_render.cpp @@ -79,7 +79,7 @@ static quint16 halfQuadIndexData[] = }; struct { - QVector<QRhiResource *> releasePool; + QList<QRhiResource *> releasePool; QRhiTexture *cubemap1 = nullptr; QRhiTexture *cubemap2 = nullptr; diff --git a/tests/manual/rhi/cubemap_scissor/cubemap_scissor.cpp b/tests/manual/rhi/cubemap_scissor/cubemap_scissor.cpp index cc30058afc..9a6d55ed69 100644 --- a/tests/manual/rhi/cubemap_scissor/cubemap_scissor.cpp +++ b/tests/manual/rhi/cubemap_scissor/cubemap_scissor.cpp @@ -59,7 +59,7 @@ #include "../shared/cube.h" struct { - QVector<QRhiResource *> releasePool; + QList<QRhiResource *> releasePool; QRhiBuffer *vbuf = nullptr; QRhiBuffer *ubuf = nullptr; QRhiTexture *tex = nullptr; diff --git a/tests/manual/rhi/float16texture_with_compute/float16texture_with_compute.cpp b/tests/manual/rhi/float16texture_with_compute/float16texture_with_compute.cpp index 014b521bd8..7310872748 100644 --- a/tests/manual/rhi/float16texture_with_compute/float16texture_with_compute.cpp +++ b/tests/manual/rhi/float16texture_with_compute/float16texture_with_compute.cpp @@ -77,7 +77,7 @@ static quint16 indexData[] = static const int MAX_MIP_LEVELS = 20; struct { - QVector<QRhiResource *> releasePool; + QList<QRhiResource *> releasePool; QRhiBuffer *vbuf = nullptr; QRhiBuffer *ibuf = nullptr; diff --git a/tests/manual/rhi/floattexture/floattexture.cpp b/tests/manual/rhi/floattexture/floattexture.cpp index 30f61c3e04..02403ed0af 100644 --- a/tests/manual/rhi/floattexture/floattexture.cpp +++ b/tests/manual/rhi/floattexture/floattexture.cpp @@ -212,7 +212,7 @@ static quint16 indexData[] = }; struct { - QVector<QRhiResource *> releasePool; + QList<QRhiResource *> releasePool; QRhiBuffer *vbuf = nullptr; QRhiBuffer *ibuf = nullptr; QRhiBuffer *ubuf = nullptr; diff --git a/tests/manual/rhi/instancing/instancing.cpp b/tests/manual/rhi/instancing/instancing.cpp index 9aafadc1b6..87a99b4581 100644 --- a/tests/manual/rhi/instancing/instancing.cpp +++ b/tests/manual/rhi/instancing/instancing.cpp @@ -58,7 +58,7 @@ const int INSTANCE_COUNT = 1024; struct { - QVector<QRhiResource *> releasePool; + QList<QRhiResource *> releasePool; QRhiBuffer *vbuf = nullptr; QRhiBuffer *instBuf = nullptr; diff --git a/tests/manual/rhi/mrt/mrt.cpp b/tests/manual/rhi/mrt/mrt.cpp index 03182bf170..cfe79419d1 100644 --- a/tests/manual/rhi/mrt/mrt.cpp +++ b/tests/manual/rhi/mrt/mrt.cpp @@ -77,7 +77,7 @@ static float triangleData[] = }; struct { - QVector<QRhiResource *> releasePool; + QList<QRhiResource *> releasePool; QRhiBuffer *vbuf = nullptr; QRhiBuffer *ibuf = nullptr; QRhiBuffer *ubuf = nullptr; diff --git a/tests/manual/rhi/msaarenderbuffer/msaarenderbuffer.cpp b/tests/manual/rhi/msaarenderbuffer/msaarenderbuffer.cpp index 26ea484d9e..fb30758bc1 100644 --- a/tests/manual/rhi/msaarenderbuffer/msaarenderbuffer.cpp +++ b/tests/manual/rhi/msaarenderbuffer/msaarenderbuffer.cpp @@ -74,7 +74,7 @@ static float triangleData[] = }; struct { - QVector<QRhiResource *> releasePool; + QList<QRhiResource *> releasePool; QRhiBuffer *vbuf = nullptr; QRhiBuffer *ibuf = nullptr; QRhiBuffer *ubuf = nullptr; diff --git a/tests/manual/rhi/msaatexture/msaatexture.cpp b/tests/manual/rhi/msaatexture/msaatexture.cpp index 1b735d2984..c22873342a 100644 --- a/tests/manual/rhi/msaatexture/msaatexture.cpp +++ b/tests/manual/rhi/msaatexture/msaatexture.cpp @@ -77,7 +77,7 @@ static float triangleData[] = const int UBUFSZ = 68; struct { - QVector<QRhiResource *> releasePool; + QList<QRhiResource *> releasePool; QRhiBuffer *vbuf = nullptr; QRhiBuffer *ibuf = nullptr; QRhiBuffer *ubuf = nullptr; diff --git a/tests/manual/rhi/multiwindow/multiwindow.cpp b/tests/manual/rhi/multiwindow/multiwindow.cpp index c5c667fe57..222f82b472 100644 --- a/tests/manual/rhi/multiwindow/multiwindow.cpp +++ b/tests/manual/rhi/multiwindow/multiwindow.cpp @@ -169,7 +169,7 @@ void destroyRhi() } struct { - QVector<QWindow *> windows; + QList<QWindow *> windows; QRhiBuffer *vbuf = nullptr; QRhiBuffer *ubuf = nullptr; @@ -295,7 +295,7 @@ protected: bool m_newlyExposed = false; QMatrix4x4 m_proj; - QVector<QRhiResource *> m_releasePool; + QList<QRhiResource *> m_releasePool; bool m_hasSwapChain = false; QRhiSwapChain *m_sc = nullptr; diff --git a/tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp b/tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp index 731e7221f3..3a2de89291 100644 --- a/tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp +++ b/tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp @@ -268,7 +268,7 @@ struct Renderer QColor m_bgColor; int m_rotationAxis; - QVector<QRhiResource *> m_releasePool; + QList<QRhiResource *> m_releasePool; bool m_hasSwapChain = false; QRhiSwapChain *m_sc = nullptr; QRhiRenderBuffer *m_ds = nullptr; @@ -691,7 +691,7 @@ struct WindowAndRenderer Renderer *renderer; }; -QVector<WindowAndRenderer> windows; +QList<WindowAndRenderer> windows; void createWindow() { diff --git a/tests/manual/rhi/qrhiprof/qrhiprof.cpp b/tests/manual/rhi/qrhiprof/qrhiprof.cpp index aa09f78bf3..2dea20ec22 100644 --- a/tests/manual/rhi/qrhiprof/qrhiprof.cpp +++ b/tests/manual/rhi/qrhiprof/qrhiprof.cpp @@ -92,7 +92,7 @@ public: }; }; - QVector<Param> params; + QList<Param> params; const Param *param(const char *key) const { auto it = std::find_if(params.cbegin(), params.cend(), [key](const Param &p) { diff --git a/tests/manual/rhi/shadowmap/shadowmap.cpp b/tests/manual/rhi/shadowmap/shadowmap.cpp index d6c5142854..dc533fea29 100644 --- a/tests/manual/rhi/shadowmap/shadowmap.cpp +++ b/tests/manual/rhi/shadowmap/shadowmap.cpp @@ -68,7 +68,7 @@ static quint16 quadIndexData[] = }; struct { - QVector<QRhiResource *> releasePool; + QList<QRhiResource *> releasePool; QRhiBuffer *vbuf = nullptr; QRhiBuffer *ibuf = nullptr; QRhiBuffer *ubuf = nullptr; diff --git a/tests/manual/rhi/texuploads/texuploads.cpp b/tests/manual/rhi/texuploads/texuploads.cpp index ee59c513ba..36be237a3d 100644 --- a/tests/manual/rhi/texuploads/texuploads.cpp +++ b/tests/manual/rhi/texuploads/texuploads.cpp @@ -59,7 +59,7 @@ struct { QRhiSampler *sampler = nullptr; QRhiShaderResourceBindings *srb = nullptr; QRhiGraphicsPipeline *ps = nullptr; - QVector<QRhiResource *> releasePool; + QList<QRhiResource *> releasePool; float rotation = 0; QRhiResourceUpdateBatch *initialUpdates = nullptr; diff --git a/tests/manual/textrendering/glyphshaping/main.cpp b/tests/manual/textrendering/glyphshaping/main.cpp index 6baf611b98..e76084cf1b 100644 --- a/tests/manual/textrendering/glyphshaping/main.cpp +++ b/tests/manual/textrendering/glyphshaping/main.cpp @@ -27,13 +27,13 @@ ****************************************************************************/ #include <QApplication> -#include <QStringList> -#include <QVector> -#include <QFile> #include <QDir> -#include <QPainter> +#include <QFile> #include <QFontMetrics> #include <QImage> +#include <QList> +#include <QPainter> +#include <QStringList> #include <QXmlStreamReader> static const int fontPixelSize = 25; @@ -47,7 +47,7 @@ struct testDataSet QString inputOriginal; QString output; QString outputOriginal; - QVector<uint> outputGlyphIDs; + QList<uint> outputGlyphIDs; QString outputGlyphIDsOriginal; }; diff --git a/tests/manual/touch/main.cpp b/tests/manual/touch/main.cpp index c8d1950f8c..d56b2c14f5 100644 --- a/tests/manual/touch/main.cpp +++ b/tests/manual/touch/main.cpp @@ -27,30 +27,30 @@ ****************************************************************************/ #include <QApplication> +#include <QAction> +#include <QCommandLineOption> +#include <QCommandLineParser> +#include <QDebug> #include <QGesture> #include <QLabel> +#include <QList> +#include <QMainWindow> #include <QMenu> #include <QMenuBar> -#include <QAction> -#include <QMainWindow> -#include <QSplitter> -#include <QStatusBar> -#include <QToolBar> -#include <QVector> -#include <QCommandLineOption> -#include <QCommandLineParser> -#include <QPlainTextEdit> #include <QPainter> #include <QPainterPath> #include <QPaintEvent> +#include <QPlainTextEdit> #include <QScreen> -#include <QWindow> #include <QSharedPointer> -#include <QDebug> +#include <QSplitter> +#include <QStatusBar> #include <QTextStream> +#include <QToolBar> +#include <QWindow> static bool optIgnoreTouch = false; -static QVector<Qt::GestureType> optGestures; +static QList<Qt::GestureType> optGestures; static QWidgetList mainWindows; @@ -192,9 +192,9 @@ Gesture *Gesture::fromQGesture(const QWidget *w, const QGesture *source) } typedef QSharedPointer<Gesture> GesturePtr; -typedef QVector<GesturePtr> GesturePtrs; +typedef QList<GesturePtr> GesturePtrs; -typedef QVector<QEvent::Type> EventTypeVector; +typedef QList<QEvent::Type> EventTypeVector; static EventTypeVector eventTypes; class EventFilter : public QObject { @@ -305,7 +305,7 @@ protected: private: void handleGestureEvent(QGestureEvent *gestureEvent); - QVector<Point> m_points; + QList<Point> m_points; GesturePtrs m_gestures; bool m_drawPoints; }; diff --git a/tests/manual/triangulator/triviswidget.h b/tests/manual/triangulator/triviswidget.h index aee80c6cad..7419746236 100644 --- a/tests/manual/triangulator/triviswidget.h +++ b/tests/manual/triangulator/triviswidget.h @@ -93,17 +93,17 @@ private: float m_strokeWidth = 1; bool m_dashStroke = false; - QVector<QPainterPath> m_paths; - QVector<QImage> m_strokePreviews; - QVector<QImage> m_fillPreviews; + QList<QPainterPath> m_paths; + QList<QImage> m_strokePreviews; + QList<QImage> m_fillPreviews; struct Vertex { float x, y; void set(float vx, float vy) { x = vx; y = vy; } }; - QVector<Vertex> m_fillVertices; - QVector<quint32> m_fillIndices; - QVector<Vertex> m_strokeVertices; + QList<Vertex> m_fillVertices; + QList<quint32> m_fillIndices; + QList<Vertex> m_strokeVertices; float m_zoom = 1; diff --git a/tests/manual/widgets/styles/main.cpp b/tests/manual/widgets/styles/main.cpp index 43580ce781..45ceff328b 100644 --- a/tests/manual/widgets/styles/main.cpp +++ b/tests/manual/widgets/styles/main.cpp @@ -32,19 +32,19 @@ #include <QGridLayout> #include <QGroupBox> #include <QLabel> +#include <QList> #include <QMainWindow> #include <QMenu> #include <QMenuBar> #include <QPalette> #include <QPixmap> #include <QPlainTextEdit> +#include <QScreen> #include <QStyle> #include <QTabWidget> #include <QTextStream> #include <QVBoxLayout> -#include <QVector> #include <QWindow> -#include <QScreen> // Format enumeration value and strip off the class name // added by QDebug: "QStyle::StandardPixmap(SP_Icon)" -> "SP_Icon". @@ -82,9 +82,9 @@ static bool operator<(const StyleIconEntry &e1, const StyleIconEntry &e2) return e1.name < e2.name; } -static QVector<StyleIconEntry> styleIconEntries() +static QList<StyleIconEntry> styleIconEntries() { - QVector<StyleIconEntry> result; + QList<StyleIconEntry> result; const int count = int(QStyle::SP_LineEditClearButton) + 1; result.reserve(count); for (int i = 0; i < count; ++i) { @@ -131,7 +131,7 @@ static QWidget *createStandardPixmapPage(QWidget *parent) QGridLayout *grid = new QGridLayout(result); int row = 0; int column = 0; - QVector<StyleIconEntry> entries = styleIconEntries(); + QList<StyleIconEntry> entries = styleIconEntries(); for (int i = 0, size = entries.size(); i < size; ++i) { grid->addWidget(createStandardPixmapDisplay(entries.at(i), parent), row, column++); if (column >= maxColumns) { @@ -169,7 +169,7 @@ static QWidget *createStandardIconPage(QWidget *parent) int column = 0; const int largeIconSize = parent->style()->pixelMetric(QStyle::PM_LargeIconSize); const QSize displaySize(largeIconSize, largeIconSize); - QVector<StyleIconEntry> entries = styleIconEntries(); + QList<StyleIconEntry> entries = styleIconEntries(); for (int i = 0, size = entries.size(); i < size; ++i) { grid->addWidget(createStandardIconDisplay(entries.at(i), displaySize, parent), row, column++); if (column >= maxColumns) { |