From 3c7d4de151d0d87b687644381c5d8aaef06f21b2 Mon Sep 17 00:00:00 2001 From: Jarek Kobus 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 Reviewed-by: Lars Knoll --- .../data/abstractitemmodelhandler.cpp | 2 +- .../data/abstractitemmodelhandler_p.h | 2 +- src/datavisualization/data/baritemmodelhandler.cpp | 3 +- src/datavisualization/data/baritemmodelhandler_p.h | 2 +- src/datavisualization/data/barrenderitem_p.h | 4 +- src/datavisualization/data/customrenderitem.cpp | 2 +- src/datavisualization/data/customrenderitem_p.h | 8 +-- src/datavisualization/data/qbardataproxy.cpp | 2 +- src/datavisualization/data/qbardataproxy.h | 4 +- src/datavisualization/data/qcustom3dvolume.cpp | 81 +++++++++++----------- src/datavisualization/data/qcustom3dvolume.h | 25 +++---- src/datavisualization/data/qcustom3dvolume_p.h | 10 +-- src/datavisualization/data/qscatterdataproxy.cpp | 2 +- src/datavisualization/data/qscatterdataproxy.h | 2 +- src/datavisualization/data/qsurfacedataproxy.cpp | 4 +- src/datavisualization/data/qsurfacedataproxy.h | 2 +- .../data/scatteritemmodelhandler.cpp | 2 +- .../data/scatteritemmodelhandler_p.h | 2 +- src/datavisualization/data/scatterrenderitem_p.h | 2 +- .../data/surfaceitemmodelhandler.cpp | 2 +- .../data/surfaceitemmodelhandler_p.h | 2 +- 21 files changed, 82 insertions(+), 83 deletions(-) (limited to 'src/datavisualization/data') diff --git a/src/datavisualization/data/abstractitemmodelhandler.cpp b/src/datavisualization/data/abstractitemmodelhandler.cpp index aad01cd3..332d6861 100644 --- a/src/datavisualization/data/abstractitemmodelhandler.cpp +++ b/src/datavisualization/data/abstractitemmodelhandler.cpp @@ -137,7 +137,7 @@ void AbstractItemModelHandler::handleColumnsRemoved(const QModelIndex &parent, void AbstractItemModelHandler::handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, - const QVector &roles) + const QList &roles) { Q_UNUSED(topLeft) Q_UNUSED(bottomRight) diff --git a/src/datavisualization/data/abstractitemmodelhandler_p.h b/src/datavisualization/data/abstractitemmodelhandler_p.h index 20dceac3..62a78103 100644 --- a/src/datavisualization/data/abstractitemmodelhandler_p.h +++ b/src/datavisualization/data/abstractitemmodelhandler_p.h @@ -64,7 +64,7 @@ public Q_SLOTS: int destinationColumn); virtual void handleColumnsRemoved(const QModelIndex &parent, int start, int end); virtual void handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, - const QVector &roles = QVector ()); + const QList &roles = QList()); virtual void handleLayoutChanged(const QList &parents = QList(), QAbstractItemModel::LayoutChangeHint hint = QAbstractItemModel::NoLayoutChangeHint); virtual void handleModelReset(); diff --git a/src/datavisualization/data/baritemmodelhandler.cpp b/src/datavisualization/data/baritemmodelhandler.cpp index 182a6247..5a2d92cd 100644 --- a/src/datavisualization/data/baritemmodelhandler.cpp +++ b/src/datavisualization/data/baritemmodelhandler.cpp @@ -50,8 +50,7 @@ BarItemModelHandler::~BarItemModelHandler() } void BarItemModelHandler::handleDataChanged(const QModelIndex &topLeft, - const QModelIndex &bottomRight, - const QVector &roles) + const QModelIndex &bottomRight, const QList &roles) { // Do nothing if full reset already pending if (!m_fullReset) { diff --git a/src/datavisualization/data/baritemmodelhandler_p.h b/src/datavisualization/data/baritemmodelhandler_p.h index b297c5ab..20126bcc 100644 --- a/src/datavisualization/data/baritemmodelhandler_p.h +++ b/src/datavisualization/data/baritemmodelhandler_p.h @@ -54,7 +54,7 @@ public: public Q_SLOTS: virtual void handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, - const QVector &roles = QVector ()); + const QList &roles = QList()); protected: void virtual resolveModel(); diff --git a/src/datavisualization/data/barrenderitem_p.h b/src/datavisualization/data/barrenderitem_p.h index c421d871..29147722 100644 --- a/src/datavisualization/data/barrenderitem_p.h +++ b/src/datavisualization/data/barrenderitem_p.h @@ -93,8 +93,8 @@ protected: bool m_isNull; }; -typedef QVector BarRenderItemRow; -typedef QVector BarRenderItemArray; +typedef QList BarRenderItemRow; +typedef QList BarRenderItemArray; QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/data/customrenderitem.cpp b/src/datavisualization/data/customrenderitem.cpp index acdd27fe..ac998fba 100644 --- a/src/datavisualization/data/customrenderitem.cpp +++ b/src/datavisualization/data/customrenderitem.cpp @@ -73,7 +73,7 @@ void CustomRenderItem::setMesh(const QString &meshFile) ObjectHelper::resetObjectHelper(m_renderer, m_object, meshFile); } -void CustomRenderItem::setColorTable(const QVector &colors) +void CustomRenderItem::setColorTable(const QList &colors) { m_colorTable.resize(256); for (int i = 0; i < 256; i++) { diff --git a/src/datavisualization/data/customrenderitem_p.h b/src/datavisualization/data/customrenderitem_p.h index abf6e106..3ee423cb 100644 --- a/src/datavisualization/data/customrenderitem_p.h +++ b/src/datavisualization/data/customrenderitem_p.h @@ -99,9 +99,9 @@ public: inline void setTextureDepth(int depth) { m_textureDepth = depth; setSliceIndexZ(m_sliceIndexZ); } inline int textureDepth() const { return m_textureDepth; } inline int textureSize() const { return m_textureWidth * m_textureHeight * m_textureDepth; } - inline void setColorTable(const QVector &colors) { m_colorTable = colors; } - void setColorTable(const QVector &colors); - inline const QVector &colorTable() const { return m_colorTable; } + inline void setColorTable(const QList &colors) { m_colorTable = colors; } + void setColorTable(const QList &colors); + inline const QList &colorTable() const { return m_colorTable; } inline void setVolume(bool volume) { m_isVolume = volume; } inline bool isVolume() const { return m_isVolume; } inline void setTextureFormat(QImage::Format format) { m_textureFormat = format; } @@ -175,7 +175,7 @@ private: int m_textureWidth; int m_textureHeight; int m_textureDepth; - QVector m_colorTable; + QList m_colorTable; bool m_isVolume; QImage::Format m_textureFormat; int m_sliceIndexX; diff --git a/src/datavisualization/data/qbardataproxy.cpp b/src/datavisualization/data/qbardataproxy.cpp index 14f36253..c5d33535 100644 --- a/src/datavisualization/data/qbardataproxy.cpp +++ b/src/datavisualization/data/qbardataproxy.cpp @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION * \typedef QBarDataRow * \relates QBarDataProxy * - * A vector of \l {QBarDataItem} objects. + * A list of \l {QBarDataItem} objects. */ /*! diff --git a/src/datavisualization/data/qbardataproxy.h b/src/datavisualization/data/qbardataproxy.h index 67d8cb59..155e5794 100644 --- a/src/datavisualization/data/qbardataproxy.h +++ b/src/datavisualization/data/qbardataproxy.h @@ -32,7 +32,7 @@ #include #include -#include +#include #include Q_MOC_INCLUDE() @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION class QBarDataProxyPrivate; class QBar3DSeries; -typedef QVector QBarDataRow; +typedef QList QBarDataRow; typedef QList QBarDataArray; class QT_DATAVISUALIZATION_EXPORT QBarDataProxy : public QAbstractDataProxy diff --git a/src/datavisualization/data/qcustom3dvolume.cpp b/src/datavisualization/data/qcustom3dvolume.cpp index d54f34d1..8f524c2b 100644 --- a/src/datavisualization/data/qcustom3dvolume.cpp +++ b/src/datavisualization/data/qcustom3dvolume.cpp @@ -278,13 +278,14 @@ QCustom3DVolume::QCustom3DVolume(QObject *parent) : * \sa textureData, setTextureFormat(), colorTable */ QCustom3DVolume::QCustom3DVolume(const QVector3D &position, const QVector3D &scaling, - const QQuaternion &rotation, int textureWidth, - int textureHeight, int textureDepth, - QVector *textureData, QImage::Format textureFormat, - const QVector &colorTable, QObject *parent) : - QCustom3DItem(new QCustom3DVolumePrivate(this, position, scaling, rotation, textureWidth, - textureHeight, textureDepth, - textureData, textureFormat, colorTable), parent) + const QQuaternion &rotation, int textureWidth, int textureHeight, + int textureDepth, QList *textureData, + QImage::Format textureFormat, const QList &colorTable, + QObject *parent) + : QCustom3DItem(new QCustom3DVolumePrivate(this, position, scaling, rotation, textureWidth, + textureHeight, textureDepth, textureData, + textureFormat, colorTable), + parent) { } @@ -526,7 +527,7 @@ void QCustom3DVolume::setSliceIndices(int x, int y, int z) * * \sa textureData, setTextureFormat(), QImage::colorTable() */ -void QCustom3DVolume::setColorTable(const QVector &colors) +void QCustom3DVolume::setColorTable(const QList &colors) { if (dptr()->m_colorTable != colors) { dptr()->m_colorTable = colors; @@ -536,7 +537,7 @@ void QCustom3DVolume::setColorTable(const QVector &colors) } } -QVector QCustom3DVolume::colorTable() const +QList QCustom3DVolume::colorTable() const { return dptrc()->m_colorTable; } @@ -570,7 +571,7 @@ QVector QCustom3DVolume::colorTable() const * * \sa colorTable, setTextureFormat(), setSubTextureData(), textureDataWidth() */ -void QCustom3DVolume::setTextureData(QVector *data) +void QCustom3DVolume::setTextureData(QList *data) { if (dptr()->m_textureData != data) delete dptr()->m_textureData; @@ -596,7 +597,7 @@ void QCustom3DVolume::setTextureData(QVector *data) * * \sa textureData, textureWidth, textureHeight, textureDepth, setTextureFormat() */ -QVector *QCustom3DVolume::createTextureData(const QVector &images) +QList *QCustom3DVolume::createTextureData(const QList &images) { int imageCount = images.size(); if (imageCount) { @@ -631,7 +632,7 @@ QVector *QCustom3DVolume::createTextureData(const QVector &imag int imageByteWidth = (imageFormat == QImage::Format_Indexed8) ? currentImage->bytesPerLine() : imageWidth; int frameSize = imageByteWidth * imageHeight * colorBytes; - QVector *newTextureData = new QVector; + QList *newTextureData = new QList; newTextureData->resize(frameSize * imageCount); uchar *texturePtr = newTextureData->data(); QImage convertedImage; @@ -662,7 +663,7 @@ QVector *QCustom3DVolume::createTextureData(const QVector &imag return dptr()->m_textureData; } -QVector *QCustom3DVolume::textureData() const +QList *QCustom3DVolume::textureData() const { return dptrc()->m_textureData; } @@ -1177,32 +1178,30 @@ QCustom3DVolumePrivate::QCustom3DVolumePrivate(QCustom3DVolume *q) : m_meshFile = QStringLiteral(":/defaultMeshes/barFull"); } -QCustom3DVolumePrivate::QCustom3DVolumePrivate(QCustom3DVolume *q, const QVector3D &position, - const QVector3D &scaling, - const QQuaternion &rotation, - int textureWidth, int textureHeight, - int textureDepth, QVector *textureData, - QImage::Format textureFormat, - const QVector &colorTable) : - QCustom3DItemPrivate(q, QStringLiteral(":/defaultMeshes/barFull"), position, scaling, rotation), - m_textureWidth(textureWidth), - m_textureHeight(textureHeight), - m_textureDepth(textureDepth), - m_sliceIndexX(-1), - m_sliceIndexY(-1), - m_sliceIndexZ(-1), - m_textureFormat(textureFormat), - m_colorTable(colorTable), - m_textureData(textureData), - m_alphaMultiplier(1.0f), - m_preserveOpacity(true), - m_useHighDefShader(true), - m_drawSlices(false), - m_drawSliceFrames(false), - m_sliceFrameColor(Qt::black), - m_sliceFrameWidths(QVector3D(0.01f, 0.01f, 0.01f)), - m_sliceFrameGaps(QVector3D(0.01f, 0.01f, 0.01f)), - m_sliceFrameThicknesses(QVector3D(0.01f, 0.01f, 0.01f)) +QCustom3DVolumePrivate::QCustom3DVolumePrivate( + QCustom3DVolume *q, const QVector3D &position, const QVector3D &scaling, + const QQuaternion &rotation, int textureWidth, int textureHeight, int textureDepth, + QList *textureData, QImage::Format textureFormat, const QList &colorTable) + : QCustom3DItemPrivate(q, QStringLiteral(":/defaultMeshes/barFull"), position, scaling, + rotation), + m_textureWidth(textureWidth), + m_textureHeight(textureHeight), + m_textureDepth(textureDepth), + m_sliceIndexX(-1), + m_sliceIndexY(-1), + m_sliceIndexZ(-1), + m_textureFormat(textureFormat), + m_colorTable(colorTable), + m_textureData(textureData), + m_alphaMultiplier(1.0f), + m_preserveOpacity(true), + m_useHighDefShader(true), + m_drawSlices(false), + m_drawSliceFrames(false), + m_sliceFrameColor(Qt::black), + m_sliceFrameWidths(QVector3D(0.01f, 0.01f, 0.01f)), + m_sliceFrameGaps(QVector3D(0.01f, 0.01f, 0.01f)), + m_sliceFrameThicknesses(QVector3D(0.01f, 0.01f, 0.01f)) { m_isVolumeItem = true; m_shadowCasting = false; @@ -1268,7 +1267,7 @@ QImage QCustom3DVolumePrivate::renderSlice(Qt::Axis axis, int index) padding = x % 4; pixelWidth = 1; } - QVector data((x + padding) * y * pixelWidth); + QList data((x + padding) * y * pixelWidth); int frameSize = qptr()->textureDataWidth() * m_textureHeight; int dataIndex = 0; @@ -1309,7 +1308,7 @@ QImage QCustom3DVolumePrivate::renderSlice(Qt::Axis axis, int index) QImage image(data.constData(), x, y, x * pixelWidth, m_textureFormat); image.bits(); // Call bits() to detach the new image from local data if (m_textureFormat == QImage::Format_Indexed8) { - QVector colorTable = m_colorTable; + QList colorTable = m_colorTable; if (m_alphaMultiplier != 1.0f) { for (int i = 0; i < colorTable.size(); i++) { QRgb curCol = colorTable.at(i); diff --git a/src/datavisualization/data/qcustom3dvolume.h b/src/datavisualization/data/qcustom3dvolume.h index 78e684d9..6967c608 100644 --- a/src/datavisualization/data/qcustom3dvolume.h +++ b/src/datavisualization/data/qcustom3dvolume.h @@ -48,8 +48,9 @@ class QT_DATAVISUALIZATION_EXPORT QCustom3DVolume : public QCustom3DItem Q_PROPERTY(int sliceIndexX READ sliceIndexX WRITE setSliceIndexX NOTIFY sliceIndexXChanged) Q_PROPERTY(int sliceIndexY READ sliceIndexY WRITE setSliceIndexY NOTIFY sliceIndexYChanged) Q_PROPERTY(int sliceIndexZ READ sliceIndexZ WRITE setSliceIndexZ NOTIFY sliceIndexZChanged) - Q_PROPERTY(QVector colorTable READ colorTable WRITE setColorTable NOTIFY colorTableChanged) - Q_PROPERTY(QVector *textureData READ textureData WRITE setTextureData NOTIFY textureDataChanged) + Q_PROPERTY(QList colorTable READ colorTable WRITE setColorTable NOTIFY colorTableChanged) + Q_PROPERTY(QList *textureData READ textureData WRITE setTextureData NOTIFY + textureDataChanged) Q_PROPERTY(float alphaMultiplier READ alphaMultiplier WRITE setAlphaMultiplier NOTIFY alphaMultiplierChanged) Q_PROPERTY(bool preserveOpacity READ preserveOpacity WRITE setPreserveOpacity NOTIFY preserveOpacityChanged) Q_PROPERTY(bool useHighDefShader READ useHighDefShader WRITE setUseHighDefShader NOTIFY useHighDefShaderChanged) @@ -64,10 +65,10 @@ public: explicit QCustom3DVolume(QObject *parent = nullptr); explicit QCustom3DVolume(const QVector3D &position, const QVector3D &scaling, - const QQuaternion &rotation, int textureWidth, - int textureHeight, int textureDepth, - QVector *textureData, QImage::Format textureFormat, - const QVector &colorTable, QObject *parent = nullptr); + const QQuaternion &rotation, int textureWidth, int textureHeight, + int textureDepth, QList *textureData, + QImage::Format textureFormat, const QList &colorTable, + QObject *parent = nullptr); virtual ~QCustom3DVolume(); void setTextureWidth(int value); @@ -87,12 +88,12 @@ public: int sliceIndexZ() const; void setSliceIndices(int x, int y, int z); - void setColorTable(const QVector &colors); - QVector colorTable() const; + void setColorTable(const QList &colors); + QList colorTable() const; - void setTextureData(QVector *data); - QVector *createTextureData(const QVector &images); - QVector *textureData() const; + void setTextureData(QList *data); + QList *createTextureData(const QList &images); + QList *textureData() const; void setSubTextureData(Qt::Axis axis, int index, const uchar *data); void setSubTextureData(Qt::Axis axis, int index, const QImage &image); @@ -131,7 +132,7 @@ Q_SIGNALS: void sliceIndexYChanged(int value); void sliceIndexZChanged(int value); void colorTableChanged(); - void textureDataChanged(QVector *data); + void textureDataChanged(QList *data); void textureFormatChanged(QImage::Format format); void alphaMultiplierChanged(float mult); void preserveOpacityChanged(bool enabled); diff --git a/src/datavisualization/data/qcustom3dvolume_p.h b/src/datavisualization/data/qcustom3dvolume_p.h index 7c802f62..e12b706d 100644 --- a/src/datavisualization/data/qcustom3dvolume_p.h +++ b/src/datavisualization/data/qcustom3dvolume_p.h @@ -73,9 +73,9 @@ class QCustom3DVolumePrivate : public QCustom3DItemPrivate public: QCustom3DVolumePrivate(QCustom3DVolume *q); QCustom3DVolumePrivate(QCustom3DVolume *q, const QVector3D &position, const QVector3D &scaling, - const QQuaternion &rotation, int textureWidth, - int textureHeight, int textureDepth, QVector *textureData, - QImage::Format textureFormat, const QVector &colorTable); + const QQuaternion &rotation, int textureWidth, int textureHeight, + int textureDepth, QList *textureData, + QImage::Format textureFormat, const QList &colorTable); virtual ~QCustom3DVolumePrivate(); void resetDirtyBits(); @@ -92,8 +92,8 @@ public: int m_sliceIndexZ; QImage::Format m_textureFormat; - QVector m_colorTable; - QVector *m_textureData; + QList m_colorTable; + QList *m_textureData; float m_alphaMultiplier; bool m_preserveOpacity; diff --git a/src/datavisualization/data/qscatterdataproxy.cpp b/src/datavisualization/data/qscatterdataproxy.cpp index 2d0e203a..884d2da9 100644 --- a/src/datavisualization/data/qscatterdataproxy.cpp +++ b/src/datavisualization/data/qscatterdataproxy.cpp @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION * \typedef QScatterDataArray * \relates QScatterDataProxy * - * A vector of \l {QScatterDataItem} objects. + * A list of \l {QScatterDataItem} objects. */ /*! diff --git a/src/datavisualization/data/qscatterdataproxy.h b/src/datavisualization/data/qscatterdataproxy.h index 086621e0..0a2f73ba 100644 --- a/src/datavisualization/data/qscatterdataproxy.h +++ b/src/datavisualization/data/qscatterdataproxy.h @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION class QScatterDataProxyPrivate; class QScatter3DSeries; -typedef QVector QScatterDataArray; +typedef QList QScatterDataArray; class QT_DATAVISUALIZATION_EXPORT QScatterDataProxy : public QAbstractDataProxy { diff --git a/src/datavisualization/data/qsurfacedataproxy.cpp b/src/datavisualization/data/qsurfacedataproxy.cpp index 1c61084c..50514889 100644 --- a/src/datavisualization/data/qsurfacedataproxy.cpp +++ b/src/datavisualization/data/qsurfacedataproxy.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION * A surface data proxy handles surface related data in rows. For this it * provides two auxiliary typedefs: QtDataVisualization::QSurfaceDataArray and * QtDataVisualization::QSurfaceDataRow. \c QSurfaceDataArray is a QList that - * controls the rows. \c QSurfaceDataRow is a QVector that contains + * controls the rows. \c QSurfaceDataRow is a QList that contains * QSurfaceDataItem objects. For more information about how to feed the data to * the proxy, see the sample code in the Q3DSurface documentation. * @@ -79,7 +79,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION * \typedef QSurfaceDataRow * \relates QSurfaceDataProxy * - * A vector of \l {QSurfaceDataItem} objects. + * A list of \l {QSurfaceDataItem} objects. */ /*! diff --git a/src/datavisualization/data/qsurfacedataproxy.h b/src/datavisualization/data/qsurfacedataproxy.h index 8284d9ba..9f767ce2 100644 --- a/src/datavisualization/data/qsurfacedataproxy.h +++ b/src/datavisualization/data/qsurfacedataproxy.h @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION class QSurfaceDataProxyPrivate; class QSurface3DSeries; -typedef QVector QSurfaceDataRow; +typedef QList QSurfaceDataRow; typedef QList QSurfaceDataArray; class QT_DATAVISUALIZATION_EXPORT QSurfaceDataProxy : public QAbstractDataProxy diff --git a/src/datavisualization/data/scatteritemmodelhandler.cpp b/src/datavisualization/data/scatteritemmodelhandler.cpp index 28a4f663..59fba44d 100644 --- a/src/datavisualization/data/scatteritemmodelhandler.cpp +++ b/src/datavisualization/data/scatteritemmodelhandler.cpp @@ -54,7 +54,7 @@ ScatterItemModelHandler::~ScatterItemModelHandler() void ScatterItemModelHandler::handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, - const QVector &roles) + const QList &roles) { // Do nothing if full reset already pending if (!m_fullReset) { diff --git a/src/datavisualization/data/scatteritemmodelhandler_p.h b/src/datavisualization/data/scatteritemmodelhandler_p.h index 991a6c34..8573f675 100644 --- a/src/datavisualization/data/scatteritemmodelhandler_p.h +++ b/src/datavisualization/data/scatteritemmodelhandler_p.h @@ -54,7 +54,7 @@ public: public Q_SLOTS: virtual void handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, - const QVector &roles = QVector ()); + const QList &roles = QList()); virtual void handleRowsInserted(const QModelIndex &parent, int start, int end); virtual void handleRowsRemoved(const QModelIndex &parent, int start, int end); diff --git a/src/datavisualization/data/scatterrenderitem_p.h b/src/datavisualization/data/scatterrenderitem_p.h index d7f38eed..4c0c30a4 100644 --- a/src/datavisualization/data/scatterrenderitem_p.h +++ b/src/datavisualization/data/scatterrenderitem_p.h @@ -65,7 +65,7 @@ protected: QVector3D m_position; bool m_visible; }; -typedef QVector ScatterRenderItemArray; +typedef QList ScatterRenderItemArray; QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/data/surfaceitemmodelhandler.cpp b/src/datavisualization/data/surfaceitemmodelhandler.cpp index ad086e01..122499be 100644 --- a/src/datavisualization/data/surfaceitemmodelhandler.cpp +++ b/src/datavisualization/data/surfaceitemmodelhandler.cpp @@ -52,7 +52,7 @@ SurfaceItemModelHandler::~SurfaceItemModelHandler() void SurfaceItemModelHandler::handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, - const QVector &roles) + const QList &roles) { // Do nothing if full reset already pending if (!m_fullReset) { diff --git a/src/datavisualization/data/surfaceitemmodelhandler_p.h b/src/datavisualization/data/surfaceitemmodelhandler_p.h index aaa7a987..6304c822 100644 --- a/src/datavisualization/data/surfaceitemmodelhandler_p.h +++ b/src/datavisualization/data/surfaceitemmodelhandler_p.h @@ -54,7 +54,7 @@ public: public Q_SLOTS: virtual void handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, - const QVector &roles = QVector ()); + const QList &roles = QList()); protected: void virtual resolveModel(); -- cgit v1.2.3