Const changes to public headers

Task-number: QTRD-2182

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

14 files changed, 58 insertions, 60 deletions

diff --git a/src/datavis3d/data/qbardataproxy.cpp b/src/datavis3d/data/qbardataproxy.cpp
index 651551cc..92975cb1 100644
--- a/src/datavis3d/data/qbardataproxy.cpp
+++ b/src/datavis3d/data/qbardataproxy.cpp
@@ -121,7 +121,7 @@ void QBarDataProxy::removeRows(int rowIndex, int removeCount)
 }
 
 // Mutexing data accessors should be done by user, if needed
-int QBarDataProxy::rowCount()
+int QBarDataProxy::rowCount() const
 {
     return dptrc()->m_dataArray.size();
 }
diff --git a/src/datavis3d/data/qbardataproxy.h b/src/datavis3d/data/qbardataproxy.h
index c3217483..a9696e1c 100644
--- a/src/datavis3d/data/qbardataproxy.h
+++ b/src/datavis3d/data/qbardataproxy.h
@@ -71,7 +71,7 @@ public:
     // If data is accessed from same thread that sets it, access doesn't need to be protected with mutex.
     // Row and item pointers are guaranteed to be valid only until next call that modifies data.
     // Array pointer is guaranteed to be valid for lifetime of proxy.
-    int rowCount();
+    int rowCount() const;
     const QBarDataArray *array() const;
     const QBarDataRow *rowAt(int rowIndex) const;
     const QBarDataItem *itemAt(int rowIndex, int columnIndex) const; // Row and column in said row need to exist or this crashes
diff --git a/src/datavis3d/data/qmapdataproxy.cpp b/src/datavis3d/data/qmapdataproxy.cpp
index 4e59f8a3..8c66157c 100644
--- a/src/datavis3d/data/qmapdataproxy.cpp
+++ b/src/datavis3d/data/qmapdataproxy.cpp
@@ -67,9 +67,9 @@ void QMapDataProxy::resetArray(QMapDataArray *newArray)
 
 
 // Mutexing data accessors should be done by user, if needed
-int QMapDataProxy::itemCount()
+int QMapDataProxy::itemCount() const
 {
-    return dptr()->m_dataArray.size();
+    return dptrc()->m_dataArray.size();
 }
 
 const QMapDataArray *QMapDataProxy::array() const
diff --git a/src/datavis3d/data/qmapdataproxy.h b/src/datavis3d/data/qmapdataproxy.h
index ea1d5b2c..d25e95e2 100644
--- a/src/datavis3d/data/qmapdataproxy.h
+++ b/src/datavis3d/data/qmapdataproxy.h
@@ -67,7 +67,7 @@ public:
     // If data is accessed from same thread that sets it, access doesn't need to be protected with mutex.
     // Item pointers are guaranteed to be valid only until next call that modifies data.
     // Array pointer is guaranteed to be valid for lifetime of proxy.
-    int itemCount();
+    int itemCount() const;
     const QMapDataArray *array() const;
     const QMapDataItem *itemAt(int index) const; // Index needs to exist or this crashes
 
diff --git a/src/datavis3d/data/qscatterdataproxy.cpp b/src/datavis3d/data/qscatterdataproxy.cpp
index 0c2c99f1..090a5e73 100644
--- a/src/datavis3d/data/qscatterdataproxy.cpp
+++ b/src/datavis3d/data/qscatterdataproxy.cpp
@@ -66,9 +66,9 @@ void QScatterDataProxy::resetArray(QScatterDataArray *newArray)
 }
 
 // Mutexing data accessors should be done by user, if needed
-int QScatterDataProxy::itemCount()
+int QScatterDataProxy::itemCount() const
 {
-    return dptr()->m_dataArray.size();
+    return dptrc()->m_dataArray.size();
 }
 
 const QScatterDataArray *QScatterDataProxy::array() const
diff --git a/src/datavis3d/data/qscatterdataproxy.h b/src/datavis3d/data/qscatterdataproxy.h
index e05ac1c8..d884bded 100644
--- a/src/datavis3d/data/qscatterdataproxy.h
+++ b/src/datavis3d/data/qscatterdataproxy.h
@@ -67,7 +67,7 @@ public:
     // If data is accessed from same thread that sets it, access doesn't need to be protected with mutex.
     // Item pointers are guaranteed to be valid only until next call that modifies data.
     // Array pointer is guaranteed to be valid for lifetime of proxy.
