HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r988:8a36a6921f5a

0

examples/piechartdrilldown/drilldownchart.cpp +1 -1

             }
-            void DrilldownChart::changeSeries(QSeries* series)
+            void DrilldownChart::changeSeries(QAbstractSeries* series)
             {
                 // NOTE: if the series is owned by the chart it will be deleted
                 // here the "window" owns the series...

0

examples/piechartdrilldown/drilldownchart.h +3 -3

             #include <QChart>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class QSeries;
+            class QAbstractSeries;
             class QPieSlice;
             QTCOMMERCIALCHART_END_NAMESPACE
             public:
                 explicit DrilldownChart(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0);
                 ~DrilldownChart();
-                void changeSeries(QSeries* series);
+                void changeSeries(QAbstractSeries* series);
             public Q_SLOTS:
                 void handleSliceClicked(QPieSlice* slice);
             private:
-                QSeries* m_currentSeries;
+                QAbstractSeries* m_currentSeries;
             };
             #endif // DRILLDOWNCHART_H

0

examples/piechartdrilldown/drilldownslice.cpp +2 -2

             QTCOMMERCIALCHART_USE_NAMESPACE
-            DrilldownSlice::DrilldownSlice(qreal value, QString prefix, QSeries* drilldownSeries)
+            DrilldownSlice::DrilldownSlice(qreal value, QString prefix, QAbstractSeries* drilldownSeries)
                 :m_drilldownSeries(drilldownSeries),
                 m_prefix(prefix)
             {
             }
-            QSeries* DrilldownSlice::drilldownSeries() const
+            QAbstractSeries* DrilldownSlice::drilldownSeries() const
             {
                 return m_drilldownSeries;
             }

0

examples/piechartdrilldown/drilldownslice.h +4 -4

             #include <QPieSlice>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class QSeries;
+            class QAbstractSeries;
             QTCOMMERCIALCHART_END_NAMESPACE
             QTCOMMERCIALCHART_USE_NAMESPACE
                 Q_OBJECT
             public:
-                DrilldownSlice(qreal value, QString prefix, QSeries* drilldownSeries);
+                DrilldownSlice(qreal value, QString prefix, QAbstractSeries* drilldownSeries);
                 virtual ~DrilldownSlice();
-                QSeries* drilldownSeries() const;
+                QAbstractSeries* drilldownSeries() const;
             public Q_SLOTS:
                 void updateLabel();
                 void hideHighlight();
             private:
-                QSeries* m_drilldownSeries;
+                QAbstractSeries* m_drilldownSeries;
                 QString m_prefix;
             };

0

examples/presenterchart/chartview.cpp +1 -1

             //![3]
             //![4]
-                foreach (QSeries* series, m_series) {
+                foreach (QAbstractSeries* series, m_series) {
                     QObject::connect(series,SIGNAL(clicked(QPointF)),this,SLOT(handlePointClicked(QPointF)));
                 }
             //![4]

0

examples/presenterchart/chartview.h +1 -1

             private:
                 QTimer m_timer;
-                QList<QSeries*> m_series;
+                QList<QAbstractSeries *> m_series;
                 QStringList m_titles;
                 int m_index;
                 QChart *m_chart;

0

examples/stackedbarchartdrilldown/drilldownchart.cpp +1 -1

             {
             }
-            void DrilldownChart::changeSeries(QSeries* series)
+            void DrilldownChart::changeSeries(QAbstractSeries *series)
             {
                 if (m_currentSeries)
                     removeSeries(m_currentSeries);

0

examples/stackedbarchartdrilldown/drilldownchart.h +2 -2

             public:
                 explicit DrilldownChart(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0);
-                void changeSeries(QSeries* series);
+                void changeSeries(QAbstractSeries *series);
             public Q_SLOTS:
                 void handleClicked(QBarSet *barset, QString category, Qt::MouseButtons button);
             private:
-                QSeries* m_currentSeries;
+                QAbstractSeries* m_currentSeries;
             };
             //! [2]

0

qmlplugin/declarativeareaseries.cpp +1 -1

             {
             }
-            QSeries *DeclarativeAreaSeries::series()
+            QAbstractSeries *DeclarativeAreaSeries::series()
             {
                 return this;
             }

0

qmlplugin/declarativeareaseries.h +1 -1

                 explicit DeclarativeAreaSeries(QObject *parent = 0);
             public:
-                QSeries *series();
+                QAbstractSeries *series();
                 QDeclarativeListProperty<DeclarativeXyPoint> points();
                 QDeclarativeListProperty<DeclarativeXyPoint> lowerPoints();

0

qmlplugin/declarativelineseries.cpp +1 -1

             {
             }
-            QSeries *DeclarativeLineSeries::series()
+            QAbstractSeries *DeclarativeLineSeries::series()
             {
                 return this;
             }

0

qmlplugin/declarativelineseries.h +1 -1

                 explicit DeclarativeLineSeries(QObject *parent = 0);
             public:
-                QSeries *series();
+                QAbstractSeries *series();
                 QDeclarativeListProperty<DeclarativeXyPoint> points();
             };

0

qmlplugin/declarativescatterseries.cpp +1 -1

             {
             }
-            QSeries *DeclarativeScatterSeries::series()
+            QAbstractSeries *DeclarativeScatterSeries::series()
             {
                 return this;
             }

0

qmlplugin/declarativescatterseries.h +1 -1

                 explicit DeclarativeScatterSeries(QObject *parent = 0);
             public:
-                QSeries *series();
+                QAbstractSeries *series();
                 QDeclarativeListProperty<DeclarativeXyPoint> points();
             };

0

qmlplugin/declarativesplineseries.cpp +1 -1

             {
             }
-            QSeries *DeclarativeSplineSeries::series()
+            QAbstractSeries *DeclarativeSplineSeries::series()
             {
                 return this;
             }

0

qmlplugin/declarativesplineseries.h +1 -1

                 explicit DeclarativeSplineSeries(QObject *parent = 0);
             public:
-                QSeries *series();
+                QAbstractSeries *series();
                 QDeclarativeListProperty<DeclarativeXyPoint> points();
             };

0

