summaryrefslogtreecommitdiffstats
path: root/src/quick3d/quick3drender/items
diff options
context:
space:
mode:
authorMike Krus <mike.krus@kdab.com>2020-11-14 10:17:35 +0000
committerMike Krus <mike.krus@kdab.com>2020-11-20 11:59:42 +0000
commitba9827ab5de200756f5c2c0899fc01f1d573eae2 (patch)
treec591d5a38559ec1e2cf0435930c4b32a79c25e14 /src/quick3d/quick3drender/items
parent9e2770d8995aedb07c517dd31395c8bb3a605def (diff)
Follow up on change of QQmlListProperty to qsizetype
Also update dependencies and fix non-gui builds. Disabled (for now) gltf unit test since JSON parser seems to crash. Change-Id: Ie7fdd9626653e89ad43e8bdb22b0e764618b1e9e Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src/quick3d/quick3drender/items')
-rw-r--r--src/quick3d/quick3drender/items/quick3deffect.cpp8
-rw-r--r--src/quick3d/quick3drender/items/quick3deffect_p.h8
-rw-r--r--src/quick3d/quick3drender/items/quick3dlayerfilter.cpp4
-rw-r--r--src/quick3d/quick3drender/items/quick3dlayerfilter_p.h4
-rw-r--r--src/quick3d/quick3drender/items/quick3dmaterial.cpp4
-rw-r--r--src/quick3d/quick3drender/items/quick3dmaterial_p.h4
-rw-r--r--src/quick3d/quick3drender/items/quick3draycaster.cpp4
-rw-r--r--src/quick3d/quick3drender/items/quick3draycaster_p_p.h4
-rw-r--r--src/quick3d/quick3drender/items/quick3drenderpass.cpp12
-rw-r--r--src/quick3d/quick3drender/items/quick3drenderpass_p.h12
-rw-r--r--src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp8
-rw-r--r--src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h8
-rw-r--r--src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp4
-rw-r--r--src/quick3d/quick3drender/items/quick3drendertargetoutput_p.h4
-rw-r--r--src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp4
-rw-r--r--src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h4
-rw-r--r--src/quick3d/quick3drender/items/quick3dstateset.cpp4
-rw-r--r--src/quick3d/quick3drender/items/quick3dstateset_p.h4
-rw-r--r--src/quick3d/quick3drender/items/quick3dtechnique.cpp12
-rw-r--r--src/quick3d/quick3drender/items/quick3dtechnique_p.h12
-rw-r--r--src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp8
-rw-r--r--src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h8
-rw-r--r--src/quick3d/quick3drender/items/quick3dtexture.cpp4
-rw-r--r--src/quick3d/quick3drender/items/quick3dtexture_p.h4
24 files changed, 76 insertions, 76 deletions
diff --git a/src/quick3d/quick3drender/items/quick3deffect.cpp b/src/quick3d/quick3drender/items/quick3deffect.cpp
index fa82c6eff..617b52e85 100644
--- a/src/quick3d/quick3drender/items/quick3deffect.cpp
+++ b/src/quick3d/quick3drender/items/quick3deffect.cpp
@@ -78,7 +78,7 @@ void Quick3DEffect::appendTechnique(QQmlListProperty<QTechnique> *list, QTechniq
}
// TO DO : Return a QAbstractTechnique once properly defined
-QTechnique *Quick3DEffect::techniqueAt(QQmlListProperty<QTechnique> *list, int index)
+QTechnique *Quick3DEffect::techniqueAt(QQmlListProperty<QTechnique> *list, qsizetype index)
{
Quick3DEffect *eff = qobject_cast<Quick3DEffect*>(list->object);
if (eff)
@@ -86,7 +86,7 @@ QTechnique *Quick3DEffect::techniqueAt(QQmlListProperty<QTechnique> *list, int i
return nullptr;
}
-int Quick3DEffect::techniqueCount(QQmlListProperty<QTechnique> *list)
+qsizetype Quick3DEffect::techniqueCount(QQmlListProperty<QTechnique> *list)
{
Quick3DEffect *eff = qobject_cast<Quick3DEffect*>(list->object);
if (eff)
@@ -112,13 +112,13 @@ void Quick3DEffect::appendParameter(QQmlListProperty<QParameter> *list, QParamet
qobject_cast<QEffect *>(effect->parentEffect())->addParameter(param);
}
-QParameter *Quick3DEffect::parameterAt(QQmlListProperty<QParameter> *list, int index)
+QParameter *Quick3DEffect::parameterAt(QQmlListProperty<QParameter> *list, qsizetype index)
{
Quick3DEffect *effect = qobject_cast<Quick3DEffect *>(list->object);
return qobject_cast<QEffect *>(effect->parentEffect())->parameters().at(index);
}
-int Quick3DEffect::parametersCount(QQmlListProperty<QParameter> *list)
+qsizetype Quick3DEffect::parametersCount(QQmlListProperty<QParameter> *list)
{
Quick3DEffect *effect = qobject_cast<Quick3DEffect *>(list->object);
return qobject_cast<QEffect *>(effect->parentEffect())->parameters().count();
diff --git a/src/quick3d/quick3drender/items/quick3deffect_p.h b/src/quick3d/quick3drender/items/quick3deffect_p.h
index 69c5b2be6..fb6fa2bdd 100644
--- a/src/quick3d/quick3drender/items/quick3deffect_p.h
+++ b/src/quick3d/quick3drender/items/quick3deffect_p.h
@@ -79,13 +79,13 @@ public:
private:
static void appendTechnique(QQmlListProperty<QTechnique> *list, QTechnique *bar);
- static QTechnique *techniqueAt(QQmlListProperty<QTechnique> *list, int index);
- static int techniqueCount(QQmlListProperty<QTechnique> *list);
+ static QTechnique *techniqueAt(QQmlListProperty<QTechnique> *list, qsizetype index);
+ static qsizetype techniqueCount(QQmlListProperty<QTechnique> *list);
static void clearTechniqueList(QQmlListProperty<QTechnique> *list);
static void appendParameter(QQmlListProperty<QParameter> *list, QParameter *param);
- static QParameter *parameterAt(QQmlListProperty<QParameter> *list, int index);
- static int parametersCount(QQmlListProperty<QParameter> *list);
+ static QParameter *parameterAt(QQmlListProperty<QParameter> *list, qsizetype index);
+ static qsizetype parametersCount(QQmlListProperty<QParameter> *list);
static void clearParameterList(QQmlListProperty<QParameter> *list);
};
diff --git a/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp b/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp
index 951b4f82f..505495eb3 100644
--- a/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp
+++ b/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp
@@ -71,7 +71,7 @@ void Quick3DLayerFilter::appendLayer(QQmlListProperty<QLayer> *list, QLayer *lay
}
}
-QLayer *Quick3DLayerFilter::layerAt(QQmlListProperty<QLayer> *list, int index)
+QLayer *Quick3DLayerFilter::layerAt(QQmlListProperty<QLayer> *list, qsizetype index)
{
Quick3DLayerFilter *filter = qobject_cast<Quick3DLayerFilter *>(list->object);
if (filter) {
@@ -80,7 +80,7 @@ QLayer *Quick3DLayerFilter::layerAt(QQmlListProperty<QLayer> *list, int index)
return 0;
}
-int Quick3DLayerFilter::layerCount(QQmlListProperty<QLayer> *list)
+qsizetype Quick3DLayerFilter::layerCount(QQmlListProperty<QLayer> *list)
{
Quick3DLayerFilter *filter = qobject_cast<Quick3DLayerFilter *>(list->object);
if (filter) {
diff --git a/src/quick3d/quick3drender/items/quick3dlayerfilter_p.h b/src/quick3d/quick3drender/items/quick3dlayerfilter_p.h
index 6294d2b98..3bcb6aaa2 100644
--- a/src/quick3d/quick3drender/items/quick3dlayerfilter_p.h
+++ b/src/quick3d/quick3drender/items/quick3dlayerfilter_p.h
@@ -77,8 +77,8 @@ public:
private:
static void appendLayer(QQmlListProperty<QLayer> *list, QLayer *bar);
- static QLayer *layerAt(QQmlListProperty<QLayer> *list, int index);
- static int layerCount(QQmlListProperty<QLayer> *list);
+ static QLayer *layerAt(QQmlListProperty<QLayer> *list, qsizetype index);
+ static qsizetype layerCount(QQmlListProperty<QLayer> *list);
static void clearLayers(QQmlListProperty<QLayer> *list);
};
diff --git a/src/quick3d/quick3drender/items/quick3dmaterial.cpp b/src/quick3d/quick3drender/items/quick3dmaterial.cpp
index 3dfbec83e..4e5cc1947 100644
--- a/src/quick3d/quick3drender/items/quick3dmaterial.cpp
+++ b/src/quick3d/quick3drender/items/quick3dmaterial.cpp
@@ -72,7 +72,7 @@ void Quick3DMaterial::appendParameter(QQmlListProperty<QParameter> *list, QParam
}
}
-QParameter *Quick3DMaterial::parameterAt(QQmlListProperty<QParameter> *list, int index)
+QParameter *Quick3DMaterial::parameterAt(QQmlListProperty<QParameter> *list, qsizetype index)
{
Quick3DMaterial *mat = qobject_cast<Quick3DMaterial *>(list->object);
if (mat)
@@ -80,7 +80,7 @@ QParameter *Quick3DMaterial::parameterAt(QQmlListProperty<QParameter> *list, int
return 0;
}
-int Quick3DMaterial::parameterCount(QQmlListProperty<QParameter> *list)
+qsizetype Quick3DMaterial::parameterCount(QQmlListProperty<QParameter> *list)
{
Quick3DMaterial *mat = qobject_cast<Quick3DMaterial *>(list->object);
if (mat)
diff --git a/src/quick3d/quick3drender/items/quick3dmaterial_p.h b/src/quick3d/quick3drender/items/quick3dmaterial_p.h
index 2069ba9c6..adb0d066b 100644
--- a/src/quick3d/quick3drender/items/quick3dmaterial_p.h
+++ b/src/quick3d/quick3drender/items/quick3dmaterial_p.h
@@ -83,8 +83,8 @@ public:
private:
// FIXME - remove when we have a custom QML parser
static void appendParameter(QQmlListProperty<QParameter> *list, QParameter *bar);
- static QParameter *parameterAt(QQmlListProperty<QParameter> *list, int index);
- static int parameterCount(QQmlListProperty<QParameter> *list);
+ static QParameter *parameterAt(QQmlListProperty<QParameter> *list, qsizetype index);
+ static qsizetype parameterCount(QQmlListProperty<QParameter> *list);
static void clearParameters(QQmlListProperty<QParameter> *list);
};
diff --git a/src/quick3d/quick3drender/items/quick3draycaster.cpp b/src/quick3d/quick3drender/items/quick3draycaster.cpp
index d0c282a1c..dad28bbbe 100644
--- a/src/quick3d/quick3drender/items/quick3draycaster.cpp
+++ b/src/quick3d/quick3drender/items/quick3draycaster.cpp
@@ -56,7 +56,7 @@ void Quick3DRayCasterPrivate::appendLayer(QQmlListProperty<QLayer> *list, QLayer
filter->addLayer(layer);
}
-QLayer *Quick3DRayCasterPrivate::layerAt(QQmlListProperty<QLayer> *list, int index)
+QLayer *Quick3DRayCasterPrivate::layerAt(QQmlListProperty<QLayer> *list, qsizetype index)
{
QAbstractRayCaster *filter = qobject_cast<QAbstractRayCaster *>(list->object);
if (filter)
@@ -64,7 +64,7 @@ QLayer *Quick3DRayCasterPrivate::layerAt(QQmlListProperty<QLayer> *list, int ind
return nullptr;
}
-int Quick3DRayCasterPrivate::layerCount(QQmlListProperty<QLayer> *list)
+qsizetype Quick3DRayCasterPrivate::layerCount(QQmlListProperty<QLayer> *list)
{
QAbstractRayCaster *filter = qobject_cast<QAbstractRayCaster *>(list->object);
if (filter)
diff --git a/src/quick3d/quick3drender/items/quick3draycaster_p_p.h b/src/quick3d/quick3drender/items/quick3draycaster_p_p.h
index dec8dcfb6..096cae351 100644
--- a/src/quick3d/quick3drender/items/quick3draycaster_p_p.h
+++ b/src/quick3d/quick3drender/items/quick3draycaster_p_p.h
@@ -69,8 +69,8 @@ public:
explicit Quick3DRayCasterPrivate() : QAbstractRayCasterPrivate() { }
static void appendLayer(QQmlListProperty<QLayer> *list, QLayer *bar);
- static QLayer *layerAt(QQmlListProperty<QLayer> *list, int index);
- static int layerCount(QQmlListProperty<QLayer> *list);
+ static QLayer *layerAt(QQmlListProperty<QLayer> *list, qsizetype index);
+ static qsizetype layerCount(QQmlListProperty<QLayer> *list);
static void clearLayers(QQmlListProperty<QLayer> *list);
Q_DECLARE_PUBLIC(Quick3DRayCaster)
diff --git a/src/quick3d/quick3drender/items/quick3drenderpass.cpp b/src/quick3d/quick3drender/items/quick3drenderpass.cpp
index 7bd50a0d5..e05bd9c74 100644
--- a/src/quick3d/quick3drender/items/quick3drenderpass.cpp
+++ b/src/quick3d/quick3drender/items/quick3drenderpass.cpp
@@ -84,13 +84,13 @@ void Quick3DRenderPass::appendFilterKey(QQmlListProperty<QFilterKey> *list, QFil
rPass->parentRenderPass()->addFilterKey(filterKey);
}
-QFilterKey *Quick3DRenderPass::filterKeyAt(QQmlListProperty<QFilterKey> *list, int index)
+QFilterKey *Quick3DRenderPass::filterKeyAt(QQmlListProperty<QFilterKey> *list, qsizetype index)
{
Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
return rPass->parentRenderPass()->filterKeys().at(index);
}
-int Quick3DRenderPass::filterKeysCount(QQmlListProperty<QFilterKey> *list)
+qsizetype Quick3DRenderPass::filterKeysCount(QQmlListProperty<QFilterKey> *list)
{
Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
return rPass->parentRenderPass()->filterKeys().count();
@@ -110,13 +110,13 @@ void Quick3DRenderPass::appendRenderState(QQmlListProperty<QRenderState> *list,
rPass->parentRenderPass()->addRenderState(state);
}
-QRenderState *Quick3DRenderPass::renderStateAt(QQmlListProperty<QRenderState> *list, int index)
+QRenderState *Quick3DRenderPass::renderStateAt(QQmlListProperty<QRenderState> *list, qsizetype index)
{
Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
return rPass->parentRenderPass()->renderStates().at(index);
}
-int Quick3DRenderPass::renderStateCount(QQmlListProperty<QRenderState> *list)
+qsizetype Quick3DRenderPass::renderStateCount(QQmlListProperty<QRenderState> *list)
{
Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
return rPass->parentRenderPass()->renderStates().count();
@@ -136,13 +136,13 @@ void Quick3DRenderPass::appendParameter(QQmlListProperty<QParameter> *list, QPar
rPass->parentRenderPass()->addParameter(param);
}
-QParameter *Quick3DRenderPass::parameterAt(QQmlListProperty<QParameter> *list, int index)
+QParameter *Quick3DRenderPass::parameterAt(QQmlListProperty<QParameter> *list, qsizetype index)
{
Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
return rPass->parentRenderPass()->parameters().at(index);
}
-int Quick3DRenderPass::parametersCount(QQmlListProperty<QParameter> *list)
+qsizetype Quick3DRenderPass::parametersCount(QQmlListProperty<QParameter> *list)
{
Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
return rPass->parentRenderPass()->parameters().count();
diff --git a/src/quick3d/quick3drender/items/quick3drenderpass_p.h b/src/quick3d/quick3drender/items/quick3drenderpass_p.h
index 982cab9f4..58ef251ff 100644
--- a/src/quick3d/quick3drender/items/quick3drenderpass_p.h
+++ b/src/quick3d/quick3drender/items/quick3drenderpass_p.h
@@ -80,18 +80,18 @@ public:
private:
static void appendFilterKey(QQmlListProperty<QFilterKey> *list, QFilterKey *filterKey);
- static QFilterKey *filterKeyAt(QQmlListProperty<QFilterKey> *list, int index);
- static int filterKeysCount(QQmlListProperty<QFilterKey> *list);
+ static QFilterKey *filterKeyAt(QQmlListProperty<QFilterKey> *list, qsizetype index);
+ static qsizetype filterKeysCount(QQmlListProperty<QFilterKey> *list);
static void clearFilterKey(QQmlListProperty<QFilterKey> *list);
static void appendRenderState(QQmlListProperty<QRenderState> *list, QRenderState *state);
- static QRenderState *renderStateAt(QQmlListProperty<QRenderState> *list, int index);
- static int renderStateCount(QQmlListProperty<QRenderState> *list);
+ static QRenderState *renderStateAt(QQmlListProperty<QRenderState> *list, qsizetype index);
+ static qsizetype renderStateCount(QQmlListProperty<QRenderState> *list);
static void clearRenderStates(QQmlListProperty<QRenderState> *list);
static void appendParameter(QQmlListProperty<QParameter> *list, QParameter *param);
- static QParameter *parameterAt(QQmlListProperty<QParameter> *list, int index);
- static int parametersCount(QQmlListProperty<QParameter> *list);
+ static QParameter *parameterAt(QQmlListProperty<QParameter> *list, qsizetype index);
+ static qsizetype parametersCount(QQmlListProperty<QParameter> *list);
static void clearParameterList(QQmlListProperty<QParameter> *list);
};
diff --git a/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp b/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp
index 0a8fa8a3a..5cf45b4a8 100644
--- a/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp
+++ b/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp
@@ -78,7 +78,7 @@ void Quick3DRenderPassFilter::appendInclude(QQmlListProperty<QFilterKey> *list,
}
}
-QFilterKey *Quick3DRenderPassFilter::includeAt(QQmlListProperty<QFilterKey> *list, int index)
+QFilterKey *Quick3DRenderPassFilter::includeAt(QQmlListProperty<QFilterKey> *list, qsizetype index)
{
Quick3DRenderPassFilter *filter = qobject_cast<Quick3DRenderPassFilter *>(list->object);
if (filter)
@@ -86,7 +86,7 @@ QFilterKey *Quick3DRenderPassFilter::includeAt(QQmlListProperty<QFilterKey> *lis
return 0;
}
-int Quick3DRenderPassFilter::includesCount(QQmlListProperty<QFilterKey> *list)
+qsizetype Quick3DRenderPassFilter::includesCount(QQmlListProperty<QFilterKey> *list)
{
Quick3DRenderPassFilter *filter = qobject_cast<Quick3DRenderPassFilter *>(list->object);
if (filter)
@@ -110,13 +110,13 @@ void Quick3DRenderPassFilter::appendParameter(QQmlListProperty<QParameter> *list
rPassFilter->parentRenderPassFilter()->addParameter(param);
}
-QParameter *Quick3DRenderPassFilter::parameterAt(QQmlListProperty<QParameter> *list, int index)
+QParameter *Quick3DRenderPassFilter::parameterAt(QQmlListProperty<QParameter> *list, qsizetype index)
{
Quick3DRenderPassFilter *rPassFilter = qobject_cast<Quick3DRenderPassFilter *>(list->object);
return rPassFilter->parentRenderPassFilter()->parameters().at(index);
}
-int Quick3DRenderPassFilter::parametersCount(QQmlListProperty<QParameter> *list)
+qsizetype Quick3DRenderPassFilter::parametersCount(QQmlListProperty<QParameter> *list)
{
Quick3DRenderPassFilter *rPassFilter = qobject_cast<Quick3DRenderPassFilter *>(list->object);
return rPassFilter->parentRenderPassFilter()->parameters().count();
diff --git a/src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h b/src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h
index 8f81766ef..1f13f1d2f 100644
--- a/src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h
+++ b/src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h
@@ -80,13 +80,13 @@ public:
private:
static void appendInclude(QQmlListProperty<QFilterKey> *list, QFilterKey *criterion);
- static QFilterKey *includeAt(QQmlListProperty<QFilterKey> *list, int index);
- static int includesCount(QQmlListProperty<QFilterKey> *list);
+ static QFilterKey *includeAt(QQmlListProperty<QFilterKey> *list, qsizetype index);
+ static qsizetype includesCount(QQmlListProperty<QFilterKey> *list);
static void clearIncludes(QQmlListProperty<QFilterKey> *list);
static void appendParameter(QQmlListProperty<QParameter> *list, QParameter *param);
- static QParameter *parameterAt(QQmlListProperty<QParameter> *list, int index);
- static int parametersCount(QQmlListProperty<QParameter> *list);
+ static QParameter *parameterAt(QQmlListProperty<QParameter> *list, qsizetype index);
+ static qsizetype parametersCount(QQmlListProperty<QParameter> *list);
static void clearParameterList(QQmlListProperty<QParameter> *list);
};
diff --git a/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp b/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp
index 024789a4c..5d35e7e00 100644
--- a/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp
+++ b/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp
@@ -66,7 +66,7 @@ void Quick3DRenderTargetOutput::appendRenderAttachment(QQmlListProperty<QRenderT
rT->parentRenderTarget()->addOutput(output);
}
-QRenderTargetOutput *Quick3DRenderTargetOutput::renderAttachmentAt(QQmlListProperty<QRenderTargetOutput> *list, int index)
+QRenderTargetOutput *Quick3DRenderTargetOutput::renderAttachmentAt(QQmlListProperty<QRenderTargetOutput> *list, qsizetype index)
{
Quick3DRenderTargetOutput *rT = qobject_cast<Quick3DRenderTargetOutput *>(list->object);
if (rT)
@@ -74,7 +74,7 @@ QRenderTargetOutput *Quick3DRenderTargetOutput::renderAttachmentAt(QQmlListPrope
return nullptr;
}
-int Quick3DRenderTargetOutput::renderAttachmentCount(QQmlListProperty<QRenderTargetOutput> *list)
+qsizetype Quick3DRenderTargetOutput::renderAttachmentCount(QQmlListProperty<QRenderTargetOutput> *list)
{
Quick3DRenderTargetOutput *rT = qobject_cast<Quick3DRenderTargetOutput *>(list->object);
if (rT)
diff --git a/src/quick3d/quick3drender/items/quick3drendertargetoutput_p.h b/src/quick3d/quick3drender/items/quick3drendertargetoutput_p.h
index f7b15b0cb..076d034ed 100644
--- a/src/quick3d/quick3drender/items/quick3drendertargetoutput_p.h
+++ b/src/quick3d/quick3drender/items/quick3drendertargetoutput_p.h
@@ -75,8 +75,8 @@ public:
private:
static void appendRenderAttachment(QQmlListProperty<QRenderTargetOutput> *list, QRenderTargetOutput *attachment);
- static QRenderTargetOutput *renderAttachmentAt(QQmlListProperty<QRenderTargetOutput> *list, int index);
- static int renderAttachmentCount(QQmlListProperty<QRenderTargetOutput> *list);
+ static QRenderTargetOutput *renderAttachmentAt(QQmlListProperty<QRenderTargetOutput> *list, qsizetype index);
+ static qsizetype renderAttachmentCount(QQmlListProperty<QRenderTargetOutput> *list);
static void clearRenderAttachments(QQmlListProperty<QRenderTargetOutput> *list);
};
diff --git a/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp b/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp
index 36681b021..51e8911a6 100644
--- a/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp
+++ b/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp
@@ -91,13 +91,13 @@ void Quick3DShaderDataArray::appendValue(QQmlListProperty<QShaderData> *list, QS
static_cast<Quick3DShaderDataArrayPrivate *>(Quick3DShaderDataArrayPrivate::get(self))->m_values.append(bar);
}
-QShaderData *Quick3DShaderDataArray::valueAt(QQmlListProperty<QShaderData> *list, int index)
+QShaderData *Quick3DShaderDataArray::valueAt(QQmlListProperty<QShaderData> *list, qsizetype index)
{
Quick3DShaderDataArray *self = static_cast<Quick3DShaderDataArray *>(list->object);
return static_cast<Quick3DShaderDataArrayPrivate *>(Quick3DShaderDataArrayPrivate::get(self))->m_values.at(index);
}
-int Quick3DShaderDataArray::valueCount(QQmlListProperty<QShaderData> *list)
+qsizetype Quick3DShaderDataArray::valueCount(QQmlListProperty<QShaderData> *list)
{
Quick3DShaderDataArray *self = static_cast<Quick3DShaderDataArray *>(list->object);
return static_cast<Quick3DShaderDataArrayPrivate *>(Quick3DShaderDataArrayPrivate::get(self))->m_values.count();
diff --git a/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h b/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h
index a7c7ae833..4a1347cf8 100644
--- a/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h
+++ b/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h
@@ -82,8 +82,8 @@ public:
private:
static void appendValue(QQmlListProperty<QShaderData> *list, QShaderData *bar);
- static QShaderData *valueAt(QQmlListProperty<QShaderData> *list, int index);
- static int valueCount(QQmlListProperty<QShaderData> *list);
+ static QShaderData *valueAt(QQmlListProperty<QShaderData> *list, qsizetype index);
+ static qsizetype valueCount(QQmlListProperty<QShaderData> *list);
static void clearValues(QQmlListProperty<QShaderData> *list);
Q_DECLARE_PRIVATE(Quick3DShaderDataArray)
};
diff --git a/src/quick3d/quick3drender/items/quick3dstateset.cpp b/src/quick3d/quick3drender/items/quick3dstateset.cpp
index 468364493..49fa0b96a 100644
--- a/src/quick3d/quick3drender/items/quick3dstateset.cpp
+++ b/src/quick3d/quick3drender/items/quick3dstateset.cpp
@@ -70,13 +70,13 @@ void Quick3DStateSet::appendRenderState(QQmlListProperty<QRenderState> *list, QR
stateSet->parentStateSet()->addRenderState(state);
}
-QRenderState *Quick3DStateSet::renderStateAt(QQmlListProperty<QRenderState> *list, int index)
+QRenderState *Quick3DStateSet::renderStateAt(QQmlListProperty<QRenderState> *list, qsizetype index)
{
Quick3DStateSet *stateSet = qobject_cast<Quick3DStateSet *>(list->object);
return stateSet->parentStateSet()->renderStates().at(index);
}
-int Quick3DStateSet::renderStateCount(QQmlListProperty<QRenderState> *list)
+qsizetype Quick3DStateSet::renderStateCount(QQmlListProperty<QRenderState> *list)
{
Quick3DStateSet *stateSet = qobject_cast<Quick3DStateSet *>(list->object);
return stateSet->parentStateSet()->renderStates().count();
diff --git a/src/quick3d/quick3drender/items/quick3dstateset_p.h b/src/quick3d/quick3drender/items/quick3dstateset_p.h
index 7b532ec83..4d060e149 100644
--- a/src/quick3d/quick3drender/items/quick3dstateset_p.h
+++ b/src/quick3d/quick3drender/items/quick3dstateset_p.h
@@ -75,8 +75,8 @@ public:
private:
static void appendRenderState(QQmlListProperty<QRenderState> *list, QRenderState *state);
- static QRenderState *renderStateAt(QQmlListProperty<QRenderState> *list, int index);
- static int renderStateCount(QQmlListProperty<QRenderState> *list);
+ static QRenderState *renderStateAt(QQmlListProperty<QRenderState> *list, qsizetype index);
+ static qsizetype renderStateCount(QQmlListProperty<QRenderState> *list);
static void clearRenderStates(QQmlListProperty<QRenderState> *list);
};
diff --git a/src/quick3d/quick3drender/items/quick3dtechnique.cpp b/src/quick3d/quick3drender/items/quick3dtechnique.cpp
index 0a15c9f7e..805748a1c 100644
--- a/src/quick3d/quick3drender/items/quick3dtechnique.cpp
+++ b/src/quick3d/quick3drender/items/quick3dtechnique.cpp
@@ -74,13 +74,13 @@ void Quick3DTechnique::appendParameter(QQmlListProperty<QParameter> *list, QPara
technique->parentTechnique()->addParameter(param);
}
-QParameter *Quick3DTechnique::parameterAt(QQmlListProperty<QParameter> *list, int index)
+QParameter *Quick3DTechnique::parameterAt(QQmlListProperty<QParameter> *list, qsizetype index)
{
Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object);
return technique->parentTechnique()->parameters().at(index);
}
-int Quick3DTechnique::parametersCount(QQmlListProperty<QParameter> *list)
+qsizetype Quick3DTechnique::parametersCount(QQmlListProperty<QParameter> *list)
{
Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object);
return technique->parentTechnique()->parameters().count();
@@ -102,7 +102,7 @@ void Quick3DTechnique::appendRenderPass(QQmlListProperty<QRenderPass> *list, QRe
}
}
-QRenderPass *Quick3DTechnique::renderPassAt(QQmlListProperty<QRenderPass> *list, int index)
+QRenderPass *Quick3DTechnique::renderPassAt(QQmlListProperty<QRenderPass> *list, qsizetype index)
{
Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object);
if (technique)
@@ -110,7 +110,7 @@ QRenderPass *Quick3DTechnique::renderPassAt(QQmlListProperty<QRenderPass> *list,
return 0;
}
-int Quick3DTechnique::renderPassCount(QQmlListProperty<QRenderPass> *list)
+qsizetype Quick3DTechnique::renderPassCount(QQmlListProperty<QRenderPass> *list)
{
Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object);
if (technique)
@@ -147,7 +147,7 @@ void Quick3DTechnique::appendFilterKey(QQmlListProperty<QFilterKey> *list, QFilt
}
}
-QFilterKey *Quick3DTechnique::filterKeyAt(QQmlListProperty<QFilterKey> *list, int index)
+QFilterKey *Quick3DTechnique::filterKeyAt(QQmlListProperty<QFilterKey> *list, qsizetype index)
{
Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object);
if (technique)
@@ -155,7 +155,7 @@ QFilterKey *Quick3DTechnique::filterKeyAt(QQmlListProperty<QFilterKey> *list, in
return 0;
}
-int Quick3DTechnique::filterKeyCount(QQmlListProperty<QFilterKey> *list)
+qsizetype Quick3DTechnique::filterKeyCount(QQmlListProperty<QFilterKey> *list)
{
Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object);
if (technique)
diff --git a/src/quick3d/quick3drender/items/quick3dtechnique_p.h b/src/quick3d/quick3drender/items/quick3dtechnique_p.h
index 0c02e07c3..425eb0b25 100644
--- a/src/quick3d/quick3drender/items/quick3dtechnique_p.h
+++ b/src/quick3d/quick3drender/items/quick3dtechnique_p.h
@@ -81,18 +81,18 @@ public:
private:
static void appendParameter(QQmlListProperty<QParameter> *list, QParameter *param);
- static QParameter *parameterAt(QQmlListProperty<QParameter> *list, int index);
- static int parametersCount(QQmlListProperty<QParameter> *list);
+ static QParameter *parameterAt(QQmlListProperty<QParameter> *list, qsizetype index);
+ static qsizetype parametersCount(QQmlListProperty<QParameter> *list);
static void clearParameterList(QQmlListProperty<QParameter> *list);
static void appendFilterKey(QQmlListProperty<QFilterKey> *list, QFilterKey *filterKey);
- static QFilterKey *filterKeyAt(QQmlListProperty<QFilterKey> *list, int index);
- static int filterKeyCount(QQmlListProperty<QFilterKey> *list);
+ static QFilterKey *filterKeyAt(QQmlListProperty<QFilterKey> *list, qsizetype index);
+ static qsizetype filterKeyCount(QQmlListProperty<QFilterKey> *list);
static void clearFilterKeyList(QQmlListProperty<QFilterKey> *list);
static void appendRenderPass(QQmlListProperty<QRenderPass> *list, QRenderPass* renderPass);
- static QRenderPass *renderPassAt(QQmlListProperty<QRenderPass> *list, int index);
- static int renderPassCount(QQmlListProperty<QRenderPass> *list);
+ static QRenderPass *renderPassAt(QQmlListProperty<QRenderPass> *list, qsizetype index);
+ static qsizetype renderPassCount(QQmlListProperty<QRenderPass> *list);
static void clearRenderPasses( QQmlListProperty<QRenderPass> *list);
};
diff --git a/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp b/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp
index 2019093c9..01e114fab 100644
--- a/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp
+++ b/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp
@@ -77,7 +77,7 @@ void Quick3DTechniqueFilter::appendRequire(QQmlListProperty<QFilterKey> *list, Q
}
}
-QFilterKey *Quick3DTechniqueFilter::requireAt(QQmlListProperty<QFilterKey> *list, int index)
+QFilterKey *Quick3DTechniqueFilter::requireAt(QQmlListProperty<QFilterKey> *list, qsizetype index)
{
Quick3DTechniqueFilter *filter = qobject_cast<Quick3DTechniqueFilter *>(list->object);
if (filter)
@@ -85,7 +85,7 @@ QFilterKey *Quick3DTechniqueFilter::requireAt(QQmlListProperty<QFilterKey> *list
return 0;
}
-int Quick3DTechniqueFilter::requiresCount(QQmlListProperty<QFilterKey> *list)
+qsizetype Quick3DTechniqueFilter::requiresCount(QQmlListProperty<QFilterKey> *list)
{
Quick3DTechniqueFilter *filter = qobject_cast<Quick3DTechniqueFilter *>(list->object);
if (filter)
@@ -109,13 +109,13 @@ void Quick3DTechniqueFilter::appendParameter(QQmlListProperty<QParameter> *list,
techniqueFilter->parentTechniqueFilter()->addParameter(param);
}
-QParameter *Quick3DTechniqueFilter::parameterAt(QQmlListProperty<QParameter> *list, int index)
+QParameter *Quick3DTechniqueFilter::parameterAt(QQmlListProperty<QParameter> *list, qsizetype index)
{
Quick3DTechniqueFilter *techniqueFilter = qobject_cast<Quick3DTechniqueFilter *>(list->object);
return techniqueFilter->parentTechniqueFilter()->parameters().at(index);
}
-int Quick3DTechniqueFilter::parametersCount(QQmlListProperty<QParameter> *list)
+qsizetype Quick3DTechniqueFilter::parametersCount(QQmlListProperty<QParameter> *list)
{
Quick3DTechniqueFilter *techniqueFilter = qobject_cast<Quick3DTechniqueFilter *>(list->object);
return techniqueFilter->parentTechniqueFilter()->parameters().count();
diff --git a/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h b/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h
index 9cd776827..9a2b396ac 100644
--- a/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h
+++ b/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h
@@ -80,13 +80,13 @@ public:
private:
static void appendRequire(QQmlListProperty<QFilterKey> *list, QFilterKey *criterion);
- static QFilterKey *requireAt(QQmlListProperty<QFilterKey> *list, int index);
- static int requiresCount(QQmlListProperty<QFilterKey> *list);
+ static QFilterKey *requireAt(QQmlListProperty<QFilterKey> *list, qsizetype index);
+ static qsizetype requiresCount(QQmlListProperty<QFilterKey> *list);
static void clearRequires(QQmlListProperty<QFilterKey> *list);
static void appendParameter(QQmlListProperty<QParameter> *list, QParameter *param);
- static QParameter *parameterAt(QQmlListProperty<QParameter> *list, int index);
- static int parametersCount(QQmlListProperty<QParameter> *list);
+ static QParameter *parameterAt(QQmlListProperty<QParameter> *list, qsizetype index);
+ static qsizetype parametersCount(QQmlListProperty<QParameter> *list);
static void clearParameterList(QQmlListProperty<QParameter> *list);
};
diff --git a/src/quick3d/quick3drender/items/quick3dtexture.cpp b/src/quick3d/quick3drender/items/quick3dtexture.cpp
index 7627a3283..01f36542d 100644
--- a/src/quick3d/quick3drender/items/quick3dtexture.cpp
+++ b/src/quick3d/quick3drender/items/quick3dtexture.cpp
@@ -68,7 +68,7 @@ void Quick3DTextureExtension::appendTextureImage(QQmlListProperty<QAbstractTextu
self->parentTexture()->addTextureImage(textureImage);
}
-QAbstractTextureImage *Quick3DTextureExtension::textureImageAt(QQmlListProperty<QAbstractTextureImage> *list, int index)
+QAbstractTextureImage *Quick3DTextureExtension::textureImageAt(QQmlListProperty<QAbstractTextureImage> *list, qsizetype index)
{
Quick3DTextureExtension *self = qobject_cast<Quick3DTextureExtension *>(list->object);
if (self)
@@ -76,7 +76,7 @@ QAbstractTextureImage *Quick3DTextureExtension::textureImageAt(QQmlListProperty<
return nullptr;
}
-int Quick3DTextureExtension::textureImageCount(QQmlListProperty<QAbstractTextureImage> *list)
+qsizetype Quick3DTextureExtension::textureImageCount(QQmlListProperty<QAbstractTextureImage> *list)
{
Quick3DTextureExtension *self = qobject_cast<Quick3DTextureExtension *>(list->object);
if (self)
diff --git a/src/quick3d/quick3drender/items/quick3dtexture_p.h b/src/quick3d/quick3drender/items/quick3dtexture_p.h
index 54d23a16b..2f22d404e 100644
--- a/src/quick3d/quick3drender/items/quick3dtexture_p.h
+++ b/src/quick3d/quick3drender/items/quick3dtexture_p.h
@@ -77,8 +77,8 @@ public:
private:
static void appendTextureImage(QQmlListProperty<QAbstractTextureImage> *list, QAbstractTextureImage *textureImage);
- static QAbstractTextureImage *textureImageAt(QQmlListProperty<QAbstractTextureImage> *list, int index);
- static int textureImageCount(QQmlListProperty<QAbstractTextureImage> *list);
+ static QAbstractTextureImage *textureImageAt(QQmlListProperty<QAbstractTextureImage> *list, qsizetype index);
+ static qsizetype textureImageCount(QQmlListProperty<QAbstractTextureImage> *list);
static void clearTextureImageList(QQmlListProperty<QAbstractTextureImage> *list);
};