Removed setwindowtitle and made parameters const ref

Task-number: QTRD-2211

Change-Id: Ib4087b40bb8d0e72d9fc4fe0c97acce4996b7fbd
Change-Id: Ib4087b40bb8d0e72d9fc4fe0c97acce4996b7fbd
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

12 files changed, 22 insertions, 71 deletions

diff --git a/src/datavis3d/engine/abstract3dcontroller.cpp b/src/datavis3d/engine/abstract3dcontroller.cpp
index 2f687cea..45919f97 100644
--- a/src/datavis3d/engine/abstract3dcontroller.cpp
+++ b/src/datavis3d/engine/abstract3dcontroller.cpp
@@ -434,8 +434,8 @@ void Abstract3DController::setCameraPosition(GLfloat horizontal, GLfloat vertica
     //qDebug() << "camera rotation set to" << m_horizontalRotation << m_verticalRotation;
 }
 
-void Abstract3DController::setObjectColor(QColor baseColor, QColor heightColor, QColor depthColor,
-                                          bool uniform)
+void Abstract3DController::setObjectColor(const QColor &baseColor, const QColor &heightColor,
+                                          const QColor &depthColor, bool uniform)
 {
     m_theme.m_baseColor = baseColor;
     m_theme.m_heightColor = heightColor;
diff --git a/src/datavis3d/engine/abstract3dcontroller_p.h b/src/datavis3d/engine/abstract3dcontroller_p.h
index fdc19322..878448a0 100644
--- a/src/datavis3d/engine/abstract3dcontroller_p.h
+++ b/src/datavis3d/engine/abstract3dcontroller_p.h
@@ -215,8 +215,8 @@ public:
 
     // Set color if you don't want to use themes. Set uniform to false if you want the (height)
     // color to change from bottom to top
-    virtual void setObjectColor(QColor baseColor, QColor heightColor, QColor depthColor,
-                                bool uniform = true);
+    virtual void setObjectColor(const QColor &baseColor, const QColor &heightColor,
+                                const QColor &depthColor, bool uniform = true);
 
     // Set theme (bar colors, shaders, window color, background colors, light intensity and text
     // colors are affected)
@@ -260,7 +260,8 @@ public:
     virtual void handleAxisRangeChangedBySender(QObject *sender);
     virtual void handleAxisSegmentCountChangedBySender(QObject *sender);
     virtual void handleAxisSubSegmentCountChangedBySender(QObject *sender);
-    virtual void handleAxisAutoAdjustRangeChangedInOrientation(QAbstractAxis::AxisOrientation orientation, bool autoAdjust) = 0;
+    virtual void handleAxisAutoAdjustRangeChangedInOrientation(
+            QAbstractAxis::AxisOrientation orientation, bool autoAdjust) = 0;
     virtual void handleAxisLabelFormatChangedBySender(QObject *sender);
 
 public slots:
diff --git a/src/datavis3d/engine/bars3dcontroller.cpp b/src/datavis3d/engine/bars3dcontroller.cpp
index d54aeace..8b6f9ae8 100644
--- a/src/datavis3d/engine/bars3dcontroller.cpp
+++ b/src/datavis3d/engine/bars3dcontroller.cpp
@@ -375,7 +375,7 @@ QPoint Bars3dController::noSelectionPoint()
     return noSelectionPos;
 }
 