qmlplugin/declarativexyseries.cpp +1 -1

             void DeclarativeXySeries::componentComplete()
             {
-                QSeries *thisObj = reinterpret_cast<QSeries *>(series());
+                QAbstractSeries *thisObj = reinterpret_cast<QAbstractSeries *>(series());
                 DeclarativeChart *declarativeChart = qobject_cast<DeclarativeChart *>(thisObj->parent());
                 if (declarativeChart) {

0

qmlplugin/declarativexyseries.h +2 -2

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChart;
-            class QSeries;
+            class QAbstractSeries;
             class DeclarativeXySeries : public QDeclarativeParserStatus
             {
                 virtual void componentComplete();
             public:
-                virtual QSeries *series() = 0;
+                virtual QAbstractSeries *series() = 0;
                 virtual QDeclarativeListProperty<DeclarativeXyPoint> points() = 0;
             public Q_SLOTS:

0

src/areachart/qareaseries.cpp +5 -5

             /*!
                 \fn virtual QSeriesType QAreaSeries::type() const
                 \brief Returns type of series.
-                \sa QSeries, QSeriesType
+                \sa QAbstractSeries, QSeriesType
             */
             /*!
                 When series object is added to QChartView or QChart instance ownerships is transferred.
             */
             QAreaSeries::QAreaSeries(QLineSeries *upperSeries, QLineSeries *lowerSeries)
-                : QSeries(*new QAreaSeriesPrivate(upperSeries,lowerSeries,this),upperSeries)
+                : QAbstractSeries(*new QAreaSeriesPrivate(upperSeries,lowerSeries,this),upperSeries)
             {
             }
             }
-            QSeries::QSeriesType QAreaSeries::type() const
+            QAbstractSeries::QSeriesType QAreaSeries::type() const
             {
-                return QSeries::SeriesTypeArea;
+                return QAbstractSeries::SeriesTypeArea;
             }
             QLineSeries* QAreaSeries::upperSeries() const
             ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QAreaSeriesPrivate::QAreaSeriesPrivate(QLineSeries *upperSeries, QLineSeries *lowerSeries,QAreaSeries* q) :
-                QSeriesPrivate(q),
+                QAbstractSeriesPrivate(q),
                 m_upperSeries(upperSeries),
                 m_lowerSeries(lowerSeries),
                 m_pointsVisible(false)

0

src/areachart/qareaseries.h +3 -3

             #define QAREASERIES_H
             #include <qchartglobal.h>
-            #include <qseries.h>
+            #include <qabstractseries.h>
             #include <QPen>
             #include <QBrush>
             class QLineSeries;
             class QAreaSeriesPrivate;
-            class QTCOMMERCIALCHART_EXPORT QAreaSeries : public QSeries
+            class QTCOMMERCIALCHART_EXPORT QAreaSeries : public QAbstractSeries
             {
                 Q_OBJECT
             public:
                 ~QAreaSeries();
             public:
-                QSeries::QSeriesType type() const;
+                QAbstractSeries::QSeriesType type() const;
                 QLineSeries* upperSeries() const;
                 QLineSeries* lowerSeries() const;

0

src/areachart/qareaseries_p.h +2 -2

             #ifndef QAREASERIES_P_H
             #define QAREASERIES_P_H
-            #include "qseries_p.h"
+            #include "qabstractseries_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QAreaSeries;
-            class QAreaSeriesPrivate: public QSeriesPrivate
+            class QAreaSeriesPrivate: public QAbstractSeriesPrivate
             {
                 Q_OBJECT

0

src/barchart/barchartmodel_p.h +1 -1

             #include <QObject>
             #include <QStringList>
             #include "qchartglobal.h"
-            #include <qseries.h>
+            #include <qabstractseries.h>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

0

src/barchart/qbarseries.cpp +6 -5

                 QBarSeries is QObject which is a child of a \a parent.
             */
             QBarSeries::QBarSeries(QBarCategories categories, QObject *parent) :
-                QSeries(*new QBarSeriesPrivate(categories, this),parent)
+                QAbstractSeries(*new QBarSeriesPrivate(categories, this),parent)
             {
             }
                 \internal
             */
             QBarSeries::QBarSeries(QBarSeriesPrivate &d, QObject *parent) :
-                QSeries(d,parent)
+                QAbstractSeries(d,parent)
             {
             }
             /*!
                 Returns the type of series. Derived classes override this.
             */
-            QSeries::QSeriesType QBarSeries::type() const
+            QAbstractSeries::QSeriesType QBarSeries::type() const
             {
-                return QSeries::SeriesTypeBar;
+                return QAbstractSeries::SeriesTypeBar;
             }
             /*!
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-            QBarSeriesPrivate::QBarSeriesPrivate(QBarCategories categories, QBarSeries *q) : QSeriesPrivate(q),
+            QBarSeriesPrivate::QBarSeriesPrivate(QBarCategories categories, QBarSeries *q) :
+                QAbstractSeriesPrivate(q),
                 m_internalModel(new BarChartModel(categories,this)),
                 m_model(0),
                 m_mapCategories(-1),

0

src/barchart/qbarseries.h +3 -3

             #ifndef BARSERIES_H
             #define BARSERIES_H
-            #include <qseries.h>
+            #include <qabstractseries.h>
             #include <QStringList>
             class QModelIndex;
             class QBarSeriesPrivate;
             // Container for series
-            class QTCOMMERCIALCHART_EXPORT QBarSeries : public QSeries
+            class QTCOMMERCIALCHART_EXPORT QBarSeries : public QAbstractSeries
             {
                 Q_OBJECT
             public:
                 explicit QBarSeries(QBarCategories categories, QObject *parent = 0);
                 virtual ~QBarSeries();
-                QSeries::QSeriesType type() const;
+                QAbstractSeries::QSeriesType type() const;
                 void appendBarSet(QBarSet *set);            // Takes ownership of set
                 void removeBarSet(QBarSet *set);            // Releases ownership, doesn't delete set

0

src/barchart/qbarseries_p.h +3 -3

             #define QBARSERIES_P_H
             #include "qbarseries.h"
-            #include "qseries_p.h"
+            #include "qabstractseries_p.h"
             #include <QStringList>
-            #include <QSeries>
+            #include <QAbstractSeries>
             class QModelIndex;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             // Container for series
-            class QBarSeriesPrivate : public QSeriesPrivate
+            class QBarSeriesPrivate : public QAbstractSeriesPrivate
             {
                 Q_OBJECT
             public:

0

src/barchart/qpercentbarseries.cpp +3 -3

             /*!
                 \fn virtual QSeriesType QPercentBarSeries::type() const
                 \brief Returns type of series.
-                \sa QSeries, QSeriesType
+                \sa QAbstractSeries, QSeriesType
             */
             /*!
             {
             }
-            QSeries::QSeriesType QPercentBarSeries::type() const
+            QAbstractSeries::QSeriesType QPercentBarSeries::type() const
             {
-                return QSeries::SeriesTypePercentBar;
+                return QAbstractSeries::SeriesTypePercentBar;
             }
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

0

src/barchart/qpercentbarseries.h +1 -1

                 Q_OBJECT
             public:
                 explicit QPercentBarSeries(QBarCategories categories, QObject *parent = 0);
-                QSeries::QSeriesType type() const;
+                QAbstractSeries::QSeriesType type() const;
             private:
                 Q_DECLARE_PRIVATE(QPercentBarSeries)
                 Q_DISABLE_COPY(QPercentBarSeries)

0

src/barchart/qstackedbarseries.cpp +3 -3

             /*!
                 \fn virtual QSeriesType QStackedBarSeries::type() const
                 \brief Returns type of series.
-                \sa QSeries, QSeriesType
+                \sa QSeriesType
             */
             /*!
             {
             }
-            QSeries::QSeriesType QStackedBarSeries::type() const
+            QAbstractSeries::QSeriesType QStackedBarSeries::type() const
             {
-                return QSeries::SeriesTypeStackedBar;
+                return QAbstractSeries::SeriesTypeStackedBar;
             }
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

0

src/barchart/qstackedbarseries.h +1 -1

                 Q_OBJECT
             public:
                 explicit QStackedBarSeries(QBarCategories categories, QObject *parent = 0);
-                QSeries::QSeriesType type() const;
+                QAbstractSeries::QSeriesType type() const;
             private:
                 Q_DECLARE_PRIVATE(QStackedBarSeries)
                 Q_DISABLE_COPY(QStackedBarSeries)

0

src/chartdataset.cpp +16 -16

             #include "chartdataset_p.h"
             #include "qchartaxis.h"
             #include "qchartaxis_p.h"
-            #include "qseries_p.h"
+            #include "qabstractseries_p.h"
             #include "qbarseries.h"
             #include "qstackedbarseries.h"
             #include "qpercentbarseries.h"
             {
             }
-            void ChartDataSet::addSeries(QSeries* series, QChartAxis *axisY)
+            void ChartDataSet::addSeries(QAbstractSeries* series, QChartAxis *axisY)
             {
                 if(axisY==0) axisY = m_axisY;
                 series->d_ptr->scaleDomain(*domain);
-                if(series->type() == QSeries::SeriesTypeBar || series->type() == QSeries::SeriesTypeStackedBar || series->type() == QSeries::SeriesTypePercentBar)
+                if(series->type() == QAbstractSeries::SeriesTypeBar
+                        || series->type() == QAbstractSeries::SeriesTypeStackedBar
+                        || series->type() == QAbstractSeries::SeriesTypePercentBar) {
                     QBarSeries* barSeries = static_cast<QBarSeries*>(series);
                     setupCategories(barSeries);
                 }
-                if (series->type()== QSeries::SeriesTypePie &&  m_seriesAxisMap.count()==0)
+                if (series->type()== QAbstractSeries::SeriesTypePie && m_seriesAxisMap.count() == 0) {
                     axisX()->hide();
                     this->axisY()->hide();
                 }
                 m_seriesAxisMap.insert(series,axisY);
-                QMapIterator<int, QSeries*> i(m_indexSeriesMap);
+                QMapIterator<int, QAbstractSeries*> i(m_indexSeriesMap);
                 int key=0;
                 while (i.hasNext()) {
             }
-            QChartAxis* ChartDataSet::removeSeries(QSeries* series)
+            QChartAxis* ChartDataSet::removeSeries(QAbstractSeries* series)
             {
                 QChartAxis* axis = m_seriesAxisMap.value(series);
             void ChartDataSet::removeAllSeries()
             {
-                QList<QSeries*> series =  m_seriesAxisMap.keys();
+                QList<QAbstractSeries*> series =  m_seriesAxisMap.keys();
                 QList<QChartAxis*> axes;
-                foreach(QSeries* s , series) {
+                foreach(QAbstractSeries *s , series) {
                     QChartAxis* axis  = removeSeries(s);
                     if(axis==axisY()) continue;
                     int i = axes.indexOf(axis);
                 }
             }
-            int ChartDataSet::seriesCount(QSeries::QSeriesType type)
+            int ChartDataSet::seriesCount(QAbstractSeries::QSeriesType type)
             {
                 int count=0;
-                QMapIterator<QSeries*, QChartAxis*> i(m_seriesAxisMap);
+                QMapIterator<QAbstractSeries*, QChartAxis*> i(m_seriesAxisMap);
                 while (i.hasNext()) {
                        i.next();
                        if(i.key()->type()==type) count++;
                 return count;
             }
-            int ChartDataSet::seriesIndex(QSeries *series)
+            int ChartDataSet::seriesIndex(QAbstractSeries *series)
             {
-                QMapIterator<int, QSeries*> i(m_indexSeriesMap);
+                QMapIterator<int, QAbstractSeries*> i(m_indexSeriesMap);
                 while (i.hasNext()) {
                     i.next();
                     if (i.value() == series)
                 return -1;
             }
-            QChartAxis* ChartDataSet::axisY(QSeries* series) const
+            QChartAxis* ChartDataSet::axisY(QAbstractSeries *series) const
             {
                 if(series == 0) return m_axisY;
                 return m_seriesAxisMap.value(series);
             }
-            Domain* ChartDataSet::domain(QSeries* series) const
+            Domain* ChartDataSet::domain(QAbstractSeries *series) const
             {
             	QChartAxis* axis = m_seriesAxisMap.value(series);
             	if(axis){

0

src/chartdataset_p.h +13 -13

             #ifndef CHARTDATASET_P_H
             #define CHARTDATASET_P_H
-            #include "qseries.h"
+            #include "qabstractseries.h"
             #include "domain_p.h"
             #include <QVector>
                 ChartDataSet(QObject* parent=0);
                 virtual ~ChartDataSet();
-                void addSeries(QSeries* series,QChartAxis *axisY = 0);
+                void addSeries(QAbstractSeries* series,QChartAxis *axisY = 0);
-                QChartAxis* removeSeries(QSeries* series);
+                QChartAxis* removeSeries(QAbstractSeries* series);
                 void removeAllSeries();
                 void zoomInDomain(const QRectF& rect, const QSizeF& size);
                 void zoomOutDomain(const QRectF& rect, const QSizeF& size);
                 void scrollDomain(int dx,int dy,const QSizeF& size);
-                int seriesCount(QSeries::QSeriesType type);
+                int seriesCount(QAbstractSeries::QSeriesType type);
-                int seriesIndex(QSeries *series);
+                int seriesIndex(QAbstractSeries *series);
-                Domain* domain(QSeries* series) const;
+                Domain* domain(QAbstractSeries* series) const;
                 Domain* domain(QChartAxis* axis) const;
                 QChartAxis* axisX() const { return m_axisX; }
-                QChartAxis* axisY(QSeries* series = 0) const;
+                QChartAxis* axisY(QAbstractSeries *series = 0) const;
             Q_SIGNALS:
-                void seriesAdded(QSeries* series,Domain* domain);
+                void seriesAdded(QAbstractSeries* series, Domain* domain);
-                void seriesRemoved(QSeries* series);
+                void seriesRemoved(QAbstractSeries* series);
                 void axisAdded(QChartAxis* axis,Domain* domain);
                 void axisRemoved(QChartAxis* axis);
             private:
                 QStringList createLabels(QChartAxis* axis,qreal min, qreal max);
-                void calculateDomain(QSeries* series,Domain* domain);
+                void calculateDomain(QAbstractSeries* series,Domain* domain);
                 void setupCategories(QBarSeries* series);
             private:
-                QMap<QSeries*, QChartAxis*> m_seriesAxisMap;
+                QMap<QAbstractSeries *, QChartAxis *> m_seriesAxisMap;
-                QMap<QChartAxis*, Domain*> m_axisDomainMap;
+                QMap<QChartAxis*, Domain *> m_axisDomainMap;
-                QMap<int,QSeries*> m_indexSeriesMap;
+                QMap<int, QAbstractSeries *> m_indexSeriesMap;
                 QChartAxis* m_axisX;
                 QChartAxis* m_axisY;

0

src/chartpresenter.cpp +8 -8

             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             #include "chartanimator_p.h"
-            #include "qseries_p.h"
+            #include "qabstractseries_p.h"
             #include "qareaseries.h"
             #include "axis_p.h"
             #include "areachartitem_p.h"
             }
-            void ChartPresenter::handleSeriesAdded(QSeries* series,Domain* domain)
+            void ChartPresenter::handleSeriesAdded(QAbstractSeries* series,Domain* domain)
             {
                 Chart *item = series->d_ptr->createGraphics(this);
                 Q_ASSERT(item);
                 m_chartItems.insert(series,item);
             }
-            void ChartPresenter::handleSeriesRemoved(QSeries* series)
+            void ChartPresenter::handleSeriesRemoved(QAbstractSeries* series)
             {
                 Chart* item = m_chartItems.take(series);
                 Q_ASSERT(item);
                 if(m_animator) {
                     //small hack to handle area animations
-                    if(series->type()==QSeries::SeriesTypeArea){
+                    if(series->type() == QAbstractSeries::SeriesTypeArea){
                         QAreaSeries* areaSeries = static_cast<QAreaSeries*>(series);
                         AreaChartItem* area = static_cast<AreaChartItem*>(item);
                         m_animator->removeAnimation(area->upperLineItem());
             void ChartPresenter::resetAllElements()
             {
-                QList<QChartAxis*> axisList = m_axisItems.uniqueKeys();
+                QList<QChartAxis *> axisList = m_axisItems.uniqueKeys();
-                QList<QSeries*> seriesList = m_chartItems.uniqueKeys();
+                QList<QAbstractSeries *> seriesList = m_chartItems.uniqueKeys();
-                foreach(QChartAxis* axis, axisList) {
+                foreach(QChartAxis *axis, axisList) {
                     handleAxisRemoved(axis);
                     handleAxisAdded(axis,m_dataset->domain(axis));
                 }
-                foreach(QSeries* series, seriesList) {
+                foreach(QAbstractSeries *series, seriesList) {
                     handleSeriesRemoved(series);
                     handleSeriesAdded(series,m_dataset->domain(series));
                 }

0

src/chartpresenter_p.h +5 -5

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class Chart;
-            class QSeries;
+            class QAbstractSeries;
             class ChartDataSet;
             class Domain;
             class Axis;
                 QRectF margins() const { return m_chartMargins;}
             public Q_SLOTS:
-                void handleSeriesAdded(QSeries* series,Domain* domain);
+                void handleSeriesAdded(QAbstractSeries* series,Domain* domain);
-                void handleSeriesRemoved(QSeries* series);
+                void handleSeriesRemoved(QAbstractSeries* series);
                 void handleAxisAdded(QChartAxis* axis,Domain* domain);
                 void handleAxisRemoved(QChartAxis* axis);
                 void updateLayout();
                 ChartAnimator* m_animator;
                 ChartDataSet* m_dataset;
                 ChartTheme *m_chartTheme;
-                QMap<QSeries*,Chart*> m_chartItems;
+                QMap<QAbstractSeries *, Chart *> m_chartItems;
-                QMap<QChartAxis*,Axis*> m_axisItems;
+                QMap<QChartAxis *, Axis *> m_axisItems;
                 QRectF m_rect;
                 QRectF m_chartRect;
                 QChart::AnimationOptions m_options;

0

src/charttheme_p.h 0 -1

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartItem;
-            class QSeries;
             class LineChartItem;
             class QLineSeries;
             class BarChartItem;

0

src/legend/legendmarker.cpp +2 -2

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            LegendMarker::LegendMarker(QSeries* series,QLegend *legend) : QGraphicsObject(legend),
+            LegendMarker::LegendMarker(QAbstractSeries *series, QLegend *legend) : QGraphicsObject(legend),
             m_series(series),
             m_markerRect(0,0,10.0,10.0),
             m_boundingRect(0,0,0,0),
             {
                 setLabel(m_series->name());
-                if(m_series->type()== QSeries::SeriesTypeScatter)
+                if(m_series->type()== QAbstractSeries::SeriesTypeScatter)
                 {
                     setBrush(m_series->brush());

0

src/legend/legendmarker_p.h +4 -4

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class QSeries;
+            class QAbstractSeries;
             class QAreaSeries;
             class QXYSeries;
             class QBarSet;
                 Q_OBJECT
             public:
-                explicit LegendMarker(QSeries* m_series,QLegend *parent);
+                explicit LegendMarker(QAbstractSeries *m_series, QLegend *parent);
                 void setPen(const QPen &pen);
                 QPen pen() const;
                 void setLabel(const QString label);
                 QString label() const;
-                QSeries* series() const { return m_series;}
+                QAbstractSeries *series() const { return m_series;}
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
                 virtual void updated() = 0;
             protected:
-                QSeries* m_series;
+                QAbstractSeries *m_series;
                 QRectF m_markerRect;
                 QRectF m_boundingRect;
                 QLegend* m_legend;

0

src/legend/qlegend.cpp +10 -10

             #include "qlegend.h"
             #include "qlegend_p.h"
-            #include "qseries.h"
+            #include "qabstractseries.h"
-            #include "qseries_p.h"
+            #include "qabstractseries_p.h"
             #include "qchart_p.h"
             #include "legendmarker_p.h"
              \mainclass
-             \sa QChart, QSeries
+             \sa QChart, QAbstractSeries
              */
             /*!
                 setFlags(QGraphicsItem::ItemClipsChildrenToShape);
                 setEnabled(false); // By default legend is disabled
                 setVisible(false);
-                QObject::connect(chart->d_ptr->m_dataset,SIGNAL(seriesAdded(QSeries*,Domain*)),d_ptr.data(),SLOT(handleSeriesAdded(QSeries*,Domain*)));
+                QObject::connect(chart->d_ptr->m_dataset,SIGNAL(seriesAdded(QAbstractSeries *, Domain *)),d_ptr.data(),SLOT(handleSeriesAdded(QAbstractSeries *,Domain*)));
-                QObject::connect(chart->d_ptr->m_dataset,SIGNAL(seriesRemoved(QSeries*)),d_ptr.data(),SLOT(handleSeriesRemoved(QSeries*)));
+                QObject::connect(chart->d_ptr->m_dataset,SIGNAL(seriesRemoved(QAbstractSeries *)),d_ptr.data(),SLOT(handleSeriesRemoved(QAbstractSeries *)));
             }
             QLegend::~QLegend()
                 m_presenter->updateLayout();
             }
-            void QLegendPrivate::handleSeriesAdded(QSeries *series, Domain *domain)
+            void QLegendPrivate::handleSeriesAdded(QAbstractSeries *series, Domain *domain)
             {
                 Q_UNUSED(domain)
                 foreach(LegendMarker* marker , markers)
                     m_markers->addToGroup(marker);
-                if(series->type()==QSeries::SeriesTypePie)
+                if(series->type() == QAbstractSeries::SeriesTypePie)
                 {
                     QPieSeries *pieSeries = static_cast<QPieSeries *>(series);
                     QObject::connect(pieSeries,SIGNAL(added(QList<QPieSlice*>)),this,SLOT(handleUpdateSeries()));
                 updateLayout();
             }
-            void QLegendPrivate::handleSeriesRemoved(QSeries *series)
+            void QLegendPrivate::handleSeriesRemoved(QAbstractSeries *series)
             {
                 QList<QGraphicsItem *> items = m_markers->childItems();
                     }
                 }
-                if(series->type()==QSeries::SeriesTypePie)
+                if(series->type() == QAbstractSeries::SeriesTypePie)
                 {
                     QPieSeries *pieSeries = static_cast<QPieSeries *>(series);
                     QObject::disconnect(pieSeries,SIGNAL(added(QList<QPieSlice*>)),this,SLOT(handleUpdateSeries()));
             void QLegendPrivate::handleUpdateSeries()
             {
                 //TODO: reimplement to be optimal
-                QSeries* series = qobject_cast<QSeries *> (sender());
+                QAbstractSeries* series = qobject_cast<QAbstractSeries *> (sender());
                 Q_ASSERT(series);
                 handleSeriesRemoved(series);
                 handleSeriesAdded(series,0);

0

src/legend/qlegend.h 0 -2

             class QPieSeries;
             class QAreaSeries;
             class LegendScrollButton;
-            class QSeries;
             class QChart;
             class QLegendPrivate;

0

src/legend/qlegend_p.h +3 -2

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartPresenter;
+            class QAbstractSeries;
             class QLegendPrivate : public QObject
             {
                 void updateLayout();
             public Q_SLOTS:
-                void handleSeriesAdded(QSeries *series, Domain *domain);
+                void handleSeriesAdded(QAbstractSeries *series, Domain *domain);
-                void handleSeriesRemoved(QSeries *series);
+                void handleSeriesRemoved(QAbstractSeries *series);
                 void handleUpdateSeries(); //TODO remove this function
             private:

0

src/linechart/qlineseries.cpp +3 -3

             /*!
                 \fn virtual QSeriesType QLineSeries::type() const
                 \brief Returns type of series.
-                \sa QSeries, QSeriesType
+                \sa QAbstractSeries, QSeriesType
             */
             /*!
             {
             }
-            QSeries::QSeriesType QLineSeries::type() const
+            QAbstractSeries::QSeriesType QLineSeries::type() const
             {
-                return QSeries::SeriesTypeLine;
+                return QAbstractSeries::SeriesTypeLine;
             }
             /*

0

src/linechart/qlineseries.h +1 -1

                 explicit QLineSeries(QObject *parent = 0);
                 ~QLineSeries();
-                QSeries::QSeriesType type() const;
+                QAbstractSeries::QSeriesType type() const;
             protected:
                 QLineSeries(QLineSeriesPrivate &d,QObject *parent = 0);

0

src/piechart/qpieseries.cpp +5 -5

                 Constructs a series object which is a child of \a parent.
             */
             QPieSeries::QPieSeries(QObject *parent) :
-                QSeries(*new QPieSeriesPrivate(this),parent)
+                QAbstractSeries(*new QPieSeriesPrivate(this),parent)
             {
             }
             /*!
                 Returns QChartSeries::SeriesTypePie.
             */
-            QSeries::QSeriesType QPieSeries::type() const
+            QAbstractSeries::QSeriesType QPieSeries::type() const
             {
-                return QSeries::SeriesTypePie;
+                return QAbstractSeries::SeriesTypePie;
             }
             /*!
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-            QPieSeriesPrivate::QPieSeriesPrivate(QPieSeries *parent)
+            QPieSeriesPrivate::QPieSeriesPrivate(QPieSeries *parent) :
-                :QSeriesPrivate(parent),
+                QAbstractSeriesPrivate(parent),
                 m_pieRelativeHorPos(0.5),
                 m_pieRelativeVerPos(0.5),
                 m_pieRelativeSize(0.7),

0

src/piechart/qpieseries.h +2 -2

             #ifndef PIESERIES_H
             #define PIESERIES_H
-            #include <qseries.h>
+            #include <qabstractseries.h>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QPieSeriesPrivate;
             class QPieSlice;
-            class QTCOMMERCIALCHART_EXPORT QPieSeries : public QSeries
+            class QTCOMMERCIALCHART_EXPORT QPieSeries : public QAbstractSeries
             {
                 Q_OBJECT
                 Q_PROPERTY(qreal horizontalPosition READ horizontalPosition WRITE setHorizontalPosition)

0

src/piechart/qpieseries_p.h +2 -2

             #define QPIESERIES_P_H
             #include "qpieseries.h"
-            #include "qseries_p.h"
+            #include "qabstractseries_p.h"
             class QModelIndex;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class QPieSeriesPrivate : public QSeriesPrivate
+            class QPieSeriesPrivate : public QAbstractSeriesPrivate
             {
                 Q_OBJECT

0

src/qabstractseries.cpp ~~src/qseries.cpp~~ renamed +17 -17

             **
             ****************************************************************************/
-            #include "qseries.h"
+            #include "qabstractseries.h"
-            #include "qseries_p.h"
+            #include "qabstractseries_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
-                \class QSeries
+                \class QAbstractSeries
                 \brief Base class for all QtCommercial Chart series.
                 \mainclass
             */
             /*!
-                \enum QSeries::QSeriesType
+                \enum QAbstractSeries::QSeriesType
                 The type of the series object.
             */
             /*!
-                \fn QSeriesType QSeries::type() const
+                \fn QSeriesType QAbstractSeries::type() const
                 \brief The type of the series.
             */
             /*!
-                \fn bool QSeries::setModel(QAbstractItemModel *model)
+                \fn bool QAbstractSeries::setModel(QAbstractItemModel *model)
                 \brief Use the \a model to provide data for the series. The model overrides possible user data
                 set with QChartSeries type specific data setters. For example if you call both
                 QScatterSeries::addData() and QScatterSeries::setModel, only the data provided by the model is
             */
             /*!
-                \property QSeries::name
+                \property QAbstractSeries::name
                 \brief name of the series property
             */
             /*!
-                \fn void QSeries::setName(const QString& name)
+                \fn void QAbstractSeries::setName(const QString& name)
                 \brief Sets a \a name for the series.
                 The name of a series is shown in the legend for QXYSeries.
                 \internal
                 \brief Constructs ChartSeries object with \a parent.
             */
-            QSeries::QSeries(QSeriesPrivate &d, QObject *parent) :
+            QAbstractSeries::QAbstractSeries(QAbstractSeriesPrivate &d, QObject *parent) :
                 QObject(parent),
                 d_ptr(&d)
             {
             /*!
                 \brief Virtual destructor for the chart series.
             */
-            QSeries::~QSeries()
+            QAbstractSeries::~QAbstractSeries()
             {
             }
             /*!
                 \brief Returns the pointer to the model that is used as the series data source
             */
-            QAbstractItemModel* QSeries::model() const
+            QAbstractItemModel* QAbstractSeries::model() const
             {
                 return d_ptr->m_model;
             }
-            void QSeries::setName(const QString& name)
+            void QAbstractSeries::setName(const QString& name)
             {
                 d_ptr->m_name = name;
             }
                 \brief Returns the name of the series.
                 \sa setName()
             */
-            QString QSeries::name() const
+            QString QAbstractSeries::name() const
             {
                 return d_ptr->m_name;
             }
             ///////////////////////////////////////////////////////////////////////////////////////////////////
-            QSeriesPrivate::QSeriesPrivate(QSeries* q): q_ptr(q),m_model(0)
+            QAbstractSeriesPrivate::QAbstractSeriesPrivate(QAbstractSeries* q): q_ptr(q),m_model(0)
             {
             }
-            QSeriesPrivate::~QSeriesPrivate()
+            QAbstractSeriesPrivate::~QAbstractSeriesPrivate()
             {
             }
-            #include "moc_qseries.cpp"
+            #include "moc_qabstractseries.cpp"
-            #include "moc_qseries_p.cpp"
+            #include "moc_qabstractseries_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

0

src/qabstractseries.h ~~src/qseries.h~~ renamed +7 -7

             **
             ****************************************************************************/
-            #ifndef QSERIES_H
+            #ifndef QABSTRACTSERIES_H
-            #define QSERIES_H
+            #define QABSTRACTSERIES_H
             #include <qchartglobal.h>
             #include <QObject>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class QSeriesPrivate;
+            class QAbstractSeriesPrivate;
-            class QTCOMMERCIALCHART_EXPORT QSeries : public QObject
+            class QTCOMMERCIALCHART_EXPORT QAbstractSeries : public QObject
             {
                 Q_OBJECT
                 Q_PROPERTY(QString name READ name WRITE setName)
                 };
             protected:
-                QSeries(QSeriesPrivate &d, QObject *parent = 0);
+                QAbstractSeries(QAbstractSeriesPrivate &d, QObject *parent = 0);
             public:
-                ~QSeries();
+                ~QAbstractSeries();
                 virtual QSeriesType type() const = 0;
                 virtual bool setModel(QAbstractItemModel* model) = 0;
                 QAbstractItemModel* model() const;
                 QString name() const;
             protected:
-                QScopedPointer<QSeriesPrivate> d_ptr;
+                QScopedPointer<QAbstractSeriesPrivate> d_ptr;
                 friend class ChartDataSet;
                 friend class ChartPresenter;
                 friend class QLegendPrivate;

0

src/qabstractseries_p.h ~~src/qseries_p.h~~ renamed +8 -8

             //
             // We mean it.
-            #ifndef QSERIES_P_H
+            #ifndef QABSTRACTSERIES_P_H
-            #define QSERIES_P_H
+            #define QABSTRACTSERIES_P_H
-            #include "qseries.h"
+            #include "qabstractseries.h"
             class QAbstractItemModel;
             class LegendMarker;
             class QLegend;
-            class QSeriesPrivate : public QObject
+            class QAbstractSeriesPrivate : public QObject
             {
                 Q_OBJECT
             public:
-                QSeriesPrivate(QSeries *q);
+                QAbstractSeriesPrivate(QAbstractSeries *q);
-                ~QSeriesPrivate();
+                ~QAbstractSeriesPrivate();
                 virtual void scaleDomain(Domain& domain) = 0;
                 virtual Chart* createGraphics(ChartPresenter* presenter) = 0;
                 virtual QList<LegendMarker*> createLegendMarker(QLegend* legend) = 0;
             protected:
-                QSeries *q_ptr;
+                QAbstractSeries *q_ptr;
                 QAbstractItemModel *m_model;
                 QString m_name;
-                friend class QSeries;
+                friend class QAbstractSeries;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

0

src/qchart.cpp +5 -5

              If auto scaling is enabled, re-scales the axes the series is bound to (both the x axis and
              the y axis).
              */
-            void QChart::addSeries(QSeries* series, QChartAxis* axisY)
+            void QChart::addSeries(QAbstractSeries *series, QChartAxis *axisY)
             {
                 Q_ASSERT(series);
                 d_ptr->m_dataset->addSeries(series, axisY);
              It does not delete the pointed QChartSeries data object
              \sa addSeries(), removeAllSeries()
              */
-            void QChart::removeSeries(QSeries* series)
+            void QChart::removeSeries(QAbstractSeries *series)
             {
                 Q_ASSERT(series);
                 d_ptr->m_dataset->removeSeries(series);
              Returns the pointer to the y axis object of the \a series
              If no \a series is provided then default Y axis of the chart is returned.
              */
-            QChartAxis* QChart::axisY(QSeries* series) const
+            QChartAxis* QChart::axisY(QAbstractSeries *series) const
             {
                 return d_ptr->m_dataset->axisY(series);
             }
             void QChartPrivate::createConnections()
             {
-                QObject::connect(m_dataset,SIGNAL(seriesAdded(QSeries*,Domain*)),m_presenter,SLOT(handleSeriesAdded(QSeries*,Domain*)));
+                QObject::connect(m_dataset,SIGNAL(seriesAdded(QAbstractSeries *, Domain *)),m_presenter,SLOT(handleSeriesAdded(QAbstractSeries *, Domain *)));
-                QObject::connect(m_dataset,SIGNAL(seriesRemoved(QSeries*)),m_presenter,SLOT(handleSeriesRemoved(QSeries*)));
+                QObject::connect(m_dataset,SIGNAL(seriesRemoved(QAbstractSeries *)),m_presenter,SLOT(handleSeriesRemoved(QAbstractSeries *)));
                 QObject::connect(m_dataset,SIGNAL(axisAdded(QChartAxis*,Domain*)),m_presenter,SLOT(handleAxisAdded(QChartAxis*,Domain*)));
                 QObject::connect(m_dataset,SIGNAL(axisRemoved(QChartAxis*)),m_presenter,SLOT(handleAxisRemoved(QChartAxis*)));
             }

0

src/qchart.h +5 -5

             #ifndef QCHART_H
             #define QCHART_H
-            #include <QSeries>
+            #include <QAbstractSeries>
             #include <QLegend>
             #include <QGraphicsWidget>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class QSeries;
+            class QAbstractSeries;
             class QChartAxis;
             class QLegend;
             struct QChartPrivate;
                 explicit QChart(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0);
                 ~QChart();
-                void addSeries(QSeries *series, QChartAxis *axisY = 0);
+                void addSeries(QAbstractSeries *series, QChartAxis *axisY = 0);
-                void removeSeries(QSeries *series);
+                void removeSeries(QAbstractSeries *series);
                 void removeAllSeries();
                 void setTheme(QChart::ChartTheme theme);
                 void scrollDown();
                 QChartAxis* axisX() const;
-                QChartAxis* axisY(QSeries* series = 0) const;
+                QChartAxis* axisY(QAbstractSeries* series = 0) const;
                 QLegend* legend() const;
                 QRectF margins() const;

0

src/qchartview.h +1 -1

             #define QCHARTVIEW_H
             #include <QChartAxis>
-            #include <QSeries>
+            #include <QAbstractSeries>
             #include <QChart>
             #include <QGraphicsView>

0

src/scatterseries/qscatterseries.cpp +3 -3

             /*!
                 \fn QChartSeriesType QScatterSeries::type() const
                 \brief Returns QChartSeries::SeriesTypeScatter.
-                \sa QSeries, QSeriesType
+                \sa QAbstractSeries, QSeriesType
             */
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             {
             }
-            QSeries::QSeriesType QScatterSeries::type() const
+            QAbstractSeries::QSeriesType QScatterSeries::type() const
             {
-                return QSeries::SeriesTypeScatter;
+                return QAbstractSeries::SeriesTypeScatter;
             }
             /*!

0

src/scatterseries/qscatterseries.h +1 -1

                 explicit QScatterSeries(QObject *parent = 0);
                 ~QScatterSeries();
-                QSeries::QSeriesType type() const;
+                QAbstractSeries::QSeriesType type() const;
                 MarkerShape shape() const;
                 void setShape(MarkerShape shape);

0

src/splinechart/qsplineseries.cpp +2 -2

             {
             }
-            QSeries::QSeriesType QSplineSeries::type() const
+            QAbstractSeries::QSeriesType QSplineSeries::type() const
             {
-                return QSeries::SeriesTypeSpline;
+                return QAbstractSeries::SeriesTypeSpline;
             }
             QPointF QSplineSeries::controlPoint(int index) const

0

src/splinechart/qsplineseries.h +1 -1

             public:
                 explicit QSplineSeries(QObject *parent = 0);
-                QSeries::QSeriesType type() const;
+                QAbstractSeries::QSeriesType type() const;
                 QPointF controlPoint(int index) const;
                 void setModelMappingRange(int first, int count);

0

src/src.pro +3 -3

                 $$PWD/domain.cpp \
                 $$PWD/qchart.cpp \
                 $$PWD/qchartview.cpp \
-                $$PWD/qseries.cpp \
+                $$PWD/qabstractseries.cpp \
                 $$PWD/chartbackground.cpp \
                 $$PWD/chart.cpp \
                 $$PWD/scroller.cpp
                 $$PWD/qchart_p.h \
                 $$PWD/qchartview_p.h \
                 $$PWD/scroller_p.h \
-                $$PWD/qseries_p.h
+                $$PWD/qabstractseries_p.h
             PUBLIC_HEADERS += \
                 $$PWD/qchart.h \
                 $$PWD/qchartglobal.h \
-                $$PWD/qseries.h \
+                $$PWD/qabstractseries.h \
                 $$PWD/qchartview.h
             include(animations/animations.pri)

0

src/xychart/qxyseries.cpp +9 -10

                 Constructs empty series object which is a child of \a parent.
                 When series object is added to QChartView or QChart instance ownerships is transferred.
             */
-            QXYSeries::QXYSeries(QXYSeriesPrivate &d,QObject *parent):QSeries(d,parent)
+            QXYSeries::QXYSeries(QXYSeriesPrivate &d,QObject *parent) : QAbstractSeries(d, parent)
             {
             }
             //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-            QXYSeriesPrivate::QXYSeriesPrivate(QXYSeries *q): QSeriesPrivate(q),
+            QXYSeriesPrivate::QXYSeriesPrivate(QXYSeries *q) : QAbstractSeriesPrivate(q),
-            m_mapX(-1),
+                m_mapX(-1),
-            m_mapY(-1),
+                m_mapY(-1),
-            m_mapFirst(0),
+                m_mapFirst(0),
-            m_mapCount(0),
+                m_mapCount(0),
-            m_mapLimited(false),
+                m_mapLimited(false),
-            m_mapOrientation( Qt::Vertical),
+                m_mapOrientation( Qt::Vertical),
-            m_pointsVisible(false)
+                m_pointsVisible(false)
             {
             }
             void QXYSeriesPrivate::scaleDomain(Domain& domain)

0

src/xychart/qxyseries.h +2 -2

             #define QXYSERIES_H
             #include <qchartglobal.h>
-            #include <qseries.h>
+            #include <qabstractseries.h>
             #include <QPen>
             #include <QBrush>
             class QXYSeriesPrivate;
-            class QTCOMMERCIALCHART_EXPORT QXYSeries : public QSeries
+            class QTCOMMERCIALCHART_EXPORT QXYSeries : public QAbstractSeries
             {
                 Q_OBJECT
             protected:

0

src/xychart/qxyseries_p.h +2 -2

             #ifndef QXYSERIES_P_H
             #define QXYSERIES_P_H
-            #include "qseries_p.h"
+            #include "qabstractseries_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QXYSeries;
-            class QXYSeriesPrivate: public QSeriesPrivate
+            class QXYSeriesPrivate: public QAbstractSeriesPrivate
             {
                 Q_OBJECT

0

test/auto/chartdataset/tst_chartdataset.cpp +22 -22

             QTCOMMERCIALCHART_USE_NAMESPACE
-            Q_DECLARE_METATYPE(Domain*)
+            Q_DECLARE_METATYPE(Domain *)
-            Q_DECLARE_METATYPE(QChartAxis*)
+            Q_DECLARE_METATYPE(QChartAxis *)
-            Q_DECLARE_METATYPE(QSeries*)
+            Q_DECLARE_METATYPE(QAbstractSeries *)
-            Q_DECLARE_METATYPE(QLineSeries*)
+            Q_DECLARE_METATYPE(QLineSeries *)
             class tst_ChartDataSet: public QObject {
                 QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis*,Domain*)));
                 QSignalSpy spy1(&dataSet, SIGNAL(axisRemoved(QChartAxis*)));
-                QSignalSpy spy2(&dataSet, SIGNAL(seriesAdded(QSeries*,Domain*)));
+                QSignalSpy spy2(&dataSet, SIGNAL(seriesAdded(QAbstractSeries *,Domain*)));
-                QSignalSpy spy3(&dataSet, SIGNAL(seriesRemoved(QSeries*)));
+                QSignalSpy spy3(&dataSet, SIGNAL(seriesRemoved(QAbstractSeries *)));
                 dataSet.addSeries(series0,axis0);
                 dataSet.addSeries(series1,axis1);
                 dataSet.addSeries(series1,axis1);
                 dataSet.addSeries(series2,axis2);
-                QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis*,Domain*)));
+                QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis *, Domain *)));
-                QSignalSpy spy1(&dataSet, SIGNAL(axisRemoved(QChartAxis*)));
+                QSignalSpy spy1(&dataSet, SIGNAL(axisRemoved(QChartAxis *)));
-                QSignalSpy spy2(&dataSet, SIGNAL(seriesAdded(QSeries*,Domain*)));
+                QSignalSpy spy2(&dataSet, SIGNAL(seriesAdded(QAbstractSeries *, Domain *)));
-                QSignalSpy spy3(&dataSet, SIGNAL(seriesRemoved(QSeries*)));
+                QSignalSpy spy3(&dataSet, SIGNAL(seriesRemoved(QAbstractSeries *)));
                 dataSet.removeSeries(series0);
                 dataSet.removeSeries(series1);
                 dataSet.addSeries(series1, axis1);
                 dataSet.addSeries(series2, axis2);
-                QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis*,Domain*)));
+                QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis *, Domain *)));
-                QSignalSpy spy1(&dataSet, SIGNAL(axisRemoved(QChartAxis*)));
+                QSignalSpy spy1(&dataSet, SIGNAL(axisRemoved(QChartAxis *)));
-                QSignalSpy spy2(&dataSet, SIGNAL(seriesAdded(QSeries*,Domain*)));
+                QSignalSpy spy2(&dataSet, SIGNAL(seriesAdded(QAbstractSeries *, Domain *)));
-                QSignalSpy spy3(&dataSet, SIGNAL(seriesRemoved(QSeries*)));
+                QSignalSpy spy3(&dataSet, SIGNAL(seriesRemoved(QAbstractSeries *)));
                 dataSet.removeAllSeries();
                 dataSet.addSeries(series1, axis1);
                 dataSet.addSeries(series2, axis2);
