Remove TransformType from the public API

This is in fact needed only in the backend class, so no need to expose
it to the outside.

Change-Id: Ia0e9a619e8d18da59ae67ec70566614aa171719a
Task-number: QTBUG-51505
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

3 files changed, 14 insertions, 15 deletions

diff --git a/src/render/materialsystem/qshaderdata.h b/src/render/materialsystem/qshaderdata.h
index 522aa1185..a8553f32e 100644
--- a/src/render/materialsystem/qshaderdata.h
+++ b/src/render/materialsystem/qshaderdata.h
@@ -65,12 +65,6 @@ class QT3DRENDERSHARED_EXPORT QShaderData : public Qt3DCore::QComponent
 public:
     explicit QShaderData(Qt3DCore::QNode *parent = nullptr);
 
-    enum TransformType {
-        ModelToEye = 0,
-        ModelToWorld
-    };
-    Q_ENUM(TransformType)
-
     PropertyReaderInterfacePtr propertyReader() const;
 
 protected:
diff --git a/src/render/materialsystem/shaderdata.cpp b/src/render/materialsystem/shaderdata.cpp
index d78ccc6d2..17b50ad74 100644
--- a/src/render/materialsystem/shaderdata.cpp
+++ b/src/render/materialsystem/shaderdata.cpp
@@ -180,11 +180,11 @@ bool ShaderData::updateViewTransform(const QMatrix4x4 &viewMatrix)
     // We check the matrices and decide if the transform has changed since the previous call to needsUpdate
     if (m_viewMatrix != viewMatrix) {
         m_viewMatrix = viewMatrix;
-        const QHash<QString, QShaderData::TransformType>::const_iterator transformedEnd = m_transformedProperties.end();
-        QHash<QString, QShaderData::TransformType>::const_iterator transformedIt = m_transformedProperties.begin();
+        const QHash<QString, TransformType>::const_iterator transformedEnd = m_transformedProperties.end();
+        QHash<QString, TransformType>::const_iterator transformedIt = m_transformedProperties.begin();
 
         while (transformedIt != transformedEnd) {
-            if (transformedIt.value() == QShaderData::ModelToEye) {
+            if (transformedIt.value() == ModelToEye) {
                 m_updatedProperties.insert(transformedIt.key(), m_viewMatrix * m_worldMatrix * m_originalProperties.value(transformedIt.key()).value<QVector3D>());
                 m_properties.insert(transformedIt.key(), m_viewMatrix * m_worldMatrix * m_originalProperties.value(transformedIt.key()).value<QVector3D>());
             }
@@ -235,11 +235,11 @@ bool ShaderData::updateWorldTransform(const QMatrix4x4 &worldMatrix)
     if (m_worldMatrix != worldMatrix) {
         m_worldMatrix = worldMatrix;
 
-        const QHash<QString, QShaderData::TransformType>::const_iterator transformedEnd = m_transformedProperties.end();
-        QHash<QString, QShaderData::TransformType>::const_iterator transformedIt = m_transformedProperties.begin();
+        const QHash<QString, TransformType>::const_iterator transformedEnd = m_transformedProperties.end();
+        QHash<QString, TransformType>::const_iterator transformedIt = m_transformedProperties.begin();
 
         while (transformedIt != transformedEnd) {
-            if (transformedIt.value() == QShaderData::ModelToEye) {
+            if (transformedIt.value() == ModelToEye) {
                 m_updatedProperties.insert(transformedIt.key(), m_viewMatrix * m_worldMatrix * m_originalProperties.value(transformedIt.key()).value<QVector3D>());
                 m_properties.insert(transformedIt.key(), m_viewMatrix * m_worldMatrix * m_originalProperties.value(transformedIt.key()).value<QVector3D>());
             } else {
@@ -312,7 +312,7 @@ void ShaderData::readPeerProperties(QShaderData *shaderData)
             QVariant value = m_properties.value(it.key() + QStringLiteral("Transformed"));
             // if that's the case, we apply a space transformation to the property
             if (value.isValid() && value.type() == QVariant::Int)
-                m_transformedProperties.insert(it.key(), static_cast<QShaderData::TransformType>(value.toInt()));
+                m_transformedProperties.insert(it.key(), static_cast<TransformType>(value.toInt()));
         }
         ++it;
     }
@@ -333,7 +333,7 @@ void ShaderData::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
                 // matrices
                 m_originalProperties.insert(propertyName, val);
                 if (m_transformedProperties.contains(propertyName)) {
-                    if (m_transformedProperties[propertyName] == QShaderData::ModelToEye)
+                    if (m_transformedProperties[propertyName] == ModelToEye)
                         val = m_viewMatrix * m_worldMatrix * val.value<QVector3D>();
                     else
                         val = m_worldMatrix * val.value<QVector3D>();
diff --git a/src/render/materialsystem/shaderdata_p.h b/src/render/materialsystem/shaderdata_p.h
index fe2573ba4..6b3ba488e 100644
--- a/src/render/materialsystem/shaderdata_p.h
+++ b/src/render/materialsystem/shaderdata_p.h
@@ -70,6 +70,11 @@ class NodeManagers;
 class Q_AUTOTEST_EXPORT ShaderData : public BackendNode
 {
 public:
+    enum TransformType {
+        ModelToEye = 0,
+        ModelToWorld
+    };
+
     ShaderData();
     ~ShaderData();
 
@@ -103,7 +108,7 @@ protected:
     QHash<QString, QVariant> m_updatedProperties;
     PropertyReaderInterfacePtr m_propertyReader;
     QHash<QString, QVariant> m_nestedShaderDataProperties;
-    QHash<QString, QShaderData::TransformType> m_transformedProperties;
+    QHash<QString, TransformType> m_transformedProperties;
     QMutex m_mutex;
     static QVector<Qt3DCore::QNodeId> m_updatedShaderData;
     QMatrix4x4 m_worldMatrix;