summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2014-01-24 14:16:12 +0200
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2014-01-27 07:51:24 +0200
commit5e172211056437521ebbe6135661edaa486bee83 (patch)
tree826dafaf0a538ad302a5e8d30340505c1ad406ae
parent71b501d31ae7c5d3aab987b54acccecce1136896 (diff)
Add missing consts to public apis
Task-number: QTRD-2807 Change-Id: I74a6735ab37a8b3d97548adba99ca79ce2c7975c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
-rw-r--r--src/datavisualization/axis/qvalue3daxis.h7
-rw-r--r--src/datavisualization/engine/q3dbars.cpp18
-rw-r--r--src/datavisualization/engine/q3dbars.h10
-rw-r--r--src/datavisualization/engine/q3dscatter.cpp4
-rw-r--r--src/datavisualization/engine/q3dscatter.h2
-rw-r--r--src/datavisualization/engine/q3dsurface.cpp4
-rw-r--r--src/datavisualization/engine/q3dsurface.h2
-rw-r--r--src/datavisualization/input/qabstract3dinputhandler.cpp2
-rw-r--r--src/datavisualization/input/qabstract3dinputhandler.h2
9 files changed, 26 insertions, 25 deletions
diff --git a/src/datavisualization/axis/qvalue3daxis.h b/src/datavisualization/axis/qvalue3daxis.h
index d5d23825..1bb9cea3 100644
--- a/src/datavisualization/axis/qvalue3daxis.h
+++ b/src/datavisualization/axis/qvalue3daxis.h
@@ -36,13 +36,14 @@ public:
explicit QValue3DAxis(QObject *parent = 0);
virtual ~QValue3DAxis();
+ void setSegmentCount(int count);
int segmentCount() const;
- int subSegmentCount() const;
- QString labelFormat() const;
- void setSegmentCount(int count);
void setSubSegmentCount(int count);
+ int subSegmentCount() const;
+
void setLabelFormat(const QString &format);
+ QString labelFormat() const;
signals:
void segmentCountChanged(int count);
diff --git a/src/datavisualization/engine/q3dbars.cpp b/src/datavisualization/engine/q3dbars.cpp
index 1d86f8f0..8ffa5712 100644
--- a/src/datavisualization/engine/q3dbars.cpp
+++ b/src/datavisualization/engine/q3dbars.cpp
@@ -177,9 +177,9 @@ void Q3DBars::insertSeries(int index, QBar3DSeries *series)
/*!
* \return list of series added to this graph.
*/
-QList<QBar3DSeries *> Q3DBars::seriesList()
+QList<QBar3DSeries *> Q3DBars::seriesList() const
{
- return dptr()->m_shared->barSeriesList();
+ return dptrc()->m_shared->barSeriesList();
}
/*!
@@ -217,9 +217,9 @@ void Q3DBars::setBarThickness(float thicknessRatio)
}
}
-float Q3DBars::barThickness()
+float Q3DBars::barThickness() const
{
- return dptr()->m_shared->barThickness();
+ return dptrc()->m_shared->barThickness();
}
/*!
@@ -230,7 +230,7 @@ float Q3DBars::barThickness()
*
* \sa barSpacingRelative, multiSeriesUniform
*/
-void Q3DBars::setBarSpacing(QSizeF spacing)
+void Q3DBars::setBarSpacing(const QSizeF &spacing)
{
if (spacing != barSpacing()) {
dptr()->m_shared->setBarSpecs(GLfloat(barThickness()), spacing, isBarSpacingRelative());
@@ -238,9 +238,9 @@ void Q3DBars::setBarSpacing(QSizeF spacing)
}
}
-QSizeF Q3DBars::barSpacing()
+QSizeF Q3DBars::barSpacing() const
{
- return dptr()->m_shared->barSpacing();
+ return dptrc()->m_shared->barSpacing();
}
/*!
@@ -258,9 +258,9 @@ void Q3DBars::setBarSpacingRelative(bool relative)
}
}
-bool Q3DBars::isBarSpacingRelative()
+bool Q3DBars::isBarSpacingRelative() const
{
- return dptr()->m_shared->isBarSpecRelative();
+ return dptrc()->m_shared->isBarSpecRelative();
}
/*!
diff --git a/src/datavisualization/engine/q3dbars.h b/src/datavisualization/engine/q3dbars.h
index 636c5720..f9303e29 100644
--- a/src/datavisualization/engine/q3dbars.h
+++ b/src/datavisualization/engine/q3dbars.h
@@ -52,19 +52,19 @@ public:
void addSeries(QBar3DSeries *series);
void removeSeries(QBar3DSeries *series);
void insertSeries(int index, QBar3DSeries *series);
- QList<QBar3DSeries *> seriesList();
+ QList<QBar3DSeries *> seriesList() const;
void setMultiSeriesUniform(bool uniform);
bool isMultiSeriesUniform() const;
void setBarThickness(float thicknessRatio);
- float barThickness();
+ float barThickness() const;
- void setBarSpacing(QSizeF spacing);
- QSizeF barSpacing();
+ void setBarSpacing(const QSizeF &spacing);
+ QSizeF barSpacing() const;
void setBarSpacingRelative(bool relative);
- bool isBarSpacingRelative();
+ bool isBarSpacingRelative() const;
void setRowAxis(QCategory3DAxis *axis);
QCategory3DAxis *rowAxis() const;
diff --git a/src/datavisualization/engine/q3dscatter.cpp b/src/datavisualization/engine/q3dscatter.cpp
index 9af916cb..0279cd67 100644
--- a/src/datavisualization/engine/q3dscatter.cpp
+++ b/src/datavisualization/engine/q3dscatter.cpp
@@ -117,9 +117,9 @@ void Q3DScatter::removeSeries(QScatter3DSeries *series)
/*!
* \return list of series added to this graph.
*/
-QList<QScatter3DSeries *> Q3DScatter::seriesList()
+QList<QScatter3DSeries *> Q3DScatter::seriesList() const
{
- return dptr()->m_shared->scatterSeriesList();
+ return dptrc()->m_shared->scatterSeriesList();
}
Q3DScatterPrivate *Q3DScatter::dptr()
diff --git a/src/datavisualization/engine/q3dscatter.h b/src/datavisualization/engine/q3dscatter.h
index f9a67d76..9644c9cd 100644
--- a/src/datavisualization/engine/q3dscatter.h
+++ b/src/datavisualization/engine/q3dscatter.h
@@ -44,7 +44,7 @@ public:
void addSeries(QScatter3DSeries *series);
void removeSeries(QScatter3DSeries *series);
- QList<QScatter3DSeries *> seriesList();
+ QList<QScatter3DSeries *> seriesList() const;
void setAxisX(QValue3DAxis *axis);
QValue3DAxis *axisX() const;
diff --git a/src/datavisualization/engine/q3dsurface.cpp b/src/datavisualization/engine/q3dsurface.cpp
index 8ff46791..b1129320 100644
--- a/src/datavisualization/engine/q3dsurface.cpp
+++ b/src/datavisualization/engine/q3dsurface.cpp
@@ -132,9 +132,9 @@ void Q3DSurface::removeSeries(QSurface3DSeries *series)
*
* \note The surface graph currently supports only a single series at a time.
*/
-QList<QSurface3DSeries *> Q3DSurface::seriesList()
+QList<QSurface3DSeries *> Q3DSurface::seriesList() const
{
- return dptr()->m_shared->surfaceSeriesList();
+ return dptrc()->m_shared->surfaceSeriesList();
}
Q3DSurfacePrivate *Q3DSurface::dptr()
diff --git a/src/datavisualization/engine/q3dsurface.h b/src/datavisualization/engine/q3dsurface.h
index 772b0441..01db882b 100644
--- a/src/datavisualization/engine/q3dsurface.h
+++ b/src/datavisualization/engine/q3dsurface.h
@@ -42,7 +42,7 @@ public:
void addSeries(QSurface3DSeries *series);
void removeSeries(QSurface3DSeries *series);
- QList<QSurface3DSeries *> seriesList();
+ QList<QSurface3DSeries *> seriesList() const;
// Axes
void setAxisX(QValue3DAxis *axis);
diff --git a/src/datavisualization/input/qabstract3dinputhandler.cpp b/src/datavisualization/input/qabstract3dinputhandler.cpp
index b2d02596..012d975f 100644
--- a/src/datavisualization/input/qabstract3dinputhandler.cpp
+++ b/src/datavisualization/input/qabstract3dinputhandler.cpp
@@ -140,7 +140,7 @@ void QAbstract3DInputHandler::wheelEvent(QWheelEvent *event)
* Current enumerated input view based on the view of the processed input events.
* When the view changes inputViewChanged() is emitted.
*/
-QAbstract3DInputHandler::InputView QAbstract3DInputHandler::inputView()
+QAbstract3DInputHandler::InputView QAbstract3DInputHandler::inputView() const
{
return d_ptr->m_inputView;
}
diff --git a/src/datavisualization/input/qabstract3dinputhandler.h b/src/datavisualization/input/qabstract3dinputhandler.h
index 4824d78a..13ea56e5 100644
--- a/src/datavisualization/input/qabstract3dinputhandler.h
+++ b/src/datavisualization/input/qabstract3dinputhandler.h
@@ -54,7 +54,7 @@ public:
virtual void wheelEvent(QWheelEvent *event);
public:
- InputView inputView();
+ InputView inputView() const;
void setInputView(InputView inputView);
QPoint inputPosition() const;