Miscellaneous api cleanup

Task-number: QTRD-2665

Change-Id: I3ed82721603e1b72b4b1543f197d1eabb8743bb7
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

8 files changed, 35 insertions, 49 deletions

diff --git a/src/datavisualization/engine/q3dcamera.cpp b/src/datavisualization/engine/q3dcamera.cpp
index d70645e0..bc936436 100644
--- a/src/datavisualization/engine/q3dcamera.cpp
+++ b/src/datavisualization/engine/q3dcamera.cpp
@@ -60,36 +60,38 @@ Q3DCamera::~Q3DCamera()
  * Copies the 3D camera's properties from the given source camera.
  * Values are copied from the \a source to this object.
  */
-void Q3DCamera::copyValuesFrom(const Q3DCamera &source)
+void Q3DCamera::copyValuesFrom(const Q3DObject &source)
 {
     Q3DObject::copyValuesFrom(source);
 
-    d_ptr->m_target.setX(source.d_ptr->m_target.x());
-    d_ptr->m_target.setY(source.d_ptr->m_target.y());
-    d_ptr->m_target.setZ(source.d_ptr->m_target.z());
+    const Q3DCamera &sourceCamera = static_cast<const Q3DCamera &>(source);
 
-    d_ptr->m_up.setX(source.d_ptr->m_up.x());
-    d_ptr->m_up.setY(source.d_ptr->m_up.y());
-    d_ptr->m_up.setZ(source.d_ptr->m_up.z());
+    d_ptr->m_target.setX(sourceCamera.d_ptr->m_target.x());
+    d_ptr->m_target.setY(sourceCamera.d_ptr->m_target.y());
+    d_ptr->m_target.setZ(sourceCamera.d_ptr->m_target.z());
+
+    d_ptr->m_up.setX(sourceCamera.d_ptr->m_up.x());
+    d_ptr->m_up.setY(sourceCamera.d_ptr->m_up.y());
+    d_ptr->m_up.setZ(sourceCamera.d_ptr->m_up.z());
 
     float *values = new float[16];
-    source.d_ptr->m_viewMatrix.copyDataTo(values);
+    sourceCamera.d_ptr->m_viewMatrix.copyDataTo(values);
     d_ptr->m_viewMatrix = QMatrix4x4(values);
     delete[] values;
 
-    d_ptr->m_xRotation = source.d_ptr->m_xRotation;
-    d_ptr->m_yRotation = source.d_ptr->m_yRotation;
+    d_ptr->m_xRotation = sourceCamera.d_ptr->m_xRotation;
+    d_ptr->m_yRotation = sourceCamera.d_ptr->m_yRotation;
 
-    d_ptr->m_minXRotation = source.d_ptr->m_minXRotation;
-    d_ptr->m_minYRotation = source.d_ptr->m_minYRotation;
-    d_ptr->m_maxXRotation = source.d_ptr->m_maxXRotation;
-    d_ptr->m_maxYRotation = source.d_ptr->m_maxYRotation;
+    d_ptr->m_minXRotation = sourceCamera.d_ptr->m_minXRotation;
+    d_ptr->m_minYRotation = sourceCamera.d_ptr->m_minYRotation;
+    d_ptr->m_maxXRotation = sourceCamera.d_ptr->m_maxXRotation;
+    d_ptr->m_maxYRotation = sourceCamera.d_ptr->m_maxYRotation;
 
-    d_ptr->m_wrapXRotation = source.d_ptr->m_wrapXRotation;
-    d_ptr->m_wrapYRotation = source.d_ptr->m_wrapYRotation;
+    d_ptr->m_wrapXRotation = sourceCamera.d_ptr->m_wrapXRotation;
+    d_ptr->m_wrapYRotation = sourceCamera.d_ptr->m_wrapYRotation;
 
-    d_ptr->m_zoomLevel = source.d_ptr->m_zoomLevel;
-    d_ptr->m_activePreset = source.d_ptr->m_activePreset;
+    d_ptr->m_zoomLevel = sourceCamera.d_ptr->m_zoomLevel;
+    d_ptr->m_activePreset = sourceCamera.d_ptr->m_activePreset;
 }
 
 /*!
diff --git a/src/datavisualization/engine/q3dcamera.h b/src/datavisualization/engine/q3dcamera.h
index db322518..36764f14 100644
--- a/src/datavisualization/engine/q3dcamera.h
+++ b/src/datavisualization/engine/q3dcamera.h
@@ -67,7 +67,7 @@ public:
     bool wrapYRotation() const;
     void setWrapYRotation(bool isEnabled);
 
-    void copyValuesFrom(const Q3DCamera &source);
+    virtual void copyValuesFrom(const Q3DObject &source);
 
     QMatrix4x4 viewMatrix() const;
     void setViewMatrix(const QMatrix4x4 &viewMatrix);
@@ -104,7 +104,8 @@ signals:
     void wrapXRotationChanged(bool isEnabled);
     void wrapYRotationChanged(bool isEnabled);
 
-protected:
+private:
+    // To be exposed in the future
     void setMinXRotation(float rotation);
     void setMinYRotation(float rotation);
     void setMaxXRotation(float rotation);
diff --git a/src/datavisualization/engine/q3dlight.cpp b/src/datavisualization/engine/q3dlight.cpp
index f1b1b4e7..742b0ce7 100644
--- a/src/datavisualization/engine/q3dlight.cpp
+++ b/src/datavisualization/engine/q3dlight.cpp
@@ -42,14 +42,6 @@ Q3DLight::Q3DLight(QObject *parent) :
 }
 
 /*!
- * Copies the properties of the 3D light from the given source \a source light to this light instance.
- */
-void Q3DLight::copyValuesFrom(const Q3DLight &source)
-{
-    Q3DObject::copyValuesFrom(source);
-}
-
-/*!
  * Destroys the light object.
  */
 Q3DLight::~Q3DLight()
