diff options
Diffstat (limited to 'src/axis')
31 files changed, 157 insertions, 158 deletions
diff --git a/src/axis/barcategoryaxis/chartbarcategoryaxisx.cpp b/src/axis/barcategoryaxis/chartbarcategoryaxisx.cpp index b113fd2d..bf870c7d 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<QGraphicsLineItem*>(axis.at(0)); + QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem *>(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<QGraphicsLineItem*>(lines.at(i)); + QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem *>(lines.at(i)); lineItem->setLine(layout[i], chartRect.top(), layout[i], chartRect.bottom()); - QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem*>(labels.at(i)); + QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem *>(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<QGraphicsRectItem*>(shades.at(i / 2 - 1)); + QGraphicsRectItem *rectItem = static_cast<QGraphicsRectItem *>(shades.at(i / 2 - 1)); rectItem->setRect(layout[i - 1], chartRect.top(), layout[i] - layout[i - 1], chartRect.height()); } - lineItem = static_cast<QGraphicsLineItem*>(axis.at(i + 1)); + lineItem = static_cast<QGraphicsLineItem *>(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 b58d2fe3..16da68cd 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<qreal> calculateLayout() const; void updateGeometry(); diff --git a/src/axis/barcategoryaxis/chartbarcategoryaxisy.cpp b/src/axis/barcategoryaxis/chartbarcategoryaxisy.cpp index 2f98578a..5c4e5f08 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<QGraphicsLineItem*>(axis.at(0)); + QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem *>(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<QGraphicsLineItem*>(lines.at(i)); + QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem *>(lines.at(i)); lineItem->setLine(chartRect.left() , layout[i], chartRect.right(), layout[i]); - QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem*>(labels.at(i)); + QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem *>(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<QGraphicsRectItem*>(shades.at(i / 2 - 1)); + QGraphicsRectItem *rectItem = static_cast<QGraphicsRectItem *>(shades.at(i / 2 - 1)); rectItem->setRect(chartRect.left(), layout[i], chartRect.width(), layout[i - 1] - layout[i]); } - lineItem = static_cast<QGraphicsLineItem*>(axis.at(i + 1)); + lineItem = static_cast<QGraphicsLineItem *>(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 3efe505a..feb9afaa 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<qreal> calculateLayout() const; void updateGeometry(); diff --git a/src/axis/barcategoryaxis/qbarcategoryaxis.cpp b/src/axis/barcategoryaxis/qbarcategoryaxis.cpp index 172f926c..9da39b8c 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<Domain*>(sender()); + Domain *domain = qobject_cast<Domain *>(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 9134dae3..26dc3fd3 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 cb1357b4..5338919a 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 b5171711..cb575662 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<QGraphicsLineItem*>(axis.at(0)); + QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem *>(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<QGraphicsSimpleTextItem*>(labels.at(i)); + QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem *>(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<QGraphicsRectItem*>(shades.at(i / 2 - 1)); + QGraphicsRectItem *rectItem = static_cast<QGraphicsRectItem *>(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<QGraphicsLineItem*>(lines.at(i)); + QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem *>(lines.at(i)); lineItem->setPos(layout[i], chartRect.top()); lineItem->setLine(0, 0, 0, chartRect.height()); - QGraphicsLineItem *tickLineItem = static_cast<QGraphicsLineItem*>(axis.at(i + 1)); + QGraphicsLineItem *tickLineItem = static_cast<QGraphicsLineItem *>(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 9cc76188..5a3009b8 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<qreal> calculateLayout() const; void updateGeometry(); diff --git a/src/axis/categoryaxis/chartcategoryaxisy.cpp b/src/axis/categoryaxis/chartcategoryaxisy.cpp index d05a9054..7cd05c58 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<QGraphicsLineItem*>(axis.at(0)); + QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem *>(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<QGraphicsSimpleTextItem*>(labels.at(i)); + QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem *>(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<QGraphicsRectItem*>(shades.at(i / 2 - 1)); + QGraphicsRectItem *rectItem = static_cast<QGraphicsRectItem *>(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<QGraphicsLineItem*>(lines.at(i)); + QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem *>(lines.at(i)); lineItem->setPos(chartRect.left(), layout[i]); lineItem->setLine(0, 0, chartRect.width(), 0); - QGraphicsLineItem *tickLineItem = static_cast<QGraphicsLineItem*>(axis.at(i + 1)); + QGraphicsLineItem *tickLineItem = static_cast<QGraphicsLineItem *>(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 f63dd080..ebc358e8 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<qreal> calculateLayout() const; void updateGeometry(); diff --git a/src/axis/categoryaxis/qcategoryaxis.cpp b/src/axis/categoryaxis/qcategoryaxis.cpp index 572d6a06..8e783149 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 259a0e07..13d52f12 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 f6fb787a..02db3cef 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 85dafc51..d8be13c3 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<Domain*>(sender()); + Domain *domain = qobject_cast<Domain *>(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 69ad826a..4fdf92d1 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<qreal> &layout); QVector<qreal> 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<QGraphicsItemGroup> m_shades; QScopedPointer<QGraphicsItemGroup> m_labels; QScopedPointer<QGraphicsItemGroup> m_arrow; - QGraphicsSimpleTextItem* m_title; + QGraphicsSimpleTextItem *m_title; QVector<qreal> 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 3f2f649b..e107b205 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<QGraphicsLineItem*>(axis.at(0)); + QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem *>(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<QGraphicsLineItem*>(lines.at(i)); + QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem *>(lines.at(i)); lineItem->setLine(layout[i], chartRect.top(), layout[i], chartRect.bottom()); - QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem*>(labels.at(i)); + QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem *>(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<QGraphicsRectItem*>(shades.at(i / 2 - 1)); + QGraphicsRectItem *rectItem = static_cast<QGraphicsRectItem *>(shades.at(i / 2 - 1)); rectItem->setRect(layout[i - 1], chartRect.top(), layout[i] - layout[i - 1], chartRect.height()); } - lineItem = static_cast<QGraphicsLineItem*>(axis.at(i + 1)); + lineItem = static_cast<QGraphicsLineItem *>(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<QDateTimeAxis*>(m_chartAxis); + QDateTimeAxis *axis = qobject_cast<QDateTimeAxis *>(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 6afa9fe7..c56e3094 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 8164b8d9..820b68c0 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<QGraphicsLineItem*>(axis.at(0)); + QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem *>(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<QGraphicsLineItem*>(lines.at(i)); + QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem *>(lines.at(i)); lineItem->setLine(chartRect.left() , layout[i], chartRect.right(), layout[i]); - QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem*>(labels.at(i)); + QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem *>(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<QGraphicsRectItem*>(shades.at(i / 2 - 1)); + QGraphicsRectItem *rectItem = static_cast<QGraphicsRectItem *>(shades.at(i / 2 - 1)); rectItem->setRect(chartRect.left(), layout[i], chartRect.width(), layout[i - 1] - layout[i]); } - lineItem = static_cast<QGraphicsLineItem*>(axis.at(i + 1)); + lineItem = static_cast<QGraphicsLineItem *>(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<QDateTimeAxis*>(m_chartAxis); + QDateTimeAxis *axis = qobject_cast<QDateTimeAxis *>(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 ea61247b..e33fb5a0 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<qreal> calculateLayout() const; diff --git a/src/axis/datetimeaxis/qdatetimeaxis.cpp b/src/axis/datetimeaxis/qdatetimeaxis.cpp index 754a241d..e59a7040 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<Domain*>(sender()); + Domain *domain = qobject_cast<Domain *>(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 a8d52985..22a5504d 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 98cf9e45..3a5ec547 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 24b8894a..8864da5f 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 7935c122..0d6f23af 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 a4f4cb44..00820b2e 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<QGraphicsLineItem*>(axis.at(0)); + QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem *>(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<QGraphicsLineItem*>(lines.at(i)); + QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem *>(lines.at(i)); lineItem->setLine(layout[i], chartRrect.top(), layout[i], chartRrect.bottom()); - QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem*>(labels.at(i)); + QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem *>(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<QGraphicsRectItem*>(shades.at(i / 2 - 1)); + QGraphicsRectItem *rectItem = static_cast<QGraphicsRectItem *>(shades.at(i / 2 - 1)); rectItem->setRect(layout[i - 1], chartRrect.top(), layout[i] - layout[i - 1], chartRrect.height()); } - lineItem = static_cast<QGraphicsLineItem*>(axis.at(i + 1)); + lineItem = static_cast<QGraphicsLineItem *>(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<QValueAxis*>(m_chartAxis); + QValueAxis *axis = qobject_cast<QValueAxis *>(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 da48637c..4bd70dea 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<qreal> calculateLayout() const; diff --git a/src/axis/valueaxis/chartvalueaxisy.cpp b/src/axis/valueaxis/chartvalueaxisy.cpp index 04e2e3f5..51d4f439 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<QGraphicsLineItem*>(axis.at(0)); + QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem *>(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<QGraphicsLineItem*>(lines.at(i)); + QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem *>(lines.at(i)); lineItem->setLine(chartRect.left(), layout[i], chartRect.right(), layout[i]); - QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem*>(labels.at(i)); + QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem *>(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<QGraphicsRectItem*>(shades.at(i / 2 - 1)); + QGraphicsRectItem *rectItem = static_cast<QGraphicsRectItem *>(shades.at(i / 2 - 1)); rectItem->setRect(chartRect.left(), layout[i], chartRect.width(), layout[i - 1] - layout[i]); } - lineItem = static_cast<QGraphicsLineItem*>(axis.at(i + 1)); + lineItem = static_cast<QGraphicsLineItem *>(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<QValueAxis*>(m_chartAxis); + QValueAxis *axis = qobject_cast<QValueAxis *>(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 1c099f74..84aea8fe 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<qreal> calculateLayout() const; void updateGeometry(); diff --git a/src/axis/valueaxis/qvalueaxis.cpp b/src/axis/valueaxis/qvalueaxis.cpp index 5435a70c..4a938a2f 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<Domain*>(sender()); + Domain *domain = qobject_cast<Domain *>(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 58a0d4c1..3edabacc 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: |