diff --git a/plugins/declarative/declarativebarseries.cpp b/plugins/declarative/declarativebarseries.cpp index 51c6689..6f1a821 100644 --- a/plugins/declarative/declarativebarseries.cpp +++ b/plugins/declarative/declarativebarseries.cpp @@ -61,7 +61,7 @@ void DeclarativeBarSet::setValues(QVariantList values) } DeclarativeBarSeries::DeclarativeBarSeries(QDeclarativeItem *parent) : - QBarSeries(parent) + QAbstractBarSeries(parent) { connect(this, SIGNAL(barsetsAdded(QList)), this, SLOT(handleAdded(QList))); connect(this, SIGNAL(barsetsRemoved(QList)), this, SLOT(handleRemoved(QList))); @@ -91,7 +91,7 @@ void DeclarativeBarSeries::componentComplete() { foreach(QObject *child, children()) { if (qobject_cast(child)) { - QBarSeries::append(qobject_cast(child)); + QAbstractBarSeries::append(qobject_cast(child)); } else if (qobject_cast(child)) { QVBarModelMapper *mapper = qobject_cast(child); mapper->setSeries(this); @@ -154,7 +154,7 @@ DeclarativeBarSet *DeclarativeBarSeries::insert(int index, QString label, QVaria DeclarativeBarSet *barset = new DeclarativeBarSet(this); barset->setLabel(label); barset->setValues(values); - if (QBarSeries::insert(insertIndex, barset)) + if (QAbstractBarSeries::insert(insertIndex, barset)) return barset; delete barset; return 0; @@ -173,7 +173,7 @@ void DeclarativeGroupedBarSeries::componentComplete() { foreach(QObject *child, children()) { if (qobject_cast(child)) { - QBarSeries::append(qobject_cast(child)); + QAbstractBarSeries::append(qobject_cast(child)); } else if(qobject_cast(child)) { QVBarModelMapper *mapper = qobject_cast(child); mapper->setSeries(this); @@ -249,7 +249,7 @@ void DeclarativeStackedBarSeries::componentComplete() { foreach(QObject *child, children()) { if (qobject_cast(child)) { - QBarSeries::append(qobject_cast(child)); + QAbstractBarSeries::append(qobject_cast(child)); } else if(qobject_cast(child)) { QVBarModelMapper *mapper = qobject_cast(child); mapper->setSeries(this); @@ -325,7 +325,7 @@ void DeclarativePercentBarSeries::componentComplete() { foreach(QObject *child, children()) { if (qobject_cast(child)) { - QBarSeries::append(qobject_cast(child)); + QAbstractBarSeries::append(qobject_cast(child)); } else if(qobject_cast(child)) { QVBarModelMapper *mapper = qobject_cast(child); mapper->setSeries(this); diff --git a/plugins/declarative/declarativebarseries.h b/plugins/declarative/declarativebarseries.h index 6484466..91488f9 100644 --- a/plugins/declarative/declarativebarseries.h +++ b/plugins/declarative/declarativebarseries.h @@ -58,7 +58,7 @@ private Q_SLOTS: void handleCountChanged(int index, int count); }; -class DeclarativeBarSeries : public QBarSeries, public QDeclarativeParserStatus +class DeclarativeBarSeries : public QAbstractBarSeries, public QDeclarativeParserStatus { Q_OBJECT Q_INTERFACES(QDeclarativeParserStatus) @@ -77,8 +77,8 @@ public: Q_INVOKABLE DeclarativeBarSet *at(int index); Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); } Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values); - Q_INVOKABLE bool remove(QBarSet *barset) { return QBarSeries::remove(barset); } - Q_INVOKABLE void clear() { return QBarSeries::clear(); } + Q_INVOKABLE bool remove(QBarSet *barset) { return QAbstractBarSeries::remove(barset); } + Q_INVOKABLE void clear() { return QAbstractBarSeries::clear(); } public: // from QDeclarativeParserStatus void classBegin(); diff --git a/src/barchart/barchartitem.cpp b/src/barchart/barchartitem.cpp index 305362d..37b087a 100644 --- a/src/barchart/barchartitem.cpp +++ b/src/barchart/barchartitem.cpp @@ -32,7 +32,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE -BarChartItem::BarChartItem(QBarSeries *series, ChartPresenter *presenter) : +BarChartItem::BarChartItem(QAbstractBarSeries *series, ChartPresenter *presenter) : ChartItem(presenter), m_series(series) { diff --git a/src/barchart/barchartitem_p.h b/src/barchart/barchartitem_p.h index 10b685d..5921b01 100644 --- a/src/barchart/barchartitem_p.h +++ b/src/barchart/barchartitem_p.h @@ -46,7 +46,7 @@ class BarChartItem : public ChartItem { Q_OBJECT public: - BarChartItem(QBarSeries *series, ChartPresenter *presenter); + BarChartItem(QAbstractBarSeries *series, ChartPresenter *presenter); virtual ~BarChartItem(); public: @@ -79,7 +79,7 @@ protected: QVector m_layout; // Not owned. - QBarSeries *m_series; + QAbstractBarSeries *m_series; QList m_bars; QList m_labels; }; diff --git a/src/barchart/groupedbarchartitem.cpp b/src/barchart/groupedbarchartitem.cpp index d502da3..b83bb2c 100644 --- a/src/barchart/groupedbarchartitem.cpp +++ b/src/barchart/groupedbarchartitem.cpp @@ -27,7 +27,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE -GroupedBarChartItem::GroupedBarChartItem(QBarSeries *series, ChartPresenter *presenter) : +GroupedBarChartItem::GroupedBarChartItem(QAbstractBarSeries *series, ChartPresenter *presenter) : BarChartItem(series, presenter) { } diff --git a/src/barchart/groupedbarchartitem_p.h b/src/barchart/groupedbarchartitem_p.h index 2b6c04b..5119907 100644 --- a/src/barchart/groupedbarchartitem_p.h +++ b/src/barchart/groupedbarchartitem_p.h @@ -41,7 +41,7 @@ class GroupedBarChartItem : public BarChartItem { Q_OBJECT public: - GroupedBarChartItem(QBarSeries *series, ChartPresenter *presenter); + GroupedBarChartItem(QAbstractBarSeries *series, ChartPresenter *presenter); private: virtual QVector calculateLayout(); diff --git a/src/barchart/percentbarchartitem.cpp b/src/barchart/percentbarchartitem.cpp index 1b46c6c..1d3171f 100644 --- a/src/barchart/percentbarchartitem.cpp +++ b/src/barchart/percentbarchartitem.cpp @@ -27,7 +27,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE -PercentBarChartItem::PercentBarChartItem(QBarSeries *series, ChartPresenter *presenter) : +PercentBarChartItem::PercentBarChartItem(QAbstractBarSeries *series, ChartPresenter *presenter) : BarChartItem(series, presenter) { } diff --git a/src/barchart/percentbarchartitem_p.h b/src/barchart/percentbarchartitem_p.h index 494a168..71a2a3f 100644 --- a/src/barchart/percentbarchartitem_p.h +++ b/src/barchart/percentbarchartitem_p.h @@ -36,13 +36,13 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE -class QBarSeries; +class QAbstractBarSeries; class PercentBarChartItem : public BarChartItem { Q_OBJECT public: - PercentBarChartItem(QBarSeries *series, ChartPresenter *presenter); + PercentBarChartItem(QAbstractBarSeries *series, ChartPresenter *presenter); private: virtual QVector calculateLayout(); diff --git a/src/barchart/qbarmodelmapper.cpp b/src/barchart/qbarmodelmapper.cpp index 6ef3ed6..d587f12 100644 --- a/src/barchart/qbarmodelmapper.cpp +++ b/src/barchart/qbarmodelmapper.cpp @@ -60,13 +60,13 @@ void QBarModelMapper::setModel(QAbstractItemModel *model) connect(d->m_model, SIGNAL(columnsRemoved(QModelIndex,int,int)), d, SLOT(modelColumnsRemoved(QModelIndex,int,int))); } -QBarSeries* QBarModelMapper::series() const +QAbstractBarSeries* QBarModelMapper::series() const { Q_D(const QBarModelMapper); return d->m_series; } -void QBarModelMapper::setSeries(QBarSeries *series) +void QBarModelMapper::setSeries(QAbstractBarSeries *series) { Q_D(QBarModelMapper); if (d->m_series) { diff --git a/src/barchart/qbarmodelmapper.h b/src/barchart/qbarmodelmapper.h index 02a2bd8..82c3e8f 100644 --- a/src/barchart/qbarmodelmapper.h +++ b/src/barchart/qbarmodelmapper.h @@ -29,7 +29,7 @@ class QAbstractItemModel; QTCOMMERCIALCHART_BEGIN_NAMESPACE class QBarModelMapperPrivate; -class QBarSeries; +class QAbstractBarSeries; class QChart; class QTCOMMERCIALCHART_EXPORT QBarModelMapper : public QObject @@ -42,8 +42,8 @@ protected: QAbstractItemModel* model() const; void setModel(QAbstractItemModel *model); - QBarSeries* series() const; - void setSeries(QBarSeries *series); + QAbstractBarSeries* series() const; + void setSeries(QAbstractBarSeries *series); int first() const; void setFirst(int first); diff --git a/src/barchart/qbarmodelmapper_p.h b/src/barchart/qbarmodelmapper_p.h index 37152b2..f0e4334 100644 --- a/src/barchart/qbarmodelmapper_p.h +++ b/src/barchart/qbarmodelmapper_p.h @@ -74,7 +74,7 @@ private: void blockSeriesSignals(bool block = true); private: - QBarSeries *m_series; + QAbstractBarSeries *m_series; QList m_barSets; QAbstractItemModel *m_model; int m_first; diff --git a/src/barchart/qbarseries.cpp b/src/barchart/qbarseries.cpp index 26ac0ef..5991999 100644 --- a/src/barchart/qbarseries.cpp +++ b/src/barchart/qbarseries.cpp @@ -192,17 +192,17 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE Constructs empty QBarSeries. QBarSeries is QObject which is a child of a \a parent. */ -QBarSeries::QBarSeries(QObject *parent) : - QAbstractSeries(*new QBarSeriesPrivate(this),parent) +QAbstractBarSeries::QAbstractBarSeries(QObject *parent) : + QAbstractSeries(*new QAbstractBarSeriesPrivate(this),parent) { } /*! Destructs barseries and owned barsets. */ -QBarSeries::~QBarSeries() +QAbstractBarSeries::~QAbstractBarSeries() { - Q_D(QBarSeries); + Q_D(QAbstractBarSeries); if(d->m_dataset){ d->m_dataset->removeSeries(this); } @@ -211,7 +211,7 @@ QBarSeries::~QBarSeries() /*! \internal */ -QBarSeries::QBarSeries(QBarSeriesPrivate &d, QObject *parent) : +QAbstractBarSeries::QAbstractBarSeries(QAbstractBarSeriesPrivate &d, QObject *parent) : QAbstractSeries(d,parent) { } @@ -219,7 +219,7 @@ QBarSeries::QBarSeries(QBarSeriesPrivate &d, QObject *parent) : /*! Returns the type of series. Derived classes override this. */ -QAbstractSeries::SeriesType QBarSeries::type() const +QAbstractSeries::SeriesType QAbstractBarSeries::type() const { return QAbstractSeries::SeriesTypeBar; } @@ -230,9 +230,9 @@ QAbstractSeries::SeriesType QBarSeries::type() const is one pixel no matter what the scale of x-axis is. Bars wider than zero are scaled with x-axis. Note that with \link QGroupedBarSeries \endlink this value means the width of one group of bars instead of just one bar. */ -void QBarSeries::setBarWidth(qreal width) +void QAbstractBarSeries::setBarWidth(qreal width) { - Q_D(QBarSeries); + Q_D(QAbstractBarSeries); d->setBarWidth(width); } @@ -240,9 +240,9 @@ void QBarSeries::setBarWidth(qreal width) Returns the width of the bars of the series. \sa setBarWidth() */ -qreal QBarSeries::barWidth() const +qreal QAbstractBarSeries::barWidth() const { - Q_D(const QBarSeries); + Q_D(const QAbstractBarSeries); return d->barWidth(); } @@ -250,9 +250,9 @@ qreal QBarSeries::barWidth() const Adds a set of bars to series. Takes ownership of \a set. If the set is null or is already in series, it won't be appended. Returns true, if appending succeeded. */ -bool QBarSeries::append(QBarSet *set) +bool QAbstractBarSeries::append(QBarSet *set) { - Q_D(QBarSeries); + Q_D(QAbstractBarSeries); bool success = d->append(set); if (success) { QList sets; @@ -267,9 +267,9 @@ bool QBarSeries::append(QBarSet *set) Removes a set of bars from series. Releases ownership of \a set. Doesn't delete \a set. Returns true, if set was removed. */ -bool QBarSeries::remove(QBarSet *set) +bool QAbstractBarSeries::remove(QBarSet *set) { - Q_D(QBarSeries); + Q_D(QAbstractBarSeries); bool success = d->remove(set); if (success) { QList sets; @@ -286,9 +286,9 @@ bool QBarSeries::remove(QBarSet *set) nothing is appended and function returns false. If any of the sets is in list more than once, nothing is appended and function returns false. */ -bool QBarSeries::append(QList sets) +bool QAbstractBarSeries::append(QList sets) { - Q_D(QBarSeries); + Q_D(QAbstractBarSeries); bool success = d->append(sets); if (success) { emit barsetsAdded(sets); @@ -302,9 +302,9 @@ bool QBarSeries::append(QList sets) Returns true, if inserting succeeded. */ -bool QBarSeries::insert(int index, QBarSet *set) +bool QAbstractBarSeries::insert(int index, QBarSet *set) { - Q_D(QBarSeries); + Q_D(QAbstractBarSeries); bool success = d->insert(index, set); if (success) { QList sets; @@ -318,9 +318,9 @@ bool QBarSeries::insert(int index, QBarSet *set) /*! Removes all of the bar sets from the series */ -void QBarSeries::clear() +void QAbstractBarSeries::clear() { - Q_D(QBarSeries); + Q_D(QAbstractBarSeries); QList sets = barSets(); bool success = d->remove(sets); if (success) { @@ -332,27 +332,27 @@ void QBarSeries::clear() /*! Returns number of sets in series. */ -int QBarSeries::count() const +int QAbstractBarSeries::count() const { - Q_D(const QBarSeries); + Q_D(const QAbstractBarSeries); return d->m_barSets.count(); } /*! Returns a list of sets in series. Keeps ownership of sets. */ -QList QBarSeries::barSets() const +QList QAbstractBarSeries::barSets() const { - Q_D(const QBarSeries); + Q_D(const QAbstractBarSeries); return d->m_barSets; } /*! Sets the visibility of labels in series to \a visible */ -void QBarSeries::setLabelsVisible(bool visible) +void QAbstractBarSeries::setLabelsVisible(bool visible) { - Q_D(QBarSeries); + Q_D(QAbstractBarSeries); if (d->m_labelsVisible != visible) { d->setLabelsVisible(visible); emit labelsVisibleChanged(); @@ -362,15 +362,15 @@ void QBarSeries::setLabelsVisible(bool visible) /*! Returns the visibility of labels */ -bool QBarSeries::isLabelsVisible() const +bool QAbstractBarSeries::isLabelsVisible() const { - Q_D(const QBarSeries); + Q_D(const QAbstractBarSeries); return d->m_labelsVisible; } /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -QBarSeriesPrivate::QBarSeriesPrivate(QBarSeries *q) : +QAbstractBarSeriesPrivate::QAbstractBarSeriesPrivate(QAbstractBarSeries *q) : QAbstractSeriesPrivate(q), m_barWidth(0.5), // Default value is 50% of category width m_labelsVisible(false), @@ -378,7 +378,7 @@ QBarSeriesPrivate::QBarSeriesPrivate(QBarSeries *q) : { } -int QBarSeriesPrivate::categoryCount() const +int QAbstractBarSeriesPrivate::categoryCount() const { // No categories defined. return count of longest set. int count = 0; @@ -391,7 +391,7 @@ int QBarSeriesPrivate::categoryCount() const return count; } -void QBarSeriesPrivate::setBarWidth(qreal width) +void QAbstractBarSeriesPrivate::setBarWidth(qreal width) { if (width < 0.0) { width = 0.0; @@ -400,29 +400,29 @@ void QBarSeriesPrivate::setBarWidth(qreal width) emit updatedBars(); } -qreal QBarSeriesPrivate::barWidth() const +qreal QAbstractBarSeriesPrivate::barWidth() const { return m_barWidth; } -QBarSet* QBarSeriesPrivate::barsetAt(int index) +QBarSet* QAbstractBarSeriesPrivate::barsetAt(int index) { return m_barSets.at(index); } -void QBarSeriesPrivate::setVisible(bool visible) +void QAbstractBarSeriesPrivate::setVisible(bool visible) { m_visible = visible; emit updatedBars(); } -void QBarSeriesPrivate::setLabelsVisible(bool visible) +void QAbstractBarSeriesPrivate::setLabelsVisible(bool visible) { m_labelsVisible = visible; emit labelsVisibleChanged(visible); } -qreal QBarSeriesPrivate::min() +qreal QAbstractBarSeriesPrivate::min() { if (m_barSets.count() <= 0) { return 0; @@ -440,7 +440,7 @@ qreal QBarSeriesPrivate::min() return min; } -qreal QBarSeriesPrivate::max() +qreal QAbstractBarSeriesPrivate::max() { if (m_barSets.count() <= 0) { return 0; @@ -459,7 +459,7 @@ qreal QBarSeriesPrivate::max() return max; } -qreal QBarSeriesPrivate::valueAt(int set, int category) +qreal QAbstractBarSeriesPrivate::valueAt(int set, int category) { if ((set < 0) || (set >= m_barSets.count())) { // No set, no value. @@ -472,7 +472,7 @@ qreal QBarSeriesPrivate::valueAt(int set, int category) return m_barSets.at(set)->at(category); } -qreal QBarSeriesPrivate::percentageAt(int set, int category) +qreal QAbstractBarSeriesPrivate::percentageAt(int set, int category) { if ((set < 0) || (set >= m_barSets.count())) { // No set, no value. @@ -491,7 +491,7 @@ qreal QBarSeriesPrivate::percentageAt(int set, int category) return value / sum; } -qreal QBarSeriesPrivate::categorySum(int category) +qreal QAbstractBarSeriesPrivate::categorySum(int category) { qreal sum(0); int count = m_barSets.count(); // Count sets @@ -502,7 +502,7 @@ qreal QBarSeriesPrivate::categorySum(int category) return sum; } -qreal QBarSeriesPrivate::absoluteCategorySum(int category) +qreal QAbstractBarSeriesPrivate::absoluteCategorySum(int category) { qreal sum(0); int count = m_barSets.count(); // Count sets @@ -513,7 +513,7 @@ qreal QBarSeriesPrivate::absoluteCategorySum(int category) return sum; } -qreal QBarSeriesPrivate::maxCategorySum() +qreal QAbstractBarSeriesPrivate::maxCategorySum() { qreal max = INT_MIN; int count = categoryCount(); @@ -525,7 +525,7 @@ qreal QBarSeriesPrivate::maxCategorySum() return max; } -qreal QBarSeriesPrivate::minX() +qreal QAbstractBarSeriesPrivate::minX() { if (m_barSets.count() <= 0) { return 0; @@ -543,7 +543,7 @@ qreal QBarSeriesPrivate::minX() return min; } -qreal QBarSeriesPrivate::maxX() +qreal QAbstractBarSeriesPrivate::maxX() { if (m_barSets.count() <= 0) { return 0; @@ -563,7 +563,7 @@ qreal QBarSeriesPrivate::maxX() } -void QBarSeriesPrivate::scaleDomain(Domain& domain) +void QAbstractBarSeriesPrivate::scaleDomain(Domain& domain) { qreal minX(domain.minX()); qreal minY(domain.minY()); @@ -584,9 +584,9 @@ void QBarSeriesPrivate::scaleDomain(Domain& domain) domain.setRange(minX,maxX,minY,maxY,tickXCount,tickYCount); } -Chart* QBarSeriesPrivate::createGraphics(ChartPresenter* presenter) +Chart* QAbstractBarSeriesPrivate::createGraphics(ChartPresenter* presenter) { - Q_Q(QBarSeries); + Q_Q(QAbstractBarSeries); BarChartItem* bar = new BarChartItem(q,presenter); if(presenter->animationOptions().testFlag(QChart::SeriesAnimations)) { @@ -597,9 +597,9 @@ Chart* QBarSeriesPrivate::createGraphics(ChartPresenter* presenter) } -QList QBarSeriesPrivate::createLegendMarker(QLegend* legend) +QList QAbstractBarSeriesPrivate::createLegendMarker(QLegend* legend) { - Q_Q(QBarSeries); + Q_Q(QAbstractBarSeries); QList markers; foreach(QBarSet* set, q->barSets()) { BarLegendMarker* marker = new BarLegendMarker(q,set,legend); @@ -609,19 +609,19 @@ QList QBarSeriesPrivate::createLegendMarker(QLegend* legend) return markers; } -QAbstractAxis* QBarSeriesPrivate::createAxisX(QObject* parent) +QAbstractAxis* QAbstractBarSeriesPrivate::createAxisX(QObject* parent) { return new QCategoriesAxis(parent); } -QAbstractAxis* QBarSeriesPrivate::createAxisY(QObject* parent) +QAbstractAxis* QAbstractBarSeriesPrivate::createAxisY(QObject* parent) { return new QValuesAxis(parent); } -bool QBarSeriesPrivate::append(QBarSet *set) +bool QAbstractBarSeriesPrivate::append(QBarSet *set) { - Q_Q(QBarSeries); + Q_Q(QAbstractBarSeries); if ((m_barSets.contains(set)) || (set == 0)) { // Fail if set is already in list or set is null. return false; @@ -636,9 +636,9 @@ bool QBarSeriesPrivate::append(QBarSet *set) return true; } -bool QBarSeriesPrivate::remove(QBarSet *set) +bool QAbstractBarSeriesPrivate::remove(QBarSet *set) { - Q_Q(QBarSeries); + Q_Q(QAbstractBarSeries); if (!m_barSets.contains(set)) { // Fail if set is not in list return false; @@ -653,9 +653,9 @@ bool QBarSeriesPrivate::remove(QBarSet *set) return true; } -bool QBarSeriesPrivate::append(QList sets) +bool QAbstractBarSeriesPrivate::append(QList sets) { - Q_Q(QBarSeries); + Q_Q(QAbstractBarSeries); foreach (QBarSet* set, sets) { if ((set == 0) || (m_barSets.contains(set))) { // Fail if any of the sets is null or is already appended. @@ -679,9 +679,9 @@ bool QBarSeriesPrivate::append(QList sets) return true; } -bool QBarSeriesPrivate::remove(QList sets) +bool QAbstractBarSeriesPrivate::remove(QList sets) { - Q_Q(QBarSeries); + Q_Q(QAbstractBarSeries); if (sets.count() == 0) { return false; } @@ -709,9 +709,9 @@ bool QBarSeriesPrivate::remove(QList sets) return true; } -bool QBarSeriesPrivate::insert(int index, QBarSet *set) +bool QAbstractBarSeriesPrivate::insert(int index, QBarSet *set) { - Q_Q(QBarSeries); + Q_Q(QAbstractBarSeries); if ((m_barSets.contains(set)) || (set == 0)) { // Fail if set is already in list or set is null. return false; diff --git a/src/barchart/qbarseries.h b/src/barchart/qbarseries.h index de7a367..52a3699 100644 --- a/src/barchart/qbarseries.h +++ b/src/barchart/qbarseries.h @@ -27,10 +27,10 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE class QBarSet; -class QBarSeriesPrivate; +class QAbstractBarSeriesPrivate; // Container for series -class QTCOMMERCIALCHART_EXPORT QBarSeries : public QAbstractSeries +class QTCOMMERCIALCHART_EXPORT QAbstractBarSeries : public QAbstractSeries { Q_OBJECT Q_PROPERTY(qreal barWidth READ barWidth WRITE setBarWidth) @@ -38,8 +38,8 @@ class QTCOMMERCIALCHART_EXPORT QBarSeries : public QAbstractSeries Q_PROPERTY(bool labelsVisible READ isLabelsVisible WRITE setLabelsVisible NOTIFY labelsVisibleChanged) public: - explicit QBarSeries(QObject *parent = 0); - virtual ~QBarSeries(); + explicit QAbstractBarSeries(QObject *parent = 0); + virtual ~QAbstractBarSeries(); QAbstractSeries::SeriesType type() const; @@ -58,7 +58,7 @@ public: bool isLabelsVisible() const; protected: - explicit QBarSeries(QBarSeriesPrivate &d,QObject *parent = 0); + explicit QAbstractBarSeries(QAbstractBarSeriesPrivate &d,QObject *parent = 0); Q_SIGNALS: void clicked(int index, QBarSet *barset); @@ -70,7 +70,7 @@ Q_SIGNALS: void barsetsRemoved(QList sets); protected: - Q_DECLARE_PRIVATE(QBarSeries) + Q_DECLARE_PRIVATE(QAbstractBarSeries) friend class BarChartItem; friend class PercentBarChartItem; friend class StackedBarChartItem; diff --git a/src/barchart/qbarseries_p.h b/src/barchart/qbarseries_p.h index 21b9499..1e36c38 100644 --- a/src/barchart/qbarseries_p.h +++ b/src/barchart/qbarseries_p.h @@ -39,11 +39,11 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE class QBarModelMapper; -class QBarSeriesPrivate : public QAbstractSeriesPrivate +class QAbstractBarSeriesPrivate : public QAbstractSeriesPrivate { Q_OBJECT public: - QBarSeriesPrivate(QBarSeries *parent); + QAbstractBarSeriesPrivate(QAbstractBarSeries *parent); int categoryCount() const; void setBarWidth(qreal width); @@ -89,7 +89,7 @@ protected: bool m_visible; private: - Q_DECLARE_PUBLIC(QBarSeries) + Q_DECLARE_PUBLIC(QAbstractBarSeries) }; QTCOMMERCIALCHART_END_NAMESPACE diff --git a/src/barchart/qbarset.h b/src/barchart/qbarset.h index b245f9b..f2e028b 100644 --- a/src/barchart/qbarset.h +++ b/src/barchart/qbarset.h @@ -104,7 +104,7 @@ private: friend class QBarSeries; friend class BarLegendMarker; friend class BarChartItem; - friend class QBarSeriesPrivate; + friend class QAbstractBarSeriesPrivate; friend class StackedBarChartItem; friend class PercentBarChartItem; friend class GroupedBarChartItem; diff --git a/src/barchart/qgroupedbarseries.cpp b/src/barchart/qgroupedbarseries.cpp index 22c27c0..fa900e0 100644 --- a/src/barchart/qgroupedbarseries.cpp +++ b/src/barchart/qgroupedbarseries.cpp @@ -60,7 +60,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE QGroupedBarSeries is QObject which is a child of a \a parent. */ QGroupedBarSeries::QGroupedBarSeries(QObject *parent) - : QBarSeries(*new QGroupedBarSeriesPrivate(this), parent) + : QAbstractBarSeries(*new QGroupedBarSeriesPrivate(this), parent) { } @@ -74,7 +74,7 @@ QAbstractSeries::SeriesType QGroupedBarSeries::type() const /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -QGroupedBarSeriesPrivate::QGroupedBarSeriesPrivate(QGroupedBarSeries *q) : QBarSeriesPrivate(q) +QGroupedBarSeriesPrivate::QGroupedBarSeriesPrivate(QGroupedBarSeries *q) : QAbstractBarSeriesPrivate(q) { } diff --git a/src/barchart/qgroupedbarseries.h b/src/barchart/qgroupedbarseries.h index c18e886..1a281c4 100644 --- a/src/barchart/qgroupedbarseries.h +++ b/src/barchart/qgroupedbarseries.h @@ -28,7 +28,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE class QGroupedBarSeriesPrivate; -class QTCOMMERCIALCHART_EXPORT QGroupedBarSeries : public QBarSeries +class QTCOMMERCIALCHART_EXPORT QGroupedBarSeries : public QAbstractBarSeries { Q_OBJECT public: diff --git a/src/barchart/qgroupedbarseries_p.h b/src/barchart/qgroupedbarseries_p.h index 796673c..00e79d7 100644 --- a/src/barchart/qgroupedbarseries_p.h +++ b/src/barchart/qgroupedbarseries_p.h @@ -36,7 +36,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE -class QGroupedBarSeriesPrivate: public QBarSeriesPrivate +class QGroupedBarSeriesPrivate: public QAbstractBarSeriesPrivate { public: QGroupedBarSeriesPrivate(QGroupedBarSeries* q); diff --git a/src/barchart/qhbarmodelmapper.cpp b/src/barchart/qhbarmodelmapper.cpp index 47b79ed..2db1f87 100644 --- a/src/barchart/qhbarmodelmapper.cpp +++ b/src/barchart/qhbarmodelmapper.cpp @@ -179,12 +179,12 @@ void QHBarModelMapper::setModel(QAbstractItemModel *model) } } -QBarSeries* QHBarModelMapper::series() const +QAbstractBarSeries* QHBarModelMapper::series() const { return QBarModelMapper::series(); } -void QHBarModelMapper::setSeries(QBarSeries *series) +void QHBarModelMapper::setSeries(QAbstractBarSeries *series) { if (series != QBarModelMapper::series()) { QBarModelMapper::setSeries(series); diff --git a/src/barchart/qhbarmodelmapper.h b/src/barchart/qhbarmodelmapper.h index 6c18841..ad84447 100644 --- a/src/barchart/qhbarmodelmapper.h +++ b/src/barchart/qhbarmodelmapper.h @@ -28,7 +28,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE class QTCOMMERCIALCHART_EXPORT QHBarModelMapper : public QBarModelMapper { Q_OBJECT - Q_PROPERTY(QBarSeries *series READ series WRITE setSeries NOTIFY seriesReplaced) + Q_PROPERTY(QAbstractBarSeries *series READ series WRITE setSeries NOTIFY seriesReplaced) Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelReplaced) Q_PROPERTY(int firstBarSetRow READ firstBarSetRow WRITE setFirstBarSetRow NOTIFY firstBarSetRowChanged) Q_PROPERTY(int lastBarSetRow READ lastBarSetRow WRITE setLastBarSetRow NOTIFY lastBarSetRowChanged) @@ -41,8 +41,8 @@ public: QAbstractItemModel* model() const; void setModel(QAbstractItemModel *model); - QBarSeries* series() const; - void setSeries(QBarSeries *series); + QAbstractBarSeries* series() const; + void setSeries(QAbstractBarSeries *series); int firstBarSetRow() const; void setFirstBarSetRow(int firstBarSetRow); diff --git a/src/barchart/qpercentbarseries.cpp b/src/barchart/qpercentbarseries.cpp index 39886a8..a5f5ad5 100644 --- a/src/barchart/qpercentbarseries.cpp +++ b/src/barchart/qpercentbarseries.cpp @@ -60,7 +60,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE QPercentBarSeries is QObject which is a child of a \a parent. */ QPercentBarSeries::QPercentBarSeries(QObject *parent) - : QBarSeries(*new QPercentBarSeriesPrivate(this), parent) + : QAbstractBarSeries(*new QPercentBarSeriesPrivate(this), parent) { } @@ -74,7 +74,7 @@ QAbstractSeries::SeriesType QPercentBarSeries::type() const /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -QPercentBarSeriesPrivate::QPercentBarSeriesPrivate(QPercentBarSeries *q) : QBarSeriesPrivate(q) +QPercentBarSeriesPrivate::QPercentBarSeriesPrivate(QPercentBarSeries *q) : QAbstractBarSeriesPrivate(q) { } diff --git a/src/barchart/qpercentbarseries.h b/src/barchart/qpercentbarseries.h index fa67461..f720903 100644 --- a/src/barchart/qpercentbarseries.h +++ b/src/barchart/qpercentbarseries.h @@ -28,7 +28,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE class QPercentBarSeriesPrivate; -class QTCOMMERCIALCHART_EXPORT QPercentBarSeries : public QBarSeries +class QTCOMMERCIALCHART_EXPORT QPercentBarSeries : public QAbstractBarSeries { Q_OBJECT public: diff --git a/src/barchart/qpercentbarseries_p.h b/src/barchart/qpercentbarseries_p.h index 454bce4..c21ad49 100644 --- a/src/barchart/qpercentbarseries_p.h +++ b/src/barchart/qpercentbarseries_p.h @@ -36,7 +36,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE -class QPercentBarSeriesPrivate: public QBarSeriesPrivate +class QPercentBarSeriesPrivate: public QAbstractBarSeriesPrivate { public: QPercentBarSeriesPrivate(QPercentBarSeries* q); diff --git a/src/barchart/qstackedbarseries.cpp b/src/barchart/qstackedbarseries.cpp index 4627905..292d09e 100644 --- a/src/barchart/qstackedbarseries.cpp +++ b/src/barchart/qstackedbarseries.cpp @@ -61,7 +61,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE QStackedBarSeries is QObject which is a child of a \a parent. */ QStackedBarSeries::QStackedBarSeries(QObject *parent) - : QBarSeries(*new QStackedBarSeriesPrivate(this), parent) + : QAbstractBarSeries(*new QStackedBarSeriesPrivate(this), parent) { } @@ -75,7 +75,7 @@ QAbstractSeries::SeriesType QStackedBarSeries::type() const /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -QStackedBarSeriesPrivate::QStackedBarSeriesPrivate(QStackedBarSeries *q) : QBarSeriesPrivate(q) +QStackedBarSeriesPrivate::QStackedBarSeriesPrivate(QStackedBarSeries *q) : QAbstractBarSeriesPrivate(q) { } diff --git a/src/barchart/qstackedbarseries.h b/src/barchart/qstackedbarseries.h index 135ee65..08ee241 100644 --- a/src/barchart/qstackedbarseries.h +++ b/src/barchart/qstackedbarseries.h @@ -28,7 +28,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE class QStackedBarSeriesPrivate; -class QTCOMMERCIALCHART_EXPORT QStackedBarSeries : public QBarSeries +class QTCOMMERCIALCHART_EXPORT QStackedBarSeries : public QAbstractBarSeries { Q_OBJECT public: diff --git a/src/barchart/qstackedbarseries_p.h b/src/barchart/qstackedbarseries_p.h index bf04717..d80c22d 100644 --- a/src/barchart/qstackedbarseries_p.h +++ b/src/barchart/qstackedbarseries_p.h @@ -36,7 +36,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE -class QStackedBarSeriesPrivate: public QBarSeriesPrivate +class QStackedBarSeriesPrivate: public QAbstractBarSeriesPrivate { public: QStackedBarSeriesPrivate(QStackedBarSeries* q); diff --git a/src/barchart/qvbarmodelmapper.cpp b/src/barchart/qvbarmodelmapper.cpp index 2276f4b..e9e1377 100644 --- a/src/barchart/qvbarmodelmapper.cpp +++ b/src/barchart/qvbarmodelmapper.cpp @@ -178,12 +178,12 @@ void QVBarModelMapper::setModel(QAbstractItemModel *model) } } -QBarSeries* QVBarModelMapper::series() const +QAbstractBarSeries* QVBarModelMapper::series() const { return QBarModelMapper::series(); } -void QVBarModelMapper::setSeries(QBarSeries *series) +void QVBarModelMapper::setSeries(QAbstractBarSeries *series) { if (series != QBarModelMapper::series()) { QBarModelMapper::setSeries(series); diff --git a/src/barchart/qvbarmodelmapper.h b/src/barchart/qvbarmodelmapper.h index 17b836b..23747b4 100644 --- a/src/barchart/qvbarmodelmapper.h +++ b/src/barchart/qvbarmodelmapper.h @@ -28,7 +28,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE class QTCOMMERCIALCHART_EXPORT QVBarModelMapper : public QBarModelMapper { Q_OBJECT - Q_PROPERTY(QBarSeries *series READ series WRITE setSeries NOTIFY seriesReplaced) + Q_PROPERTY(QAbstractBarSeries *series READ series WRITE setSeries NOTIFY seriesReplaced) Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelReplaced) Q_PROPERTY(int firstBarSetColumn READ firstBarSetColumn WRITE setFirstBarSetColumn NOTIFY firstBarSetColumnChanged) Q_PROPERTY(int lastBarSetColumn READ lastBarSetColumn WRITE setLastBarSetColumn NOTIFY lastBarSetColumnChanged) @@ -41,8 +41,8 @@ public: QAbstractItemModel* model() const; void setModel(QAbstractItemModel *model); - QBarSeries* series() const; - void setSeries(QBarSeries *series); + QAbstractBarSeries* series() const; + void setSeries(QAbstractBarSeries *series); int firstBarSetColumn() const; void setFirstBarSetColumn(int firstBarSetColumn); diff --git a/src/barchart/stackedbarchartitem.cpp b/src/barchart/stackedbarchartitem.cpp index 0673a28..292e36a 100644 --- a/src/barchart/stackedbarchartitem.cpp +++ b/src/barchart/stackedbarchartitem.cpp @@ -27,7 +27,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE -StackedBarChartItem::StackedBarChartItem(QBarSeries *series, ChartPresenter *presenter) : +StackedBarChartItem::StackedBarChartItem(QAbstractBarSeries *series, ChartPresenter *presenter) : BarChartItem(series, presenter) { } diff --git a/src/barchart/stackedbarchartitem_p.h b/src/barchart/stackedbarchartitem_p.h index 15b54b9..3148556 100644 --- a/src/barchart/stackedbarchartitem_p.h +++ b/src/barchart/stackedbarchartitem_p.h @@ -41,7 +41,7 @@ class StackedBarChartItem : public BarChartItem { Q_OBJECT public: - StackedBarChartItem(QBarSeries *series, ChartPresenter *presenter); + StackedBarChartItem(QAbstractBarSeries *series, ChartPresenter *presenter); private: virtual QVector calculateLayout(); diff --git a/src/charttheme.cpp b/src/charttheme.cpp index 21f9731..0d61bb1 100644 --- a/src/charttheme.cpp +++ b/src/charttheme.cpp @@ -159,7 +159,7 @@ void ChartTheme::decorate(QLineSeries *series,int index) } } -void ChartTheme::decorate(QBarSeries *series, int index) +void ChartTheme::decorate(QAbstractBarSeries *series, int index) { QBrush brush; QPen pen; diff --git a/src/charttheme_p.h b/src/charttheme_p.h index 34fce7f..8f482b8 100644 --- a/src/charttheme_p.h +++ b/src/charttheme_p.h @@ -41,7 +41,7 @@ class ChartItem; class LineChartItem; class QLineSeries; class BarChartItem; -class QBarSeries; +class QAbstractBarSeries; class StackedBarChartItem; class QStackedBarSeries; class QPercentBarSeries; @@ -72,7 +72,7 @@ public: QChart::ChartTheme id() const {return m_id;} void decorate(QChart *chart); void decorate(QLegend *legend); - void decorate(QBarSeries *series, int index); + void decorate(QAbstractBarSeries *series, int index); void decorate(QLineSeries *series, int index); void decorate(QAreaSeries *series, int index); void decorate(QScatterSeries *series, int index); diff --git a/src/legend/legendmarker.cpp b/src/legend/legendmarker.cpp index 46092ea..17428bb 100644 --- a/src/legend/legendmarker.cpp +++ b/src/legend/legendmarker.cpp @@ -177,7 +177,7 @@ void AreaLegendMarker::updated() ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -BarLegendMarker::BarLegendMarker(QBarSeries *barseries,QBarSet *barset, QLegend *legend) : LegendMarker(barseries,legend), +BarLegendMarker::BarLegendMarker(QAbstractBarSeries *barseries,QBarSet *barset, QLegend *legend) : LegendMarker(barseries,legend), m_barset(barset) { //QObject::connect(this, SIGNAL(selected()),barset->d_ptr.data(), SIGNAL(selected())); diff --git a/src/legend/legendmarker_p.h b/src/legend/legendmarker_p.h index 1327be7..6ae225a 100644 --- a/src/legend/legendmarker_p.h +++ b/src/legend/legendmarker_p.h @@ -43,7 +43,7 @@ class QAbstractSeries; class QAreaSeries; class QXYSeries; class QBarSet; -class QBarSeries; +class QAbstractBarSeries; class QPieSlice; class QLegend; class QPieSeries; @@ -123,7 +123,7 @@ private: class BarLegendMarker : public LegendMarker { public: - BarLegendMarker(QBarSeries *barseries, QBarSet *barset,QLegend *legend); + BarLegendMarker(QAbstractBarSeries *barseries, QBarSet *barset,QLegend *legend); protected: void updated(); private: diff --git a/tests/auto/chartdataset/tst_chartdataset.cpp b/tests/auto/chartdataset/tst_chartdataset.cpp index 6958d4e..a4a0f56 100644 --- a/tests/auto/chartdataset/tst_chartdataset.cpp +++ b/tests/auto/chartdataset/tst_chartdataset.cpp @@ -136,7 +136,7 @@ void tst_ChartDataSet::addSeries_data() QAbstractSeries* scatter = new QScatterSeries(this); QAbstractSeries* spline = new QSplineSeries(this); QAbstractSeries* pie = new QPieSeries(this); - QAbstractSeries* bar = new QBarSeries(this); + QAbstractSeries* bar = new QAbstractBarSeries(this); QAbstractSeries* percent = new QPercentBarSeries(this); QAbstractSeries* stacked = new QStackedBarSeries(this); @@ -185,7 +185,7 @@ void tst_ChartDataSet::setAxisX_data() QAbstractSeries* scatter = new QScatterSeries(this); QAbstractSeries* spline = new QSplineSeries(this); QAbstractSeries* pie = new QPieSeries(this); - QAbstractSeries* bar = new QBarSeries(this); + QAbstractSeries* bar = new QAbstractBarSeries(this); QAbstractSeries* percent = new QPercentBarSeries(this); QAbstractSeries* stacked = new QStackedBarSeries(this); diff --git a/tests/auto/qbarseries/tst_qbarseries.cpp b/tests/auto/qbarseries/tst_qbarseries.cpp index b0b2a82..3ee177c 100644 --- a/tests/auto/qbarseries/tst_qbarseries.cpp +++ b/tests/auto/qbarseries/tst_qbarseries.cpp @@ -63,8 +63,8 @@ private slots: void clearWithAnimations(); private: - QBarSeries* m_barseries; - QBarSeries* m_barseries_with_sets; + QAbstractBarSeries* m_barseries; + QAbstractBarSeries* m_barseries_with_sets; QList m_testSets; @@ -81,8 +81,8 @@ void tst_QBarSeries::cleanupTestCase() void tst_QBarSeries::init() { - m_barseries = new QBarSeries(); - m_barseries_with_sets = new QBarSeries(); + m_barseries = new QAbstractBarSeries(); + m_barseries_with_sets = new QAbstractBarSeries(); for (int i=0; i<5; i++) { m_testSets.append(new QBarSet("testset")); @@ -110,7 +110,7 @@ void tst_QBarSeries::qbarseries_data() void tst_QBarSeries::qbarseries() { - QBarSeries *barseries = new QBarSeries(); + QAbstractBarSeries *barseries = new QAbstractBarSeries(); QVERIFY(barseries != 0); } @@ -316,7 +316,7 @@ void tst_QBarSeries::mouseclicked_data() void tst_QBarSeries::mouseclicked() { - QBarSeries* series = new QBarSeries(); + QAbstractBarSeries* series = new QAbstractBarSeries(); QBarSet* set1 = new QBarSet(QString("set 1")); // *set1 << QPointF(0,10) << QPointF(1,10) << QPointF(2,10); @@ -454,7 +454,7 @@ void tst_QBarSeries::mousehovered_data() void tst_QBarSeries::mousehovered() { - QBarSeries* series = new QBarSeries(); + QAbstractBarSeries* series = new QAbstractBarSeries(); QBarSet* set1 = new QBarSet(QString("set 1")); // *set1 << QPointF(0,10) << QPointF(1,10) << QPointF(2,10); @@ -550,7 +550,7 @@ void tst_QBarSeries::mousehovered() void tst_QBarSeries::clearWithAnimations() { - QBarSeries* series = new QBarSeries(); + QAbstractBarSeries* series = new QAbstractBarSeries(); QBarSet* set1 = new QBarSet(QString("set 1")); // *set1 << QPointF(0,10) << QPointF(1,10) << QPointF(2,10); diff --git a/tests/auto/qchart/tst_qchart.cpp b/tests/auto/qchart/tst_qchart.cpp index 16d6a87..8782bcf 100644 --- a/tests/auto/qchart/tst_qchart.cpp +++ b/tests/auto/qchart/tst_qchart.cpp @@ -177,7 +177,7 @@ void tst_QChart::addSeries_data() QAbstractSeries* series2 = new QScatterSeries(this); QAbstractSeries* series3 = new QSplineSeries(this); QAbstractSeries* series4 = new QPieSeries(this); - QAbstractSeries* series5 = new QBarSeries(this); + QAbstractSeries* series5 = new QAbstractBarSeries(this); QAbstractSeries* series6 = new QPercentBarSeries(this); QAbstractSeries* series7 = new QStackedBarSeries(this); diff --git a/tests/chartwidgettest/mainwidget.cpp b/tests/chartwidgettest/mainwidget.cpp index c2f5c60..d2175f5 100644 --- a/tests/chartwidgettest/mainwidget.cpp +++ b/tests/chartwidgettest/mainwidget.cpp @@ -274,9 +274,9 @@ void MainWidget::addSeries(QString seriesName, int columnCount, int rowCount, QS QStringList labels = generateLabels(rowCount); foreach(QString label, labels) category << label; - QBarSeries* series = 0; + QAbstractBarSeries* series = 0; if (seriesName == "Bar") { - series = new QBarSeries(this); + series = new QAbstractBarSeries(this); QCategoriesAxis* axis = new QCategoriesAxis(); axis->append(category); m_chart->setAxisX(axis,series);