diff --git a/src/datavisualization/engine/q3dlight.h b/src/datavisualization/engine/q3dlight.h
index 0a4ba174..f9109183 100644
--- a/src/datavisualization/engine/q3dlight.h
+++ b/src/datavisualization/engine/q3dlight.h
@@ -34,8 +34,6 @@ public:
     Q3DLight(QObject *parent = 0);
     virtual ~Q3DLight();
 
-    void copyValuesFrom(const Q3DLight &source);
-
 private:
     QScopedPointer<Q3DLightPrivate> d_ptr;
 
diff --git a/src/datavisualization/engine/q3dobject.h b/src/datavisualization/engine/q3dobject.h
index 930bb022..f5e117e1 100644
--- a/src/datavisualization/engine/q3dobject.h
+++ b/src/datavisualization/engine/q3dobject.h
@@ -38,7 +38,7 @@ public:
     Q3DObject(QObject *parent = 0);
     virtual ~Q3DObject();
 
-    void copyValuesFrom(const Q3DObject &source);
+    virtual void copyValuesFrom(const Q3DObject &source);
 
     Q3DScene *parentScene();
 
diff --git a/src/datavisualization/engine/q3dscene.cpp b/src/datavisualization/engine/q3dscene.cpp
index de6a3c97..cfef3dcf 100644
--- a/src/datavisualization/engine/q3dscene.cpp
+++ b/src/datavisualization/engine/q3dscene.cpp
@@ -190,7 +190,7 @@ void Q3DScene::setSelectionQueryPosition(const QPoint &point)
         d_ptr->m_selectionQueryPosition = point;
         d_ptr->m_changeTracker.selectionQueryPositionChanged = true;
         emit selectionQueryPositionChanged(point);
-        emitNeedRender();
+        emit needRender();
     }
 }
 
@@ -225,7 +225,7 @@ void Q3DScene::setSlicingActive(bool isSlicing)
         d_ptr->m_isSlicingActive = isSlicing;
         d_ptr->m_changeTracker.slicingActivatedChanged = true;
         emit slicingActiveChanged(isSlicing);
-        emitNeedRender();
+        emit needRender();
     }
 }
 
@@ -245,7 +245,7 @@ void Q3DScene::setSecondarySubviewOnTop(bool isSecondaryOnTop)
         d_ptr->m_isSecondarySubviewOnTop = isSecondaryOnTop;
         d_ptr->m_changeTracker.subViewportOrderChanged = true;
         emit secondarySubviewOnTopChanged(isSecondaryOnTop);
-        emitNeedRender();
+        emit needRender();
     }
 }
 
@@ -271,11 +271,11 @@ void Q3DScene::setActiveCamera(Q3DCamera *camera)
     if (camera != d_ptr->m_camera) {
         if (d_ptr->m_camera) {
             disconnect(d_ptr->m_camera, &Q3DCamera::xRotationChanged, this,
-                    &Q3DScene::emitNeedRender);
+                    &Q3DScene::needRender);
             disconnect(d_ptr->m_camera, &Q3DCamera::yRotationChanged, this,
-                    &Q3DScene::emitNeedRender);
+                    &Q3DScene::needRender);
             disconnect(d_ptr->m_camera, &Q3DCamera::zoomLevelChanged, this,
-                    &Q3DScene::emitNeedRender);
+                    &Q3DScene::needRender);
         }
 
         d_ptr->m_camera = camera;
@@ -283,23 +283,18 @@ void Q3DScene::setActiveCamera(Q3DCamera *camera)
 
         if (camera) {
             connect(camera, &Q3DCamera::xRotationChanged, this,
-                    &Q3DScene::emitNeedRender);
+                    &Q3DScene::needRender);
             connect(camera, &Q3DCamera::yRotationChanged, this,
-                    &Q3DScene::emitNeedRender);
+                    &Q3DScene::needRender);
             connect(camera, &Q3DCamera::zoomLevelChanged, this,
-                    &Q3DScene::emitNeedRender);
+                    &Q3DScene::needRender);
         }
 
         emit activeCameraChanged(camera);
-        emitNeedRender();
+        emit needRender();
     }
 }
 
-void Q3DScene::emitNeedRender()
-{
-    emit needRender();
-}
-
 /*!
  * \property Q3DScene::activeLight
  *
diff --git a/src/datavisualization/engine/q3dscene.h b/src/datavisualization/engine/q3dscene.h
index 8033b595..f1b424a6 100644
--- a/src/datavisualization/engine/q3dscene.h
+++ b/src/datavisualization/engine/q3dscene.h
@@ -81,9 +81,6 @@ public:
     Q_INVOKABLE void setLightPositionRelativeToCamera(const QVector3D &relativePosition,
                                                       float fixedRotation = 0.0f,
                                                       float distanceModifier = 0.0f);
-private:
-    // TODO: Move to private
-    void emitNeedRender();
 
 signals:
     void viewportChanged(QRect viewport);
diff --git a/src/datavisualization/engine/q3dwindow.h b/src/datavisualization/engine/q3dwindow.h
index ea96fb05..e185914f 100644
--- a/src/datavisualization/engine/q3dwindow.h
+++ b/src/datavisualization/engine/q3dwindow.h
@@ -51,6 +51,7 @@ protected slots:
     void renderNow();
 
 protected:
+    // TODO: Move to private unnecessarily exposed functionality when doing QTRD-2213
     virtual void render();
 
     bool event(QEvent *event);