-    int itemCount();
+    int itemCount() const;
     const QScatterDataArray *array() const;
     const QScatterDataItem *itemAt(int index) const; // Index needs to exist or this crashes
 
diff --git a/src/datavis3d/engine/q3dbars.cpp b/src/datavis3d/engine/q3dbars.cpp
index f7688530..699fc05d 100644
--- a/src/datavis3d/engine/q3dbars.cpp
+++ b/src/datavis3d/engine/q3dbars.cpp
@@ -250,7 +250,7 @@ void Q3DBars::setupSampleSpace(int samplesRow, int samplesColumn)
     d_ptr->m_shared->setupSampleSpace(samplesRow, samplesColumn);
 }
 
-QSize Q3DBars::sampleSpace()
+QSize Q3DBars::sampleSpace() const
 {
     return QSize(d_ptr->m_shared->rowCount(), d_ptr->m_shared->columnCount());
 }
@@ -325,7 +325,7 @@ void Q3DBars::setSelectionMode(SelectionMode mode)
     d_ptr->m_shared->setSelectionMode(mode);
 }
 
-SelectionMode Q3DBars::selectionMode()
+SelectionMode Q3DBars::selectionMode() const
 {
     return d_ptr->m_shared->selectionMode();
 }
@@ -342,7 +342,7 @@ void Q3DBars::setWindowTitle(const QString &title)
     setTitle(title);
 }
 
-QString Q3DBars::windowTitle()
+QString Q3DBars::windowTitle() const
 {
     return title();
 }
@@ -387,7 +387,7 @@ void Q3DBars::setFont(const QFont &font)
     d_ptr->m_shared->setFont(font);
 }
 
-QFont Q3DBars::font()
+QFont Q3DBars::font() const
 {
     return d_ptr->m_shared->font();
 }
@@ -405,7 +405,7 @@ void Q3DBars::setLabelTransparency(LabelTransparency transparency)
     d_ptr->m_shared->setLabelTransparency(transparency);
 }
 
-LabelTransparency Q3DBars::labelTransparency()
+LabelTransparency Q3DBars::labelTransparency() const
 {
     return d_ptr->m_shared->labelTransparency();
 }
@@ -422,7 +422,7 @@ void Q3DBars::setGridVisible(bool visible)
     d_ptr->m_shared->setGridEnabled(visible);
 }
 
-bool Q3DBars::isGridVisible()
+bool Q3DBars::isGridVisible() const
 {
     return d_ptr->m_shared->gridEnabled();
 }
@@ -439,7 +439,7 @@ void Q3DBars::setBackgroundVisible(bool visible)
     d_ptr->m_shared->setBackgroundEnabled(visible);
 }
 
-bool Q3DBars::isBackgroundVisible()
+bool Q3DBars::isBackgroundVisible() const
 {
     return d_ptr->m_shared->backgroundEnabled();
 }
@@ -457,7 +457,7 @@ void Q3DBars::setShadowQuality(ShadowQuality quality)
     return d_ptr->m_shared->setShadowQuality(quality);
 }
 
-ShadowQuality Q3DBars::shadowQuality()
+ShadowQuality Q3DBars::shadowQuality() const
 {
     return d_ptr->m_shared->shadowQuality();
 }
diff --git a/src/datavis3d/engine/q3dbars.h b/src/datavis3d/engine/q3dbars.h
index aea82b9e..d4e0fce9 100644
--- a/src/datavis3d/engine/q3dbars.h
+++ b/src/datavis3d/engine/q3dbars.h
@@ -85,7 +85,7 @@ public:
     // how many samples per row and column, and names for axes
     // TODO: This defines the data window, needs additional parameters startRow, startColumn
     void setupSampleSpace(int samplesRow, int samplesColumn);
