From 6d8ed28d1429b9e2957e13e84b2c17708e6b0cc9 2012-07-03 10:20:04
From: sauimone <samu.uimonen@digia.com>
Date: 2012-07-03 10:20:04
Subject: [PATCH] Removed QPointF from QBarSet

---

diff --git a/examples/examples.pro b/examples/examples.pro
index 8a92c8c..b89c21a 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -6,7 +6,6 @@ CURRENTLY_BUILDING_COMPONENTS = "examples"
 TEMPLATE = subdirs
 SUBDIRS += \
            areachart \
-           barchart \
            #customchart \
            linechart \
            percentbarchart \
diff --git a/examples/legend/mainwidget.cpp b/examples/legend/mainwidget.cpp
index 9e31f5b..6e65039 100644
--- a/examples/legend/mainwidget.cpp
+++ b/examples/legend/mainwidget.cpp
@@ -25,7 +25,7 @@
 #include <QLabel>
 #include <QDebug>
 #include <QBarSet>
-#include <QBarSeries>
+#include <QGroupedBarSeries>
 #include <QLegend>
 #include <QFormLayout>
 
@@ -118,7 +118,7 @@ MainWidget::MainWidget(QWidget *parent) :
 
 void MainWidget::createSeries()
 {
-    m_series = new QBarSeries();
+    m_series = new QGroupedBarSeries();
     addBarset();
     addBarset();
     addBarset();
@@ -196,7 +196,7 @@ void MainWidget::addBarset()
 {
     QBarSet *barSet = new QBarSet(QString("set ") + QString::number(m_series->count()));
     qreal delta = m_series->count() * 0.1;
-    *barSet << QPointF(0.0 + delta, 1 + delta) << QPointF(1.0 + delta, 2 + delta) << QPointF(2.0 + delta, 3 + delta) << QPointF(3.0 + delta, 4 + delta);
+    *barSet << 1 + delta << 2 + delta << 3 + delta << 4 + delta;
     m_series->append(barSet);
 }
 
diff --git a/examples/legend/mainwidget.h b/examples/legend/mainwidget.h
index e0b2fbd..f410185 100644
--- a/examples/legend/mainwidget.h
+++ b/examples/legend/mainwidget.h
@@ -30,7 +30,7 @@
 #include <QGraphicsGridLayout>
 #include <QDoubleSpinBox>
 #include <QGroupBox>
-#include <QBarSeries>
+#include <QGroupedBarSeries>
 
 QTCOMMERCIALCHART_USE_NAMESPACE
 
@@ -66,7 +66,7 @@ public slots:
 private:
 
     QChart *m_chart;
-    QBarSeries *m_series;
+    QGroupedBarSeries *m_series;
 
     QChartView *m_chartView;
     QGridLayout *m_mainLayout;
diff --git a/plugins/declarative/declarativebarseries.cpp b/plugins/declarative/declarativebarseries.cpp
index 457d799..51c6689 100644
--- a/plugins/declarative/declarativebarseries.cpp
+++ b/plugins/declarative/declarativebarseries.cpp
@@ -57,8 +57,6 @@ void DeclarativeBarSet::setValues(QVariantList values)
     for (int i(0); i < values.count(); i++) {
         if (values.at(i).canConvert(QVariant::Double))
             QBarSet::append(values[i].toDouble());
-        else if (values.at(i).canConvert(QVariant::PointF))
-            QBarSet::append(values[i].toPointF());
     }
 }
 
diff --git a/plugins/declarative/declarativebarseries.h b/plugins/declarative/declarativebarseries.h
index d16fe59..6484466 100644
--- a/plugins/declarative/declarativebarseries.h
+++ b/plugins/declarative/declarativebarseries.h
@@ -47,11 +47,9 @@ public:
 
 public: // From QBarSet
     Q_INVOKABLE void append(qreal value) { QBarSet::append(value); }
-    Q_INVOKABLE void append(qreal x, qreal y) { QBarSet::append(QPointF(x, y)); }
     Q_INVOKABLE void remove(const int index, const int count = 1) { QBarSet::remove(index, count); }
     Q_INVOKABLE void replace(int index, qreal value) { QBarSet::replace(index, value); }
-    Q_INVOKABLE void replace(int index, qreal x, qreal y) { QBarSet::replace(index, QPointF(x, y)); }
-    Q_INVOKABLE QPointF at(int index) { return QBarSet::at(index); }
+    Q_INVOKABLE qreal at(int index) { return QBarSet::at(index); }
 
 Q_SIGNALS:
     void countChanged(int count);
