Public slot and const ref changes

Task-number: QTRD-2211

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

10 files changed, 38 insertions, 46 deletions

diff --git a/src/datavis3d/data/qitemmodelbardatamapping.cpp b/src/datavis3d/data/qitemmodelbardatamapping.cpp
index e549d2d3..55c5b406 100644
--- a/src/datavis3d/data/qitemmodelbardatamapping.cpp
+++ b/src/datavis3d/data/qitemmodelbardatamapping.cpp
@@ -162,7 +162,7 @@ void QItemModelBarDataMapping::setRowCategories(const QStringList &categories)
     emit mappingChanged();
 }
 
-const QStringList &QItemModelBarDataMapping::rowCategories() const
+QStringList QItemModelBarDataMapping::rowCategories() const
 {
     return d_ptr->m_rowCategories;
 }
@@ -178,7 +178,7 @@ void QItemModelBarDataMapping::setColumnCategories(const QStringList &categories
     emit mappingChanged();
 }
 
-const QStringList &QItemModelBarDataMapping::columnCategories() const
+QStringList QItemModelBarDataMapping::columnCategories() const
 {
     return d_ptr->m_columnCategories;
 }
diff --git a/src/datavis3d/data/qitemmodelbardatamapping.h b/src/datavis3d/data/qitemmodelbardatamapping.h
index 424a9c30..0c03fe74 100644
--- a/src/datavis3d/data/qitemmodelbardatamapping.h
+++ b/src/datavis3d/data/qitemmodelbardatamapping.h
@@ -57,9 +57,9 @@ public:
     QString valueRole() const;
 
     void setRowCategories(const QStringList &categories);
-    const QStringList &rowCategories() const;
+    QStringList rowCategories() const;
     void setColumnCategories(const QStringList &categories);
-    const QStringList &columnCategories() const;
+    QStringList columnCategories() const;
 
     void remap(const QString &rowRole, const QString &columnRole,
                const QString &valueRole, const QStringList &rowCategories,
diff --git a/src/datavis3d/data/qscatterdataitem.cpp b/src/datavis3d/data/qscatterdataitem.cpp
index b2bfec3f..c2926811 100644
--- a/src/datavis3d/data/qscatterdataitem.cpp
+++ b/src/datavis3d/data/qscatterdataitem.cpp
@@ -94,7 +94,7 @@ void QScatterDataItem::setPosition(const QVector3D &position)
 /*!
  * \return position of this data item.
  */
-const QVector3D &QScatterDataItem::position() const
+QVector3D QScatterDataItem::position() const
 {
     return m_position;
 }
diff --git a/src/datavis3d/data/qscatterdataitem.h b/src/datavis3d/data/qscatterdataitem.h
index 82383ae6..96a33eb2 100644
--- a/src/datavis3d/data/qscatterdataitem.h
+++ b/src/datavis3d/data/qscatterdataitem.h
@@ -37,7 +37,7 @@ public:
     QScatterDataItem &operator=(const QScatterDataItem &other);
 
     void setPosition(const QVector3D &position);
-    const QVector3D &position() const;
+    QVector3D position() const;
 
     //void setSize(qreal size);
     //qreal size() const;
diff --git a/src/datavis3d/engine/q3dbars.cpp b/src/datavis3d/engine/q3dbars.cpp
index eb157634..cf196ac8 100644
--- a/src/datavis3d/engine/q3dbars.cpp
+++ b/src/datavis3d/engine/q3dbars.cpp
@@ -85,8 +85,6 @@ Q3DBars::Q3DBars()
     : d_ptr(new Q3DBarsPrivate(this, geometry()))
 {
     d_ptr->m_shared->initializeOpenGL();
-    QObject::connect(d_ptr->m_shared, &Abstract3DController::shadowQualityChanged, this,
-                     &Q3DBars::handleShadowQualityUpdate);
     QObject::connect(d_ptr->m_shared, &Bars3dController::selectedBarPosChanged, this,
                      &Q3DBars::selectedBarPosChanged);
 }
@@ -107,14 +105,6 @@ void Q3DBars::render()
     d_ptr->m_shared->render();
 }
 
-/*!
- * \internal
- */
-void Q3DBars::handleShadowQualityUpdate(QDataVis::ShadowQuality quality)
-{
-    emit shadowQualityChanged(quality);
-}
-
 #if defined(Q_OS_ANDROID)
 /*!
  * \internal
@@ -415,7 +405,7 @@ QDataVis::ShadowQuality Q3DBars::shadowQuality() const
 /*!
  * \return category axis for rows.
  */