-    QSize sampleSpace(); // TODO: Return QRect once data window properly implemented?
+    QSize sampleSpace() const; // TODO: Return QRect once data window properly implemented?
 
     // Select preset camera placement
     void setCameraPreset(CameraPreset preset);
@@ -110,11 +110,11 @@ public:
 
     // Change selection mode; single bar, bar and row, bar and column, or all
     void setSelectionMode(SelectionMode mode);
-    SelectionMode selectionMode();
+    SelectionMode selectionMode() const;
 
     // Set window title
     void setWindowTitle(const QString &title);
-    QString windowTitle();
+    QString windowTitle() const;
 
     // Font size adjustment
     void setFontSize(float fontsize);
@@ -122,28 +122,27 @@ public:
 
     // Set font
     void setFont(const QFont &font);
-    QFont font();
+    QFont font() const;
 
     // Label transparency adjustment
     void setLabelTransparency(LabelTransparency transparency);
-    LabelTransparency labelTransparency();
+    LabelTransparency labelTransparency() const;
 
     // Enable or disable background grid
     void setGridVisible(bool visible);
-    bool isGridVisible();
+    bool isGridVisible() const;
 
-    // TODO: Do these need to be public? Where are they called from?
     // Size
     void setWidth(const int width);
     void setHeight(const int height);
 
     // Enable or disable background mesh
     void setBackgroundVisible(bool visible);
-    bool isBackgroundVisible();
+    bool isBackgroundVisible() const;
 
     // Adjust shadow quality
     void setShadowQuality(ShadowQuality quality);
-    ShadowQuality shadowQuality();
+    ShadowQuality shadowQuality() const;
 
     // Axes - row & column axes are fixed to category axes, value axis can be
     // customized.
diff --git a/src/datavis3d/engine/q3dmaps.cpp b/src/datavis3d/engine/q3dmaps.cpp
index d7c11540..dfee2cbf 100644
--- a/src/datavis3d/engine/q3dmaps.cpp
+++ b/src/datavis3d/engine/q3dmaps.cpp
@@ -213,7 +213,7 @@ void Q3DMaps::setSelectionMode(SelectionMode mode)
     d_ptr->m_shared->setSelectionMode(mode);
 }
 
-SelectionMode Q3DMaps::selectionMode()
+SelectionMode Q3DMaps::selectionMode() const
 {
     return d_ptr->m_shared->selectionMode();
 }
@@ -223,7 +223,7 @@ void Q3DMaps::setWindowTitle(const QString &title)
     setTitle(title);
 }
 
-QString Q3DMaps::windowTitle()
+QString Q3DMaps::windowTitle() const
 {
     return title();
 }
@@ -233,7 +233,7 @@ void Q3DMaps::setFontSize(float fontsize)
     d_ptr->m_shared->setFontSize(fontsize);
 }
 
-float Q3DMaps::fontSize()
+float Q3DMaps::fontSize() const
 {
     return d_ptr->m_shared->fontSize();
 }
@@ -243,7 +243,7 @@ void Q3DMaps::setFont(const QFont &font)
     d_ptr->m_shared->setFont(font);
 }
 
-QFont Q3DMaps::font()
+QFont Q3DMaps::font() const
 {
     return d_ptr->m_shared->font();
 }
@@ -253,7 +253,7 @@ void Q3DMaps::setLabelTransparency(LabelTransparency transparency)
     d_ptr->m_shared->setLabelTransparency(transparency);
 }
 
-LabelTransparency Q3DMaps::labelTransparency()
+LabelTransparency Q3DMaps::labelTransparency() const
 {
     return d_ptr->m_shared->labelTransparency();
 }
@@ -263,7 +263,7 @@ ShadowQuality Q3DMaps::setShadowQuality(ShadowQuality quality)
     return d_ptr->m_shared->setShadowQuality(quality);
 }
 
-ShadowQuality Q3DMaps::shadowQuality()
+ShadowQuality Q3DMaps::shadowQuality() const
 {
     return d_ptr->m_shared->shadowQuality();
 }
diff --git a/src/datavis3d/engine/q3dmaps.h b/src/datavis3d/engine/q3dmaps.h
index 94233763..96707631 100644
--- a/src/datavis3d/engine/q3dmaps.h
+++ b/src/datavis3d/engine/q3dmaps.h
@@ -117,27 +117,27 @@ public:
 
     // Change selection mode; single bar, bar and row, bar and column, or all
     void setSelectionMode(SelectionMode mode);