diff --git a/src/barchart/barchartitem.cpp b/src/barchart/barchartitem.cpp
index 5ec48fb..305362d 100644
--- a/src/barchart/barchartitem.cpp
+++ b/src/barchart/barchartitem.cpp
@@ -83,30 +83,30 @@ QVector<QRectF> BarChartItem::calculateLayout()
     for (int category = 0; category < categoryCount; category++) {
         qreal yPos = height + scaleY * m_domainMinY + geometry().topLeft().y();
         for (int set = 0; set < setCount; set++) {
-            QBarSet* barSet = m_series->d_func()->barsetAt(set);
-            qreal xPos = (barSet->at(category).x() - m_domainMinX) * scaleX + m_rect.left() - barWidth/2;
-            qreal barHeight = barSet->at(category).y() * scaleY;
+            QBarSetPrivate* barSet = m_series->d_func()->barsetAt(set)->d_ptr.data();
+            qreal xPos = (barSet->m_values.at(category).x() - m_domainMinX) * scaleX + m_rect.left() - barWidth/2;
+            qreal barHeight = barSet->m_values.at(category).y() * scaleY;
 
             Bar* bar = m_bars.at(itemIndex);
             QRectF rect(xPos, yPos - barHeight, barWidth, barHeight);
 
             layout.append(rect);
-            bar->setPen(barSet->pen());
-            bar->setBrush(barSet->brush());
+            bar->setPen(barSet->m_pen);
+            bar->setBrush(barSet->m_brush);
             bar->setVisible(barsVisible);
 
             QGraphicsSimpleTextItem* label = m_labels.at(itemIndex);
 
-            if (!qFuzzyIsNull(barSet->at(category).y())) {
-                label->setText(QString::number(barSet->at(category).y()));
+            if (!qFuzzyIsNull(barSet->m_values.at(category).y())) {
+                label->setText(QString::number(barSet->m_values.at(category).y()));
             } else {
                 label->setText(QString(""));
             }
 
             label->setPos(xPos + (rect.width()/2 - label->boundingRect().width()/2)
                           ,yPos - barHeight/2 - label->boundingRect().height()/2);
-            label->setFont(barSet->labelFont());
-            label->setBrush(barSet->labelBrush());
+            label->setFont(barSet->m_labelFont);
+            label->setBrush(barSet->m_labelBrush);
 
             itemIndex++;
         }
diff --git a/src/barchart/groupedbarchartitem.cpp b/src/barchart/groupedbarchartitem.cpp
index bc462bc..d502da3 100644
--- a/src/barchart/groupedbarchartitem.cpp
+++ b/src/barchart/groupedbarchartitem.cpp
@@ -23,6 +23,7 @@
 #include "qbarset_p.h"
 #include "qbarseries_p.h"
 #include "qbarset.h"
+#include "qbarset_p.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
@@ -53,32 +54,32 @@ QVector<QRectF> GroupedBarChartItem::calculateLayout()
     for (int category = 0; category < categoryCount; category++) {
         qreal yPos = height + scaleY * m_domainMinY + geometry().topLeft().y();
         for (int set = 0; set < setCount; set++) {
-            QBarSet* barSet = m_series->d_func()->barsetAt(set);
+            QBarSetPrivate* barSet = m_series->d_func()->barsetAt(set)->d_ptr.data();
 
-            qreal xPos = (barSet->at(category).x() - m_domainMinX) * scaleX + m_rect.left();
+            qreal xPos = (barSet->m_values.at(category).x() - m_domainMinX) * scaleX + m_rect.left();
             xPos -= setCount*barWidth/2;
             xPos += set*barWidth;
-            qreal barHeight = barSet->at(category).y() * scaleY;
+            qreal barHeight = barSet->m_values.at(category).y() * scaleY;
             Bar* bar = m_bars.at(itemIndex);
 
             QRectF rect(xPos, yPos - barHeight, barWidth, barHeight);
             layout.append(rect);
-            bar->setPen(barSet->pen());
-            bar->setBrush(barSet->brush());
+            bar->setPen(barSet->m_pen);
+            bar->setBrush(barSet->m_brush);
             bar->setVisible(barsVisible);
 
             QGraphicsSimpleTextItem* label = m_labels.at(itemIndex);
 
-            if (!qFuzzyIsNull(barSet->at(category).y())) {
-                label->setText(QString::number(barSet->at(category).y()));
+            if (!qFuzzyIsNull(barSet->m_values.at(category).y())) {
+                label->setText(QString::number(barSet->m_values.at(category).y()));
             } else {
                 label->setText(QString(""));
             }
 
             label->setPos(xPos + (rect.width()/2 - label->boundingRect().width()/2)
                           ,yPos - barHeight/2 - label->boundingRect().height()/2);
-            label->setFont(barSet->labelFont());
-            label->setBrush(barSet->labelBrush());
+            label->setFont(barSet->m_labelFont);
+            label->setBrush(barSet->m_labelBrush);
 
             itemIndex++;
         }
diff --git a/src/barchart/percentbarchartitem.cpp b/src/barchart/percentbarchartitem.cpp
index 5a45e38..1b46c6c 100644
--- a/src/barchart/percentbarchartitem.cpp
+++ b/src/barchart/percentbarchartitem.cpp
@@ -23,6 +23,7 @@
 #include "qbarseries_p.h"
 #include "qbarset.h"
 #include "chartanimator_p.h"
+#include "qbarset_p.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
@@ -55,14 +56,14 @@ QVector<QRectF> PercentBarChartItem::calculateLayout()
         qreal percentage = (100 / colSum);
         qreal yPos = height + scaleY * m_domainMinY + geometry().topLeft().y();
         for (int set=0; set < setCount; set++) {
-            QBarSet* barSet = m_series->d_func()->barsetAt(set);
+            QBarSetPrivate* barSet = m_series->d_func()->barsetAt(set)->d_ptr.data();
 
-            qreal xPos = (barSet->at(category).x() - m_domainMinX) * scaleX + m_rect.left() - barWidth/2;
+            qreal xPos = (barSet->m_values.at(category).x() - m_domainMinX) * scaleX + m_rect.left() - barWidth/2;
 
-            qreal barHeight = barSet->at(category).y() * percentage * scaleY;
+            qreal barHeight = barSet->m_values.at(category).y() * percentage * scaleY;
             Bar* bar = m_bars.at(itemIndex);
-            bar->setPen(barSet->pen());
-            bar->setBrush(barSet->brush());
+            bar->setPen(barSet->m_pen);
+            bar->setBrush(barSet->m_brush);
             bar->setVisible(barsVisible);
 
             QRectF rect(xPos, yPos-barHeight, barWidth, barHeight);
@@ -82,8 +83,8 @@ QVector<QRectF> PercentBarChartItem::calculateLayout()
 
             label->setPos(xPos + (rect.width()/2 - label->boundingRect().width()/2)
                           ,yPos - barHeight/2 - label->boundingRect().height()/2);
-            label->setFont(barSet->labelFont());
-            label->setBrush(barSet->labelBrush());
+            label->setFont(barSet->m_labelFont);
+            label->setBrush(barSet->m_labelBrush);
 
             itemIndex++;
             yPos -= barHeight;
diff --git a/src/barchart/qbarmodelmapper.cpp b/src/barchart/qbarmodelmapper.cpp
index 5063476..6ef3ed6 100644
--- a/src/barchart/qbarmodelmapper.cpp
+++ b/src/barchart/qbarmodelmapper.cpp
@@ -416,7 +416,7 @@ void QBarModelMapperPrivate::barSetsAdded(QList<QBarSet*> sets)
     for(int i = firstIndex + m_firstBarSetSection; i < firstIndex + m_firstBarSetSection + sets.count(); i++) {
         m_model->setHeaderData(i, m_orientation == Qt::Vertical ? Qt::Horizontal : Qt::Vertical, sets.at(i - firstIndex - m_firstBarSetSection)->label());
         for (int j = 0; j < sets.at(i - firstIndex - m_firstBarSetSection)->count(); j++)
-            m_model->setData(barModelIndex(i, j), sets.at(i - firstIndex - m_firstBarSetSection)->at(j).y());
+            m_model->setData(barModelIndex(i, j), sets.at(i - firstIndex - m_firstBarSetSection)->at(j));
     }
     blockModelSignals(false);
     initializeBarFromModel();
@@ -465,7 +465,7 @@ void QBarModelMapperPrivate::valuesAdded(int index, int count)
         m_model->insertColumns(index + m_first, count);
 
     for (int j = index; j < index + count; j++)
-        m_model->setData(barModelIndex(barSetIndex + m_firstBarSetSection, j), m_barSets.at(barSetIndex)->at(j).y());
+        m_model->setData(barModelIndex(barSetIndex + m_firstBarSetSection, j), m_barSets.at(barSetIndex)->at(j));
 
     blockModelSignals(false);
     initializeBarFromModel();
@@ -510,7 +510,7 @@ void QBarModelMapperPrivate::barValueChanged(int index)
     int barSetIndex = m_barSets.indexOf(qobject_cast<QBarSet *>(QObject::sender()));
 
     blockModelSignals();
-    m_model->setData(barModelIndex(barSetIndex + m_firstBarSetSection, index), m_barSets.at(barSetIndex)->at(index).y());
+    m_model->setData(barModelIndex(barSetIndex + m_firstBarSetSection, index), m_barSets.at(barSetIndex)->at(index));
     blockModelSignals(false);
     initializeBarFromModel();
 }
diff --git a/src/barchart/qbarseries.cpp b/src/barchart/qbarseries.cpp
index 0b29cb2..26ac0ef 100644
--- a/src/barchart/qbarseries.cpp
+++ b/src/barchart/qbarseries.cpp
@@ -432,7 +432,7 @@ qreal QBarSeriesPrivate::min()
     for (int i = 0; i < m_barSets.count(); i++) {
         int categoryCount = m_barSets.at(i)->count();
         for (int j = 0; j < categoryCount; j++) {
-            qreal temp = m_barSets.at(i)->at(j).y();
+            qreal temp = m_barSets.at(i)->at(j);
             if (temp < min)
                 min = temp;
         }
@@ -450,7 +450,7 @@ qreal QBarSeriesPrivate::max()
     for (int i = 0; i < m_barSets.count(); i++) {
         int categoryCount = m_barSets.at(i)->count();
         for (int j = 0; j < categoryCount; j++) {
-            qreal temp = m_barSets.at(i)->at(j).y();
+            qreal temp = m_barSets.at(i)->at(j);
             if (temp > max)
                 max = temp;
         }
@@ -469,7 +469,7 @@ qreal QBarSeriesPrivate::valueAt(int set, int category)
         return 0;
     }
 
-    return m_barSets.at(set)->at(category).y();
+    return m_barSets.at(set)->at(category);
 }
 
 qreal QBarSeriesPrivate::percentageAt(int set, int category)
@@ -482,7 +482,7 @@ qreal QBarSeriesPrivate::percentageAt(int set, int category)
         return 0;
     }
 
-    qreal value = m_barSets.at(set)->at(category).y();
+    qreal value = m_barSets.at(set)->at(category);
     qreal sum = categorySum(category);
     if ( qFuzzyIsNull(sum) ) {
         return 0;
@@ -497,7 +497,7 @@ qreal QBarSeriesPrivate::categorySum(int category)
     int count = m_barSets.count(); // Count sets
     for (int set = 0; set < count; set++) {
         if (category < m_barSets.at(set)->count())
-            sum += m_barSets.at(set)->at(category).y();
+            sum += m_barSets.at(set)->at(category);
     }
     return sum;
 }
@@ -508,7 +508,7 @@ qreal QBarSeriesPrivate::absoluteCategorySum(int category)
     int count = m_barSets.count(); // Count sets
     for (int set = 0; set < count; set++) {
         if (category < m_barSets.at(set)->count())
-            sum += qAbs(m_barSets.at(set)->at(category).y());
+            sum += qAbs(m_barSets.at(set)->at(category));
     }
     return sum;
 }
@@ -535,7 +535,7 @@ qreal QBarSeriesPrivate::minX()
     for (int i = 0; i < m_barSets.count(); i++) {
         int categoryCount = m_barSets.at(i)->count();
         for (int j = 0; j < categoryCount; j++) {
-            qreal temp = m_barSets.at(i)->at(j).x();
+            qreal temp = m_barSets.at(i)->d_ptr.data()->m_values.at(j).x();
             if (temp < min)
                 min = temp;
         }
@@ -553,7 +553,7 @@ qreal QBarSeriesPrivate::maxX()
     for (int i = 0; i < m_barSets.count(); i++) {
         int categoryCount = m_barSets.at(i)->count();
         for (int j = 0; j < categoryCount; j++) {
-            qreal temp = m_barSets.at(i)->at(j).x();
+            qreal temp = m_barSets.at(i)->d_ptr.data()->m_values.at(j).x();
             if (temp > max)
                 max = temp;
         }
diff --git a/src/barchart/qbarset.cpp b/src/barchart/qbarset.cpp
index 9a89351..5c38f82 100644
--- a/src/barchart/qbarset.cpp
+++ b/src/barchart/qbarset.cpp
@@ -276,42 +276,17 @@ QString QBarSet::label() const
 }
 
 /*!
-    Appends a point to set. Parameter \a value x coordinate defines the
-    position in x-axis and y coordinate defines the height of bar.
-    Depending on presentation (QBarSeries, QGroupedBarSeries, QStackedBarSeries, QPercentBarSeries)
-    the x values are used or ignored.
-*/
-void QBarSet::append(const QPointF value)
-{
-    int index = d_ptr->m_values.count();
-    d_ptr->append(value);
-    emit valuesAdded(index, 1);
-}
-
-/*!
-    Appends a list of \a values to set. Works like append with single point.
-    \sa append()
-*/
-void QBarSet::append(const QList<QPointF> &values)
-{
-    int index = d_ptr->m_values.count();
-    d_ptr->append(values);
-    emit valuesAdded(index, values.count());
-}
-
-/*!
-    Appends new value \a value to the end of set. Internally the value is converted to QPointF,
-    with x coordinate being the index of appended value and y coordinate is the value.
+    Appends new value \a value to the end of set.
 */
 void QBarSet::append(const qreal value)
 {
-    // Convert to QPointF and use other append(QPointF) method.
-    append(QPointF(d_ptr->m_values.count(), value));
+    // Convert to QPointF
+    d_ptr->append(QPointF(d_ptr->m_values.count(), value));
 }
 
 /*!
     Appends a list of reals to set. Works like append with single real value. The \a values in list
-    are converted to QPointF, where x coordinate is the index of point and y coordinate is the value.
+    are appended to end of barset
     \sa append()
 */
 void QBarSet::append(const QList<qreal> &values)
@@ -327,17 +302,8 @@ void QBarSet::append(const QList<qreal> &values)
 */
 QBarSet& QBarSet::operator << (const qreal &value)
 {
-    append(value);
-    return *this;
-}
-
-/*!
-    Convinience operator. Same as append, with QPointF \a value.
-    \sa append()
-*/
-QBarSet& QBarSet::operator << (const QPointF &value)
-{
-    append(value);
+//    append(value);
+    d_ptr->append(QPointF(d_ptr->m_values.count(), value));
     return *this;
 }
 
@@ -353,17 +319,6 @@ void QBarSet::insert(const int index, const qreal value)
 }
 
 /*!
-    Inserts new \a value on the \a index position.
-    The value that is currently at this postion is moved to postion index + 1
-    \sa remove()
-*/
-void QBarSet::insert(const int index, const QPointF value)
-{
-    d_ptr->insert(index,value);
-    emit valuesAdded(index,1);
-}
-
-/*!
     Removes \a count number of values from the set starting at \a index.
     \sa insert()
 */
@@ -387,40 +342,27 @@ void QBarSet::replace(const int index, const qreal value)
     }
 }
 
