From 68a8d659283832c1b72b226817b05263a76895ca 2012-02-09 14:36:52
From: Michal Klocek <michal.klocek@digia.com>
Date: 2012-02-09 14:36:52
Subject: [PATCH] Clean up obsolete create metods in series

---

diff --git a/example/colorlinechart/main.cpp b/example/colorlinechart/main.cpp
index 2a313ce..0628875 100644
--- a/example/colorlinechart/main.cpp
+++ b/example/colorlinechart/main.cpp
@@ -15,11 +15,11 @@ int main(int argc, char *argv[])
 
     QMainWindow window;
 
-    QLineChartSeries* series0 = QLineChartSeries::create();
+    QLineChartSeries* series0 = new QLineChartSeries();
     QPen blue(Qt::blue);
     blue.setWidth(3);
     series0->setPen(blue);
-    QLineChartSeries* series1 = QLineChartSeries::create();
+    QLineChartSeries* series1 = new QLineChartSeries();
     QPen red(Qt::red);
     red.setWidth(3);
     series1->setPen(red);
diff --git a/example/dynamiclinechart/main.cpp b/example/dynamiclinechart/main.cpp
index 5384058..92f9041 100644
--- a/example/dynamiclinechart/main.cpp
+++ b/example/dynamiclinechart/main.cpp
@@ -13,11 +13,11 @@ int main(int argc, char *argv[])
 
     QMainWindow window;
 
-    QLineChartSeries* series0 = QLineChartSeries::create();
+    QLineChartSeries* series0 = new QLineChartSeries();
     QPen blue(Qt::blue);
     blue.setWidth(3);
     series0->setPen(blue);
-    QLineChartSeries* series1 = QLineChartSeries::create();
+    QLineChartSeries* series1 = new QLineChartSeries();
     QPen red(Qt::red);
     red.setWidth(3);
     series1->setPen(red);
diff --git a/example/linechart/main.cpp b/example/linechart/main.cpp
index f067775..ede0db5 100644
--- a/example/linechart/main.cpp
+++ b/example/linechart/main.cpp
@@ -15,11 +15,11 @@ int main(int argc, char *argv[])
 
     QMainWindow window;
 
-    QLineChartSeries* series0 = QLineChartSeries::create();
+    QLineChartSeries* series0 = new QLineChartSeries();
     QPen blue(Qt::blue);
     blue.setWidth(3);
     series0->setPen(blue);
-    QLineChartSeries* series1 = QLineChartSeries::create();
+    QLineChartSeries* series1 = new QLineChartSeries();
     QPen red(Qt::red);
     red.setWidth(3);
     series1->setPen(red);
diff --git a/example/zoomlinechart/main.cpp b/example/zoomlinechart/main.cpp
index 1983867..1e3082a 100644
--- a/example/zoomlinechart/main.cpp
+++ b/example/zoomlinechart/main.cpp
@@ -14,11 +14,11 @@ int main(int argc, char *argv[])
 
     QMainWindow window;
 
-    QLineChartSeries* series0 = QLineChartSeries::create();
+    QLineChartSeries* series0 = new QLineChartSeries();
     QPen blue(Qt::blue);
     blue.setWidth(3);
     series0->setPen(blue);
-    QLineChartSeries* series1 = QLineChartSeries::create();
+    QLineChartSeries* series1 = new QLineChartSeries();
     QPen red(Qt::red);
     red.setWidth(3);
     series1->setPen(red);
diff --git a/src/chartpresenter.cpp b/src/chartpresenter.cpp
index 6f7896e..909cb3f 100644
--- a/src/chartpresenter.cpp
+++ b/src/chartpresenter.cpp
@@ -267,26 +267,6 @@ void ChartPresenter::removeAxis(QChartAxis* axis)
     else if(axis == m_axisY) m_axisY=0;
 }
 
-/*
- void ChartPresenter::setAxisX(const QChartAxis& axis)
- {
- setAxis(m_axisXItem,axis);
- }
- void ChartPresenter::setAxisY(const QChartAxis& axis)
- {
- setAxis(m_axisYItem.at(0),axis);
- }
-
- void ChartPresenter::setAxisY(const QList<QChartAxis>& axis)
- {
- //TODO not implemented
- }
-
- void ChartPresenter::setAxis(AxisItem *item, const QChartAxis& axis)
- {
- item->setVisible(axis.isAxisVisible());
- }
- */
 #include "moc_chartpresenter_p.cpp"
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/linechart/qlinechartseries.cpp b/src/linechart/qlinechartseries.cpp
index a102e63..4d7627b 100644
--- a/src/linechart/qlinechartseries.cpp
+++ b/src/linechart/qlinechartseries.cpp
@@ -10,13 +10,6 @@ QLineChartSeries::~QLineChartSeries()
 {
 }
 
