From 3c7d4de151d0d87b687644381c5d8aaef06f21b2 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Wed, 24 Jun 2020 10:25:01 +0200
Subject: Use QList instead of QVector

Task-number: QTBUG-84469
Change-Id: I4dc064b70adb054ca4add2dd662e7227255ff970
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 examples/datavisualization/volumetric/volumetric.h | 29 ++++++++++------------
 1 file changed, 13 insertions(+), 16 deletions(-)

(limited to 'examples/datavisualization/volumetric/volumetric.h')

diff --git a/examples/datavisualization/volumetric/volumetric.h b/examples/datavisualization/volumetric/volumetric.h
index f9db6df7..f76884d6 100644
--- a/examples/datavisualization/volumetric/volumetric.h
+++ b/examples/datavisualization/volumetric/volumetric.h
@@ -78,14 +78,11 @@ public Q_SLOTS:
     void setDrawSliceFrames(int enabled);
 
 private:
-
-    void initHeightMap(QString fileName, QVector<uchar> &layerData);
+    void initHeightMap(QString fileName, QList<uchar> &layerData);
     void initMineShaftArray();
-    int createVolume(int textureSize, int startIndex, int count,
-                      QVector<uchar> *textureData);
-    int excavateMineShaft(int textureSize, int startIndex, int count,
-                          QVector<uchar> *textureData);
-    void excavateMineBlock(int textureSize, int dataIndex, int size, QVector<uchar> *textureData);
+    int createVolume(int textureSize, int startIndex, int count, QList<uchar> *textureData);
+    int excavateMineShaft(int textureSize, int startIndex, int count, QList<uchar> *textureData);
+    void excavateMineBlock(int textureSize, int dataIndex, int size, QList<uchar> *textureData);
     void handleSlicingChanges();
 
     Q3DScatter *m_graph;
@@ -99,9 +96,9 @@ private:
     QLabel *m_fpsLabel;
     QRadioButton *m_mediumDetailRB;
     QRadioButton *m_highDetailRB;
-    QVector<uchar> *m_lowDetailData;
-    QVector<uchar> *m_mediumDetailData;
-    QVector<uchar> *m_highDetailData;
+    QList<uchar> *m_lowDetailData;
+    QList<uchar> *m_mediumDetailData;
+    QList<uchar> *m_highDetailData;
     QTimer m_timer;
     int m_mediumDetailIndex;
     int m_highDetailIndex;
@@ -110,17 +107,17 @@ private:
     QSlider *m_sliceSliderX;
     QSlider *m_sliceSliderY;
     QSlider *m_sliceSliderZ;
-    QVector<QRgb> m_colorTable1;
-    QVector<QRgb> m_colorTable2;
+    QList<QRgb> m_colorTable1;
+    QList<QRgb> m_colorTable2;
     bool m_usingPrimaryTable;
     QLabel *m_sliceLabelX;
     QLabel *m_sliceLabelY;
     QLabel *m_sliceLabelZ;
     QLabel *m_alphaMultiplierLabel;
-    QVector<uchar> m_magmaLayer;
-    QVector<uchar> m_waterLayer;
-    QVector<uchar> m_groundLayer;
-    QVector<QPair<QVector3D, QVector3D> > m_mineShaftArray;
+    QList<uchar> m_magmaLayer;
+    QList<uchar> m_waterLayer;
+    QList<uchar> m_groundLayer;
+    QList<QPair<QVector3D, QVector3D>> m_mineShaftArray;
 };
 
 #endif
-- 
cgit v1.2.3