-                QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis*,Domain*)));
+                QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis *, Domain *)));
-                QSignalSpy spy1(&dataSet, SIGNAL(axisRemoved(QChartAxis*)));
+                QSignalSpy spy1(&dataSet, SIGNAL(axisRemoved(QChartAxis *)));
-                QSignalSpy spy2(&dataSet, SIGNAL(seriesAdded(QSeries*,Domain*)));
+                QSignalSpy spy2(&dataSet, SIGNAL(seriesAdded(QAbstractSeries *, Domain *)));
-                QSignalSpy spy3(&dataSet, SIGNAL(seriesRemoved(QSeries*)));
+                QSignalSpy spy3(&dataSet, SIGNAL(seriesRemoved(QAbstractSeries *)));
                 QCOMPARE(dataSet.seriesCount(series0->type()),3);
                 QCOMPARE(spy0.count(), 0);
                 dataSet.addSeries(series1, axis1);
                 dataSet.addSeries(series2, axis2);
-                QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis*,Domain*)));
+                QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis *, Domain *)));
-                QSignalSpy spy1(&dataSet, SIGNAL(axisRemoved(QChartAxis*)));
+                QSignalSpy spy1(&dataSet, SIGNAL(axisRemoved(QChartAxis *)));
-                QSignalSpy spy2(&dataSet, SIGNAL(seriesAdded(QSeries*,Domain*)));
+                QSignalSpy spy2(&dataSet, SIGNAL(seriesAdded(QAbstractSeries *, Domain *)));
-                QSignalSpy spy3(&dataSet, SIGNAL(seriesRemoved(QSeries*)));
+                QSignalSpy spy3(&dataSet, SIGNAL(seriesRemoved(QAbstractSeries *)));
                 QVERIFY(dataSet.domain(axis0)==dataSet.domain(series0));
                 QVERIFY(dataSet.domain(axis1)==dataSet.domain(series1));