-void Bars3dController::setBarSpecs(GLfloat thicknessRatio, QSizeF spacing, bool relative)
+void Bars3dController::setBarSpecs(GLfloat thicknessRatio, const QSizeF &spacing, bool relative)
 {
     m_barThicknessRatio = thicknessRatio;
     m_barSpacing        = spacing;
diff --git a/src/datavis3d/engine/bars3dcontroller_p.h b/src/datavis3d/engine/bars3dcontroller_p.h
index 60fd2c35..f7016860 100644
--- a/src/datavis3d/engine/bars3dcontroller_p.h
+++ b/src/datavis3d/engine/bars3dcontroller_p.h
@@ -102,7 +102,7 @@ public:
     // y -component sets the thickness/spacing of z -direction
     // With relative 0.0f means side-to-side, 1.0f = one thickness in between
     void setBarSpecs(GLfloat thicknessRatio = 1.0f,
-                     QSizeF spacing = QSizeF(1.0, 1.0),
+                     const QSizeF &spacing = QSizeF(1.0, 1.0),
                      bool relative = true);
     GLfloat barThickness();
     QSizeF barSpacing();
diff --git a/src/datavis3d/engine/maps3dcontroller.cpp b/src/datavis3d/engine/maps3dcontroller.cpp
index 253b774a..9157fa6f 100644
--- a/src/datavis3d/engine/maps3dcontroller.cpp
+++ b/src/datavis3d/engine/maps3dcontroller.cpp
@@ -1234,7 +1234,8 @@ void Maps3DController::setTheme(QDataVis::ColorTheme colorTheme)
     m_updateLabels = true;
 }
 
