Fix deprecated API usage and compile warnings

- QVariant::Type deprecated, use QMetaType related APIs
- QNodeId not used as reference in for loops (nop but really noisy)
- some unused code

Change-Id: I291219207fcd1ad0bf89533b4e2bb5fa47a353bb
Reviewed-by: Mike Krus <mike.krus@kdab.com>

16 files changed, 42 insertions, 44 deletions

diff --git a/src/render/backend/entity_p.h b/src/render/backend/entity_p.h
index 3c2f9c2b5..e83765a78 100644
--- a/src/render/backend/entity_p.h
+++ b/src/render/backend/entity_p.h
@@ -269,7 +269,7 @@ private:
         Manager *manager = m_nodeManagers->manager<Type, Manager>(); \
         QList<Handle> entries; \
         entries.reserve(variable.size()); \
-        for (const QNodeId id : variable) \
+        for (const QNodeId &id : variable) \
             entries.push_back(manager->lookupHandle(id)); \
         return entries; \
         } \
@@ -280,7 +280,7 @@ private:
         Manager *manager = m_nodeManagers->manager<Type, Manager>(); \
         std::vector<Type *> entries; \
         entries.reserve(variable.size()); \
-        for (const QNodeId id : variable) \
+        for (const QNodeId &id : variable) \
             entries.push_back(manager->lookupResource(id)); \
         return entries; \
     } \