-QCategoryAxis *Q3DBars::rowAxis()
+QCategoryAxis *Q3DBars::rowAxis() const
 {
     return reinterpret_cast<QCategoryAxis *>(d_ptr->m_shared->axisX());
 }
@@ -423,7 +413,7 @@ QCategoryAxis *Q3DBars::rowAxis()
 /*!
  * \return category axis for columns.
  */
-QCategoryAxis *Q3DBars::columnAxis()
+QCategoryAxis *Q3DBars::columnAxis() const
 {
     return reinterpret_cast<QCategoryAxis *>(d_ptr->m_shared->axisZ());
 }
@@ -441,7 +431,7 @@ void Q3DBars::setValueAxis(QValueAxis *axis)
 /*!
  * \return used value axis (Y-axis).
  */
-QValueAxis *Q3DBars::valueAxis()
+QValueAxis *Q3DBars::valueAxis() const
 {
     return static_cast<QValueAxis *>(d_ptr->m_shared->axisY());
 }
@@ -466,6 +456,8 @@ Q3DBarsPrivate::Q3DBarsPrivate(Q3DBars *q, QRect rect)
     : q_ptr(q),
       m_shared(new Bars3dController(rect))
 {
+    QObject::connect(m_shared, &Abstract3DController::shadowQualityChanged, this,
+                     &Q3DBarsPrivate::handleShadowQualityUpdate);
 }
 
 Q3DBarsPrivate::~Q3DBarsPrivate()
@@ -474,4 +466,9 @@ Q3DBarsPrivate::~Q3DBarsPrivate()
     delete m_shared;
 }
 
+void Q3DBarsPrivate::handleShadowQualityUpdate(QDataVis::ShadowQuality quality)
+{
+    emit q_ptr->shadowQualityChanged(quality);
+}
+
 QT_DATAVIS3D_END_NAMESPACE
diff --git a/src/datavis3d/engine/q3dbars.h b/src/datavis3d/engine/q3dbars.h
index 8eb14690..ff6a6fad 100644
--- a/src/datavis3d/engine/q3dbars.h
+++ b/src/datavis3d/engine/q3dbars.h
@@ -93,18 +93,14 @@ public:
     void setShadowQuality(QDataVis::ShadowQuality quality);
     QDataVis::ShadowQuality shadowQuality() const;
 
-    QCategoryAxis *rowAxis();
-    QCategoryAxis *columnAxis();
+    QCategoryAxis *rowAxis() const;
+    QCategoryAxis *columnAxis() const;
     void setValueAxis(QValueAxis *axis);
-    QValueAxis *valueAxis();
+    QValueAxis *valueAxis() const;
 
     void setDataProxy(QBarDataProxy *proxy);
     QBarDataProxy *dataProxy();
 
-public slots:
-    // Used to detect when shadow quality changes autonomously due to e.g. resizing.
-    void handleShadowQualityUpdate(QDataVis::ShadowQuality quality);
-
 signals:
     void shadowQualityChanged(QDataVis::ShadowQuality quality);
     void selectedBarPosChanged(QPoint position);
diff --git a/src/datavis3d/engine/q3dbars_p.h b/src/datavis3d/engine/q3dbars_p.h
index 9eed8162..d98473e6 100644
--- a/src/datavis3d/engine/q3dbars_p.h
+++ b/src/datavis3d/engine/q3dbars_p.h
@@ -42,6 +42,9 @@ public:
     Q3DBarsPrivate(Q3DBars *q, QRect rect);
     ~Q3DBarsPrivate();
 
+    // Used to detect when shadow quality changes autonomously due to e.g. resizing.
+    void handleShadowQualityUpdate(QDataVis::ShadowQuality quality);
+
     Q3DBars *q_ptr;
     Bars3dController *m_shared;
 };