-void Maps3DController::setBarColor(QColor baseColor, QColor heightColor, bool uniform)
+void Maps3DController::setBarColor(const QColor &baseColor, const QColor &heightColor,
+                                   bool uniform)
 {
     m_theme->m_baseColor = baseColor;
     m_theme->m_heightColor = heightColor;
diff --git a/src/datavis3d/engine/maps3dcontroller_p.h b/src/datavis3d/engine/maps3dcontroller_p.h
index d0c2e74e..8011cf9a 100644
--- a/src/datavis3d/engine/maps3dcontroller_p.h
+++ b/src/datavis3d/engine/maps3dcontroller_p.h
@@ -103,7 +103,7 @@ public:
     void setTheme(QDataVis::ColorTheme theme);
 
     // Set color if you don't want to use themes. Set uniform to false if you want the (height) color to change from bottom to top
-    void setBarColor(QColor baseColor, QColor heightColor, bool uniform = true);
+    void setBarColor(const QColor &baseColor, const QColor &heightColor, bool uniform = true);
 
     // Set area specs
     void setAreaSpecs(const QRect &areaRect, const QImage &image);
diff --git a/src/datavis3d/engine/q3dbars.cpp b/src/datavis3d/engine/q3dbars.cpp
index 73df356b..058b0be1 100644
--- a/src/datavis3d/engine/q3dbars.cpp
+++ b/src/datavis3d/engine/q3dbars.cpp
@@ -200,7 +200,7 @@ void Q3DBars::setHeight(const int height)
  * thickness. If it is true, value of 0.0 means the bars are side-to-side and for example 1.0 means
  * there is one thickness in between the bars. It is \c true by default.
  */
-void Q3DBars::setBarSpecs(qreal thicknessRatio, QSizeF spacing, bool relative)
+void Q3DBars::setBarSpecs(qreal thicknessRatio, const QSizeF &spacing, bool relative)
 {
     d_ptr->m_shared->setBarSpecs(GLfloat(thicknessRatio), spacing, relative);
 }
@@ -281,7 +281,8 @@ void Q3DBars::setTheme(QDataVis::ColorTheme theme)
  *
  * \warning This method is subject to change.
  */
-void Q3DBars::setBarColor(QColor baseColor, QColor heightColor, QColor depthColor, bool uniform)
+void Q3DBars::setBarColor(const QColor &baseColor, const QColor &heightColor,
+                          const QColor &depthColor, bool uniform)
 {
     d_ptr->m_shared->setObjectColor(baseColor, heightColor, depthColor, uniform);
 }
@@ -303,21 +304,6 @@ QDataVis::SelectionMode Q3DBars::selectionMode() const
 }
 
 /*!
- * \property Q3DBars::windowTitle
- *
- * Sets the window \a title. The default is application executable name.
- */
-void Q3DBars::setWindowTitle(const QString &title)
-{
-    setTitle(title);
-}
-
-QString Q3DBars::windowTitle() const
-{
-    return title();
-}
-
-/*!
  * Override bar type with a mesh object located in \a objFileName.
  * \note Object needs to be in Wavefront obj format and include vertices, normals and UVs.
  * It also needs to be in triangles.
diff --git a/src/datavis3d/engine/q3dbars.h b/src/datavis3d/engine/q3dbars.h
index 2b217085..c78fa2ec 100644
--- a/src/datavis3d/engine/q3dbars.h
+++ b/src/datavis3d/engine/q3dbars.h
@@ -36,7 +36,6 @@ class QT_DATAVIS3D_EXPORT Q3DBars : public Q3DWindow
     Q_PROPERTY(QtDataVis3D::QDataVis::SelectionMode selectionMode READ selectionMode WRITE setSelectionMode)
     Q_PROPERTY(QtDataVis3D::QDataVis::LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency)
     Q_PROPERTY(QtDataVis3D::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality NOTIFY shadowQualityChanged)
-    Q_PROPERTY(QString windowTitle READ windowTitle WRITE setWindowTitle)
     Q_PROPERTY(QFont font READ font WRITE setFont)
     Q_PROPERTY(float fontSize READ fontSize WRITE setFontSize)
     Q_PROPERTY(bool gridVisible READ isGridVisible WRITE setGridVisible)
@@ -51,7 +50,7 @@ public:
     ~Q3DBars();
 
     void setBarSpecs(qreal thicknessRatio = 1.0,
-                     QSizeF spacing = QSizeF(1.0, 1.0),
+                     const QSizeF &spacing = QSizeF(1.0, 1.0),
                      bool relative = true);
 
     void setBarType(QDataVis::MeshStyle style, bool smooth = false);
@@ -66,7 +65,7 @@ public:
 
     void setTheme(QDataVis::ColorTheme theme);
 
-    void setBarColor(QColor baseColor, QColor heightColor, QColor depthColor,
+    void setBarColor(const QColor &baseColor, const QColor &heightColor, const QColor &depthColor,
                      bool uniform = true);
 
     void setMeshFileName(const QString &objFileName);
@@ -74,9 +73,6 @@ public:
     void setSelectionMode(QDataVis::SelectionMode mode);
     QDataVis::SelectionMode selectionMode() const;
 
-    void setWindowTitle(const QString &title);
-    QString windowTitle() const;
-
     void setFontSize(float fontsize);
     float fontSize();
 
diff --git a/src/datavis3d/engine/q3dmaps.cpp b/src/datavis3d/engine/q3dmaps.cpp
index ffa5ed1b..8bb93ad2 100644
--- a/src/datavis3d/engine/q3dmaps.cpp
+++ b/src/datavis3d/engine/q3dmaps.cpp
@@ -170,7 +170,7 @@ void Q3DMaps::setTheme(QDataVis::ColorTheme theme)
     d_ptr->m_shared->setTheme(theme);
 }
 
-void Q3DMaps::setBarColor(QColor baseColor, QColor heightColor, bool uniform)
+void Q3DMaps::setBarColor(const QColor &baseColor, const QColor &heightColor, bool uniform)
 {
     d_ptr->m_shared->setBarColor(baseColor, heightColor, uniform);
 }
@@ -195,16 +195,6 @@ QDataVis::SelectionMode Q3DMaps::selectionMode() const
     return d_ptr->m_shared->selectionMode();
 }
 
-void Q3DMaps::setWindowTitle(const QString &title)
-{
-    setTitle(title);
-}
-
-QString Q3DMaps::windowTitle() const
-{
-    return title();
-}
-
 void Q3DMaps::setFontSize(float fontsize)
 {
     d_ptr->m_shared->setFontSize(fontsize);
diff --git a/src/datavis3d/engine/q3dmaps.h b/src/datavis3d/engine/q3dmaps.h
index 195b91e0..e911995f 100644
--- a/src/datavis3d/engine/q3dmaps.h
+++ b/src/datavis3d/engine/q3dmaps.h
@@ -37,7 +37,6 @@ class QMapDataProxy;
 class QT_DATAVIS3D_EXPORT Q3DMaps : public Q3DWindow
 {
     Q_OBJECT
-    Q_PROPERTY(QString windowTitle READ windowTitle WRITE setWindowTitle)
     Q_PROPERTY(QFont font READ font WRITE setFont)
     Q_PROPERTY(float fontSize READ fontSize WRITE setFontSize)
 
@@ -82,7 +81,7 @@ public:
     void setTheme(QDataVis::ColorTheme theme);
 
     // Set color if you don't want to use themes. Set uniform to false if you want the (height) color to change from bottom to top
-    void setBarColor(QColor baseColor, QColor heightColor, bool uniform = true);
+    void setBarColor(const QColor &baseColor, const QColor &heightColor, bool uniform = true);
 
     // Set area specs
     void setAreaSpecs(const QRect &areaRect, const QImage &image);
@@ -96,10 +95,6 @@ public:
     void setSelectionMode(QDataVis::SelectionMode mode);
     QDataVis::SelectionMode selectionMode() const;
 
-    // Set window title
-    void setWindowTitle(const QString &title);
-    QString windowTitle() const;
-
     // Font size adjustment
     void setFontSize(float fontsize);
     float fontSize() const;
diff --git a/src/datavis3d/engine/q3dscatter.cpp b/src/datavis3d/engine/q3dscatter.cpp
index 7585c08c..e4f44d78 100644
--- a/src/datavis3d/engine/q3dscatter.cpp
+++ b/src/datavis3d/engine/q3dscatter.cpp
@@ -241,7 +241,8 @@ void Q3DScatter::setTheme(QDataVis::ColorTheme theme)
  *
  * \warning This method is subject to change.
  */
