From f36371057e0a1d24ef98ffef30e61c01bd9a95da 2012-02-23 07:36:36
From: Tero Ahola <tero.ahola@digia.com>
Date: 2012-02-23 07:36:36
Subject: [PATCH] Fixed compilation of example apps with QBarSets

---

diff --git a/example/gdpbarchart/widget.cpp b/example/gdpbarchart/widget.cpp
index 8514984..d53c0f5 100644
--- a/example/gdpbarchart/widget.cpp
+++ b/example/gdpbarchart/widget.cpp
@@ -141,7 +141,7 @@ void Widget::refreshChart()
         for (int i = 0; i < selectedYearsInts.size(); i++)
         {
             query.exec("SELECT country,gdpvalue FROM gdp2 where year=" + QString("%1").arg(selectedYearsInts[i]) + " AND " + countriesQuery);
-            QBarSet* barSet = new QBarSet;
+            QBarSet* barSet = new QBarSet("Barset" + QString::number(i));
             //        while (query.next()) {
             //            qDebug() << query.value(0).toString() << " : " << query.value(1).toString();
             //        }
diff --git a/test/chartwidgettest/mainwidget.cpp b/test/chartwidgettest/mainwidget.cpp
index 04165a3..e567452 100644
--- a/test/chartwidgettest/mainwidget.cpp
+++ b/test/chartwidgettest/mainwidget.cpp
@@ -247,51 +247,25 @@ void MainWidget::addSeries(QString seriesName, int columnCount, int rowCount, QS
             m_chartWidget->addSeries(series);
             setCurrentSeries(series);
         }
-    } else if (seriesName == "Bar") {
+    } else if (seriesName == "Bar"
+               || seriesName == "Stacked bar"
+               || seriesName == "Percent bar") {
         // TODO: replace QBarCategory with QStringList?
         QBarCategory *category = new QBarCategory;
         QStringList labels = generateLabels(rowCount);
         foreach(QString label, labels)
             *category << label;
-        QBarChartSeries* series = new QBarChartSeries(category, this);
+        QBarChartSeries* series = 0;
+        if (seriesName == "Bar")
+            series = new QBarChartSeries(category, this);
+        else if (seriesName == "Stacked bar")
+            series = new QStackedBarChartSeries(category, this);
+        else
+            series = new QPercentBarChartSeries(category, this);
 
         for (int j(0); j < data.count(); j++) {
             QList<qreal> column = data.at(j);
-            QBarSet *set = new QBarSet;
-            for (int i(0); i < column.count(); i++) {
-                *set << column.at(i);
-            }
-            series->addBarSet(set);
-        }
-        m_chartWidget->addSeries(series);
-        setCurrentSeries(series);
-    } else if (seriesName == "Stacked bar") {
-        QBarCategory *category = new QBarCategory;
-        QStringList labels = generateLabels(rowCount);
-        foreach(QString label, labels)
-            *category << label;
-        QStackedBarChartSeries* series = new QStackedBarChartSeries(category, this);
-
-        for (int j(0); j < data.count(); j++) {
-            QList<qreal> column = data.at(j);
-            QBarSet *set = new QBarSet;
-            for (int i(0); i < column.count(); i++) {
-                *set << column.at(i);
-            }
-            series->addBarSet(set);
-        }
-        m_chartWidget->addSeries(series);
-        setCurrentSeries(series);
-    } else if (seriesName == "Percent bar") {
-        QBarCategory *category = new QBarCategory;
-        QStringList labels = generateLabels(rowCount);
-        foreach(QString label, labels)
-            *category << label;
-        QPercentBarChartSeries* series = new QPercentBarChartSeries(category, this);
-
-        for (int j(0); j < data.count(); j++) {
-            QList<qreal> column = data.at(j);
-            QBarSet *set = new QBarSet;
+            QBarSet *set = new QBarSet("set" + QString::number(j));
             for (int i(0); i < column.count(); i++) {
                 *set << column.at(i);
             }