diff --git a/src/datavis3d/engine/q3dscatter.cpp b/src/datavis3d/engine/q3dscatter.cpp
index ae4fcb70..30a5eb81 100644
--- a/src/datavis3d/engine/q3dscatter.cpp
+++ b/src/datavis3d/engine/q3dscatter.cpp
@@ -78,8 +78,6 @@ Q3DScatter::Q3DScatter()
     : d_ptr(new Q3DScatterPrivate(this, geometry()))
 {
     d_ptr->m_shared->initializeOpenGL();
-    QObject::connect(d_ptr->m_shared, &Abstract3DController::shadowQualityChanged, this,
-                     &Q3DScatter::handleShadowQualityUpdate);
 }
 
 /*!
@@ -98,14 +96,6 @@ void Q3DScatter::render()
     d_ptr->m_shared->render();
 }
 
-/*!
- * \internal
- */
-void Q3DScatter::handleShadowQualityUpdate(QDataVis::ShadowQuality quality)
-{
-    emit shadowQualityChanged(quality);
-}
-
 #if defined(Q_OS_ANDROID)
 /*!
  * \internal
@@ -369,7 +359,7 @@ void Q3DScatter::setValueAxisX(QValueAxis *axis)
 /*!
  * \return used value axis (X-axis).
  */
-QValueAxis *Q3DScatter::valueAxisX()
+QValueAxis *Q3DScatter::valueAxisX() const
 {
     return static_cast<QValueAxis *>(d_ptr->m_shared->axisX());
 }
@@ -387,7 +377,7 @@ void Q3DScatter::setValueAxisY(QValueAxis *axis)
 /*!
  * \return used value axis (Y-axis).
  */
-QValueAxis *Q3DScatter::valueAxisY()
+QValueAxis *Q3DScatter::valueAxisY() const
 {
     return static_cast<QValueAxis *>(d_ptr->m_shared->axisY());
 }
@@ -405,7 +395,7 @@ void Q3DScatter::setValueAxisZ(QValueAxis *axis)
 /*!
  * \return used value axis (Z-axis).
  */
-QValueAxis *Q3DScatter::valueAxisZ()
+QValueAxis *Q3DScatter::valueAxisZ() const
 {
     return static_cast<QValueAxis *>(d_ptr->m_shared->axisZ());
 }
@@ -436,6 +426,8 @@ Q3DScatterPrivate::Q3DScatterPrivate(Q3DScatter *q, QRect rect)
     : q_ptr(q),
       m_shared(new Scatter3DController(rect))
 {
+    QObject::connect(m_shared, &Abstract3DController::shadowQualityChanged, this,
+                     &Q3DScatterPrivate::handleShadowQualityUpdate);
 }
 
 Q3DScatterPrivate::~Q3DScatterPrivate()
@@ -444,4 +436,9 @@ Q3DScatterPrivate::~Q3DScatterPrivate()
     delete m_shared;
 }
 
+void Q3DScatterPrivate::handleShadowQualityUpdate(QDataVis::ShadowQuality quality)
+{
+    emit q_ptr->shadowQualityChanged(quality);
+}
+
 QT_DATAVIS3D_END_NAMESPACE
diff --git a/src/datavis3d/engine/q3dscatter.h b/src/datavis3d/engine/q3dscatter.h
index bbc6dcec..2094bb5d 100644
--- a/src/datavis3d/engine/q3dscatter.h
+++ b/src/datavis3d/engine/q3dscatter.h
@@ -83,21 +83,17 @@ public:
     QDataVis::ShadowQuality shadowQuality() const;
 
     void setValueAxisX(QValueAxis *axis);
-    QValueAxis *valueAxisX();
+    QValueAxis *valueAxisX() const;
 
     void setValueAxisY(QValueAxis *axis);
-    QValueAxis *valueAxisY();
+    QValueAxis *valueAxisY() const;
 
     void setValueAxisZ(QValueAxis *axis);
-    QValueAxis *valueAxisZ();
+    QValueAxis *valueAxisZ() const;
 
     void setDataProxy(QScatterDataProxy *proxy);
     QScatterDataProxy *dataProxy();
 
-public slots:
-    // Used to detect when shadow quality changes autonomously due to e.g. resizing.
-    void handleShadowQualityUpdate(QDataVis::ShadowQuality quality);
-
 signals:
     void shadowQualityChanged(QDataVis::ShadowQuality quality);
 
diff --git a/src/datavis3d/engine/q3dscatter_p.h b/src/datavis3d/engine/q3dscatter_p.h
index ab2e2b06..435f6708 100644
--- a/src/datavis3d/engine/q3dscatter_p.h
+++ b/src/datavis3d/engine/q3dscatter_p.h
@@ -42,6 +42,9 @@ public:
     Q3DScatterPrivate(Q3DScatter *q, QRect rect);
     ~Q3DScatterPrivate();
 
+    // Used to detect when shadow quality changes autonomously due to e.g. resizing.
+    void handleShadowQualityUpdate(QDataVis::ShadowQuality quality);
+
     Q3DScatter *q_ptr;
     Scatter3DController *m_shared;
 };