From 9fa3cf15c8500fba5bbb861f1925160815ae2afd Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 22 Jun 2020 11:44:14 +0200 Subject: Use QList instead of QVector in gui Applied to headers only. Source file to be changed separately. Task-number: QTBUG-84469 Change-Id: Ic08a899321eaffc46b8461aaee3dbaa4d2c727a9 Reviewed-by: Laszlo Agocs --- src/gui/painting/qtriangulator_p.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/gui/painting/qtriangulator_p.h') diff --git a/src/gui/painting/qtriangulator_p.h b/src/gui/painting/qtriangulator_p.h index 177e5e66ed..e07fcae090 100644 --- a/src/gui/painting/qtriangulator_p.h +++ b/src/gui/painting/qtriangulator_p.h @@ -52,8 +52,8 @@ // #include -#include #include +#include QT_BEGIN_NAMESPACE @@ -67,13 +67,13 @@ public: inline Type type() const { return t; } - inline void setDataUint(const QVector &data) + inline void setDataUint(const QList &data) { t = UnsignedInt; indices32 = data; } - inline void setDataUshort(const QVector &data) + inline void setDataUshort(const QList &data) { t = UnsignedShort; indices16 = data; @@ -96,20 +96,20 @@ public: private: Type t; - QVector indices32; - QVector indices16; + QList indices32; + QList indices16; }; struct QTriangleSet { // The vertices of a triangle are given by: (x[i[n]], y[i[n]]), (x[j[n]], y[j[n]]), (x[k[n]], y[k[n]]), n = 0, 1, ... - QVector vertices; // [x[0], y[0], x[1], y[1], x[2], ...] + QList vertices; // [x[0], y[0], x[1], y[1], x[2], ...] QVertexIndexVector indices; // [i[0], j[0], k[0], i[1], j[1], k[1], i[2], ...] }; struct QPolylineSet { - QVector vertices; // [x[0], y[0], x[1], y[1], x[2], ...] + QList vertices; // [x[0], y[0], x[1], y[1], x[2], ...] QVertexIndexVector indices; // End of polyline is marked with -1. }; -- cgit v1.2.3