From 29c99bddbf48f97b054a34354f55b36a3f84a62c Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 22 Jun 2020 10:12:38 +0200 Subject: Use QList instead of QVector in examples Task-number: QTBUG-84469 Change-Id: Id14119168bb1bf11f99bda7ef6ee9cf51bcfab2e Reviewed-by: Sona Kurazyan --- examples/opengl/qopenglwidget/glwidget.cpp | 2 +- examples/opengl/qopenglwidget/glwidget.h | 8 ++++---- examples/opengl/qopenglwidget/mainwindow.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'examples/opengl/qopenglwidget') diff --git a/examples/opengl/qopenglwidget/glwidget.cpp b/examples/opengl/qopenglwidget/glwidget.cpp index 89c8469662..a480fe5726 100644 --- a/examples/opengl/qopenglwidget/glwidget.cpp +++ b/examples/opengl/qopenglwidget/glwidget.cpp @@ -319,7 +319,7 @@ void GLWidget::initializeGL() // let's do something different and potentially more efficient: create a // properly interleaved data set. const int vertexCount = m_vertices.count(); - QVector buf; + QList buf; buf.resize(vertexCount * 3 * 2); GLfloat *p = buf.data(); for (int i = 0; i < vertexCount; ++i) { diff --git a/examples/opengl/qopenglwidget/glwidget.h b/examples/opengl/qopenglwidget/glwidget.h index 99288261c0..50f8aa9be5 100644 --- a/examples/opengl/qopenglwidget/glwidget.h +++ b/examples/opengl/qopenglwidget/glwidget.h @@ -57,7 +57,7 @@ #include #include #include -#include +#include #include class Bubble; @@ -101,10 +101,10 @@ private: qreal m_fAngle = 0; qreal m_fScale = 1; bool m_showBubbles = true; - QVector m_vertices; - QVector m_normals; + QList m_vertices; + QList m_normals; bool m_qtLogo = true; - QVector m_bubbles; + QList m_bubbles; int m_frames = 0; QElapsedTimer m_time; QOpenGLShader *m_vshader1 = nullptr; diff --git a/examples/opengl/qopenglwidget/mainwindow.h b/examples/opengl/qopenglwidget/mainwindow.h index bec1a563e0..43cc55100e 100644 --- a/examples/opengl/qopenglwidget/mainwindow.h +++ b/examples/opengl/qopenglwidget/mainwindow.h @@ -77,7 +77,7 @@ private: QGridLayout *m_layout; int m_nextX; int m_nextY; - QVector m_glWidgets; + QList m_glWidgets; }; #endif -- cgit v1.2.1