diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-22 12:12:52 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-25 07:54:07 +0200 |
commit | dd71c43b9718be3523ed6b307a3402f88de070e1 (patch) | |
tree | 16d98b58843a729ad9153142121a5371ff305af5 /examples | |
parent | 10669911b7beac620989d69653334fb6ee477744 (diff) |
Use QList instead of QVector
Task-number: QTBUG-84469
Change-Id: I4c3353c00a566023503fbc178ba8454391dc334c
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/qml/referenceexamples/properties/birthdayparty.h | 4 | ||||
-rw-r--r-- | examples/quick/quickwidgets/qquickviewcomparison/logo.h | 4 | ||||
-rw-r--r-- | examples/quick/scenegraph/shared/logorenderer.h | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/examples/qml/referenceexamples/properties/birthdayparty.h b/examples/qml/referenceexamples/properties/birthdayparty.h index a5704972cc..9da5158de2 100644 --- a/examples/qml/referenceexamples/properties/birthdayparty.h +++ b/examples/qml/referenceexamples/properties/birthdayparty.h @@ -51,7 +51,7 @@ #define BIRTHDAYPARTY_H #include <QObject> -#include <QVector> +#include <QList> #include <QQmlListProperty> #include "person.h" @@ -91,7 +91,7 @@ private: static void removeLastGuest(QQmlListProperty<Person>*); Person *m_host; - QVector<Person *> m_guests; + QList<Person *> m_guests; }; // ![3] diff --git a/examples/quick/quickwidgets/qquickviewcomparison/logo.h b/examples/quick/quickwidgets/qquickviewcomparison/logo.h index 6cb35a28c4..7e58bbb7b7 100644 --- a/examples/quick/quickwidgets/qquickviewcomparison/logo.h +++ b/examples/quick/quickwidgets/qquickviewcomparison/logo.h @@ -52,7 +52,7 @@ #define LOGO_H #include <qopengl.h> -#include <QVector> +#include <QList> #include <QVector3D> class Logo @@ -68,7 +68,7 @@ private: void extrude(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2); void add(const QVector3D &v, const QVector3D &n); - QVector<GLfloat> m_data; + QList<GLfloat> m_data; int m_count; }; diff --git a/examples/quick/scenegraph/shared/logorenderer.h b/examples/quick/scenegraph/shared/logorenderer.h index 03821919a9..e39a2db57d 100644 --- a/examples/quick/scenegraph/shared/logorenderer.h +++ b/examples/quick/scenegraph/shared/logorenderer.h @@ -57,7 +57,7 @@ #include <qopenglfunctions.h> #include <QTime> -#include <QVector> +#include <QList> class LogoRenderer : protected QOpenGLFunctions { @@ -78,8 +78,8 @@ private: void quad(qreal x1, qreal y1, qreal x2, qreal y2, qreal x3, qreal y3, qreal x4, qreal y4); void extrude(qreal x1, qreal y1, qreal x2, qreal y2); - QVector<QVector3D> vertices; - QVector<QVector3D> normals; + QList<QVector3D> vertices; + QList<QVector3D> normals; QOpenGLShaderProgram program1; int vertexAttr1; int normalAttr1; |