0

test/auto/qchart/tst_qchart.cpp +16 -16

             QTCOMMERCIALCHART_USE_NAMESPACE
-            Q_DECLARE_METATYPE(QChartAxis*)
+            Q_DECLARE_METATYPE(QChartAxis *)
-            Q_DECLARE_METATYPE(QSeries*)
+            Q_DECLARE_METATYPE(QAbstractSeries *)
             Q_DECLARE_METATYPE(QChart::AnimationOption)
             Q_DECLARE_METATYPE(QBrush)
             Q_DECLARE_METATYPE(QPen)
             void tst_QChart::addSeries_data()
             {
-                QTest::addColumn<QSeries*>("series");
+                QTest::addColumn<QAbstractSeries *>("series");
-                QTest::addColumn<QChartAxis*>("axis");
+                QTest::addColumn<QChartAxis *>("axis");
-                QSeries* series0 = new QLineSeries(this);
+                QAbstractSeries* series0 = new QLineSeries(this);
-                QSeries* series1 = new QAreaSeries(static_cast<QLineSeries*>(series0));
+                QAbstractSeries* series1 = new QAreaSeries(static_cast<QLineSeries*>(series0));
-                QSeries* series2 = new QScatterSeries(this);
+                QAbstractSeries* series2 = new QScatterSeries(this);
-                QSeries* series3 = new QSplineSeries(this);
+                QAbstractSeries* series3 = new QSplineSeries(this);
-                QSeries* series4 = new QPieSeries(this);
+                QAbstractSeries* series4 = new QPieSeries(this);
-                QSeries* series5 = new QBarSeries(QBarCategories(),this);
+                QAbstractSeries* series5 = new QBarSeries(QBarCategories(),this);
-                QSeries* series6 = new QPercentBarSeries(QBarCategories(),this);
+                QAbstractSeries* series6 = new QPercentBarSeries(QBarCategories(),this);
-                QSeries* series7 = new QStackedBarSeries(QBarCategories(),this);
+                QAbstractSeries* series7 = new QStackedBarSeries(QBarCategories(),this);
                 QChartAxis* axis = new QChartAxis(this);
             void tst_QChart::addSeries()
             {
-                QFETCH(QSeries*, series);
+                QFETCH(QAbstractSeries *, series);
-                QFETCH(QChartAxis*, axis);
+                QFETCH(QChartAxis *, axis);
                 m_view->show();
                 QTest::qWaitForWindowShown(m_view);
                 if(!axis) axis = m_chart->axisY();
             void tst_QChart::removeSeries()
             {
-                QFETCH(QSeries*, series);
+                QFETCH(QAbstractSeries *, series);
-                QFETCH(QChartAxis*, axis);
+                QFETCH(QChartAxis *, axis);
                 m_view->show();
                 QTest::qWaitForWindowShown(m_view);
                 if(!axis) axis = m_chart->axisY();

0

test/tablemodelchart/tablewidget.h 0 -1

             class QTableView;
             class QRadioButton;
             class QSpinBox;
-            //class QSeries;
             class TableWidget : public QWidget
             {

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages