diff options
100 files changed, 256 insertions, 257 deletions
diff --git a/src/animation/frontend/qabstractanimation.h b/src/animation/frontend/qabstractanimation.h index 1d7459217..06e380441 100644 --- a/src/animation/frontend/qabstractanimation.h +++ b/src/animation/frontend/qabstractanimation.h @@ -37,8 +37,8 @@ #ifndef QT3DANIMATION_QABSTRACTANIMATION_H #define QT3DANIMATION_QABSTRACTANIMATION_H +#include <QtCore/qlist.h> #include <QtCore/qobject.h> -#include <QtCore/qvector.h> #include <Qt3DAnimation/qt3danimation_global.h> diff --git a/src/animation/frontend/qanimationclipdata.cpp b/src/animation/frontend/qanimationclipdata.cpp index e105b7b43..1e02332de 100644 --- a/src/animation/frontend/qanimationclipdata.cpp +++ b/src/animation/frontend/qanimationclipdata.cpp @@ -39,7 +39,7 @@ #include "qanimationclipdata.h" -#include <QtCore/qvector.h> +#include <QtCore/qlist.h> QT_BEGIN_NAMESPACE diff --git a/src/animation/frontend/qanimationcontroller.cpp b/src/animation/frontend/qanimationcontroller.cpp index ddb105d08..e53188aaa 100644 --- a/src/animation/frontend/qanimationcontroller.cpp +++ b/src/animation/frontend/qanimationcontroller.cpp @@ -229,7 +229,7 @@ QAnimationController::QAnimationController(QObject *parent) /*! Returns the list of animation groups the conroller is currently holding. */ -QVector<QAnimationGroup *> QAnimationController::animationGroupList() +QList<QAnimationGroup *> QAnimationController::animationGroupList() { Q_D(QAnimationController); return d->m_animationGroups; @@ -274,7 +274,7 @@ bool QAnimationController::recursive() const /*! Sets the \a animationGroups for the controller. Old groups are cleared. */ -void QAnimationController::setAnimationGroups(const QVector<Qt3DAnimation::QAnimationGroup *> &animationGroups) +void QAnimationController::setAnimationGroups(const QList<Qt3DAnimation::QAnimationGroup *> &animationGroups) { Q_D(QAnimationController); d->m_animationGroups = animationGroups; diff --git a/src/animation/frontend/qanimationcontroller.h b/src/animation/frontend/qanimationcontroller.h index 47f2e0edd..3cadcab57 100644 --- a/src/animation/frontend/qanimationcontroller.h +++ b/src/animation/frontend/qanimationcontroller.h @@ -62,7 +62,7 @@ class Q_3DANIMATIONSHARED_EXPORT QAnimationController : public QObject public: QAnimationController(QObject *parent = nullptr); - QVector<Qt3DAnimation::QAnimationGroup *> animationGroupList(); + QList<Qt3DAnimation::QAnimationGroup *> animationGroupList(); int activeAnimationGroup() const; float position() const; @@ -71,7 +71,7 @@ public: Qt3DCore::QEntity *entity() const; bool recursive() const; - void setAnimationGroups(const QVector<Qt3DAnimation::QAnimationGroup *> &animationGroups); + void setAnimationGroups(const QList<Qt3DAnimation::QAnimationGroup *> &animationGroups); void addAnimationGroup(Qt3DAnimation::QAnimationGroup *animationGroups); void removeAnimationGroup(Qt3DAnimation::QAnimationGroup *animationGroups); diff --git a/src/animation/frontend/qanimationgroup.cpp b/src/animation/frontend/qanimationgroup.cpp index 84078b4f4..b766b2770 100644 --- a/src/animation/frontend/qanimationgroup.cpp +++ b/src/animation/frontend/qanimationgroup.cpp @@ -131,7 +131,7 @@ QString QAnimationGroup::name() const /*! Returns the list of animations in the group. */ -QVector<Qt3DAnimation::QAbstractAnimation *> QAnimationGroup::animationList() +QList<Qt3DAnimation::QAbstractAnimation *> QAnimationGroup::animationList() { Q_D(QAnimationGroup); return d->m_animations; @@ -161,7 +161,7 @@ void QAnimationGroup::setName(const QString &name) /*! Sets the \a animations to the group. Old animations are removed. */ -void QAnimationGroup::setAnimations(const QVector<Qt3DAnimation::QAbstractAnimation *> &animations) +void QAnimationGroup::setAnimations(const QList<Qt3DAnimation::QAbstractAnimation *> &animations) { Q_D(QAnimationGroup); d->m_animations = animations; diff --git a/src/animation/frontend/qanimationgroup.h b/src/animation/frontend/qanimationgroup.h index dd18edafc..1a3086b39 100644 --- a/src/animation/frontend/qanimationgroup.h +++ b/src/animation/frontend/qanimationgroup.h @@ -60,11 +60,11 @@ public: explicit QAnimationGroup(QObject *parent = nullptr); QString name() const; - QVector<Qt3DAnimation::QAbstractAnimation *> animationList(); + QList<Qt3DAnimation::QAbstractAnimation *> animationList(); float position() const; float duration() const; - void setAnimations(const QVector<Qt3DAnimation::QAbstractAnimation *> &animations); + void setAnimations(const QList<Qt3DAnimation::QAbstractAnimation *> &animations); void addAnimation(Qt3DAnimation::QAbstractAnimation *animation); void removeAnimation(Qt3DAnimation::QAbstractAnimation *animation); diff --git a/src/animation/frontend/qchannel.cpp b/src/animation/frontend/qchannel.cpp index 1e0da3c3f..9e47357e2 100644 --- a/src/animation/frontend/qchannel.cpp +++ b/src/animation/frontend/qchannel.cpp @@ -39,7 +39,7 @@ #include "qchannel.h" -#include <QtCore/qvector.h> +#include <QtCore/qlist.h> QT_BEGIN_NAMESPACE diff --git a/src/animation/frontend/qchannelcomponent.cpp b/src/animation/frontend/qchannelcomponent.cpp index b8511dd1f..60c0fec88 100644 --- a/src/animation/frontend/qchannelcomponent.cpp +++ b/src/animation/frontend/qchannelcomponent.cpp @@ -39,7 +39,7 @@ #include "qchannelcomponent.h" -#include <QtCore/qvector.h> +#include <QtCore/qlist.h> QT_BEGIN_NAMESPACE diff --git a/src/animation/frontend/qchannelmapper.cpp b/src/animation/frontend/qchannelmapper.cpp index 711259e7f..cbbf05549 100644 --- a/src/animation/frontend/qchannelmapper.cpp +++ b/src/animation/frontend/qchannelmapper.cpp @@ -100,7 +100,7 @@ void QChannelMapper::removeMapping(QAbstractChannelMapping *mapping) d->unregisterDestructionHelper(mapping); } -QVector<QAbstractChannelMapping *> QChannelMapper::mappings() const +QList<QAbstractChannelMapping *> QChannelMapper::mappings() const { Q_D(const QChannelMapper); return d->m_mappings; diff --git a/src/animation/frontend/qchannelmapper.h b/src/animation/frontend/qchannelmapper.h index 109bf7e06..675b800df 100644 --- a/src/animation/frontend/qchannelmapper.h +++ b/src/animation/frontend/qchannelmapper.h @@ -57,7 +57,7 @@ public: void addMapping(QAbstractChannelMapping *mapping); void removeMapping(QAbstractChannelMapping *mapping); - QVector<QAbstractChannelMapping *> mappings() const; + QList<QAbstractChannelMapping *> mappings() const; protected: explicit QChannelMapper(QChannelMapperPrivate &dd, Qt3DCore::QNode *parent = nullptr); diff --git a/src/animation/frontend/qkeyframeanimation.cpp b/src/animation/frontend/qkeyframeanimation.cpp index 53d48a12b..5bd55220a 100644 --- a/src/animation/frontend/qkeyframeanimation.cpp +++ b/src/animation/frontend/qkeyframeanimation.cpp @@ -178,7 +178,7 @@ QKeyframeAnimation::QKeyframeAnimation(QObject *parent) } -void QKeyframeAnimation::setFramePositions(const QVector<float> &positions) +void QKeyframeAnimation::setFramePositions(const QList<float> &positions) { Q_D(QKeyframeAnimation); d->m_framePositions = positions; @@ -201,7 +201,7 @@ void QKeyframeAnimation::setFramePositions(const QVector<float> &positions) /*! Sets the \a keyframes of the animation. Old keyframes are cleared. */ -void QKeyframeAnimation::setKeyframes(const QVector<Qt3DCore::QTransform *> &keyframes) +void QKeyframeAnimation::setKeyframes(const QList<Qt3DCore::QTransform *> &keyframes) { Q_D(QKeyframeAnimation); d->m_keyframes = keyframes; @@ -293,7 +293,7 @@ void QKeyframeAnimation::updateAnimation(float position) d->calculateFrame(position); } -QVector<float> QKeyframeAnimation::framePositions() const +QList<float> QKeyframeAnimation::framePositions() const { Q_D(const QKeyframeAnimation); return d->m_framePositions; @@ -302,7 +302,7 @@ QVector<float> QKeyframeAnimation::framePositions() const /*! Returns the list of keyframes. */ -QVector<Qt3DCore::QTransform *> QKeyframeAnimation::keyframeList() const +QList<Qt3DCore::QTransform *> QKeyframeAnimation::keyframeList() const { Q_D(const QKeyframeAnimation); return d->m_keyframes; diff --git a/src/animation/frontend/qkeyframeanimation.h b/src/animation/frontend/qkeyframeanimation.h index 0aed76cfb..58ca19092 100644 --- a/src/animation/frontend/qkeyframeanimation.h +++ b/src/animation/frontend/qkeyframeanimation.h @@ -53,7 +53,7 @@ class QKeyframeAnimationPrivate; class Q_3DANIMATIONSHARED_EXPORT QKeyframeAnimation : public QAbstractAnimation { Q_OBJECT - Q_PROPERTY(QVector<float> framePositions READ framePositions WRITE setFramePositions NOTIFY framePositionsChanged) + Q_PROPERTY(QList<float> framePositions READ framePositions WRITE setFramePositions NOTIFY framePositionsChanged) Q_PROPERTY(Qt3DCore::QTransform *target READ target WRITE setTarget NOTIFY targetChanged) Q_PROPERTY(QEasingCurve easing READ easing WRITE setEasing NOTIFY easingChanged) Q_PROPERTY(QString targetName READ targetName WRITE setTargetName NOTIFY targetNameChanged) @@ -71,20 +71,20 @@ public: }; Q_ENUM(RepeatMode) - QVector<float> framePositions() const; - QVector<Qt3DCore::QTransform *> keyframeList() const; + QList<float> framePositions() const; + QList<Qt3DCore::QTransform *> keyframeList() const; Qt3DCore::QTransform *target() const; QEasingCurve easing() const; QString targetName() const; RepeatMode startMode() const; RepeatMode endMode() const; - void setKeyframes(const QVector<Qt3DCore::QTransform *> &keyframes); + void setKeyframes(const QList<Qt3DCore::QTransform *> &keyframes); void addKeyframe(Qt3DCore::QTransform *keyframe); void removeKeyframe(Qt3DCore::QTransform *keyframe); public Q_SLOTS: - void setFramePositions(const QVector<float> &positions); + void setFramePositions(const QList<float> &positions); void setTarget(Qt3DCore::QTransform *target); void setEasing(const QEasingCurve &easing); void setTargetName(const QString &name); @@ -92,7 +92,7 @@ public Q_SLOTS: void setEndMode(RepeatMode mode); Q_SIGNALS: - void framePositionsChanged(const QVector<float> &positions); + void framePositionsChanged(const QList<float> &positions); void targetChanged(Qt3DCore::QTransform *target); void easingChanged(const QEasingCurve &easing); void targetNameChanged(const QString &name); diff --git a/src/animation/frontend/qmorphinganimation.cpp b/src/animation/frontend/qmorphinganimation.cpp index 5b16668f9..63c0d68ca 100644 --- a/src/animation/frontend/qmorphinganimation.cpp +++ b/src/animation/frontend/qmorphinganimation.cpp @@ -179,7 +179,7 @@ QMorphingAnimationPrivate::QMorphingAnimationPrivate() QMorphingAnimationPrivate::~QMorphingAnimationPrivate() { - for (QVector<float> *weights : qAsConst(m_weights)) + for (QList<float> *weights : qAsConst(m_weights)) delete weights; } @@ -189,7 +189,7 @@ void QMorphingAnimationPrivate::updateAnimation(float position) if (!m_target || !m_target->geometry()) return; - QVector<int> relevantValues; + QList<int> relevantValues; float sum = 0.0f; float interpolator = 0.0f; m_morphKey.resize(m_morphTargets.size()); @@ -252,12 +252,12 @@ void QMorphingAnimationPrivate::setTargetInterpolated(int morphTarget) // remove attributes from previous frame if (m_currentTarget && (target != m_currentTarget)) { - const QVector<Qt3DCore::QAttribute *> targetAttributes = m_currentTarget->attributeList(); + const QList<Qt3DCore::QAttribute *> targetAttributes = m_currentTarget->attributeList(); for (int i = 0; i < targetAttributes.size(); ++i) geometry->removeAttribute(targetAttributes.at(i)); } - const QVector<Qt3DCore::QAttribute *> targetAttributes = target->attributeList(); + const QList<Qt3DCore::QAttribute *> targetAttributes = target->attributeList(); // add attributes from current frame to the geometry if (target != m_currentTarget) { @@ -282,7 +282,7 @@ QMorphingAnimation::QMorphingAnimation(QObject *parent) this, &QMorphingAnimation::updateAnimation); } -QVector<float> QMorphingAnimation::targetPositions() const +QList<float> QMorphingAnimation::targetPositions() const { Q_D(const QMorphingAnimation); return d->m_targetPositions; @@ -321,7 +321,7 @@ QEasingCurve QMorphingAnimation::easing() const /*! Set morph \a targets to animation. Old targets are cleared. */ -void QMorphingAnimation::setMorphTargets(const QVector<Qt3DAnimation::QMorphTarget *> &targets) +void QMorphingAnimation::setMorphTargets(const QList<Qt3DAnimation::QMorphTarget *> &targets) { Q_D(QMorphingAnimation); d->m_morphTargets = targets; @@ -353,7 +353,7 @@ void QMorphingAnimation::removeMorphTarget(Qt3DAnimation::QMorphTarget *target) d->m_position = -1.0f; } -void QMorphingAnimation::setTargetPositions(const QVector<float> &targetPositions) +void QMorphingAnimation::setTargetPositions(const QList<float> &targetPositions) { Q_D(QMorphingAnimation); d->m_targetPositions = targetPositions; @@ -365,7 +365,7 @@ void QMorphingAnimation::setTargetPositions(const QVector<float> &targetPosition d->m_weights.resize(targetPositions.size()); for (int i = 0; i < d->m_weights.size(); ++i) { if (d->m_weights[i] == nullptr) - d->m_weights[i] = new QVector<float>(); + d->m_weights[i] = new QList<float>(); } } d->m_position = -1.0f; @@ -384,13 +384,13 @@ void QMorphingAnimation::setTarget(Qt3DRender::QGeometryRenderer *target) /*! Sets morph \a weights at \a positionIndex. */ -void QMorphingAnimation::setWeights(int positionIndex, const QVector<float> &weights) +void QMorphingAnimation::setWeights(int positionIndex, const QList<float> &weights) { Q_D(QMorphingAnimation); if (d->m_weights.size() < positionIndex) d->m_weights.resize(positionIndex + 1); if (d->m_weights[positionIndex] == nullptr) - d->m_weights[positionIndex] = new QVector<float>(); + d->m_weights[positionIndex] = new QList<float>(); *d->m_weights[positionIndex] = weights; d->m_position = -1.0f; } @@ -398,7 +398,7 @@ void QMorphingAnimation::setWeights(int positionIndex, const QVector<float> &wei /*! Return morph weights at \a positionIndex. */ -QVector<float> QMorphingAnimation::getWeights(int positionIndex) +QList<float> QMorphingAnimation::getWeights(int positionIndex) { Q_D(QMorphingAnimation); return *d->m_weights[positionIndex]; @@ -407,7 +407,7 @@ QVector<float> QMorphingAnimation::getWeights(int positionIndex) /*! Return morph target list. */ -QVector<Qt3DAnimation::QMorphTarget *> QMorphingAnimation::morphTargetList() +QList<Qt3DAnimation::QMorphTarget *> QMorphingAnimation::morphTargetList() { Q_D(QMorphingAnimation); return d->m_morphTargets; diff --git a/src/animation/frontend/qmorphinganimation.h b/src/animation/frontend/qmorphinganimation.h index 1a9a60695..fab6f5b44 100644 --- a/src/animation/frontend/qmorphinganimation.h +++ b/src/animation/frontend/qmorphinganimation.h @@ -54,7 +54,7 @@ class QMorphingAnimationPrivate; class Q_3DANIMATIONSHARED_EXPORT QMorphingAnimation : public QAbstractAnimation { Q_OBJECT - Q_PROPERTY(QVector<float> targetPositions READ targetPositions WRITE setTargetPositions NOTIFY targetPositionsChanged) + Q_PROPERTY(QList<float> targetPositions READ targetPositions WRITE setTargetPositions NOTIFY targetPositionsChanged) Q_PROPERTY(float interpolator READ interpolator NOTIFY interpolatorChanged) Q_PROPERTY(Qt3DRender::QGeometryRenderer *target READ target WRITE setTarget NOTIFY targetChanged) Q_PROPERTY(QString targetName READ targetName WRITE setTargetName NOTIFY targetNameChanged) @@ -71,31 +71,31 @@ public: explicit QMorphingAnimation(QObject *parent = nullptr); - QVector<float> targetPositions() const; + QList<float> targetPositions() const; float interpolator() const; Qt3DRender::QGeometryRenderer *target() const; QString targetName() const; QMorphingAnimation::Method method() const; QEasingCurve easing() const; - void setMorphTargets(const QVector<Qt3DAnimation::QMorphTarget *> &targets); + void setMorphTargets(const QList<Qt3DAnimation::QMorphTarget *> &targets); void addMorphTarget(Qt3DAnimation::QMorphTarget *target); void removeMorphTarget(Qt3DAnimation::QMorphTarget *target); - void setWeights(int positionIndex, const QVector<float> &weights); - QVector<float> getWeights(int positionIndex); + void setWeights(int positionIndex, const QList<float> &weights); + QList<float> getWeights(int positionIndex); - QVector<Qt3DAnimation::QMorphTarget *> morphTargetList(); + QList<Qt3DAnimation::QMorphTarget *> morphTargetList(); public Q_SLOTS: - void setTargetPositions(const QVector<float> &targetPositions); + void setTargetPositions(const QList<float> &targetPositions); void setTarget(Qt3DRender::QGeometryRenderer *target); void setTargetName(const QString name); void setMethod(QMorphingAnimation::Method method); void setEasing(const QEasingCurve &easing); Q_SIGNALS: - void targetPositionsChanged(const QVector<float> &targetPositions); + void targetPositionsChanged(const QList<float> &targetPositions); void interpolatorChanged(float interpolator); void targetChanged(Qt3DRender::QGeometryRenderer *target); void targetNameChanged(const QString &name); diff --git a/src/animation/frontend/qmorphtarget.cpp b/src/animation/frontend/qmorphtarget.cpp index 1edaf2445..bca51cfe4 100644 --- a/src/animation/frontend/qmorphtarget.cpp +++ b/src/animation/frontend/qmorphtarget.cpp @@ -115,7 +115,7 @@ QMorphTarget::QMorphTarget(QObject *parent) /*! Returns a list of attributes contained in the morph target. */ -QVector<Qt3DCore::QAttribute *> QMorphTarget::attributeList() const +QList<Qt3DCore::QAttribute *> QMorphTarget::attributeList() const { Q_D(const QMorphTarget); return d->m_targetAttributes; @@ -130,7 +130,7 @@ QStringList QMorphTarget::attributeNames() const /*! Sets \a attributes to the morph target. Old attributes are cleared. */ -void QMorphTarget::setAttributes(const QVector<Qt3DCore::QAttribute *> &attributes) +void QMorphTarget::setAttributes(const QList<Qt3DCore::QAttribute *> &attributes) { Q_D(QMorphTarget); d->m_targetAttributes = attributes; diff --git a/src/animation/frontend/qmorphtarget.h b/src/animation/frontend/qmorphtarget.h index 210a3be41..039158398 100644 --- a/src/animation/frontend/qmorphtarget.h +++ b/src/animation/frontend/qmorphtarget.h @@ -58,10 +58,10 @@ class Q_3DANIMATIONSHARED_EXPORT QMorphTarget : public QObject public: explicit QMorphTarget(QObject *parent = nullptr); - QVector<Qt3DCore::QAttribute *> attributeList() const; + QList<Qt3DCore::QAttribute *> attributeList() const; QStringList attributeNames() const; - void setAttributes(const QVector<Qt3DCore::QAttribute *> &attributes); + void setAttributes(const QList<Qt3DCore::QAttribute *> &attributes); void addAttribute(Qt3DCore::QAttribute *attribute); void removeAttribute(Qt3DCore::QAttribute *attribute); diff --git a/src/animation/frontend/qvertexblendanimation.cpp b/src/animation/frontend/qvertexblendanimation.cpp index 77ba9a301..b997dbabc 100644 --- a/src/animation/frontend/qvertexblendanimation.cpp +++ b/src/animation/frontend/qvertexblendanimation.cpp @@ -194,16 +194,16 @@ void QVertexBlendAnimationPrivate::updateAnimation(float position) // remove attributes from previous frame if (m_currentBase && m_currentTarget && (base != m_currentBase || target != m_currentTarget)) { - const QVector<Qt3DCore::QAttribute *> baseAttributes = m_currentBase->attributeList(); - const QVector<Qt3DCore::QAttribute *> targetAttributes = m_currentTarget->attributeList(); + const QList<Qt3DCore::QAttribute *> baseAttributes = m_currentBase->attributeList(); + const QList<Qt3DCore::QAttribute *> targetAttributes = m_currentTarget->attributeList(); for (int i = 0; i < baseAttributes.size(); ++i) { geometry->removeAttribute(baseAttributes.at(i)); geometry->removeAttribute(targetAttributes.at(i)); } } - const QVector<Qt3DCore::QAttribute *> baseAttributes = base->attributeList(); - const QVector<Qt3DCore::QAttribute *> targetAttributes = target->attributeList(); + const QList<Qt3DCore::QAttribute *> baseAttributes = base->attributeList(); + const QList<Qt3DCore::QAttribute *> targetAttributes = target->attributeList(); const QStringList attributeNames = base->attributeNames(); // add attributes from current frame to the geometry @@ -239,7 +239,7 @@ QVertexBlendAnimation::QVertexBlendAnimation(QObject *parent) this, &QVertexBlendAnimation::updateAnimation); } -QVector<float> QVertexBlendAnimation::targetPositions() const +QList<float> QVertexBlendAnimation::targetPositions() const { Q_D(const QVertexBlendAnimation); return d->m_targetPositions; @@ -266,7 +266,7 @@ QString QVertexBlendAnimation::targetName() const /*! Set morph \a targets to animation. Old targets are cleared. */ -void QVertexBlendAnimation::setMorphTargets(const QVector<Qt3DAnimation::QMorphTarget *> &targets) +void QVertexBlendAnimation::setMorphTargets(const QList<Qt3DAnimation::QMorphTarget *> &targets) { Q_D(QVertexBlendAnimation); d->m_morphTargets = targets; @@ -291,7 +291,7 @@ void QVertexBlendAnimation::removeMorphTarget(Qt3DAnimation::QMorphTarget *targe d->m_morphTargets.removeAll(target); } -void QVertexBlendAnimation::setTargetPositions(const QVector<float> &targetPositions) +void QVertexBlendAnimation::setTargetPositions(const QList<float> &targetPositions) { Q_D(QVertexBlendAnimation); if (d->m_targetPositions == targetPositions) @@ -313,7 +313,7 @@ void QVertexBlendAnimation::setTarget(Qt3DRender::QGeometryRenderer *target) /*! Return morph target list. */ -QVector<Qt3DAnimation::QMorphTarget *> QVertexBlendAnimation::morphTargetList() +QList<Qt3DAnimation::QMorphTarget *> QVertexBlendAnimation::morphTargetList() { Q_D(QVertexBlendAnimation); return d->m_morphTargets; diff --git a/src/animation/frontend/qvertexblendanimation.h b/src/animation/frontend/qvertexblendanimation.h index 1be721ce4..89247656f 100644 --- a/src/animation/frontend/qvertexblendanimation.h +++ b/src/animation/frontend/qvertexblendanimation.h @@ -52,7 +52,7 @@ class QVertexBlendAnimationPrivate; class Q_3DANIMATIONSHARED_EXPORT QVertexBlendAnimation : public QAbstractAnimation { Q_OBJECT - Q_PROPERTY(QVector<float> targetPositions READ targetPositions WRITE setTargetPositions NOTIFY targetPositionsChanged) + Q_PROPERTY(QList<float> targetPositions READ targetPositions WRITE setTargetPositions NOTIFY targetPositionsChanged) Q_PROPERTY(float interpolator READ interpolator NOTIFY interpolatorChanged) Q_PROPERTY(Qt3DRender::QGeometryRenderer *target READ target WRITE setTarget NOTIFY targetChanged) Q_PROPERTY(QString targetName READ targetName WRITE setTargetName NOTIFY targetNameChanged) @@ -60,24 +60,24 @@ class Q_3DANIMATIONSHARED_EXPORT QVertexBlendAnimation : public QAbstractAnimati public: explicit QVertexBlendAnimation(QObject *parent = nullptr); - QVector<float> targetPositions() const; + QList<float> targetPositions() const; float interpolator() const; Qt3DRender::QGeometryRenderer *target() const; QString targetName() const; - void setMorphTargets(const QVector<Qt3DAnimation::QMorphTarget *> &targets); + void setMorphTargets(const QList<Qt3DAnimation::QMorphTarget *> &targets); void addMorphTarget(Qt3DAnimation::QMorphTarget *target); void removeMorphTarget(Qt3DAnimation::QMorphTarget *target); - QVector<Qt3DAnimation::QMorphTarget *> morphTargetList(); + QList<Qt3DAnimation::QMorphTarget *> morphTargetList(); public Q_SLOTS: - void setTargetPositions(const QVector<float> &targetPositions); + void setTargetPositions(const QList<float> &targetPositions); void setTarget(Qt3DRender::QGeometryRenderer *target); void setTargetName(const QString name); Q_SIGNALS: - void targetPositionsChanged(const QVector<float> &targetPositions); + void targetPositionsChanged(const QList<float> &targetPositions); void interpolatorChanged(float interpolator); void targetChanged(Qt3DRender::QGeometryRenderer *target); void targetNameChanged(const QString &name); diff --git a/src/core/aspects/qaspectengine.cpp b/src/core/aspects/qaspectengine.cpp index 2adefbbb3..df352c38d 100644 --- a/src/core/aspects/qaspectengine.cpp +++ b/src/core/aspects/qaspectengine.cpp @@ -60,11 +60,11 @@ QT_BEGIN_NAMESPACE namespace{ -QVector<Qt3DCore::QNode *> getNodesForCreation(Qt3DCore::QNode *root) +QList<Qt3DCore::QNode *> getNodesForCreation(Qt3DCore::QNode *root) { using namespace Qt3DCore; - QVector<QNode *> nodes; + QList<QNode *> nodes; QNodeVisitor visitor; visitor.traverse(root, [&nodes](QNode *node) { nodes.append(node); @@ -84,11 +84,11 @@ QVector<Qt3DCore::QNode *> getNodesForCreation(Qt3DCore::QNode *root) return nodes; } -QVector<Qt3DCore::QNode *> getNodesForRemoval(Qt3DCore::QNode *root) +QList<Qt3DCore::QNode *> getNodesForRemoval(Qt3DCore::QNode *root) { using namespace Qt3DCore; - QVector<QNode *> nodes; + QList<QNode *> nodes; QNodeVisitor visitor; visitor.traverse(root, [&nodes](QNode *node) { nodes.append(node); @@ -373,7 +373,7 @@ void QAspectEngine::unregisterAspect(const QString &name) /*! * \return the aspects owned by the aspect engine. */ -QVector<QAbstractAspect *> QAspectEngine::aspects() const +QList<QAbstractAspect *> QAspectEngine::aspects() const { Q_D(const QAspectEngine); return d->m_aspects; @@ -444,10 +444,10 @@ QNode *QAspectEngine::lookupNode(QNodeId id) const return d->m_scene ? d->m_scene->lookupNode(id) : nullptr; } -QVector<QNode *> QAspectEngine::lookupNodes(const QVector<QNodeId> &ids) const +QList<QNode *> QAspectEngine::lookupNodes(const QList<QNodeId> &ids) const { Q_D(const QAspectEngine); - return d->m_scene ? d->m_scene->lookupNodes(ids) : QVector<QNode *>{}; + return d->m_scene ? d->m_scene->lookupNodes(ids) : QList<QNode *>{}; } /*! @@ -487,7 +487,7 @@ void QAspectEngine::setRootEntity(QEntityPtr root) // deregister the nodes from the scene d->initNodeTree(root.data()); - const QVector<QNode *> nodes = getNodesForCreation(root.data()); + const QList<QNode *> nodes = getNodesForCreation(root.data()); // Specify if the AspectManager should be driving the simulation loop or not d->m_aspectManager->setRunMode(d->m_runMode); diff --git a/src/core/aspects/qaspectengine.h b/src/core/aspects/qaspectengine.h index 04eede9d3..a6592cf34 100644 --- a/src/core/aspects/qaspectengine.h +++ b/src/core/aspects/qaspectengine.h @@ -43,8 +43,8 @@ #include <Qt3DCore/qt3dcore_global.h> #include <Qt3DCore/qabstractfrontendnodemanager.h> #include <Qt3DCore/qnodeid.h> +#include <QtCore/QList> #include <QtCore/QObject> -#include <QtCore/QVector> QT_BEGIN_NAMESPACE @@ -82,7 +82,7 @@ public: void unregisterAspect(QAbstractAspect *aspect); void unregisterAspect(const QString &name); - QVector<QAbstractAspect*> aspects() const; + QList<QAbstractAspect*> aspects() const; QAbstractAspect *aspect(const QString &name) const; QVariant executeCommand(const QString &command); @@ -90,7 +90,7 @@ public: void processFrame(); QNode *lookupNode(QNodeId id) const override; - QVector<QNode *> lookupNodes(const QVector<QNodeId> &ids) const override; + QList<QNode *> lookupNodes(const QList<QNodeId> &ids) const override; private: Q_DECLARE_PRIVATE(QAspectEngine) diff --git a/src/core/geometry/qgeometry.cpp b/src/core/geometry/qgeometry.cpp index 4e8dcacac..6b1af6804 100644 --- a/src/core/geometry/qgeometry.cpp +++ b/src/core/geometry/qgeometry.cpp @@ -279,7 +279,7 @@ QVector3D QGeometry::maxExtent() const /*! Returns the list of attributes in this geometry. */ -QVector<QAttribute *> QGeometry::attributes() const +QList<QAttribute *> QGeometry::attributes() const { Q_D(const QGeometry); return d->m_attributes; diff --git a/src/core/geometry/qgeometry.h b/src/core/geometry/qgeometry.h index 89b3c7019..8f21638b2 100644 --- a/src/core/geometry/qgeometry.h +++ b/src/core/geometry/qgeometry.h @@ -60,7 +60,7 @@ public: explicit QGeometry(Qt3DCore::QNode *parent = nullptr); ~QGeometry(); - QVector<QAttribute *> attributes() const; + QList<QAttribute *> attributes() const; Q_INVOKABLE void addAttribute(Qt3DCore::QAttribute *attribute); Q_INVOKABLE void removeAttribute(Qt3DCore::QAttribute *attribute); diff --git a/src/core/jobs/qaspectjob.h b/src/core/jobs/qaspectjob.h index 90070f5b7..a824c90cf 100644 --- a/src/core/jobs/qaspectjob.h +++ b/src/core/jobs/qaspectjob.h @@ -42,7 +42,6 @@ #include <Qt3DCore/qt3dcore_global.h> #include <QtCore/QSharedPointer> -#include <QtCore/QVector> QT_BEGIN_NAMESPACE diff --git a/src/core/nodes/qcomponent.cpp b/src/core/nodes/qcomponent.cpp index 79bba229d..5e41e2f67 100644 --- a/src/core/nodes/qcomponent.cpp +++ b/src/core/nodes/qcomponent.cpp @@ -158,9 +158,9 @@ void QComponent::setShareable(bool shareable) } /*! - Returns a QVector containing all the entities that reference this component. + Returns a QList containing all the entities that reference this component. */ -QVector<QEntity *> QComponent::entities() const +QList<QEntity *> QComponent::entities() const { Q_D(const QComponent); return d->m_entities; diff --git a/src/core/nodes/qcomponent.h b/src/core/nodes/qcomponent.h index f07b34c9f..3de755710 100644 --- a/src/core/nodes/qcomponent.h +++ b/src/core/nodes/qcomponent.h @@ -61,7 +61,7 @@ public: bool isShareable() const; - QVector<QEntity *> entities() const; + QList<QEntity *> entities() const; public Q_SLOTS: void setShareable(bool isShareable); diff --git a/src/core/nodes/qentity.cpp b/src/core/nodes/qentity.cpp index 02f84b924..25ec4434c 100644 --- a/src/core/nodes/qentity.cpp +++ b/src/core/nodes/qentity.cpp @@ -119,7 +119,7 @@ namespace Qt3DCore { */ /*! - \fn template<typename T> QVector<T *> Qt3DCore::QEntity::componentsOfType() const + \fn template<typename T> QList<T *> Qt3DCore::QEntity::componentsOfType() const Returns all the components added to this entity that can be cast to type T or an empty vector if there are no such components. diff --git a/src/core/nodes/qentity.h b/src/core/nodes/qentity.h index ab87da4eb..6c9bec118 100644 --- a/src/core/nodes/qentity.h +++ b/src/core/nodes/qentity.h @@ -51,7 +51,7 @@ namespace Qt3DCore { class QComponent; class QEntityPrivate; -typedef QVector<QComponent*> QComponentVector; +using QComponentVector = QList<QComponent*>; class Q_3DCORESHARED_EXPORT QEntity : public QNode { @@ -63,9 +63,9 @@ public: QComponentVector components() const; template<class T> - QVector<T *> componentsOfType() const + QList<T *> componentsOfType() const { - QVector<T*> matchComponents; + QList<T*> matchComponents; const QComponentVector comps = this->components(); for (QComponent *component : comps) { T *typedComponent = qobject_cast<T*>(component); diff --git a/src/core/nodes/qnode.cpp b/src/core/nodes/qnode.cpp index e9665874d..15a2f5978 100644 --- a/src/core/nodes/qnode.cpp +++ b/src/core/nodes/qnode.cpp @@ -383,7 +383,7 @@ void QNodePrivate::setSceneHelper(QNode *root) // We also need to handle QEntity <-> QComponent relationships if (QComponent *c = qobject_cast<QComponent *>(root)) { - const QVector<QEntity *> entities = c->entities(); + const QList<QEntity *> entities = c->entities(); for (QEntity *entity : entities) { if (!m_scene->hasEntityForComponent(c->id(), entity->id())) { if (!c->isShareable() && !m_scene->entitiesForComponent(c->id()).isEmpty()) @@ -406,7 +406,7 @@ void QNodePrivate::unsetSceneHelper(QNode *node) // We also need to handle QEntity <-> QComponent relationships removal if (QComponent *c = qobject_cast<QComponent *>(node)) { - const QVector<QEntity *> entities = c->entities(); + const QList<QEntity *> entities = c->entities(); for (QEntity *entity : entities) { if (nodePrivate->m_scene) nodePrivate->m_scene->removeEntityForComponent(c->id(), entity->id()); diff --git a/src/core/nodes/qnode.h b/src/core/nodes/qnode.h index 2fe0b0f9e..4c7f11d56 100644 --- a/src/core/nodes/qnode.h +++ b/src/core/nodes/qnode.h @@ -58,8 +58,8 @@ class QAspectEngine; class QBackendNodeTester; #endif -typedef QVector<QNode *> QNodeVector; -typedef QSharedPointer<QNode> QNodePtr; +using QNodeVector = QList<QNode *>; +using QNodePtr = QSharedPointer<QNode>; class Q_3DCORESHARED_EXPORT QNode : public QObject { diff --git a/src/core/nodes/qnodeid.h b/src/core/nodes/qnodeid.h index 18fb954ef..704fc6c76 100644 --- a/src/core/nodes/qnodeid.h +++ b/src/core/nodes/qnodeid.h @@ -100,7 +100,7 @@ private: }; QT3D_DECLARE_TYPEINFO(Qt3DCore, QNodeId, Q_PRIMITIVE_TYPE) -typedef QVector<QNodeId> QNodeIdVector; +using QNodeIdVector = QList<QNodeId>; #ifndef QT_NO_DEBUG_STREAM Q_3DCORESHARED_EXPORT QDebug operator<<(QDebug d, QNodeId id); diff --git a/src/core/qabstractfrontendnodemanager.cpp b/src/core/qabstractfrontendnodemanager.cpp index 9c8b8eceb..7b2ed5f3e 100644 --- a/src/core/qabstractfrontendnodemanager.cpp +++ b/src/core/qabstractfrontendnodemanager.cpp @@ -55,7 +55,7 @@ Returns the node instance matching the id, or nullptr if not found. */ /* -\fn QVector<QNode *> Qt3DCore::QAbstractFrontEndNodeManager::lookupNodes(const QVector<QNodeId> &ids) const +\fn QList<QNode *> Qt3DCore::QAbstractFrontEndNodeManager::lookupNodes(const QList<QNodeId> &ids) const Returns the vector of node instance matching the ids. diff --git a/src/core/qabstractfrontendnodemanager.h b/src/core/qabstractfrontendnodemanager.h index 4b47e7761..3a42f05e1 100644 --- a/src/core/qabstractfrontendnodemanager.h +++ b/src/core/qabstractfrontendnodemanager.h @@ -43,7 +43,7 @@ #include <Qt3DCore/qt3dcore_global.h> #include <Qt3DCore/qnodeid.h> -#include <QtCore/qvector.h> +#include <QtCore/qlist.h> QT_BEGIN_NAMESPACE @@ -67,7 +67,7 @@ public: virtual ~QAbstractFrontEndNodeManager(); virtual QNode *lookupNode(QNodeId id) const = 0; - virtual QVector<QNode *> lookupNodes(const QVector<QNodeId> &ids) const = 0; + virtual QList<QNode *> lookupNodes(const QList<QNodeId> &ids) const = 0; protected: QAbstractFrontEndNodeManager(); diff --git a/src/core/transforms/qjoint.cpp b/src/core/transforms/qjoint.cpp index de7d913e3..1c0233f49 100644 --- a/src/core/transforms/qjoint.cpp +++ b/src/core/transforms/qjoint.cpp @@ -373,7 +373,7 @@ void QJoint::removeChildJoint(QJoint *joint) /*! The vector of joints this joint has as children. */ -QVector<QJoint *> QJoint::childJoints() const +QList<QJoint *> QJoint::childJoints() const { Q_D(const QJoint); return d->m_childJoints; diff --git a/src/core/transforms/qjoint.h b/src/core/transforms/qjoint.h index 1bd404a1a..851673a59 100644 --- a/src/core/transforms/qjoint.h +++ b/src/core/transforms/qjoint.h @@ -80,7 +80,7 @@ public: void addChildJoint(QJoint *joint); void removeChildJoint(QJoint *joint); - QVector<QJoint *> childJoints() const; + QList<QJoint *> childJoints() const; public Q_SLOTS: void setScale(const QVector3D &scale); diff --git a/src/extras/defaults/qspritesheet.cpp b/src/extras/defaults/qspritesheet.cpp index 8eb1e33e6..94f608f4a 100644 --- a/src/extras/defaults/qspritesheet.cpp +++ b/src/extras/defaults/qspritesheet.cpp @@ -117,7 +117,7 @@ QSpriteSheet::~QSpriteSheet() { } -QVector<QSpriteSheetItem *> QSpriteSheet::sprites() const +QList<QSpriteSheetItem *> QSpriteSheet::sprites() const { Q_D(const QSpriteSheet); return d->m_sprites; @@ -160,7 +160,7 @@ void QSpriteSheet::removeSprite(QSpriteSheetItem *sprite) d->unregisterDestructionHelper(sprite); } -void QSpriteSheet::setSprites(QVector<QSpriteSheetItem *> sprites) +void QSpriteSheet::setSprites(QList<QSpriteSheetItem *> sprites) { Q_D(QSpriteSheet); d->m_sprites = sprites; diff --git a/src/extras/defaults/qspritesheet.h b/src/extras/defaults/qspritesheet.h index 93c4262b0..8e69458cc 100644 --- a/src/extras/defaults/qspritesheet.h +++ b/src/extras/defaults/qspritesheet.h @@ -42,8 +42,8 @@ #include <Qt3DExtras/qabstractspritesheet.h> #include <Qt3DExtras/qspritesheetitem.h> +#include <QtCore/QList> #include <QtCore/QRect> -#include <QtCore/QVector> QT_BEGIN_NAMESPACE @@ -54,21 +54,21 @@ class QSpriteSheetPrivate; class Q_3DEXTRASSHARED_EXPORT QSpriteSheet : public QAbstractSpriteSheet { Q_OBJECT - Q_PROPERTY(QVector<QSpriteSheetItem *> sprites READ sprites WRITE setSprites NOTIFY spritesChanged) + Q_PROPERTY(QList<QSpriteSheetItem *> sprites READ sprites WRITE setSprites NOTIFY spritesChanged) public: explicit QSpriteSheet(Qt3DCore::QNode *parent = nullptr); ~QSpriteSheet(); - QVector<QSpriteSheetItem *> sprites() const; + QList<QSpriteSheetItem *> sprites() const; QSpriteSheetItem *addSprite(int x, int y, int width, int height); void addSprite(QSpriteSheetItem *sprite); void removeSprite(QSpriteSheetItem *sprite); public Q_SLOTS: - void setSprites(QVector<QSpriteSheetItem *> sprites); + void setSprites(QList<QSpriteSheetItem *> sprites); Q_SIGNALS: - void spritesChanged(QVector<QSpriteSheetItem *> sprites); + void spritesChanged(QList<QSpriteSheetItem *> sprites); private: Q_DECLARE_PRIVATE(QSpriteSheet) diff --git a/src/input/frontend/qabstractphysicaldevice.cpp b/src/input/frontend/qabstractphysicaldevice.cpp index 100852d2a..3a7eaf0dd 100644 --- a/src/input/frontend/qabstractphysicaldevice.cpp +++ b/src/input/frontend/qabstractphysicaldevice.cpp @@ -184,7 +184,7 @@ void QAbstractPhysicalDevice::removeAxisSetting(QAxisSetting *axisSetting) /*! Returns the axisSettings associated with this device. */ -QVector<QAxisSetting *> QAbstractPhysicalDevice::axisSettings() const +QList<QAxisSetting *> QAbstractPhysicalDevice::axisSettings() const { Q_D(const QAbstractPhysicalDevice); return d->m_axisSettings; diff --git a/src/input/frontend/qabstractphysicaldevice.h b/src/input/frontend/qabstractphysicaldevice.h index 3161443ae..501b4851c 100644 --- a/src/input/frontend/qabstractphysicaldevice.h +++ b/src/input/frontend/qabstractphysicaldevice.h @@ -42,8 +42,8 @@ #include <Qt3DInput/qt3dinput_global.h> #include <Qt3DCore/qnode.h> +#include <QtCore/qlist.h> #include <QtCore/qobject.h> -#include <QtCore/qvector.h> QT_BEGIN_NAMESPACE @@ -70,7 +70,7 @@ public: void addAxisSetting(QAxisSetting *axisSetting); void removeAxisSetting(QAxisSetting *axisSetting); - QVector<QAxisSetting *> axisSettings() const; + QList<QAxisSetting *> axisSettings() const; protected: QAbstractPhysicalDevice(QAbstractPhysicalDevicePrivate &dd, Qt3DCore::QNode *parent = nullptr); diff --git a/src/input/frontend/qaction.cpp b/src/input/frontend/qaction.cpp index c13aaa6bd..51f375fb5 100644 --- a/src/input/frontend/qaction.cpp +++ b/src/input/frontend/qaction.cpp @@ -141,7 +141,7 @@ void QAction::removeInput(QAbstractActionInput *input) /*! Returns the list of inputs that can trigger this action. */ -QVector<QAbstractActionInput *> QAction::inputs() const +QList<QAbstractActionInput *> QAction::inputs() const { Q_D(const QAction); return d->m_inputs; diff --git a/src/input/frontend/qaction.h b/src/input/frontend/qaction.h index 63a9c7033..707283b30 100644 --- a/src/input/frontend/qaction.h +++ b/src/input/frontend/qaction.h @@ -62,7 +62,7 @@ public: void addInput(QAbstractActionInput *input); void removeInput(QAbstractActionInput *input); - QVector<QAbstractActionInput *> inputs() const; + QList<QAbstractActionInput *> inputs() const; Q_SIGNALS: void activeChanged(bool isActive); diff --git a/src/input/frontend/qactioninput.cpp b/src/input/frontend/qactioninput.cpp index 42db5d28f..1b4834d7f 100644 --- a/src/input/frontend/qactioninput.cpp +++ b/src/input/frontend/qactioninput.cpp @@ -105,7 +105,7 @@ QActionInput::~QActionInput() Holds the buttons that can trigger this Action. */ -QVector<int> QActionInput::buttons() const +QList<int> QActionInput::buttons() const { Q_D(const QActionInput); return d->m_buttons; @@ -165,7 +165,7 @@ QAbstractPhysicalDevice *QActionInput::sourceDevice() const } /*! - \fn Qt3DInput::QActionInput::buttonsChanged(const QVector<int> &buttons) + \fn Qt3DInput::QActionInput::buttonsChanged(const QList<int> &buttons) This signal is emitted when the buttons associated with the action input is changed. The buttons changed are \a buttons @@ -178,7 +178,7 @@ QAbstractPhysicalDevice *QActionInput::sourceDevice() const */ /*! - \qmlsignal Qt3D.Input::ActionInput::buttonsChanged(const QVector<int> &buttons) + \qmlsignal Qt3D.Input::ActionInput::buttonsChanged(const QList<int> &buttons) This signal is emitted when the \a buttons associated with the action input is changed. @@ -188,7 +188,7 @@ QAbstractPhysicalDevice *QActionInput::sourceDevice() const /*! Set the buttons to trigger the QActionInput instance to \a buttons. */ -void QActionInput::setButtons(const QVector<int> &buttons) +void QActionInput::setButtons(const QList<int> &buttons) { Q_D(QActionInput); if (buttons != d->m_buttons) { diff --git a/src/input/frontend/qactioninput.h b/src/input/frontend/qactioninput.h index 86dfcb282..fbf899e26 100644 --- a/src/input/frontend/qactioninput.h +++ b/src/input/frontend/qactioninput.h @@ -55,22 +55,22 @@ class Q_3DINPUTSHARED_EXPORT QActionInput : public Qt3DInput::QAbstractActionInp { Q_OBJECT Q_PROPERTY(Qt3DInput::QAbstractPhysicalDevice *sourceDevice READ sourceDevice WRITE setSourceDevice NOTIFY sourceDeviceChanged) - Q_PROPERTY(QVector<int> buttons READ buttons WRITE setButtons NOTIFY buttonsChanged) + Q_PROPERTY(QList<int> buttons READ buttons WRITE setButtons NOTIFY buttonsChanged) public: explicit QActionInput(Qt3DCore::QNode *parent = nullptr); ~QActionInput(); QAbstractPhysicalDevice *sourceDevice() const; - QVector<int> buttons() const; + QList<int> buttons() const; public Q_SLOTS: void setSourceDevice(QAbstractPhysicalDevice *sourceDevice); - void setButtons(const QVector<int> &buttons); + void setButtons(const QList<int> &buttons); Q_SIGNALS: void sourceDeviceChanged(QAbstractPhysicalDevice *sourceDevice); - void buttonsChanged(const QVector<int> &buttons); + void buttonsChanged(const QList<int> &buttons); private: Q_DECLARE_PRIVATE(QActionInput) diff --git a/src/input/frontend/qaxis.cpp b/src/input/frontend/qaxis.cpp index d41cf904f..d19b0f08e 100644 --- a/src/input/frontend/qaxis.cpp +++ b/src/input/frontend/qaxis.cpp @@ -149,7 +149,7 @@ void QAxis::removeInput(QAbstractAxisInput *input) \return vector of all inputs added to the axis. */ -QVector<QAbstractAxisInput *> QAxis::inputs() const +QList<QAbstractAxisInput *> QAxis::inputs() const { Q_D(const QAxis); return d->m_inputs; diff --git a/src/input/frontend/qaxis.h b/src/input/frontend/qaxis.h index 4482dbedc..3dcb68692 100644 --- a/src/input/frontend/qaxis.h +++ b/src/input/frontend/qaxis.h @@ -59,7 +59,7 @@ public: void addInput(QAbstractAxisInput *input); void removeInput(QAbstractAxisInput *input); - QVector<QAbstractAxisInput *> inputs() const; + QList<QAbstractAxisInput *> inputs() const; float value() const; diff --git a/src/input/frontend/qaxissetting.cpp b/src/input/frontend/qaxissetting.cpp index d5ea709f6..70f8120b7 100644 --- a/src/input/frontend/qaxissetting.cpp +++ b/src/input/frontend/qaxissetting.cpp @@ -90,7 +90,7 @@ QAxisSetting::~QAxisSetting() * \brief QAxisSetting::axes * \return the current list of Axis these settings apply to. */ -QVector<int> QAxisSetting::axes() const +QList<int> QAxisSetting::axes() const { Q_D(const QAxisSetting); return d->m_axes; @@ -159,7 +159,7 @@ void QAxisSetting::setDeadZoneRadius(float deadZoneRadius) } /*! - \fn Qt3DInput::QAxisSetting::axesChanged(const QVector<int> &axes) + \fn Qt3DInput::QAxisSetting::axesChanged(const QList<int> &axes) This signal is emitted when the axes associated with the axis setting is changed to \a axes. */ @@ -181,7 +181,7 @@ void QAxisSetting::setDeadZoneRadius(float deadZoneRadius) /*! Set the current axes of the QAxisSetting instance to \a axes. */ -void QAxisSetting::setAxes(const QVector<int> &axes) +void QAxisSetting::setAxes(const QList<int> &axes) { Q_D(QAxisSetting); if (d->m_axes == axes) diff --git a/src/input/frontend/qaxissetting.h b/src/input/frontend/qaxissetting.h index 5f814cf8a..b7ec7b7da 100644 --- a/src/input/frontend/qaxissetting.h +++ b/src/input/frontend/qaxissetting.h @@ -42,7 +42,7 @@ #include <Qt3DInput/qt3dinput_global.h> #include <Qt3DCore/qnode.h> -#include <QtCore/qvector.h> +#include <QtCore/qlist.h> QT_BEGIN_NAMESPACE @@ -54,7 +54,7 @@ class Q_3DINPUTSHARED_EXPORT QAxisSetting : public Qt3DCore::QNode { Q_OBJECT Q_PROPERTY(float deadZoneRadius READ deadZoneRadius WRITE setDeadZoneRadius NOTIFY deadZoneRadiusChanged) - Q_PROPERTY(QVector<int> axes READ axes WRITE setAxes NOTIFY axesChanged) + Q_PROPERTY(QList<int> axes READ axes WRITE setAxes NOTIFY axesChanged) Q_PROPERTY(bool smooth READ isSmoothEnabled WRITE setSmoothEnabled NOTIFY smoothChanged) public: @@ -62,17 +62,17 @@ public: ~QAxisSetting(); float deadZoneRadius() const; - QVector<int> axes() const; + QList<int> axes() const; bool isSmoothEnabled() const; public Q_SLOTS: void setDeadZoneRadius(float deadZoneRadius); - void setAxes(const QVector<int> &axes); + void setAxes(const QList<int> &axes); void setSmoothEnabled(bool enabled); Q_SIGNALS: void deadZoneRadiusChanged(float deadZoneRadius); - void axesChanged(const QVector<int> &axes); + void axesChanged(const QList<int> &axes); void smoothChanged(bool smooth); private: diff --git a/src/input/frontend/qbuttonaxisinput.cpp b/src/input/frontend/qbuttonaxisinput.cpp index 6cd997156..0149766f6 100644 --- a/src/input/frontend/qbuttonaxisinput.cpp +++ b/src/input/frontend/qbuttonaxisinput.cpp @@ -123,7 +123,7 @@ float QButtonAxisInput::scale() const \property QButtonAxisInput::buttons Specifies the buttons which control the axis */ -void QButtonAxisInput::setButtons(const QVector<int> &buttons) +void QButtonAxisInput::setButtons(const QList<int> &buttons) { Q_D(QButtonAxisInput); if (buttons != d->m_buttons) { @@ -132,7 +132,7 @@ void QButtonAxisInput::setButtons(const QVector<int> &buttons) } } -QVector<int> QButtonAxisInput::buttons() const +QList<int> QButtonAxisInput::buttons() const { Q_D(const QButtonAxisInput); return d->m_buttons; diff --git a/src/input/frontend/qbuttonaxisinput.h b/src/input/frontend/qbuttonaxisinput.h index e17b6d94e..2e3da532f 100644 --- a/src/input/frontend/qbuttonaxisinput.h +++ b/src/input/frontend/qbuttonaxisinput.h @@ -53,7 +53,7 @@ class Q_3DINPUTSHARED_EXPORT QButtonAxisInput : public QAbstractAxisInput { Q_OBJECT Q_PROPERTY(float scale READ scale WRITE setScale NOTIFY scaleChanged) - Q_PROPERTY(QVector<int> buttons READ buttons WRITE setButtons NOTIFY buttonsChanged) + Q_PROPERTY(QList<int> buttons READ buttons WRITE setButtons NOTIFY buttonsChanged) Q_PROPERTY(float acceleration READ acceleration WRITE setAcceleration NOTIFY accelerationChanged) Q_PROPERTY(float deceleration READ deceleration WRITE setDeceleration NOTIFY decelerationChanged) @@ -62,21 +62,21 @@ public: ~QButtonAxisInput(); float scale() const; - QVector<int> buttons() const; + QList<int> buttons() const; float acceleration() const; float deceleration() const; public Q_SLOTS: void setScale(float scale); - void setButtons(const QVector<int> &buttons); + void setButtons(const QList<int> &buttons); void setAcceleration(float acceleration); void setDeceleration(float deceleration); Q_SIGNALS: void scaleChanged(float scale); - void buttonsChanged(const QVector<int> &buttons); + void buttonsChanged(const QList<int> &buttons); void accelerationChanged(float acceleration); void decelerationChanged(float deceleration); diff --git a/src/input/frontend/qinputchord.cpp b/src/input/frontend/qinputchord.cpp index 474e25254..3e470f8bb 100644 --- a/src/input/frontend/qinputchord.cpp +++ b/src/input/frontend/qinputchord.cpp @@ -178,7 +178,7 @@ void QInputChord::removeChord(QAbstractActionInput *input) /*! Returns the QInputChord's chord vector. */ -QVector<QAbstractActionInput *> QInputChord::chords() const +QList<QAbstractActionInput *> QInputChord::chords() const { Q_D(const QInputChord); return d->m_chords; diff --git a/src/input/frontend/qinputchord.h b/src/input/frontend/qinputchord.h index fd917c745..1960d949d 100644 --- a/src/input/frontend/qinputchord.h +++ b/src/input/frontend/qinputchord.h @@ -64,7 +64,7 @@ public: void addChord(QAbstractActionInput *input); void removeChord(QAbstractActionInput *input); - QVector<QAbstractActionInput *> chords() const; + QList<QAbstractActionInput *> chords() const; public Q_SLOTS: void setTimeout(int timeout); diff --git a/src/input/frontend/qinputsequence.cpp b/src/input/frontend/qinputsequence.cpp index ba571bbb9..7fa701749 100644 --- a/src/input/frontend/qinputsequence.cpp +++ b/src/input/frontend/qinputsequence.cpp @@ -231,7 +231,7 @@ void QInputSequence::removeSequence(QAbstractActionInput *input) /*! Returns the QInputSequence's sequence vector. */ -QVector<QAbstractActionInput *> QInputSequence::sequences() const +QList<QAbstractActionInput *> QInputSequence::sequences() const { Q_D(const QInputSequence); return d->m_sequences; diff --git a/src/input/frontend/qinputsequence.h b/src/input/frontend/qinputsequence.h index 47e4aa488..f732e169f 100644 --- a/src/input/frontend/qinputsequence.h +++ b/src/input/frontend/qinputsequence.h @@ -66,7 +66,7 @@ public: void addSequence(QAbstractActionInput *input); void removeSequence(QAbstractActionInput *input); - QVector<QAbstractActionInput *> sequences() const; + QList<QAbstractActionInput *> sequences() const; public Q_SLOTS: void setTimeout(int timeout); diff --git a/src/input/frontend/qlogicaldevice.cpp b/src/input/frontend/qlogicaldevice.cpp index cf723f9aa..eb1eaf350 100644 --- a/src/input/frontend/qlogicaldevice.cpp +++ b/src/input/frontend/qlogicaldevice.cpp @@ -195,7 +195,7 @@ void QLogicalDevice::removeAction(QAction *action) /*! Returns the list of actions. */ -QVector<QAction *> QLogicalDevice::actions() const +QList<QAction *> QLogicalDevice::actions() const { Q_D(const QLogicalDevice); return d->m_actions; @@ -246,7 +246,7 @@ void QLogicalDevice::removeAxis(QAxis *axis) /*! Returns the list of axis. */ -QVector<QAxis *> QLogicalDevice::axes() const +QList<QAxis *> QLogicalDevice::axes() const { Q_D(const QLogicalDevice); return d->m_axes; diff --git a/src/input/frontend/qlogicaldevice.h b/src/input/frontend/qlogicaldevice.h index 5f8a08e6e..06fb9d279 100644 --- a/src/input/frontend/qlogicaldevice.h +++ b/src/input/frontend/qlogicaldevice.h @@ -60,11 +60,11 @@ public: void addAction(QAction *action); void removeAction(QAction *action); - QVector<QAction *> actions() const; + QList<QAction *> actions() const; void addAxis(QAxis *axis); void removeAxis(QAxis *axis); - QVector<QAxis *> axes() const; + QList<QAxis *> axes() const; private: Q_DECLARE_PRIVATE(QLogicalDevice) diff --git a/src/plugins/sceneparsers/assimp/assimpimporter.cpp b/src/plugins/sceneparsers/assimp/assimpimporter.cpp index c0bfb33b7..b6880efbc 100644 --- a/src/plugins/sceneparsers/assimp/assimpimporter.cpp +++ b/src/plugins/sceneparsers/assimp/assimpimporter.cpp @@ -472,7 +472,7 @@ Qt3DCore::QEntity *AssimpImporter::node(const QString &id) } template <typename T> -void findAnimationsForNode(QVector<T *> &animations, QVector<T *> &result, const QString &name) +void findAnimationsForNode(QList<T *> &animations, QList<T *> &result, const QString &name) { for (T *anim : animations) { if (anim->targetName() == name) { @@ -505,7 +505,7 @@ Qt3DCore::QEntity *AssimpImporter::node(aiNode *node) if (morphingAnimations.size() > 0) { material = new Qt3DExtras::QMorphPhongMaterial(entityNode); - QVector<Qt3DAnimation::QMorphingAnimation *> animations; + QList<Qt3DAnimation::QMorphingAnimation *> animations; findAnimationsForNode<Qt3DAnimation::QMorphingAnimation>(m_scene->m_morphAnimations, animations, aiStringToQString(node->mName)); @@ -562,7 +562,7 @@ Qt3DCore::QEntity *AssimpImporter::node(aiNode *node) transform->setMatrix(qTransformMatrix); entityNode->addComponent(transform); - QVector<Qt3DAnimation::QKeyframeAnimation *> animations; + QList<Qt3DAnimation::QKeyframeAnimation *> animations; findAnimationsForNode<Qt3DAnimation::QKeyframeAnimation>(m_scene->m_animations, animations, aiStringToQString(node->mName)); @@ -844,8 +844,8 @@ QGeometryRenderer *AssimpImporter::loadMesh(uint meshIndex) Qt3DAnimation::QMorphingAnimation *morphingAnimation = new Qt3DAnimation::QMorphingAnimation(geometryRenderer); - QVector<QString> names; - QVector<Qt3DAnimation::QMorphTarget *> targets; + QList<QString> names; + QList<Qt3DAnimation::QMorphTarget *> targets; uint voff = 0; uint noff = 0; uint tanoff = 0; @@ -887,7 +887,7 @@ QGeometryRenderer *AssimpImporter::loadMesh(uint meshIndex) aiAnimMesh *animesh = mesh->mAnimMeshes[i]; Qt3DAnimation::QMorphTarget *target = new Qt3DAnimation::QMorphTarget(geometryRenderer); targets.push_back(target); - QVector<QAttribute *> attributes; + QList<QAttribute *> attributes; QByteArray targetBufferArray; targetBufferArray.resize(clumpSize * mesh->mNumVertices * sizeof(float)); float *dst = reinterpret_cast<float *>(targetBufferArray.data()); @@ -1049,7 +1049,7 @@ Qt3DCore::QEntity *AssimpImporter::loadCamera(aiNode *node) return camera; } -int findTimeIndex(const QVector<float> ×, float time) { +int findTimeIndex(const QList<float> ×, float time) { for (int i = 0; i < times.size(); i++) { if (qFuzzyCompare(times[i], time)) return i; @@ -1057,7 +1057,7 @@ int findTimeIndex(const QVector<float> ×, float time) { return -1; } -void insertAtTime(QVector<float> &positions, QVector<Qt3DCore::QTransform *> &tranforms, +void insertAtTime(QList<float> &positions, QList<Qt3DCore::QTransform *> &tranforms, Qt3DCore::QTransform *t, float time) { if (positions.size() == 0) { @@ -1089,8 +1089,8 @@ void AssimpImporter::loadAnimation(uint animationIndex) aiNode *targetNode = m_scene->m_aiScene->mRootNode->FindNode(nodeAnim->mNodeName); Qt3DAnimation::QKeyframeAnimation *kfa = new Qt3DAnimation::QKeyframeAnimation(); - QVector<float> positions; - QVector<Qt3DCore::QTransform*> transforms; + QList<float> positions; + QList<Qt3DCore::QTransform *> transforms; if ((nodeAnim->mNumPositionKeys > 1) || !(nodeAnim->mNumPositionKeys == 1 && nodeAnim->mPositionKeys[0].mValue.x == 0 && nodeAnim->mPositionKeys[0].mValue.y == 0 @@ -1162,7 +1162,7 @@ void AssimpImporter::loadAnimation(uint animationIndex) aiMesh *mesh = m_scene->m_aiScene->mMeshes[targetNode->mMeshes[0]]; Qt3DAnimation::QMorphingAnimation *morphingAnimation = new Qt3DAnimation::QMorphingAnimation; - QVector<float> positions; + QList<float> positions; positions.resize(morphAnim->mNumKeys); // set so that weights array is allocated to correct size in morphingAnimation morphingAnimation->setTargetPositions(positions); @@ -1170,7 +1170,7 @@ void AssimpImporter::loadAnimation(uint animationIndex) aiMeshMorphKey &key = morphAnim->mKeys[j]; positions[j] = key.mTime * tickScale; - QVector<float> weights; + QList<float> weights; weights.resize(key.mNumValuesAndWeights); for (int k = 0; k < weights.size(); k++) { const unsigned int value = key.mValues[k]; diff --git a/src/plugins/sceneparsers/assimp/assimpimporter.h b/src/plugins/sceneparsers/assimp/assimpimporter.h index 9d6bd73de..c1c8537cc 100644 --- a/src/plugins/sceneparsers/assimp/assimpimporter.h +++ b/src/plugins/sceneparsers/assimp/assimpimporter.h @@ -58,8 +58,8 @@ #include <assimp/DefaultLogger.hpp> #include <QtCore/QDir> +#include <QtCore/QList> #include <QtCore/QLoggingCategory> -#include <QtCore/QVector> #include "assimphelpers.h" @@ -139,8 +139,8 @@ private: mutable const aiScene *m_aiScene; QHash<aiTextureType, QString> m_textureToParameterName; - QVector<Qt3DAnimation::QKeyframeAnimation *> m_animations; - QVector<Qt3DAnimation::QMorphingAnimation *> m_morphAnimations; + QList<Qt3DAnimation::QKeyframeAnimation *> m_animations; + QList<Qt3DAnimation::QMorphingAnimation *> m_morphAnimations; }; QDir m_sceneDir; diff --git a/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp b/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp index 7be8dd43e..d7424831a 100644 --- a/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp +++ b/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp @@ -132,7 +132,7 @@ inline QJsonArray col2jsvec(const QColor &color, bool alpha = false) } template <typename T> -inline QJsonArray vec2jsvec(const QVector<T> &v) +inline QJsonArray vec2jsvec(const QList<T> &v) { QJsonArray arr; for (int i = 0; i < v.count(); ++i) @@ -477,7 +477,7 @@ void GLTFExporter::cacheDefaultProperties(GLTFExporter::PropertyCacheType type) // Cache metaproperties of supported types (but not their parent class types) const QMetaObject *meta = defaultObject->metaObject(); - QVector<QMetaProperty> properties; + QList<QMetaProperty> properties; properties.reserve(meta->propertyCount() - meta->propertyOffset()); for (int i = meta->propertyOffset(); i < meta->propertyCount(); ++i) { if (meta->property(i).isWritable()) @@ -660,7 +660,7 @@ void GLTFExporter::parseMaterials() // Default materials do not have separate effect, all effect parameters are stored as // material values. if (material->effect()) { - QVector<QParameter *> parameters = material->effect()->parameters(); + QList<QParameter *> parameters = material->effect()->parameters(); for (auto param : parameters) { if (param->value().type() == QVariant::Color) { QColor color = param->value().value<QColor>(); @@ -799,7 +799,7 @@ void GLTFExporter::parseMeshes() int index; }; - QVector<VertexAttrib> vAttribs; + QList<VertexAttrib> vAttribs; vAttribs.reserve(meshGeometry->attributes().size()); uint stride(0); @@ -1012,7 +1012,7 @@ void GLTFExporter::parseCameras() // GLTF cameras point in -Z by default, the rest is in the // node matrix, so no separate look-at params given here, unless it's actually QCamera. QCamera *cameraEntity = nullptr; - const QVector<QEntity *> entities = camera->entities(); + const QList<QEntity *> entities = camera->entities(); if (entities.size() == 1) cameraEntity = qobject_cast<QCamera *>(entities.at(0)); c.cameraEntity = cameraEntity; @@ -1176,8 +1176,8 @@ bool GLTFExporter::saveScene() { qCDebug(GLTFExporterLog, "Saving scene..."); - QVector<MeshInfo::BufferView> bvList; - QVector<MeshInfo::Accessor> accList; + QList<MeshInfo::BufferView> bvList; + QList<MeshInfo::Accessor> accList; for (auto it = m_meshInfo.begin(); it != m_meshInfo.end(); ++it) { auto &mi = it.value(); for (auto &v : mi.views) @@ -1663,7 +1663,7 @@ void GLTFExporter::exportMaterials(QJsonObject &materials) materialObj["name"] = matInfo.originalName; if (matInfo.type == MaterialInfo::TypeCustom) { - QVector<QParameter *> parameters = material->parameters(); + QList<QParameter *> parameters = material->parameters(); QJsonObject paramObj; for (auto param : parameters) exportParameter(paramObj, param->name(), param->value()); @@ -1755,7 +1755,7 @@ void GLTFExporter::exportMaterials(QJsonObject &materials) void GLTFExporter::exportGenericProperties(QJsonObject &jsonObj, PropertyCacheType type, QObject *obj) { - QVector<QMetaProperty> properties = m_propertyCache.value(type); + QList<QMetaProperty> properties = m_propertyCache.value(type); QObject *defaultObject = m_defaultObjectCache.value(type); for (const QMetaProperty &property : properties) { // Only output property if it is different from default diff --git a/src/plugins/sceneparsers/gltfexport/gltfexporter.h b/src/plugins/sceneparsers/gltfexport/gltfexporter.h index e135ea8eb..dfa180ee4 100644 --- a/src/plugins/sceneparsers/gltfexport/gltfexporter.h +++ b/src/plugins/sceneparsers/gltfexport/gltfexporter.h @@ -118,7 +118,7 @@ private: uint componentType; uint target; }; - QVector<BufferView> views; + QList<BufferView> views; struct Accessor { Accessor() : offset(0), stride(0), count(0), componentType(0) { } QString name; @@ -130,7 +130,7 @@ private: uint componentType; QString type; }; - QVector<Accessor> accessors; + QList<Accessor> accessors; QString name; // generated QString originalName; // may be empty QString materialName; @@ -161,8 +161,8 @@ private: QHash<QString, QColor> colors; QHash<QString, QString> textures; QHash<QString, QVariant> values; - QVector<int> blendArguments; - QVector<int> blendEquations; + QList<int> blendArguments; + QList<int> blendEquations; }; struct ProgramInfo { @@ -214,7 +214,7 @@ private: struct Node { QString name; QString uniqueName; // generated - QVector<Node *> children; + QList<Node *> children; }; void cacheDefaultProperties(PropertyCacheType type); @@ -293,14 +293,14 @@ private: QHash<Qt3DRender::QEffect *, QString> m_effectIdMap; QHash<Qt3DRender::QTechnique *, QString> m_techniqueIdMap; QHash<PropertyCacheType, QObject *> m_defaultObjectCache; - QHash<PropertyCacheType, QVector<QMetaProperty> > m_propertyCache; + QHash<PropertyCacheType, QList<QMetaProperty>> m_propertyCache; QHash<Qt3DRender::QGeometryRenderer *, MeshInfo> m_meshInfo; QHash<Qt3DRender::QMaterial *, MaterialInfo> m_materialInfo; QHash<Qt3DRender::QCameraLens *, CameraInfo> m_cameraInfo; QHash<Qt3DRender::QAbstractLight *, LightInfo> m_lightInfo; QHash<Qt3DRender::QShaderProgram *, ProgramInfo> m_programInfo; - QVector<ShaderInfo> m_shaderInfo; + QList<ShaderInfo> m_shaderInfo; Node *m_rootNode; bool m_rootNodeEmpty; diff --git a/src/quick3d/quick3dscene2d/items/qscene2d.cpp b/src/quick3d/quick3dscene2d/items/qscene2d.cpp index 6efc6a84c..e939b6a00 100644 --- a/src/quick3d/quick3dscene2d/items/qscene2d.cpp +++ b/src/quick3d/quick3dscene2d/items/qscene2d.cpp @@ -289,7 +289,7 @@ bool QScene2D::isMouseEnabled() const /*! Retrieve entities associated with the QScene2D. */ -QVector<Qt3DCore::QEntity*> QScene2D::entities() const +QList<Qt3DCore::QEntity *> QScene2D::entities() const { Q_D(const QScene2D); return d->m_entities; diff --git a/src/quick3d/quick3dscene2d/items/qscene2d.h b/src/quick3d/quick3dscene2d/items/qscene2d.h index 22708bf21..fc062a467 100644 --- a/src/quick3d/quick3dscene2d/items/qscene2d.h +++ b/src/quick3d/quick3dscene2d/items/qscene2d.h @@ -81,7 +81,7 @@ public: QQuickItem *item() const; bool isMouseEnabled() const; - QVector<Qt3DCore::QEntity *> entities() const; + QList<Qt3DCore::QEntity *> entities() const; void addEntity(Qt3DCore::QEntity *entity); void removeEntity(Qt3DCore::QEntity *entity); 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: diff --git a/tests/auto/animation/bezierevaluator/tst_bezierevaluator.cpp b/tests/auto/animation/bezierevaluator/tst_bezierevaluator.cpp index 06389bd36..27daaea48 100644 --- a/tests/auto/animation/bezierevaluator/tst_bezierevaluator.cpp +++ b/tests/auto/animation/bezierevaluator/tst_bezierevaluator.cpp @@ -29,7 +29,7 @@ #include <QtTest/QTest> #include <Qt3DAnimation/private/bezierevaluator_p.h> #include <Qt3DAnimation/private/keyframe_p.h> -#include <QtCore/qvector.h> +#include <QtCore/qlist.h> #include <cmath> diff --git a/tests/auto/core/common/testarbiter.h b/tests/auto/core/common/testarbiter.h index 1c1723fc1..92518bd07 100644 --- a/tests/auto/core/common/testarbiter.h +++ b/tests/auto/core/common/testarbiter.h @@ -51,8 +51,8 @@ public: setArbiterOnNode(n); } - QVector<Qt3DCore::QNode *> dirtyNodes() const { return m_dirtyFrontEndNodes; } - QVector<Qt3DCore::ComponentRelationshipChange> dirtyComponents() const { return m_dirtyEntityComponentNodeChanges; } + QList<Qt3DCore::QNode *> dirtyNodes() const { return m_dirtyFrontEndNodes; } + QList<Qt3DCore::ComponentRelationshipChange> dirtyComponents() const { return m_dirtyEntityComponentNodeChanges; } void clear() { diff --git a/tests/auto/input/commons/testdevice.h b/tests/auto/input/commons/testdevice.h index 37d115166..d7012ac70 100644 --- a/tests/auto/input/commons/testdevice.h +++ b/tests/auto/input/commons/testdevice.h @@ -119,9 +119,9 @@ public: return device; } - QVector<Qt3DCore::QNodeId> physicalDevices() const final + QList<Qt3DCore::QNodeId> physicalDevices() const final { - QVector<Qt3DCore::QNodeId> ids; + QList<Qt3DCore::QNodeId> ids; std::transform(m_devices.constBegin(), m_devices.constEnd(), std::back_inserter(ids), [] (TestDevice *device) { return device->id(); }); @@ -151,8 +151,8 @@ private: void onInitialize() final {} QScopedPointer<Qt3DCore::QNode> m_devicesParent; - QVector<TestDevice*> m_devices; - QVector<TestDeviceBackendNode*> m_deviceBackendNodes; + QList<TestDevice *> m_devices; + QList<TestDeviceBackendNode *> m_deviceBackendNodes; }; #endif // TESTDEVICE_H diff --git a/tests/auto/quick3d/quick3dnodeinstantiator/stringmodel.h b/tests/auto/quick3d/quick3dnodeinstantiator/stringmodel.h index 62d71b224..b928b2ab8 100644 --- a/tests/auto/quick3d/quick3dnodeinstantiator/stringmodel.h +++ b/tests/auto/quick3d/quick3dnodeinstantiator/stringmodel.h @@ -36,7 +36,7 @@ class StringModel : public QAbstractItemModel { Q_OBJECT - QVector<QString> items; + QList<QString> items; QHash<int, QByteArray> roles; QString name; diff --git a/tests/auto/render/commons/testaspect.cpp b/tests/auto/render/commons/testaspect.cpp index a2d6a8950..9176492e9 100644 --- a/tests/auto/render/commons/testaspect.cpp +++ b/tests/auto/render/commons/testaspect.cpp @@ -43,11 +43,11 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -QVector<Qt3DCore::QNode *> getNodesForCreation(Qt3DCore::QNode *root) +QList<Qt3DCore::QNode *> getNodesForCreation(Qt3DCore::QNode *root) { using namespace Qt3DCore; - QVector<QNode *> nodes; + QList<QNode *> nodes; Qt3DCore::QNodeVisitor visitor; visitor.traverse(root, [&nodes](QNode *node) { nodes.append(node); @@ -74,7 +74,7 @@ TestAspect::TestAspect(Qt3DCore::QNode *root) Qt3DCore::QAbstractAspectPrivate::get(this)->m_jobManager = m_jobManager.data(); QRenderAspect::onRegistered(); - const QVector<Qt3DCore::QNode *> nodes = getNodesForCreation(root); + const QList<Qt3DCore::QNode *> nodes = getNodesForCreation(root); for (Qt3DCore::QNode *node : nodes) d_func()->createBackendNode({ diff --git a/tests/auto/render/commons/testaspect.h b/tests/auto/render/commons/testaspect.h index 35cf6534a..6f7043725 100644 --- a/tests/auto/render/commons/testaspect.h +++ b/tests/auto/render/commons/testaspect.h @@ -74,8 +74,8 @@ public: }); } Qt3DCore::QNode *lookupNode(Qt3DCore::QNodeId id) const override { return m_frontEndNodes.value(id, nullptr); } - QVector<Qt3DCore::QNode *> lookupNodes(const QVector<Qt3DCore::QNodeId> &ids) const override { - QVector<Qt3DCore::QNode *> res; + QList<Qt3DCore::QNode *> lookupNodes(const QList<Qt3DCore::QNodeId> &ids) const override { + QList<Qt3DCore::QNode *> res; for (const auto &id: ids) { auto node = m_frontEndNodes.value(id, nullptr); if (node) diff --git a/tests/manual/deferred-renderer-cpp/pointlightblock.cpp b/tests/manual/deferred-renderer-cpp/pointlightblock.cpp index 36bab9966..aceb13dad 100644 --- a/tests/manual/deferred-renderer-cpp/pointlightblock.cpp +++ b/tests/manual/deferred-renderer-cpp/pointlightblock.cpp @@ -60,7 +60,7 @@ PointLightBlock::~PointLightBlock() { } -QVector<Qt3DRender::QAbstractLight *> PointLightBlock::lights() const +QList<Qt3DRender::QAbstractLight *> PointLightBlock::lights() const { return m_lights; } diff --git a/tests/manual/deferred-renderer-cpp/pointlightblock.h b/tests/manual/deferred-renderer-cpp/pointlightblock.h index 9c93528c8..e2f1063df 100644 --- a/tests/manual/deferred-renderer-cpp/pointlightblock.h +++ b/tests/manual/deferred-renderer-cpp/pointlightblock.h @@ -57,19 +57,19 @@ class PointLightBlock : public Qt3DRender::QShaderData { Q_OBJECT - Q_PROPERTY(QVector<Qt3DRender::QAbstractLight *> lights READ lights NOTIFY lightsChanged) + Q_PROPERTY(QList<Qt3DRender::QAbstractLight *> lights READ lights NOTIFY lightsChanged) public: explicit PointLightBlock(Qt3DCore::QNode *parent = 0); ~PointLightBlock(); - QVector<Qt3DRender::QAbstractLight *> lights() const; + QList<Qt3DRender::QAbstractLight *> lights() const; void addLight(Qt3DRender::QAbstractLight *light); Q_SIGNALS: void lightsChanged(); private: - QVector<Qt3DRender::QAbstractLight *> m_lights; + QList<Qt3DRender::QAbstractLight *> m_lights; }; #endif // POINTLIGHTBLOCK_H diff --git a/tests/manual/dynamicscene-cpp/examplescene.h b/tests/manual/dynamicscene-cpp/examplescene.h index cac6330f3..fb141e355 100644 --- a/tests/manual/dynamicscene-cpp/examplescene.h +++ b/tests/manual/dynamicscene-cpp/examplescene.h @@ -72,7 +72,7 @@ private Q_SLOTS: void buildScene(); private: - QVector<BoxEntity *> m_entities; + QList<BoxEntity *> m_entities; QTimer *m_timer; bool m_even; }; |