summaryrefslogtreecommitdiffstats
path: root/src/axis/valueaxis
diff options
context:
space:
mode:
authorJani Honkonen <jani.honkonen@digia.com>2012-09-25 15:07:59 +0300
committerJani Honkonen <jani.honkonen@digia.com>2012-09-25 15:12:41 +0300
commitf8a933676fbdcfa256f06e491b0737e37e95c6eb (patch)
tree2158c5ef940caa8c230271b2581cffcb91792ea2 /src/axis/valueaxis
parent394f63738c11558ae410383fbf2403f57fca4bf8 (diff)
more coding style fixes for src-folder
mostly putting the * or & next to the variable name
Diffstat (limited to 'src/axis/valueaxis')
-rw-r--r--src/axis/valueaxis/chartvalueaxisx.cpp18
-rw-r--r--src/axis/valueaxis/chartvalueaxisx_p.h3
-rw-r--r--src/axis/valueaxis/chartvalueaxisy.cpp16
-rw-r--r--src/axis/valueaxis/chartvalueaxisy_p.h2
-rw-r--r--src/axis/valueaxis/qvalueaxis.cpp20
-rw-r--r--src/axis/valueaxis/qvalueaxis_p.h8
6 files changed, 34 insertions, 33 deletions
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: