From 9e86776df29cee9aa175cc53e2c4eb41839700c2 2012-05-12 12:18:47
From: Marek Rosa <marek.rosa@digia.com>
Date: 2012-05-12 12:18:47
Subject: [PATCH] Removed controlPoint function from SplineSeries Public API

---

diff --git a/src/splinechart/qsplineseries.cpp b/src/splinechart/qsplineseries.cpp
index aea7c8e..0d0c2f2 100644
--- a/src/splinechart/qsplineseries.cpp
+++ b/src/splinechart/qsplineseries.cpp
@@ -71,7 +71,7 @@ QSplineSeries::~QSplineSeries()
 {
     Q_D(QSplineSeries);
     if(d->m_dataset){
-           d->m_dataset->removeSeries(this);
+        d->m_dataset->removeSeries(this);
     }
 }
 
@@ -80,12 +80,6 @@ QAbstractSeries::SeriesType QSplineSeries::type() const
     return QAbstractSeries::SeriesTypeSpline;
 }
 
-QPointF QSplineSeries::controlPoint(int index) const
-{
-    Q_D(const QSplineSeries);
-    return d->m_controlPoints[index];
-}
-
 /*!
      Sets the \a modelX to be used as a data source for x coordinate and \a modelY to be used
      as a data source for y coordinate. The \a orientation parameter specifies whether the data
@@ -216,6 +210,13 @@ QVector<qreal> QSplineSeriesPrivate::firstControlPoints(const QVector<qreal>& ve
     return result;
 }
 
+QPointF QSplineSeriesPrivate::controlPoint(int index) const
+{
+    //    Q_D(const QSplineSeries);
+    //    return d->m_controlPoints[index];
+    return m_controlPoints[index];
+}
+
 /*!
   Updates the control points, besed on currently avaiable knots.
   */
diff --git a/src/splinechart/qsplineseries.h b/src/splinechart/qsplineseries.h
index 9399912..409d8d8 100644
--- a/src/splinechart/qsplineseries.h
+++ b/src/splinechart/qsplineseries.h
@@ -40,7 +40,7 @@ public:
     ~QSplineSeries();
     QAbstractSeries::SeriesType type() const;
 
-    QPointF controlPoint(int index) const;
+//    QPointF controlPoint(int index) const;
 
     void setModelMapping(int modelX, int modelY, Qt::Orientation orientation = Qt::Vertical);
     void setModelMappingRange(int first, int count = -1);
diff --git a/src/splinechart/qsplineseries_p.h b/src/splinechart/qsplineseries_p.h
index f369d42..f0753d4 100644
--- a/src/splinechart/qsplineseries_p.h
+++ b/src/splinechart/qsplineseries_p.h
@@ -42,6 +42,8 @@ public:
     Chart* createGraphics(ChartPresenter* presenter);
     QSplineSeriesPrivate(QSplineSeries* q);
 
+    QPointF controlPoint(int index) const;
+
 public Q_SLOTS:
     void updateControlPoints();
 
diff --git a/src/splinechart/splinechartitem.cpp b/src/splinechart/splinechartitem.cpp
index c5faf3c..72a3fd8 100644
--- a/src/splinechart/splinechartitem.cpp
+++ b/src/splinechart/splinechartitem.cpp
@@ -74,7 +74,8 @@ void SplineChartItem::updateLayout(QVector<QPointF> &oldPoints, QVector<QPointF>
 
 QPointF SplineChartItem::calculateGeometryControlPoint(int index) const
 {
-    return XYChartItem::calculateGeometryPoint(m_series->controlPoint(index));
+//    return XYChartItem::calculateGeometryPoint(m_series->controlPoint(index));
+    return XYChartItem::calculateGeometryPoint(m_series->d_func()->controlPoint(index));
 }
 
 void SplineChartItem::setLayout(QVector<QPointF> &points)