From f8a933676fbdcfa256f06e491b0737e37e95c6eb 2012-09-25 12:12:41 From: Jani Honkonen Date: 2012-09-25 12:12:41 Subject: [PATCH] more coding style fixes for src-folder mostly putting the * or & next to the variable name --- diff --git a/src/animations/axisanimation.cpp b/src/animations/axisanimation.cpp index e3daefa..891007c 100644 --- a/src/animations/axisanimation.cpp +++ b/src/animations/axisanimation.cpp @@ -49,7 +49,7 @@ void AxisAnimation::setAnimationType(Animation type) m_type = type; } -void AxisAnimation::setAnimationPoint(const QPointF& point) +void AxisAnimation::setAnimationPoint(const QPointF &point) { if (state() != QAbstractAnimation::Stopped) stop(); diff --git a/src/animations/axisanimation_p.h b/src/animations/axisanimation_p.h index a2d5de6..4ecc7b0 100644 --- a/src/animations/axisanimation_p.h +++ b/src/animations/axisanimation_p.h @@ -44,7 +44,7 @@ public: AxisAnimation(ChartAxis *axis); ~AxisAnimation(); void setAnimationType(Animation type); - void setAnimationPoint(const QPointF& point); + void setAnimationPoint(const QPointF &point); void setValues(QVector &oldLayout, QVector &newLayout); protected: QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress) const; diff --git a/src/animations/pieanimation.cpp b/src/animations/pieanimation.cpp index 759288e..3d3fb58 100644 --- a/src/animations/pieanimation.cpp +++ b/src/animations/pieanimation.cpp @@ -35,7 +35,7 @@ PieAnimation::~PieAnimation() { } -ChartAnimation* PieAnimation::updateValue(PieSliceItem *sliceItem, const PieSliceData &sliceData) +ChartAnimation *PieAnimation::updateValue(PieSliceItem *sliceItem, const PieSliceData &sliceData) { PieSliceAnimation *animation = m_animations.value(sliceItem); Q_ASSERT(animation); @@ -48,7 +48,7 @@ ChartAnimation* PieAnimation::updateValue(PieSliceItem *sliceItem, const PieSlic return animation; } -ChartAnimation* PieAnimation::addSlice(PieSliceItem *sliceItem, const PieSliceData &sliceData, bool startupAnimation) +ChartAnimation *PieAnimation::addSlice(PieSliceItem *sliceItem, const PieSliceData &sliceData, bool startupAnimation) { PieSliceAnimation *animation = new PieSliceAnimation(sliceItem); m_animations.insert(sliceItem, animation); @@ -71,7 +71,7 @@ ChartAnimation* PieAnimation::addSlice(PieSliceItem *sliceItem, const PieSliceDa return animation; } -ChartAnimation* PieAnimation::removeSlice(PieSliceItem *sliceItem) +ChartAnimation *PieAnimation::removeSlice(PieSliceItem *sliceItem) { PieSliceAnimation *animation = m_animations.value(sliceItem); Q_ASSERT(animation); diff --git a/src/animations/pieanimation_p.h b/src/animations/pieanimation_p.h index c0d5a80..a6bf2e1 100644 --- a/src/animations/pieanimation_p.h +++ b/src/animations/pieanimation_p.h @@ -45,9 +45,9 @@ class PieAnimation : public ChartAnimation public: PieAnimation(PieChartItem *item); ~PieAnimation(); - ChartAnimation* updateValue(PieSliceItem *sliceItem, const PieSliceData &newValue); - ChartAnimation* addSlice(PieSliceItem *sliceItem, const PieSliceData &endValue, bool startupAnimation); - ChartAnimation* removeSlice(PieSliceItem *sliceItem); + ChartAnimation *updateValue(PieSliceItem *sliceItem, const PieSliceData &newValue); + ChartAnimation *addSlice(PieSliceItem *sliceItem, const PieSliceData &endValue, bool startupAnimation); + ChartAnimation *removeSlice(PieSliceItem *sliceItem); public: // from QVariantAnimation void updateCurrentValue(const QVariant &value); diff --git a/src/animations/splineanimation.cpp b/src/animations/splineanimation.cpp index be3e9d8..fa62c16 100644 --- a/src/animations/splineanimation.cpp +++ b/src/animations/splineanimation.cpp @@ -27,9 +27,10 @@ Q_DECLARE_METATYPE(SplineVector) QTCOMMERCIALCHART_BEGIN_NAMESPACE -SplineAnimation::SplineAnimation(SplineChartItem* item): XYAnimation(item), - m_item(item), - m_valid(false) +SplineAnimation::SplineAnimation(SplineChartItem *item) + : XYAnimation(item), + m_item(item), + m_valid(false) { } diff --git a/src/areachart/areachartitem_p.h b/src/areachart/areachartitem_p.h index 4dd1884..7290d0c 100644 --- a/src/areachart/areachartitem_p.h +++ b/src/areachart/areachartitem_p.h @@ -51,8 +51,8 @@ public: void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); QPainterPath shape() const; - LineChartItem* upperLineItem() const { return m_upper; } - LineChartItem* lowerLineItem() const { return m_lower; } + LineChartItem *upperLineItem() const { return m_upper; } + LineChartItem *lowerLineItem() const { return m_lower; } void updatePath(); @@ -68,9 +68,9 @@ public Q_SLOTS: void handleGeometryChanged(const QRectF &size); private: - QAreaSeries* m_series; - LineChartItem* m_upper; - LineChartItem* m_lower; + QAreaSeries *m_series; + LineChartItem *m_upper; + LineChartItem *m_lower; QPainterPath m_path; QRectF m_rect; QRectF m_clipRect; @@ -84,20 +84,21 @@ private: class AreaBoundItem : public LineChartItem { public: - AreaBoundItem(AreaChartItem *item, QLineSeries *lineSeries, ChartPresenter* presenter) + AreaBoundItem(AreaChartItem *item, QLineSeries *lineSeries, ChartPresenter *presenter) : LineChartItem(lineSeries, 0), m_item(item) { setPresenter(presenter); } ~AreaBoundItem() {} - void updateGeometry() { + void updateGeometry() + { LineChartItem::updateGeometry(); m_item->updatePath(); } private: - AreaChartItem* m_item; + AreaChartItem *m_item; }; QTCOMMERCIALCHART_END_NAMESPACE diff --git a/src/areachart/qareaseries.cpp b/src/areachart/qareaseries.cpp index 9f57878..6b8f0e0 100644 --- a/src/areachart/qareaseries.cpp +++ b/src/areachart/qareaseries.cpp @@ -195,13 +195,13 @@ QAbstractSeries::SeriesType QAreaSeries::type() const /*! Sets the \a series that is to be used as the area chart upper series. */ -void QAreaSeries::setUpperSeries(QLineSeries* series) +void QAreaSeries::setUpperSeries(QLineSeries *series) { Q_D(QAreaSeries); d->m_upperSeries = series; } -QLineSeries* QAreaSeries::upperSeries() const +QLineSeries *QAreaSeries::upperSeries() const { Q_D(const QAreaSeries); return d->m_upperSeries; @@ -210,13 +210,13 @@ QLineSeries* QAreaSeries::upperSeries() const /*! Sets the \a series that is to be used as the area chart lower series. */ -void QAreaSeries::setLowerSeries(QLineSeries* series) +void QAreaSeries::setLowerSeries(QLineSeries *series) { Q_D(QAreaSeries); d->m_lowerSeries = series; } -QLineSeries* QAreaSeries::lowerSeries() const +QLineSeries *QAreaSeries::lowerSeries() const { Q_D(const QAreaSeries); return d->m_lowerSeries; @@ -314,7 +314,7 @@ bool QAreaSeries::pointsVisible() const //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -QAreaSeriesPrivate::QAreaSeriesPrivate(QLineSeries *upperSeries, QLineSeries *lowerSeries, QAreaSeries* q) +QAreaSeriesPrivate::QAreaSeriesPrivate(QLineSeries *upperSeries, QLineSeries *lowerSeries, QAreaSeries *q) : QAbstractSeriesPrivate(q), m_upperSeries(upperSeries), m_lowerSeries(lowerSeries), @@ -322,7 +322,7 @@ QAreaSeriesPrivate::QAreaSeriesPrivate(QLineSeries *upperSeries, QLineSeries *lo { } -void QAreaSeriesPrivate::scaleDomain(Domain& domain) +void QAreaSeriesPrivate::scaleDomain(Domain &domain) { Q_Q(QAreaSeries); @@ -331,8 +331,8 @@ void QAreaSeriesPrivate::scaleDomain(Domain& domain) qreal maxX(domain.maxX()); qreal maxY(domain.maxY()); - QLineSeries* upperSeries = q->upperSeries(); - QLineSeries* lowerSeries = q->lowerSeries(); + QLineSeries *upperSeries = q->upperSeries(); + QLineSeries *lowerSeries = q->lowerSeries(); const QList& points = upperSeries->points(); @@ -361,11 +361,11 @@ void QAreaSeriesPrivate::scaleDomain(Domain& domain) domain.setRange(minX, maxX, minY, maxY); } -ChartElement* QAreaSeriesPrivate::createGraphics(ChartPresenter* presenter) +ChartElement *QAreaSeriesPrivate::createGraphics(ChartPresenter *presenter) { Q_Q(QAreaSeries); - AreaChartItem* area = new AreaChartItem(q, presenter); + AreaChartItem *area = new AreaChartItem(q, presenter); if (presenter->animationOptions().testFlag(QChart::SeriesAnimations)) { area->upperLineItem()->setAnimation(new XYAnimation(area->upperLineItem())); if (q->lowerSeries()) @@ -375,15 +375,15 @@ ChartElement* QAreaSeriesPrivate::createGraphics(ChartPresenter* presenter) return area; } -QList QAreaSeriesPrivate::createLegendMarker(QLegend* legend) +QList QAreaSeriesPrivate::createLegendMarker(QLegend *legend) { Q_Q(QAreaSeries); - QList list; + QList list; return list << new AreaLegendMarker(q, legend); } -void QAreaSeriesPrivate::initializeAxis(QAbstractAxis* axis) +void QAreaSeriesPrivate::initializeAxis(QAbstractAxis *axis) { Q_UNUSED(axis); } diff --git a/src/areachart/qareaseries.h b/src/areachart/qareaseries.h index 082fa25..11db5ba 100644 --- a/src/areachart/qareaseries.h +++ b/src/areachart/qareaseries.h @@ -46,10 +46,10 @@ public: public: QAbstractSeries::SeriesType type() const; - void setUpperSeries(QLineSeries* series); - QLineSeries* upperSeries() const; - void setLowerSeries(QLineSeries* series); - QLineSeries* lowerSeries() const; + void setUpperSeries(QLineSeries *series); + QLineSeries *upperSeries() const; + void setLowerSeries(QLineSeries *series); + QLineSeries *lowerSeries() const; void setPen(const QPen &pen); QPen pen() const; diff --git a/src/areachart/qareaseries_p.h b/src/areachart/qareaseries_p.h index f219deb..24ddc34 100644 --- a/src/areachart/qareaseries_p.h +++ b/src/areachart/qareaseries_p.h @@ -41,12 +41,12 @@ class QAreaSeriesPrivate: public QAbstractSeriesPrivate Q_OBJECT public: - QAreaSeriesPrivate(QLineSeries *upperSeries, QLineSeries *lowerSeries, QAreaSeries* q); + QAreaSeriesPrivate(QLineSeries *upperSeries, QLineSeries *lowerSeries, QAreaSeries *q); - void scaleDomain(Domain& domain); - ChartElement* createGraphics(ChartPresenter* presenter); - QList createLegendMarker(QLegend* legend); - void initializeAxis(QAbstractAxis* axis); + void scaleDomain(Domain &domain); + ChartElement *createGraphics(ChartPresenter *presenter); + QList createLegendMarker(QLegend *legend); + void initializeAxis(QAbstractAxis *axis); QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const; Q_SIGNALS: @@ -55,8 +55,8 @@ Q_SIGNALS: protected: QBrush m_brush; QPen m_pen; - QLineSeries* m_upperSeries; - QLineSeries* m_lowerSeries; + QLineSeries *m_upperSeries; + QLineSeries *m_lowerSeries; bool m_pointsVisible; private: Q_DECLARE_PUBLIC(QAreaSeries); diff --git a/src/axis/barcategoryaxis/chartbarcategoryaxisx.cpp b/src/axis/barcategoryaxis/chartbarcategoryaxisx.cpp index b113fd2..bf870c7 100644 --- a/src/axis/barcategoryaxis/chartbarcategoryaxisx.cpp +++ b/src/axis/barcategoryaxis/chartbarcategoryaxisx.cpp @@ -109,16 +109,16 @@ void ChartBarCategoryAxisX::updateGeometry() const qreal delta = chartRect.width() / (m_categoriesAxis->d_ptr->count()); - QGraphicsLineItem *lineItem = static_cast(axis.at(0)); + QGraphicsLineItem *lineItem = static_cast(axis.at(0)); lineItem->setLine(chartRect.left(), chartRect.bottom(), chartRect.right(), chartRect.bottom()); qreal width = chartRect.left(); for (int i = 0; i < layout.size(); ++i) { - QGraphicsLineItem *lineItem = static_cast(lines.at(i)); + QGraphicsLineItem *lineItem = static_cast(lines.at(i)); lineItem->setLine(layout[i], chartRect.top(), layout[i], chartRect.bottom()); - QGraphicsSimpleTextItem *labelItem = static_cast(labels.at(i)); + QGraphicsSimpleTextItem *labelItem = static_cast(labels.at(i)); labelItem->setText(ticksList.at(i)); - const QRectF& rect = labelItem->boundingRect(); + const QRectF &rect = labelItem->boundingRect(); QPointF center = rect.center(); labelItem->setTransformOriginPoint(center.x(), center.y()); @@ -135,10 +135,10 @@ void ChartBarCategoryAxisX::updateGeometry() } if ((i + 1) % 2 && i > 1) { - QGraphicsRectItem *rectItem = static_cast(shades.at(i / 2 - 1)); + QGraphicsRectItem *rectItem = static_cast(shades.at(i / 2 - 1)); rectItem->setRect(layout[i - 1], chartRect.top(), layout[i] - layout[i - 1], chartRect.height()); } - lineItem = static_cast(axis.at(i + 1)); + lineItem = static_cast(axis.at(i + 1)); lineItem->setLine(layout[i], chartRect.bottom(), layout[i], chartRect.bottom() + 5); } } @@ -152,7 +152,7 @@ void ChartBarCategoryAxisX::handleAxisUpdated() ChartAxis::handleAxisUpdated(); } -QSizeF ChartBarCategoryAxisX::sizeHint(Qt::SizeHint which, const QSizeF& constraint) const +QSizeF ChartBarCategoryAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const { Q_UNUSED(constraint) diff --git a/src/axis/barcategoryaxis/chartbarcategoryaxisx_p.h b/src/axis/barcategoryaxis/chartbarcategoryaxisx_p.h index b58d2fe..16da68c 100644 --- a/src/axis/barcategoryaxis/chartbarcategoryaxisx_p.h +++ b/src/axis/barcategoryaxis/chartbarcategoryaxisx_p.h @@ -45,7 +45,7 @@ public: ~ChartBarCategoryAxisX(); AxisType axisType() const { return X_AXIS;} - QSizeF sizeHint(Qt::SizeHint which, const QSizeF& constraint) const; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const; protected: QVector calculateLayout() const; void updateGeometry(); diff --git a/src/axis/barcategoryaxis/chartbarcategoryaxisy.cpp b/src/axis/barcategoryaxis/chartbarcategoryaxisy.cpp index 2f98578..5c4e5f0 100644 --- a/src/axis/barcategoryaxis/chartbarcategoryaxisy.cpp +++ b/src/axis/barcategoryaxis/chartbarcategoryaxisy.cpp @@ -107,16 +107,16 @@ void ChartBarCategoryAxisY::updateGeometry() const qreal delta = chartRect.height() / (m_categoriesAxis->d_ptr->count()); - QGraphicsLineItem *lineItem = static_cast(axis.at(0)); + QGraphicsLineItem *lineItem = static_cast(axis.at(0)); lineItem->setLine(chartRect.left() , chartRect.top(), chartRect.left(), chartRect.bottom()); qreal height = chartRect.bottom(); for (int i = 0; i < layout.size(); ++i) { - QGraphicsLineItem *lineItem = static_cast(lines.at(i)); + QGraphicsLineItem *lineItem = static_cast(lines.at(i)); lineItem->setLine(chartRect.left() , layout[i], chartRect.right(), layout[i]); - QGraphicsSimpleTextItem *labelItem = static_cast(labels.at(i)); + QGraphicsSimpleTextItem *labelItem = static_cast(labels.at(i)); labelItem->setText(ticksList.at(i)); - const QRectF& rect = labelItem->boundingRect(); + const QRectF &rect = labelItem->boundingRect(); QPointF center = rect.center(); labelItem->setTransformOriginPoint(center.x(), center.y()); @@ -133,10 +133,10 @@ void ChartBarCategoryAxisY::updateGeometry() } if ((i + 1) % 2 && i > 1) { - QGraphicsRectItem *rectItem = static_cast(shades.at(i / 2 - 1)); + QGraphicsRectItem *rectItem = static_cast(shades.at(i / 2 - 1)); rectItem->setRect(chartRect.left(), layout[i], chartRect.width(), layout[i - 1] - layout[i]); } - lineItem = static_cast(axis.at(i + 1)); + lineItem = static_cast(axis.at(i + 1)); lineItem->setLine(chartRect.left() - 5, layout[i], chartRect.left(), layout[i]); } } @@ -152,7 +152,7 @@ void ChartBarCategoryAxisY::handleAxisUpdated() ChartAxis::handleAxisUpdated(); } -QSizeF ChartBarCategoryAxisY::sizeHint(Qt::SizeHint which, const QSizeF& constraint) const +QSizeF ChartBarCategoryAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const { Q_UNUSED(constraint) diff --git a/src/axis/barcategoryaxis/chartbarcategoryaxisy_p.h b/src/axis/barcategoryaxis/chartbarcategoryaxisy_p.h index 3efe505..feb9afa 100644 --- a/src/axis/barcategoryaxis/chartbarcategoryaxisy_p.h +++ b/src/axis/barcategoryaxis/chartbarcategoryaxisy_p.h @@ -45,7 +45,7 @@ public: ~ChartBarCategoryAxisY(); AxisType axisType() const { return Y_AXIS;} - QSizeF sizeHint(Qt::SizeHint which, const QSizeF& constraint) const; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const; protected: QVector calculateLayout() const; void updateGeometry(); diff --git a/src/axis/barcategoryaxis/qbarcategoryaxis.cpp b/src/axis/barcategoryaxis/qbarcategoryaxis.cpp index 172f926..9da39b8 100644 --- a/src/axis/barcategoryaxis/qbarcategoryaxis.cpp +++ b/src/axis/barcategoryaxis/qbarcategoryaxis.cpp @@ -284,7 +284,7 @@ QString QBarCategoryAxis::at(int index) const /*! Sets minimum category to \a min. */ -void QBarCategoryAxis::setMin(const QString& min) +void QBarCategoryAxis::setMin(const QString &min) { Q_D(QBarCategoryAxis); setRange(min, d->m_maxCategory); @@ -302,7 +302,7 @@ QString QBarCategoryAxis::min() const /*! Sets maximum category to \a max. */ -void QBarCategoryAxis::setMax(const QString& max) +void QBarCategoryAxis::setMax(const QString &max) { Q_D(QBarCategoryAxis); setRange(d->m_minCategory, max); @@ -320,7 +320,7 @@ QString QBarCategoryAxis::max() const /*! Sets range from \a minCategory to \a maxCategory */ -void QBarCategoryAxis::setRange(const QString& minCategory, const QString& maxCategory) +void QBarCategoryAxis::setRange(const QString &minCategory, const QString &maxCategory) { Q_D(QBarCategoryAxis); @@ -373,11 +373,11 @@ QAbstractAxis::AxisType QBarCategoryAxis::type() const ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -QBarCategoryAxisPrivate::QBarCategoryAxisPrivate(QBarCategoryAxis* q): - QAbstractAxisPrivate(q), - m_min(0.0), - m_max(0.0), - m_count(0) +QBarCategoryAxisPrivate::QBarCategoryAxisPrivate(QBarCategoryAxis *q) + : QAbstractAxisPrivate(q), + m_min(0.0), + m_max(0.0), + m_count(0) { } @@ -408,7 +408,7 @@ void QBarCategoryAxisPrivate::setRange(const QVariant &min, const QVariant &max) void QBarCategoryAxisPrivate::handleDomainUpdated() { Q_Q(QBarCategoryAxis); - Domain* domain = qobject_cast(sender()); + Domain *domain = qobject_cast(sender()); if (m_orientation == Qt::Horizontal) { m_min = domain->minX(); @@ -442,7 +442,7 @@ void QBarCategoryAxisPrivate::handleDomainUpdated() emit q->rangeChanged(m_minCategory, m_maxCategory); } -ChartAxis* QBarCategoryAxisPrivate::createGraphics(ChartPresenter* presenter) +ChartAxis *QBarCategoryAxisPrivate::createGraphics(ChartPresenter *presenter) { Q_Q(QBarCategoryAxis); if (m_orientation == Qt::Vertical) @@ -450,7 +450,7 @@ ChartAxis* QBarCategoryAxisPrivate::createGraphics(ChartPresenter* presenter) return new ChartBarCategoryAxisX(q, presenter); } -void QBarCategoryAxisPrivate::intializeDomain(Domain* domain) +void QBarCategoryAxisPrivate::intializeDomain(Domain *domain) { Q_Q(QBarCategoryAxis); diff --git a/src/axis/barcategoryaxis/qbarcategoryaxis.h b/src/axis/barcategoryaxis/qbarcategoryaxis.h index 9134dae..26dc3fd 100644 --- a/src/axis/barcategoryaxis/qbarcategoryaxis.h +++ b/src/axis/barcategoryaxis/qbarcategoryaxis.h @@ -55,11 +55,11 @@ public: QString at(int index) const; //range handling - void setMin(const QString& minCategory); + void setMin(const QString &minCategory); QString min() const; - void setMax(const QString& maxCategory); + void setMax(const QString &maxCategory); QString max() const; - void setRange(const QString& minCategory, const QString& maxCategory); + void setRange(const QString &minCategory, const QString &maxCategory); Q_SIGNALS: void categoriesChanged(); diff --git a/src/axis/barcategoryaxis/qbarcategoryaxis_p.h b/src/axis/barcategoryaxis/qbarcategoryaxis_p.h index cb1357b..5338919 100644 --- a/src/axis/barcategoryaxis/qbarcategoryaxis_p.h +++ b/src/axis/barcategoryaxis/qbarcategoryaxis_p.h @@ -46,8 +46,8 @@ public: ~QBarCategoryAxisPrivate(); public: - ChartAxis* createGraphics(ChartPresenter* presenter); - void intializeDomain(Domain* domain); + ChartAxis *createGraphics(ChartPresenter *presenter); + void intializeDomain(Domain *domain); void handleDomainUpdated(); qreal min() { return m_min; } qreal max() { return m_max; } diff --git a/src/axis/categoryaxis/chartcategoryaxisx.cpp b/src/axis/categoryaxis/chartcategoryaxisx.cpp index b517171..cb57566 100644 --- a/src/axis/categoryaxis/chartcategoryaxisx.cpp +++ b/src/axis/categoryaxis/chartcategoryaxisx.cpp @@ -88,15 +88,15 @@ void ChartCategoryAxisX::updateGeometry() QRectF chartRect = presenter()->chartsGeometry(); // axis base line - QGraphicsLineItem *lineItem = static_cast(axis.at(0)); + QGraphicsLineItem *lineItem = static_cast(axis.at(0)); lineItem->setLine(chartRect.left(), chartRect.bottom(), chartRect.right(), chartRect.bottom()); for (int i = 0; i < layout.size(); ++i) { - QGraphicsSimpleTextItem *labelItem = static_cast(labels.at(i)); + QGraphicsSimpleTextItem *labelItem = static_cast(labels.at(i)); if (i < ticksList.count()) labelItem->setText(ticksList.at(i)); - const QRectF& rect = labelItem->boundingRect(); + const QRectF &rect = labelItem->boundingRect(); QPointF center = rect.center(); labelItem->setTransformOriginPoint(center.x(), center.y()); @@ -112,16 +112,16 @@ void ChartCategoryAxisX::updateGeometry() labelItem->setVisible(true); if ((i + 1) % 2 && i > 1) { - QGraphicsRectItem *rectItem = static_cast(shades.at(i / 2 - 1)); + QGraphicsRectItem *rectItem = static_cast(shades.at(i / 2 - 1)); rectItem->setRect(layout[i - 1], chartRect.top(), layout[i] - layout[i - 1], chartRect.height()); } // grid lines and axis line ticks - QGraphicsLineItem *lineItem = static_cast(lines.at(i)); + QGraphicsLineItem *lineItem = static_cast(lines.at(i)); lineItem->setPos(layout[i], chartRect.top()); lineItem->setLine(0, 0, 0, chartRect.height()); - QGraphicsLineItem *tickLineItem = static_cast(axis.at(i + 1)); + QGraphicsLineItem *tickLineItem = static_cast(axis.at(i + 1)); tickLineItem->setPos(layout[i], chartRect.bottom()); tickLineItem->setLine(0, 0, 0, 5); @@ -142,7 +142,7 @@ void ChartCategoryAxisX::handleAxisUpdated() ChartAxis::handleAxisUpdated(); } -QSizeF ChartCategoryAxisX::sizeHint(Qt::SizeHint which, const QSizeF& constraint) const +QSizeF ChartCategoryAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const { Q_UNUSED(constraint) diff --git a/src/axis/categoryaxis/chartcategoryaxisx_p.h b/src/axis/categoryaxis/chartcategoryaxisx_p.h index 9cc7618..5a3009b 100644 --- a/src/axis/categoryaxis/chartcategoryaxisx_p.h +++ b/src/axis/categoryaxis/chartcategoryaxisx_p.h @@ -44,7 +44,7 @@ public: ~ChartCategoryAxisX(); AxisType axisType() const { return X_AXIS; } - QSizeF sizeHint(Qt::SizeHint which, const QSizeF& constraint) const; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const; protected: QVector calculateLayout() const; void updateGeometry(); diff --git a/src/axis/categoryaxis/chartcategoryaxisy.cpp b/src/axis/categoryaxis/chartcategoryaxisy.cpp index d05a905..7cd05c5 100644 --- a/src/axis/categoryaxis/chartcategoryaxisy.cpp +++ b/src/axis/categoryaxis/chartcategoryaxisy.cpp @@ -90,17 +90,17 @@ void ChartCategoryAxisY::updateGeometry() QRectF chartRect = presenter()->chartsGeometry(); // axis base line - QGraphicsLineItem *lineItem = static_cast(axis.at(0)); + QGraphicsLineItem *lineItem = static_cast(axis.at(0)); lineItem->setLine(chartRect.left() , chartRect.top(), chartRect.left(), chartRect.bottom()); for (int i = 0; i < layout.size(); ++i) { // label items - QGraphicsSimpleTextItem *labelItem = static_cast(labels.at(i)); + QGraphicsSimpleTextItem *labelItem = static_cast(labels.at(i)); if (i < ticksList.count()) { labelItem->setText(ticksList.at(i)); } - const QRectF& rect = labelItem->boundingRect(); + const QRectF &rect = labelItem->boundingRect(); QPointF center = rect.center(); labelItem->setTransformOriginPoint(center.x(), center.y()); @@ -118,16 +118,16 @@ void ChartCategoryAxisY::updateGeometry() labelItem->setVisible(true); if ((i + 1) % 2 && i > 1) { - QGraphicsRectItem *rectItem = static_cast(shades.at(i / 2 - 1)); + QGraphicsRectItem *rectItem = static_cast(shades.at(i / 2 - 1)); rectItem->setRect(chartRect.left(), layout[i], chartRect.width(), layout[i - 1] - layout[i]); } // grid lines and axis line ticks - QGraphicsLineItem *lineItem = static_cast(lines.at(i)); + QGraphicsLineItem *lineItem = static_cast(lines.at(i)); lineItem->setPos(chartRect.left(), layout[i]); lineItem->setLine(0, 0, chartRect.width(), 0); - QGraphicsLineItem *tickLineItem = static_cast(axis.at(i + 1)); + QGraphicsLineItem *tickLineItem = static_cast(axis.at(i + 1)); tickLineItem->setPos(chartRect.left(), layout[i]); tickLineItem->setLine(-5, 0, 0, 0); @@ -148,7 +148,7 @@ void ChartCategoryAxisY::handleAxisUpdated() ChartAxis::handleAxisUpdated(); } -QSizeF ChartCategoryAxisY::sizeHint(Qt::SizeHint which, const QSizeF& constraint) const +QSizeF ChartCategoryAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const { Q_UNUSED(constraint) diff --git a/src/axis/categoryaxis/chartcategoryaxisy_p.h b/src/axis/categoryaxis/chartcategoryaxisy_p.h index f63dd08..ebc358e 100644 --- a/src/axis/categoryaxis/chartcategoryaxisy_p.h +++ b/src/axis/categoryaxis/chartcategoryaxisy_p.h @@ -44,7 +44,7 @@ public: ~ChartCategoryAxisY(); AxisType axisType() const { return Y_AXIS; } - QSizeF sizeHint(Qt::SizeHint which, const QSizeF& constraint) const; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const; protected: QVector calculateLayout() const; void updateGeometry(); diff --git a/src/axis/categoryaxis/qcategoryaxis.cpp b/src/axis/categoryaxis/qcategoryaxis.cpp index 572d6a0..8e78314 100644 --- a/src/axis/categoryaxis/qcategoryaxis.cpp +++ b/src/axis/categoryaxis/qcategoryaxis.cpp @@ -111,7 +111,7 @@ QCategoryAxis::QCategoryAxis(QCategoryAxisPrivate &d, QObject *parent): QValueAx It has to be greater than the high end limit of the previous category. Otherwise the method returns without adding a new category. */ -void QCategoryAxis::append(const QString& categoryLabel, qreal categoryEndValue) +void QCategoryAxis::append(const QString &categoryLabel, qreal categoryEndValue) { Q_D(QCategoryAxis); @@ -148,7 +148,7 @@ void QCategoryAxis::setStartValue(qreal min) /*! Returns the low end limit of the category specified by an \a categoryLabel */ -qreal QCategoryAxis::startValue(const QString& categoryLabel) const +qreal QCategoryAxis::startValue(const QString &categoryLabel) const { Q_D(const QCategoryAxis); if (categoryLabel.isEmpty()) @@ -159,7 +159,7 @@ qreal QCategoryAxis::startValue(const QString& categoryLabel) const /*! Returns the high end limit of the interval specified by an \a categoryLabel */ -qreal QCategoryAxis::endValue(const QString& categoryLabel) const +qreal QCategoryAxis::endValue(const QString &categoryLabel) const { Q_D(const QCategoryAxis); return d->m_categoriesMap.value(categoryLabel).second; @@ -209,7 +209,7 @@ void QCategoryAxis::remove(const QString &categoryLabel) Replaces \a oldLabel of an existing category with a \a newLabel If the old label does not exist the method returns without making any changes. */ -void QCategoryAxis::replaceLabel(const QString& oldLabel, const QString& newLabel) +void QCategoryAxis::replaceLabel(const QString &oldLabel, const QString &newLabel) { Q_D(QCategoryAxis); int labelIndex = d->m_categories.indexOf(oldLabel); @@ -252,9 +252,9 @@ QAbstractAxis::AxisType QCategoryAxis::type() const ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -QCategoryAxisPrivate::QCategoryAxisPrivate(QCategoryAxis* q): - QValueAxisPrivate(q), - m_categoryMinimum(0) +QCategoryAxisPrivate::QCategoryAxisPrivate(QCategoryAxis *q) + : QValueAxisPrivate(q), + m_categoryMinimum(0) { } @@ -276,7 +276,7 @@ void QCategoryAxisPrivate::handleAxisRangeChanged(qreal min, qreal max, int coun Q_UNUSED(max); } -ChartAxis* QCategoryAxisPrivate::createGraphics(ChartPresenter* presenter) +ChartAxis *QCategoryAxisPrivate::createGraphics(ChartPresenter *presenter) { Q_Q(QCategoryAxis); if (m_orientation == Qt::Vertical) diff --git a/src/axis/categoryaxis/qcategoryaxis.h b/src/axis/categoryaxis/qcategoryaxis.h index 259a0e0..13d52f1 100644 --- a/src/axis/categoryaxis/qcategoryaxis.h +++ b/src/axis/categoryaxis/qcategoryaxis.h @@ -43,14 +43,14 @@ protected: public: AxisType type() const; - void append(const QString& label, qreal categoryEndValue); - void remove(const QString& label); - void replaceLabel(const QString& oldLabel, const QString& newLabel); + void append(const QString &label, qreal categoryEndValue); + void remove(const QString &label); + void replaceLabel(const QString &oldLabel, const QString &newLabel); - qreal startValue(const QString& categoryLabel = QString()) const; + qreal startValue(const QString &categoryLabel = QString()) const; void setStartValue(qreal min); - qreal endValue(const QString& categoryLabel) const; + qreal endValue(const QString &categoryLabel) const; QStringList categoriesLabels(); int count() const; diff --git a/src/axis/categoryaxis/qcategoryaxis_p.h b/src/axis/categoryaxis/qcategoryaxis_p.h index f6fb787..02db3ce 100644 --- a/src/axis/categoryaxis/qcategoryaxis_p.h +++ b/src/axis/categoryaxis/qcategoryaxis_p.h @@ -45,7 +45,7 @@ public: QCategoryAxisPrivate(QCategoryAxis *q); ~QCategoryAxisPrivate(); - ChartAxis* createGraphics(ChartPresenter* presenter); + ChartAxis *createGraphics(ChartPresenter *presenter); int ticksCount() const; Q_SIGNALS: diff --git a/src/axis/chartaxis.cpp b/src/axis/chartaxis.cpp index 85dafc5..d8be13c 100644 --- a/src/axis/chartaxis.cpp +++ b/src/axis/chartaxis.cpp @@ -62,7 +62,7 @@ ChartAxis::~ChartAxis() { } -void ChartAxis::setAnimation(AxisAnimation* animation) +void ChartAxis::setAnimation(AxisAnimation *animation) { m_animation = animation; } @@ -271,7 +271,7 @@ bool ChartAxis::isEmpty() void ChartAxis::handleDomainUpdated() { - Domain* domain = qobject_cast(sender()); + Domain *domain = qobject_cast(sender()); qreal min(0); qreal max(0); @@ -328,7 +328,7 @@ void ChartAxis::handleAxisUpdated() setTitleText(m_chartAxis->title()); } -void ChartAxis::setTitleText(const QString& title) +void ChartAxis::setTitleText(const QString &title) { if (m_titleText != title) { m_titleText = title; @@ -444,9 +444,8 @@ bool ChartAxis::isVisible() return m_chartAxis->isVisible(); } -QSizeF ChartAxis::sizeHint(Qt::SizeHint which, const QSizeF& constraint) const +QSizeF ChartAxis::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const { - Q_UNUSED(constraint); QFontMetrics fn(m_title->font()); QSizeF sh; diff --git a/src/axis/chartaxis_p.h b/src/axis/chartaxis_p.h index 69ad826..4fdf92d 100644 --- a/src/axis/chartaxis_p.h +++ b/src/axis/chartaxis_p.h @@ -86,14 +86,14 @@ public: void setTitlePen(const QPen &pen); void setTitleBrush(const QBrush &brush); void setTitleFont(const QFont &font); - void setTitleText(const QString& title); + void setTitleText(const QString &title); void setLayout(QVector &layout); QVector layout() const { return m_layoutVector; } - void setAnimation(AxisAnimation* animation); - ChartAnimation* animation() const { return m_animation; }; + void setAnimation(AxisAnimation *animation); + ChartAnimation *animation() const { return m_animation; }; Qt::Orientation orientation() const; bool alternativePlacement() const; @@ -106,7 +106,7 @@ public: void setInternalRect(const QRectF &size); - virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF& constraint = QSizeF()) const; + virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const; protected: virtual void updateGeometry() = 0; @@ -127,7 +127,7 @@ private: void axisSelected(); protected: - QAbstractAxis* m_chartAxis; + QAbstractAxis *m_chartAxis; int m_labelsAngle; //TODO: to be removed QRectF m_rect; @@ -136,7 +136,7 @@ protected: QScopedPointer m_shades; QScopedPointer m_labels; QScopedPointer m_arrow; - QGraphicsSimpleTextItem* m_title; + QGraphicsSimpleTextItem *m_title; QVector m_layoutVector; qreal m_min; qreal m_max; @@ -173,7 +173,7 @@ protected: } private: - ChartAxis* m_axis; + ChartAxis *m_axis; }; QTCOMMERCIALCHART_END_NAMESPACE diff --git a/src/axis/datetimeaxis/chartdatetimeaxisx.cpp b/src/axis/datetimeaxis/chartdatetimeaxisx.cpp index 3f2f649..e107b20 100644 --- a/src/axis/datetimeaxis/chartdatetimeaxisx.cpp +++ b/src/axis/datetimeaxis/chartdatetimeaxisx.cpp @@ -92,16 +92,16 @@ void ChartDateTimeAxisX::updateGeometry() QRectF chartRect = presenter()->chartsGeometry(); - QGraphicsLineItem *lineItem = static_cast(axis.at(0)); + QGraphicsLineItem *lineItem = static_cast(axis.at(0)); lineItem->setLine(chartRect.left(), chartRect.bottom(), chartRect.right(), chartRect.bottom()); qreal width = 0; for (int i = 0; i < layout.size(); ++i) { - QGraphicsLineItem *lineItem = static_cast(lines.at(i)); + QGraphicsLineItem *lineItem = static_cast(lines.at(i)); lineItem->setLine(layout[i], chartRect.top(), layout[i], chartRect.bottom()); - QGraphicsSimpleTextItem *labelItem = static_cast(labels.at(i)); + QGraphicsSimpleTextItem *labelItem = static_cast(labels.at(i)); labelItem->setText(ticksList.at(i)); - const QRectF& rect = labelItem->boundingRect(); + const QRectF &rect = labelItem->boundingRect(); QPointF center = rect.center(); labelItem->setTransformOriginPoint(center.x(), center.y()); labelItem->setPos(layout[i] - center.x(), chartRect.bottom() + label_padding); @@ -116,10 +116,10 @@ void ChartDateTimeAxisX::updateGeometry() } if ((i + 1) % 2 && i > 1) { - QGraphicsRectItem *rectItem = static_cast(shades.at(i / 2 - 1)); + QGraphicsRectItem *rectItem = static_cast(shades.at(i / 2 - 1)); rectItem->setRect(layout[i - 1], chartRect.top(), layout[i] - layout[i - 1], chartRect.height()); } - lineItem = static_cast(axis.at(i + 1)); + lineItem = static_cast(axis.at(i + 1)); lineItem->setLine(layout[i], chartRect.bottom(), layout[i], chartRect.bottom() + 5); } } @@ -127,12 +127,12 @@ void ChartDateTimeAxisX::updateGeometry() void ChartDateTimeAxisX::handleAxisUpdated() { //TODO:: fix this - QDateTimeAxis* axis = qobject_cast(m_chartAxis); + QDateTimeAxis *axis = qobject_cast(m_chartAxis); m_tickCount = axis->tickCount(); ChartAxis::handleAxisUpdated(); } -QSizeF ChartDateTimeAxisX::sizeHint(Qt::SizeHint which, const QSizeF& constraint) const +QSizeF ChartDateTimeAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const { Q_UNUSED(constraint) @@ -157,7 +157,7 @@ QSizeF ChartDateTimeAxisX::sizeHint(Qt::SizeHint which, const QSizeF& constraint } sh = QSizeF(width, height); break; - } + } default: break; } diff --git a/src/axis/datetimeaxis/chartdatetimeaxisx_p.h b/src/axis/datetimeaxis/chartdatetimeaxisx_p.h index 6afa9fe..c56e309 100644 --- a/src/axis/datetimeaxis/chartdatetimeaxisx_p.h +++ b/src/axis/datetimeaxis/chartdatetimeaxisx_p.h @@ -44,7 +44,7 @@ public: ~ChartDateTimeAxisX(); AxisType axisType() const { return X_AXIS;} - QSizeF sizeHint(Qt::SizeHint which, const QSizeF& constraint) const; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const; protected: void createLabels(QStringList &labels, qreal min, qreal max, int ticks); void handleAxisUpdated(); diff --git a/src/axis/datetimeaxis/chartdatetimeaxisy.cpp b/src/axis/datetimeaxis/chartdatetimeaxisy.cpp index 8164b8d..820b68c 100644 --- a/src/axis/datetimeaxis/chartdatetimeaxisy.cpp +++ b/src/axis/datetimeaxis/chartdatetimeaxisy.cpp @@ -95,16 +95,16 @@ void ChartDateTimeAxisY::updateGeometry() qreal height = chartRect.bottom(); - QGraphicsLineItem *lineItem = static_cast(axis.at(0)); + QGraphicsLineItem *lineItem = static_cast(axis.at(0)); lineItem->setLine(chartRect.left() , chartRect.top(), chartRect.left(), chartRect.bottom()); for (int i = 0; i < layout.size(); ++i) { - QGraphicsLineItem *lineItem = static_cast(lines.at(i)); + QGraphicsLineItem *lineItem = static_cast(lines.at(i)); lineItem->setLine(chartRect.left() , layout[i], chartRect.right(), layout[i]); - QGraphicsSimpleTextItem *labelItem = static_cast(labels.at(i)); + QGraphicsSimpleTextItem *labelItem = static_cast(labels.at(i)); labelItem->setText(ticksList.at(i)); - const QRectF& rect = labelItem->boundingRect(); + const QRectF &rect = labelItem->boundingRect(); QPointF center = rect.center(); labelItem->setTransformOriginPoint(center.x(), center.y()); @@ -120,10 +120,10 @@ void ChartDateTimeAxisY::updateGeometry() } if ((i + 1) % 2 && i > 1) { - QGraphicsRectItem *rectItem = static_cast(shades.at(i / 2 - 1)); + QGraphicsRectItem *rectItem = static_cast(shades.at(i / 2 - 1)); rectItem->setRect(chartRect.left(), layout[i], chartRect.width(), layout[i - 1] - layout[i]); } - lineItem = static_cast(axis.at(i + 1)); + lineItem = static_cast(axis.at(i + 1)); lineItem->setLine(chartRect.left() - 5, layout[i], chartRect.left(), layout[i]); } } @@ -131,12 +131,12 @@ void ChartDateTimeAxisY::updateGeometry() void ChartDateTimeAxisY::handleAxisUpdated() { //TODO:: fix this - QDateTimeAxis* axis = qobject_cast(m_chartAxis); + QDateTimeAxis *axis = qobject_cast(m_chartAxis); m_tickCount = axis->tickCount(); ChartAxis::handleAxisUpdated(); } -QSizeF ChartDateTimeAxisY::sizeHint(Qt::SizeHint which, const QSizeF& constraint) const +QSizeF ChartDateTimeAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const { Q_UNUSED(constraint) diff --git a/src/axis/datetimeaxis/chartdatetimeaxisy_p.h b/src/axis/datetimeaxis/chartdatetimeaxisy_p.h index ea61247..e33fb5a 100644 --- a/src/axis/datetimeaxis/chartdatetimeaxisy_p.h +++ b/src/axis/datetimeaxis/chartdatetimeaxisy_p.h @@ -44,7 +44,7 @@ public: ~ChartDateTimeAxisY(); AxisType axisType() const { return Y_AXIS;} - QSizeF sizeHint(Qt::SizeHint which, const QSizeF& constraint) const; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const; protected: void createLabels(QStringList &labels, qreal min, qreal max, int ticks); QVector calculateLayout() const; diff --git a/src/axis/datetimeaxis/qdatetimeaxis.cpp b/src/axis/datetimeaxis/qdatetimeaxis.cpp index 754a241..e59a704 100644 --- a/src/axis/datetimeaxis/qdatetimeaxis.cpp +++ b/src/axis/datetimeaxis/qdatetimeaxis.cpp @@ -281,11 +281,11 @@ QAbstractAxis::AxisType QDateTimeAxis::type() const ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -QDateTimeAxisPrivate::QDateTimeAxisPrivate(QDateTimeAxis* q): - QAbstractAxisPrivate(q), - m_min(QDateTime::fromMSecsSinceEpoch(0)), - m_max(QDateTime::fromMSecsSinceEpoch(0)), - m_tickCount(5) +QDateTimeAxisPrivate::QDateTimeAxisPrivate(QDateTimeAxis *q) + : QAbstractAxisPrivate(q), + m_min(QDateTime::fromMSecsSinceEpoch(0)), + m_max(QDateTime::fromMSecsSinceEpoch(0)), + m_tickCount(5) { m_format = "dd-MM-yyyy\nh:mm"; } @@ -298,7 +298,7 @@ QDateTimeAxisPrivate::~QDateTimeAxisPrivate() void QDateTimeAxisPrivate::handleDomainUpdated() { Q_Q(QDateTimeAxis); - Domain* domain = qobject_cast(sender()); + Domain *domain = qobject_cast(sender()); Q_ASSERT(domain); if (orientation() == Qt::Horizontal) @@ -330,7 +330,7 @@ void QDateTimeAxisPrivate::setRange(const QVariant &min, const QVariant &max) q->setRange(min.toDateTime(), max.toDateTime()); } -ChartAxis* QDateTimeAxisPrivate::createGraphics(ChartPresenter* presenter) +ChartAxis *QDateTimeAxisPrivate::createGraphics(ChartPresenter *presenter) { Q_Q(QDateTimeAxis); if (m_orientation == Qt::Vertical) @@ -338,7 +338,7 @@ ChartAxis* QDateTimeAxisPrivate::createGraphics(ChartPresenter* presenter) return new ChartDateTimeAxisX(q, presenter); } -void QDateTimeAxisPrivate::intializeDomain(Domain* domain) +void QDateTimeAxisPrivate::intializeDomain(Domain *domain) { Q_Q(QDateTimeAxis); if (m_max == m_min) { diff --git a/src/axis/datetimeaxis/qdatetimeaxis_p.h b/src/axis/datetimeaxis/qdatetimeaxis_p.h index a8d5298..22a5504 100644 --- a/src/axis/datetimeaxis/qdatetimeaxis_p.h +++ b/src/axis/datetimeaxis/qdatetimeaxis_p.h @@ -44,11 +44,11 @@ public: ~QDateTimeAxisPrivate(); public: - ChartAxis* createGraphics(ChartPresenter* presenter); - void intializeDomain(Domain* domain); + ChartAxis *createGraphics(ChartPresenter *presenter); + void intializeDomain(Domain *domain); void handleDomainUpdated(); - qreal min(){ return m_min.toMSecsSinceEpoch(); } - qreal max(){ return m_max.toMSecsSinceEpoch(); } + qreal min() { return m_min.toMSecsSinceEpoch(); } + qreal max() { return m_max.toMSecsSinceEpoch(); } int count() const { /*TODO:*/ return 0;} protected: diff --git a/src/axis/qabstractaxis.cpp b/src/axis/qabstractaxis.cpp index 98cf9e4..3a5ec54 100644 --- a/src/axis/qabstractaxis.cpp +++ b/src/axis/qabstractaxis.cpp @@ -529,7 +529,7 @@ QFont QAbstractAxis::titleFont() const return d_ptr->m_titleFont; } -void QAbstractAxis::setTitle(const QString& title) +void QAbstractAxis::setTitle(const QString &title) { if (d_ptr->m_title != title) { d_ptr->m_title = title; @@ -706,20 +706,20 @@ void QAbstractAxis::setAlternativePlacement(bool placement) ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -QAbstractAxisPrivate::QAbstractAxisPrivate(QAbstractAxis* q): - q_ptr(q), - m_orientation(Qt::Orientation(0)), - m_dataset(0), - m_visible(true), - m_arrowVisible(true), - m_gridLineVisible(true), - m_labelsVisible(true), - m_labelsAngle(0), - m_shadesVisible(false), - m_shadesBrush(Qt::SolidPattern), - m_shadesOpacity(1.0), - m_dirty(false), - m_alternativePlacement(false) +QAbstractAxisPrivate::QAbstractAxisPrivate(QAbstractAxis *q) + : q_ptr(q), + m_orientation(Qt::Orientation(0)), + m_dataset(0), + m_visible(true), + m_arrowVisible(true), + m_gridLineVisible(true), + m_labelsVisible(true), + m_labelsAngle(0), + m_shadesVisible(false), + m_shadesBrush(Qt::SolidPattern), + m_shadesOpacity(1.0), + m_dirty(false), + m_alternativePlacement(false) { } diff --git a/src/axis/qabstractaxis.h b/src/axis/qabstractaxis.h index 24b8894..8864da5 100644 --- a/src/axis/qabstractaxis.h +++ b/src/axis/qabstractaxis.h @@ -107,7 +107,7 @@ public: QBrush titleBrush() const; void setTitleFont(const QFont &font); QFont titleFont() const; - void setTitle(const QString& title); + void setTitle(const QString &title); QString title() const; diff --git a/src/axis/qabstractaxis_p.h b/src/axis/qabstractaxis_p.h index 7935c12..0d6f23a 100644 --- a/src/axis/qabstractaxis_p.h +++ b/src/axis/qabstractaxis_p.h @@ -47,13 +47,12 @@ public: ~QAbstractAxisPrivate(); public: - - virtual ChartAxis* createGraphics(ChartPresenter* presenter) = 0; - virtual void intializeDomain(Domain* domain) = 0; + virtual ChartAxis *createGraphics(ChartPresenter *presenter) = 0; + virtual void intializeDomain(Domain *domain) = 0; void emitUpdated(); void setDirty(bool dirty); - bool isDirty(){ return m_dirty; } + bool isDirty() { return m_dirty; } void setOrientation(Qt::Orientation orientation); Qt::Orientation orientation() const { return m_orientation; } diff --git a/src/axis/valueaxis/chartvalueaxisx.cpp b/src/axis/valueaxis/chartvalueaxisx.cpp index a4f4cb4..00820b2 100644 --- a/src/axis/valueaxis/chartvalueaxisx.cpp +++ b/src/axis/valueaxis/chartvalueaxisx.cpp @@ -77,7 +77,7 @@ void ChartValueAxisX::updateGeometry() QRectF chartRrect = presenter()->chartsGeometry(); - QGraphicsLineItem *lineItem = static_cast(axis.at(0)); + QGraphicsLineItem *lineItem = static_cast(axis.at(0)); // lineItem->setLine(chartRrect.left(), chartRrect.bottom(), chartRrect.right(), chartRrect.bottom()); if (m_chartAxis->alternativePlacement()) lineItem->setLine(chartRrect.left(), m_internalRect.top(), chartRrect.right(), m_internalRect.top()); @@ -86,11 +86,11 @@ void ChartValueAxisX::updateGeometry() qreal width = 0; for (int i = 0; i < layout.size(); ++i) { - QGraphicsLineItem *lineItem = static_cast(lines.at(i)); + QGraphicsLineItem *lineItem = static_cast(lines.at(i)); lineItem->setLine(layout[i], chartRrect.top(), layout[i], chartRrect.bottom()); - QGraphicsSimpleTextItem *labelItem = static_cast(labels.at(i)); + QGraphicsSimpleTextItem *labelItem = static_cast(labels.at(i)); labelItem->setText(ticksList.at(i)); - const QRectF& rect = labelItem->boundingRect(); + const QRectF &rect = labelItem->boundingRect(); QPointF center = rect.center(); labelItem->setTransformOriginPoint(center.x(), center.y()); // labelItem->setPos(layout[i] - center.x(), chartRrect.bottom() + label_padding); @@ -100,7 +100,7 @@ void ChartValueAxisX::updateGeometry() labelItem->setPos(layout[i] - center.x(), m_internalRect.bottom() + label_padding); if (labelItem->pos().x() <= width || labelItem->pos().x() < m_rect.left() || - labelItem->pos().x() + rect.width() > m_rect.right()){ + labelItem->pos().x() + rect.width() > m_rect.right()) { labelItem->setVisible(false); lineItem->setVisible(false); } else { @@ -110,10 +110,10 @@ void ChartValueAxisX::updateGeometry() } if ((i + 1) % 2 && i > 1) { - QGraphicsRectItem *rectItem = static_cast(shades.at(i / 2 - 1)); + QGraphicsRectItem *rectItem = static_cast(shades.at(i / 2 - 1)); rectItem->setRect(layout[i - 1], chartRrect.top(), layout[i] - layout[i - 1], chartRrect.height()); } - lineItem = static_cast(axis.at(i + 1)); + lineItem = static_cast(axis.at(i + 1)); // lineItem->setLine(layout[i],chartRrect.bottom(),layout[i],chartRrect.bottom()+5); if (m_chartAxis->alternativePlacement()) lineItem->setLine(layout[i], m_internalRect.top(), layout[i], m_internalRect.top() - 5); @@ -125,7 +125,7 @@ void ChartValueAxisX::updateGeometry() void ChartValueAxisX::handleAxisUpdated() { //TODO:: fix this - QValueAxis* axis = qobject_cast(m_chartAxis); + QValueAxis *axis = qobject_cast(m_chartAxis); if (m_tickCount != axis->tickCount()) { m_tickCount = axis->tickCount(); presenter()->layout()->invalidate(); @@ -133,7 +133,7 @@ void ChartValueAxisX::handleAxisUpdated() ChartAxis::handleAxisUpdated(); } -QSizeF ChartValueAxisX::sizeHint(Qt::SizeHint which, const QSizeF& constraint) const +QSizeF ChartValueAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const { Q_UNUSED(constraint) diff --git a/src/axis/valueaxis/chartvalueaxisx_p.h b/src/axis/valueaxis/chartvalueaxisx_p.h index da48637..4bd70de 100644 --- a/src/axis/valueaxis/chartvalueaxisx_p.h +++ b/src/axis/valueaxis/chartvalueaxisx_p.h @@ -44,7 +44,8 @@ public: ~ChartValueAxisX(); AxisType axisType() const { return X_AXIS;} - QSizeF sizeHint(Qt::SizeHint which, const QSizeF& constraint) const; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const; + protected: void handleAxisUpdated(); QVector calculateLayout() const; diff --git a/src/axis/valueaxis/chartvalueaxisy.cpp b/src/axis/valueaxis/chartvalueaxisy.cpp index 04e2e3f..51d4f43 100644 --- a/src/axis/valueaxis/chartvalueaxisy.cpp +++ b/src/axis/valueaxis/chartvalueaxisy.cpp @@ -80,7 +80,7 @@ void ChartValueAxisY::updateGeometry() qreal height = m_rect.bottom(); - QGraphicsLineItem *lineItem = static_cast(axis.at(0)); + QGraphicsLineItem *lineItem = static_cast(axis.at(0)); // lineItem->setLine( chartRect.left() , chartRect.top(), chartRect.left(), chartRect.bottom()); if (m_chartAxis->alternativePlacement()) lineItem->setLine(m_internalRect.right(), chartRect.top(), m_internalRect.right(), chartRect.bottom()); @@ -90,9 +90,9 @@ void ChartValueAxisY::updateGeometry() QFontMetrics fn(m_font); for (int i = 0; i < layout.size(); ++i) { - QGraphicsLineItem *lineItem = static_cast(lines.at(i)); + QGraphicsLineItem *lineItem = static_cast(lines.at(i)); lineItem->setLine(chartRect.left(), layout[i], chartRect.right(), layout[i]); - QGraphicsSimpleTextItem *labelItem = static_cast(labels.at(i)); + QGraphicsSimpleTextItem *labelItem = static_cast(labels.at(i)); QString text = ticksList.at(i); @@ -105,7 +105,7 @@ void ChartValueAxisY::updateGeometry() labelItem->setText(text); } - const QRectF& rect = labelItem->boundingRect(); + const QRectF &rect = labelItem->boundingRect(); QPointF center = rect.center(); labelItem->setTransformOriginPoint(center.x(), center.y()); @@ -126,10 +126,10 @@ void ChartValueAxisY::updateGeometry() } if ((i + 1) % 2 && i > 1) { - QGraphicsRectItem *rectItem = static_cast(shades.at(i / 2 - 1)); + QGraphicsRectItem *rectItem = static_cast(shades.at(i / 2 - 1)); rectItem->setRect(chartRect.left(), layout[i], chartRect.width(), layout[i - 1] - layout[i]); } - lineItem = static_cast(axis.at(i + 1)); + lineItem = static_cast(axis.at(i + 1)); // lineItem->setLine( chartRect.left()-5,layout[i], chartRect.left(),layout[i]); if (m_chartAxis->alternativePlacement()) lineItem->setLine(m_internalRect.right() + 5, layout[i], m_internalRect.right(), layout[i]); @@ -141,7 +141,7 @@ void ChartValueAxisY::updateGeometry() void ChartValueAxisY::handleAxisUpdated() { //TODO:: fix this - QValueAxis* axis = qobject_cast(m_chartAxis); + QValueAxis *axis = qobject_cast(m_chartAxis); if (m_tickCount != axis->tickCount()) { m_tickCount = axis->tickCount(); presenter()->layout()->invalidate(); @@ -149,7 +149,7 @@ void ChartValueAxisY::handleAxisUpdated() ChartAxis::handleAxisUpdated(); } -QSizeF ChartValueAxisY::sizeHint(Qt::SizeHint which, const QSizeF& constraint) const +QSizeF ChartValueAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const { Q_UNUSED(constraint) diff --git a/src/axis/valueaxis/chartvalueaxisy_p.h b/src/axis/valueaxis/chartvalueaxisy_p.h index 1c099f7..84aea8f 100644 --- a/src/axis/valueaxis/chartvalueaxisy_p.h +++ b/src/axis/valueaxis/chartvalueaxisy_p.h @@ -44,7 +44,7 @@ public: ~ChartValueAxisY(); AxisType axisType() const { return Y_AXIS;} - QSizeF sizeHint(Qt::SizeHint which, const QSizeF& constraint) const; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const; protected: QVector calculateLayout() const; void updateGeometry(); diff --git a/src/axis/valueaxis/qvalueaxis.cpp b/src/axis/valueaxis/qvalueaxis.cpp index 5435a70..4a938a2 100644 --- a/src/axis/valueaxis/qvalueaxis.cpp +++ b/src/axis/valueaxis/qvalueaxis.cpp @@ -297,13 +297,13 @@ QAbstractAxis::AxisType QValueAxis::type() const ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -QValueAxisPrivate::QValueAxisPrivate(QValueAxis* q): - QAbstractAxisPrivate(q), - m_min(0), - m_max(0), - m_tickCount(5), - m_niceNumbers(false), - m_format(QString::null) +QValueAxisPrivate::QValueAxisPrivate(QValueAxis *q) + : QAbstractAxisPrivate(q), + m_min(0), + m_max(0), + m_tickCount(5), + m_niceNumbers(false), + m_format(QString::null) { } @@ -316,7 +316,7 @@ QValueAxisPrivate::~QValueAxisPrivate() void QValueAxisPrivate::handleDomainUpdated() { Q_Q(QValueAxis); - Domain* domain = qobject_cast(sender()); + Domain *domain = qobject_cast(sender()); Q_ASSERT(domain); if (orientation() == Qt::Horizontal) @@ -356,7 +356,7 @@ void QValueAxisPrivate::setRange(const QVariant &min, const QVariant &max) q->setRange(value1, value2); } -ChartAxis* QValueAxisPrivate::createGraphics(ChartPresenter* presenter) +ChartAxis *QValueAxisPrivate::createGraphics(ChartPresenter *presenter) { Q_Q(QValueAxis); if (m_orientation == Qt::Vertical) @@ -364,7 +364,7 @@ ChartAxis* QValueAxisPrivate::createGraphics(ChartPresenter* presenter) return new ChartValueAxisX(q, presenter); } -void QValueAxisPrivate::intializeDomain(Domain* domain) +void QValueAxisPrivate::intializeDomain(Domain *domain) { Q_Q(QValueAxis); if (qFuzzyCompare(m_max, m_min)) { diff --git a/src/axis/valueaxis/qvalueaxis_p.h b/src/axis/valueaxis/qvalueaxis_p.h index 58a0d4c..3edabac 100644 --- a/src/axis/valueaxis/qvalueaxis_p.h +++ b/src/axis/valueaxis/qvalueaxis_p.h @@ -43,11 +43,11 @@ public: ~QValueAxisPrivate(); public: - ChartAxis* createGraphics(ChartPresenter* presenter); - void intializeDomain(Domain* domain); + ChartAxis *createGraphics(ChartPresenter *presenter); + void intializeDomain(Domain *domain); void handleDomainUpdated(); - qreal min(){ return m_min; }; - qreal max(){ return m_max; }; + qreal min() { return m_min; }; + qreal max() { return m_max; }; int count() const { return m_tickCount; } protected: diff --git a/src/barchart/abstractbarchartitem.cpp b/src/barchart/abstractbarchartitem.cpp index 2baf3ec..eda9a95 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 a253cfb..374bbd8 100644 --- a/src/barchart/abstractbarchartitem_p.h +++ b/src/barchart/abstractbarchartitem_p.h @@ -56,7 +56,7 @@ public: virtual QVector calculateLayout() = 0; virtual void applyLayout(const QVector &layout); - virtual void setAnimation(AbstractBarAnimation* animation); + virtual void setAnimation(AbstractBarAnimation *animation); void setLayout(const QVector &layout); void updateLayout(const QVector &layout); QRectF geometry() const { return m_rect;} diff --git a/src/barchart/horizontal/bar/horizontalbarchartitem.cpp b/src/barchart/horizontal/bar/horizontalbarchartitem.cpp index 6a3be3f..a0ad4db 100644 --- a/src/barchart/horizontal/bar/horizontalbarchartitem.cpp +++ b/src/barchart/horizontal/bar/horizontalbarchartitem.cpp @@ -54,14 +54,14 @@ QVector 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 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 c7b6ed7..6c404a9 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 91aa205..4663494 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 c78bda3..c66112a 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 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 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 3ecb9fa..3f2bf57 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 98fbe49..9aa9267 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 c9936e3..b1dc7f5 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 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 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 be01a1a..4eb1b22 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 7ab1f26..687c482 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 58bbad4..39befdc 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 sets; + QList 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 sets; + QList 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 sets; + QList 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 sets) +bool QAbstractBarSeries::append(QList 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 sets; + QList 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 QAbstractBarSeries::barSets() const +QList 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 QAbstractBarSeriesPrivate::createLegendMarker(QLegend* legend) +QList QAbstractBarSeriesPrivate::createLegendMarker(QLegend *legend) { Q_Q(QAbstractBarSeries); - QList markers; + QList 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 sets) +bool QAbstractBarSeriesPrivate::append(QList sets) { foreach (QBarSet *set, sets) { if ((set == 0) || (m_barSets.contains(set))) @@ -708,7 +708,7 @@ bool QAbstractBarSeriesPrivate::append(QList sets) return true; } -bool QAbstractBarSeriesPrivate::remove(QList sets) +bool QAbstractBarSeriesPrivate::remove(QList 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(axis)); + populateCategories(qobject_cast(axis)); break; case QAbstractSeries::SeriesTypeBar: case QAbstractSeries::SeriesTypePercentBar: case QAbstractSeries::SeriesTypeStackedBar: if (axis->orientation() == Qt::Horizontal) - populateCategories(qobject_cast(axis)); + populateCategories(qobject_cast(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 87ab4f2..e6ebeab 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 sets); + bool append(QList sets); bool insert(int index, QBarSet *set); int count() const; - QList barSets() const; + QList barSets() const; void clear(); void setLabelsVisible(bool visible = true); @@ -64,8 +64,8 @@ Q_SIGNALS: void countChanged(); void labelsVisibleChanged(); - void barsetsAdded(QList sets); - void barsetsRemoved(QList sets); + void barsetsAdded(QList sets); + void barsetsRemoved(QList sets); protected: Q_DECLARE_PRIVATE(QAbstractBarSeries) diff --git a/src/barchart/qabstractbarseries_p.h b/src/barchart/qabstractbarseries_p.h index d8ed75b..cffce0b 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 createLegendMarker(QLegend* legend); + void scaleDomain(Domain &domain); + ChartElement *createGraphics(ChartPresenter *presenter); + QList 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 sets); - bool remove(QList sets); + bool append(QList sets); + bool remove(QList 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 m_barSets; diff --git a/src/barchart/qbarmodelmapper.cpp b/src/barchart/qbarmodelmapper.cpp index cc865b5..a631995 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 sets) +void QBarModelMapperPrivate::barSetsAdded(QList sets) { if (m_seriesSignalsBlock) return; @@ -434,7 +434,7 @@ void QBarModelMapperPrivate::barSetsAdded(QList sets) initializeBarFromModel(); } -void QBarModelMapperPrivate::barSetsRemoved(QList sets) +void QBarModelMapperPrivate::barSetsRemoved(QList sets) { if (m_seriesSignalsBlock) return; diff --git a/src/barchart/qbarmodelmapper.h b/src/barchart/qbarmodelmapper.h index 805eaf5..3c98261 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 5a59f1f..6ae5833 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 sets); - void barSetsRemoved(QList sets); + void barSetsAdded(QList sets); + void barSetsRemoved(QList 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 m_barSets; + QList m_barSets; QAbstractItemModel *m_model; int m_first; int m_count; diff --git a/src/barchart/qbarset.cpp b/src/barchart/qbarset.cpp index 933587d..ff5f0ba 100644 --- a/src/barchart/qbarset.cpp +++ b/src/barchart/qbarset.cpp @@ -307,7 +307,7 @@ void QBarSet::append(const QList &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 e16fbda..c2bfb5a 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 &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 28580b1..ecec786 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 ad84447..634ceef 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 7dae73f..9391a1c 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 23747b4..902068b 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 769f512..2210821 100644 --- a/src/barchart/vertical/bar/barchartitem.cpp +++ b/src/barchart/vertical/bar/barchartitem.cpp @@ -53,14 +53,14 @@ QVector 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 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 7032c4e..e97ed8f 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 df74eff..c26e612 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 b43206d..3b5bcb7 100644 --- a/src/barchart/vertical/percent/percentbarchartitem.cpp +++ b/src/barchart/vertical/percent/percentbarchartitem.cpp @@ -55,12 +55,12 @@ QVector 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 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 2d3f588..5bfe88b 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 cb92ba9..52ff116 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 085f9d2..d8d3069 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 5723011..ba47f94 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 4fd1d9d..c39b216 100644 --- a/src/barchart/vertical/stacked/stackedbarchartitem.cpp +++ b/src/barchart/vertical/stacked/stackedbarchartitem.cpp @@ -53,12 +53,12 @@ QVector 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 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))); diff --git a/src/chartbackground.cpp b/src/chartbackground.cpp index bf24b88..7907429 100644 --- a/src/chartbackground.cpp +++ b/src/chartbackground.cpp @@ -27,10 +27,10 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE -ChartBackground::ChartBackground(QGraphicsItem* parent) : - QGraphicsRectItem(parent), - m_diameter(15), - m_dropShadow(0) +ChartBackground::ChartBackground(QGraphicsItem *parent) + : QGraphicsRectItem(parent), + m_diameter(15), + m_dropShadow(0) { } diff --git a/src/chartconfig_p.h b/src/chartconfig_p.h index 12f0e76..44eced0 100644 --- a/src/chartconfig_p.h +++ b/src/chartconfig_p.h @@ -59,7 +59,7 @@ private: m_instance = this; } public: - static ChartConfig* instance() { + static ChartConfig *instance() { if (!m_instance) { m_instance = new ChartConfig(); } @@ -75,11 +75,11 @@ public: } private: - static ChartConfig* m_instance; + static ChartConfig *m_instance; }; -ChartConfig* ChartConfig::m_instance = 0; +ChartConfig *ChartConfig::m_instance = 0; QTCOMMERCIALCHART_END_NAMESPACE diff --git a/src/chartdataset.cpp b/src/chartdataset.cpp index 1e8b8f7..00b0965 100644 --- a/src/chartdataset.cpp +++ b/src/chartdataset.cpp @@ -36,7 +36,8 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE -ChartDataSet::ChartDataSet(QChart *parent): QObject(parent) +ChartDataSet::ChartDataSet(QChart *parent) + : QObject(parent) { } @@ -46,9 +47,9 @@ ChartDataSet::~ChartDataSet() removeAllSeries(); } -void ChartDataSet::addSeries(QAbstractSeries* series) +void ChartDataSet::addSeries(QAbstractSeries *series) { - Domain* domain = m_seriesDomainMap.value(series); + Domain *domain = m_seriesDomainMap.value(series); if (domain) { qWarning() << "Can not add series. Series already on the chart"; @@ -62,14 +63,14 @@ void ChartDataSet::addSeries(QAbstractSeries* series) createSeriesIndex(series); series->setParent(this); // take ownership - series->d_ptr->m_chart = qobject_cast(parent()); + series->d_ptr->m_chart = qobject_cast(parent()); series->d_ptr->m_dataset = this; emit seriesAdded(series, domain); } -void ChartDataSet::removeSeries(QAbstractSeries* series) +void ChartDataSet::removeSeries(QAbstractSeries *series) { if (!m_seriesDomainMap.contains(series)) { @@ -79,7 +80,7 @@ void ChartDataSet::removeSeries(QAbstractSeries* series) emit seriesRemoved(series); - Domain* domain = m_seriesDomainMap.take(series); + Domain *domain = m_seriesDomainMap.take(series); delete domain; domain = 0; @@ -94,9 +95,9 @@ void ChartDataSet::removeSeries(QAbstractSeries* series) -void ChartDataSet::createSeriesIndex(QAbstractSeries* series) +void ChartDataSet::createSeriesIndex(QAbstractSeries *series) { - QMapIterator i(m_indexSeriesMap); + QMapIterator i(m_indexSeriesMap); int key = 0; while (i.hasNext()) { @@ -109,7 +110,7 @@ void ChartDataSet::createSeriesIndex(QAbstractSeries* series) m_indexSeriesMap.insert(key, series); } -void ChartDataSet::removeSeriesIndex(QAbstractSeries* series) +void ChartDataSet::removeSeriesIndex(QAbstractSeries *series) { int key = seriesIndex(series); Q_ASSERT(key != -1); @@ -125,7 +126,7 @@ void ChartDataSet::createDefaultAxes() QAbstractAxis::AxisTypes typeY(0); // Remove possibly existing axes - QMapIterator i(m_seriesDomainMap); + QMapIterator i(m_seriesDomainMap); while (i.hasNext()) { i.next(); removeAxes(i.key()); @@ -136,8 +137,8 @@ void ChartDataSet::createDefaultAxes() // Select the required axis x and axis y types based on the types of the current series while (i.hasNext()) { i.next(); - QAbstractAxis* axisX = m_seriesAxisXMap.value(i.key()); - QAbstractAxis* axisY = m_seriesAxisYMap.value(i.key()); + QAbstractAxis *axisX = m_seriesAxisXMap.value(i.key()); + QAbstractAxis *axisY = m_seriesAxisYMap.value(i.key()); if (axisX) typeX &= axisX->type(); else @@ -155,20 +156,20 @@ void ChartDataSet::createDefaultAxes() void ChartDataSet::createAxes(QAbstractAxis::AxisTypes type, Qt::Orientation orientation) { - QMapIterator i(m_seriesDomainMap); + QMapIterator i(m_seriesDomainMap); // TODO: Add a descriptive comment of what happens here if (type.testFlag(QAbstractAxis::AxisTypeValue) && type.testFlag(QAbstractAxis::AxisTypeBarCategory)) { while (i.hasNext()) { i.next(); - QAbstractAxis* axis = createAxis(i.key()->d_ptr->defaultAxisType(orientation), orientation); + QAbstractAxis *axis = createAxis(i.key()->d_ptr->defaultAxisType(orientation), orientation); if (axis) { initializeAxis(axis, i.key()); emit axisAdded(axis, i.value()); } } } else if (!type.testFlag(QAbstractAxis::AxisTypeNoAxis)) { - QAbstractAxis* axis = createAxis(QAbstractAxis::AxisType(int(type)), orientation); + QAbstractAxis *axis = createAxis(QAbstractAxis::AxisType(int(type)), orientation); i.toFront(); while (i.hasNext()) { i.next(); @@ -178,9 +179,9 @@ void ChartDataSet::createAxes(QAbstractAxis::AxisTypes type, Qt::Orientation ori } } -QAbstractAxis* ChartDataSet::createAxis(QAbstractAxis::AxisType type, Qt::Orientation orientation) +QAbstractAxis *ChartDataSet::createAxis(QAbstractAxis::AxisType type, Qt::Orientation orientation) { - QAbstractAxis* axis = 0; + QAbstractAxis *axis = 0; switch (type) { case QAbstractAxis::AxisTypeValue: @@ -208,9 +209,9 @@ QAbstractAxis* ChartDataSet::createAxis(QAbstractAxis::AxisType type, Qt::Orient return axis; } -void ChartDataSet::initializeAxis(QAbstractAxis* axis, QAbstractSeries* series) +void ChartDataSet::initializeAxis(QAbstractAxis *axis, QAbstractSeries *series) { - Domain* domain = m_seriesDomainMap.value(series); + Domain *domain = m_seriesDomainMap.value(series); axis->d_ptr->m_dataset = this; series->d_ptr->initializeAxis(axis); axis->d_ptr->intializeDomain(domain); @@ -226,12 +227,12 @@ void ChartDataSet::initializeAxis(QAbstractAxis* axis, QAbstractSeries* series) axis->d_ptr->emitUpdated(); } -void ChartDataSet::removeAxes(QAbstractSeries* series) +void ChartDataSet::removeAxes(QAbstractSeries *series) { - QAbstractAxis* axisX = m_seriesAxisXMap.take(series); + QAbstractAxis *axisX = m_seriesAxisXMap.take(series); if (axisX) { - QList axesX = m_seriesAxisXMap.values(); + QList axesX = m_seriesAxisXMap.values(); int x = axesX.indexOf(axisX); if (x == -1) { @@ -241,10 +242,10 @@ void ChartDataSet::removeAxes(QAbstractSeries* series) } } - QAbstractAxis* axisY = m_seriesAxisYMap.take(series); + QAbstractAxis *axisY = m_seriesAxisYMap.take(series); if (axisY) { - QList axesY = m_seriesAxisYMap.values(); + QList axesY = m_seriesAxisYMap.values(); int y = axesY.indexOf(axisY); @@ -256,21 +257,21 @@ void ChartDataSet::removeAxes(QAbstractSeries* series) } } -void ChartDataSet::removeAxis(QAbstractAxis* axis) +void ChartDataSet::removeAxis(QAbstractAxis *axis) { if (!axis->d_ptr->m_dataset) { qWarning() << "UnBound axis found !"; return; } - QMap *seriesAxisMap; + QMap *seriesAxisMap; if (axis->orientation() == Qt::Vertical) seriesAxisMap = &m_seriesAxisYMap; else seriesAxisMap = &m_seriesAxisXMap; - QMapIterator i(*seriesAxisMap); + QMapIterator i(*seriesAxisMap); while (i.hasNext()) { i.next(); @@ -292,14 +293,14 @@ void ChartDataSet::removeAllSeries() qDeleteAll(series); } -void ChartDataSet::zoomInDomain(const QRectF& rect, const QSizeF& size) +void ChartDataSet::zoomInDomain(const QRectF &rect, const QSizeF &size) { //for performance reasons block, signals and scale "full" domain one by one. Gives twice less screen updates blockAxisSignals(true); - QMapIterator i(m_seriesDomainMap); + QMapIterator i(m_seriesDomainMap); while (i.hasNext()) { i.next(); @@ -310,13 +311,13 @@ void ChartDataSet::zoomInDomain(const QRectF& rect, const QSizeF& size) } -void ChartDataSet::zoomOutDomain(const QRectF& rect, const QSizeF& size) +void ChartDataSet::zoomOutDomain(const QRectF &rect, const QSizeF &size) { //for performance reasons block, signals and scale "full" domain one by one. Gives twice less screen updates blockAxisSignals(true); - QMapIterator i(m_seriesDomainMap); + QMapIterator i(m_seriesDomainMap); while (i.hasNext()) { i.next(); @@ -328,11 +329,11 @@ void ChartDataSet::zoomOutDomain(const QRectF& rect, const QSizeF& size) void ChartDataSet::blockAxisSignals(bool enabled) { - QMapIterator i(m_seriesDomainMap); + QMapIterator i(m_seriesDomainMap); while (i.hasNext()) { i.next(); - QAbstractAxis* axisX = m_seriesAxisXMap.value(i.key()); - QAbstractAxis* axisY = m_seriesAxisYMap.value(i.key()); + QAbstractAxis *axisX = m_seriesAxisXMap.value(i.key()); + QAbstractAxis *axisY = m_seriesAxisYMap.value(i.key()); if (axisX) { axisX->d_ptr->blockSignals(enabled); if (!enabled) { @@ -353,7 +354,7 @@ void ChartDataSet::blockAxisSignals(bool enabled) int ChartDataSet::seriesCount(QAbstractSeries::SeriesType type) { int count = 0; - QMapIterator i(m_seriesDomainMap); + QMapIterator i(m_seriesDomainMap); while (i.hasNext()) { i.next(); if (i.key()->type() == type) @@ -364,7 +365,7 @@ int ChartDataSet::seriesCount(QAbstractSeries::SeriesType type) int ChartDataSet::seriesIndex(QAbstractSeries *series) { - QMapIterator i(m_indexSeriesMap); + QMapIterator i(m_indexSeriesMap); while (i.hasNext()) { i.next(); if (i.value() == series) @@ -373,11 +374,11 @@ int ChartDataSet::seriesIndex(QAbstractSeries *series) return -1; } -QAbstractAxis* ChartDataSet::axisX(QAbstractSeries *series) const +QAbstractAxis *ChartDataSet::axisX(QAbstractSeries *series) const { if (series == 0) { - QMapIterator i(m_seriesAxisXMap); + QMapIterator i(m_seriesAxisXMap); while (i.hasNext()) { i.next(); @@ -389,10 +390,10 @@ QAbstractAxis* ChartDataSet::axisX(QAbstractSeries *series) const return m_seriesAxisXMap.value(series); } -QAbstractAxis* ChartDataSet::axisY(QAbstractSeries *series) const +QAbstractAxis *ChartDataSet::axisY(QAbstractSeries *series) const { if (series == 0) { - QMapIterator i(m_seriesAxisYMap); + QMapIterator i(m_seriesAxisYMap); while (i.hasNext()) { i.next(); @@ -412,7 +413,7 @@ void ChartDataSet::setAxis(QAbstractSeries *series, QAbstractAxis *axis, Qt::Ori return; } - Domain* domain = m_seriesDomainMap.value(series); + Domain *domain = m_seriesDomainMap.value(series); if (!domain) { qWarning() << "Series not found on the chart."; @@ -431,7 +432,7 @@ void ChartDataSet::setAxis(QAbstractSeries *series, QAbstractAxis *axis, Qt::Ori axis->d_ptr->setOrientation(orientation); - QMap *seriesAxisMap; + QMap *seriesAxisMap; if (orientation == Qt::Vertical) seriesAxisMap = &m_seriesAxisYMap; @@ -444,7 +445,7 @@ void ChartDataSet::setAxis(QAbstractSeries *series, QAbstractAxis *axis, Qt::Ori } QAbstractAxis *oldAxis = seriesAxisMap->take(series); - QList axes = seriesAxisMap->values(); + QList axes = seriesAxisMap->values(); if (oldAxis) { if (axes.indexOf(oldAxis) == -1) { emit axisRemoved(oldAxis); @@ -463,15 +464,15 @@ void ChartDataSet::setAxis(QAbstractSeries *series, QAbstractAxis *axis, Qt::Ori } } -Domain* ChartDataSet::domain(QAbstractSeries *series) const +Domain *ChartDataSet::domain(QAbstractSeries *series) const { return m_seriesDomainMap.value(series); } -void ChartDataSet::scrollDomain(qreal dx, qreal dy, const QSizeF& size) +void ChartDataSet::scrollDomain(qreal dx, qreal dy, const QSizeF &size) { blockAxisSignals(true); - QMapIterator i(m_seriesDomainMap); + QMapIterator i(m_seriesDomainMap); while (i.hasNext()) { i.next(); i.value()->move(dx, dy, size); @@ -479,7 +480,7 @@ void ChartDataSet::scrollDomain(qreal dx, qreal dy, const QSizeF& size) blockAxisSignals(false); } -QList ChartDataSet::series() const +QList ChartDataSet::series() const { return m_seriesDomainMap.keys(); } diff --git a/src/chartdataset_p.h b/src/chartdataset_p.h index 514b626..630eb53 100644 --- a/src/chartdataset_p.h +++ b/src/chartdataset_p.h @@ -43,54 +43,54 @@ class QTCOMMERCIALCHART_AUTOTEST_EXPORT ChartDataSet : public QObject { Q_OBJECT public: - ChartDataSet(QChart* parent = 0); + ChartDataSet(QChart *parent = 0); virtual ~ChartDataSet(); - void addSeries(QAbstractSeries* series); - void removeSeries(QAbstractSeries* series); + void addSeries(QAbstractSeries *series); + void removeSeries(QAbstractSeries *series); void removeAllSeries(); // void updateSeries(QAbstractSeries* series); - void zoomInDomain(const QRectF& rect, const QSizeF& size); - void zoomOutDomain(const QRectF& rect, const QSizeF& size); - void scrollDomain(qreal dx, qreal dy, const QSizeF& size); + void zoomInDomain(const QRectF &rect, const QSizeF &size); + void zoomOutDomain(const QRectF &rect, const QSizeF &size); + void scrollDomain(qreal dx, qreal dy, const QSizeF &size); int seriesCount(QAbstractSeries::SeriesType type); int seriesIndex(QAbstractSeries *series); - QAbstractAxis* axisX(QAbstractSeries *series) const; - QAbstractAxis* axisY(QAbstractSeries *series) const; + QAbstractAxis *axisX(QAbstractSeries *series) const; + QAbstractAxis *axisY(QAbstractSeries *series) const; void setAxis(QAbstractSeries *series, QAbstractAxis *axis, Qt::Orientation orientation); - QList series() const; - Domain* domain(QAbstractSeries *series) const; + QList series() const; + Domain *domain(QAbstractSeries *series) const; - void removeAxis(QAbstractAxis* axis); + void removeAxis(QAbstractAxis *axis); void createDefaultAxes(); Q_SIGNALS: - void seriesAdded(QAbstractSeries* series, Domain* domain); - void seriesRemoved(QAbstractSeries* series); + void seriesAdded(QAbstractSeries *series, Domain *domain); + void seriesRemoved(QAbstractSeries *series); // void seriesUpdated(QAbstractSeries* series); - void axisAdded(QAbstractAxis* axis, Domain* domain); - void axisRemoved(QAbstractAxis* axis); + void axisAdded(QAbstractAxis *axis, Domain *domain); + void axisRemoved(QAbstractAxis *axis); private: - void calculateDomain(QAbstractSeries* series, Domain* domain); + void calculateDomain(QAbstractSeries *series, Domain *domain); void createAxes(QAbstractAxis::AxisTypes type, Qt::Orientation orientation); - QAbstractAxis* createAxis(QAbstractAxis::AxisType type, Qt::Orientation orientation); - void initializeAxis(QAbstractAxis* axis, QAbstractSeries* series); - void removeAxes(QAbstractSeries* series); + QAbstractAxis *createAxis(QAbstractAxis::AxisType type, Qt::Orientation orientation); + void initializeAxis(QAbstractAxis *axis, QAbstractSeries *series); + void removeAxes(QAbstractSeries *series); void blockAxisSignals(bool enabled); - void createSeriesIndex(QAbstractSeries* series); - void removeSeriesIndex(QAbstractSeries* series); + void createSeriesIndex(QAbstractSeries *series); + void removeSeriesIndex(QAbstractSeries *series); private: - QMap m_seriesAxisXMap; - QMap m_seriesAxisYMap; - QMap m_seriesDomainMap; - QMap m_indexSeriesMap; + QMap m_seriesAxisXMap; + QMap m_seriesAxisYMap; + QMap m_seriesDomainMap; + QMap m_indexSeriesMap; }; QTCOMMERCIALCHART_END_NAMESPACE diff --git a/src/chartelement.cpp b/src/chartelement.cpp index 3eaf654..ea73640 100644 --- a/src/chartelement.cpp +++ b/src/chartelement.cpp @@ -36,7 +36,7 @@ void ChartElement::setPresenter(ChartPresenter *presenter) m_presenter = presenter; } -ChartPresenter* ChartElement::presenter() const +ChartPresenter *ChartElement::presenter() const { return m_presenter; } @@ -46,12 +46,12 @@ void ChartElement::setDomain(Domain *domain) m_domain = domain; } -Domain* ChartElement::domain() const +Domain *ChartElement::domain() const { return m_domain; } -void ChartElement::handleGeometryChanged(const QRectF& rect) +void ChartElement::handleGeometryChanged(const QRectF &rect) { Q_UNUSED(rect); qWarning() << "Slot not implemented"; diff --git a/src/chartelement_p.h b/src/chartelement_p.h index b7fad64..65a675f 100644 --- a/src/chartelement_p.h +++ b/src/chartelement_p.h @@ -48,20 +48,19 @@ public: explicit ChartElement(ChartPresenter *presenter); public Q_SLOTS: - virtual void handleGeometryChanged(const QRectF& rect); + virtual void handleGeometryChanged(const QRectF &rect); virtual void handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY); virtual void handleDomainUpdated(); - virtual ChartAnimation* animation() const { return 0; }; + virtual ChartAnimation *animation() const { return 0; } void setPresenter(ChartPresenter *presenter); - ChartPresenter* presenter() const; + ChartPresenter *presenter() const; void setDomain(Domain *domain); - Domain* domain() const; - + Domain *domain() const; private: - ChartPresenter* m_presenter; - Domain* m_domain; + ChartPresenter *m_presenter; + Domain *m_domain; }; QTCOMMERCIALCHART_END_NAMESPACE diff --git a/src/chartlayout.cpp b/src/chartlayout.cpp index 659c838..217c3e1 100644 --- a/src/chartlayout.cpp +++ b/src/chartlayout.cpp @@ -30,7 +30,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE static const qreal golden_ratio = 0.25; -ChartLayout::ChartLayout(ChartPresenter* presenter) +ChartLayout::ChartLayout(ChartPresenter *presenter) : m_presenter(presenter), m_margins(20, 20, 20, 20), m_minChartRect(0, 0, 200, 200) @@ -43,15 +43,15 @@ ChartLayout::~ChartLayout() } -void ChartLayout::setGeometry(const QRectF& rect) +void ChartLayout::setGeometry(const QRectF &rect) { if (!rect.isValid()) return; - QList axes = m_presenter->axisItems(); - ChartTitle* title = m_presenter->titleElement(); - QLegend* legend = m_presenter->legend(); - ChartBackground* background = m_presenter->backgroundElement(); + QList axes = m_presenter->axisItems(); + ChartTitle *title = m_presenter->titleElement(); + QLegend *legend = m_presenter->legend(); + ChartBackground *background = m_presenter->backgroundElement(); QRectF contentGeometry = calculateBackgroundGeometry(rect, background); @@ -67,7 +67,7 @@ void ChartLayout::setGeometry(const QRectF& rect) //TODO remove me #ifdef SHOW_LAYOUT - LayoutDebuger* debuger = LayoutDebuger::instance(); + LayoutDebuger *debuger = LayoutDebuger::instance(); debuger->reset(); debuger->setPen(QPen(Qt::red)); debuger->add(backgroundGeometry, m_presenter->rootItem()); @@ -75,25 +75,25 @@ void ChartLayout::setGeometry(const QRectF& rect) debuger->add(legendGeometry , m_presenter->rootItem()); debuger->add(axisGeometry , m_presenter->rootItem()); debuger->add(geometry, m_presenter->rootItem()); - foreach (LegendMarker *marker, legend->d_ptr->markers()) - debuger->add(marker->mapRectToScene(marker->boundingRect()), m_presenter->rootItem()); + foreach(LegendMarker * marker, legend->d_ptr->markers()) + debuger->add(marker->mapRectToScene(marker->boundingRect()), m_presenter->rootItem()); #endif QGraphicsLayout::setGeometry(rect); } -QRectF ChartLayout::calculateContentGeometry(const QRectF& geometry) const +QRectF ChartLayout::calculateContentGeometry(const QRectF &geometry) const { return geometry.adjusted(m_margins.left(), m_margins.top(), -m_margins.right(), -m_margins.bottom()); } -QRectF ChartLayout::calculateContentMinimum(const QRectF& minimum) const +QRectF ChartLayout::calculateContentMinimum(const QRectF &minimum) const { return minimum.adjusted(0, 0, m_margins.left() + m_margins.right(), m_margins.top() + m_margins.bottom()); } -QRectF ChartLayout::calculateBackgroundGeometry(const QRectF& geometry, ChartBackground* background) const +QRectF ChartLayout::calculateBackgroundGeometry(const QRectF &geometry, ChartBackground *background) const { qreal left, top, right, bottom; getContentsMargins(&left, &top, &right, &bottom); @@ -103,14 +103,14 @@ QRectF ChartLayout::calculateBackgroundGeometry(const QRectF& geometry, ChartBac return backgroundGeometry; } -QRectF ChartLayout::calculateBackgroundMinimum(const QRectF& minimum) const +QRectF ChartLayout::calculateBackgroundMinimum(const QRectF &minimum) const { qreal left, top, right, bottom; getContentsMargins(&left, &top, &right, &bottom); return minimum.adjusted(0, 0, left + right, top + bottom); } -QRectF ChartLayout::calculateChartGeometry(const QRectF& geometry, const QList& axes) const +QRectF ChartLayout::calculateChartGeometry(const QRectF &geometry, const QList& axes) const { QSizeF vertical(0, 0); @@ -122,7 +122,7 @@ QRectF ChartLayout::calculateChartGeometry(const QRectF& geometry, const QListorientation() == Qt::Vertical && axis->isVisible()) { // vertical = vertical.expandedTo(axis->effectiveSizeHint(Qt::MinimumSize)); if (axis->alternativePlacement()) @@ -177,7 +177,7 @@ QRectF ChartLayout::calculateChartGeometry(const QRectF& geometry, const QList& axes) const +QRectF ChartLayout::calculateAxisMinimum(const QRectF &minimum, const QList& axes) const { QSizeF vertical(0, 0); QSizeF horizontal(0, 0); @@ -192,7 +192,7 @@ QRectF ChartLayout::calculateAxisMinimum(const QRectF& minimum, const QListeffectiveSizeHint(Qt::PreferredSize, QSizeF(-1, -1)); QRectF legendRect; @@ -230,13 +230,13 @@ QRectF ChartLayout::calculateLegendGeometry(const QRectF& geometry, QLegend* leg return result; } -QRectF ChartLayout::calculateLegendMinimum(const QRectF& geometry, QLegend* legend) const +QRectF ChartLayout::calculateLegendMinimum(const QRectF &geometry, QLegend *legend) const { QSizeF minSize = legend->effectiveSizeHint(Qt::MinimumSize, QSizeF(-1, -1)); return geometry.adjusted(0, 0, minSize.width(), minSize.height()); } -QRectF ChartLayout::calculateTitleGeometry(const QRectF& geometry, ChartTitle* title) const +QRectF ChartLayout::calculateTitleGeometry(const QRectF &geometry, ChartTitle *title) const { title->setGeometry(geometry); QPointF center = geometry.center() - title->boundingRect().center(); @@ -244,19 +244,19 @@ QRectF ChartLayout::calculateTitleGeometry(const QRectF& geometry, ChartTitle* t return geometry.adjusted(0, title->boundingRect().height(), 0, 0); } -QRectF ChartLayout::calculateTitleMinimum(const QRectF& minimum, ChartTitle* title) const +QRectF ChartLayout::calculateTitleMinimum(const QRectF &minimum, ChartTitle *title) const { QSizeF min = title->sizeHint(Qt::MinimumSize); return minimum.adjusted(0, 0, min.width(), min.height()); } -QSizeF ChartLayout::sizeHint(Qt::SizeHint which, const QSizeF & constraint) const +QSizeF ChartLayout::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const { Q_UNUSED(constraint); if (which == Qt::MinimumSize) { - QList axes = m_presenter->axisItems(); - ChartTitle* title = m_presenter->titleElement(); - QLegend* legend = m_presenter->legend(); + QList axes = m_presenter->axisItems(); + ChartTitle *title = m_presenter->titleElement(); + QLegend *legend = m_presenter->legend(); QRectF minimumRect(0, 0, 0, 0); minimumRect = calculateBackgroundMinimum(minimumRect); minimumRect = calculateContentMinimum(minimumRect); @@ -268,7 +268,7 @@ QSizeF ChartLayout::sizeHint(Qt::SizeHint which, const QSizeF & constraint) cons return QSize(-1, -1); } -void ChartLayout::setMargins(const QMargins& margins) +void ChartLayout::setMargins(const QMargins &margins) { if (m_margins != margins) { m_margins = margins; diff --git a/src/chartlayout_p.h b/src/chartlayout_p.h index bbd0d99..da4f5b2 100644 --- a/src/chartlayout_p.h +++ b/src/chartlayout_p.h @@ -36,35 +36,35 @@ class ChartLayout : public QGraphicsLayout { public: - ChartLayout(ChartPresenter* presenter); + ChartLayout(ChartPresenter *presenter); virtual ~ChartLayout(); - void setMargins(const QMargins& margins); + void setMargins(const QMargins &margins); QMargins margins() const; - void setGeometry(const QRectF& rect); + void setGeometry(const QRectF &rect); void adjustChartGeometry(); protected: - QSizeF sizeHint ( Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const; int count() const { return 0; } - QGraphicsLayoutItem* itemAt(int) const { return 0; }; - void removeAt(int){}; + QGraphicsLayoutItem *itemAt(int) const { return 0; }; + void removeAt(int) {}; private: - QRectF calculateBackgroundGeometry(const QRectF& geometry, ChartBackground* background) const; - QRectF calculateContentGeometry(const QRectF& geometry) const; - QRectF calculateTitleGeometry(const QRectF& geometry, ChartTitle* title) const; - QRectF calculateChartGeometry(const QRectF& geometry, const QList& axes) const; - QRectF calculateLegendGeometry(const QRectF& geometry, QLegend* legend) const; - QRectF calculateBackgroundMinimum(const QRectF& minimum) const; - QRectF calculateContentMinimum(const QRectF& minimum) const; - QRectF calculateTitleMinimum(const QRectF& minimum, ChartTitle* title) const; - QRectF calculateAxisMinimum(const QRectF& minimum, const QList& axes) const; - QRectF calculateLegendMinimum(const QRectF& minimum, QLegend* legend) const; + QRectF calculateBackgroundGeometry(const QRectF &geometry, ChartBackground *background) const; + QRectF calculateContentGeometry(const QRectF &geometry) const; + QRectF calculateTitleGeometry(const QRectF &geometry, ChartTitle *title) const; + QRectF calculateChartGeometry(const QRectF &geometry, const QList& axes) const; + QRectF calculateLegendGeometry(const QRectF &geometry, QLegend *legend) const; + QRectF calculateBackgroundMinimum(const QRectF &minimum) const; + QRectF calculateContentMinimum(const QRectF &minimum) const; + QRectF calculateTitleMinimum(const QRectF &minimum, ChartTitle *title) const; + QRectF calculateAxisMinimum(const QRectF &minimum, const QList& axes) const; + QRectF calculateLegendMinimum(const QRectF &minimum, QLegend *legend) const; private: - ChartPresenter* m_presenter; + ChartPresenter *m_presenter; QMargins m_margins; QRectF m_minChartRect; QRectF m_minAxisRect; diff --git a/src/chartpresenter.cpp b/src/chartpresenter.cpp index 1962655..156ed48 100644 --- a/src/chartpresenter.cpp +++ b/src/chartpresenter.cpp @@ -35,7 +35,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE -ChartPresenter::ChartPresenter(QChart* chart, ChartDataSet* dataset) +ChartPresenter::ChartPresenter(QChart *chart, ChartDataSet *dataset) : QObject(chart), m_chart(chart), m_dataset(dataset), @@ -54,7 +54,7 @@ ChartPresenter::~ChartPresenter() delete m_chartTheme; } -void ChartPresenter::setChartsGeometry(const QRectF& rect) +void ChartPresenter::setChartsGeometry(const QRectF &rect) { Q_ASSERT(rect.isValid()); @@ -70,9 +70,9 @@ QRectF ChartPresenter::chartsGeometry() const return m_chartsRect; } -void ChartPresenter::handleAxisAdded(QAbstractAxis* axis, Domain* domain) +void ChartPresenter::handleAxisAdded(QAbstractAxis *axis, Domain *domain) { - ChartAxis* item = axis->d_ptr->createGraphics(this); + ChartAxis *item = axis->d_ptr->createGraphics(this); item->setDomain(domain); if (m_options.testFlag(QChart::GridAxisAnimations)) @@ -94,9 +94,9 @@ void ChartPresenter::handleAxisAdded(QAbstractAxis* axis, Domain* domain) selectVisibleAxis(); } -void ChartPresenter::handleAxisRemoved(QAbstractAxis* axis) +void ChartPresenter::handleAxisRemoved(QAbstractAxis *axis) { - ChartAxis* item = m_axisItems.take(axis); + ChartAxis *item = m_axisItems.take(axis); Q_ASSERT(item); selectVisibleAxis(); item->hide(); @@ -106,7 +106,7 @@ void ChartPresenter::handleAxisRemoved(QAbstractAxis* axis) } -void ChartPresenter::handleSeriesAdded(QAbstractSeries* series, Domain* domain) +void ChartPresenter::handleSeriesAdded(QAbstractSeries *series, Domain *domain) { ChartElement *item = series->d_ptr->createGraphics(this); Q_ASSERT(item); @@ -122,16 +122,16 @@ void ChartPresenter::handleSeriesAdded(QAbstractSeries* series, Domain* domain) m_chartItems.insert(series, item); } -void ChartPresenter::handleSeriesRemoved(QAbstractSeries* series) +void ChartPresenter::handleSeriesRemoved(QAbstractSeries *series) { - ChartElement* item = m_chartItems.take(series); + ChartElement *item = m_chartItems.take(series); Q_ASSERT(item); item->deleteLater(); } void ChartPresenter::selectVisibleAxis() { - QMapIterator i(m_axisItems); + QMapIterator i(m_axisItems); while (i.hasNext()) { i.next(); @@ -161,11 +161,11 @@ void ChartPresenter::selectVisibleAxis() void ChartPresenter::handleAxisVisibleChanged(bool visible) { - QAbstractAxis* axis = static_cast(sender()); + QAbstractAxis *axis = static_cast(sender()); Q_ASSERT(axis); if (visible) { - QMapIterator i(m_axisItems); + QMapIterator i(m_axisItems); while (i.hasNext()) { i.next(); @@ -210,20 +210,20 @@ void ChartPresenter::setAnimationOptions(QChart::AnimationOptions options) void ChartPresenter::resetAllElements() { - QMapIterator i(m_axisItems); + QMapIterator i(m_axisItems); while (i.hasNext()) { i.next(); - Domain* domain = i.value()->domain(); - QAbstractAxis* axis = i.key(); + Domain *domain = i.value()->domain(); + QAbstractAxis *axis = i.key(); handleAxisRemoved(axis); handleAxisAdded(axis, domain); } - QMapIterator j(m_chartItems); + QMapIterator j(m_chartItems); while (j.hasNext()) { j.next(); - Domain* domain = j.value()->domain(); - QAbstractSeries* series = j.key(); + Domain *domain = j.value()->domain(); + QAbstractSeries *series = j.key(); handleSeriesRemoved(series); handleSeriesAdded(series, domain); } @@ -240,7 +240,7 @@ void ChartPresenter::zoomIn(qreal factor) zoomIn(rect); } -void ChartPresenter::zoomIn(const QRectF& rect) +void ChartPresenter::zoomIn(const QRectF &rect) { QRectF r = rect.normalized(); r.translate(-chartsGeometry().topLeft()); @@ -306,12 +306,12 @@ void ChartPresenter::createTitleItem() void ChartPresenter::handleAnimationFinished() { - m_animations.removeAll(qobject_cast(sender())); + m_animations.removeAll(qobject_cast(sender())); if (m_animations.empty()) emit animationsFinished(); } -void ChartPresenter::startAnimation(ChartAnimation* animation) +void ChartPresenter::startAnimation(ChartAnimation *animation) { if (animation->state() != QAbstractAnimation::Stopped) animation->stop(); @@ -321,7 +321,7 @@ void ChartPresenter::startAnimation(ChartAnimation* animation) QTimer::singleShot(0, animation, SLOT(start())); } -void ChartPresenter::setBackgroundBrush(const QBrush& brush) +void ChartPresenter::setBackgroundBrush(const QBrush &brush) { createBackgroundItem(); m_background->setBrush(brush); @@ -335,7 +335,7 @@ QBrush ChartPresenter::backgroundBrush() const return m_background->brush(); } -void ChartPresenter::setBackgroundPen(const QPen& pen) +void ChartPresenter::setBackgroundPen(const QPen &pen) { createBackgroundItem(); m_background->setPen(pen); @@ -349,7 +349,7 @@ QPen ChartPresenter::backgroundPen() const return m_background->pen(); } -void ChartPresenter::setTitle(const QString& title) +void ChartPresenter::setTitle(const QString &title) { createTitleItem(); m_title->setText(title); @@ -363,7 +363,7 @@ QString ChartPresenter::title() const return m_title->text(); } -void ChartPresenter::setTitleFont(const QFont& font) +void ChartPresenter::setTitleFont(const QFont &font) { createTitleItem(); m_title->setFont(font); @@ -419,12 +419,12 @@ bool ChartPresenter::isBackgroundDropShadowEnabled() const } -QGraphicsLayout* ChartPresenter::layout() +QGraphicsLayout *ChartPresenter::layout() { return m_layout; } -void ChartPresenter::setMargins(const QMargins& margins) +void ChartPresenter::setMargins(const QMargins &margins) { m_layout->setMargins(margins); } @@ -434,7 +434,7 @@ QMargins ChartPresenter::margins() const return m_layout->margins(); } -QLegend* ChartPresenter::legend() +QLegend *ChartPresenter::legend() { return m_chart->legend(); } @@ -444,17 +444,17 @@ void ChartPresenter::setVisible(bool visible) m_chart->setVisible(visible); } -ChartBackground* ChartPresenter::backgroundElement() +ChartBackground *ChartPresenter::backgroundElement() { return m_background; } -QList ChartPresenter::axisItems() const +QList ChartPresenter::axisItems() const { return m_axisItems.values(); } -ChartTitle* ChartPresenter::titleElement() +ChartTitle *ChartPresenter::titleElement() { return m_title; } diff --git a/src/chartpresenter_p.h b/src/chartpresenter_p.h index 234f246..f23f8fd 100644 --- a/src/chartpresenter_p.h +++ b/src/chartpresenter_p.h @@ -78,28 +78,28 @@ public: ZoomOutState }; - ChartPresenter(QChart* chart, ChartDataSet *dataset); + ChartPresenter(QChart *chart, ChartDataSet *dataset); virtual ~ChartPresenter(); ChartTheme *chartTheme() const { return m_chartTheme; } ChartDataSet *dataSet() const { return m_dataset; } - QGraphicsItem* rootItem() const { return m_chart; } - ChartBackground* backgroundElement(); - ChartTitle* titleElement(); - QList axisItems() const; + QGraphicsItem *rootItem() const { return m_chart; } + ChartBackground *backgroundElement(); + ChartTitle *titleElement(); + QList axisItems() const; - QLegend* legend(); + QLegend *legend(); - void setBackgroundBrush(const QBrush& brush); + void setBackgroundBrush(const QBrush &brush); QBrush backgroundBrush() const; - void setBackgroundPen(const QPen& pen); + void setBackgroundPen(const QPen &pen); QPen backgroundPen() const; - void setTitle(const QString& title); + void setTitle(const QString &title); QString title() const; - void setTitleFont(const QFont& font); + void setTitleFont(const QFont &font); QFont titleFont() const; void setTitleBrush(const QBrush &brush); @@ -120,22 +120,22 @@ public: QChart::AnimationOptions animationOptions() const; void zoomIn(qreal factor); - void zoomIn(const QRectF& rect); + void zoomIn(const QRectF &rect); void zoomOut(qreal factor); void scroll(qreal dx, qreal dy); - void setChartsGeometry(const QRectF& rect); + void setChartsGeometry(const QRectF &rect); QRectF chartsGeometry() const; - void startAnimation(ChartAnimation* animation); + void startAnimation(ChartAnimation *animation); State state() const { return m_state; } QPointF statePoint() const { return m_statePoint; } void resetAllElements(); - void setMargins(const QMargins& margins); + void setMargins(const QMargins &margins); QMargins margins() const; - QGraphicsLayout* layout(); + QGraphicsLayout *layout(); private: void createBackgroundItem(); @@ -143,34 +143,34 @@ private: void selectVisibleAxis(); public Q_SLOTS: - void handleSeriesAdded(QAbstractSeries* series, Domain* domain); - void handleSeriesRemoved(QAbstractSeries* series); - void handleAxisAdded(QAbstractAxis* axis, Domain* domain); - void handleAxisRemoved(QAbstractAxis* axis); + void handleSeriesAdded(QAbstractSeries *series, Domain *domain); + void handleSeriesRemoved(QAbstractSeries *series); + void handleAxisAdded(QAbstractAxis *axis, Domain *domain); + void handleAxisRemoved(QAbstractAxis *axis); void handleAxisVisibleChanged(bool visible); private Q_SLOTS: void handleAnimationFinished(); Q_SIGNALS: - void geometryChanged(const QRectF& rect); + void geometryChanged(const QRectF &rect); void animationsFinished(); void marginsChanged(QRectF margins); private: - QChart* m_chart; - ChartDataSet* m_dataset; + QChart *m_chart; + ChartDataSet *m_dataset; ChartTheme *m_chartTheme; - QMap m_chartItems; - QMap m_axisItems; + QMap m_chartItems; + QMap m_axisItems; QRectF m_chartsRect; QChart::AnimationOptions m_options; State m_state; QPointF m_statePoint; - QList m_animations; - ChartLayout* m_layout; - ChartBackground* m_background; - ChartTitle* m_title; + QList m_animations; + ChartLayout *m_layout; + ChartBackground *m_background; + ChartTitle *m_title; }; QTCOMMERCIALCHART_END_NAMESPACE diff --git a/src/charttheme.cpp b/src/charttheme.cpp index a8fee6e..eaf56a6 100644 --- a/src/charttheme.cpp +++ b/src/charttheme.cpp @@ -79,7 +79,7 @@ ChartTheme::ChartTheme(QChart::ChartTheme id) : } -ChartTheme* ChartTheme::createTheme(QChart::ChartTheme theme) +ChartTheme *ChartTheme::createTheme(QChart::ChartTheme theme) { switch (theme) { case QChart::ChartThemeLight: diff --git a/src/charttitle.cpp b/src/charttitle.cpp index 341db7c..c1f6dff 100644 --- a/src/charttitle.cpp +++ b/src/charttitle.cpp @@ -25,7 +25,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE -ChartTitle::ChartTitle(QGraphicsItem* parent) +ChartTitle::ChartTitle(QGraphicsItem *parent) : QGraphicsSimpleTextItem(parent) { diff --git a/src/charttitle_p.h b/src/charttitle_p.h index 9c9bf51..83678b4 100644 --- a/src/charttitle_p.h +++ b/src/charttitle_p.h @@ -38,7 +38,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE class ChartTitle : public QGraphicsSimpleTextItem { public: - ChartTitle(QGraphicsItem* parent = 0); + ChartTitle(QGraphicsItem *parent = 0); ~ChartTitle(); QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const; void setText(const QString &text); diff --git a/src/domain.cpp b/src/domain.cpp index 939cd90..570cfc4 100644 --- a/src/domain.cpp +++ b/src/domain.cpp @@ -23,7 +23,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE -Domain::Domain(QObject* parent) +Domain::Domain(QObject *parent) : QObject(parent), m_minX(0), m_maxX(0), @@ -106,7 +106,7 @@ bool Domain::isEmpty() const return qFuzzyIsNull(spanX()) || qFuzzyIsNull(spanY()); } -void Domain::zoomIn(const QRectF& rect, const QSizeF& size) +void Domain::zoomIn(const QRectF &rect, const QSizeF &size) { qreal dx = spanX() / size.width(); qreal dy = spanY() / size.height(); @@ -124,7 +124,7 @@ void Domain::zoomIn(const QRectF& rect, const QSizeF& size) setRange(minX, maxX, minY, maxY); } -void Domain::zoomOut(const QRectF& rect, const QSizeF& size) +void Domain::zoomOut(const QRectF &rect, const QSizeF &size) { qreal dx = spanX() / rect.width(); qreal dy = spanY() / rect.height(); @@ -142,7 +142,7 @@ void Domain::zoomOut(const QRectF& rect, const QSizeF& size) setRange(minX, maxX, minY, maxY); } -void Domain::move(qreal dx, qreal dy, const QSizeF& size) +void Domain::move(qreal dx, qreal dy, const QSizeF &size) { qreal x = spanX() / size.width(); qreal y = spanY() / size.height(); @@ -170,7 +170,7 @@ void Domain::emitUpdated() void Domain::handleAxisUpdated() { - QAbstractAxisPrivate* axis = qobject_cast(sender()); + QAbstractAxisPrivate *axis = qobject_cast(sender()); Q_ASSERT(axis); axis->setDirty(false); if (axis->orientation() == Qt::Horizontal) diff --git a/src/domain_p.h b/src/domain_p.h index 87fa649..e5ff3ef 100644 --- a/src/domain_p.h +++ b/src/domain_p.h @@ -40,7 +40,7 @@ class QTCOMMERCIALCHART_AUTOTEST_EXPORT Domain: public QObject { Q_OBJECT public: - explicit Domain(QObject* object = 0); + explicit Domain(QObject *object = 0); virtual ~Domain(); void setRange(qreal minX, qreal maxX, qreal minY, qreal maxY); @@ -64,9 +64,9 @@ public: friend bool QTCOMMERCIALCHART_AUTOTEST_EXPORT operator!= (const Domain &domain1, const Domain &domain2); friend QDebug QTCOMMERCIALCHART_AUTOTEST_EXPORT operator<<(QDebug dbg, const Domain &domain); - void zoomIn(const QRectF& rect, const QSizeF& size); - void zoomOut(const QRectF& rect, const QSizeF& size); - void move(qreal dx, qreal dy, const QSizeF& size); + void zoomIn(const QRectF &rect, const QSizeF &size); + void zoomOut(const QRectF &rect, const QSizeF &size); + void move(qreal dx, qreal dy, const QSizeF &size); void emitUpdated(); Q_SIGNALS: diff --git a/src/legend/legendlayout.cpp b/src/legend/legendlayout.cpp index cc4606f..222be6d 100644 --- a/src/legend/legendlayout.cpp +++ b/src/legend/legendlayout.cpp @@ -26,7 +26,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE -LegendLayout::LegendLayout(QLegend* legend) +LegendLayout::LegendLayout(QLegend *legend) : m_legend(legend) { @@ -92,7 +92,7 @@ void LegendLayout::invalidate() m_legend->d_ptr->m_presenter->layout()->invalidate(); } -void LegendLayout::setGeometry(const QRectF& rect) +void LegendLayout::setGeometry(const QRectF &rect) { m_legend->d_ptr->items()->setVisible(m_legend->isVisible()); @@ -104,7 +104,7 @@ void LegendLayout::setGeometry(const QRectF& rect) setDettachedGeometry(rect); } -void LegendLayout::setAttachedGeometry(const QRectF& rect) +void LegendLayout::setAttachedGeometry(const QRectF &rect) { if (!rect.isValid()) return; @@ -154,7 +154,7 @@ void LegendLayout::setAttachedGeometry(const QRectF& rect) if (marker->isVisible()) { marker->setGeometry(geometry); marker->setPos(point); - const QRectF& rect = marker->boundingRect(); + const QRectF &rect = marker->boundingRect(); qreal h = rect.height(); size = size.expandedTo(rect.size()); m_height += h; @@ -177,7 +177,7 @@ void LegendLayout::setAttachedGeometry(const QRectF& rect) m_maxOffsetY = m_height - geometry.height() - bottom; } -void LegendLayout::setDettachedGeometry(const QRectF& rect) +void LegendLayout::setDettachedGeometry(const QRectF &rect) { if (!rect.isValid()) return; @@ -211,7 +211,7 @@ void LegendLayout::setDettachedGeometry(const QRectF& rect) if (marker->isVisible()) { marker->setGeometry(geometry); marker->setPos(point.x(), point.y()); - const QRectF& boundingRect = marker->boundingRect(); + const QRectF &boundingRect = marker->boundingRect(); qreal w = boundingRect.width(); qreal h = boundingRect.height(); m_width = qMax(m_width, w); @@ -277,7 +277,7 @@ void LegendLayout::setDettachedGeometry(const QRectF& rect) LegendMarker *marker = markers.at(i); if (marker->isVisible()) { marker->setGeometry(geometry); - const QRectF& boundingRect = marker->boundingRect(); + const QRectF &boundingRect = marker->boundingRect(); qreal w = boundingRect.width(); qreal h = boundingRect.height(); m_height = qMax(m_height, h); @@ -313,7 +313,7 @@ void LegendLayout::setDettachedGeometry(const QRectF& rect) LegendMarker *marker = markers.at(i); if (marker->isVisible()) { marker->setGeometry(geometry); - const QRectF& boundingRect = marker->boundingRect(); + const QRectF &boundingRect = marker->boundingRect(); qreal w = boundingRect.width(); qreal h = boundingRect.height(); m_height = qMax(m_height, h); @@ -346,7 +346,7 @@ void LegendLayout::setDettachedGeometry(const QRectF& rect) } -QSizeF LegendLayout::sizeHint(Qt::SizeHint which, const QSizeF & constraint) const +QSizeF LegendLayout::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const { QSizeF size(0, 0); qreal left, top, right, bottom; diff --git a/src/legend/legendlayout_p.h b/src/legend/legendlayout_p.h index a869679..9b5f5d2 100644 --- a/src/legend/legendlayout_p.h +++ b/src/legend/legendlayout_p.h @@ -31,27 +31,27 @@ class LegendLayout : public QGraphicsLayout { public: - LegendLayout(QLegend* legend); + LegendLayout(QLegend *legend); virtual ~LegendLayout(); - void setGeometry(const QRectF& rect); + void setGeometry(const QRectF &rect); void setOffset(qreal x, qreal y); QPointF offset() const; void invalidate(); protected: - QSizeF sizeHint ( Qt::SizeHint which, const QSizeF & constraint = QSizeF()) const; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const; int count() const { return 0; } - QGraphicsLayoutItem* itemAt(int) const { return 0; }; - void removeAt(int){}; + QGraphicsLayoutItem *itemAt(int) const { return 0; }; + void removeAt(int) {}; private: - void setAttachedGeometry(const QRectF& rect); - void setDettachedGeometry(const QRectF& rect); + void setAttachedGeometry(const QRectF &rect); + void setDettachedGeometry(const QRectF &rect); private: - QLegend* m_legend; + QLegend *m_legend; qreal m_offsetX; qreal m_offsetY; qreal m_minOffsetX; diff --git a/src/legend/legendmarker.cpp b/src/legend/legendmarker.cpp index 4d78dac..8db5e5f 100644 --- a/src/legend/legendmarker.cpp +++ b/src/legend/legendmarker.cpp @@ -113,7 +113,7 @@ QBrush LegendMarker::labelBrush() const } -void LegendMarker::setGeometry(const QRectF& rect) +void LegendMarker::setGeometry(const QRectF &rect) { QFontMetrics fn(font()); @@ -130,7 +130,7 @@ void LegendMarker::setGeometry(const QRectF& rect) m_textItem->setText(m_text); } - const QRectF& textRect = m_textItem->boundingRect(); + const QRectF &textRect = m_textItem->boundingRect(); m_textItem->setPos(x - m_margin, y / 2 - textRect.height() / 2); m_rectItem->setRect(m_markerRect); m_rectItem->setPos(m_margin, y / 2 - m_markerRect.height() / 2); @@ -146,7 +146,7 @@ void LegendMarker::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti Q_UNUSED(painter) } -QSizeF LegendMarker::sizeHint(Qt::SizeHint which, const QSizeF& constraint) const +QSizeF LegendMarker::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const { Q_UNUSED(constraint) @@ -210,7 +210,7 @@ void BarLegendMarker::updated() ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -PieLegendMarker::PieLegendMarker(QPieSeries* series, QPieSlice *pieslice, QLegend *legend) +PieLegendMarker::PieLegendMarker(QPieSeries *series, QPieSlice *pieslice, QLegend *legend) : LegendMarker(series, legend), m_pieslice(pieslice) { diff --git a/src/legend/legendmarker_p.h b/src/legend/legendmarker_p.h index e95c386..83f51b5 100644 --- a/src/legend/legendmarker_p.h +++ b/src/legend/legendmarker_p.h @@ -72,13 +72,13 @@ public: QAbstractSeries *series() const { return m_series;} - void setGeometry(const QRectF& rect); + void setGeometry(const QRectF &rect); QRectF boundingRect() const; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); - QSizeF sizeHint(Qt::SizeHint which, const QSizeF& constraint) const; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const; protected: // From QGraphicsObject @@ -91,7 +91,7 @@ protected: QAbstractSeries *m_series; QRectF m_markerRect; QRectF m_boundingRect; - QLegend* m_legend; + QLegend *m_legend; QGraphicsSimpleTextItem *m_textItem; QGraphicsRectItem *m_rectItem; qreal m_margin; diff --git a/src/legend/legendscroller_p.h b/src/legend/legendscroller_p.h index f40ecd3..b5a1797 100644 --- a/src/legend/legendscroller_p.h +++ b/src/legend/legendscroller_p.h @@ -43,15 +43,15 @@ class LegendScroller: public QLegend, public Scroller public: LegendScroller(QChart *chart): QLegend(chart) { } - void setOffset(const QPointF& point) { d_ptr->setOffset(point.x(), point.y()); } + void setOffset(const QPointF &point) { d_ptr->setOffset(point.x(), point.y()); } QPointF offset() const { return d_ptr->offset(); } - void mousePressEvent(QGraphicsSceneMouseEvent* event) { Scroller::mousePressEvent(event); } + void mousePressEvent(QGraphicsSceneMouseEvent *event) { Scroller::mousePressEvent(event); } - void mouseMoveEvent(QGraphicsSceneMouseEvent* event) { Scroller::mouseMoveEvent(event); } + void mouseMoveEvent(QGraphicsSceneMouseEvent *event) { Scroller::mouseMoveEvent(event); } - void mouseReleaseEvent(QGraphicsSceneMouseEvent* event) { Scroller::mouseReleaseEvent(event); } + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { Scroller::mouseReleaseEvent(event); } }; QTCOMMERCIALCHART_END_NAMESPACE diff --git a/src/legend/qlegend.cpp b/src/legend/qlegend.cpp index a00a935..199e010 100644 --- a/src/legend/qlegend.cpp +++ b/src/legend/qlegend.cpp @@ -416,7 +416,7 @@ void QLegend::showEvent(QShowEvent *event) //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -QLegendPrivate::QLegendPrivate(ChartPresenter* presenter, QChart *chart, QLegend *q) +QLegendPrivate::QLegendPrivate(ChartPresenter *presenter, QChart *chart, QLegend *q) : q_ptr(q), m_presenter(presenter), m_layout(new LegendLayout(q)), @@ -457,7 +457,7 @@ void QLegendPrivate::handleSeriesAdded(QAbstractSeries *series, Domain *domain) { Q_UNUSED(domain) - QList markers = series->d_ptr->createLegendMarker(q_ptr); + QList markers = series->d_ptr->createLegendMarker(q_ptr); foreach (LegendMarker *marker, markers) { marker->setFont(m_font); @@ -490,7 +490,7 @@ void QLegendPrivate::handleSeriesRemoved(QAbstractSeries *series) void QLegendPrivate::handleSeriesVisibleChanged() { - QAbstractSeries* series = qobject_cast (sender()); + QAbstractSeries *series = qobject_cast (sender()); Q_ASSERT(series); foreach (LegendMarker *marker, m_markers) { @@ -502,7 +502,7 @@ void QLegendPrivate::handleSeriesVisibleChanged() void QLegendPrivate::handleCountChanged() { - QAbstractSeriesPrivate* series = qobject_cast (sender()); + QAbstractSeriesPrivate *series = qobject_cast (sender()); Q_ASSERT(series); handleSeriesRemoved(series->q_ptr); handleSeriesAdded(series->q_ptr, 0); diff --git a/src/legend/qlegend_p.h b/src/legend/qlegend_p.h index 9bb1e70..4250644 100644 --- a/src/legend/qlegend_p.h +++ b/src/legend/qlegend_p.h @@ -52,8 +52,8 @@ public: QPointF offset() const; int roundness(qreal size); - QList markers() { return m_markers; } - QGraphicsItemGroup* items() { return m_items; } + QList markers() { return m_markers; } + QGraphicsItemGroup *items() { return m_items; } public Q_SLOTS: void handleSeriesAdded(QAbstractSeries *series, Domain *domain); @@ -65,9 +65,9 @@ private: QLegend *q_ptr; ChartPresenter *m_presenter; LegendLayout *m_layout; - QChart* m_chart; - QGraphicsItemGroup* m_items; - QList m_markers; + QChart *m_chart; + QGraphicsItemGroup *m_items; + QList m_markers; Qt::Alignment m_alignment; QBrush m_brush; QPen m_pen; diff --git a/src/linechart/linechartitem.cpp b/src/linechart/linechartitem.cpp index 416dc38..0a6db1a 100644 --- a/src/linechart/linechartitem.cpp +++ b/src/linechart/linechartitem.cpp @@ -29,7 +29,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE const qreal mouseEventMinWidth(12); -LineChartItem::LineChartItem(QLineSeries* series, ChartPresenter *presenter) +LineChartItem::LineChartItem(QLineSeries *series, ChartPresenter *presenter) : XYChart(series, presenter), QGraphicsItem(presenter ? presenter->rootItem() : 0), m_series(series), diff --git a/src/linechart/linechartitem_p.h b/src/linechart/linechartitem_p.h index 3b07c0f..7727b31 100644 --- a/src/linechart/linechartitem_p.h +++ b/src/linechart/linechartitem_p.h @@ -62,7 +62,7 @@ protected: void mousePressEvent(QGraphicsSceneMouseEvent *event); private: - QLineSeries* m_series; + QLineSeries *m_series; QPainterPath m_path; QPainterPath m_linePath; QVector m_points; diff --git a/src/linechart/qlineseries.cpp b/src/linechart/qlineseries.cpp index 2bd7a0b..9ddf52a 100644 --- a/src/linechart/qlineseries.cpp +++ b/src/linechart/qlineseries.cpp @@ -142,15 +142,16 @@ QDebug operator<< (QDebug debug, const QLineSeries series) //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -QLineSeriesPrivate::QLineSeriesPrivate(QLineSeries* q): QXYSeriesPrivate(q) +QLineSeriesPrivate::QLineSeriesPrivate(QLineSeries *q) + : QXYSeriesPrivate(q) { }; -ChartElement* QLineSeriesPrivate::createGraphics(ChartPresenter* presenter) +ChartElement *QLineSeriesPrivate::createGraphics(ChartPresenter *presenter) { Q_Q(QLineSeries); - LineChartItem* line = new LineChartItem(q, presenter); + LineChartItem *line = new LineChartItem(q, presenter); if (presenter->animationOptions().testFlag(QChart::SeriesAnimations)) line->setAnimation(new XYAnimation(line)); presenter->chartTheme()->decorate(q, presenter->dataSet()->seriesIndex(q)); diff --git a/src/linechart/qlineseries_p.h b/src/linechart/qlineseries_p.h index 83cfaf2..8bfdbf8 100644 --- a/src/linechart/qlineseries_p.h +++ b/src/linechart/qlineseries_p.h @@ -38,12 +38,11 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE class QLineSeriesPrivate: public QXYSeriesPrivate { public: - QLineSeriesPrivate(QLineSeries* q); - ChartElement* createGraphics(ChartPresenter* presenter); + QLineSeriesPrivate(QLineSeries *q); + ChartElement *createGraphics(ChartPresenter *presenter); private: Q_DECLARE_PUBLIC(QLineSeries); - }; QTCOMMERCIALCHART_END_NAMESPACE diff --git a/src/piechart/piechartitem.cpp b/src/piechart/piechartitem.cpp index b149914..c071c49 100644 --- a/src/piechart/piechartitem.cpp +++ b/src/piechart/piechartitem.cpp @@ -32,7 +32,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE -PieChartItem::PieChartItem(QPieSeries *series, ChartPresenter* presenter) +PieChartItem::PieChartItem(QPieSeries *series, ChartPresenter *presenter) : ChartItem(presenter), m_series(series), m_animation(0) @@ -60,17 +60,17 @@ PieChartItem::~PieChartItem() // slices deleted automatically through QGraphicsItem } -void PieChartItem::setAnimation(PieAnimation* animation) +void PieChartItem::setAnimation(PieAnimation *animation) { m_animation = animation; } -ChartAnimation* PieChartItem::animation() const +ChartAnimation *PieChartItem::animation() const { return m_animation; } -void PieChartItem::handleGeometryChanged(const QRectF& rect) +void PieChartItem::handleGeometryChanged(const QRectF &rect) { prepareGeometryChange(); m_rect = rect; @@ -143,7 +143,7 @@ void PieChartItem::updateLayout() update(); } -void PieChartItem::handleSlicesAdded(QList slices) +void PieChartItem::handleSlicesAdded(QList slices) { // delay creating slice items until there is a proper rectangle if (!m_rect.isValid() && m_sliceItems.isEmpty()) @@ -153,8 +153,8 @@ void PieChartItem::handleSlicesAdded(QList slices) bool startupAnimation = m_sliceItems.isEmpty(); - foreach (QPieSlice *slice, slices) { - PieSliceItem* sliceItem = new PieSliceItem(this); + foreach(QPieSlice * slice, slices) { + PieSliceItem *sliceItem = new PieSliceItem(this); m_sliceItems.insert(slice, sliceItem); // Note: no need to connect to slice valueChanged() etc. @@ -183,7 +183,7 @@ void PieChartItem::handleSlicesAdded(QList slices) } } -void PieChartItem::handleSlicesRemoved(QList slices) +void PieChartItem::handleSlicesRemoved(QList slices) { presenter()->chartTheme()->decorate(m_series, presenter()->dataSet()->seriesIndex(m_series)); @@ -208,9 +208,9 @@ void PieChartItem::handleSlicesRemoved(QList slices) void PieChartItem::handleSliceChanged() { - QPieSlice* slice = qobject_cast(sender()); + QPieSlice *slice = qobject_cast(sender()); if (!slice) { - QPieSlicePrivate* slicep = qobject_cast(sender()); + QPieSlicePrivate *slicep = qobject_cast(sender()); slice = slicep->q_ptr; } Q_ASSERT(m_sliceItems.contains(slice)); diff --git a/src/piechart/piechartitem_p.h b/src/piechart/piechartitem_p.h index e6af3eb..7072a0f 100644 --- a/src/piechart/piechartitem_p.h +++ b/src/piechart/piechartitem_p.h @@ -61,26 +61,26 @@ public Q_SLOTS: virtual void rangeYChanged(qreal min, qreal max, int tickYCount); void updateLayout(); - void handleSlicesAdded(QList slices); - void handleSlicesRemoved(QList slices); + void handleSlicesAdded(QList slices); + void handleSlicesRemoved(QList slices); void handleSliceChanged(); void handleSeriesVisibleChanged(); void handleOpacityChanged(); - void setAnimation(PieAnimation* animation); - ChartAnimation* animation() const; + void setAnimation(PieAnimation *animation); + ChartAnimation *animation() const; private: PieSliceData updateSliceGeometry(QPieSlice *slice); private: - QHash m_sliceItems; + QHash m_sliceItems; QPieSeries *m_series; QRectF m_rect; QPointF m_pieCenter; qreal m_pieRadius; qreal m_holeSize; - PieAnimation* m_animation; + PieAnimation *m_animation; }; diff --git a/src/piechart/pieslicedata_p.h b/src/piechart/pieslicedata_p.h index e50b590..ac970ae 100644 --- a/src/piechart/pieslicedata_p.h +++ b/src/piechart/pieslicedata_p.h @@ -41,7 +41,7 @@ template class Themed : public T { public: - Themed():m_isThemed(true) {} + Themed(): m_isThemed(true) {} inline T &operator=(const T &other) { return T::operator =(other); } @@ -82,8 +82,7 @@ public: { } - bool operator!=(const PieSliceData &other) const - { + bool operator!=(const PieSliceData &other) const { if (!qFuzzyIsNull(m_value - other.m_value)) return true; diff --git a/src/piechart/piesliceitem.cpp b/src/piechart/piesliceitem.cpp index c181084..1df8382 100644 --- a/src/piechart/piesliceitem.cpp +++ b/src/piechart/piesliceitem.cpp @@ -38,7 +38,7 @@ QPointF offset(qreal angle, qreal length) return QPointF(dx, -dy); } -PieSliceItem::PieSliceItem(QGraphicsItem* parent) +PieSliceItem::PieSliceItem(QGraphicsItem *parent) : QGraphicsObject(parent), m_hovered(false) { @@ -67,7 +67,7 @@ QPainterPath PieSliceItem::shape() const return m_slicePath; } -void PieSliceItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* /*option*/, QWidget* /*widget*/) +void PieSliceItem::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/) { painter->save(); painter->setClipRect(parentItem()->boundingRect()); @@ -116,13 +116,13 @@ void PieSliceItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* /*op } } -void PieSliceItem::hoverEnterEvent(QGraphicsSceneHoverEvent* /*event*/) +void PieSliceItem::hoverEnterEvent(QGraphicsSceneHoverEvent * /*event*/) { m_hovered = true; emit hovered(true); } -void PieSliceItem::hoverLeaveEvent(QGraphicsSceneHoverEvent* /*event*/) +void PieSliceItem::hoverLeaveEvent(QGraphicsSceneHoverEvent * /*event*/) { m_hovered = false; emit hovered(false); @@ -204,7 +204,7 @@ QPointF PieSliceItem::sliceCenter(QPointF point, qreal radius, QPieSlice *slice) return point; } -QPainterPath PieSliceItem::slicePath(QPointF center, qreal radius, qreal startAngle, qreal angleSpan, qreal *centerAngle, QPointF* armStart) +QPainterPath PieSliceItem::slicePath(QPointF center, qreal radius, qreal startAngle, qreal angleSpan, qreal *centerAngle, QPointF *armStart) { // calculate center angle *centerAngle = startAngle + (angleSpan / 2); diff --git a/src/piechart/piesliceitem_p.h b/src/piechart/piesliceitem_p.h index a508fb8..adc7617 100644 --- a/src/piechart/piesliceitem_p.h +++ b/src/piechart/piesliceitem_p.h @@ -51,7 +51,7 @@ class PieSliceItem : public QGraphicsObject Q_OBJECT public: - PieSliceItem(QGraphicsItem* parent = 0); + PieSliceItem(QGraphicsItem *parent = 0); ~PieSliceItem(); // from QGraphicsItem diff --git a/src/piechart/qhpiemodelmapper.cpp b/src/piechart/qhpiemodelmapper.cpp index 79edb97..08fb4b4 100644 --- a/src/piechart/qhpiemodelmapper.cpp +++ b/src/piechart/qhpiemodelmapper.cpp @@ -160,7 +160,7 @@ QHPieModelMapper::QHPieModelMapper(QObject *parent) : setOrientation(Qt::Horizontal); } -QAbstractItemModel* QHPieModelMapper::model() const +QAbstractItemModel *QHPieModelMapper::model() const { return QPieModelMapper::model(); } @@ -173,7 +173,7 @@ void QHPieModelMapper::setModel(QAbstractItemModel *model) } } -QPieSeries* QHPieModelMapper::series() const +QPieSeries *QHPieModelMapper::series() const { return QPieModelMapper::series(); } diff --git a/src/piechart/qhpiemodelmapper.h b/src/piechart/qhpiemodelmapper.h index 74262d1..1d06437 100644 --- a/src/piechart/qhpiemodelmapper.h +++ b/src/piechart/qhpiemodelmapper.h @@ -38,10 +38,10 @@ class QTCOMMERCIALCHART_EXPORT QHPieModelMapper : public QPieModelMapper public: explicit QHPieModelMapper(QObject *parent = 0); - QAbstractItemModel* model() const; + QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); - QPieSeries* series() const; + QPieSeries *series() const; void setSeries(QPieSeries *series); int valuesRow() const; diff --git a/src/piechart/qpiemodelmapper.cpp b/src/piechart/qpiemodelmapper.cpp index c59f73c..3f8cc3c 100644 --- a/src/piechart/qpiemodelmapper.cpp +++ b/src/piechart/qpiemodelmapper.cpp @@ -32,7 +32,7 @@ QPieModelMapper::QPieModelMapper(QObject *parent) : { } -QAbstractItemModel* QPieModelMapper::model() const +QAbstractItemModel *QPieModelMapper::model() const { Q_D(const QPieModelMapper); return d->m_model; @@ -59,7 +59,7 @@ void QPieModelMapper::setModel(QAbstractItemModel *model) connect(d->m_model, SIGNAL(destroyed()), d, SLOT(handleModelDestroyed())); } -QPieSeries* QPieModelMapper::series() const +QPieSeries *QPieModelMapper::series() const { Q_D(const QPieModelMapper); return d->m_series; @@ -216,7 +216,7 @@ void QPieModelMapperPrivate::blockSeriesSignals(bool block) } -QPieSlice* QPieModelMapperPrivate::pieSlice(QModelIndex index) const +QPieSlice *QPieModelMapperPrivate::pieSlice(QModelIndex index) const { if (!index.isValid()) return 0; // index is invalid @@ -281,7 +281,7 @@ bool QPieModelMapperPrivate::isValueIndex(QModelIndex index) const return false; } -void QPieModelMapperPrivate::slicesAdded(QList slices) +void QPieModelMapperPrivate::slicesAdded(QList slices) { if (m_seriesSignalsBlock) return; @@ -315,7 +315,7 @@ void QPieModelMapperPrivate::slicesAdded(QList slices) blockModelSignals(false); } -void QPieModelMapperPrivate::slicesRemoved(QList slices) +void QPieModelMapperPrivate::slicesRemoved(QList slices) { if (m_seriesSignalsBlock) return; diff --git a/src/piechart/qpiemodelmapper.h b/src/piechart/qpiemodelmapper.h index a8f4cee..a72f1d0 100644 --- a/src/piechart/qpiemodelmapper.h +++ b/src/piechart/qpiemodelmapper.h @@ -38,10 +38,10 @@ class QTCOMMERCIALCHART_EXPORT QPieModelMapper : public QObject protected: explicit QPieModelMapper(QObject *parent = 0); - QAbstractItemModel* model() const; + QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); - QPieSeries* series() const; + QPieSeries *series() const; void setSeries(QPieSeries *series); int first() const; diff --git a/src/piechart/qpiemodelmapper_p.h b/src/piechart/qpiemodelmapper_p.h index c0422ef..0692586 100644 --- a/src/piechart/qpiemodelmapper_p.h +++ b/src/piechart/qpiemodelmapper_p.h @@ -56,8 +56,8 @@ public Q_SLOTS: void handleModelDestroyed(); // for the series - void slicesAdded(QList slices); - void slicesRemoved(QList slices); + void slicesAdded(QList slices); + void slicesRemoved(QList slices); void sliceLabelChanged(); void sliceValueChanged(); void handleSeriesDestroyed(); @@ -65,7 +65,7 @@ public Q_SLOTS: void initializePieFromModel(); private: - QPieSlice* pieSlice(QModelIndex index) const; + QPieSlice *pieSlice(QModelIndex index) const; bool isLabelIndex(QModelIndex index) const; bool isValueIndex(QModelIndex index) const; QModelIndex valueModelIndex(int slicePos); @@ -78,7 +78,7 @@ private: private: QPieSeries *m_series; - QList m_slices; + QList m_slices; QAbstractItemModel *m_model; int m_first; int m_count; diff --git a/src/piechart/qpieseries.cpp b/src/piechart/qpieseries.cpp index cbd511b..dbc0f23 100644 --- a/src/piechart/qpieseries.cpp +++ b/src/piechart/qpieseries.cpp @@ -376,9 +376,9 @@ QAbstractSeries::SeriesType QPieSeries::type() const Returns true if append was succesfull. */ -bool QPieSeries::append(QPieSlice* slice) +bool QPieSeries::append(QPieSlice *slice) { - return append(QList() << slice); + return append(QList() << slice); } /*! @@ -387,7 +387,7 @@ bool QPieSeries::append(QPieSlice* slice) Returns true if append was successful. */ -bool QPieSeries::append(QList slices) +bool QPieSeries::append(QList slices) { Q_D(QPieSeries); @@ -425,7 +425,7 @@ bool QPieSeries::append(QList slices) Appends a single \a slice to the series and returns a reference to the series. Slice ownership is passed to the series. */ -QPieSeries& QPieSeries::operator << (QPieSlice* slice) +QPieSeries &QPieSeries::operator << (QPieSlice *slice) { append(slice); return *this; @@ -436,9 +436,9 @@ QPieSeries& QPieSeries::operator << (QPieSlice* slice) Appends a single slice to the series with give \a value and \a label. Slice ownership is passed to the series. */ -QPieSlice* QPieSeries::append(QString label, qreal value) +QPieSlice *QPieSeries::append(QString label, qreal value) { - QPieSlice* slice = new QPieSlice(label, value); + QPieSlice *slice = new QPieSlice(label, value); append(slice); return slice; } @@ -449,7 +449,7 @@ QPieSlice* QPieSeries::append(QString label, qreal value) Returns true if insert was successful. */ -bool QPieSeries::insert(int index, QPieSlice* slice) +bool QPieSeries::insert(int index, QPieSlice *slice) { Q_D(QPieSeries); @@ -473,7 +473,7 @@ bool QPieSeries::insert(int index, QPieSlice* slice) connect(slice, SIGNAL(hovered(bool)), d, SLOT(sliceHovered(bool))); - emit added(QList() << slice); + emit added(QList() << slice); emit countChanged(); return true; @@ -486,7 +486,7 @@ bool QPieSeries::insert(int index, QPieSlice* slice) Returns true if remove was successful. */ -bool QPieSeries::remove(QPieSlice* slice) +bool QPieSeries::remove(QPieSlice *slice) { Q_D(QPieSeries); @@ -495,7 +495,7 @@ bool QPieSeries::remove(QPieSlice* slice) d->updateDerivativeData(); - emit removed(QList() << slice); + emit removed(QList() << slice); emit countChanged(); delete slice; @@ -512,7 +512,7 @@ bool QPieSeries::remove(QPieSlice* slice) Returns true if take was successful. */ -bool QPieSeries::take(QPieSlice* slice) +bool QPieSeries::take(QPieSlice *slice) { Q_D(QPieSeries); @@ -524,7 +524,7 @@ bool QPieSeries::take(QPieSlice* slice) d->updateDerivativeData(); - emit removed(QList() << slice); + emit removed(QList() << slice); emit countChanged(); return true; @@ -539,7 +539,7 @@ void QPieSeries::clear() if (d->m_slices.count() == 0) return; - QList slices = d->m_slices; + QList slices = d->m_slices; foreach (QPieSlice *s, d->m_slices) d->m_slices.removeOne(s); @@ -555,7 +555,7 @@ void QPieSeries::clear() /*! Returns a list of slices that belong to this series. */ -QList QPieSeries::slices() const +QList QPieSeries::slices() const { Q_D(const QPieSeries); return d->m_slices; @@ -776,7 +776,7 @@ void QPieSeriesPrivate::updateDerivativeData() // update slice attributes qreal sliceAngle = m_pieStartAngle; qreal pieSpan = m_pieEndAngle - m_pieStartAngle; - QVector changed; + QVector changed; foreach (QPieSlice *s, m_slices) { QPieSlicePrivate *d = QPieSlicePrivate::fromSlice(s); d->setPercentage(s->value() / m_sum); @@ -807,7 +807,7 @@ void QPieSeriesPrivate::setSizes(qreal innerSize, qreal outerSize) emit pieSizeChanged(); } -QPieSeriesPrivate* QPieSeriesPrivate::fromSeries(QPieSeries *series) +QPieSeriesPrivate *QPieSeriesPrivate::fromSeries(QPieSeries *series) { return series->d_func(); } @@ -820,7 +820,7 @@ void QPieSeriesPrivate::sliceValueChanged() void QPieSeriesPrivate::sliceClicked() { - QPieSlice* slice = qobject_cast(sender()); + QPieSlice *slice = qobject_cast(sender()); Q_ASSERT(m_slices.contains(slice)); Q_Q(QPieSeries); emit q->clicked(slice); @@ -828,32 +828,32 @@ void QPieSeriesPrivate::sliceClicked() void QPieSeriesPrivate::sliceHovered(bool state) { - QPieSlice* slice = qobject_cast(sender()); + QPieSlice *slice = qobject_cast(sender()); Q_ASSERT(m_slices.contains(slice)); Q_Q(QPieSeries); emit q->hovered(slice, state); } -void QPieSeriesPrivate::scaleDomain(Domain& domain) +void QPieSeriesPrivate::scaleDomain(Domain &domain) { Q_UNUSED(domain); // does not apply to pie } -ChartElement* QPieSeriesPrivate::createGraphics(ChartPresenter* presenter) +ChartElement *QPieSeriesPrivate::createGraphics(ChartPresenter *presenter) { Q_Q(QPieSeries); - PieChartItem* pie = new PieChartItem(q, presenter); + PieChartItem *pie = new PieChartItem(q, presenter); if (presenter->animationOptions().testFlag(QChart::SeriesAnimations)) pie->setAnimation(new PieAnimation(pie)); presenter->chartTheme()->decorate(q, presenter->dataSet()->seriesIndex(q)); return pie; } -QList QPieSeriesPrivate::createLegendMarker(QLegend* legend) +QList QPieSeriesPrivate::createLegendMarker(QLegend *legend) { Q_Q(QPieSeries); - QList markers; + QList markers; foreach (QPieSlice *slice, q->slices()) { PieLegendMarker* marker = new PieLegendMarker(q, slice, legend); markers << marker; @@ -861,7 +861,7 @@ QList QPieSeriesPrivate::createLegendMarker(QLegend* legend) return markers; } -void QPieSeriesPrivate::initializeAxis(QAbstractAxis* axis) +void QPieSeriesPrivate::initializeAxis(QAbstractAxis *axis) { Q_UNUSED(axis); } diff --git a/src/piechart/qpieseries.h b/src/piechart/qpieseries.h index 79b2534..857d2cf 100644 --- a/src/piechart/qpieseries.h +++ b/src/piechart/qpieseries.h @@ -45,18 +45,18 @@ public: QAbstractSeries::SeriesType type() const; - bool append(QPieSlice* slice); - bool append(QList slices); - QPieSeries& operator << (QPieSlice* slice); - QPieSlice* append(QString label, qreal value); + bool append(QPieSlice *slice); + bool append(QList slices); + QPieSeries &operator << (QPieSlice *slice); + QPieSlice *append(QString label, qreal value); - bool insert(int index, QPieSlice* slice); + bool insert(int index, QPieSlice *slice); - bool remove(QPieSlice* slice); - bool take(QPieSlice* slice); + bool remove(QPieSlice *slice); + bool take(QPieSlice *slice); void clear(); - QList slices() const; + QList slices() const; int count() const; bool isEmpty() const; @@ -85,10 +85,10 @@ public: void setLabelsPosition(QPieSlice::LabelPosition position); Q_SIGNALS: - void added(QList slices); - void removed(QList slices); - void clicked(QPieSlice* slice); - void hovered(QPieSlice* slice, bool state); + void added(QList slices); + void removed(QList slices); + void clicked(QPieSlice *slice); + void hovered(QPieSlice *slice, bool state); void countChanged(); void sumChanged(); diff --git a/src/piechart/qpieseries_p.h b/src/piechart/qpieseries_p.h index 163d335..16c7e27 100644 --- a/src/piechart/qpieseries_p.h +++ b/src/piechart/qpieseries_p.h @@ -44,16 +44,16 @@ public: QPieSeriesPrivate(QPieSeries *parent); ~QPieSeriesPrivate(); - void scaleDomain(Domain& domain); - ChartElement* createGraphics(ChartPresenter *presenter); - QList createLegendMarker(QLegend *legend); - void initializeAxis(QAbstractAxis* axis); + void scaleDomain(Domain &domain); + ChartElement *createGraphics(ChartPresenter *presenter); + QList createLegendMarker(QLegend *legend); + void initializeAxis(QAbstractAxis *axis); QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const; void updateDerivativeData(); void setSizes(qreal innerSize, qreal outerSize); - static QPieSeriesPrivate* fromSeries(QPieSeries *series); + static QPieSeriesPrivate *fromSeries(QPieSeries *series); signals: void calculatedDataChanged(); @@ -69,7 +69,7 @@ public Q_SLOTS: void sliceHovered(bool state); private: - QList m_slices; + QList m_slices; qreal m_pieRelativeHorPos; qreal m_pieRelativeVerPos; qreal m_pieRelativeSize; diff --git a/src/piechart/qpieslice_p.h b/src/piechart/qpieslice_p.h index 4cfda69..95a6361 100644 --- a/src/piechart/qpieslice_p.h +++ b/src/piechart/qpieslice_p.h @@ -45,7 +45,7 @@ public: QPieSlicePrivate(QPieSlice *parent); ~QPieSlicePrivate(); - static QPieSlicePrivate* fromSlice(QPieSlice *slice); + static QPieSlicePrivate *fromSlice(QPieSlice *slice); void setPen(const QPen &pen, bool themed); void setBrush(const QBrush &brush, bool themed); diff --git a/src/piechart/qvpiemodelmapper.cpp b/src/piechart/qvpiemodelmapper.cpp index 8afccc1..62a1ea2 100644 --- a/src/piechart/qvpiemodelmapper.cpp +++ b/src/piechart/qvpiemodelmapper.cpp @@ -163,7 +163,7 @@ QVPieModelMapper::QVPieModelMapper(QObject *parent) : QPieModelMapper::setOrientation(Qt::Vertical); } -QAbstractItemModel* QVPieModelMapper::model() const +QAbstractItemModel *QVPieModelMapper::model() const { return QPieModelMapper::model(); } @@ -176,7 +176,7 @@ void QVPieModelMapper::setModel(QAbstractItemModel *model) } } -QPieSeries* QVPieModelMapper::series() const +QPieSeries *QVPieModelMapper::series() const { return QPieModelMapper::series(); } diff --git a/src/piechart/qvpiemodelmapper.h b/src/piechart/qvpiemodelmapper.h index 2520189..8fe8e80 100644 --- a/src/piechart/qvpiemodelmapper.h +++ b/src/piechart/qvpiemodelmapper.h @@ -38,10 +38,10 @@ class QTCOMMERCIALCHART_EXPORT QVPieModelMapper : public QPieModelMapper public: explicit QVPieModelMapper(QObject *parent = 0); - QAbstractItemModel* model() const; + QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); - QPieSeries* series() const; + QPieSeries *series() const; void setSeries(QPieSeries *series); int valuesColumn() const; diff --git a/src/qabstractseries.cpp b/src/qabstractseries.cpp index fdd311d..e744f43 100644 --- a/src/qabstractseries.cpp +++ b/src/qabstractseries.cpp @@ -141,7 +141,7 @@ QAbstractSeries::~QAbstractSeries() qFatal("Still binded series detected !"); } -void QAbstractSeries::setName(const QString& name) +void QAbstractSeries::setName(const QString &name) { if (name != d_ptr->m_name) { d_ptr->m_name = name; @@ -192,7 +192,7 @@ void QAbstractSeries::setOpacity(qreal opacity) Set automatically when the series is added to the chart and unset when the series is removed from the chart. */ -QChart* QAbstractSeries::chart() const +QChart *QAbstractSeries::chart() const { return d_ptr->m_chart; } @@ -224,7 +224,7 @@ void QAbstractSeries::hide() /////////////////////////////////////////////////////////////////////////////////////////////////// -QAbstractSeriesPrivate::QAbstractSeriesPrivate(QAbstractSeries* q) +QAbstractSeriesPrivate::QAbstractSeriesPrivate(QAbstractSeries *q) : q_ptr(q), m_chart(0), m_dataset(0), diff --git a/src/qabstractseries.h b/src/qabstractseries.h index ca6fe44..4ad1f45 100644 --- a/src/qabstractseries.h +++ b/src/qabstractseries.h @@ -62,14 +62,14 @@ public: ~QAbstractSeries(); virtual SeriesType type() const = 0; - void setName(const QString& name); + void setName(const QString &name); QString name() const; void setVisible(bool visible = true); bool isVisible() const; qreal opacity() const; void setOpacity(qreal opacity); - QChart* chart() const; + QChart *chart() const; void show(); void hide(); diff --git a/src/qabstractseries_p.h b/src/qabstractseries_p.h index 5018aa0..dd2e890 100644 --- a/src/qabstractseries_p.h +++ b/src/qabstractseries_p.h @@ -49,10 +49,10 @@ public: QAbstractSeriesPrivate(QAbstractSeries *q); ~QAbstractSeriesPrivate(); - virtual void scaleDomain(Domain& domain) = 0; - virtual ChartElement* createGraphics(ChartPresenter* presenter) = 0; - virtual QList createLegendMarker(QLegend* legend) = 0; - virtual void initializeAxis(QAbstractAxis* axis) = 0; + virtual void scaleDomain(Domain &domain) = 0; + virtual ChartElement *createGraphics(ChartPresenter *presenter) = 0; + virtual QList createLegendMarker(QLegend *legend) = 0; + virtual void initializeAxis(QAbstractAxis *axis) = 0; virtual QAbstractAxis::AxisType defaultAxisType(Qt::Orientation) const = 0; Q_SIGNALS: diff --git a/src/qchart.cpp b/src/qchart.cpp index 45a68b1..90804eb 100644 --- a/src/qchart.cpp +++ b/src/qchart.cpp @@ -166,7 +166,7 @@ void QChart::removeAllSeries() /*! Sets the \a brush that is used for painting the background of the chart area. */ -void QChart::setBackgroundBrush(const QBrush& brush) +void QChart::setBackgroundBrush(const QBrush &brush) { d_ptr->m_presenter->setBackgroundBrush(brush); } @@ -182,7 +182,7 @@ QBrush QChart::backgroundBrush() const /*! Sets the \a pen that is used for painting the background of the chart area. */ -void QChart::setBackgroundPen(const QPen& pen) +void QChart::setBackgroundPen(const QPen &pen) { d_ptr->m_presenter->setBackgroundPen(pen); } @@ -198,7 +198,7 @@ QPen QChart::backgroundPen() const /*! Sets the chart \a title. The description text that is drawn above the chart. */ -void QChart::setTitle(const QString& title) +void QChart::setTitle(const QString &title) { d_ptr->m_presenter->setTitle(title); } @@ -214,7 +214,7 @@ QString QChart::title() const /*! Sets the \a font that is used for drawing the chart description text that is rendered above the chart. */ -void QChart::setTitleFont(const QFont& font) +void QChart::setTitleFont(const QFont &font) { d_ptr->m_presenter->setTitleFont(font); } @@ -264,9 +264,10 @@ void QChart::zoomIn() /*! Zooms in the view to a maximum level at which \a rect is still fully visible. */ -void QChart::zoomIn(const QRectF& rect) +void QChart::zoomIn(const QRectF &rect) { - if (!rect.isValid()) return; + if (!rect.isValid()) + return; d_ptr->m_presenter->zoomIn(rect); } @@ -304,7 +305,7 @@ void QChart::zoom(qreal factor) Returns the pointer to the x axis object of the chart asociated with the specified \a series If no series is provided then pointer to currently visible axis is provided */ -QAbstractAxis* QChart::axisX(QAbstractSeries* series) const +QAbstractAxis *QChart::axisX(QAbstractSeries *series) const { return d_ptr->m_dataset->axisX(series); } @@ -313,7 +314,7 @@ QAbstractAxis* QChart::axisX(QAbstractSeries* series) const Returns the pointer to the y axis object of the chart asociated with the specified \a series If no series is provided then pointer to currently visible axis is provided */ -QAbstractAxis* QChart::axisY(QAbstractSeries *series) const +QAbstractAxis *QChart::axisY(QAbstractSeries *series) const { return d_ptr->m_dataset->axisY(series); } @@ -360,7 +361,7 @@ void QChart::createDefaultAxes() /*! Returns the legend object of the chart. Ownership stays in chart. */ -QLegend* QChart::legend() const +QLegend *QChart::legend() const { return d_ptr->m_legend; } @@ -368,7 +369,7 @@ QLegend* QChart::legend() const /*! Sets the minimum \a margins between the plot area (axes) and the edge of the chart widget. */ -void QChart::setMargins(const QMargins& margins) +void QChart::setMargins(const QMargins &margins) { d_ptr->m_presenter->setMargins(margins); } @@ -446,7 +447,7 @@ bool QChart::isDropShadowEnabled() const \sa addSeries(), removeSeries(), removeAllSeries() */ -QList QChart::series() const +QList QChart::series() const { return d_ptr->m_dataset->series(); } @@ -456,7 +457,7 @@ QList QChart::series() const \sa axisX(), axisY(), setAxisY(), createDefaultAxes() */ -void QChart::setAxisX(QAbstractAxis* axis , QAbstractSeries *series) +void QChart::setAxisX(QAbstractAxis *axis , QAbstractSeries *series) { d_ptr->m_dataset->setAxis(series, axis, Qt::Horizontal); } diff --git a/src/qchart.h b/src/qchart.h index 9a1d7de..5f44741 100644 --- a/src/qchart.h +++ b/src/qchart.h @@ -74,22 +74,22 @@ public: void addSeries(QAbstractSeries *series); void removeSeries(QAbstractSeries *series); void removeAllSeries(); - QList series() const; + QList series() const; - void setAxisX(QAbstractAxis* axis, QAbstractSeries *series = 0); - void setAxisY(QAbstractAxis* axis, QAbstractSeries *series = 0); + void setAxisX(QAbstractAxis *axis, QAbstractSeries *series = 0); + void setAxisY(QAbstractAxis *axis, QAbstractSeries *series = 0); - QAbstractAxis* axisX(QAbstractSeries* series = 0) const; - QAbstractAxis* axisY(QAbstractSeries* series = 0) const; + QAbstractAxis *axisX(QAbstractSeries *series = 0) const; + QAbstractAxis *axisY(QAbstractSeries *series = 0) const; void createDefaultAxes(); void setTheme(QChart::ChartTheme theme); QChart::ChartTheme theme() const; - void setTitle(const QString& title); + void setTitle(const QString &title); QString title() const; - void setTitleFont(const QFont& font); + void setTitleFont(const QFont &font); QFont titleFont() const; void setTitleBrush(const QBrush &brush); QBrush titleBrush() const; @@ -112,9 +112,9 @@ public: void zoom(qreal factor); void scroll(qreal dx, qreal dy); - QLegend* legend() const; + QLegend *legend() const; - void setMargins(const QMargins& margins); + void setMargins(const QMargins &margins); QMargins margins() const; QRectF plotArea() const; diff --git a/src/qchart_p.h b/src/qchart_p.h index ecb572d..6403072 100644 --- a/src/qchart_p.h +++ b/src/qchart_p.h @@ -42,7 +42,7 @@ struct QChartPrivate { QChartPrivate(); ~QChartPrivate(); - QLegend* m_legend; + QLegend *m_legend; ChartDataSet *m_dataset; ChartPresenter *m_presenter; diff --git a/src/qchartglobal.h b/src/qchartglobal.h index 7a4b127..7d38090 100644 --- a/src/qchartglobal.h +++ b/src/qchartglobal.h @@ -78,8 +78,8 @@ static inline QDebug chartDebug(int numargs,...) va_start(valist, numargs); //for( int i = 0 ; i < numargs; i++ ) int line = va_arg(valist, int); - char* file = va_arg(valist, char*); - char* function = va_arg(valist, char*); + char *file = va_arg(valist, char *); + char *function = va_arg(valist, char *); va_end(valist); return qDebug() << QString().append(function).append("(").append(file).append(":%1)").arg(line); } diff --git a/src/qchartview.cpp b/src/qchartview.cpp index bd73e4b..52d7d26 100644 --- a/src/qchartview.cpp +++ b/src/qchartview.cpp @@ -82,7 +82,7 @@ QChartView::~QChartView() /*! Returns the pointer to the associated chart */ -QChart* QChartView::chart() const +QChart *QChartView::chart() const { return d_ptr->m_chart; } @@ -102,7 +102,7 @@ void QChartView::setChart(QChart *chart) /*! Sets the RubberBandPlicy to \a rubberBand. Selected policy determines the way zooming is performed. */ -void QChartView::setRubberBand(const RubberBands& rubberBand) +void QChartView::setRubberBand(const RubberBands &rubberBand) { d_ptr->m_rubberBandFlags = rubberBand; @@ -205,7 +205,7 @@ void QChartView::resizeEvent(QResizeEvent *event) /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -QChartViewPrivate::QChartViewPrivate(QChartView *q, QChart* chart) +QChartViewPrivate::QChartViewPrivate(QChartView *q, QChart *chart) : q_ptr(q), m_scene(new QGraphicsScene(q)), m_chart(chart), diff --git a/src/qchartview.h b/src/qchartview.h index e08a52a..b63fd4a 100644 --- a/src/qchartview.h +++ b/src/qchartview.h @@ -1,74 +1,74 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc -** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com -** -** This file is part of the Qt Commercial Charts Add-on. -** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. -** -** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QCHARTVIEW_H -#define QCHARTVIEW_H - -#include -#include -#include -#include - -class QGraphicsScene; -class QRubberBand; - -QTCOMMERCIALCHART_BEGIN_NAMESPACE - -class QChartViewPrivate; - -class QTCOMMERCIALCHART_EXPORT QChartView : public QGraphicsView -{ - Q_OBJECT - Q_ENUMS(RubberBand) -public: - - enum RubberBand { - NoRubberBand = 0x0, - VerticalRubberBand = 0x1, - HorizonalRubberBand = 0x2, - RectangleRubberBand = 0x3 - }; - - Q_DECLARE_FLAGS(RubberBands, RubberBand) - - explicit QChartView(QWidget *parent = 0); - explicit QChartView(QChart *chart, QWidget *parent = 0); - ~QChartView(); - - void setRubberBand(const RubberBands& rubberBands); - RubberBands rubberBand() const; - - QChart* chart() const; - void setChart(QChart *chart); - -protected: - void resizeEvent(QResizeEvent *event); - void mousePressEvent(QMouseEvent *event); - void mouseMoveEvent(QMouseEvent *event); - void mouseReleaseEvent(QMouseEvent *event); - -protected: - QScopedPointer d_ptr; - Q_DISABLE_COPY(QChartView) -}; - -QTCOMMERCIALCHART_END_NAMESPACE - -#endif // QCHARTVIEW_H +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the Qt Commercial Charts Add-on. +** +** $QT_BEGIN_LICENSE$ +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QCHARTVIEW_H +#define QCHARTVIEW_H + +#include +#include +#include +#include + +class QGraphicsScene; +class QRubberBand; + +QTCOMMERCIALCHART_BEGIN_NAMESPACE + +class QChartViewPrivate; + +class QTCOMMERCIALCHART_EXPORT QChartView : public QGraphicsView +{ + Q_OBJECT + Q_ENUMS(RubberBand) +public: + + enum RubberBand { + NoRubberBand = 0x0, + VerticalRubberBand = 0x1, + HorizonalRubberBand = 0x2, + RectangleRubberBand = 0x3 + }; + + Q_DECLARE_FLAGS(RubberBands, RubberBand) + + explicit QChartView(QWidget *parent = 0); + explicit QChartView(QChart *chart, QWidget *parent = 0); + ~QChartView(); + + void setRubberBand(const RubberBands &rubberBands); + RubberBands rubberBand() const; + + QChart *chart() const; + void setChart(QChart *chart); + +protected: + void resizeEvent(QResizeEvent *event); + void mousePressEvent(QMouseEvent *event); + void mouseMoveEvent(QMouseEvent *event); + void mouseReleaseEvent(QMouseEvent *event); + +protected: + QScopedPointer d_ptr; + Q_DISABLE_COPY(QChartView) +}; + +QTCOMMERCIALCHART_END_NAMESPACE + +#endif // QCHARTVIEW_H diff --git a/src/scatterchart/qscatterseries.cpp b/src/scatterchart/qscatterseries.cpp index 6c1ba34..b161cda 100644 --- a/src/scatterchart/qscatterseries.cpp +++ b/src/scatterchart/qscatterseries.cpp @@ -243,14 +243,14 @@ void QScatterSeries::setMarkerSize(qreal size) //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -QScatterSeriesPrivate::QScatterSeriesPrivate(QScatterSeries* q) : - QXYSeriesPrivate(q), - m_shape(QScatterSeries::MarkerShapeCircle), - m_size(15.0) +QScatterSeriesPrivate::QScatterSeriesPrivate(QScatterSeries *q) + : QXYSeriesPrivate(q), + m_shape(QScatterSeries::MarkerShapeCircle), + m_size(15.0) { } -ChartElement* QScatterSeriesPrivate::createGraphics(ChartPresenter* presenter) +ChartElement *QScatterSeriesPrivate::createGraphics(ChartPresenter *presenter) { Q_Q(QScatterSeries); ScatterChartItem *scatter = new ScatterChartItem(q, presenter); diff --git a/src/scatterchart/qscatterseries_p.h b/src/scatterchart/qscatterseries_p.h index 2c87715..dd87682 100644 --- a/src/scatterchart/qscatterseries_p.h +++ b/src/scatterchart/qscatterseries_p.h @@ -37,8 +37,8 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE class QScatterSeriesPrivate: public QXYSeriesPrivate { public: - QScatterSeriesPrivate(QScatterSeries* q); - ChartElement* createGraphics(ChartPresenter* presenter); + QScatterSeriesPrivate(QScatterSeries *q); + ChartElement *createGraphics(ChartPresenter *presenter); private: QScatterSeries::MarkerShape m_shape; diff --git a/src/scatterchart/scatterchartitem.cpp b/src/scatterchart/scatterchartitem.cpp index 20d55f4..82d2b23 100644 --- a/src/scatterchart/scatterchartitem.cpp +++ b/src/scatterchart/scatterchartitem.cpp @@ -64,15 +64,14 @@ void ScatterChartItem::createPoints(int count) switch (m_shape) { case QScatterSeries::MarkerShapeCircle: { item = new CircleMarker(0, 0, m_size, m_size, this); - const QRectF& rect = item->boundingRect(); + const QRectF &rect = item->boundingRect(); item->setPos(-rect.width() / 2, -rect.height() / 2); break; } - case QScatterSeries::MarkerShapeRectangle: { + case QScatterSeries::MarkerShapeRectangle: item = new RectangleMarker(0, 0, m_size, m_size, this); item->setPos(-m_size / 2, -m_size / 2); break; - } default: qWarning() << "Unsupported marker type"; break; @@ -86,7 +85,7 @@ void ScatterChartItem::deletePoints(int count) QList items = m_items.childItems(); for (int i = 0; i < count; ++i) { - QGraphicsItem * item = items.takeLast(); + QGraphicsItem *item = items.takeLast(); m_markerMap.remove(item); delete(item); } @@ -117,12 +116,12 @@ void ScatterChartItem::updateGeometry() if (diff != 0) handleUpdated(); - QList items = m_items.childItems(); + QList items = m_items.childItems(); for (int i = 0; i < points.size(); i++) { - QGraphicsItem* item = items.at(i); - const QPointF& point = points.at(i); - const QRectF& rect = item->boundingRect(); + QGraphicsItem *item = items.at(i); + const QPointF &point = points.at(i); + const QRectF &rect = item->boundingRect(); m_markerMap[item] = point; item->setPos(point.x() - rect.width() / 2, point.y() - rect.height() / 2); if (!m_visible || !clipRect().contains(point)) @@ -143,13 +142,13 @@ void ScatterChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem * Q_UNUSED(widget) } -void ScatterChartItem::setPen(const QPen& pen) +void ScatterChartItem::setPen(const QPen &pen) { foreach (QGraphicsItem *item , m_items.childItems()) static_cast(item)->setPen(pen); } -void ScatterChartItem::setBrush(const QBrush& brush) +void ScatterChartItem::setBrush(const QBrush &brush) { foreach (QGraphicsItem *item , m_items.childItems()) static_cast(item)->setBrush(brush); diff --git a/src/scatterchart/scatterchartitem_p.h b/src/scatterchart/scatterchartitem_p.h index b9630f5..f127dee 100644 --- a/src/scatterchart/scatterchartitem_p.h +++ b/src/scatterchart/scatterchartitem_p.h @@ -80,11 +80,11 @@ class CircleMarker: public QGraphicsEllipseItem { public: - CircleMarker(qreal x, qreal y, qreal w, qreal h, ScatterChartItem *parent) - : QGraphicsEllipseItem(x, y, w, h, parent), - m_parent(parent) - { - } + CircleMarker(qreal x, qreal y, qreal w, qreal h, ScatterChartItem *parent) + : QGraphicsEllipseItem(x, y, w, h, parent), + m_parent(parent) + { + } protected: void mousePressEvent(QGraphicsSceneMouseEvent *event) @@ -94,7 +94,7 @@ protected: } private: - ScatterChartItem* m_parent; + ScatterChartItem *m_parent; }; class RectangleMarker: public QGraphicsRectItem @@ -115,7 +115,7 @@ protected: } private: - ScatterChartItem* m_parent; + ScatterChartItem *m_parent; }; QTCOMMERCIALCHART_END_NAMESPACE diff --git a/src/scroller.cpp b/src/scroller.cpp index c396f56..3000323 100644 --- a/src/scroller.cpp +++ b/src/scroller.cpp @@ -38,7 +38,7 @@ Scroller::~Scroller() { } -void Scroller::mousePressEvent(QGraphicsSceneMouseEvent* event) +void Scroller::mousePressEvent(QGraphicsSceneMouseEvent *event) { if (event->button() == Qt::LeftButton) { switch (m_state) { @@ -66,7 +66,7 @@ void Scroller::mousePressEvent(QGraphicsSceneMouseEvent* event) } } -void Scroller::mouseMoveEvent(QGraphicsSceneMouseEvent* event) +void Scroller::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { QPointF delta = event->pos() - m_press; @@ -96,7 +96,7 @@ void Scroller::mouseMoveEvent(QGraphicsSceneMouseEvent* event) } } -void Scroller::mouseReleaseEvent(QGraphicsSceneMouseEvent* event) +void Scroller::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { if (event->button() == Qt::LeftButton) { @@ -163,7 +163,7 @@ void Scroller::scrollTick() } } -void Scroller::lowerSpeed(QPointF& speed, qreal maxSpeed) +void Scroller::lowerSpeed(QPointF &speed, qreal maxSpeed) { qreal x = qBound(-maxSpeed, speed.x(), maxSpeed); qreal y = qBound(-maxSpeed, speed.y(), maxSpeed); @@ -176,7 +176,7 @@ void Scroller::lowerSpeed(QPointF& speed, qreal maxSpeed) speed.setY(y); } -void Scroller::calculateSpeed(const QPointF& position) +void Scroller::calculateSpeed(const QPointF &position) { if (m_timeStamp.elapsed() > m_timeTreshold) { @@ -200,7 +200,7 @@ void Scroller::calculateSpeed(const QPointF& position) ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -ScrollTicker::ScrollTicker(Scroller *scroller, QObject* parent) +ScrollTicker::ScrollTicker(Scroller *scroller, QObject *parent) : QObject(parent), m_scroller(scroller) { diff --git a/src/scroller_p.h b/src/scroller_p.h index 40f19e7..1ac9b12 100644 --- a/src/scroller_p.h +++ b/src/scroller_p.h @@ -71,20 +71,20 @@ public: Scroller(); virtual ~Scroller(); - virtual void setOffset(const QPointF& point) = 0; + virtual void setOffset(const QPointF &point) = 0; virtual QPointF offset() const = 0; public: void scrollTick(); public: - void mousePressEvent(QGraphicsSceneMouseEvent* event); - void mouseMoveEvent(QGraphicsSceneMouseEvent* event); - void mouseReleaseEvent(QGraphicsSceneMouseEvent* event); + void mousePressEvent(QGraphicsSceneMouseEvent *event); + void mouseMoveEvent(QGraphicsSceneMouseEvent *event); + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); private: - void calculateSpeed(const QPointF& position); - void lowerSpeed(QPointF& speed, qreal maxSpeed = 100); + void calculateSpeed(const QPointF &position); + void lowerSpeed(QPointF &speed, qreal maxSpeed = 100); private: ScrollTicker m_ticker; diff --git a/src/splinechart/qsplineseries.cpp b/src/splinechart/qsplineseries.cpp index 806a759..576dc02 100644 --- a/src/splinechart/qsplineseries.cpp +++ b/src/splinechart/qsplineseries.cpp @@ -125,7 +125,7 @@ QAbstractSeries::SeriesType QSplineSeries::type() const //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -QSplineSeriesPrivate::QSplineSeriesPrivate(QSplineSeries* q) +QSplineSeriesPrivate::QSplineSeriesPrivate(QSplineSeries *q) : QLineSeriesPrivate(q) { } @@ -244,7 +244,7 @@ void QSplineSeriesPrivate::updateControlPoints() } } -ChartElement* QSplineSeriesPrivate::createGraphics(ChartPresenter* presenter) +ChartElement *QSplineSeriesPrivate::createGraphics(ChartPresenter *presenter) { Q_Q(QSplineSeries); SplineChartItem *spline = new SplineChartItem(q, presenter); diff --git a/src/splinechart/qsplineseries_p.h b/src/splinechart/qsplineseries_p.h index 917f143..4cd0df0 100644 --- a/src/splinechart/qsplineseries_p.h +++ b/src/splinechart/qsplineseries_p.h @@ -39,8 +39,8 @@ class QSplineSeriesPrivate: public QLineSeriesPrivate { Q_OBJECT public: - ChartElement* createGraphics(ChartPresenter* presenter); - QSplineSeriesPrivate(QSplineSeries* q); + ChartElement *createGraphics(ChartPresenter *presenter); + QSplineSeriesPrivate(QSplineSeries *q); QPointF controlPoint(int index) const; diff --git a/src/splinechart/splinechartitem.cpp b/src/splinechart/splinechartitem.cpp index 0df1335..066693d 100644 --- a/src/splinechart/splinechartitem.cpp +++ b/src/splinechart/splinechartitem.cpp @@ -51,13 +51,13 @@ QPainterPath SplineChartItem::shape() const return m_path; } -void SplineChartItem::setAnimation(SplineAnimation* animation) +void SplineChartItem::setAnimation(SplineAnimation *animation) { m_animation = animation; XYChart::setAnimation(animation); } -ChartAnimation* SplineChartItem::animation() const +ChartAnimation *SplineChartItem::animation() const { return m_animation; } @@ -119,7 +119,7 @@ void SplineChartItem::updateGeometry() QPainterPath splinePath(points.at(0)); for (int i = 0; i < points.size() - 1; i++) { - const QPointF& point = points.at(i + 1); + const QPointF &point = points.at(i + 1); splinePath.cubicTo(controlPoints[2 * i], controlPoints[2 * i + 1], point); } diff --git a/src/splinechart/splinechartitem_p.h b/src/splinechart/splinechartitem_p.h index df58a7a..5cd5806 100644 --- a/src/splinechart/splinechartitem_p.h +++ b/src/splinechart/splinechartitem_p.h @@ -52,8 +52,8 @@ public: void setControlGeometryPoints(QVector& points); QVector controlGeometryPoints() const; - void setAnimation(SplineAnimation* animation); - ChartAnimation* animation() const; + void setAnimation(SplineAnimation *animation); + ChartAnimation *animation() const; public Q_SLOTS: void handleUpdated(); @@ -74,7 +74,7 @@ private: QPen m_pointPen; bool m_pointsVisible; QVector m_controlPoints; - SplineAnimation* m_animation; + SplineAnimation *m_animation; friend class SplineAnimation; }; diff --git a/src/xychart/qhxymodelmapper.cpp b/src/xychart/qhxymodelmapper.cpp index 8b47db6..5deb0ad 100644 --- a/src/xychart/qhxymodelmapper.cpp +++ b/src/xychart/qhxymodelmapper.cpp @@ -149,7 +149,7 @@ QHXYModelMapper::QHXYModelMapper(QObject *parent) : QXYModelMapper::setOrientation(Qt::Horizontal); } -QAbstractItemModel* QHXYModelMapper::model() const +QAbstractItemModel *QHXYModelMapper::model() const { return QXYModelMapper::model(); } @@ -162,7 +162,7 @@ void QHXYModelMapper::setModel(QAbstractItemModel *model) } } -QXYSeries* QHXYModelMapper::series() const +QXYSeries *QHXYModelMapper::series() const { return QXYModelMapper::series(); } diff --git a/src/xychart/qhxymodelmapper.h b/src/xychart/qhxymodelmapper.h index 6d5b652..9ad3bff 100644 --- a/src/xychart/qhxymodelmapper.h +++ b/src/xychart/qhxymodelmapper.h @@ -38,10 +38,10 @@ class QTCOMMERCIALCHART_EXPORT QHXYModelMapper : public QXYModelMapper public: explicit QHXYModelMapper(QObject *parent = 0); - QAbstractItemModel* model() const; + QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); - QXYSeries* series() const; + QXYSeries *series() const; void setSeries(QXYSeries *series); int xRow() const; diff --git a/src/xychart/qvxymodelmapper.cpp b/src/xychart/qvxymodelmapper.cpp index c00abea..77dfe96 100644 --- a/src/xychart/qvxymodelmapper.cpp +++ b/src/xychart/qvxymodelmapper.cpp @@ -149,7 +149,7 @@ QVXYModelMapper::QVXYModelMapper(QObject *parent) : QXYModelMapper::setOrientation(Qt::Vertical); } -QAbstractItemModel* QVXYModelMapper::model() const +QAbstractItemModel *QVXYModelMapper::model() const { return QXYModelMapper::model(); } @@ -162,7 +162,7 @@ void QVXYModelMapper::setModel(QAbstractItemModel *model) } } -QXYSeries* QVXYModelMapper::series() const +QXYSeries *QVXYModelMapper::series() const { return QXYModelMapper::series(); } diff --git a/src/xychart/qvxymodelmapper.h b/src/xychart/qvxymodelmapper.h index 649f5bc..088a8cf 100644 --- a/src/xychart/qvxymodelmapper.h +++ b/src/xychart/qvxymodelmapper.h @@ -38,10 +38,10 @@ class QTCOMMERCIALCHART_EXPORT QVXYModelMapper : public QXYModelMapper public: explicit QVXYModelMapper(QObject *parent = 0); - QAbstractItemModel* model() const; + QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); - QXYSeries* series() const; + QXYSeries *series() const; void setSeries(QXYSeries *series); int xColumn() const; diff --git a/src/xychart/qxymodelmapper.cpp b/src/xychart/qxymodelmapper.cpp index 1ad404f..3b981fb 100644 --- a/src/xychart/qxymodelmapper.cpp +++ b/src/xychart/qxymodelmapper.cpp @@ -37,7 +37,7 @@ QXYModelMapper::QXYModelMapper(QObject *parent): /*! \internal */ -QAbstractItemModel* QXYModelMapper::model() const +QAbstractItemModel *QXYModelMapper::model() const { Q_D(const QXYModelMapper); return d->m_model; @@ -69,7 +69,7 @@ void QXYModelMapper::setModel(QAbstractItemModel *model) /*! \internal */ -QXYSeries* QXYModelMapper::series() const +QXYSeries *QXYModelMapper::series() const { Q_D(const QXYModelMapper); return d->m_series; diff --git a/src/xychart/qxymodelmapper.h b/src/xychart/qxymodelmapper.h index f74c47c..9b66edf 100644 --- a/src/xychart/qxymodelmapper.h +++ b/src/xychart/qxymodelmapper.h @@ -38,10 +38,10 @@ class QTCOMMERCIALCHART_EXPORT QXYModelMapper : public QObject protected: explicit QXYModelMapper(QObject *parent = 0); - QAbstractItemModel* model() const; + QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); - QXYSeries* series() const; + QXYSeries *series() const; void setSeries(QXYSeries *series); int first() const; @@ -60,7 +60,7 @@ protected: void setYSection(int ySection); protected: - QXYModelMapperPrivate * const d_ptr; + QXYModelMapperPrivate *const d_ptr; Q_DECLARE_PRIVATE(QXYModelMapper) }; diff --git a/src/xychart/qxyseries.cpp b/src/xychart/qxyseries.cpp index 90c3a4f..bef6c87 100644 --- a/src/xychart/qxyseries.cpp +++ b/src/xychart/qxyseries.cpp @@ -390,7 +390,7 @@ bool QXYSeries::pointsVisible() const Stream operator for adding a data \a point to the series. \sa append() */ -QXYSeries& QXYSeries::operator<< (const QPointF &point) +QXYSeries &QXYSeries::operator<< (const QPointF &point) { append(point); return *this; @@ -402,7 +402,7 @@ QXYSeries& QXYSeries::operator<< (const QPointF &point) \sa append() */ -QXYSeries& QXYSeries::operator<< (const QList& points) +QXYSeries &QXYSeries::operator<< (const QList& points) { append(points); return *this; @@ -411,13 +411,13 @@ QXYSeries& QXYSeries::operator<< (const QList& points) ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -QXYSeriesPrivate::QXYSeriesPrivate(QXYSeries *q) : - QAbstractSeriesPrivate(q), - m_pointsVisible(false) +QXYSeriesPrivate::QXYSeriesPrivate(QXYSeries *q) + : QAbstractSeriesPrivate(q), + m_pointsVisible(false) { } -void QXYSeriesPrivate::scaleDomain(Domain& domain) +void QXYSeriesPrivate::scaleDomain(Domain &domain) { qreal minX(0); qreal minY(0); @@ -447,14 +447,14 @@ void QXYSeriesPrivate::scaleDomain(Domain& domain) domain.setRange(minX, maxX, minY, maxY); } -QList QXYSeriesPrivate::createLegendMarker(QLegend* legend) +QList QXYSeriesPrivate::createLegendMarker(QLegend *legend) { Q_Q(QXYSeries); - QList list; + QList list; return list << new XYLegendMarker(q, legend); } -void QXYSeriesPrivate::initializeAxis(QAbstractAxis* axis) +void QXYSeriesPrivate::initializeAxis(QAbstractAxis *axis) { Q_UNUSED(axis); } diff --git a/src/xychart/qxyseries.h b/src/xychart/qxyseries.h index deb2a46..d5b9884 100644 --- a/src/xychart/qxyseries.h +++ b/src/xychart/qxyseries.h @@ -57,8 +57,8 @@ public: int count() const; QList points() const; - QXYSeries& operator << (const QPointF &point); - QXYSeries& operator << (const QList &points); + QXYSeries &operator << (const QPointF &point); + QXYSeries &operator << (const QList &points); virtual void setPen(const QPen &pen); QPen pen() const; diff --git a/src/xychart/qxyseries_p.h b/src/xychart/qxyseries_p.h index 1947109..896d84a 100644 --- a/src/xychart/qxyseries_p.h +++ b/src/xychart/qxyseries_p.h @@ -42,12 +42,12 @@ class QXYSeriesPrivate: public QAbstractSeriesPrivate Q_OBJECT public: - QXYSeriesPrivate(QXYSeries* q); + QXYSeriesPrivate(QXYSeries *q); - void scaleDomain(Domain& domain); - QList createLegendMarker(QLegend* legend); + void scaleDomain(Domain &domain); + QList createLegendMarker(QLegend *legend); - void initializeAxis(QAbstractAxis* axis); + void initializeAxis(QAbstractAxis *axis); QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const; Q_SIGNALS: diff --git a/src/xychart/xychart.cpp b/src/xychart/xychart.cpp index 4d40228..efc8950 100644 --- a/src/xychart/xychart.cpp +++ b/src/xychart/xychart.cpp @@ -59,7 +59,7 @@ void XYChart::setClipRect(const QRectF &rect) m_clipRect = rect; } -void XYChart::setAnimation(XYAnimation* animation) +void XYChart::setAnimation(XYAnimation *animation) { m_animation = animation; } diff --git a/src/xychart/xychart_p.h b/src/xychart/xychart_p.h index 029523b..7d4b155 100644 --- a/src/xychart/xychart_p.h +++ b/src/xychart/xychart_p.h @@ -57,8 +57,8 @@ public: QSizeF size() const { return m_size; } QPointF origin() const { return m_origin; } - void setAnimation(XYAnimation* animation); - ChartAnimation* animation() const { return m_animation; } + void setAnimation(XYAnimation *animation); + ChartAnimation *animation() const { return m_animation; } virtual void updateGeometry() = 0; bool isDirty() const { return m_dirty; } @@ -73,7 +73,7 @@ public Q_SLOTS: void handleGeometryChanged(const QRectF &size); Q_SIGNALS: - void clicked(const QPointF& point); + void clicked(const QPointF &point); protected: virtual void updateChart(QVector &oldPoints, QVector &newPoints, int index = -1); @@ -90,12 +90,12 @@ protected: qreal m_maxX; qreal m_minY; qreal m_maxY; - QXYSeries* m_series; + QXYSeries *m_series; QSizeF m_size; QPointF m_origin; QRectF m_clipRect; QVector m_points; - XYAnimation* m_animation; + XYAnimation *m_animation; bool m_dirty; friend class AreaChartItem;