-QLineChartSeries* QLineChartSeries::create(QObject* parent)
-{
-    //TODO: here we take QChartData when it is ready
-    // return null if malformed;
-    return new QLineChartSeries(parent);
-}
-
 int QLineChartSeries::add(qreal x,qreal y)
 {
     m_x<<x;
diff --git a/src/linechart/qlinechartseries.h b/src/linechart/qlinechartseries.h
index 133025c..1be17dd 100644
--- a/src/linechart/qlinechartseries.h
+++ b/src/linechart/qlinechartseries.h
@@ -12,13 +12,11 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 class QTCOMMERCIALCHART_EXPORT QLineChartSeries : public QChartSeries
 {
     Q_OBJECT
-private:
-    QLineChartSeries(QObject* parent=0);
 public:
+    QLineChartSeries(QObject* parent=0);
     virtual ~QLineChartSeries();
 
 public: // from QChartSeries
-    static QLineChartSeries* create(QObject* parent=0);
     virtual QChartSeriesType type() const { return QChartSeries::SeriesTypeLine;}
 
 public:
diff --git a/src/qchart.cpp b/src/qchart.cpp
index a727c6e..ca11d7e 100644
--- a/src/qchart.cpp
+++ b/src/qchart.cpp
@@ -42,7 +42,7 @@ QChartSeries* QChart::createSeries(QChartSeries::QChartSeriesType type)
 
     switch (type) {
         case QChartSeries::SeriesTypeLine: {
-            series = QLineChartSeries::create();
+            series = new QLineChartSeries(this);
             break;
         }
         case QChartSeries::SeriesTypeBar: {
diff --git a/src/qchartseries.cpp b/src/qchartseries.cpp
index 47cd153..bdbe6d9 100644
--- a/src/qchartseries.cpp
+++ b/src/qchartseries.cpp
@@ -1,34 +1,5 @@
-#include "qchartglobal.h"
 #include "qchartseries.h"
 
-#include "barchartseries.h"
-#include "qlinechartseries.h"
-
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
-
-QChartSeries* QChartSeries::create(QChartSeriesType type, QObject* parent)
-{
-    qDebug() << "QChartSeries::create";
-    // TODO: Other types
-    switch (type) {
-    case QChartSeries::SeriesTypeLine: {
-        QLineChartSeries* s = QLineChartSeries::create(parent); // TODO: do we need create method for derived implementations?
-        return s;
-    }
-    case QChartSeries::SeriesTypePie: {
-       return 0;
-    }
-    case QChartSeries::SeriesTypeScatter: {
-       return 0;
-    }
-    case QChartSeries::SeriesTypeBar: {
-        BarChartSeries* s = new BarChartSeries(parent);
-        return s;
-    }
-    default:
-        return 0;
-    }
-}
-
 #include "moc_qchartseries.cpp"
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/qchartseries.h b/src/qchartseries.h
index bbe6c3e..01d9367 100644
--- a/src/qchartseries.h
+++ b/src/qchartseries.h
@@ -29,9 +29,6 @@ protected:
 public:
     virtual ~QChartSeries(){};
 
-    // Factory method
-    static QChartSeries* create(QChartSeriesType type, QObject* parent = 0 );
-
     // Pure virtual
     virtual QChartSeriesType type() const = 0;
 
diff --git a/test/chartwidgettest/mainwidget.cpp b/test/chartwidgettest/mainwidget.cpp
index d648eff..5bafadf 100644
--- a/test/chartwidgettest/mainwidget.cpp
+++ b/test/chartwidgettest/mainwidget.cpp
@@ -223,7 +223,7 @@ void MainWidget::addSeries(QString series, QString data)
 //            lineSeries->add(x.at(i), y.at(i));
 //        }
         //Q_ASSERT(newSeries->setData(x, y));
-        QLineChartSeries* series0 = QLineChartSeries::create();
+        QLineChartSeries* series0 = new QLineChartSeries();
         for (int i(0); i < x.count() && i < y.count(); i++)
             series0->add(x.at(i), y.at(i));
         m_chartWidget->addSeries(series0);
@@ -236,7 +236,7 @@ void MainWidget::addSeries(QString series, QString data)
     if (series == "Bar") {
         // This is the another way of creating series. Should we create test cases for both ways, if we support them?
         qDebug() << "Bar chart series";
-        newSeries = QChartSeries::create(QChartSeries::SeriesTypeBar, this);
+        newSeries = new BarChartSeries(this);
 
         // Create some test data to chart
         QStandardItemModel dataModel(2,10,this);