-    SelectionMode selectionMode();
+    SelectionMode selectionMode() const;
 
     // Set window title
     void setWindowTitle(const QString &title);
-    QString windowTitle();
+    QString windowTitle() const;
 
     // Font size adjustment
     void setFontSize(float fontsize);
-    float fontSize();
+    float fontSize() const;
 
     // Set font
     void setFont(const QFont &font);
-    QFont font();
+    QFont font() const;
 
     // Label transparency adjustment
     void setLabelTransparency(LabelTransparency transparency);
-    LabelTransparency labelTransparency();
+    LabelTransparency labelTransparency() const;
 
     // Adjust shadow quality
     ShadowQuality setShadowQuality(ShadowQuality quality);
-    ShadowQuality shadowQuality();
+    ShadowQuality shadowQuality() const;
 
     // Sets the data proxy. Assumes ownership of the data proxy. Deletes old proxy.
     void setDataProxy(QMapDataProxy *proxy);
diff --git a/src/datavis3d/engine/q3dscatter.cpp b/src/datavis3d/engine/q3dscatter.cpp
index 9705decd..0d4aac28 100644
--- a/src/datavis3d/engine/q3dscatter.cpp
+++ b/src/datavis3d/engine/q3dscatter.cpp
@@ -287,7 +287,7 @@ void Q3DScatter::setSelectionMode(SelectionMode mode)
     d_ptr->m_shared->setSelectionMode(mode);
 }
 
-SelectionMode Q3DScatter::selectionMode()
+SelectionMode Q3DScatter::selectionMode() const
 {
     return d_ptr->m_shared->selectionMode();
 }
@@ -304,7 +304,7 @@ void Q3DScatter::setWindowTitle(const QString &title)
     setTitle(title);
 }
 
-QString Q3DScatter::windowTitle()
+QString Q3DScatter::windowTitle() const
 {
     return title();
 }
@@ -332,7 +332,7 @@ void Q3DScatter::setFontSize(float fontsize)
     d_ptr->m_shared->setFontSize(fontsize);
 }
 
-float Q3DScatter::fontSize()
+float Q3DScatter::fontSize() const
 {
     return d_ptr->m_shared->fontSize();
 }
@@ -349,7 +349,7 @@ void Q3DScatter::setFont(const QFont &font)
     d_ptr->m_shared->setFont(font);
 }
 
-QFont Q3DScatter::font()
+QFont Q3DScatter::font() const
 {
     return d_ptr->m_shared->font();
 }
@@ -367,7 +367,7 @@ void Q3DScatter::setLabelTransparency(LabelTransparency transparency)
     d_ptr->m_shared->setLabelTransparency(transparency);
 }
 
-LabelTransparency Q3DScatter::labelTransparency()
+LabelTransparency Q3DScatter::labelTransparency() const
 {
     return d_ptr->m_shared->labelTransparency();
 }
@@ -384,7 +384,7 @@ void Q3DScatter::setGridVisible(bool visible)
     d_ptr->m_shared->setGridEnabled(visible);
 }
 
-bool Q3DScatter::isGridVisible()
+bool Q3DScatter::isGridVisible() const
 {
     return d_ptr->m_shared->gridEnabled();
 }
@@ -401,7 +401,7 @@ void Q3DScatter::setBackgroundVisible(bool visible)
     d_ptr->m_shared->setBackgroundEnabled(visible);
 }
 
-bool Q3DScatter::isBackgroundVisible()
+bool Q3DScatter::isBackgroundVisible() const
 {
     return d_ptr->m_shared->backgroundEnabled();
 }
@@ -419,7 +419,7 @@ void Q3DScatter::setShadowQuality(ShadowQuality quality)
     return d_ptr->m_shared->setShadowQuality(quality);
 }
 
-ShadowQuality Q3DScatter::shadowQuality()
+ShadowQuality Q3DScatter::shadowQuality() const
 {
     return d_ptr->m_shared->shadowQuality();
 }
