From e1f0c8c24a7045b57f6522976ba9e502e0f36d1b 2012-02-24 09:36:06
From: Tero Ahola <tero.ahola@digia.com>
Date: 2012-02-24 09:36:06
Subject: [PATCH] Removed unused DeclarativeSeries class

---

diff --git a/qmlplugin/declarativechart.cpp b/qmlplugin/declarativechart.cpp
index 2487e14..fb377ab 100644
--- a/qmlplugin/declarativechart.cpp
+++ b/qmlplugin/declarativechart.cpp
@@ -11,8 +11,7 @@ DeclarativeChart::DeclarativeChart(QDeclarativeItem *parent)
 
 DeclarativeChart::ChartTheme DeclarativeChart::theme()
 {
-    if (m_chart)
-        return (ChartTheme) m_chart->chartTheme();
+    return (ChartTheme) m_chart->chartTheme();
 }
 
 void DeclarativeChart::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
diff --git a/qmlplugin/declarativeseries.cpp b/qmlplugin/declarativeseries.cpp
deleted file mode 100644
index cd253f5..0000000
--- a/qmlplugin/declarativeseries.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-#include "declarativeseries.h"
-#include "declarativechart.h"
-#include <qscatterseries.h>
-#include <qlinechartseries.h>
-#include <qpieseries.h>
-#include <cmath>
-#include <QDebug>
-
-QTCOMMERCIALCHART_BEGIN_NAMESPACE
-
-DeclarativeSeries::DeclarativeSeries(QDeclarativeItem *parent) :
-    QDeclarativeItem(parent),
-    m_seriesType(SeriesTypeInvalid), // TODO: default type?
-    m_chart(0),
-    m_series(0)
-{
-    setFlag(QGraphicsItem::ItemHasNoContents, false);
-    connect(this, SIGNAL(parentChanged()),
-            this, SLOT(setParentForSeries()));
-}
-
-void DeclarativeSeries::setSeriesType(SeriesType type)
-{
-    if (!m_series || type != m_seriesType) {
-        m_seriesType = type;
-        initSeries();
-    } else {
-        m_seriesType = type;
-    }
-}
-
-void DeclarativeSeries::setParentForSeries()
-{
-    if (!m_series)
-        initSeries();
-    else if (m_series->type() != m_seriesType)
-        initSeries();
-}
-
-void DeclarativeSeries::initSeries()
-{
-    DeclarativeChart *declarativeChart = qobject_cast<DeclarativeChart *>(parent());
-
-    if (declarativeChart && m_seriesType != SeriesTypeInvalid) {
-        delete m_series;
-        m_series = 0;
-
-        QChart *chart = qobject_cast<QChart *>(declarativeChart->m_chart);
-        qDebug() << "creating series for chart: " << chart;
-        Q_ASSERT(chart);
-
-        switch (m_seriesType) {
-        case SeriesTypePie: {
-            QPieSeries *pieSeries = new QPieSeries();
-            chart->addSeries(pieSeries);
-            QList<qreal> data;
-            data << 1.0;
-            data << 12.0;
-            data << 4.0;
-            Q_ASSERT(pieSeries->setData(data));
-            m_series = pieSeries;
-            break;
-        }
-        default:
-            Q_ASSERT(false);
-            break;
-        }
-    }
-}
-
-#include "moc_declarativeseries.cpp"
-
-QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/qmlplugin/declarativeseries.h b/qmlplugin/declarativeseries.h
deleted file mode 100644
index 11c163b..0000000
--- a/qmlplugin/declarativeseries.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef DECLARATIVESERIES_H
-#define DECLARATIVESERIES_H
-
-#include <QDeclarativeItem>
-#include <qchart.h>
-#include <qchartseries.h>
-
-QTCOMMERCIALCHART_BEGIN_NAMESPACE
-
-class DeclarativeSeries : public QDeclarativeItem
-{
-    Q_OBJECT
-    Q_ENUMS(SeriesType)
-    Q_PROPERTY(SeriesType seriesType READ seriesType WRITE setSeriesType)
-
-public:
-    // TODO: how to re-use the existing enum from QChart?
-    enum SeriesType {
-        SeriesTypeInvalid = -1,
-        SeriesTypeLine = QChartSeries::SeriesTypeLine,
-//        SeriesTypeArea,
-        SeriesTypeBar,
-        SeriesTypeStackedBar,
-        SeriesTypePercentBar,
-        SeriesTypePie,
-        SeriesTypeScatter
-//        SeriesTypeSpline
-    };
-
-    explicit DeclarativeSeries(QDeclarativeItem *parent = 0);
-
-signals:
-
-public slots:
-    void setParentForSeries();
-
-public:
-    void setSeriesType(SeriesType type);
-    SeriesType seriesType() { return m_seriesType; }
-
-private:
-    void initSeries();
-    SeriesType m_seriesType;
-    QChart *m_chart;
-    QChartSeries *m_series;
-};
-
-QTCOMMERCIALCHART_END_NAMESPACE
-
-#endif // DECLARATIVESERIES_H
diff --git a/qmlplugin/plugin.cpp b/qmlplugin/plugin.cpp
index 697b982..b4d6cfa 100644
--- a/qmlplugin/plugin.cpp
+++ b/qmlplugin/plugin.cpp
@@ -1,7 +1,6 @@
 #include <QtDeclarative/qdeclarativeextensionplugin.h>
 #include <QtDeclarative/qdeclarative.h>
 #include "declarativechart.h"
-#include "declarativeseries.h"
 #include "scatterelement.h"
 #include "declarativescatterseries.h"
 #include "declarativelineseries.h"
@@ -18,7 +17,6 @@ public:
         Q_ASSERT(QLatin1String(uri) == QLatin1String("QtCommercial.Chart"));
 
         qmlRegisterType<DeclarativeChart>(uri, 1, 0, "Chart");
-        qmlRegisterType<DeclarativeSeries>(uri, 1, 0, "Series");
         qmlRegisterType<DeclarativeScatterSeries>(uri, 1, 0, "ScatterSeries");
         qmlRegisterType<DeclarativeLineSeries>(uri, 1, 0, "LineSeries");
         qmlRegisterType<DeclarativePieSeries>(uri, 1, 0, "PieSeries");
diff --git a/qmlplugin/qmlplugin.pro b/qmlplugin/qmlplugin.pro
index 0c4eb90..5c4fe88 100644
--- a/qmlplugin/qmlplugin.pro
+++ b/qmlplugin/qmlplugin.pro
@@ -24,14 +24,12 @@ RCC_DIR = $$CHART_BUILD_DIR/plugin
 SOURCES += \
     plugin.cpp \
     declarativechart.cpp \
-    declarativeseries.cpp \
     declarativescatterseries.cpp \
     scatterelement.cpp \
     declarativepieseries.cpp \
     declarativelineseries.cpp
 HEADERS += \
     declarativechart.h \
-    declarativeseries.h \
     declarativescatterseries.h \
     scatterelement.h \
     declarativepieseries.h \
@@ -45,23 +43,3 @@ qmldir.files += $$PWD/qmldir
 qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 
 INSTALLS += target qmldir
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-