From e841be3ef9b4ea089265991cb0fe3a5d4ee14224 Mon Sep 17 00:00:00 2001
From: Sean Harmer <sean.harmer@kdab.com>
Date: Mon, 27 Mar 2017 14:58:40 +0100
Subject: Add Threshold suffix to QLevelOfDetail enum values

Change-Id: I70a39b4a2664e2952d9f3cdd1ace1f021b0311dd
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
---
 tests/auto/render/levelofdetail/tst_levelofdetail.cpp   | 10 +++++-----
 tests/auto/render/qlevelofdetail/tst_qlevelofdetail.cpp |  4 ++--
 tests/manual/lod/main.qml                               |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/render/levelofdetail/tst_levelofdetail.cpp b/tests/auto/render/levelofdetail/tst_levelofdetail.cpp
index 1446811a8..148c54e58 100644
--- a/tests/auto/render/levelofdetail/tst_levelofdetail.cpp
+++ b/tests/auto/render/levelofdetail/tst_levelofdetail.cpp
@@ -70,7 +70,7 @@ private Q_SLOTS:
         // THEN
         QCOMPARE(renderLod.camera(), Qt3DCore::QNodeId{});
         QCOMPARE(renderLod.currentIndex(), 0);
-        QCOMPARE(renderLod.thresholdType(), Qt3DRender::QLevelOfDetail::DistanceToCamera);
+        QCOMPARE(renderLod.thresholdType(), Qt3DRender::QLevelOfDetail::DistanceToCameraThreshold);
         QVERIFY(renderLod.thresholds().empty());
         QCOMPARE(renderLod.radius(), 1.f);
         QCOMPARE(renderLod.center(), QVector3D{});
@@ -78,7 +78,7 @@ private Q_SLOTS:
 
         // GIVEN
         Qt3DRender::QLevelOfDetail lod;
-        lod.setThresholdType(Qt3DRender::QLevelOfDetail::ProjectedScreenPixelSize);
+        lod.setThresholdType(Qt3DRender::QLevelOfDetail::ProjectedScreenPixelSizeThreshold);
 
         // WHEN
         renderLod.setRenderer(&renderer);
@@ -96,18 +96,18 @@ private Q_SLOTS:
         renderLod.setRenderer(&renderer);
 
         // THEN
-        QVERIFY(renderLod.thresholdType() != Qt3DRender::QLevelOfDetail::ProjectedScreenPixelSize);
+        QVERIFY(renderLod.thresholdType() != Qt3DRender::QLevelOfDetail::ProjectedScreenPixelSizeThreshold);
         QVERIFY(renderLod.camera().isNull());
 
         {
             // WHEN
             Qt3DCore::QPropertyUpdatedChangePtr updateChange(new Qt3DCore::QPropertyUpdatedChange(Qt3DCore::QNodeId()));
-            updateChange->setValue(static_cast<int>(Qt3DRender::QLevelOfDetail::ProjectedScreenPixelSize));
+            updateChange->setValue(static_cast<int>(Qt3DRender::QLevelOfDetail::ProjectedScreenPixelSizeThreshold));
             updateChange->setPropertyName("thresholdType");
             renderLod.sceneChangeEvent(updateChange);
 
             // THEN
-            QCOMPARE(renderLod.thresholdType(), Qt3DRender::QLevelOfDetail::ProjectedScreenPixelSize);
+            QCOMPARE(renderLod.thresholdType(), Qt3DRender::QLevelOfDetail::ProjectedScreenPixelSizeThreshold);
             QVERIFY(renderer.dirtyBits() != 0);
         }
 
diff --git a/tests/auto/render/qlevelofdetail/tst_qlevelofdetail.cpp b/tests/auto/render/qlevelofdetail/tst_qlevelofdetail.cpp
index e2ffdd9da..ba357c8c9 100644
--- a/tests/auto/render/qlevelofdetail/tst_qlevelofdetail.cpp
+++ b/tests/auto/render/qlevelofdetail/tst_qlevelofdetail.cpp
@@ -89,14 +89,14 @@ private Q_SLOTS:
 
         {
             // WHEN
-            lod->setThresholdType(Qt3DRender::QLevelOfDetail::ProjectedScreenPixelSize);
+            lod->setThresholdType(Qt3DRender::QLevelOfDetail::ProjectedScreenPixelSizeThreshold);
             QCoreApplication::processEvents();
 
             // THEN
             QCOMPARE(arbiter.events.size(), 1);
             Qt3DCore::QPropertyUpdatedChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QPropertyUpdatedChange>();
             QCOMPARE(change->propertyName(), "thresholdType");
-            QCOMPARE(change->value().value<int>(), static_cast<int>(Qt3DRender::QLevelOfDetail::ProjectedScreenPixelSize));
+            QCOMPARE(change->value().value<int>(), static_cast<int>(Qt3DRender::QLevelOfDetail::ProjectedScreenPixelSizeThreshold));
 
             arbiter.events.clear();
         }
diff --git a/tests/manual/lod/main.qml b/tests/manual/lod/main.qml
index 0c03ff257..80547dcff 100644
--- a/tests/manual/lod/main.qml
+++ b/tests/manual/lod/main.qml
@@ -126,7 +126,7 @@ Entity {
                     id: lod
                     camera: camera
                     thresholds: [1000, 600, 300, 180]
-                    thresholdType: LevelOfDetail.ProjectedScreenPixelSize
+                    thresholdType: LevelOfDetail.ProjectedScreenPixelSizeThreshold
                     volumeOverride: lod.createBoundingSphere(Qt.vector3d(0, 0, 0), 2.0)
                 }
             ]
@@ -149,7 +149,7 @@ Entity {
 
             camera: camera
             thresholds: [20, 35, 50, 65]
-            thresholdType: LevelOfDetail.DistanceToCamera
+            thresholdType: LevelOfDetail.DistanceToCameraThreshold
             volumeOverride: lodLoader.createBoundingSphere(Qt.vector3d(0, 0, 0), -1)
             sources: ["qrc:/SphereEntity.qml", "qrc:/CylinderEntity.qml", "qrc:/ConeEntity.qml", "qrc:/CuboidEntity.qml"]
         }
@@ -171,7 +171,7 @@ Entity {
                 LevelOfDetailSwitch {
                     camera: camera
                     thresholds: [20, 35, 50, 65]
-                    thresholdType: LevelOfDetail.DistanceToCamera
+                    thresholdType: LevelOfDetail.DistanceToCameraThreshold
                 }
             ]
 
-- 
cgit v1.2.3