diff --git a/src/datavis3d/engine/q3dscatter.h b/src/datavis3d/engine/q3dscatter.h
index 685010a1..ec7044bd 100644
--- a/src/datavis3d/engine/q3dscatter.h
+++ b/src/datavis3d/engine/q3dscatter.h
@@ -110,40 +110,39 @@ public:
 
     // Change selection mode; single bar, bar and row, bar and column, or all
     void setSelectionMode(SelectionMode mode);
-    SelectionMode selectionMode();
+    SelectionMode selectionMode() const;
 
     // Set window title
     void setWindowTitle(const QString &title);
-    QString windowTitle();
+    QString windowTitle() const;
 
     // Font size adjustment
     void setFontSize(float fontsize);
-    float fontSize();
+    float fontSize() const;
 
     // Set font
     void setFont(const QFont &font);
-    QFont font();
+    QFont font() const;
 
     // Label transparency adjustment
     void setLabelTransparency(LabelTransparency transparency);
-    LabelTransparency labelTransparency();
+    LabelTransparency labelTransparency() const;
 
     // Enable or disable background grid
     void setGridVisible(bool visible);
-    bool isGridVisible();
+    bool isGridVisible() const;
 
-    // TODO: Do these need to be public? Where are they called from?
     // Size
     void setWidth(const int width);
     void setHeight(const int height);
 
     // Enable or disable background mesh
     void setBackgroundVisible(bool visible);
-    bool isBackgroundVisible();
+    bool isBackgroundVisible() const;
 
     // Adjust shadow quality
     void setShadowQuality(ShadowQuality quality);
-    ShadowQuality shadowQuality();
+    ShadowQuality shadowQuality() const;
 
     // Axes
     void setValueAxisX(QValueAxis *axis);
diff --git a/src/datavis3d/engine/q3dsurface.cpp b/src/datavis3d/engine/q3dsurface.cpp
index 49a61e8e..248458e9 100644
--- a/src/datavis3d/engine/q3dsurface.cpp
+++ b/src/datavis3d/engine/q3dsurface.cpp
@@ -104,7 +104,7 @@ void Q3DSurface::setSmoothSurface(bool enable)
     d_ptr->m_shared->setSmoothSurface(enable);
 }
 
-bool Q3DSurface::smoothSurface()
+bool Q3DSurface::smoothSurface() const
 {
     return d_ptr->m_shared->smoothSurface();
 }
@@ -114,7 +114,7 @@ void Q3DSurface::setSurfaceGrid(bool enable)
     d_ptr->m_shared->setSurfaceGrid(enable);
 }
 
-bool Q3DSurface::surfaceGrid()
+bool Q3DSurface::surfaceGrid() const
 {
     return d_ptr->m_shared->surfaceGrid();
 }
@@ -159,7 +159,7 @@ void Q3DSurface::appendSeries(QList<qreal> series, int width, int depth )
     d_ptr->m_shared->setData(series, width, depth);
 }
 
-void Q3DSurface::showData()
+void Q3DSurface::showData() const
 {
     for (int i = 0; i < d_ptr->numOfSeries(); i++) {
         QList<qreal> s = d_ptr->seriesAt(i);
diff --git a/src/datavis3d/engine/q3dsurface.h b/src/datavis3d/engine/q3dsurface.h
index c8f0fb5a..d9e5fe1f 100644
--- a/src/datavis3d/engine/q3dsurface.h
+++ b/src/datavis3d/engine/q3dsurface.h
@@ -61,11 +61,11 @@ public:
 
     // Enable or disable the smoothes of the surface
     void setSmoothSurface(bool enable);
-    bool smoothSurface();
+    bool smoothSurface() const;
 
     // Enable or disable the grid on the surface
     void setSurfaceGrid(bool enable);
-    bool surfaceGrid();
+    bool surfaceGrid() const;
 
     void setGradientColorAt(qreal pos, const QColor &color);
 
@@ -76,7 +76,7 @@ public:
 
 //TODO part
     void appendSeries(QList<qreal> series, int width, int depth);
-    void showData();
+    void showData() const;
 //END TODO
 
     // TODO: Do these need to be public? Where are they called from?