-/*!
-    Sets a new value \a value to set, indexed by \a index
-*/
-void QBarSet::replace(const int index, const QPointF value)
-{
-    if (index >= 0 && index < d_ptr->m_values.count()) {
-        d_ptr->replace(index,value);
-        emit valueChanged(index);
-    }
-}
 
 /*!
-    Returns value of set indexed by \a index. Note that all appended values are stored internally as QPointF.
-    The returned QPointF has x coordinate, which is index (if appended with qreal append) or the x value
-    of the QPointF (if appended with QPointF append).
-    If the index is out of bounds QPointF(0, 0.0) is returned.
+    Returns value of set indexed by \a index.
+    If the index is out of bounds 0.0 is returned.
 */
-QPointF QBarSet::at(const int index) const
+qreal QBarSet::at(const int index) const
 {
     if (index < 0 || index >= d_ptr->m_values.count()) {
-        return QPointF(index, 0.0);
+        return 0;
     }
 
-    return d_ptr->m_values.at(index);
+    return d_ptr->m_values.at(index).y();
 }
 
 /*!
-    Returns value of set indexed by \a index. ote that all appended values are stored internally as QPointF.
-    The returned QPointF has x coordinate, which is index (if appended with qreal append) or the x value
-    of the QPointF (if appended with QPointF append).
+    Returns value of set indexed by \a index.
+    If the index is out of bounds 0.0 is returned.
 */