diff --git a/src/render/backend/visitorutils_p.h b/src/render/backend/visitorutils_p.h
index 824cd0ddf..cea4af2b1 100644
--- a/src/render/backend/visitorutils_p.h
+++ b/src/render/backend/visitorutils_p.h
@@ -132,7 +132,7 @@ void visitPrimitives(NodeManagers *manager, const GeometryProvider *renderer, Vi
     if (geom) {
         Qt3DRender::Render::Attribute *attribute = nullptr;
         const auto attrIds = geom->attributes();
-        for (const Qt3DCore::QNodeId attrId : attrIds) {
+        for (const Qt3DCore::QNodeId &attrId : attrIds) {
             attribute = manager->lookupResource<Attribute, AttributeManager>(attrId);
             if (attribute){
                 if (!positionAttribute && attribute->name() == Qt3DCore::QAttribute::defaultPositionAttributeName())
diff --git a/src/render/framegraph/framegraphvisitor.cpp b/src/render/framegraph/framegraphvisitor.cpp
index a5a47d711..7da61386a 100644
--- a/src/render/framegraph/framegraphvisitor.cpp
+++ b/src/render/framegraph/framegraphvisitor.cpp
@@ -96,7 +96,7 @@ void FrameGraphVisitor::visit(Render::FrameGraphNode *node)
     // initiate a rendering from the current camera
     const QList<Qt3DCore::QNodeId> fgChildIds = node->childrenIds();
 
-    for (const Qt3DCore::QNodeId fgChildId : fgChildIds)
+    for (const Qt3DCore::QNodeId &fgChildId : fgChildIds)
         visit(m_manager->lookupNode(fgChildId));
 
     // Leaf node - create a RenderView ready to be populated
diff --git a/src/render/geometry/gltfskeletonloader.cpp b/src/render/geometry/gltfskeletonloader.cpp
index 3bd96e379..9bd59f54b 100644
--- a/src/render/geometry/gltfskeletonloader.cpp
+++ b/src/render/geometry/gltfskeletonloader.cpp
@@ -62,7 +62,7 @@ void jsonArrayToSqt(const QJsonArray &jsonArray, Qt3DCore::Sqt &sqt)
     QMatrix4x4 m;
     float *data = m.data();
     int i = 0;
-    for (const auto &element : jsonArray)
+    for (const auto element : jsonArray)
         *(data + i++) = static_cast<float>(element.toDouble());
 
     decomposeQMatrix4x4(m, sqt);
@@ -449,23 +449,23 @@ bool GLTFSkeletonLoader::parseGLTF2()
 {
     bool success = true;
     const QJsonArray buffers = m_json.object().value(KEY_BUFFERS).toArray();
-    for (const auto &bufferValue : buffers)
+    for (const auto bufferValue : buffers)
         success &= processJSONBuffer(bufferValue.toObject());
 
     const QJsonArray bufferViews = m_json.object().value(KEY_BUFFER_VIEWS).toArray();
-    for (const auto &bufferViewValue : bufferViews)
+    for (const auto bufferViewValue : bufferViews)
         success &= processJSONBufferView(bufferViewValue.toObject());
 
     const QJsonArray accessors = m_json.object().value(KEY_ACCESSORS).toArray();
-    for (const auto &accessorValue : accessors)
+    for (const auto accessorValue : accessors)
         success &= processJSONAccessor(accessorValue.toObject());
 
     const QJsonArray skins = m_json.object().value(KEY_SKINS).toArray();
-    for (const auto &skinValue : skins)
+    for (const auto skinValue : skins)
         success &= processJSONSkin(skinValue.toObject());
 
     const QJsonArray nodes = m_json.object().value(KEY_NODES).toArray();
-    for (const auto &nodeValue : nodes)
+    for (const auto nodeValue : nodes)
         success &= processJSONNode(nodeValue.toObject());
     setupNodeParentLinks();
 
diff --git a/src/render/jobs/filtercompatibletechniquejob.cpp b/src/render/jobs/filtercompatibletechniquejob.cpp
index e2c22401c..c53f811f8 100644
--- a/src/render/jobs/filtercompatibletechniquejob.cpp
+++ b/src/render/jobs/filtercompatibletechniquejob.cpp
@@ -80,7 +80,7 @@ void FilterCompatibleTechniqueJob::run()
     Q_ASSERT(m_renderer->isRunning());
 
     const std::vector<Qt3DCore::QNodeId> dirtyTechniqueIds = m_manager->takeDirtyTechniques();
-    for (const Qt3DCore::QNodeId techniqueId : dirtyTechniqueIds) {
+    for (const Qt3DCore::QNodeId &techniqueId : dirtyTechniqueIds) {
         Technique *technique = m_manager->lookupResource(techniqueId);
         if (Q_LIKELY(technique != nullptr))
             technique->setCompatibleWithRenderer((*m_renderer->contextInfo() == *technique->graphicsApiFilter()));
diff --git a/src/render/jobs/filterlayerentityjob.cpp b/src/render/jobs/filterlayerentityjob.cpp
index 00ed76d86..ddea1ebf7 100644
--- a/src/render/jobs/filterlayerentityjob.cpp
+++ b/src/render/jobs/filterlayerentityjob.cpp
@@ -81,7 +81,7 @@ void FilterLayerEntityJob::filterAcceptAnyMatchingLayers(Entity *entity,
 {
     const Qt3DCore::QNodeIdVector entityLayers = entity->layerIds();
 
-    for (const Qt3DCore::QNodeId id : entityLayers) {
+    for (const Qt3DCore::QNodeId &id : entityLayers) {
         const bool layerAccepted = layerIds.contains(id);
 
         if (layerAccepted) {
@@ -99,7 +99,7 @@ void FilterLayerEntityJob::filterAcceptAllMatchingLayers(Entity *entity,
     const Qt3DCore::QNodeIdVector entityLayers = entity->layerIds();
     int layersAccepted = 0;
 
-    for (const Qt3DCore::QNodeId id : entityLayers) {
+    for (const Qt3DCore::QNodeId &id : entityLayers) {
         if (layerIds.contains(id))
             ++layersAccepted;
     }
@@ -118,7 +118,7 @@ void FilterLayerEntityJob::filterDiscardAnyMatchingLayers(Entity *entity,
     const Qt3DCore::QNodeIdVector entityLayers = entity->layerIds();
     bool entityCanBeDiscarded = false;
 
-    for (const Qt3DCore::QNodeId id : entityLayers) {
+    for (const Qt3DCore::QNodeId &id : entityLayers) {
         if (layerIds.contains(id)) {
             entityCanBeDiscarded =  true;
             break;
@@ -140,7 +140,7 @@ void FilterLayerEntityJob::filterDiscardAllMatchingLayers(Entity *entity,
 
     int containedLayers = 0;
 
-    for (const Qt3DCore::QNodeId id : layerIds) {
+    for (const Qt3DCore::QNodeId &id : layerIds) {
         if (entityLayers.contains(id))
             ++containedLayers;
     }
@@ -167,7 +167,7 @@ void FilterLayerEntityJob::filterLayerAndEntity()
     FrameGraphManager *frameGraphManager = m_manager->frameGraphManager();
     LayerManager *layerManager = m_manager->layerManager();
 
-    for (const Qt3DCore::QNodeId layerFilterId : qAsConst(m_layerFilterIds)) {
+    for (const Qt3DCore::QNodeId &layerFilterId : qAsConst(m_layerFilterIds)) {
         LayerFilterNode *layerFilter = static_cast<LayerFilterNode *>(frameGraphManager->lookupNode(layerFilterId));
         Qt3DCore::QNodeIdVector layerIds = layerFilter->layerIds();
 
diff --git a/src/render/jobs/filterproximitydistancejob.cpp b/src/render/jobs/filterproximitydistancejob.cpp
index 90978d573..3a4bf7d89 100644
--- a/src/render/jobs/filterproximitydistancejob.cpp
+++ b/src/render/jobs/filterproximitydistancejob.cpp
@@ -78,7 +78,7 @@ void FilterProximityDistanceJob::run()
         FrameGraphManager *frameGraphManager = m_manager->frameGraphManager();
         EntityManager *entityManager = m_manager->renderNodesManager();
 
-        for (const Qt3DCore::QNodeId proximityFilterId : qAsConst(m_proximityFilterIds)) {
+        for (const Qt3DCore::QNodeId &proximityFilterId : qAsConst(m_proximityFilterIds)) {
             ProximityFilter *proximityFilter = static_cast<ProximityFilter *>(frameGraphManager->lookupNode(proximityFilterId));
             m_targetEntity = entityManager->lookupResource(proximityFilter->entityId());
             m_distanceThresholdSquared = proximityFilter->distanceThreshold();
diff --git a/src/render/jobs/pickboundingvolumeutils.cpp b/src/render/jobs/pickboundingvolumeutils.cpp
index e3a0e018a..d123b99f2 100644
--- a/src/render/jobs/pickboundingvolumeutils.cpp
+++ b/src/render/jobs/pickboundingvolumeutils.cpp
@@ -854,7 +854,7 @@ bool HierarchicalEntityPicker::collectHits(NodeManagers *manager, Entity *root)
 
         Qt3DCore::QNodeIdVector recursiveLayers;
         const Qt3DCore::QNodeIdVector entityLayers = current.entity->componentsUuid<Layer>();
-        for (const Qt3DCore::QNodeId layerId : entityLayers) {
+        for (const Qt3DCore::QNodeId &layerId : entityLayers) {
             Layer *layer = layerManager->lookupResource(layerId);
             if (layer->recursive())
                 recursiveLayers << layerId;
diff --git a/src/render/jobs/renderviewjobutils.cpp b/src/render/jobs/renderviewjobutils.cpp
index 3677bf4cf..2e707007a 100644
--- a/src/render/jobs/renderviewjobutils.cpp
+++ b/src/render/jobs/renderviewjobutils.cpp
@@ -77,7 +77,7 @@ Technique *findTechniqueForEffect(NodeManagers *manager,
 
     // Iterate through the techniques in the effect
     const auto techniqueIds = effect->techniques();
-    for (const QNodeId techniqueId : techniqueIds) {
+    for (const QNodeId &techniqueId : techniqueIds) {
         Technique *technique = manager->techniqueManager()->lookupResource(techniqueId);
 
         // Should be valid, if not there likely a problem with node addition/destruction changes
@@ -117,7 +117,7 @@ RenderPassList findRenderPassesForTechnique(NodeManagers *manager,
 
     RenderPassList passes;
     const auto passIds = technique->renderPasses();
-    for (const QNodeId passId : passIds) {
+    for (const QNodeId &passId : passIds) {
         RenderPass *renderPass = manager->renderPassManager()->lookupResource(passId);
 
         if (renderPass && renderPass->isEnabled()) {
@@ -128,12 +128,12 @@ RenderPassList findRenderPassesForTechnique(NodeManagers *manager,
 
                 // Iterate through the filter criteria and look for render passes with criteria that satisfy them
                 const auto filterKeyIds = passFilter->filters();
-                for (const QNodeId filterKeyId : filterKeyIds) {
+                for (const QNodeId &filterKeyId : filterKeyIds) {
                     foundMatch = false;
                     FilterKey *filterFilterKey = manager->filterKeyManager()->lookupResource(filterKeyId);
 
                     const auto passFilterKeyIds = renderPass->filterKeys();
-                    for (const QNodeId passFilterKeyId : passFilterKeyIds) {
+                    for (const QNodeId &passFilterKeyId : passFilterKeyIds) {
                         FilterKey *passFilterKey = manager->filterKeyManager()->lookupResource(passFilterKeyId);
                         if ((foundMatch = (*passFilterKey == *filterFilterKey)))
                             break;
@@ -169,7 +169,7 @@ ParameterInfoList::const_iterator findParamInfo(ParameterInfoList *params, const
 void addParametersForIds(ParameterInfoList *params, ParameterManager *manager,
                          const Qt3DCore::QNodeIdVector &parameterIds)
 {
-    for (const QNodeId paramId : parameterIds) {
+    for (const QNodeId &paramId : parameterIds) {
         const HParameter parameterHandle = manager->lookupHandle(paramId);
         const Parameter *param = manager->data(parameterHandle);
         ParameterInfoList::iterator it = std::lower_bound(params->begin(), params->end(), param->nameId());
diff --git a/src/render/jobs/updateentitylayersjob.cpp b/src/render/jobs/updateentitylayersjob.cpp
index 62b3b1c78..8f9de8ee6 100644
--- a/src/render/jobs/updateentitylayersjob.cpp
+++ b/src/render/jobs/updateentitylayersjob.cpp
@@ -76,7 +76,7 @@ void UpdateEntityLayersJob::run()
         Entity *entity = entityManager->data(handle);
         const Qt3DCore::QNodeIdVector entityLayers = entity->componentsUuid<Layer>();
 
-        for (const Qt3DCore::QNodeId layerId : entityLayers) {
+        for (const Qt3DCore::QNodeId &layerId : entityLayers) {
             Layer *layer = layerManager->lookupResource(layerId);
             if (layer->recursive()) {
                 // Find all children of the entity and add the layers to them
diff --git a/src/render/materialsystem/filterkey.cpp b/src/render/materialsystem/filterkey.cpp
index e6c37b241..c3ed62924 100644
--- a/src/render/materialsystem/filterkey.cpp
+++ b/src/render/materialsystem/filterkey.cpp
@@ -92,7 +92,7 @@ bool FilterKey::operator ==(const FilterKey &other)
     // https://codereview.qt-project.org/#/c/204484/
     // and adding the following early comparison of the types should give
     // an equivalent performance gain:
-    return (other.value().type() == value().type() &&
+    return (other.value().metaType() == value().metaType() &&
             other.name() == name() &&
             other.value() == value());
 }
diff --git a/src/render/materialsystem/qparameter.cpp b/src/render/materialsystem/qparameter.cpp
index e5d586519..d4a457115 100644
--- a/src/render/materialsystem/qparameter.cpp
+++ b/src/render/materialsystem/qparameter.cpp
@@ -197,7 +197,7 @@ inline QVariant toBackendValue(const QVariant &v)
 
 void QParameterPrivate::setValue(const QVariant &v)
 {
-    if (v.type() == QVariant::List) {
+    if (v.metaType().id() == QMetaType::QVariantList) {
         QSequentialIterable iterable = v.value<QSequentialIterable>();
         QVariantList variants;
         variants.reserve(iterable.size());
diff --git a/src/render/materialsystem/shaderdata.cpp b/src/render/materialsystem/shaderdata.cpp
index 8b70b384f..f5e194697 100644
--- a/src/render/materialsystem/shaderdata.cpp
+++ b/src/render/materialsystem/shaderdata.cpp
@@ -127,7 +127,7 @@ void ShaderData::syncFromFrontEnd(const QNode *frontEnd, bool firstTime)
 
             // We check if property is a Transformed property
             QString transformedPropertyName;
-            if (propertyValue.userType() == QVariant::Vector3D) {
+            if (propertyValue.userType() == QMetaType::QVector3D) {
                 // if there is a matching QShaderData::TransformType propertyTransformed
                 transformedPropertyName = propertyName + QLatin1String("Transformed");
                 isTransformed = propertyNames.contains(transformedPropertyName);
diff --git a/src/render/materialsystem/technique.cpp b/src/render/materialsystem/technique.cpp
index bb3843d5b..4f8673c5b 100644
--- a/src/render/materialsystem/technique.cpp
+++ b/src/render/materialsystem/technique.cpp
@@ -176,12 +176,12 @@ bool Technique::isCompatibleWithFilters(const QNodeIdVector &filterKeyIds)
 
     // Iterate through the filter criteria and for each one search for a criteria on the
     // technique that satisfies it
-    for (const QNodeId filterKeyId : filterKeyIds) {
+    for (const QNodeId &filterKeyId : filterKeyIds) {
         FilterKey *filterKey = m_nodeManager->filterKeyManager()->lookupResource(filterKeyId);
 
         bool foundMatch = false;
 
-        for (const QNodeId techniqueFilterKeyId : qAsConst(m_filterKeyList)) {
+        for (const QNodeId &techniqueFilterKeyId : qAsConst(m_filterKeyList)) {
             FilterKey *techniqueFilterKey = m_nodeManager->filterKeyManager()->lookupResource(techniqueFilterKeyId);
             if ((foundMatch = (*techniqueFilterKey == *filterKey)))
                 break;
diff --git a/src/render/shadergraph/qshadergraphloader.cpp b/src/render/shadergraph/qshadergraphloader.cpp
index 64f159e7b..3d95ba69c 100644
--- a/src/render/shadergraph/qshadergraphloader.cpp
+++ b/src/render/shadergraph/qshadergraphloader.cpp
@@ -147,7 +147,7 @@ void QShaderGraphLoader::load()
     }
 
     const QJsonArray nodes = nodesValue.toArray();
-    for (const QJsonValue &nodeValue : nodes) {
+    for (const QJsonValue nodeValue : nodes) {
         if (!nodeValue.isObject()) {
             qWarning() << "Invalid node found";
             hasError = true;
@@ -173,9 +173,8 @@ void QShaderGraphLoader::load()
 
         const QJsonArray layersArray = nodeObject.value(QStringLiteral("layers")).toArray();
         auto layers = QStringList();
-        for (const QJsonValue &layerValue : layersArray) {
+        for (const QJsonValue layerValue : layersArray)
             layers.append(layerValue.toString());
-        }
 
         QShaderNode node = m_prototypes.value(type);
         node.setUuid(uuid);
@@ -189,13 +188,13 @@ void QShaderGraphLoader::load()
                 if (parameterValue.isObject()) {
                     const QJsonObject parameterObject = parameterValue.toObject();
                     const QString type = parameterObject.value(QStringLiteral("type")).toString();
-                    const int typeId = QMetaType::type(type.toUtf8());
+                    const QMetaType typeId = QMetaType::fromName(type.toUtf8());
 
                     const QString value = parameterObject.value(QStringLiteral("value")).toString();
                     auto variant = QVariant(value);
 
-                    if (QMetaType::typeFlags(typeId) & QMetaType::IsEnumeration) {
-                        const QMetaObject *metaObject = QMetaType::metaObjectForType(typeId);
+                    if (typeId.flags() & QMetaType::IsEnumeration) {
+                        const QMetaObject *metaObject = typeId.metaObject();
                         const char *className = metaObject->className();
                         const QByteArray enumName = type.mid(static_cast<int>(qstrlen(className)) + 2).toUtf8();
                         const QMetaEnum metaEnum = metaObject->enumerator(metaObject->indexOfEnumerator(enumName));
@@ -216,7 +215,7 @@ void QShaderGraphLoader::load()
     }
 
     const QJsonArray edges = edgesValue.toArray();
-    for (const QJsonValue &edgeValue : edges) {
+    for (const QJsonValue edgeValue : edges) {
         if (!edgeValue.isObject()) {
             qWarning() << "Invalid edge found";
             hasError = true;
@@ -247,9 +246,8 @@ void QShaderGraphLoader::load()
 
         const QJsonArray layersArray = edgeObject.value(QStringLiteral("layers")).toArray();
         auto layers = QStringList();
-        for (const QJsonValue &layerValue : layersArray) {
+        for (const QJsonValue layerValue : layersArray)
             layers.append(layerValue.toString());
-        }
 
         auto edge = QShaderGraph::Edge();
         edge.sourceNodeUuid = sourceUuid;
diff --git a/src/render/shadergraph/qshadernodesloader.cpp b/src/render/shadergraph/qshadernodesloader.cpp
index df34fd1f7..f1239d749 100644
--- a/src/render/shadergraph/qshadernodesloader.cpp
+++ b/src/render/shadergraph/qshadernodesloader.cpp
@@ -123,7 +123,7 @@ void QShaderNodesLoader::load(const QJsonObject &prototypesObject)
         const QJsonValue inputsValue = nodeObject.value(QStringLiteral("inputs"));
         if (inputsValue.isArray()) {
             const QJsonArray inputsArray = inputsValue.toArray();
-            for (const QJsonValue &inputValue : inputsArray) {
+            for (const QJsonValue inputValue : inputsArray) {
                 if (!inputValue.isString()) {
                     qWarning() << "Non-string value in inputs";
                     hasError = true;
@@ -140,7 +140,7 @@ void QShaderNodesLoader::load(const QJsonObject &prototypesObject)
         const QJsonValue outputsValue = nodeObject.value(QStringLiteral("outputs"));
         if (outputsValue.isArray()) {
             const QJsonArray outputsArray = outputsValue.toArray();
-            for (const QJsonValue &outputValue : outputsArray) {
+            for (const QJsonValue outputValue : outputsArray) {
                 if (!outputValue.isString()) {
                     qWarning() << "Non-string value in outputs";
                     hasError = true;
@@ -162,13 +162,13 @@ void QShaderNodesLoader::load(const QJsonObject &prototypesObject)
                 if (parameterValue.isObject()) {
                     const QJsonObject parameterObject = parameterValue.toObject();
                     const QString type = parameterObject.value(QStringLiteral("type")).toString();
-                    const int typeId = QMetaType::type(type.toUtf8());
+                    const QMetaType typeId = QMetaType::fromName(type.toUtf8());
 
                     const QString value = parameterObject.value(QStringLiteral("value")).toString();
                     auto variant = QVariant(value);
 
-                    if (QMetaType::typeFlags(typeId) & QMetaType::IsEnumeration) {
-                        const QMetaObject *metaObject = QMetaType::metaObjectForType(typeId);
+                    if (typeId.flags() & QMetaType::IsEnumeration) {
+                        const QMetaObject *metaObject = typeId.metaObject();
                         const char *className = metaObject->className();
                         const QByteArray enumName = type.mid(static_cast<int>(qstrlen(className)) + 2).toUtf8();
                         const QMetaEnum metaEnum = metaObject->enumerator(metaObject->indexOfEnumerator(enumName));
@@ -188,7 +188,7 @@ void QShaderNodesLoader::load(const QJsonObject &prototypesObject)
         const QJsonValue rulesValue = nodeObject.value(QStringLiteral("rules"));
         if (rulesValue.isArray()) {
             const QJsonArray rulesArray = rulesValue.toArray();
-            for (const QJsonValue &ruleValue : rulesArray) {
+            for (const QJsonValue ruleValue : rulesArray) {
                 if (!ruleValue.isObject()) {
                     qWarning() << "Rules should be objects";
                     hasError = true;