diff options
Diffstat (limited to 'src/render')
31 files changed, 69 insertions, 69 deletions
diff --git a/src/render/framegraph/qlayerfilter.cpp b/src/render/framegraph/qlayerfilter.cpp index ef87b1c2e..d7285fad0 100644 --- a/src/render/framegraph/qlayerfilter.cpp +++ b/src/render/framegraph/qlayerfilter.cpp @@ -223,7 +223,7 @@ void QLayerFilter::removeLayer(QLayer *layer) /*! \return the current list of layers */ -QVector<QLayer *> QLayerFilter::layers() const +QList<QLayer *> QLayerFilter::layers() const { Q_D(const QLayerFilter); return d->m_layers; diff --git a/src/render/framegraph/qlayerfilter.h b/src/render/framegraph/qlayerfilter.h index f430814d5..06702af5a 100644 --- a/src/render/framegraph/qlayerfilter.h +++ b/src/render/framegraph/qlayerfilter.h @@ -69,7 +69,7 @@ public: void addLayer(QLayer *layer); void removeLayer(QLayer *layer); - QVector<QLayer *> layers() const; + QList<QLayer *> layers() const; FilterMode filterMode() const; void setFilterMode(FilterMode filterMode); diff --git a/src/render/framegraph/qrenderpassfilter.cpp b/src/render/framegraph/qrenderpassfilter.cpp index 304da32d9..5b45d5d73 100644 --- a/src/render/framegraph/qrenderpassfilter.cpp +++ b/src/render/framegraph/qrenderpassfilter.cpp @@ -112,7 +112,7 @@ QRenderPassFilter::QRenderPassFilter(QRenderPassFilterPrivate &dd, QNode *parent /*! Returns a vector of the current keys for the filter. */ -QVector<QFilterKey *> QRenderPassFilter::matchAny() const +QList<QFilterKey *> QRenderPassFilter::matchAny() const { Q_D(const QRenderPassFilter); return d->m_matchList; @@ -199,7 +199,7 @@ void QRenderPassFilter::removeParameter(QParameter *parameter) /*! Returns the current vector of parameters. */ -QVector<QParameter *> QRenderPassFilter::parameters() const +QList<QParameter *> QRenderPassFilter::parameters() const { Q_D(const QRenderPassFilter); return d->m_parameters; diff --git a/src/render/framegraph/qrenderpassfilter.h b/src/render/framegraph/qrenderpassfilter.h index 49a9e1d3e..162459b4e 100644 --- a/src/render/framegraph/qrenderpassfilter.h +++ b/src/render/framegraph/qrenderpassfilter.h @@ -61,13 +61,13 @@ public: explicit QRenderPassFilter(Qt3DCore::QNode *parent = nullptr); ~QRenderPassFilter(); - QVector<QFilterKey*> matchAny() const; + QList<QFilterKey *> matchAny() const; void addMatch(QFilterKey *filterKey); void removeMatch(QFilterKey *filterKey); void addParameter(QParameter *parameter); void removeParameter(QParameter *parameter); - QVector<QParameter *> parameters() const; + QList<QParameter *> parameters() const; protected: explicit QRenderPassFilter(QRenderPassFilterPrivate &dd, Qt3DCore::QNode *parent = nullptr); diff --git a/src/render/framegraph/qrenderstateset.cpp b/src/render/framegraph/qrenderstateset.cpp index d8bde2ec4..6e8700695 100644 --- a/src/render/framegraph/qrenderstateset.cpp +++ b/src/render/framegraph/qrenderstateset.cpp @@ -212,7 +212,7 @@ void QRenderStateSet::removeRenderState(QRenderState *state) /*! Returns the list of QRenderState objects that compose the QRenderStateSet instance. */ -QVector<QRenderState *> QRenderStateSet::renderStates() const +QList<QRenderState *> QRenderStateSet::renderStates() const { Q_D(const QRenderStateSet); return d->m_renderStates; diff --git a/src/render/framegraph/qrenderstateset.h b/src/render/framegraph/qrenderstateset.h index cf4c0cdd5..f4f334996 100644 --- a/src/render/framegraph/qrenderstateset.h +++ b/src/render/framegraph/qrenderstateset.h @@ -59,7 +59,7 @@ public: void addRenderState(QRenderState *state); void removeRenderState(QRenderState *state); - QVector<QRenderState *> renderStates() const; + QList<QRenderState *> renderStates() const; protected: explicit QRenderStateSet(QRenderStateSetPrivate &dd, Qt3DCore::QNode *parent = nullptr); diff --git a/src/render/framegraph/qrendertargetselector.cpp b/src/render/framegraph/qrendertargetselector.cpp index b2c8468f2..015768103 100644 --- a/src/render/framegraph/qrendertargetselector.cpp +++ b/src/render/framegraph/qrendertargetselector.cpp @@ -146,7 +146,7 @@ QRenderTarget *QRenderTargetSelector::target() const \note At render time, if no draw buffer has been specified, the renderer will default to using all the attachments' draw buffers. */ -void QRenderTargetSelector::setOutputs(const QVector<QRenderTargetOutput::AttachmentPoint> &buffers) +void QRenderTargetSelector::setOutputs(const QList<QRenderTargetOutput::AttachmentPoint> &buffers) { Q_D(QRenderTargetSelector); if (buffers != d->m_outputs) { @@ -158,7 +158,7 @@ void QRenderTargetSelector::setOutputs(const QVector<QRenderTargetOutput::Attach /*! \return the list of draw buffers for the current Qt3DRender::QRenderTargetSelector instance. */ -QVector<QRenderTargetOutput::AttachmentPoint> QRenderTargetSelector::outputs() const +QList<QRenderTargetOutput::AttachmentPoint> QRenderTargetSelector::outputs() const { Q_D(const QRenderTargetSelector); return d->m_outputs; diff --git a/src/render/framegraph/qrendertargetselector.h b/src/render/framegraph/qrendertargetselector.h index 84fdfe82e..8ea8e3121 100644 --- a/src/render/framegraph/qrendertargetselector.h +++ b/src/render/framegraph/qrendertargetselector.h @@ -62,8 +62,8 @@ public: QRenderTarget *target() const; - void setOutputs(const QVector<QRenderTargetOutput::AttachmentPoint> &buffers); - QVector<QRenderTargetOutput::AttachmentPoint> outputs() const; + void setOutputs(const QList<QRenderTargetOutput::AttachmentPoint> &buffers); + QList<QRenderTargetOutput::AttachmentPoint> outputs() const; public Q_SLOTS: void setTarget(QRenderTarget *target); @@ -82,6 +82,6 @@ private: QT_END_NAMESPACE -Q_DECLARE_METATYPE(QVector<Qt3DRender::QRenderTargetOutput::AttachmentPoint>) // LCOV_EXCL_LINE +Q_DECLARE_METATYPE(QList<Qt3DRender::QRenderTargetOutput::AttachmentPoint>) // LCOV_EXCL_LINE #endif // QT3DRENDER_QRENDERTARGETSELECTOR_H diff --git a/src/render/framegraph/qsortpolicy.cpp b/src/render/framegraph/qsortpolicy.cpp index a107f1906..d3d7fe58f 100644 --- a/src/render/framegraph/qsortpolicy.cpp +++ b/src/render/framegraph/qsortpolicy.cpp @@ -152,21 +152,21 @@ QSortPolicy::QSortPolicy(QSortPolicyPrivate &dd, QNode *parent) /*! \return the current sort types in use */ -QVector<QSortPolicy::SortType> QSortPolicy::sortTypes() const +QList<QSortPolicy::SortType> QSortPolicy::sortTypes() const { Q_D(const QSortPolicy); return d->m_sortTypes; } -QVector<int> QSortPolicy::sortTypesInt() const +QList<int> QSortPolicy::sortTypesInt() const { Q_D(const QSortPolicy); - QVector<int> sortTypesInt; + QList<int> sortTypesInt; transformVector(d->m_sortTypes, sortTypesInt); return sortTypesInt; } -void QSortPolicy::setSortTypes(const QVector<SortType> &sortTypes) +void QSortPolicy::setSortTypes(const QList<SortType> &sortTypes) { Q_D(QSortPolicy); if (sortTypes != d->m_sortTypes) { @@ -179,9 +179,9 @@ void QSortPolicy::setSortTypes(const QVector<SortType> &sortTypes) } } -void QSortPolicy::setSortTypes(const QVector<int> &sortTypesInt) +void QSortPolicy::setSortTypes(const QList<int> &sortTypesInt) { - QVector<SortType> sortTypes; + QList<SortType> sortTypes; transformVector(sortTypesInt, sortTypes); setSortTypes(sortTypes); } diff --git a/src/render/framegraph/qsortpolicy.h b/src/render/framegraph/qsortpolicy.h index 5cd1ef7e2..a52136bd2 100644 --- a/src/render/framegraph/qsortpolicy.h +++ b/src/render/framegraph/qsortpolicy.h @@ -51,7 +51,7 @@ class QSortPolicyPrivate; class Q_3DRENDERSHARED_EXPORT QSortPolicy : public QFrameGraphNode { Q_OBJECT - Q_PROPERTY(QVector<int> sortTypes READ sortTypesInt WRITE setSortTypes NOTIFY sortTypesChanged) + Q_PROPERTY(QList<int> sortTypes READ sortTypesInt WRITE setSortTypes NOTIFY sortTypesChanged) public: explicit QSortPolicy(Qt3DCore::QNode *parent = nullptr); ~QSortPolicy(); @@ -66,16 +66,16 @@ public: }; Q_ENUM(SortType) // LCOV_EXCL_LINE - QVector<SortType> sortTypes() const; - QVector<int> sortTypesInt() const; + QList<SortType> sortTypes() const; + QList<int> sortTypesInt() const; public Q_SLOTS: - void setSortTypes(const QVector<SortType> &sortTypes); - void setSortTypes(const QVector<int> &sortTypesInt); + void setSortTypes(const QList<SortType> &sortTypes); + void setSortTypes(const QList<int> &sortTypesInt); Q_SIGNALS: - void sortTypesChanged(const QVector<SortType> &sortTypes); - void sortTypesChanged(const QVector<int> &sortTypes); + void sortTypesChanged(const QList<SortType> &sortTypes); + void sortTypesChanged(const QList<int> &sortTypes); protected: explicit QSortPolicy(QSortPolicyPrivate &dd, Qt3DCore::QNode *parent = nullptr); diff --git a/src/render/framegraph/qtechniquefilter.cpp b/src/render/framegraph/qtechniquefilter.cpp index 17a79ba25..981147c24 100644 --- a/src/render/framegraph/qtechniquefilter.cpp +++ b/src/render/framegraph/qtechniquefilter.cpp @@ -117,7 +117,7 @@ QTechniqueFilter::QTechniqueFilter(QTechniqueFilterPrivate &dd, QNode *parent) /*! Returns a vector of the current keys for the filter. */ -QVector<QFilterKey *> QTechniqueFilter::matchAll() const +QList<QFilterKey *> QTechniqueFilter::matchAll() const { Q_D(const QTechniqueFilter); return d->m_matchList; @@ -202,7 +202,7 @@ void QTechniqueFilter::removeParameter(QParameter *parameter) /*! Returns the current vector of parameters. */ -QVector<QParameter *> QTechniqueFilter::parameters() const +QList<QParameter *> QTechniqueFilter::parameters() const { Q_D(const QTechniqueFilter); return d->m_parameters; diff --git a/src/render/framegraph/qtechniquefilter.h b/src/render/framegraph/qtechniquefilter.h index 1cf9abcd1..af4308cc2 100644 --- a/src/render/framegraph/qtechniquefilter.h +++ b/src/render/framegraph/qtechniquefilter.h @@ -58,13 +58,13 @@ public: explicit QTechniqueFilter(Qt3DCore::QNode *parent = nullptr); ~QTechniqueFilter(); - QVector<QFilterKey*> matchAll() const; + QList<QFilterKey *> matchAll() const; void addMatch(QFilterKey *filterKey); void removeMatch(QFilterKey *filterKey); void addParameter(QParameter *p); void removeParameter(QParameter *p); - QVector<QParameter *> parameters() const; + QList<QParameter *> parameters() const; protected: QTechniqueFilter(QTechniqueFilterPrivate &dd, Qt3DCore::QNode *parent = nullptr); diff --git a/src/render/frontend/qlevelofdetail.cpp b/src/render/frontend/qlevelofdetail.cpp index 9b54e832e..d3b1e3d30 100644 --- a/src/render/frontend/qlevelofdetail.cpp +++ b/src/render/frontend/qlevelofdetail.cpp @@ -99,7 +99,7 @@ void QLevelOfDetailPrivate::setCurrentIndex(int currentIndex) Qt3DRender::QGeometryRenderer *geometryRenderer = new Qt3DCore::QGeometryRenderer(renderableEntity); renderableEntity->addComponent(geometryRenderer); Qt3DRender::QLevelOfDetail* lod = new Qt3Render::QLevelOfDetail(renderableEntity); - QVector<qreal> thresholds = {20, 35, 50, 65}; + QList<qreal> thresholds = {20, 35, 50, 65}; lod->setThresholds(thresholds); lod->setCamera(mainCamera); renderableEntity->addComponent(lod); @@ -232,7 +232,7 @@ void QLevelOfDetailPrivate::setCurrentIndex(int currentIndex) */ /*! - * \qmlproperty QVector<qreal> LevelOfDetail::thresholds + * \qmlproperty QList<qreal> LevelOfDetail::thresholds * * Array of range values as float point numbers. The value for the most detailed representation * should be specified first. @@ -368,7 +368,7 @@ void QLevelOfDetail::setThresholdType(QLevelOfDetail::ThresholdType thresholdTyp } } -QVector<qreal> QLevelOfDetail::thresholds() const +QList<qreal> QLevelOfDetail::thresholds() const { Q_D(const QLevelOfDetail); return d->m_thresholds; @@ -383,7 +383,7 @@ QLevelOfDetailBoundingSphere QLevelOfDetail::createBoundingSphere(const QVector3 * Sets the range values in \a thresholds. * \sa Qt3DRender::QLevelOfDetail::thresholdType */ -void QLevelOfDetail::setThresholds(const QVector<qreal> &thresholds) +void QLevelOfDetail::setThresholds(const QList<qreal> &thresholds) { Q_D(QLevelOfDetail); if (d->m_thresholds != thresholds) { diff --git a/src/render/frontend/qlevelofdetail.h b/src/render/frontend/qlevelofdetail.h index f31c90db7..1edd83b3b 100644 --- a/src/render/frontend/qlevelofdetail.h +++ b/src/render/frontend/qlevelofdetail.h @@ -59,7 +59,7 @@ class Q_3DRENDERSHARED_EXPORT QLevelOfDetail : public Qt3DCore::QComponent Q_PROPERTY(Qt3DRender::QCamera *camera READ camera WRITE setCamera NOTIFY cameraChanged) Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged) Q_PROPERTY(ThresholdType thresholdType READ thresholdType WRITE setThresholdType NOTIFY thresholdTypeChanged) - Q_PROPERTY(QVector<qreal> thresholds READ thresholds WRITE setThresholds NOTIFY thresholdsChanged) + Q_PROPERTY(QList<qreal> thresholds READ thresholds WRITE setThresholds NOTIFY thresholdsChanged) Q_PROPERTY(Qt3DRender::QLevelOfDetailBoundingSphere volumeOverride READ volumeOverride WRITE setVolumeOverride NOTIFY volumeOverrideChanged) public: @@ -75,7 +75,7 @@ public: QCamera *camera() const; int currentIndex() const; ThresholdType thresholdType() const; - QVector<qreal> thresholds() const; + QList<qreal> thresholds() const; QLevelOfDetailBoundingSphere volumeOverride() const; Q_INVOKABLE Qt3DRender::QLevelOfDetailBoundingSphere createBoundingSphere(const QVector3D ¢er, float radius); @@ -84,14 +84,14 @@ public Q_SLOTS: void setCamera(QCamera *camera); void setCurrentIndex(int currentIndex); void setThresholdType(ThresholdType thresholdType); - void setThresholds(const QVector<qreal> &thresholds); + void setThresholds(const QList<qreal> &thresholds); void setVolumeOverride(const QLevelOfDetailBoundingSphere &volumeOverride); Q_SIGNALS: void cameraChanged(QCamera *camera); void currentIndexChanged(int currentIndex); void thresholdTypeChanged(ThresholdType thresholdType); - void thresholdsChanged(const QVector<qreal> &thresholds); + void thresholdsChanged(const QList<qreal> &thresholds); void volumeOverrideChanged(const QLevelOfDetailBoundingSphere &volumeOverride); protected: diff --git a/src/render/frontend/qrendertarget.cpp b/src/render/frontend/qrendertarget.cpp index e359d9bdd..1abc0fca6 100644 --- a/src/render/frontend/qrendertarget.cpp +++ b/src/render/frontend/qrendertarget.cpp @@ -144,7 +144,7 @@ void QRenderTarget::removeOutput(QRenderTargetOutput *output) /*! \return the chosen outputs. */ -QVector<QRenderTargetOutput *> QRenderTarget::outputs() const +QList<QRenderTargetOutput *> QRenderTarget::outputs() const { Q_D(const QRenderTarget); return d->m_outputs; diff --git a/src/render/frontend/qrendertarget.h b/src/render/frontend/qrendertarget.h index 7c339d2c8..2ace857da 100644 --- a/src/render/frontend/qrendertarget.h +++ b/src/render/frontend/qrendertarget.h @@ -59,7 +59,7 @@ public: void addOutput(QRenderTargetOutput *output); void removeOutput(QRenderTargetOutput *output); - QVector<QRenderTargetOutput *> outputs() const; + QList<QRenderTargetOutput *> outputs() const; protected: explicit QRenderTarget(QRenderTargetPrivate &dd, Qt3DCore::QNode *parent = nullptr); diff --git a/src/render/materialsystem/qeffect.cpp b/src/render/materialsystem/qeffect.cpp index 0e950cee4..19910b3af 100644 --- a/src/render/materialsystem/qeffect.cpp +++ b/src/render/materialsystem/qeffect.cpp @@ -213,7 +213,7 @@ void QEffect::removeParameter(QParameter *parameter) /*! * Returns the list of parameters used by the effect. */ -QVector<QParameter *> QEffect::parameters() const +QList<QParameter *> QEffect::parameters() const { Q_D(const QEffect); return d->m_parameters; @@ -259,7 +259,7 @@ void QEffect::removeTechnique(QTechnique *t) /*! * Returns the list of techniques used by the effect. */ -QVector<QTechnique *> QEffect::techniques() const +QList<QTechnique *> QEffect::techniques() const { Q_D(const QEffect); return d->m_techniques; diff --git a/src/render/materialsystem/qeffect.h b/src/render/materialsystem/qeffect.h index d265590e9..e3d0cee4f 100644 --- a/src/render/materialsystem/qeffect.h +++ b/src/render/materialsystem/qeffect.h @@ -60,11 +60,11 @@ public: void addParameter(QParameter *parameter); void removeParameter(QParameter *parameter); - QVector<QParameter *> parameters() const; + QList<QParameter *> parameters() const; void addTechnique(QTechnique *t); void removeTechnique(QTechnique *t); - QVector<QTechnique *> techniques() const; + QList<QTechnique *> techniques() const; protected: explicit QEffect(QEffectPrivate &dd, Qt3DCore::QNode *parent = nullptr); diff --git a/src/render/materialsystem/qmaterial.cpp b/src/render/materialsystem/qmaterial.cpp index 50fcd59be..5625b5331 100644 --- a/src/render/materialsystem/qmaterial.cpp +++ b/src/render/materialsystem/qmaterial.cpp @@ -291,7 +291,7 @@ void QMaterial::removeParameter(QParameter *parameter) /*! * Returns a vector of the material's current parameters */ -QVector<QParameter *> QMaterial::parameters() const +QList<QParameter *> QMaterial::parameters() const { Q_D(const QMaterial); return d->m_parameters; diff --git a/src/render/materialsystem/qmaterial.h b/src/render/materialsystem/qmaterial.h index 2d306d016..4d5ec02dc 100644 --- a/src/render/materialsystem/qmaterial.h +++ b/src/render/materialsystem/qmaterial.h @@ -67,7 +67,7 @@ public: void addParameter(QParameter *parameter); void removeParameter(QParameter *parameter); - QVector<QParameter *> parameters() const; + QList<QParameter *> parameters() const; public Q_SLOTS: void setEffect(QEffect *effect); diff --git a/src/render/materialsystem/qrenderpass.cpp b/src/render/materialsystem/qrenderpass.cpp index 40c9cb1cd..97e10c57a 100644 --- a/src/render/materialsystem/qrenderpass.cpp +++ b/src/render/materialsystem/qrenderpass.cpp @@ -296,7 +296,7 @@ void QRenderPass::removeFilterKey(QFilterKey *filterKey) Returns the list of Qt3DRender::QFilterKey key objects making up the filter keys of the Qt3DRender::QRenderPass. */ -QVector<QFilterKey *> QRenderPass::filterKeys() const +QList<QFilterKey *> QRenderPass::filterKeys() const { Q_D(const QRenderPass); return d->m_filterKeyList; @@ -345,7 +345,7 @@ void QRenderPass::removeRenderState(QRenderState *state) Returns the list of Qt3DRender::QRenderState state objects making up the render state of the Qt3DRender::QRenderPass. */ -QVector<QRenderState *> QRenderPass::renderStates() const +QList<QRenderState *> QRenderPass::renderStates() const { Q_D(const QRenderPass); return d->m_renderStates; diff --git a/src/render/materialsystem/qrenderpass.h b/src/render/materialsystem/qrenderpass.h index 71cd9b989..b7d494646 100644 --- a/src/render/materialsystem/qrenderpass.h +++ b/src/render/materialsystem/qrenderpass.h @@ -55,7 +55,7 @@ namespace Qt3DRender { class QParameter; class QRenderState; -typedef QVector<QParameter*> ParameterList; +using ParameterList = QList<QParameter *>; class QRenderPassPrivate; @@ -72,15 +72,15 @@ public: void addFilterKey(QFilterKey *filterKey); void removeFilterKey(QFilterKey *filterKey); - QVector<QFilterKey*> filterKeys() const; + QList<QFilterKey *> filterKeys() const; void addRenderState(QRenderState *state); void removeRenderState(QRenderState *state); - QVector<QRenderState *> renderStates() const; + QList<QRenderState *> renderStates() const; void addParameter(QParameter *p); void removeParameter(QParameter *p); - QVector<QParameter *> parameters() const; + QList<QParameter *> parameters() const; public Q_SLOTS: void setShaderProgram(QShaderProgram *shaderProgram); diff --git a/src/render/materialsystem/qshaderdata.h b/src/render/materialsystem/qshaderdata.h index 4a851172c..39d113bd4 100644 --- a/src/render/materialsystem/qshaderdata.h +++ b/src/render/materialsystem/qshaderdata.h @@ -42,7 +42,7 @@ #include <Qt3DCore/qcomponent.h> #include <Qt3DRender/qt3drender_global.h> -#include <QtCore/QVector> +#include <QtCore/QList> QT_BEGIN_NAMESPACE @@ -82,6 +82,6 @@ private: QT_END_NAMESPACE Q_DECLARE_METATYPE(Qt3DRender::QShaderData*) // LCOV_EXCL_LINE -Q_DECLARE_METATYPE(QVector<Qt3DRender::QShaderData*>) // LCOV_EXCL_LINE +Q_DECLARE_METATYPE(QList<Qt3DRender::QShaderData*>) // LCOV_EXCL_LINE #endif // QT3DRENDER_QSHADERDATA_H diff --git a/src/render/materialsystem/qtechnique.cpp b/src/render/materialsystem/qtechnique.cpp index eca8b88c6..095c8b2d5 100644 --- a/src/render/materialsystem/qtechnique.cpp +++ b/src/render/materialsystem/qtechnique.cpp @@ -280,7 +280,7 @@ void QTechnique::removeFilterKey(QFilterKey *filterKey) Returns the list of Qt3DCore::QFilterKey key objects making up the filter keys of the Qt3DRender::QTechnique. */ -QVector<QFilterKey *> QTechnique::filterKeys() const +QList<QFilterKey *> QTechnique::filterKeys() const { Q_D(const QTechnique); return d->m_filterKeys; @@ -365,7 +365,7 @@ void QTechnique::removeRenderPass(QRenderPass *pass) /*! Returns the list of render passes contained in the technique. */ -QVector<QRenderPass *> QTechnique::renderPasses() const +QList<QRenderPass *> QTechnique::renderPasses() const { Q_D(const QTechnique); return d->m_renderPasses; @@ -374,7 +374,7 @@ QVector<QRenderPass *> QTechnique::renderPasses() const /*! Returns a vector of the techniques current parameters */ -QVector<QParameter *> QTechnique::parameters() const +QList<QParameter *> QTechnique::parameters() const { Q_D(const QTechnique); return d->m_parameters; diff --git a/src/render/materialsystem/qtechnique.h b/src/render/materialsystem/qtechnique.h index 1246d79cf..6a5ba6146 100644 --- a/src/render/materialsystem/qtechnique.h +++ b/src/render/materialsystem/qtechnique.h @@ -44,7 +44,7 @@ #include <Qt3DCore/qnode.h> #include <Qt3DRender/qrenderpass.h> #include <Qt3DRender/qfilterkey.h> -#include <QtCore/QVector> +#include <QtCore/QList> #include <QtCore/QSharedPointer> QT_BEGIN_NAMESPACE @@ -66,15 +66,15 @@ public: void addFilterKey(QFilterKey *filterKey); void removeFilterKey(QFilterKey *filterKey); - QVector<QFilterKey*> filterKeys() const; + QList<QFilterKey*> filterKeys() const; void addParameter(QParameter *p); void removeParameter(QParameter *p); - QVector<QParameter *> parameters() const; + QList<QParameter *> parameters() const; void addRenderPass(QRenderPass *pass); void removeRenderPass(QRenderPass *pass); - QVector<QRenderPass *> renderPasses() const; + QList<QRenderPass *> renderPasses() const; QGraphicsApiFilter *graphicsApiFilter(); const QGraphicsApiFilter *graphicsApiFilter() const; diff --git a/src/render/picking/qabstractraycaster.cpp b/src/render/picking/qabstractraycaster.cpp index 18658a858..f21d3b9ae 100644 --- a/src/render/picking/qabstractraycaster.cpp +++ b/src/render/picking/qabstractraycaster.cpp @@ -355,7 +355,7 @@ void QAbstractRayCaster::removeLayer(QLayer *layer) /*! \return the current list of layers */ -QVector<QLayer *> QAbstractRayCaster::layers() const +QList<QLayer *> QAbstractRayCaster::layers() const { Q_D(const QAbstractRayCaster); return d->m_layers; diff --git a/src/render/picking/qabstractraycaster.h b/src/render/picking/qabstractraycaster.h index a630b3723..db410871f 100644 --- a/src/render/picking/qabstractraycaster.h +++ b/src/render/picking/qabstractraycaster.h @@ -74,7 +74,7 @@ public: }; Q_ENUM(FilterMode) // LOVC_EXLC_LINE - using Hits = QVector<QRayCasterHit>; + using Hits = QList<QRayCasterHit>; explicit QAbstractRayCaster(QNode *parent = nullptr); ~QAbstractRayCaster(); @@ -85,7 +85,7 @@ public: void addLayer(QLayer *layer); void removeLayer(QLayer *layer); - QVector<QLayer *> layers() const; + QList<QLayer *> layers() const; public Q_SLOTS: void setRunMode(RunMode runMode); diff --git a/src/render/texture/qabstracttexture.cpp b/src/render/texture/qabstracttexture.cpp index 885f2d809..823f9dd13 100644 --- a/src/render/texture/qabstracttexture.cpp +++ b/src/render/texture/qabstracttexture.cpp @@ -799,7 +799,7 @@ void QAbstractTexture::removeTextureImage(QAbstractTextureImage *textureImage) Returns a list of pointers to QAbstractTextureImage objects contained in the texture provider. */ -QVector<QAbstractTextureImage *> QAbstractTexture::textureImages() const +QList<QAbstractTextureImage *> QAbstractTexture::textureImages() const { Q_D(const QAbstractTexture); return d->m_textureImages; diff --git a/src/render/texture/qabstracttexture.h b/src/render/texture/qabstracttexture.h index f46344eff..d9a3ca5bb 100644 --- a/src/render/texture/qabstracttexture.h +++ b/src/render/texture/qabstracttexture.h @@ -286,7 +286,7 @@ public: void addTextureImage(QAbstractTextureImage *textureImage); void removeTextureImage(QAbstractTextureImage *textureImage); - QVector<QAbstractTextureImage *> textureImages() const; + QList<QAbstractTextureImage *> textureImages() const; // sampler data - in the future proxy to a Sampler helper void setWrapMode(const QTextureWrapMode &wrapMode); diff --git a/src/render/texture/qtexturedata.cpp b/src/render/texture/qtexturedata.cpp index ac4ca80c0..fad14973b 100644 --- a/src/render/texture/qtexturedata.cpp +++ b/src/render/texture/qtexturedata.cpp @@ -71,7 +71,7 @@ public: QTextureWrapMode::WrapMode m_wrapModeZ; QAbstractTexture::ComparisonFunction m_comparisonFunction; QAbstractTexture::ComparisonMode m_comparisonMode; - QVector<QTextureImageDataPtr> m_imagesData; + QList<QTextureImageDataPtr> m_imagesData; }; @@ -365,7 +365,7 @@ void QTextureData::setComparisonMode(QAbstractTexture::ComparisonMode comparison /*! * Returns the data of the images used by this texture. */ -QVector<QTextureImageDataPtr> QTextureData::imageData() const +QList<QTextureImageDataPtr> QTextureData::imageData() const { Q_D(const QTextureData); return d->m_imagesData; diff --git a/src/render/texture/qtexturedata.h b/src/render/texture/qtexturedata.h index 04324ca14..3a296100f 100644 --- a/src/render/texture/qtexturedata.h +++ b/src/render/texture/qtexturedata.h @@ -102,7 +102,7 @@ public: QAbstractTexture::ComparisonMode comparisonMode() const; void setComparisonMode(QAbstractTexture::ComparisonMode comparisonMode); - QVector<QTextureImageDataPtr> imageData() const; + QList<QTextureImageDataPtr> imageData() const; void addImageData(const QTextureImageDataPtr &imageData); private: |