-void Q3DScatter::setObjectColor(QColor baseColor, QColor heightColor, QColor depthColor, bool uniform)
+void Q3DScatter::setObjectColor(const QColor &baseColor, const QColor &heightColor,
+                                const QColor &depthColor, bool uniform)
 {
     d_ptr->m_shared->setObjectColor(baseColor, heightColor, depthColor, uniform);
 }
@@ -263,21 +264,6 @@ QDataVis::SelectionMode Q3DScatter::selectionMode() const
 }
 
 /*!
- * \property Q3DScatter::windowTitle
- *
- * Sets the window \a title. The default is application executable name.
- */
-void Q3DScatter::setWindowTitle(const QString &title)
-{
-    setTitle(title);
-}
-
-QString Q3DScatter::windowTitle() const
-{
-    return title();
-}
-
-/*!
  * Override item type with a mesh object located in \a objFileName.
  * \note Object needs to be in Wavefront obj format and include vertices, normals and UVs.
  * It also needs to be in triangles.
diff --git a/src/datavis3d/engine/q3dscatter.h b/src/datavis3d/engine/q3dscatter.h
index 4f4cf5e0..dfb386ca 100644
--- a/src/datavis3d/engine/q3dscatter.h
+++ b/src/datavis3d/engine/q3dscatter.h
@@ -37,7 +37,6 @@ class QT_DATAVIS3D_EXPORT Q3DScatter : public Q3DWindow
     Q_PROPERTY(QtDataVis3D::QDataVis::SelectionMode selectionMode READ selectionMode WRITE setSelectionMode)
     Q_PROPERTY(QtDataVis3D::QDataVis::LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency)
     Q_PROPERTY(QtDataVis3D::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality)
-    Q_PROPERTY(QString windowTitle READ windowTitle WRITE setWindowTitle)
     Q_PROPERTY(QFont font READ font WRITE setFont)
     Q_PROPERTY(float fontSize READ fontSize WRITE setFontSize)
     Q_PROPERTY(bool gridVisible READ isGridVisible WRITE setGridVisible)
@@ -58,17 +57,14 @@ public:
 
     void setTheme(QDataVis::ColorTheme theme);
 
-    void setObjectColor(QColor baseColor, QColor heightColor, QColor depthColor,
-                        bool uniform = true);
+    void setObjectColor(const QColor &baseColor, const QColor &heightColor,
+                        const QColor &depthColor, bool uniform = true);
 
     void setMeshFileName(const QString &objFileName);
 
     void setSelectionMode(QDataVis::SelectionMode mode);
     QDataVis::SelectionMode selectionMode() const;
 
-    void setWindowTitle(const QString &title);
-    QString windowTitle() const;
-
     void setFontSize(float fontsize);
     float fontSize() const;