diff options
Diffstat (limited to 'src/barchart')
32 files changed, 120 insertions, 119 deletions
diff --git a/src/barchart/abstractbarchartitem.cpp b/src/barchart/abstractbarchartitem.cpp index 2baf3ec5..eda9a951 100644 --- a/src/barchart/abstractbarchartitem.cpp +++ b/src/barchart/abstractbarchartitem.cpp @@ -184,13 +184,13 @@ void AbstractBarChartItem::handleUpdatedBars() for (int category = 0; category < categoryCount; category++) { for (int set = 0; set < setCount; set++) { - QBarSetPrivate* barSet = m_series->d_func()->barsetAt(set)->d_ptr.data(); - Bar* bar = m_bars.at(itemIndex); + QBarSetPrivate *barSet = m_series->d_func()->barsetAt(set)->d_ptr.data(); + Bar *bar = m_bars.at(itemIndex); bar->setPen(barSet->m_pen); bar->setBrush(barSet->m_brush); bar->update(); - QGraphicsSimpleTextItem* label = m_labels.at(itemIndex); + QGraphicsSimpleTextItem *label = m_labels.at(itemIndex); label->setFont(barSet->m_labelFont); label->setBrush(barSet->m_labelBrush); label->update(); diff --git a/src/barchart/abstractbarchartitem_p.h b/src/barchart/abstractbarchartitem_p.h index a253cfb2..374bbd83 100644 --- a/src/barchart/abstractbarchartitem_p.h +++ b/src/barchart/abstractbarchartitem_p.h @@ -56,7 +56,7 @@ public: virtual QVector<QRectF> calculateLayout() = 0; virtual void applyLayout(const QVector<QRectF> &layout); - virtual void setAnimation(AbstractBarAnimation* animation); + virtual void setAnimation(AbstractBarAnimation *animation); void setLayout(const QVector<QRectF> &layout); void updateLayout(const QVector<QRectF> &layout); QRectF geometry() const { return m_rect;} diff --git a/src/barchart/horizontal/bar/horizontalbarchartitem.cpp b/src/barchart/horizontal/bar/horizontalbarchartitem.cpp index 6a3be3f9..a0ad4db6 100644 --- a/src/barchart/horizontal/bar/horizontalbarchartitem.cpp +++ b/src/barchart/horizontal/bar/horizontalbarchartitem.cpp @@ -54,14 +54,14 @@ QVector<QRectF> HorizontalBarChartItem::calculateLayout() for (int category = 0; category < categoryCount; category++) { qreal xPos = -scaleX * m_domainMinX + geometry().left(); for (int set = 0; set < setCount; set++) { - QBarSetPrivate* barSet = m_series->d_func()->barsetAt(set)->d_ptr.data(); + QBarSetPrivate *barSet = m_series->d_func()->barsetAt(set)->d_ptr.data(); qreal yPos = geometry().bottom() + (m_domainMinY - barSet->pos(category)) * scaleY; yPos += setCount * rectHeight / 2; yPos -= set * rectHeight; qreal rectWidth = barSet->value(category) * scaleX; - Bar* bar = m_bars.at(itemIndex); + Bar *bar = m_bars.at(itemIndex); QRectF rect(xPos, yPos - rectHeight, rectWidth, rectHeight); layout.append(rect); @@ -72,7 +72,7 @@ QVector<QRectF> HorizontalBarChartItem::calculateLayout() else bar->setVisible(barsVisible); - QGraphicsSimpleTextItem* label = m_labels.at(itemIndex); + QGraphicsSimpleTextItem *label = m_labels.at(itemIndex); if (!qFuzzyIsNull(barSet->value(category))) label->setText(QString::number(barSet->value(category))); diff --git a/src/barchart/horizontal/bar/qhorizontalbarseries.cpp b/src/barchart/horizontal/bar/qhorizontalbarseries.cpp index c7b6ed70..6c404a92 100644 --- a/src/barchart/horizontal/bar/qhorizontalbarseries.cpp +++ b/src/barchart/horizontal/bar/qhorizontalbarseries.cpp @@ -60,8 +60,8 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE Constructs empty QHorizontalBarSeries. QHorizontalBarSeries is QObject which is a child of a \a parent. */ -QHorizontalBarSeries::QHorizontalBarSeries(QObject *parent) : - QAbstractBarSeries(*new QHorizontalBarSeriesPrivate(this), parent) +QHorizontalBarSeries::QHorizontalBarSeries(QObject *parent) + : QAbstractBarSeries(*new QHorizontalBarSeriesPrivate(this), parent) { } @@ -86,12 +86,13 @@ QAbstractSeries::SeriesType QHorizontalBarSeries::type() const /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -QHorizontalBarSeriesPrivate::QHorizontalBarSeriesPrivate(QHorizontalBarSeries *q) : QAbstractBarSeriesPrivate(q) +QHorizontalBarSeriesPrivate::QHorizontalBarSeriesPrivate(QHorizontalBarSeries *q) + : QAbstractBarSeriesPrivate(q) { } -void QHorizontalBarSeriesPrivate::scaleDomain(Domain& domain) +void QHorizontalBarSeriesPrivate::scaleDomain(Domain &domain) { qreal minX(domain.minX()); qreal minY(domain.minY()); @@ -107,11 +108,11 @@ void QHorizontalBarSeriesPrivate::scaleDomain(Domain& domain) domain.setRange(minX, maxX, minY, maxY); } -ChartElement* QHorizontalBarSeriesPrivate::createGraphics(ChartPresenter* presenter) +ChartElement *QHorizontalBarSeriesPrivate::createGraphics(ChartPresenter *presenter) { Q_Q(QHorizontalBarSeries); - HorizontalBarChartItem* bar = new HorizontalBarChartItem(q, presenter); + HorizontalBarChartItem *bar = new HorizontalBarChartItem(q, presenter); if (presenter->animationOptions().testFlag(QChart::SeriesAnimations)) bar->setAnimation(new HorizontalBarAnimation(bar)); presenter->chartTheme()->decorate(q, presenter->dataSet()->seriesIndex(q)); diff --git a/src/barchart/horizontal/bar/qhorizontalbarseries_p.h b/src/barchart/horizontal/bar/qhorizontalbarseries_p.h index 91aa2058..46634947 100644 --- a/src/barchart/horizontal/bar/qhorizontalbarseries_p.h +++ b/src/barchart/horizontal/bar/qhorizontalbarseries_p.h @@ -38,9 +38,9 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE class QHorizontalBarSeriesPrivate: public QAbstractBarSeriesPrivate { public: - QHorizontalBarSeriesPrivate(QHorizontalBarSeries* q); - ChartElement* createGraphics(ChartPresenter* presenter); - void scaleDomain(Domain& domain); + QHorizontalBarSeriesPrivate(QHorizontalBarSeries *q); + ChartElement *createGraphics(ChartPresenter *presenter); + void scaleDomain(Domain &domain); private: Q_DECLARE_PUBLIC(QHorizontalBarSeries) }; diff --git a/src/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp b/src/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp index c78bda39..c66112ad 100644 --- a/src/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp +++ b/src/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp @@ -25,8 +25,8 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE -HorizontalPercentBarChartItem::HorizontalPercentBarChartItem(QAbstractBarSeries *series, ChartPresenter *presenter) : - AbstractBarChartItem(series, presenter) +HorizontalPercentBarChartItem::HorizontalPercentBarChartItem(QAbstractBarSeries *series, ChartPresenter *presenter) + : AbstractBarChartItem(series, presenter) { } @@ -54,12 +54,12 @@ QVector<QRectF> HorizontalPercentBarChartItem::calculateLayout() qreal percentage = (100 / colSum); qreal xPos = -scaleX * m_domainMinX + geometry().left(); for (int set = 0; set < setCount; set++) { - QBarSetPrivate* barSet = m_series->d_func()->barsetAt(set)->d_ptr.data(); + QBarSetPrivate *barSet = m_series->d_func()->barsetAt(set)->d_ptr.data(); qreal yPos = (m_domainMinY + 0.5 - barSet->pos(category)) * scaleY + geometry().bottom() - rectHeight / 2; qreal rectWidth = barSet->value(category) * percentage * scaleX; - Bar* bar = m_bars.at(itemIndex); + Bar *bar = m_bars.at(itemIndex); QRectF rect(xPos, yPos - rectHeight, rectWidth, rectHeight); layout.append(rect); @@ -70,7 +70,7 @@ QVector<QRectF> HorizontalPercentBarChartItem::calculateLayout() else bar->setVisible(barsVisible); - QGraphicsSimpleTextItem* label = m_labels.at(itemIndex); + QGraphicsSimpleTextItem *label = m_labels.at(itemIndex); if (!qFuzzyIsNull(m_series->d_func()->valueAt(set, category))) { int p = m_series->d_func()->percentageAt(set, category) * 100; diff --git a/src/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp b/src/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp index 3ecb9fae..3f2bf577 100644 --- a/src/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp +++ b/src/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp @@ -88,7 +88,7 @@ QHorizontalPercentBarSeriesPrivate::QHorizontalPercentBarSeriesPrivate(QHorizont } -void QHorizontalPercentBarSeriesPrivate::scaleDomain(Domain& domain) +void QHorizontalPercentBarSeriesPrivate::scaleDomain(Domain &domain) { qreal minX(domain.minX()); qreal minY(domain.minY()); @@ -104,11 +104,11 @@ void QHorizontalPercentBarSeriesPrivate::scaleDomain(Domain& domain) domain.setRange(minX, maxX, minY, maxY); } -ChartElement* QHorizontalPercentBarSeriesPrivate::createGraphics(ChartPresenter* presenter) +ChartElement *QHorizontalPercentBarSeriesPrivate::createGraphics(ChartPresenter *presenter) { Q_Q(QHorizontalPercentBarSeries); - HorizontalPercentBarChartItem* bar = new HorizontalPercentBarChartItem(q, presenter); + HorizontalPercentBarChartItem *bar = new HorizontalPercentBarChartItem(q, presenter); if (presenter->animationOptions().testFlag(QChart::SeriesAnimations)) bar->setAnimation(new HorizontalPercentBarAnimation(bar)); presenter->chartTheme()->decorate(q, presenter->dataSet()->seriesIndex(q)); diff --git a/src/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h b/src/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h index 98fbe49a..9aa92675 100644 --- a/src/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h +++ b/src/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h @@ -38,9 +38,9 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE class QHorizontalPercentBarSeriesPrivate: public QAbstractBarSeriesPrivate { public: - QHorizontalPercentBarSeriesPrivate(QHorizontalPercentBarSeries* q); - ChartElement* createGraphics(ChartPresenter* presenter); - void scaleDomain(Domain& domain); + QHorizontalPercentBarSeriesPrivate(QHorizontalPercentBarSeries *q); + ChartElement *createGraphics(ChartPresenter *presenter); + void scaleDomain(Domain &domain); private: Q_DECLARE_PUBLIC(QHorizontalPercentBarSeries) }; diff --git a/src/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp b/src/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp index c9936e32..b1dc7f55 100644 --- a/src/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp +++ b/src/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp @@ -25,8 +25,8 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE -HorizontalStackedBarChartItem::HorizontalStackedBarChartItem(QAbstractBarSeries *series, ChartPresenter *presenter) : - AbstractBarChartItem(series, presenter) +HorizontalStackedBarChartItem::HorizontalStackedBarChartItem(QAbstractBarSeries *series, ChartPresenter *presenter) + : AbstractBarChartItem(series, presenter) { } @@ -53,12 +53,12 @@ QVector<QRectF> HorizontalStackedBarChartItem::calculateLayout() qreal xMax = -scaleX * m_domainMinX + geometry().left(); qreal xMin = -scaleX * m_domainMinX + geometry().left(); for (int set = 0; set < setCount; set++) { - QBarSetPrivate* barSet = m_series->d_func()->barsetAt(set)->d_ptr.data(); + QBarSetPrivate *barSet = m_series->d_func()->barsetAt(set)->d_ptr.data(); qreal yPos = (m_domainMinY + 0.5 - barSet->pos(category)) * scaleY + geometry().bottom() - rectHeight / 2; qreal rectWidth = barSet->value(category) * scaleX; - Bar* bar = m_bars.at(itemIndex); + Bar *bar = m_bars.at(itemIndex); bar->setPen(barSet->m_pen); bar->setBrush(barSet->m_brush); @@ -67,7 +67,7 @@ QVector<QRectF> HorizontalStackedBarChartItem::calculateLayout() else bar->setVisible(barsVisible); - QGraphicsSimpleTextItem* label = m_labels.at(itemIndex); + QGraphicsSimpleTextItem *label = m_labels.at(itemIndex); if (!qFuzzyIsNull(barSet->value(category))) label->setText(QString::number(barSet->value(category))); diff --git a/src/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp b/src/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp index be01a1a8..4eb1b22a 100644 --- a/src/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp +++ b/src/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp @@ -56,8 +56,8 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE Constructs empty QHorizontalStackedBarSeries. QHorizontalStackedBarSeries is QObject which is a child of a \a parent. */ -QHorizontalStackedBarSeries::QHorizontalStackedBarSeries(QObject *parent) : - QAbstractBarSeries(*new QHorizontalStackedBarSeriesPrivate(this), parent) +QHorizontalStackedBarSeries::QHorizontalStackedBarSeries(QObject *parent) + : QAbstractBarSeries(*new QHorizontalStackedBarSeriesPrivate(this), parent) { } @@ -87,7 +87,7 @@ QHorizontalStackedBarSeriesPrivate::QHorizontalStackedBarSeriesPrivate(QHorizont } -void QHorizontalStackedBarSeriesPrivate::scaleDomain(Domain& domain) +void QHorizontalStackedBarSeriesPrivate::scaleDomain(Domain &domain) { qreal minX(domain.minX()); qreal minY(domain.minY()); @@ -103,11 +103,11 @@ void QHorizontalStackedBarSeriesPrivate::scaleDomain(Domain& domain) domain.setRange(minX, maxX, minY, maxY); } -ChartElement* QHorizontalStackedBarSeriesPrivate::createGraphics(ChartPresenter* presenter) +ChartElement *QHorizontalStackedBarSeriesPrivate::createGraphics(ChartPresenter *presenter) { Q_Q(QHorizontalStackedBarSeries); - HorizontalStackedBarChartItem* bar = new HorizontalStackedBarChartItem(q, presenter); + HorizontalStackedBarChartItem *bar = new HorizontalStackedBarChartItem(q, presenter); if (presenter->animationOptions().testFlag(QChart::SeriesAnimations)) bar->setAnimation(new HorizontalStackedBarAnimation(bar)); presenter->chartTheme()->decorate(q, presenter->dataSet()->seriesIndex(q)); diff --git a/src/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h b/src/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h index 7ab1f26e..687c4821 100644 --- a/src/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h +++ b/src/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h @@ -38,9 +38,9 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE class QHorizontalStackedBarSeriesPrivate: public QAbstractBarSeriesPrivate { public: - QHorizontalStackedBarSeriesPrivate(QHorizontalStackedBarSeries* q); - ChartElement* createGraphics(ChartPresenter* presenter); - void scaleDomain(Domain& domain); + QHorizontalStackedBarSeriesPrivate(QHorizontalStackedBarSeries *q); + ChartElement *createGraphics(ChartPresenter *presenter); + void scaleDomain(Domain &domain); private: Q_DECLARE_PUBLIC(QHorizontalStackedBarSeries) }; diff --git a/src/barchart/qabstractbarseries.cpp b/src/barchart/qabstractbarseries.cpp index 58bbad4e..39befdc3 100644 --- a/src/barchart/qabstractbarseries.cpp +++ b/src/barchart/qabstractbarseries.cpp @@ -236,7 +236,7 @@ bool QAbstractBarSeries::append(QBarSet *set) Q_D(QAbstractBarSeries); bool success = d->append(set); if (success) { - QList<QBarSet*> sets; + QList<QBarSet *> sets; sets.append(set); set->setParent(this); emit barsetsAdded(sets); @@ -255,7 +255,7 @@ bool QAbstractBarSeries::remove(QBarSet *set) Q_D(QAbstractBarSeries); bool success = d->remove(set); if (success) { - QList<QBarSet*> sets; + QList<QBarSet *> sets; sets.append(set); set->setParent(0); emit barsetsRemoved(sets); @@ -279,7 +279,7 @@ bool QAbstractBarSeries::take(QBarSet *set) Q_D(QAbstractBarSeries); bool success = d->remove(set); if (success) { - QList<QBarSet*> sets; + QList<QBarSet *> sets; sets.append(set); emit barsetsRemoved(sets); emit countChanged(); @@ -293,7 +293,7 @@ bool QAbstractBarSeries::take(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 QAbstractBarSeries::append(QList<QBarSet* > sets) +bool QAbstractBarSeries::append(QList<QBarSet *> sets) { Q_D(QAbstractBarSeries); bool success = d->append(sets); @@ -314,7 +314,7 @@ bool QAbstractBarSeries::insert(int index, QBarSet *set) Q_D(QAbstractBarSeries); bool success = d->insert(index, set); if (success) { - QList<QBarSet*> sets; + QList<QBarSet *> sets; sets.append(set); emit barsetsAdded(sets); emit countChanged(); @@ -350,7 +350,7 @@ int QAbstractBarSeries::count() const /*! Returns a list of sets in series. Keeps ownership of sets. */ -QList<QBarSet*> QAbstractBarSeries::barSets() const +QList<QBarSet *> QAbstractBarSeries::barSets() const { Q_D(const QAbstractBarSeries); return d->m_barSets; @@ -412,7 +412,7 @@ qreal QAbstractBarSeriesPrivate::barWidth() const return m_barWidth; } -QBarSet* QAbstractBarSeriesPrivate::barsetAt(int index) +QBarSet *QAbstractBarSeriesPrivate::barsetAt(int index) { return m_barSets.at(index); } @@ -623,7 +623,7 @@ qreal QAbstractBarSeriesPrivate::bottom() } -void QAbstractBarSeriesPrivate::scaleDomain(Domain& domain) +void QAbstractBarSeriesPrivate::scaleDomain(Domain &domain) { qreal minX(domain.minX()); qreal minY(domain.minY()); @@ -641,17 +641,17 @@ void QAbstractBarSeriesPrivate::scaleDomain(Domain& domain) domain.setRange(minX, maxX, minY, maxY); } -ChartElement* QAbstractBarSeriesPrivate::createGraphics(ChartPresenter* presenter) +ChartElement *QAbstractBarSeriesPrivate::createGraphics(ChartPresenter *presenter) { Q_UNUSED(presenter); qWarning() << "QAbstractBarSeriesPrivate::createGraphics called"; return 0; } -QList<LegendMarker*> QAbstractBarSeriesPrivate::createLegendMarker(QLegend* legend) +QList<LegendMarker *> QAbstractBarSeriesPrivate::createLegendMarker(QLegend *legend) { Q_Q(QAbstractBarSeries); - QList<LegendMarker*> markers; + QList<LegendMarker *> markers; foreach (QBarSet *set, q->barSets()) { BarLegendMarker* marker = new BarLegendMarker(q, set, legend); markers << marker; @@ -688,7 +688,7 @@ bool QAbstractBarSeriesPrivate::remove(QBarSet *set) return true; } -bool QAbstractBarSeriesPrivate::append(QList<QBarSet* > sets) +bool QAbstractBarSeriesPrivate::append(QList<QBarSet * > sets) { foreach (QBarSet *set, sets) { if ((set == 0) || (m_barSets.contains(set))) @@ -708,7 +708,7 @@ bool QAbstractBarSeriesPrivate::append(QList<QBarSet* > sets) return true; } -bool QAbstractBarSeriesPrivate::remove(QList<QBarSet* > sets) +bool QAbstractBarSeriesPrivate::remove(QList<QBarSet * > sets) { if (sets.count() == 0) return false; @@ -745,7 +745,7 @@ bool QAbstractBarSeriesPrivate::insert(int index, QBarSet *set) return true; } -void QAbstractBarSeriesPrivate::initializeAxis(QAbstractAxis* axis) +void QAbstractBarSeriesPrivate::initializeAxis(QAbstractAxis *axis) { Q_Q(QAbstractBarSeries); @@ -755,13 +755,13 @@ void QAbstractBarSeriesPrivate::initializeAxis(QAbstractAxis* axis) case QAbstractSeries::SeriesTypeHorizontalPercentBar: case QAbstractSeries::SeriesTypeHorizontalStackedBar: if (axis->orientation() == Qt::Vertical) - populateCategories(qobject_cast<QBarCategoryAxis*>(axis)); + populateCategories(qobject_cast<QBarCategoryAxis *>(axis)); break; case QAbstractSeries::SeriesTypeBar: case QAbstractSeries::SeriesTypePercentBar: case QAbstractSeries::SeriesTypeStackedBar: if (axis->orientation() == Qt::Horizontal) - populateCategories(qobject_cast<QBarCategoryAxis*>(axis)); + populateCategories(qobject_cast<QBarCategoryAxis *>(axis)); break; default: qWarning() << "Unexpected series type"; @@ -795,7 +795,7 @@ QAbstractAxis::AxisType QAbstractBarSeriesPrivate::defaultAxisType(Qt::Orientati } -void QAbstractBarSeriesPrivate::populateCategories(QBarCategoryAxis* axis) +void QAbstractBarSeriesPrivate::populateCategories(QBarCategoryAxis *axis) { QStringList categories; if (axis->categories().isEmpty()) { diff --git a/src/barchart/qabstractbarseries.h b/src/barchart/qabstractbarseries.h index 87ab4f23..e6ebeaba 100644 --- a/src/barchart/qabstractbarseries.h +++ b/src/barchart/qabstractbarseries.h @@ -46,10 +46,10 @@ public: bool append(QBarSet *set); bool remove(QBarSet *set); bool take(QBarSet *set); - bool append(QList<QBarSet* > sets); + bool append(QList<QBarSet *> sets); bool insert(int index, QBarSet *set); int count() const; - QList<QBarSet*> barSets() const; + QList<QBarSet *> barSets() const; void clear(); void setLabelsVisible(bool visible = true); @@ -64,8 +64,8 @@ Q_SIGNALS: void countChanged(); void labelsVisibleChanged(); - void barsetsAdded(QList<QBarSet*> sets); - void barsetsRemoved(QList<QBarSet*> sets); + void barsetsAdded(QList<QBarSet *> sets); + void barsetsRemoved(QList<QBarSet *> sets); protected: Q_DECLARE_PRIVATE(QAbstractBarSeries) diff --git a/src/barchart/qabstractbarseries_p.h b/src/barchart/qabstractbarseries_p.h index d8ed75b5..cffce0bd 100644 --- a/src/barchart/qabstractbarseries_p.h +++ b/src/barchart/qabstractbarseries_p.h @@ -53,20 +53,20 @@ public: void setVisible(bool visible); void setLabelsVisible(bool visible); - void scaleDomain(Domain& domain); - ChartElement* createGraphics(ChartPresenter* presenter); - QList<LegendMarker*> createLegendMarker(QLegend* legend); + void scaleDomain(Domain &domain); + ChartElement *createGraphics(ChartPresenter *presenter); + QList<LegendMarker *> createLegendMarker(QLegend *legend); - void initializeAxis(QAbstractAxis* axis); + void initializeAxis(QAbstractAxis *axis); virtual QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const; bool append(QBarSet *set); bool remove(QBarSet *set); - bool append(QList<QBarSet* > sets); - bool remove(QList<QBarSet* > sets); + bool append(QList<QBarSet *> sets); + bool remove(QList<QBarSet *> sets); bool insert(int index, QBarSet *set); - QBarSet* barsetAt(int index); + QBarSet *barsetAt(int index); qreal min(); qreal max(); qreal valueAt(int set, int category); @@ -90,7 +90,7 @@ Q_SIGNALS: void visibleChanged(); private: - void populateCategories(QBarCategoryAxis* axis); + void populateCategories(QBarCategoryAxis *axis); protected: QList<QBarSet *> m_barSets; diff --git a/src/barchart/qbarmodelmapper.cpp b/src/barchart/qbarmodelmapper.cpp index cc865b5b..a6319958 100644 --- a/src/barchart/qbarmodelmapper.cpp +++ b/src/barchart/qbarmodelmapper.cpp @@ -33,7 +33,7 @@ QBarModelMapper::QBarModelMapper(QObject *parent) : { } -QAbstractItemModel* QBarModelMapper::model() const +QAbstractItemModel *QBarModelMapper::model() const { Q_D(const QBarModelMapper); return d->m_model; @@ -60,7 +60,7 @@ void QBarModelMapper::setModel(QAbstractItemModel *model) connect(d->m_model, SIGNAL(destroyed()), d, SLOT(handleModelDestroyed())); } -QAbstractBarSeries* QBarModelMapper::series() const +QAbstractBarSeries *QBarModelMapper::series() const { Q_D(const QBarModelMapper); return d->m_series; @@ -215,7 +215,7 @@ void QBarModelMapperPrivate::blockSeriesSignals(bool block) m_seriesSignalsBlock = block; } -QBarSet* QBarModelMapperPrivate::barSet(QModelIndex index) +QBarSet *QBarModelMapperPrivate::barSet(QModelIndex index) { if (!index.isValid()) return 0; @@ -269,7 +269,7 @@ void QBarModelMapperPrivate::modelUpdated(QModelIndex topLeft, QModelIndex botto for (int row = topLeft.row(); row <= bottomRight.row(); row++) { for (int column = topLeft.column(); column <= bottomRight.column(); column++) { index = topLeft.sibling(row, column); - QBarSet* bar = barSet(index); + QBarSet *bar = barSet(index); if (bar) { if (m_orientation == Qt::Vertical) bar->replace(row - m_first, m_model->data(index).toReal()); @@ -293,7 +293,7 @@ void QBarModelMapperPrivate::modelHeaderDataUpdated(Qt::Orientation orientation, if (orientation != m_orientation) { for (int section = first; section <= last; section++) { if (section >= m_firstBarSetSection && section <= m_lastBarSetSection) { - QBarSet* bar = m_series->barSets().at(section - m_firstBarSetSection); + QBarSet *bar = m_series->barSets().at(section - m_firstBarSetSection); if (bar) bar->setLabel(m_model->headerData(section, orientation).toString()); } @@ -387,7 +387,7 @@ void QBarModelMapperPrivate::removeData(int start, int end) // To be implemented } -void QBarModelMapperPrivate::barSetsAdded(QList<QBarSet*> sets) +void QBarModelMapperPrivate::barSetsAdded(QList<QBarSet *> sets) { if (m_seriesSignalsBlock) return; @@ -434,7 +434,7 @@ void QBarModelMapperPrivate::barSetsAdded(QList<QBarSet*> sets) initializeBarFromModel(); } -void QBarModelMapperPrivate::barSetsRemoved(QList<QBarSet*> sets) +void QBarModelMapperPrivate::barSetsRemoved(QList<QBarSet *> sets) { if (m_seriesSignalsBlock) return; diff --git a/src/barchart/qbarmodelmapper.h b/src/barchart/qbarmodelmapper.h index 805eaf58..3c98261f 100644 --- a/src/barchart/qbarmodelmapper.h +++ b/src/barchart/qbarmodelmapper.h @@ -38,10 +38,10 @@ class QTCOMMERCIALCHART_EXPORT QBarModelMapper : public QObject protected: explicit QBarModelMapper(QObject *parent = 0); - QAbstractItemModel* model() const; + QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); - QAbstractBarSeries* series() const; + QAbstractBarSeries *series() const; void setSeries(QAbstractBarSeries *series); int first() const; diff --git a/src/barchart/qbarmodelmapper_p.h b/src/barchart/qbarmodelmapper_p.h index 5a59f1f2..6ae5833a 100644 --- a/src/barchart/qbarmodelmapper_p.h +++ b/src/barchart/qbarmodelmapper_p.h @@ -56,8 +56,8 @@ public Q_SLOTS: void handleModelDestroyed(); // for the series - void barSetsAdded(QList<QBarSet*> sets); - void barSetsRemoved(QList<QBarSet*> sets); + void barSetsAdded(QList<QBarSet *> sets); + void barSetsRemoved(QList<QBarSet *> sets); void valuesAdded(int index, int count); void valuesRemoved(int index, int count); void barLabelChanged(); @@ -67,7 +67,7 @@ public Q_SLOTS: void initializeBarFromModel(); private: - QBarSet* barSet(QModelIndex index); + QBarSet *barSet(QModelIndex index); QModelIndex barModelIndex(int barSection, int posInBar); void insertData(int start, int end); void removeData(int start, int end); @@ -76,7 +76,7 @@ private: private: QAbstractBarSeries *m_series; - QList<QBarSet*> m_barSets; + QList<QBarSet *> m_barSets; QAbstractItemModel *m_model; int m_first; int m_count; diff --git a/src/barchart/qbarset.cpp b/src/barchart/qbarset.cpp index 933587d8..ff5f0ba9 100644 --- a/src/barchart/qbarset.cpp +++ b/src/barchart/qbarset.cpp @@ -307,7 +307,7 @@ void QBarSet::append(const QList<qreal> &values) Convenience operator. Same as append, with real \a value. \sa append() */ -QBarSet& QBarSet::operator << (const qreal &value) +QBarSet &QBarSet::operator << (const qreal &value) { append(value); return *this; diff --git a/src/barchart/qbarset.h b/src/barchart/qbarset.h index e16fbda6..c2bfb5aa 100644 --- a/src/barchart/qbarset.h +++ b/src/barchart/qbarset.h @@ -51,7 +51,7 @@ public: void append(const qreal value); void append(const QList<qreal> &values); - QBarSet& operator << (const qreal &value); + QBarSet &operator << (const qreal &value); void insert(const int index, const qreal value); void remove(const int index, const int count = 1); diff --git a/src/barchart/qhbarmodelmapper.cpp b/src/barchart/qhbarmodelmapper.cpp index 28580b1f..ecec7869 100644 --- a/src/barchart/qhbarmodelmapper.cpp +++ b/src/barchart/qhbarmodelmapper.cpp @@ -166,7 +166,7 @@ QHBarModelMapper::QHBarModelMapper(QObject *parent) : QBarModelMapper::setOrientation(Qt::Horizontal); } -QAbstractItemModel* QHBarModelMapper::model() const +QAbstractItemModel *QHBarModelMapper::model() const { return QBarModelMapper::model(); } @@ -179,7 +179,7 @@ void QHBarModelMapper::setModel(QAbstractItemModel *model) } } -QAbstractBarSeries* QHBarModelMapper::series() const +QAbstractBarSeries *QHBarModelMapper::series() const { return QBarModelMapper::series(); } diff --git a/src/barchart/qhbarmodelmapper.h b/src/barchart/qhbarmodelmapper.h index ad844472..634ceef2 100644 --- a/src/barchart/qhbarmodelmapper.h +++ b/src/barchart/qhbarmodelmapper.h @@ -38,10 +38,10 @@ class QTCOMMERCIALCHART_EXPORT QHBarModelMapper : public QBarModelMapper public: explicit QHBarModelMapper(QObject *parent = 0); - QAbstractItemModel* model() const; + QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); - QAbstractBarSeries* series() const; + QAbstractBarSeries *series() const; void setSeries(QAbstractBarSeries *series); int firstBarSetRow() const; diff --git a/src/barchart/qvbarmodelmapper.cpp b/src/barchart/qvbarmodelmapper.cpp index 7dae73fa..9391a1c0 100644 --- a/src/barchart/qvbarmodelmapper.cpp +++ b/src/barchart/qvbarmodelmapper.cpp @@ -165,7 +165,7 @@ QVBarModelMapper::QVBarModelMapper(QObject *parent) : QBarModelMapper::setOrientation(Qt::Vertical); } -QAbstractItemModel* QVBarModelMapper::model() const +QAbstractItemModel *QVBarModelMapper::model() const { return QBarModelMapper::model(); } @@ -178,7 +178,7 @@ void QVBarModelMapper::setModel(QAbstractItemModel *model) } } -QAbstractBarSeries* QVBarModelMapper::series() const +QAbstractBarSeries *QVBarModelMapper::series() const { return QBarModelMapper::series(); } diff --git a/src/barchart/qvbarmodelmapper.h b/src/barchart/qvbarmodelmapper.h index 23747b4c..902068ba 100644 --- a/src/barchart/qvbarmodelmapper.h +++ b/src/barchart/qvbarmodelmapper.h @@ -38,10 +38,10 @@ class QTCOMMERCIALCHART_EXPORT QVBarModelMapper : public QBarModelMapper public: explicit QVBarModelMapper(QObject *parent = 0); - QAbstractItemModel* model() const; + QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); - QAbstractBarSeries* series() const; + QAbstractBarSeries *series() const; void setSeries(QAbstractBarSeries *series); int firstBarSetColumn() const; diff --git a/src/barchart/vertical/bar/barchartitem.cpp b/src/barchart/vertical/bar/barchartitem.cpp index 769f512c..2210821f 100644 --- a/src/barchart/vertical/bar/barchartitem.cpp +++ b/src/barchart/vertical/bar/barchartitem.cpp @@ -53,14 +53,14 @@ QVector<QRectF> BarChartItem::calculateLayout() for (int category = 0; category < categoryCount; category++) { qreal yPos = height + scaleY * m_domainMinY + geometry().top(); for (int set = 0; set < setCount; set++) { - QBarSetPrivate* barSet = m_series->d_func()->barsetAt(set)->d_ptr.data(); + QBarSetPrivate *barSet = m_series->d_func()->barsetAt(set)->d_ptr.data(); qreal xPos = (barSet->pos(category) - m_domainMinX) * scaleX + geometry().left(); xPos -= setCount * rectWidth / 2; xPos += set * rectWidth; qreal rectHeight = barSet->value(category) * scaleY; - Bar* bar = m_bars.at(itemIndex); + Bar *bar = m_bars.at(itemIndex); QRectF rect(xPos, yPos - rectHeight, rectWidth, rectHeight); layout.append(rect); @@ -71,7 +71,7 @@ QVector<QRectF> BarChartItem::calculateLayout() else bar->setVisible(barsVisible); - QGraphicsSimpleTextItem* label = m_labels.at(itemIndex); + QGraphicsSimpleTextItem *label = m_labels.at(itemIndex); if (!qFuzzyIsNull(barSet->value(category))) label->setText(QString::number(barSet->value(category))); diff --git a/src/barchart/vertical/bar/qbarseries.cpp b/src/barchart/vertical/bar/qbarseries.cpp index 7032c4e1..e97ed8f3 100644 --- a/src/barchart/vertical/bar/qbarseries.cpp +++ b/src/barchart/vertical/bar/qbarseries.cpp @@ -89,7 +89,7 @@ QBarSeriesPrivate::QBarSeriesPrivate(QBarSeries *q) : QAbstractBarSeriesPrivate( } -void QBarSeriesPrivate::scaleDomain(Domain& domain) +void QBarSeriesPrivate::scaleDomain(Domain &domain) { qreal minX(domain.minX()); qreal minY(domain.minY()); @@ -106,11 +106,11 @@ void QBarSeriesPrivate::scaleDomain(Domain& domain) } -ChartElement* QBarSeriesPrivate::createGraphics(ChartPresenter* presenter) +ChartElement *QBarSeriesPrivate::createGraphics(ChartPresenter *presenter) { Q_Q(QBarSeries); - BarChartItem* bar = new BarChartItem(q, presenter); + BarChartItem *bar = new BarChartItem(q, presenter); if (presenter->animationOptions().testFlag(QChart::SeriesAnimations)) bar->setAnimation(new BarAnimation(bar)); presenter->chartTheme()->decorate(q, presenter->dataSet()->seriesIndex(q)); diff --git a/src/barchart/vertical/bar/qbarseries_p.h b/src/barchart/vertical/bar/qbarseries_p.h index df74eff3..c26e6123 100644 --- a/src/barchart/vertical/bar/qbarseries_p.h +++ b/src/barchart/vertical/bar/qbarseries_p.h @@ -39,9 +39,9 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE class QBarSeriesPrivate: public QAbstractBarSeriesPrivate { public: - QBarSeriesPrivate(QBarSeries* q); - ChartElement* createGraphics(ChartPresenter* presenter); - void scaleDomain(Domain& domain); + QBarSeriesPrivate(QBarSeries *q); + ChartElement *createGraphics(ChartPresenter *presenter); + void scaleDomain(Domain &domain); private: Q_DECLARE_PUBLIC(QBarSeries) }; diff --git a/src/barchart/vertical/percent/percentbarchartitem.cpp b/src/barchart/vertical/percent/percentbarchartitem.cpp index b43206df..3b5bcb76 100644 --- a/src/barchart/vertical/percent/percentbarchartitem.cpp +++ b/src/barchart/vertical/percent/percentbarchartitem.cpp @@ -55,12 +55,12 @@ QVector<QRectF> PercentBarChartItem::calculateLayout() qreal percentage = (100 / colSum); qreal yPos = height + scaleY * m_domainMinY + geometry().top(); for (int set = 0; set < setCount; set++) { - QBarSetPrivate* barSet = m_series->d_func()->barsetAt(set)->d_ptr.data(); + QBarSetPrivate *barSet = m_series->d_func()->barsetAt(set)->d_ptr.data(); qreal xPos = (barSet->pos(category) - m_domainMinX) * scaleX + geometry().left() - rectWidth / 2; qreal rectHeight = barSet->value(category) * percentage * scaleY; - Bar* bar = m_bars.at(itemIndex); + Bar *bar = m_bars.at(itemIndex); bar->setPen(barSet->m_pen); bar->setBrush(barSet->m_brush); if (qFuzzyIsNull(rectHeight)) @@ -71,7 +71,7 @@ QVector<QRectF> PercentBarChartItem::calculateLayout() QRectF rect(xPos, yPos - rectHeight, rectWidth, rectHeight); layout.append(rect); - QGraphicsSimpleTextItem* label = m_labels.at(itemIndex); + QGraphicsSimpleTextItem *label = m_labels.at(itemIndex); if (!qFuzzyIsNull(m_series->d_func()->valueAt(set, category))) { int p = m_series->d_func()->percentageAt(set, category) * 100; diff --git a/src/barchart/vertical/percent/qpercentbarseries.cpp b/src/barchart/vertical/percent/qpercentbarseries.cpp index 2d3f5880..5bfe88b9 100644 --- a/src/barchart/vertical/percent/qpercentbarseries.cpp +++ b/src/barchart/vertical/percent/qpercentbarseries.cpp @@ -88,7 +88,7 @@ QPercentBarSeriesPrivate::QPercentBarSeriesPrivate(QPercentBarSeries *q) : QAbst } -void QPercentBarSeriesPrivate::scaleDomain(Domain& domain) +void QPercentBarSeriesPrivate::scaleDomain(Domain &domain) { qreal minX(domain.minX()); qreal minY(domain.minY()); @@ -105,11 +105,11 @@ void QPercentBarSeriesPrivate::scaleDomain(Domain& domain) } -ChartElement* QPercentBarSeriesPrivate::createGraphics(ChartPresenter* presenter) +ChartElement *QPercentBarSeriesPrivate::createGraphics(ChartPresenter *presenter) { Q_Q(QPercentBarSeries); - PercentBarChartItem* bar = new PercentBarChartItem(q, presenter); + PercentBarChartItem *bar = new PercentBarChartItem(q, presenter); if (presenter->animationOptions().testFlag(QChart::SeriesAnimations)) bar->setAnimation(new PercentBarAnimation(bar)); presenter->chartTheme()->decorate(q, presenter->dataSet()->seriesIndex(q)); diff --git a/src/barchart/vertical/percent/qpercentbarseries_p.h b/src/barchart/vertical/percent/qpercentbarseries_p.h index cb92ba91..52ff116b 100644 --- a/src/barchart/vertical/percent/qpercentbarseries_p.h +++ b/src/barchart/vertical/percent/qpercentbarseries_p.h @@ -39,9 +39,9 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE class QPercentBarSeriesPrivate: public QAbstractBarSeriesPrivate { public: - QPercentBarSeriesPrivate(QPercentBarSeries* q); - void scaleDomain(Domain& domain); - ChartElement* createGraphics(ChartPresenter* presenter); + QPercentBarSeriesPrivate(QPercentBarSeries *q); + void scaleDomain(Domain &domain); + ChartElement *createGraphics(ChartPresenter *presenter); private: Q_DECLARE_PUBLIC(QPercentBarSeries) }; diff --git a/src/barchart/vertical/stacked/qstackedbarseries.cpp b/src/barchart/vertical/stacked/qstackedbarseries.cpp index 085f9d27..d8d30693 100644 --- a/src/barchart/vertical/stacked/qstackedbarseries.cpp +++ b/src/barchart/vertical/stacked/qstackedbarseries.cpp @@ -88,7 +88,7 @@ QStackedBarSeriesPrivate::QStackedBarSeriesPrivate(QStackedBarSeries *q) : QAbst } -void QStackedBarSeriesPrivate::scaleDomain(Domain& domain) +void QStackedBarSeriesPrivate::scaleDomain(Domain &domain) { qreal minX(domain.minX()); qreal minY(domain.minY()); @@ -104,11 +104,11 @@ void QStackedBarSeriesPrivate::scaleDomain(Domain& domain) domain.setRange(minX, maxX, minY, maxY); } -ChartElement* QStackedBarSeriesPrivate::createGraphics(ChartPresenter* presenter) +ChartElement *QStackedBarSeriesPrivate::createGraphics(ChartPresenter *presenter) { Q_Q(QStackedBarSeries); - StackedBarChartItem* bar = new StackedBarChartItem(q, presenter); + StackedBarChartItem *bar = new StackedBarChartItem(q, presenter); if (presenter->animationOptions().testFlag(QChart::SeriesAnimations)) bar->setAnimation(new StackedBarAnimation(bar)); presenter->chartTheme()->decorate(q, presenter->dataSet()->seriesIndex(q)); diff --git a/src/barchart/vertical/stacked/qstackedbarseries_p.h b/src/barchart/vertical/stacked/qstackedbarseries_p.h index 57230114..ba47f947 100644 --- a/src/barchart/vertical/stacked/qstackedbarseries_p.h +++ b/src/barchart/vertical/stacked/qstackedbarseries_p.h @@ -39,9 +39,9 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE class QStackedBarSeriesPrivate: public QAbstractBarSeriesPrivate { public: - QStackedBarSeriesPrivate(QStackedBarSeries* q); - ChartElement* createGraphics(ChartPresenter* presenter); - void scaleDomain(Domain& domain); + QStackedBarSeriesPrivate(QStackedBarSeries *q); + ChartElement *createGraphics(ChartPresenter *presenter); + void scaleDomain(Domain &domain); private: Q_DECLARE_PUBLIC(QStackedBarSeries) }; diff --git a/src/barchart/vertical/stacked/stackedbarchartitem.cpp b/src/barchart/vertical/stacked/stackedbarchartitem.cpp index 4fd1d9d6..c39b216e 100644 --- a/src/barchart/vertical/stacked/stackedbarchartitem.cpp +++ b/src/barchart/vertical/stacked/stackedbarchartitem.cpp @@ -53,12 +53,12 @@ QVector<QRectF> StackedBarChartItem::calculateLayout() qreal yMax = height + scaleY * m_domainMinY + geometry().top(); qreal yMin = height + scaleY * m_domainMinY + geometry().top(); for (int set = 0; set < setCount; set++) { - QBarSetPrivate* barSet = m_series->d_func()->barsetAt(set)->d_ptr.data(); + QBarSetPrivate *barSet = m_series->d_func()->barsetAt(set)->d_ptr.data(); qreal xPos = (barSet->pos(category) - m_domainMinX) * scaleX + geometry().left() - rectWidth / 2; qreal rectHeight = barSet->value(category) * scaleY; - Bar* bar = m_bars.at(itemIndex); + Bar *bar = m_bars.at(itemIndex); bar->setPen(barSet->m_pen); bar->setBrush(barSet->m_brush); if (qFuzzyIsNull(rectHeight)) @@ -66,7 +66,7 @@ QVector<QRectF> StackedBarChartItem::calculateLayout() else bar->setVisible(barsVisible); - QGraphicsSimpleTextItem* label = m_labels.at(itemIndex); + QGraphicsSimpleTextItem *label = m_labels.at(itemIndex); if (!qFuzzyIsNull(barSet->value(category))) label->setText(QString::number(barSet->value(category))); |