summaryrefslogtreecommitdiffstats
path: root/src/render/framegraph
diff options
context:
space:
mode:
Diffstat (limited to 'src/render/framegraph')
-rw-r--r--src/render/framegraph/qlayerfilter.cpp2
-rw-r--r--src/render/framegraph/qlayerfilter.h2
-rw-r--r--src/render/framegraph/qrenderpassfilter.cpp4
-rw-r--r--src/render/framegraph/qrenderpassfilter.h4
-rw-r--r--src/render/framegraph/qrenderstateset.cpp2
-rw-r--r--src/render/framegraph/qrenderstateset.h2
-rw-r--r--src/render/framegraph/qrendertargetselector.cpp4
-rw-r--r--src/render/framegraph/qrendertargetselector.h6
-rw-r--r--src/render/framegraph/qsortpolicy.cpp12
-rw-r--r--src/render/framegraph/qsortpolicy.h14
-rw-r--r--src/render/framegraph/qtechniquefilter.cpp4
-rw-r--r--src/render/framegraph/qtechniquefilter.h4
12 files changed, 30 insertions, 30 deletions
diff --git a/src/render/framegraph/qlayerfilter.cpp b/src/render/framegraph/qlayerfilter.cpp
index ef87b1c2e..d7285fad0 100644
--- a/src/render/framegraph/qlayerfilter.cpp
+++ b/src/render/framegraph/qlayerfilter.cpp
@@ -223,7 +223,7 @@ void QLayerFilter::removeLayer(QLayer *layer)
/*!
\return the current list of layers
*/
-QVector<QLayer *> QLayerFilter::layers() const
+QList<QLayer *> QLayerFilter::layers() const
{
Q_D(const QLayerFilter);
return d->m_layers;
diff --git a/src/render/framegraph/qlayerfilter.h b/src/render/framegraph/qlayerfilter.h
index f430814d5..06702af5a 100644
--- a/src/render/framegraph/qlayerfilter.h
+++ b/src/render/framegraph/qlayerfilter.h
@@ -69,7 +69,7 @@ public:
void addLayer(QLayer *layer);
void removeLayer(QLayer *layer);
- QVector<QLayer *> layers() const;
+ QList<QLayer *> layers() const;
FilterMode filterMode() const;
void setFilterMode(FilterMode filterMode);
diff --git a/src/render/framegraph/qrenderpassfilter.cpp b/src/render/framegraph/qrenderpassfilter.cpp
index 304da32d9..5b45d5d73 100644
--- a/src/render/framegraph/qrenderpassfilter.cpp
+++ b/src/render/framegraph/qrenderpassfilter.cpp
@@ -112,7 +112,7 @@ QRenderPassFilter::QRenderPassFilter(QRenderPassFilterPrivate &dd, QNode *parent
/*!
Returns a vector of the current keys for the filter.
*/
-QVector<QFilterKey *> QRenderPassFilter::matchAny() const
+QList<QFilterKey *> QRenderPassFilter::matchAny() const
{
Q_D(const QRenderPassFilter);
return d->m_matchList;
@@ -199,7 +199,7 @@ void QRenderPassFilter::removeParameter(QParameter *parameter)
/*!
Returns the current vector of parameters.
*/
-QVector<QParameter *> QRenderPassFilter::parameters() const
+QList<QParameter *> QRenderPassFilter::parameters() const
{
Q_D(const QRenderPassFilter);
return d->m_parameters;
diff --git a/src/render/framegraph/qrenderpassfilter.h b/src/render/framegraph/qrenderpassfilter.h
index 49a9e1d3e..162459b4e 100644
--- a/src/render/framegraph/qrenderpassfilter.h
+++ b/src/render/framegraph/qrenderpassfilter.h
@@ -61,13 +61,13 @@ public:
explicit QRenderPassFilter(Qt3DCore::QNode *parent = nullptr);
~QRenderPassFilter();
- QVector<QFilterKey*> matchAny() const;
+ QList<QFilterKey *> matchAny() const;
void addMatch(QFilterKey *filterKey);
void removeMatch(QFilterKey *filterKey);
void addParameter(QParameter *parameter);
void removeParameter(QParameter *parameter);
- QVector<QParameter *> parameters() const;
+ QList<QParameter *> parameters() const;
protected:
explicit QRenderPassFilter(QRenderPassFilterPrivate &dd, Qt3DCore::QNode *parent = nullptr);
diff --git a/src/render/framegraph/qrenderstateset.cpp b/src/render/framegraph/qrenderstateset.cpp
index d8bde2ec4..6e8700695 100644
--- a/src/render/framegraph/qrenderstateset.cpp
+++ b/src/render/framegraph/qrenderstateset.cpp
@@ -212,7 +212,7 @@ void QRenderStateSet::removeRenderState(QRenderState *state)
/*!
Returns the list of QRenderState objects that compose the QRenderStateSet instance.
*/
-QVector<QRenderState *> QRenderStateSet::renderStates() const
+QList<QRenderState *> QRenderStateSet::renderStates() const
{
Q_D(const QRenderStateSet);
return d->m_renderStates;
diff --git a/src/render/framegraph/qrenderstateset.h b/src/render/framegraph/qrenderstateset.h
index cf4c0cdd5..f4f334996 100644
--- a/src/render/framegraph/qrenderstateset.h
+++ b/src/render/framegraph/qrenderstateset.h
@@ -59,7 +59,7 @@ public:
void addRenderState(QRenderState *state);
void removeRenderState(QRenderState *state);
- QVector<QRenderState *> renderStates() const;
+ QList<QRenderState *> renderStates() const;
protected:
explicit QRenderStateSet(QRenderStateSetPrivate &dd, Qt3DCore::QNode *parent = nullptr);
diff --git a/src/render/framegraph/qrendertargetselector.cpp b/src/render/framegraph/qrendertargetselector.cpp
index b2c8468f2..015768103 100644
--- a/src/render/framegraph/qrendertargetselector.cpp
+++ b/src/render/framegraph/qrendertargetselector.cpp
@@ -146,7 +146,7 @@ QRenderTarget *QRenderTargetSelector::target() const
\note At render time, if no draw buffer has been specified, the renderer will
default to using all the attachments' draw buffers.
*/
-void QRenderTargetSelector::setOutputs(const QVector<QRenderTargetOutput::AttachmentPoint> &buffers)
+void QRenderTargetSelector::setOutputs(const QList<QRenderTargetOutput::AttachmentPoint> &buffers)
{
Q_D(QRenderTargetSelector);
if (buffers != d->m_outputs) {
@@ -158,7 +158,7 @@ void QRenderTargetSelector::setOutputs(const QVector<QRenderTargetOutput::Attach
/*!
\return the list of draw buffers for the current Qt3DRender::QRenderTargetSelector instance.
*/
-QVector<QRenderTargetOutput::AttachmentPoint> QRenderTargetSelector::outputs() const
+QList<QRenderTargetOutput::AttachmentPoint> QRenderTargetSelector::outputs() const
{
Q_D(const QRenderTargetSelector);
return d->m_outputs;
diff --git a/src/render/framegraph/qrendertargetselector.h b/src/render/framegraph/qrendertargetselector.h
index 84fdfe82e..8ea8e3121 100644
--- a/src/render/framegraph/qrendertargetselector.h
+++ b/src/render/framegraph/qrendertargetselector.h
@@ -62,8 +62,8 @@ public:
QRenderTarget *target() const;
- void setOutputs(const QVector<QRenderTargetOutput::AttachmentPoint> &buffers);
- QVector<QRenderTargetOutput::AttachmentPoint> outputs() const;
+ void setOutputs(const QList<QRenderTargetOutput::AttachmentPoint> &buffers);
+ QList<QRenderTargetOutput::AttachmentPoint> outputs() const;
public Q_SLOTS:
void setTarget(QRenderTarget *target);
@@ -82,6 +82,6 @@ private:
QT_END_NAMESPACE
-Q_DECLARE_METATYPE(QVector<Qt3DRender::QRenderTargetOutput::AttachmentPoint>) // LCOV_EXCL_LINE
+Q_DECLARE_METATYPE(QList<Qt3DRender::QRenderTargetOutput::AttachmentPoint>) // LCOV_EXCL_LINE
#endif // QT3DRENDER_QRENDERTARGETSELECTOR_H
diff --git a/src/render/framegraph/qsortpolicy.cpp b/src/render/framegraph/qsortpolicy.cpp
index a107f1906..d3d7fe58f 100644
--- a/src/render/framegraph/qsortpolicy.cpp
+++ b/src/render/framegraph/qsortpolicy.cpp
@@ -152,21 +152,21 @@ QSortPolicy::QSortPolicy(QSortPolicyPrivate &dd, QNode *parent)
/*!
\return the current sort types in use
*/
-QVector<QSortPolicy::SortType> QSortPolicy::sortTypes() const
+QList<QSortPolicy::SortType> QSortPolicy::sortTypes() const
{
Q_D(const QSortPolicy);
return d->m_sortTypes;
}
-QVector<int> QSortPolicy::sortTypesInt() const
+QList<int> QSortPolicy::sortTypesInt() const
{
Q_D(const QSortPolicy);
- QVector<int> sortTypesInt;
+ QList<int> sortTypesInt;
transformVector(d->m_sortTypes, sortTypesInt);
return sortTypesInt;
}
-void QSortPolicy::setSortTypes(const QVector<SortType> &sortTypes)
+void QSortPolicy::setSortTypes(const QList<SortType> &sortTypes)
{
Q_D(QSortPolicy);
if (sortTypes != d->m_sortTypes) {
@@ -179,9 +179,9 @@ void QSortPolicy::setSortTypes(const QVector<SortType> &sortTypes)
}
}
-void QSortPolicy::setSortTypes(const QVector<int> &sortTypesInt)
+void QSortPolicy::setSortTypes(const QList<int> &sortTypesInt)
{
- QVector<SortType> sortTypes;
+ QList<SortType> sortTypes;
transformVector(sortTypesInt, sortTypes);
setSortTypes(sortTypes);
}
diff --git a/src/render/framegraph/qsortpolicy.h b/src/render/framegraph/qsortpolicy.h
index 5cd1ef7e2..a52136bd2 100644
--- a/src/render/framegraph/qsortpolicy.h
+++ b/src/render/framegraph/qsortpolicy.h
@@ -51,7 +51,7 @@ class QSortPolicyPrivate;
class Q_3DRENDERSHARED_EXPORT QSortPolicy : public QFrameGraphNode
{
Q_OBJECT
- Q_PROPERTY(QVector<int> sortTypes READ sortTypesInt WRITE setSortTypes NOTIFY sortTypesChanged)
+ Q_PROPERTY(QList<int> sortTypes READ sortTypesInt WRITE setSortTypes NOTIFY sortTypesChanged)
public:
explicit QSortPolicy(Qt3DCore::QNode *parent = nullptr);
~QSortPolicy();
@@ -66,16 +66,16 @@ public:
};
Q_ENUM(SortType) // LCOV_EXCL_LINE
- QVector<SortType> sortTypes() const;
- QVector<int> sortTypesInt() const;
+ QList<SortType> sortTypes() const;
+ QList<int> sortTypesInt() const;
public Q_SLOTS:
- void setSortTypes(const QVector<SortType> &sortTypes);
- void setSortTypes(const QVector<int> &sortTypesInt);
+ void setSortTypes(const QList<SortType> &sortTypes);
+ void setSortTypes(const QList<int> &sortTypesInt);
Q_SIGNALS:
- void sortTypesChanged(const QVector<SortType> &sortTypes);
- void sortTypesChanged(const QVector<int> &sortTypes);
+ void sortTypesChanged(const QList<SortType> &sortTypes);
+ void sortTypesChanged(const QList<int> &sortTypes);
protected:
explicit QSortPolicy(QSortPolicyPrivate &dd, Qt3DCore::QNode *parent = nullptr);
diff --git a/src/render/framegraph/qtechniquefilter.cpp b/src/render/framegraph/qtechniquefilter.cpp
index 17a79ba25..981147c24 100644
--- a/src/render/framegraph/qtechniquefilter.cpp
+++ b/src/render/framegraph/qtechniquefilter.cpp
@@ -117,7 +117,7 @@ QTechniqueFilter::QTechniqueFilter(QTechniqueFilterPrivate &dd, QNode *parent)
/*!
Returns a vector of the current keys for the filter.
*/
-QVector<QFilterKey *> QTechniqueFilter::matchAll() const
+QList<QFilterKey *> QTechniqueFilter::matchAll() const
{
Q_D(const QTechniqueFilter);
return d->m_matchList;
@@ -202,7 +202,7 @@ void QTechniqueFilter::removeParameter(QParameter *parameter)
/*!
Returns the current vector of parameters.
*/
-QVector<QParameter *> QTechniqueFilter::parameters() const
+QList<QParameter *> QTechniqueFilter::parameters() const
{
Q_D(const QTechniqueFilter);
return d->m_parameters;
diff --git a/src/render/framegraph/qtechniquefilter.h b/src/render/framegraph/qtechniquefilter.h
index 1cf9abcd1..af4308cc2 100644
--- a/src/render/framegraph/qtechniquefilter.h
+++ b/src/render/framegraph/qtechniquefilter.h
@@ -58,13 +58,13 @@ public:
explicit QTechniqueFilter(Qt3DCore::QNode *parent = nullptr);
~QTechniqueFilter();
- QVector<QFilterKey*> matchAll() const;
+ QList<QFilterKey *> matchAll() const;
void addMatch(QFilterKey *filterKey);
void removeMatch(QFilterKey *filterKey);
void addParameter(QParameter *p);
void removeParameter(QParameter *p);
- QVector<QParameter *> parameters() const;
+ QList<QParameter *> parameters() const;
protected:
QTechniqueFilter(QTechniqueFilterPrivate &dd, Qt3DCore::QNode *parent = nullptr);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 03:42:02 +0000