-QPointF QBarSet::operator [](const int index) const
+qreal QBarSet::operator [](const int index) const
 {
-    return d_ptr->m_values.at(index);
+    return at(index);
 }
 
 /*!
@@ -432,13 +374,12 @@ int QBarSet::count() const
 }
 
 /*!
-    Returns sum of all values in barset. The sum is sum of y coordinates in the QPointF representation.
+    Returns sum of all values in barset.
 */
 qreal QBarSet::sum() const
 {
     qreal total(0);
     for (int i=0; i < d_ptr->m_values.count(); i++) {
-        //total += d_ptr->m_values.at(i);
         total += d_ptr->m_values.at(i).y();
     }
     return total;
diff --git a/src/barchart/qbarset.h b/src/barchart/qbarset.h
index 9d056a3..b245f9b 100644
--- a/src/barchart/qbarset.h
+++ b/src/barchart/qbarset.h
@@ -48,21 +48,16 @@ public:
     void setLabel(const QString label);
     QString label() const;
 
-    void append(const QPointF value);
-    void append(const QList<QPointF> &values);
     void append(const qreal value);
     void append(const QList<qreal> &values);
 
     QBarSet& operator << (const qreal &value);
-    QBarSet& operator << (const QPointF &value);
 
     void insert(const int index, const qreal value);
-    void insert(const int index, const QPointF value);
     void remove(const int index, const int count = 1);
     void replace(const int index, const qreal value);
-    void replace(const int index, const QPointF value);
-    QPointF at(const int index) const;
-    QPointF operator [] (const int index) const;
+    qreal at(const int index) const;
+    qreal operator [] (const int index) const;
     int count() const;
     qreal sum() const;
 
@@ -110,6 +105,9 @@ private:
     friend class BarLegendMarker;
     friend class BarChartItem;
     friend class QBarSeriesPrivate;
+    friend class StackedBarChartItem;
+    friend class PercentBarChartItem;
+    friend class GroupedBarChartItem;
 };
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/barchart/stackedbarchartitem.cpp b/src/barchart/stackedbarchartitem.cpp
index 38c8eb2..0673a28 100644
--- a/src/barchart/stackedbarchartitem.cpp
+++ b/src/barchart/stackedbarchartitem.cpp
@@ -53,14 +53,14 @@ QVector<QRectF> StackedBarChartItem::calculateLayout()
     for (int category = 0; category < categoryCount; category++) {
         qreal yPos = height + rangeY * m_domainMinY + geometry().topLeft().y();
         for (int set=0; set < setCount; set++) {
-            QBarSet* barSet = m_series->d_func()->barsetAt(set);
+            QBarSetPrivate* barSet = m_series->d_func()->barsetAt(set)->d_ptr.data();
 
-            qreal xPos = (barSet->at(category).x() - m_domainMinX) * scaleX + m_rect.left() - barWidth/2;
+            qreal xPos = (barSet->m_values.at(category).x() - m_domainMinX) * scaleX + m_rect.left() - barWidth/2;
 
-            qreal barHeight = barSet->at(category).y() * scaleY;
+            qreal barHeight = barSet->m_values.at(category).y() * scaleY;
             Bar* bar = m_bars.at(itemIndex);
-            bar->setPen(barSet->pen());
-            bar->setBrush(barSet->brush());
+            bar->setPen(barSet->m_pen);
+            bar->setBrush(barSet->m_brush);
             bar->setVisible(barsVisible);
 
             QRectF rect(xPos, yPos-barHeight, barWidth, barHeight);
@@ -68,16 +68,16 @@ QVector<QRectF> StackedBarChartItem::calculateLayout()
 
             QGraphicsSimpleTextItem* label = m_labels.at(itemIndex);
 
-            if (!qFuzzyIsNull(barSet->at(category).y())) {
-                label->setText(QString::number(barSet->at(category).y()));
+            if (!qFuzzyIsNull(barSet->m_values.at(category).y())) {
+                label->setText(QString::number(barSet->m_values.at(category).y()));
             } else {
                 label->setText(QString(""));
             }
 
             label->setPos(xPos + (rect.width()/2 - label->boundingRect().width()/2)
                           ,yPos - barHeight/2 - label->boundingRect().height()/2);
-            label->setFont(barSet->labelFont());
-            label->setBrush(barSet->labelBrush());
+            label->setFont(barSet->m_labelFont);
+            label->setBrush(barSet->m_labelBrush);
             itemIndex++;
             yPos -= barHeight;
         }
diff --git a/tests/auto/qbarmodelmapper/tst_qbarmodelmapper.cpp b/tests/auto/qbarmodelmapper/tst_qbarmodelmapper.cpp
index 2d16933..aa1cd81 100644
--- a/tests/auto/qbarmodelmapper/tst_qbarmodelmapper.cpp
+++ b/tests/auto/qbarmodelmapper/tst_qbarmodelmapper.cpp
@@ -605,7 +605,7 @@ void tst_qbarmodelmapper::modelUpdateCell()
     createVerticalMapper();
 
     QVERIFY(m_model->setData(m_model->index(1, 0), 44));
-    QCOMPARE(m_series->barSets().at(0)->at(1).y(), 44.0);
+    QCOMPARE(m_series->barSets().at(0)->at(1), 44.0);
     QCOMPARE(m_model->data(m_model->index(1, 0)).toReal(), 44.0);
 }
 
diff --git a/tests/auto/qbarseries/tst_qbarseries.cpp b/tests/auto/qbarseries/tst_qbarseries.cpp
index 737854a..b0b2a82 100644
--- a/tests/auto/qbarseries/tst_qbarseries.cpp
+++ b/tests/auto/qbarseries/tst_qbarseries.cpp
@@ -319,11 +319,13 @@ void tst_QBarSeries::mouseclicked()
     QBarSeries* series = new QBarSeries();
 
     QBarSet* set1 = new QBarSet(QString("set 1"));
-    *set1 << QPointF(0,10) << QPointF(1,10) << QPointF(2,10);
+//    *set1 << QPointF(0,10) << QPointF(1,10) << QPointF(2,10);
+    *set1 << 10 << 10 << 10;
     series->append(set1);
 
     QBarSet* set2 = new QBarSet(QString("set 2"));
-    *set2 << QPointF(0.3,10) << QPointF(1.3,10) << QPointF(2.3,10);
+//    *set2 << QPointF(0.3,10) << QPointF(1.3,10) << QPointF(2.3,10);
+    *set2 << 10 << 10 << 10;
     series->append(set2);
 
     QSignalSpy seriesSpy(series,SIGNAL(clicked(int,QBarSet*)));
@@ -455,11 +457,13 @@ void tst_QBarSeries::mousehovered()
     QBarSeries* series = new QBarSeries();
 
     QBarSet* set1 = new QBarSet(QString("set 1"));
-    *set1 << QPointF(0,10) << QPointF(1,10) << QPointF(2,10);
+//    *set1 << QPointF(0,10) << QPointF(1,10) << QPointF(2,10);
+    *set1 << 10 << 10 << 10;
     series->append(set1);
 
     QBarSet* set2 = new QBarSet(QString("set 2"));
-    *set2 << QPointF(0.3,10) << QPointF(1.3,10) << QPointF(2.3,10);
+//    *set2 << QPointF(0.3,10) << QPointF(1.3,10) << QPointF(2.3,10);
+    *set2 << 10 << 10 << 10;
     series->append(set2);
 
     QSignalSpy seriesSpy(series,SIGNAL(hovered(bool,QBarSet*)));
@@ -549,11 +553,13 @@ void tst_QBarSeries::clearWithAnimations()
     QBarSeries* series = new QBarSeries();
 
     QBarSet* set1 = new QBarSet(QString("set 1"));
-    *set1 << QPointF(0,10) << QPointF(1,10) << QPointF(2,10);
+//    *set1 << QPointF(0,10) << QPointF(1,10) << QPointF(2,10);
+    *set1 << 10 << 10 << 10;
     series->append(set1);
 
     QBarSet* set2 = new QBarSet(QString("set 2"));
-    *set2 << QPointF(0.3,10) << QPointF(1.3,10) << QPointF(2.3,10);
+//    *set2 << QPointF(0.3,10) << QPointF(1.3,10) << QPointF(2.3,10);
+    *set2 << 10 << 10 << 10;
     series->append(set2);
 
     QChartView view(new QChart());
diff --git a/tests/auto/qbarset/tst_qbarset.cpp b/tests/auto/qbarset/tst_qbarset.cpp
index 365f422..95b2d81 100644
--- a/tests/auto/qbarset/tst_qbarset.cpp
+++ b/tests/auto/qbarset/tst_qbarset.cpp
@@ -137,7 +137,7 @@ void tst_QBarSet::append()
 
     for (int i=0; i<count; i++) {
         m_barset->append(value);
-        QCOMPARE(m_barset->at(i).y(), value);
+        QCOMPARE(m_barset->at(i), value);
         sum += value;
         value += 1.0;
     }
@@ -167,7 +167,7 @@ void tst_QBarSet::appendOperator()
 
     for (int i=0; i<count; i++) {
         *m_barset << value;
-        QCOMPARE(m_barset->at(i).y(), value);
+        QCOMPARE(m_barset->at(i), value);
         sum += value;
         value += 1.0;
     }
@@ -188,20 +188,20 @@ void tst_QBarSet::insert()
     QSignalSpy valueSpy(m_barset,SIGNAL(valuesAdded(int,int)));
 
     m_barset->insert(0, 1.0);       // 1.0
-    QCOMPARE(m_barset->at(0).y(), 1.0);
+    QCOMPARE(m_barset->at(0), 1.0);
     QCOMPARE(m_barset->count(), 1);
     QVERIFY(qFuzzyCompare(m_barset->sum(), 1.0));
 
     m_barset->insert(0, 2.0);       // 2.0 1.0
-    QCOMPARE(m_barset->at(0).y(), 2.0);
-    QCOMPARE(m_barset->at(1).y(), 1.0);
+    QCOMPARE(m_barset->at(0), 2.0);
+    QCOMPARE(m_barset->at(1), 1.0);
     QCOMPARE(m_barset->count(), 2);
     QVERIFY(qFuzzyCompare(m_barset->sum(), 3.0));
 
     m_barset->insert(1, 3.0);       // 2.0 3.0 1.0
-    QCOMPARE(m_barset->at(1).y(), 3.0);
-    QCOMPARE(m_barset->at(0).y(), 2.0);
-    QCOMPARE(m_barset->at(2).y(), 1.0);
+    QCOMPARE(m_barset->at(1), 3.0);
+    QCOMPARE(m_barset->at(0), 2.0);
+    QCOMPARE(m_barset->at(2), 1.0);
     QCOMPARE(m_barset->count(), 3);
     QVERIFY(qFuzzyCompare(m_barset->sum(), 6.0));
     QCOMPARE(valueSpy.count(), 3);
@@ -228,9 +228,9 @@ void tst_QBarSet::remove()
 
     // Remove middle
     m_barset->remove(2);                // 1.0 2.0 4.0
-    QCOMPARE(m_barset->at(0).y(), 1.0);
-    QCOMPARE(m_barset->at(1).y(), 2.0);
-    QCOMPARE(m_barset->at(2).y(), 4.0);
+    QCOMPARE(m_barset->at(0), 1.0);
+    QCOMPARE(m_barset->at(1), 2.0);
+    QCOMPARE(m_barset->at(2), 4.0);
     QCOMPARE(m_barset->count(), 3);
     QCOMPARE(m_barset->sum(), 7.0);
     QCOMPARE(valueSpy.count(), 1);
@@ -245,8 +245,8 @@ void tst_QBarSet::remove()
 
     // Remove first
     m_barset->remove(0);                // 2.0 4.0
-    QCOMPARE(m_barset->at(0).y(), 2.0);
-    QCOMPARE(m_barset->at(1).y(), 4.0);
+    QCOMPARE(m_barset->at(0), 2.0);
+    QCOMPARE(m_barset->at(1), 4.0);
     QCOMPARE(m_barset->count(), 2);
     QCOMPARE(m_barset->sum(), 6.0);
 
@@ -310,16 +310,16 @@ void tst_QBarSet::replace()
     m_barset->replace(0, 5.0);          // 5.0 2.0 3.0 4.0
     QCOMPARE(m_barset->count(), 4);
     QCOMPARE(m_barset->sum(), 14.0);
-    QCOMPARE(m_barset->at(0).y(), 5.0);
+    QCOMPARE(m_barset->at(0), 5.0);
 
     // Replace last
     m_barset->replace(3, 6.0);
     QCOMPARE(m_barset->count(), 4);     // 5.0 2.0 3.0 6.0
     QCOMPARE(m_barset->sum(), 16.0);
-    QCOMPARE(m_barset->at(0).y(), 5.0);
-    QCOMPARE(m_barset->at(1).y(), 2.0);
-    QCOMPARE(m_barset->at(2).y(), 3.0);
-    QCOMPARE(m_barset->at(3).y(), 6.0);
+    QCOMPARE(m_barset->at(0), 5.0);
+    QCOMPARE(m_barset->at(1), 2.0);
+    QCOMPARE(m_barset->at(2), 3.0);
+    QCOMPARE(m_barset->at(3), 6.0);
 
     // Illegal indexes
     m_barset->replace(4, 6.0);
@@ -328,10 +328,10 @@ void tst_QBarSet::replace()
     m_barset->replace(-1, 6.0);
     QCOMPARE(m_barset->count(), 4);     // 5.0 2.0 3.0 6.0
     QCOMPARE(m_barset->sum(), 16.0);
-    m_barset->replace(4, QPointF(1.0, 1.0));
+    m_barset->replace(4, 1.0);
     QCOMPARE(m_barset->count(), 4);     // 5.0 2.0 3.0 6.0
     QCOMPARE(m_barset->sum(), 16.0);
-    m_barset->replace(-1, QPointF(1.0, 1.0));
+    m_barset->replace(-1, 1.0);
     QCOMPARE(m_barset->count(), 4);     // 5.0 2.0 3.0 6.0
     QCOMPARE(m_barset->sum(), 16.0);
 
@@ -353,10 +353,10 @@ void tst_QBarSet::at()
     m_barset->append(3.0);
     m_barset->append(4.0);
 
-    QCOMPARE(m_barset->at(0).y(), 1.0);
-    QCOMPARE(m_barset->at(1).y(), 2.0);
-    QCOMPARE(m_barset->at(2).y(), 3.0);
-    QCOMPARE(m_barset->at(3).y(), 4.0);
+    QCOMPARE(m_barset->at(0), 1.0);
+    QCOMPARE(m_barset->at(1), 2.0);
+    QCOMPARE(m_barset->at(2), 3.0);
+    QCOMPARE(m_barset->at(3), 4.0);
 }
 
 void tst_QBarSet::atOperator_data()
@@ -374,10 +374,10 @@ void tst_QBarSet::atOperator()
     m_barset->append(3.0);
     m_barset->append(4.0);
 
-    QCOMPARE(m_barset->operator [](0).y(), 1.0);
-    QCOMPARE(m_barset->operator [](1).y(), 2.0);
-    QCOMPARE(m_barset->operator [](2).y(), 3.0);
-    QCOMPARE(m_barset->operator [](3).y(), 4.0);
+    QCOMPARE(m_barset->operator [](0), 1.0);
+    QCOMPARE(m_barset->operator [](1), 2.0);
+    QCOMPARE(m_barset->operator [](2), 3.0);
+    QCOMPARE(m_barset->operator [](3), 4.0);
 }
 
 void tst_QBarSet::count_data()