src folder: another massive victory for coding style police

34 files changed, 1094 insertions, 1099 deletions

diff --git a/src/animations/axisanimation.cpp b/src/animations/axisanimation.cpp
index 6bc49e7e..b36a4f6e 100644
--- a/src/animations/axisanimation.cpp
+++ b/src/animations/axisanimation.cpp
@@ -61,48 +61,48 @@ void AxisAnimation::setValues(QVector<qreal> &oldLayout, QVector<qreal> &newLayo
     if (state() != QAbstractAnimation::Stopped) stop();
 
     if (newLayout.count() == 0)
-    return;
+        return;
 
     switch (m_type) {
-        case ZoomOutAnimation: {
-            QRectF rect = m_axis->gridGeometry();
-            oldLayout.resize(newLayout.count());
-
-            for(int i = 0, j = oldLayout.count() - 1; i < (oldLayout.count() + 1) / 2; ++i, --j) {
-                oldLayout[i] = m_axis->orientation() == Qt::Horizontal ? rect.left() : rect.bottom();
-                oldLayout[j] = m_axis->orientation() == Qt::Horizontal ? rect.right() : rect.top();
-            }
-        }
-        break;
-        case ZoomInAnimation: {
-            int index = qMin(oldLayout.count() * (m_axis->orientation() == Qt::Horizontal ? m_point.x() : (1 - m_point.y())), newLayout.count() - (qreal)1.0);
-            oldLayout.resize(newLayout.count());
+    case ZoomOutAnimation: {
+        QRectF rect = m_axis->gridGeometry();
+        oldLayout.resize(newLayout.count());
 
-            for(int i = 0; i < oldLayout.count(); i++)
-            oldLayout[i]= oldLayout[index];
+        for (int i = 0, j = oldLayout.count() - 1; i < (oldLayout.count() + 1) / 2; ++i, --j) {
+            oldLayout[i] = m_axis->orientation() == Qt::Horizontal ? rect.left() : rect.bottom();
+            oldLayout[j] = m_axis->orientation() == Qt::Horizontal ? rect.right() : rect.top();
         }
-        break;
-        case MoveForwardAnimation: {
-            oldLayout.resize(newLayout.count());
+    }
+    break;
+    case ZoomInAnimation: {
+        int index = qMin(oldLayout.count() * (m_axis->orientation() == Qt::Horizontal ? m_point.x() : (1 - m_point.y())), newLayout.count() - (qreal)1.0);
+        oldLayout.resize(newLayout.count());
 
-            for(int i = 0, j = i + 1; i < oldLayout.count() - 1; ++i, ++j)
-            oldLayout[i]= oldLayout[j];
-        }
-        break;
-        case MoveBackwordAnimation: {
-            oldLayout.resize(newLayout.count());
+        for (int i = 0; i < oldLayout.count(); i++)
+            oldLayout[i] = oldLayout[index];
+    }
+    break;
+    case MoveForwardAnimation: {
+        oldLayout.resize(newLayout.count());
 
-            for(int i = oldLayout.count() - 1, j = i - 1; i > 0; --i, --j)
-            oldLayout[i]= oldLayout[j];
-        }
-        break;
-        default: {
-            oldLayout.resize(newLayout.count());
-            QRectF rect = m_axis->gridGeometry();
-            for(int i = 0, j = oldLayout.count() - 1; i < oldLayout.count(); ++i, --j)
+        for (int i = 0, j = i + 1; i < oldLayout.count() - 1; ++i, ++j)
+            oldLayout[i] = oldLayout[j];
+    }
+    break;
+    case MoveBackwordAnimation: {
+        oldLayout.resize(newLayout.count());
+
+        for (int i = oldLayout.count() - 1, j = i - 1; i > 0; --i, --j)
+            oldLayout[i] = oldLayout[j];
+    }
+    break;
+    default: {
+        oldLayout.resize(newLayout.count());
+        QRectF rect = m_axis->gridGeometry();
+        for (int i = 0, j = oldLayout.count() - 1; i < oldLayout.count(); ++i, --j)
             oldLayout[i] = m_axis->orientation() == Qt::Horizontal ? rect.left() : rect.top();
-        }
-        break;
+    }
+    break;
     }
 
     QVariantAnimation::KeyValues value;
diff --git a/src/animations/splineanimation.cpp b/src/animations/splineanimation.cpp
index fa62c16e..9ef0d988 100644
--- a/src/animations/splineanimation.cpp
+++ b/src/animations/splineanimation.cpp
@@ -128,37 +128,37 @@ QVariant SplineAnimation::interpolated(const QVariant &start, const QVariant &en
     case RemovePointAnimation:
     case AddPointAnimation:
     case ReplacePointAnimation: {
-            if (startPair.first.count() != endPair.first.count())
-                break;
-            Q_ASSERT(startPair.first.count() * 2 - 2 == startPair.second.count());
-            Q_ASSERT(endPair.first.count() * 2 - 2 == endPair.second.count());
-            for (int i = 0; i < endPair.first.count(); i++) {
-                qreal x = startPair.first[i].x() + ((endPair.first[i].x() - startPair.first[i].x()) * progress);
-                qreal y = startPair.first[i].y() + ((endPair.first[i].y() - startPair.first[i].y()) * progress);
-                result.first << QPointF(x, y);
-                if (i + 1 >= endPair.first.count())
-                    continue;
-                x = startPair.second[i * 2].x() + ((endPair.second[i * 2].x() - startPair.second[i * 2].x()) * progress);
-                y = startPair.second[i * 2].y() + ((endPair.second[i * 2].y() - startPair.second[i * 2].y()) * progress);
-                result.second << QPointF(x, y);
-                x = startPair.second[i * 2 + 1].x() + ((endPair.second[i * 2 + 1].x() - startPair.second[i * 2 + 1].x()) * progress);
-                y = startPair.second[i * 2 + 1].y() + ((endPair.second[i * 2 + 1].y() - startPair.second[i * 2 + 1].y()) * progress);
-                result.second << QPointF(x, y);
-            }
+        if (startPair.first.count() != endPair.first.count())
+            break;
+        Q_ASSERT(startPair.first.count() * 2 - 2 == startPair.second.count());
+        Q_ASSERT(endPair.first.count() * 2 - 2 == endPair.second.count());
+        for (int i = 0; i < endPair.first.count(); i++) {
+            qreal x = startPair.first[i].x() + ((endPair.first[i].x() - startPair.first[i].x()) * progress);
+            qreal y = startPair.first[i].y() + ((endPair.first[i].y() - startPair.first[i].y()) * progress);
+            result.first << QPointF(x, y);
+            if (i + 1 >= endPair.first.count())
+                continue;
+            x = startPair.second[i * 2].x() + ((endPair.second[i * 2].x() - startPair.second[i * 2].x()) * progress);
+            y = startPair.second[i * 2].y() + ((endPair.second[i * 2].y() - startPair.second[i * 2].y()) * progress);
+            result.second << QPointF(x, y);
+            x = startPair.second[i * 2 + 1].x() + ((endPair.second[i * 2 + 1].x() - startPair.second[i * 2 + 1].x()) * progress);
+            y = startPair.second[i * 2 + 1].y() + ((endPair.second[i * 2 + 1].y() - startPair.second[i * 2 + 1].y()) * progress);
+            result.second << QPointF(x, y);
         }
-        break;
+    }
+    break;
     case NewAnimation: {
-            Q_ASSERT(endPair.first.count() * 2 - 2 == endPair.second.count());
-            int count = endPair.first.count() * qBound(qreal(0), progress, qreal(1));
-            for (int i = 0; i < count; i++) {
-                result.first << endPair.first[i];
-                if (i + 1 == count)
-                    break;
-                result.second << endPair.second[2 * i];
-                result.second << endPair.second[2 * i + 1];
-            }
+        Q_ASSERT(endPair.first.count() * 2 - 2 == endPair.second.count());
+        int count = endPair.first.count() * qBound(qreal(0), progress, qreal(1));
+        for (int i = 0; i < count; i++) {
+            result.first << endPair.first[i];
+            if (i + 1 == count)
+                break;
+            result.second << endPair.second[2 * i];
+            result.second << endPair.second[2 * i + 1];
         }
-        break;
+    }
+    break;
     default:
         qWarning() << "Unknown type of animation";
         break;
diff --git a/src/axis/barcategoryaxis/chartbarcategoryaxisx.cpp b/src/axis/barcategoryaxis/chartbarcategoryaxisx.cpp
index 0591618e..1201ed6b 100644
--- a/src/axis/barcategoryaxis/chartbarcategoryaxisx.cpp
+++ b/src/axis/barcategoryaxis/chartbarcategoryaxisx.cpp
@@ -27,8 +27,9 @@
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
-ChartBarCategoryAxisX::ChartBarCategoryAxisX(QBarCategoryAxis *axis,ChartPresenter *presenter) : HorizontalAxis(axis,presenter,true),
-m_categoriesAxis(axis)
+ChartBarCategoryAxisX::ChartBarCategoryAxisX(QBarCategoryAxis *axis, ChartPresenter *presenter)
+    : HorizontalAxis(axis, presenter, true),
+      m_categoriesAxis(axis)
 {
 
 }
@@ -41,28 +42,27 @@ QVector<qreal> ChartBarCategoryAxisX::calculateLayout() const
 {
     int count = m_categoriesAxis->d_ptr->count();
 
-    Q_ASSERT(count>=1);
+    Q_ASSERT(count >= 1);
 
     QVector<qreal> points;
-    points.resize(count+2);
+    points.resize(count + 2);
 
-    const QRectF& gridRect = gridGeometry();
+    const QRectF &gridRect = gridGeometry();
 
-    const qreal delta = gridRect.width()/(count);
-    qreal offset =-min()-0.5;
+    const qreal delta = gridRect.width() / (count);
+    qreal offset = -min() - 0.5;
 
-    if(delta<1) return points;
+    if (delta < 1)
+        return points;
 
-    if(offset<0) {
-        offset = int(offset * gridRect.width()/(max() - min()))%int(delta) + delta;
-    }
-    else {
-        offset = int(offset * gridRect.width()/(max() - min()))%int(delta);
-    }
+    if (offset < 0)
+        offset = int(offset * gridRect.width() / (max() - min())) % int(delta) + delta;
+    else
+        offset = int(offset * gridRect.width() / (max() - min())) % int(delta);
 
-    for (int i = -1; i < count+1; ++i) {
+    for (int i = -1; i < count + 1; ++i) {
         qreal x = offset + i * delta + gridRect.left();
-        points[i+1] = x;
+        points[i + 1] = x;
     }
     return points;
 }
@@ -70,15 +70,14 @@ QVector<qreal> ChartBarCategoryAxisX::calculateLayout() const
 QStringList ChartBarCategoryAxisX::createCategoryLabels(const QVector<qreal>& layout) const
 {
     QStringList result ;
-    const QRectF& gridRect = gridGeometry();
+    const QRectF &gridRect = gridGeometry();
 
-    qreal d = (max() - min())/gridRect.width();
-    for (int i = 0;i < layout.count()-1; ++i) {
-        qreal x = qFloor((((layout[i] + layout[i+1])/2-gridRect.left())*d + min()+0.5));
+    qreal d = (max() - min()) / gridRect.width();
+    for (int i = 0; i < layout.count() - 1; ++i) {
+        qreal x = qFloor((((layout[i] + layout[i + 1]) / 2 - gridRect.left()) * d + min() + 0.5));
         if ((x < m_categoriesAxis->categories().count()) && (x >= 0)) {
             result << m_categoriesAxis->categories().at(x);
-        }
-        else {
+        } else {
             // No label for x coordinate
             result << "";
         }
@@ -91,22 +90,23 @@ QStringList ChartBarCategoryAxisX::createCategoryLabels(const QVector<qreal>& la
 void ChartBarCategoryAxisX::updateGeometry()
 {
     const QVector<qreal>& layout = ChartAxis::layout();
-    if(layout.isEmpty()) return;
+    if (layout.isEmpty())
+        return;
     setLabels(createCategoryLabels(layout));
     HorizontalAxis::updateGeometry();
 }
 
 void ChartBarCategoryAxisX::handleAxisUpdated()
 {
-    if(m_categoriesAxis->categories()!=m_categories)
-    {
-        m_categories=m_categoriesAxis->categories();
-        if(ChartAxis::layout().count()==m_categoriesAxis->d_ptr->count()+2) updateGeometry();
+    if (m_categoriesAxis->categories() != m_categories) {
+        m_categories = m_categoriesAxis->categories();
+        if (ChartAxis::layout().count() == m_categoriesAxis->d_ptr->count() + 2)
+            updateGeometry();
     }
     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)
 
@@ -114,35 +114,34 @@ QSizeF ChartBarCategoryAxisX::sizeHint(Qt::SizeHint which, const QSizeF& constra
     QSizeF sh;
     QSizeF base = ChartAxis::sizeHint(which, constraint);
     QStringList ticksList = createCategoryLabels(ChartAxis::layout());
-    qreal width=0;
-    qreal height=0;
-
-      switch (which) {
-        case Qt::MinimumSize:
-            width = fn.boundingRect("...").width();
-            height = fn.height()+labelPadding();
-            width=qMax(width,base.width());
-            height+=base.height();
-            sh = QSizeF(width,height);
-            break;
-        case Qt::PreferredSize:{
-
-            for (int i = 0; i < ticksList.size(); ++i)
-            {
-                QRectF rect = fn.boundingRect(ticksList.at(i));
-                width+=rect.width();
-                height=qMax(rect.height()+labelPadding(),height);
-            }
-            width=qMax(width,base.width());
-            height+=base.height();
-            sh = QSizeF(width,height);
-            break;
+    qreal width = 0;
+    qreal height = 0;
+
+    switch (which) {
+    case Qt::MinimumSize:
+        width = fn.boundingRect("...").width();
+        height = fn.height() + labelPadding();
+        width = qMax(width, base.width());
+        height += base.height();
+        sh = QSizeF(width, height);
+        break;
+    case Qt::PreferredSize: {
+
+        for (int i = 0; i < ticksList.size(); ++i) {
+            QRectF rect = fn.boundingRect(ticksList.at(i));
+            width += rect.width();
+            height = qMax(rect.height() + labelPadding(), height);
         }
-        default:
-          break;
-      }
+        width = qMax(width, base.width());
+        height += base.height();
+        sh = QSizeF(width, height);
+        break;
+    }
+    default:
+        break;
+    }
 
-      return sh;
+    return sh;
 }
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/axis/barcategoryaxis/chartbarcategoryaxisy.cpp b/src/axis/barcategoryaxis/chartbarcategoryaxisy.cpp
index 8637b4ed..f7f07c64 100644
--- a/src/axis/barcategoryaxis/chartbarcategoryaxisy.cpp
+++ b/src/axis/barcategoryaxis/chartbarcategoryaxisy.cpp
@@ -26,8 +26,9 @@
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
-ChartBarCategoryAxisY::ChartBarCategoryAxisY(QBarCategoryAxis *axis,ChartPresenter *presenter) : VerticalAxis(axis,presenter,true),
-m_categoriesAxis(axis)
+ChartBarCategoryAxisY::ChartBarCategoryAxisY(QBarCategoryAxis *axis, ChartPresenter *presenter)
+    : VerticalAxis(axis, presenter, true),
+      m_categoriesAxis(axis)
 {
 }
 
@@ -39,28 +40,27 @@ QVector<qreal> ChartBarCategoryAxisY::calculateLayout() const
 {
     int count = m_categoriesAxis->d_ptr->count();
 
-    Q_ASSERT(count>=1);
+    Q_ASSERT(count >= 1);
 
     QVector<qreal> points;
-    points.resize(count+2);
+    points.resize(count + 2);
 
-    const QRectF& gridRect = gridGeometry();
+    const QRectF &gridRect = gridGeometry();
 
-    const qreal delta = gridRect.height()/(count);
+    const qreal delta = gridRect.height() / (count);
     qreal offset = - min() - 0.5;
 
-    if(delta<1) return points;
+    if (delta < 1)
+        return points;
 
-    if(offset<0) {
-        offset = int(offset * gridRect.height()/(max() - min()))%int(delta) + delta;
-    }
-    else {
-        offset = int(offset * gridRect.height()/(max() - min()))%int(delta);
-    }
+    if (offset < 0)
+        offset = int(offset * gridRect.height() / (max() - min())) % int(delta) + delta;
+    else
+        offset = int(offset * gridRect.height() / (max() - min())) % int(delta);
 
-    for (int i = -1; i < count +1; ++i) {
+    for (int i = -1; i < count + 1; ++i) {
         int y = gridRect.bottom() - i * delta - offset;
-        points[i+1] = y;
+        points[i + 1] = y;
     }
     return points;
 }
@@ -68,14 +68,13 @@ QVector<qreal> ChartBarCategoryAxisY::calculateLayout() const
 QStringList ChartBarCategoryAxisY::createCategoryLabels(const QVector<qreal>& layout) const
 {
     QStringList result;
-    const QRectF& gridRect = gridGeometry();
-    qreal d = (max() - min())/gridRect.height();
-    for (int i = 0;i < layout.count()-1; ++i) {
-        qreal x = qFloor(((gridRect.height()- (layout[i+1] + layout[i])/2 + gridRect.top())*d + min()+0.5));
+    const QRectF &gridRect = gridGeometry();
+    qreal d = (max() - min()) / gridRect.height();
+    for (int i = 0; i < layout.count() - 1; ++i) {
+        qreal x = qFloor(((gridRect.height() - (layout[i + 1] + layout[i]) / 2 + gridRect.top()) * d + min() + 0.5));
         if ((x < m_categoriesAxis->categories().count()) && (x >= 0)) {
             result << m_categoriesAxis->categories().at(x);
-        }
-        else {
+        } else {
             // No label for x coordinate
             result << "";
         }
@@ -87,7 +86,8 @@ QStringList ChartBarCategoryAxisY::createCategoryLabels(const QVector<qreal>& la
 void ChartBarCategoryAxisY::updateGeometry()
 {
     const QVector<qreal>& layout = ChartAxis::layout();
-    if(layout.isEmpty()) return;
+    if (layout.isEmpty())
+        return;
     setLabels(createCategoryLabels(layout));
     VerticalAxis::updateGeometry();
 }
@@ -95,17 +95,15 @@ void ChartBarCategoryAxisY::updateGeometry()
 void ChartBarCategoryAxisY::handleAxisUpdated()
 {
 
-    if(m_categoriesAxis->categories()!=m_categories)
-    {
-        m_categories=m_categoriesAxis->categories();
-        if(ChartAxis::layout().count()==m_categoriesAxis->d_ptr->count()+2) {
+    if (m_categoriesAxis->categories() != m_categories) {
+        m_categories = m_categoriesAxis->categories();
+        if (ChartAxis::layout().count() == m_categoriesAxis->d_ptr->count() + 2)
             updateGeometry();
-        }
     }
     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)
 
@@ -113,35 +111,34 @@ QSizeF ChartBarCategoryAxisY::sizeHint(Qt::SizeHint which, const QSizeF& constra
     QSizeF sh;
     QSizeF base = ChartAxis::sizeHint(which, constraint);
     QStringList ticksList = createCategoryLabels(ChartAxis::layout());
-    qreal width=0;
-    qreal height=0;
-
-      switch (which) {
-        case Qt::MinimumSize:
-            width = fn.boundingRect("...").width() + labelPadding();
-            height = fn.height();
-            width+=base.width();
-            height=qMax(height,base.height());
-            sh = QSizeF(width,height);
-            break;
-        case Qt::PreferredSize:{
-
-            for (int i = 0; i < ticksList.size(); ++i)
-            {
-                QRectF rect = fn.boundingRect(ticksList.at(i));
-                height+=rect.height();
-                width=qMax(rect.width()+labelPadding(),width);
-            }
-            height=qMax(height,base.height());
-            width+=base.width();
-            sh = QSizeF(width,height);
-            break;
+    qreal width = 0;
+    qreal height = 0;
+
+    switch (which) {
+    case Qt::MinimumSize:
+        width = fn.boundingRect("...").width() + labelPadding();
+        height = fn.height();
+        width += base.width();
+        height = qMax(height, base.height());
+        sh = QSizeF(width, height);
+        break;
+    case Qt::PreferredSize: {
+
+        for (int i = 0; i < ticksList.size(); ++i) {
+            QRectF rect = fn.boundingRect(ticksList.at(i));
+            height += rect.height();
+            width = qMax(rect.width() + labelPadding(), width);
         }
-        default:
-          break;
-      }
+        height = qMax(height, base.height());
+        width += base.width();
+        sh = QSizeF(width, height);
+        break;
+    }
+    default:
+        break;
+    }
 
-      return sh;
+    return sh;
 }
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/axis/barcategoryaxis/qbarcategoryaxis.cpp b/src/axis/barcategoryaxis/qbarcategoryaxis.cpp
index 5bb305ae..c47c366f 100644
--- a/src/axis/barcategoryaxis/qbarcategoryaxis.cpp
+++ b/src/axis/barcategoryaxis/qbarcategoryaxis.cpp
@@ -163,26 +163,25 @@ QBarCategoryAxis::QBarCategoryAxis(QBarCategoryAxisPrivate &d, QObject *parent)
 void QBarCategoryAxis::append(const QStringList &categories)
 {
     if (categories.isEmpty())
-    return;
+        return;
 
     Q_D(QBarCategoryAxis);
 
     int count = d->m_categories.count();
 
-    foreach(QString category, categories)
-    {
-        if(!d->m_categories.contains(category) && !category.isNull()) {
+    foreach(QString category, categories) {
+        if (!d->m_categories.contains(category) && !category.isNull()) {
             d->m_categories.append(category);
         }
     }
 
-    if(d->m_categories.count() == count) return;
+    if (d->m_categories.count() == count)
+        return;
 
-    if (count == 0) {
+    if (count == 0)
         setRange(d->m_categories.first(), d->m_categories.last());
-    } else {
+    else
         setRange(d->m_minCategory, d->m_categories.last());
-    }
 
     emit categoriesChanged();
 }
@@ -198,17 +197,16 @@ void QBarCategoryAxis::append(const QString &category)
 
     int count = d->m_categories.count();
 
-    if(!d->m_categories.contains(category) && !category.isNull()){
+    if (!d->m_categories.contains(category) && !category.isNull())
         d->m_categories.append(category);
-    }
 
-    if(d->m_categories.count() == count) return;
+    if (d->m_categories.count() == count)
+        return;
 
-    if (count == 0) {
+    if (count == 0)
         setRange(d->m_categories.last(), d->m_categories.last());
-    } else {
+    else
         setRange(d->m_minCategory, d->m_categories.last());
-    }
 
     emit categoriesChanged();
 }
@@ -223,17 +221,18 @@ void QBarCategoryAxis::remove(const QString &category)
 
     if (d->m_categories.contains(category)) {
         d->m_categories.removeAt(d->m_categories.indexOf(category));
-        if (!d->m_categories.isEmpty()){
-            if(d->m_minCategory == category){
+        if (!d->m_categories.isEmpty()) {
+            if (d->m_minCategory == category) {
                 setRange(d->m_categories.first(), d->m_maxCategory);
-            } else if(d->m_maxCategory == category){
+            } else if (d->m_maxCategory == category) {
                 setRange(d->m_minCategory, d->m_categories.last());
             } else {
                 d->updateCategoryDomain();
                 d->emitUpdated();
             }
-        }else
+        } else {
             setRange(QString::null, QString::null);
+        }
         emit categoriesChanged();
     }
 }
@@ -248,17 +247,17 @@ void QBarCategoryAxis::insert(int index, const QString &category)
 
     int count = d->m_categories.count();
 
-    if(!d->m_categories.contains(category) && !category.isNull()){
+    if (!d->m_categories.contains(category) && !category.isNull())
         d->m_categories.insert(index, category);
-    }
 
-    if(d->m_categories.count() == count) return;
+    if (d->m_categories.count() == count)
+        return;
 
     if (count == 0) {
         setRange(d->m_categories.first(), d->m_categories.first());
     } else if (index == 0) {
         setRange(d->m_categories.first(), d->m_maxCategory);
-    } else if (index == count){
+    } else if (index == count) {
         setRange(d->m_minCategory, d->m_categories.last());
     } else {
         d->updateCategoryDomain();
@@ -281,9 +280,9 @@ void QBarCategoryAxis::replace(const QString &oldCategory, const QString &newCat
 
     if (pos != -1 && !d->m_categories.contains(newCategory) && !newCategory.isNull()) {
         d->m_categories.replace(pos, newCategory);
-        if(d->m_minCategory == oldCategory) {
+        if (d->m_minCategory == oldCategory) {
             setRange(newCategory, d->m_maxCategory);
-        } else if(d->m_maxCategory == oldCategory) {
+        } else if (d->m_maxCategory == oldCategory) {
             setRange(d->m_minCategory, newCategory);
         } else {
             d->emitUpdated();
@@ -299,7 +298,7 @@ void QBarCategoryAxis::clear()
 {
     Q_D(QBarCategoryAxis);
     d->m_categories.clear();
-        setRange(QString::null, QString::null);
+    setRange(QString::null, QString::null);
     emit categoriesChanged();
 }
 
@@ -404,9 +403,9 @@ void QBarCategoryAxis::setRange(const QString &minCategory, const QString &maxCa
         d->emitUpdated();
     }
 
-    if (d->m_categories.indexOf(maxCategory) < d->m_categories.indexOf(minCategory)){
+    if (d->m_categories.indexOf(maxCategory) < d->m_categories.indexOf(minCategory))
         return;
-    }
+
     if (!minCategory.isEmpty() && d->m_minCategory != minCategory && d->m_categories.contains(minCategory)) {
         d->m_minCategory = minCategory;
         d->m_min = d->m_categories.indexOf(d->m_minCategory) - 0.5;
diff --git a/src/axis/categoryaxis/chartcategoryaxisx.cpp b/src/axis/categoryaxis/chartcategoryaxisx.cpp
index a2d426ec..f3629fcc 100644
--- a/src/axis/categoryaxis/chartcategoryaxisx.cpp
+++ b/src/axis/categoryaxis/chartcategoryaxisx.cpp
@@ -28,8 +28,9 @@
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
-ChartCategoryAxisX::ChartCategoryAxisX(QCategoryAxis *axis,ChartPresenter *presenter) : HorizontalAxis(axis,presenter,true),
-    m_axis(axis)
+ChartCategoryAxisX::ChartCategoryAxisX(QCategoryAxis *axis, ChartPresenter *presenter)
+    : HorizontalAxis(axis, presenter, true),
+      m_axis(axis)
 {
 }
 
@@ -45,12 +46,12 @@ QVector<qreal> ChartCategoryAxisX::calculateLayout() const
     if (tickCount < 2)
         return points;
 
-    const QRectF& gridRect = gridGeometry();
+    const QRectF &gridRect = gridGeometry();
     qreal range = m_axis->max() - m_axis->min();
     if (range > 0) {
         points.resize(tickCount);
         qreal scale = gridRect.width() / range;
-        for (int i = 0; i < tickCount; ++i)
+        for (int i = 0; i < tickCount; ++i) {
             if (i < tickCount - 1) {
                 int x = (m_axis->startValue(m_axis->categoriesLabels().at(i)) - m_axis->min()) * scale + gridRect.left();
                 points[i] = x;
@@ -58,6 +59,7 @@ QVector<qreal> ChartCategoryAxisX::calculateLayout() const
                 int x = (m_axis->endValue(m_axis->categoriesLabels().at(i - 1)) - m_axis->min())  * scale + gridRect.left();
                 points[i] = x;
             }
+        }
     }
 
     return points;
@@ -65,7 +67,7 @@ QVector<qreal> ChartCategoryAxisX::calculateLayout() const
 
 void ChartCategoryAxisX::updateGeometry()
 {
-    setLabels(m_axis->categoriesLabels()<<"");
+    setLabels(m_axis->categoriesLabels() << "");
     HorizontalAxis::updateGeometry();
 }
 
@@ -75,7 +77,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)
 
@@ -83,31 +85,30 @@ QSizeF ChartCategoryAxisX::sizeHint(Qt::SizeHint which, const QSizeF& constraint
     QSizeF sh;
     QSizeF base = ChartAxis::sizeHint(which, constraint);
     QStringList ticksList ; //TODO:
-    qreal width=0;
-    qreal height=0;
+    qreal width = 0;
+    qreal height = 0;
 
     switch (which) {
-        case Qt::MinimumSize:
+    case Qt::MinimumSize:
         width = fn.boundingRect("...").width();
         height = fn.height() + labelPadding();
-        width=qMax(width,base.width());
-        height+=base.height();
-        sh = QSizeF(width,height);
+        width = qMax(width, base.width());
+        height += base.height();
+        sh = QSizeF(width, height);
         break;
-        case Qt::PreferredSize: {
+    case Qt::PreferredSize: {
 
-            for (int i = 0; i < ticksList.size(); ++i)
-            {
-                QRectF rect = fn.boundingRect(ticksList.at(i));
-                width+=rect.width();
-                height=qMax(rect.height()+labelPadding(),height);
-            }
-            width=qMax(width,base.width());
-            height+=base.height();
-            sh = QSizeF(width,height);
-            break;
+        for (int i = 0; i < ticksList.size(); ++i) {
+            QRectF rect = fn.boundingRect(ticksList.at(i));
+            width += rect.width();
+            height = qMax(rect.height() + labelPadding(), height);
         }
-        default:
+        width = qMax(width, base.width());
+        height += base.height();
+        sh = QSizeF(width, height);
+        break;
+    }
+    default:
         break;
     }
 
diff --git a/src/axis/categoryaxis/chartcategoryaxisx_p.h b/src/axis/categoryaxis/chartcategoryaxisx_p.h
index 5a499168..6f30f3e5 100644
--- a/src/axis/categoryaxis/chartcategoryaxisx_p.h
+++ b/src/axis/categoryaxis/chartcategoryaxisx_p.h
@@ -44,11 +44,14 @@ public:
     ~ChartCategoryAxisX();
 
     QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const;
+
 protected:
     QVector<qreal> calculateLayout() const;
     void updateGeometry();
-Q_SLOTS
+
+public Q_SLOTS:
     void handleAxisUpdated();
+
 private:
     QCategoryAxis *m_axis;
 };
diff --git a/src/axis/categoryaxis/chartcategoryaxisy.cpp b/src/axis/categoryaxis/chartcategoryaxisy.cpp
index 5aeb1381..e766b8c6 100644
--- a/src/axis/categoryaxis/chartcategoryaxisy.cpp
+++ b/src/axis/categoryaxis/chartcategoryaxisy.cpp
@@ -28,8 +28,9 @@
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
-ChartCategoryAxisY::ChartCategoryAxisY(QCategoryAxis *axis,ChartPresenter *presenter) : VerticalAxis(axis,presenter,true),
-     m_axis(axis)
+ChartCategoryAxisY::ChartCategoryAxisY(QCategoryAxis *axis, ChartPresenter *presenter)
+    : VerticalAxis(axis, presenter, true),
+      m_axis(axis)
 {
 }
 
@@ -45,12 +46,12 @@ QVector<qreal> ChartCategoryAxisY::calculateLayout() const
     if (tickCount < 2)
         return points;
 
-    const QRectF& gridRect = gridGeometry();
+    const QRectF &gridRect = gridGeometry();
     qreal range = m_axis->max() - m_axis->min();
     if (range > 0) {
         points.resize(tickCount);
         qreal scale = gridRect.height() / range;
-        for (int i = 0; i < tickCount; ++i)
+        for (int i = 0; i < tickCount; ++i) {
             if (i < tickCount - 1) {
                 int y = -(m_axis->startValue(m_axis->categoriesLabels().at(i)) - m_axis->min()) * scale + gridRect.bottom();
                 points[i] = y;
@@ -58,6 +59,7 @@ QVector<qreal> ChartCategoryAxisY::calculateLayout() const
                 int y = -(m_axis->endValue(m_axis->categoriesLabels().at(i - 1)) - m_axis->min())  * scale + gridRect.bottom();
                 points[i] = y;
             }
+        }
     }
 
     return points;
@@ -65,7 +67,7 @@ QVector<qreal> ChartCategoryAxisY::calculateLayout() const
 
 void ChartCategoryAxisY::updateGeometry()
 {
-    setLabels(m_axis->categoriesLabels()<<"");
+    setLabels(m_axis->categoriesLabels() << "");
     VerticalAxis::updateGeometry();
 }
 
@@ -75,7 +77,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)
 
@@ -83,35 +85,34 @@ QSizeF ChartCategoryAxisY::sizeHint(Qt::SizeHint which, const QSizeF& constraint
     QSizeF sh;
     QSizeF base = ChartAxis::sizeHint(which, constraint);
     QStringList ticksList; //TODO::
-    qreal width=0;
-    qreal height=0;
-
-      switch (which) {
-        case Qt::MinimumSize:
-            width = fn.boundingRect("...").width()+labelPadding();
-            height = fn.height();
-            width=qMax(width,base.width());
-            height+=base.height();
-            sh = QSizeF(width,height);
-            break;
-        case Qt::PreferredSize:{
-
-            for (int i = 0; i < ticksList.size(); ++i)
-            {
-                QRectF rect = fn.boundingRect(ticksList.at(i));
-                height+=rect.height();
-                width=qMax(rect.width()+labelPadding(),width);
-            }
-            height=qMax(height,base.height());
-            width+=base.width();
-            sh = QSizeF(width,height);
-            break;
+    qreal width = 0;
+    qreal height = 0;
+
+    switch (which) {
+    case Qt::MinimumSize:
+        width = fn.boundingRect("...").width() + labelPadding();
+        height = fn.height();
+        width = qMax(width, base.width());
+        height += base.height();
+        sh = QSizeF(width, height);
+        break;
+    case Qt::PreferredSize: {
+
+        for (int i = 0; i < ticksList.size(); ++i) {
+            QRectF rect = fn.boundingRect(ticksList.at(i));
+            height += rect.height();
+            width = qMax(rect.width() + labelPadding(), width);
         }
-        default:
-          break;
-      }
+        height = qMax(height, base.height());
+        width += base.width();
+        sh = QSizeF(width, height);
+        break;
+    }
+    default:
+        break;
+    }
 
-      return sh;
+    return sh;
 }
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/axis/categoryaxis/chartcategoryaxisy_p.h b/src/axis/categoryaxis/chartcategoryaxisy_p.h
index 6b995488..296f3317 100644
--- a/src/axis/categoryaxis/chartcategoryaxisy_p.h
+++ b/src/axis/categoryaxis/chartcategoryaxisy_p.h
@@ -44,11 +44,14 @@ public:
     ~ChartCategoryAxisY();
 
     QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const;
+
 protected:
     QVector<qreal> calculateLayout() const;
     void updateGeometry();
-Q_SLOTS
+
+public Q_SLOTS:
     void handleAxisUpdated();
+
 private:
     QCategoryAxis *m_axis;
 };
diff --git a/src/axis/chartaxis.cpp b/src/axis/chartaxis.cpp
index 87a8c806..67fd6df5 100644
--- a/src/axis/chartaxis.cpp
+++ b/src/axis/chartaxis.cpp
@@ -32,19 +32,20 @@
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
-ChartAxis::ChartAxis(QAbstractAxis *axis,ChartPresenter *presenter, bool intervalAxis) : ChartElement(presenter),
-    m_chartAxis(axis),
-    m_labelsAngle(0),
-    m_grid(new QGraphicsItemGroup(presenter->rootItem())),
-    m_shades(new QGraphicsItemGroup(presenter->rootItem())),
-    m_labels(new QGraphicsItemGroup(presenter->rootItem())),
-    m_arrow(new QGraphicsItemGroup(presenter->rootItem())),
-    m_title(new QGraphicsSimpleTextItem(presenter->rootItem())),
-    m_min(0),
-    m_max(0),
-    m_animation(0),
-    m_labelPadding(5),
-    m_intervalAxis(intervalAxis)
+ChartAxis::ChartAxis(QAbstractAxis *axis, ChartPresenter *presenter, bool intervalAxis)
+    : ChartElement(presenter),
+      m_chartAxis(axis),
+      m_labelsAngle(0),
+      m_grid(new QGraphicsItemGroup(presenter->rootItem())),
+      m_shades(new QGraphicsItemGroup(presenter->rootItem())),
+      m_labels(new QGraphicsItemGroup(presenter->rootItem())),
+      m_arrow(new QGraphicsItemGroup(presenter->rootItem())),
+      m_title(new QGraphicsSimpleTextItem(presenter->rootItem())),
+      m_min(0),
+      m_max(0),
+      m_animation(0),
+      m_labelPadding(5),
+      m_intervalAxis(intervalAxis)
 {
     //initial initialization
     m_arrow->setZValue(ChartPresenter::AxisZValue);
@@ -53,7 +54,7 @@ ChartAxis::ChartAxis(QAbstractAxis *axis,ChartPresenter *presenter, bool interva
     m_shades->setZValue(ChartPresenter::ShadesZValue);
     m_grid->setZValue(ChartPresenter::GridZValue);
 
-    QObject::connect(m_chartAxis->d_ptr.data(),SIGNAL(updated()),this,SLOT(handleAxisUpdated()));
+    QObject::connect(m_chartAxis->d_ptr.data(), SIGNAL(updated()), this, SLOT(handleAxisUpdated()));
 
     QGraphicsSimpleTextItem item;
     m_font = item.font();
@@ -64,29 +65,31 @@ ChartAxis::~ChartAxis()
 {
 }
 
-void ChartAxis::setAnimation(AxisAnimation* animation)
+void ChartAxis::setAnimation(AxisAnimation *animation)
 {
-    m_animation=animation;
+    m_animation = animation;
 }
 
 void ChartAxis::setLayout(QVector<qreal> &layout)
 {
-    m_layoutVector=layout;
+    m_layoutVector = layout;
 }
 
 void ChartAxis::createItems(int count)
 {
     if (m_arrow->children().size() == 0)
-        m_arrow->addToGroup(new AxisItem(this,presenter()->rootItem()));
-    if (m_intervalAxis && m_grid->children().size() == 0){
-        for(int i = 0 ; i < 2 ;i  ++)
+        m_arrow->addToGroup(new AxisItem(this, presenter()->rootItem()));
+
+    if (m_intervalAxis && m_grid->children().size() == 0) {
+        for (int i = 0 ; i < 2 ; i  ++)
             m_grid->addToGroup(new QGraphicsLineItem(presenter()->rootItem()));
     }
+
     for (int i = 0; i < count; ++i) {
         m_grid->addToGroup(new QGraphicsLineItem(presenter()->rootItem()));
         m_labels->addToGroup(new QGraphicsSimpleTextItem(presenter()->rootItem()));
         m_arrow->addToGroup(new QGraphicsLineItem(presenter()->rootItem()));
-        if ((m_grid->childItems().size())%2 && m_grid->childItems().size()>2)
+        if ((m_grid->childItems().size()) % 2 && m_grid->childItems().size() > 2)
             m_shades->addToGroup(new QGraphicsRectItem(presenter()->rootItem()));
     }
 }
@@ -99,7 +102,8 @@ void ChartAxis::deleteItems(int count)
     QList<QGraphicsItem *> axis = m_arrow->childItems();
 
     for (int i = 0; i < count; ++i) {
-        if (lines.size()%2 && lines.size() > 1) delete(shades.takeLast());
+        if (lines.size() % 2 && lines.size() > 1)
+            delete(shades.takeLast());
         delete(lines.takeLast());
         delete(labels.takeLast());
         delete(axis.takeLast());
@@ -110,41 +114,38 @@ void ChartAxis::updateLayout(QVector<qreal> &layout)
 {
     int diff = m_layoutVector.size() - layout.size();
 
-    if (diff>0) {
+    if (diff > 0)
         deleteItems(diff);
-    }
-    else if (diff<0) {
+    else if (diff < 0)
         createItems(-diff);
-    }
 
-    if(diff<0) handleAxisUpdated();
+    if (diff < 0) handleAxisUpdated();
 
     if (m_animation) {
-          switch(presenter()->state()){
-              case ChartPresenter::ZoomInState:
-                  m_animation->setAnimationType(AxisAnimation::ZoomInAnimation);
-                  m_animation->setAnimationPoint(presenter()->statePoint());
-                  break;
-              case ChartPresenter::ZoomOutState:
-                  m_animation->setAnimationType(AxisAnimation::ZoomOutAnimation);
-                  m_animation->setAnimationPoint(presenter()->statePoint());
-                  break;
-              case ChartPresenter::ScrollUpState:
-              case ChartPresenter::ScrollLeftState:
-                  m_animation->setAnimationType(AxisAnimation::MoveBackwordAnimation);
-                  break;
-              case ChartPresenter::ScrollDownState:
-              case ChartPresenter::ScrollRightState:
-                  m_animation->setAnimationType(AxisAnimation::MoveForwardAnimation);
-                  break;
-              case ChartPresenter::ShowState:
-                  m_animation->setAnimationType(AxisAnimation::DefaultAnimation);
-                  break;
-          }
-          m_animation->setValues(m_layoutVector,layout);
-          presenter()->startAnimation(m_animation);
-    }
-    else {
+        switch (presenter()->state()) {
+        case ChartPresenter::ZoomInState:
+            m_animation->setAnimationType(AxisAnimation::ZoomInAnimation);
+            m_animation->setAnimationPoint(presenter()->statePoint());
+            break;
+        case ChartPresenter::ZoomOutState:
+            m_animation->setAnimationType(AxisAnimation::ZoomOutAnimation);
+            m_animation->setAnimationPoint(presenter()->statePoint());
+            break;
+        case ChartPresenter::ScrollUpState:
+        case ChartPresenter::ScrollLeftState:
+            m_animation->setAnimationType(AxisAnimation::MoveBackwordAnimation);
+            break;
+        case ChartPresenter::ScrollDownState:
+        case ChartPresenter::ScrollRightState:
+            m_animation->setAnimationType(AxisAnimation::MoveForwardAnimation);
+            break;
+        case ChartPresenter::ShowState:
+            m_animation->setAnimationType(AxisAnimation::DefaultAnimation);
+            break;
+        }
+        m_animation->setValues(m_layoutVector, layout);
+        presenter()->startAnimation(m_animation);
+    } else {
         setLayout(layout);
         updateGeometry();
     }
@@ -212,74 +213,65 @@ void ChartAxis::setShadesVisibility(bool visible)
 
 void ChartAxis::setLabelsAngle(int angle)
 {
-    foreach(QGraphicsItem* item , m_labels->childItems()) {
-          item->setRotation(angle);
-    }
+    foreach (QGraphicsItem *item, m_labels->childItems())
+        item->setRotation(angle);
 
-    m_labelsAngle=angle;
+    m_labelsAngle = angle;
 }
 
 void ChartAxis::setLabelsPen(const QPen &pen)
 {
-    foreach(QGraphicsItem* item , m_labels->childItems()) {
-        static_cast<QGraphicsSimpleTextItem*>(item)->setPen(pen);
-    }
+    foreach (QGraphicsItem *item , m_labels->childItems())
+        static_cast<QGraphicsSimpleTextItem *>(item)->setPen(pen);
 }
 
 void ChartAxis::setLabelsBrush(const QBrush &brush)
 {
-    foreach(QGraphicsItem* item , m_labels->childItems()) {
-        static_cast<QGraphicsSimpleTextItem*>(item)->setBrush(brush);
-    }
+    foreach (QGraphicsItem *item , m_labels->childItems())
+        static_cast<QGraphicsSimpleTextItem *>(item)->setBrush(brush);
 }
 
 void ChartAxis::setLabelsFont(const QFont &font)
 {
-    foreach(QGraphicsItem* item , m_labels->childItems()) {
-        static_cast<QGraphicsSimpleTextItem*>(item)->setFont(font);
-    }
-    if(m_font!=font) {
+    foreach (QGraphicsItem *item , m_labels->childItems())
+        static_cast<QGraphicsSimpleTextItem *>(item)->setFont(font);
+
+    if (m_font != font) {
         m_font = font;
-        foreach(QGraphicsItem* item , m_labels->childItems()) {
-            static_cast<QGraphicsSimpleTextItem*>(item)->setFont(font);
-        }
+        foreach (QGraphicsItem *item , m_labels->childItems())
+            static_cast<QGraphicsSimpleTextItem *>(item)->setFont(font);
         QGraphicsLayoutItem::updateGeometry();
         presenter()->layout()->invalidate();
-
     }
 }
 
 void ChartAxis::setShadesBrush(const QBrush &brush)
 {
-    foreach(QGraphicsItem* item , m_shades->childItems()) {
-        static_cast<QGraphicsRectItem*>(item)->setBrush(brush);
-    }
+    foreach (QGraphicsItem *item , m_shades->childItems())
+        static_cast<QGraphicsRectItem *>(item)->setBrush(brush);
 }
 
 void ChartAxis::setShadesPen(const QPen &pen)
 {
-    foreach(QGraphicsItem* item , m_shades->childItems()) {
-        static_cast<QGraphicsRectItem*>(item)->setPen(pen);
-    }
+    foreach (QGraphicsItem *item , m_shades->childItems())
+        static_cast<QGraphicsRectItem *>(item)->setPen(pen);
 }
 
 void ChartAxis::setArrowPen(const QPen &pen)
 {
-    foreach(QGraphicsItem* item , m_arrow->childItems()) {
-           static_cast<QGraphicsLineItem*>(item)->setPen(pen);
-    }
+    foreach (QGraphicsItem *item , m_arrow->childItems())
+        static_cast<QGraphicsLineItem *>(item)->setPen(pen);
 }
 
 void ChartAxis::setGridPen(const QPen &pen)
 {
-    foreach(QGraphicsItem* item , m_grid->childItems()) {
-        static_cast<QGraphicsLineItem*>(item)->setPen(pen);
-    }
+    foreach (QGraphicsItem *item , m_grid->childItems())
+        static_cast<QGraphicsLineItem *>(item)->setPen(pen);
 }
 
 void ChartAxis::setLabelPadding(int padding)
 {
-    m_labelPadding=padding;
+    m_labelPadding = padding;
 }
 
 bool ChartAxis::isEmpty()
@@ -289,22 +281,19 @@ bool ChartAxis::isEmpty()
 
 void ChartAxis::handleDomainUpdated()
 {
-    Domain* domain = qobject_cast<Domain*>(sender());
+    Domain *domain = qobject_cast<Domain *>(sender());
     qreal min(0);
     qreal max(0);
 
-    if(m_chartAxis->orientation()==Qt::Horizontal) {
+    if (m_chartAxis->orientation() == Qt::Horizontal) {
         min = domain->minX();
         max = domain->maxX();
-    }
-    else if (m_chartAxis->orientation()==Qt::Vertical)
-    {
+    } else if (m_chartAxis->orientation() == Qt::Vertical) {
         min = domain->minY();
         max = domain->maxY();
     }
 
-    if (!qFuzzyIsNull(m_min - min) || !qFuzzyIsNull(m_max - max))
-    {
+    if (!qFuzzyIsNull(m_min - min) || !qFuzzyIsNull(m_max - max)) {
         m_min = min;
         m_max = max;
 
@@ -314,9 +303,9 @@ void ChartAxis::handleDomainUpdated()
             updateLayout(layout);
             QSizeF before = effectiveSizeHint(Qt::MinimumSize);
 
-            QSizeF after= sizeHint(Qt::MinimumSize);
+            QSizeF after = sizeHint(Qt::MinimumSize);
 
-            if(before!=after) {
+            if (before != after) {
                 QGraphicsLayoutItem::updateGeometry();
                 //we don't want to call invalidate on layout, since it will change minimum size of component,
                 //which we would like to avoid since it causes nasty flips when scrolling or zooming,
@@ -329,8 +318,8 @@ void ChartAxis::handleDomainUpdated()
 
 void ChartAxis::handleAxisUpdated()
 {
-    if(isEmpty()) return;
-
+    if (isEmpty())
+        return;
 
     bool visible = m_chartAxis->isVisible();
 
@@ -349,9 +338,9 @@ void ChartAxis::handleAxisUpdated()
     setTitleText(m_chartAxis->title());
 }
 
-void ChartAxis::setTitleText(const QString& title)
+void ChartAxis::setTitleText(const QString &title)
 {
-    if(m_titleText!=title) {
+    if (m_titleText != title) {
         m_titleText = title;
         m_axisRect = QRect();
         QGraphicsLayoutItem::updateGeometry();
@@ -369,44 +358,43 @@ void ChartAxis::hide()
 
 void ChartAxis::setGeometry(const QRectF &axis, const QRectF &grid)
 {
-        m_gridRect = grid;
-        m_axisRect = axis;
+    m_gridRect = grid;
+    m_axisRect = axis;
 
-        if (isEmpty()) return;
+    if (isEmpty())
+        return;
 
-        if(!m_titleText.isNull()) {
-            QFontMetrics fn(m_title->font());
+    if (!m_titleText.isNull()) {
+        QFontMetrics fn(m_title->font());
 
-            int size(0);
+        int size(0);
 
-            if(orientation()==Qt::Horizontal)
+        if (orientation() == Qt::Horizontal)
             size = grid.width();
-            else if(orientation()==Qt::Vertical)
+        else if (orientation() == Qt::Vertical)
             size = grid.height();
 
-            if (fn.boundingRect(m_titleText).width() > size)
-            {
-                QString string = m_titleText + "...";
-                while (fn.boundingRect(string).width() > size && string.length() > 3)
+        if (fn.boundingRect(m_titleText).width() > size) {
+            QString string = m_titleText + "...";
+            while (fn.boundingRect(string).width() > size && string.length() > 3)
                 string.remove(string.length() - 4, 1);
-                m_title->setText(string);
-            }
-            else
+            m_title->setText(string);
+        } else {
             m_title->setText(m_titleText);
+        }
 
-            QPointF center = grid.center() - m_title->boundingRect().center();
-            if(orientation()==Qt::Horizontal) {
-                m_title->setPos(center.x(),m_axisRect.bottom()-m_title->boundingRect().height());
-            }
-            else if(orientation()==Qt::Vertical) {
-                m_title->setTransformOriginPoint(m_title->boundingRect().center());
-                m_title->setRotation(270);
-                m_title->setPos(m_axisRect.left()- m_title->boundingRect().width()/2+m_title->boundingRect().height()/2,center.y());
-            }
+        QPointF center = grid.center() - m_title->boundingRect().center();
+        if (orientation() == Qt::Horizontal) {
+            m_title->setPos(center.x(), m_axisRect.bottom() - m_title->boundingRect().height());
+        } else if (orientation() == Qt::Vertical) {
+            m_title->setTransformOriginPoint(m_title->boundingRect().center());
+            m_title->setRotation(270);
+            m_title->setPos(m_axisRect.left() - m_title->boundingRect().width() / 2 + m_title->boundingRect().height() / 2, center.y());
         }
+    }
 
-        QVector<qreal> layout = calculateLayout();
-        updateLayout(layout);
+    QVector<qreal> layout = calculateLayout();
+    updateLayout(layout);
 
 }
 
@@ -430,41 +418,36 @@ bool ChartAxis::isVisible()
     return m_chartAxis->isVisible();
 }
 
-void ChartAxis::setLabels(const QStringList& labels)
+void ChartAxis::setLabels(const QStringList &labels)
 {
-    m_labelsList=labels;
+    m_labelsList = labels;
 }
 
-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;
 
-    if(m_titleText.isNull()) return sh;
-
-    switch(which) {
-        case Qt::MinimumSize:
-        if(orientation()==Qt::Horizontal) {
-            sh = QSizeF(fn.boundingRect ("...").width(),fn.height());
-        }
-        else if(orientation()==Qt::Vertical) {
-            sh = QSizeF(fn.height(),fn.boundingRect ("...").width());
-        }
+    if (m_titleText.isNull())
+        return sh;
 
+    switch (which) {
+    case Qt::MinimumSize:
+        if (orientation() == Qt::Horizontal)
+            sh = QSizeF(fn.boundingRect("...").width(), fn.height());
+        else if (orientation() == Qt::Vertical)
+            sh = QSizeF(fn.height(), fn.boundingRect("...").width());
         break;
-        case Qt::MaximumSize:
-        case Qt::PreferredSize:
-        if(orientation()==Qt::Horizontal) {
-            sh = QSizeF(fn.boundingRect(m_chartAxis->title()).width(),fn.height());
-        }
-        else if(orientation()==Qt::Vertical) {
-            sh = QSizeF(fn.height(),fn.boundingRect(m_chartAxis->title()).width());
-        }
-
+    case Qt::MaximumSize:
+    case Qt::PreferredSize:
+        if (orientation() == Qt::Horizontal)
+            sh = QSizeF(fn.boundingRect(m_chartAxis->title()).width(), fn.height());
+        else if (orientation() == Qt::Vertical)
+            sh = QSizeF(fn.height(), fn.boundingRect(m_chartAxis->title()).width());
         break;
-        default:
+    default:
         break;
     }
 
@@ -473,28 +456,27 @@ QSizeF ChartAxis::sizeHint(Qt::SizeHint which, const QSizeF& constraint) const
 
 QStringList ChartAxis::createValueLabels(int ticks) const
 {
-    Q_ASSERT(m_max>m_min);
-    Q_ASSERT(ticks>1);
+    Q_ASSERT(m_max > m_min);
+    Q_ASSERT(ticks > 1);
 
     QStringList labels;
 
-    int n = qMax(int(-qFloor(log10((m_max-m_min)/(ticks-1)))),0);
+    int n = qMax(int(-qFloor(log10((m_max - m_min) / (ticks - 1)))), 0);
     n++;
 
     QValueAxis *axis = qobject_cast<QValueAxis *>(m_chartAxis);
 
     QString format = axis->labelFormat();
 
-    if(format.isNull()) {
-        for (int i=0; i< ticks; i++) {
-            qreal value = m_min + (i * (m_max - m_min)/ (ticks-1));
-            labels << QString::number(value,'f',n);
+    if (format.isNull()) {
+        for (int i = 0; i < ticks; i++) {
+            qreal value = m_min + (i * (m_max - m_min) / (ticks - 1));
+            labels << QString::number(value, 'f', n);
         }
-    }
-    else {
+    } else {
         QByteArray array = format.toAscii();
-        for (int i=0; i< ticks; i++) {
-            qreal value = m_min + (i * (m_max - m_min)/ (ticks-1));
+        for (int i = 0; i < ticks; i++) {
+            qreal value = m_min + (i * (m_max - m_min) / (ticks - 1));
             labels << QString().sprintf(array, value);
         }
     }
@@ -502,18 +484,17 @@ QStringList ChartAxis::createValueLabels(int ticks) const
     return labels;
 }
 
-QStringList ChartAxis::createDateTimeLabels(const QString& format,int ticks) const
+QStringList ChartAxis::createDateTimeLabels(const QString &format, int ticks) const
 {
-    Q_ASSERT(m_max>m_min);
-    Q_ASSERT(ticks>1);
+    Q_ASSERT(m_max > m_min);
+    Q_ASSERT(ticks > 1);
     QStringList labels;
-    int n = qMax(int(-floor(log10((m_max-m_min)/(ticks-1)))),0);
+    int n = qMax(int(-floor(log10((m_max - m_min) / (ticks - 1)))), 0);
     n++;
-    for (int i=0; i< ticks; i++) {
-        qreal value = m_min + (i * (m_max - m_min)/ (ticks-1));
+    for (int i = 0; i < ticks; i++) {
+        qreal value = m_min + (i * (m_max - m_min) / (ticks - 1));
         labels << QDateTime::fromMSecsSinceEpoch(value).toString(format);
     }
-
     return labels;
 }
 
diff --git a/src/axis/chartaxis_p.h b/src/axis/chartaxis_p.h
index f4fede6f..a15bf8af 100644
--- a/src/axis/chartaxis_p.h
+++ b/src/axis/chartaxis_p.h
@@ -103,7 +103,7 @@ public:
     QRectF axisGeometry() const { return m_axisRect; }
     QRectF gridGeometry() const { return m_gridRect; }
 
-    void setLabels(const QStringList& labels);
+    void setLabels(const QStringList &labels);
     QStringList labels() const { return m_labelsList; }
 
     //this flag indicates that axis is used to show intervals it means labels are in between ticks
@@ -112,7 +112,7 @@ public:
     virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
 
 protected:
-    void setGeometry(const QRectF &size){ Q_UNUSED(size);};
+    void setGeometry(const QRectF &size) { Q_UNUSED(size);};
     virtual void updateGeometry() = 0;
     virtual QVector<qreal> calculateLayout() const = 0;
 
@@ -125,7 +125,7 @@ protected:
     qreal min() const {return m_min; }
     qreal max() const {return m_max; }
     QStringList createValueLabels(int ticks) const;
-    QStringList createDateTimeLabels(const QString& format,int ticks) const;
+    QStringList createDateTimeLabels(const QString &format, int ticks) const;
 
 public Q_SLOTS:
     virtual void handleAxisUpdated();
@@ -158,8 +158,8 @@ private:
     QStringList m_labelsList;
     bool m_intervalAxis;
 
-friend class AxisAnimation;
-friend class AxisItem;
+    friend class AxisAnimation;
+    friend class AxisItem;
 
 };
 
diff --git a/src/axis/datetimeaxis/chartdatetimeaxisx.cpp b/src/axis/datetimeaxis/chartdatetimeaxisx.cpp
index 481e312d..9b971ec3 100644
--- a/src/axis/datetimeaxis/chartdatetimeaxisx.cpp
+++ b/src/axis/datetimeaxis/chartdatetimeaxisx.cpp
@@ -28,8 +28,10 @@
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
-ChartDateTimeAxisX::ChartDateTimeAxisX(QDateTimeAxis *axis,ChartPresenter *presenter) : HorizontalAxis(axis,presenter),
-m_tickCount(0),m_axis(axis)
+ChartDateTimeAxisX::ChartDateTimeAxisX(QDateTimeAxis *axis, ChartPresenter *presenter)
+    : HorizontalAxis(axis, presenter),
+      m_tickCount(0),
+      m_axis(axis)
 {
 }
 
@@ -39,12 +41,12 @@ ChartDateTimeAxisX::~ChartDateTimeAxisX()
 
 QVector<qreal> ChartDateTimeAxisX::calculateLayout() const
 {
-    Q_ASSERT(m_tickCount>=2);
+    Q_ASSERT(m_tickCount >= 2);
 
     QVector<qreal> points;
     points.resize(m_tickCount);
-    const QRectF& gridRect = gridGeometry();
-    const qreal deltaX = gridRect.width()/(m_tickCount-1);
+    const QRectF &gridRect = gridGeometry();
+    const qreal deltaX = gridRect.width() / (m_tickCount - 1);
     for (int i = 0; i < m_tickCount; ++i) {
         int x = i * deltaX + gridRect.left();
         points[i] = x;
@@ -55,8 +57,9 @@ QVector<qreal> ChartDateTimeAxisX::calculateLayout() const
 void ChartDateTimeAxisX::updateGeometry()
 {
     const QVector<qreal>& layout = ChartAxis::layout();
-    if(layout.isEmpty()) return;
-    setLabels(createDateTimeLabels(m_axis->format(),layout.size()));
+    if (layout.isEmpty())
+        return;
+    setLabels(createDateTimeLabels(m_axis->format(), layout.size()));
     HorizontalAxis::updateGeometry();
 }
 
@@ -66,41 +69,40 @@ void ChartDateTimeAxisX::handleAxisUpdated()
     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)
 
     QFontMetrics fn(font());
     QSizeF sh;
 
-      switch (which) {
-        case Qt::MinimumSize:
-            sh = QSizeF(fn.boundingRect("...").width(),fn.height());
-            break;
-        case Qt::PreferredSize:{
-
-            const QVector<qreal>& layout = ChartAxis::layout();
-            if(layout.isEmpty()) break;
-            QStringList ticksList;
+    switch (which) {
+    case Qt::MinimumSize:
+        sh = QSizeF(fn.boundingRect("...").width(), fn.height());
+        break;
+    case Qt::PreferredSize: {
 
+        const QVector<qreal>& layout = ChartAxis::layout();
+        if (layout.isEmpty())
+            break;
+        QStringList ticksList;
 
-            qreal width=0;
-            qreal height=0;
+        qreal width = 0;
+        qreal height = 0;
 
-            for (int i = 0; i < ticksList.size(); ++i)
-            {
-                QRectF rect = fn.boundingRect(ticksList.at(i));
-                width+=rect.width();
-                height+=qMax(rect.height()+labelPadding(),height);
-            }
-            sh = QSizeF(width,height);
-            break;
+        for (int i = 0; i < ticksList.size(); ++i) {
+            QRectF rect = fn.boundingRect(ticksList.at(i));
+            width += rect.width();
+            height += qMax(rect.height() + labelPadding(), height);
         }
-        default:
-          break;
-      }
+        sh = QSizeF(width, height);
+        break;
+    }
+    default:
+        break;
+    }
 
-      return sh;
+    return sh;
 }
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/axis/datetimeaxis/chartdatetimeaxisy.cpp b/src/axis/datetimeaxis/chartdatetimeaxisy.cpp
index 960a4acf..8deb04c4 100644
--- a/src/axis/datetimeaxis/chartdatetimeaxisy.cpp
+++ b/src/axis/datetimeaxis/chartdatetimeaxisy.cpp
@@ -28,8 +28,10 @@
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
-ChartDateTimeAxisY::ChartDateTimeAxisY(QDateTimeAxis *axis,ChartPresenter *presenter) : VerticalAxis(axis,presenter),
-m_tickCount(0),m_axis(axis)
+ChartDateTimeAxisY::ChartDateTimeAxisY(QDateTimeAxis *axis, ChartPresenter *presenter)
+    : VerticalAxis(axis, presenter),
+      m_tickCount(0),
+      m_axis(axis)
 {
 }
 
@@ -39,12 +41,12 @@ ChartDateTimeAxisY::~ChartDateTimeAxisY()
 
 QVector<qreal> ChartDateTimeAxisY::calculateLayout() const
 {
-    Q_ASSERT(m_tickCount>=2);
+    Q_ASSERT(m_tickCount >= 2);
 
     QVector<qreal> points;
     points.resize(m_tickCount);
-    const QRectF& gridRect = gridGeometry();
-    const qreal deltaY = gridRect.height()/(m_tickCount-1);
+    const QRectF &gridRect = gridGeometry();
+    const qreal deltaY = gridRect.height() / (m_tickCount - 1);
     for (int i = 0; i < m_tickCount; ++i) {
         int y = i * -deltaY + gridRect.bottom();
         points[i] = y;
@@ -56,8 +58,9 @@ QVector<qreal> ChartDateTimeAxisY::calculateLayout() const
 void ChartDateTimeAxisY::updateGeometry()
 {
     const QVector<qreal> &layout = ChartAxis::layout();
-    if(layout.isEmpty()) return;
-    setLabels(createDateTimeLabels(m_axis->format(),layout.size()));
+    if (layout.isEmpty())
+        return;
+    setLabels(createDateTimeLabels(m_axis->format(), layout.size()));
     VerticalAxis::updateGeometry();
 }
 
@@ -67,41 +70,39 @@ void ChartDateTimeAxisY::handleAxisUpdated()
     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)
 
     QFontMetrics fn(font());
     QSizeF sh;
 
-      switch (which) {
-        case Qt::MinimumSize:
-            sh = QSizeF(fn.boundingRect("...").width(),fn.height());
-            break;
-        case Qt::PreferredSize:{
+    switch (which) {
+    case Qt::MinimumSize:
+        sh = QSizeF(fn.boundingRect("...").width(), fn.height());
+        break;
+    case Qt::PreferredSize: {
 
-            const QVector<qreal>& layout = ChartAxis::layout();
-            if(layout.isEmpty()) break;
-            QStringList ticksList;
+        const QVector<qreal>& layout = ChartAxis::layout();
+        if (layout.isEmpty()) break;
+        QStringList ticksList;
 
+        qreal width = 0;
+        qreal height = 0;
 
-            qreal width=0;
-            qreal height=0;
-
-            for (int i = 0; i < ticksList.size(); ++i)
-            {
-                QRectF rect = fn.boundingRect(ticksList.at(i));
-                width+=rect.width();
-                height+=qMax(rect.height()+labelPadding(),height);
-            }
-            sh = QSizeF(width,height);
-            break;
+        for (int i = 0; i < ticksList.size(); ++i) {
+            QRectF rect = fn.boundingRect(ticksList.at(i));
+            width += rect.width();
+            height += qMax(rect.height() + labelPadding(), height);
         }
-        default:
-          break;
-      }
+        sh = QSizeF(width, height);
+        break;
+    }
+    default:
+        break;
+    }
 
-      return sh;
+    return sh;
 }
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/axis/horizontalaxis.cpp b/src/axis/horizontalaxis.cpp
index 756f68a0..16cd1c11 100644
--- a/src/axis/horizontalaxis.cpp
+++ b/src/axis/horizontalaxis.cpp
@@ -25,7 +25,8 @@
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
-HorizontalAxis::HorizontalAxis(QAbstractAxis *axis, ChartPresenter *presenter,bool intervalAxis):ChartAxis(axis,presenter,intervalAxis)
+HorizontalAxis::HorizontalAxis(QAbstractAxis *axis, ChartPresenter *presenter, bool intervalAxis)
+    : ChartAxis(axis, presenter, intervalAxis)
 {
 }
 
@@ -37,7 +38,8 @@ void HorizontalAxis::updateGeometry()
 {
     const QVector<qreal>& layout = ChartAxis::layout();
 
-    if(layout.isEmpty()) return;
+    if (layout.isEmpty())
+        return;
 
     QStringList ticksList = labels();
 
@@ -49,86 +51,85 @@ void HorizontalAxis::updateGeometry()
     Q_ASSERT(labels.size() == ticksList.size());
     Q_ASSERT(layout.size() == ticksList.size());
 
-    const QRectF& axisRect = axisGeometry();
-    const QRectF& gridRect = gridGeometry();
+    const QRectF &axisRect = axisGeometry();
+    const QRectF &gridRect = gridGeometry();
 
     //arrow
-    QGraphicsLineItem *arrowItem = static_cast<QGraphicsLineItem*>(axis.at(0));
+    QGraphicsLineItem *arrowItem = static_cast<QGraphicsLineItem *>(axis.at(0));
 
-    if (alignment()==Qt::AlignTop)
+    if (alignment() == Qt::AlignTop)
         arrowItem->setLine(gridRect.left(), axisRect.bottom(), gridRect.right(), axisRect.bottom());
-    else if(alignment()==Qt::AlignBottom)
+    else if (alignment() == Qt::AlignBottom)
         arrowItem->setLine(gridRect.left(), axisRect.top(), gridRect.right(), axisRect.top());
 
     qreal width = 0;
 
     for (int i = 0; i < layout.size(); ++i) {
 
-        QGraphicsLineItem *gridItem = static_cast<QGraphicsLineItem*>(lines.at(i));
-        QGraphicsLineItem *tickItem = static_cast<QGraphicsLineItem*>(axis.at(i+1));
-        QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem*>(labels.at(i));
+        QGraphicsLineItem *gridItem = static_cast<QGraphicsLineItem *>(lines.at(i));
+        QGraphicsLineItem *tickItem = static_cast<QGraphicsLineItem *>(axis.at(i + 1));
+        QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem *>(labels.at(i));
 
         //grid line
         gridItem->setLine(layout[i], gridRect.top(), layout[i], gridRect.bottom());
 
         //label text
         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());
 
         //ticks and label position
-        if (alignment()==Qt::AlignTop){
+        if (alignment() == Qt::AlignTop) {
             labelItem->setPos(layout[i] - center.x(), axisRect.bottom() - rect.height() - labelPadding());
-            tickItem->setLine(layout[i],axisRect.bottom(),layout[i],axisRect.bottom() - labelPadding());
-        }else if(alignment()==Qt::AlignBottom){
+            tickItem->setLine(layout[i], axisRect.bottom(), layout[i], axisRect.bottom() - labelPadding());
+        } else if (alignment() == Qt::AlignBottom) {
             labelItem->setPos(layout[i] - center.x(), axisRect.top() + labelPadding());
-            tickItem->setLine(layout[i],axisRect.top(),layout[i],axisRect.top() + labelPadding());
+            tickItem->setLine(layout[i], axisRect.top(), layout[i], axisRect.top() + labelPadding());
         }
 
-        if(intervalAxis()&& i+1!=layout.size()) {
-            const qreal delta = (layout[i+1] - layout[i])/2;
+        if (intervalAxis() && i + 1 != layout.size()) {
+            const qreal delta = (layout[i + 1] - layout[i]) / 2;
             labelItem->setPos(layout[i] + delta - center.x(), labelItem->pos().y());
         }
 
         //overlap detection
-        if(labelItem->pos().x() <= width ||
+        if (labelItem->pos().x() <= width ||
             labelItem->pos().x() < axisRect.left() ||
             labelItem->pos().x() + rect.width() > axisRect.right()) {
             labelItem->setVisible(false);
             gridItem->setVisible(false);
             tickItem->setVisible(false);
-        }
-        else {
+        } else {
             labelItem->setVisible(true);
             gridItem->setVisible(true);
             tickItem->setVisible(true);
-            width=rect.width()+labelItem->pos().x();
+            width = rect.width() + labelItem->pos().x();
         }
 
         //shades
-        if ((i+1)%2 && i>1) {
-            QGraphicsRectItem *rectItem = static_cast<QGraphicsRectItem*>(shades.at(i/2-1));
-            rectItem->setRect(layout[i-1],gridRect.top(),layout[i]-layout[i-1],gridRect.height());
+        if ((i + 1) % 2 && i > 1) {
+            QGraphicsRectItem *rectItem = static_cast<QGraphicsRectItem *>(shades.at(i / 2 - 1));
+            rectItem->setRect(layout[i - 1], gridRect.top(), layout[i] - layout[i - 1], gridRect.height());
         }
 
         // check if the grid line and the axis tick should be shown
         qreal x = gridItem->line().p1().x();
         if (x < gridRect.left() || x > gridRect.right()) {
-              gridItem->setVisible(false);
-              tickItem->setVisible(false);
-              if( intervalAxis() && ( labelItem->pos().x() < gridRect.left() || labelItem->pos().x() + rect.width() > gridRect.right()))
-                  labelItem->setVisible(false);
+            gridItem->setVisible(false);
+            tickItem->setVisible(false);
+            if (intervalAxis() && (labelItem->pos().x() < gridRect.left() || labelItem->pos().x() + rect.width() > gridRect.right()))
+                labelItem->setVisible(false);
         }
 
     }
 
     //begin/end grid line in case labels between
-    if(intervalAxis()) {
+    if (intervalAxis()) {
         QGraphicsLineItem *gridLine;
-        gridLine = static_cast<QGraphicsLineItem*>(lines.at(layout.size()));
+        gridLine = static_cast<QGraphicsLineItem *>(lines.at(layout.size()));
         gridLine->setLine(gridRect.right(), gridRect.top(), gridRect.right(), gridRect.bottom());
-        gridLine = static_cast<QGraphicsLineItem*>(lines.at(layout.size()+1));
+        gridLine = static_cast<QGraphicsLineItem *>(lines.at(layout.size() + 1));
         gridLine->setLine(gridRect.left(), gridRect.top(), gridRect.left(), gridRect.bottom());
     }
 }
diff --git a/src/axis/horizontalaxis_p.h b/src/axis/horizontalaxis_p.h
index a8c20f68..31a14837 100644
--- a/src/axis/horizontalaxis_p.h
+++ b/src/axis/horizontalaxis_p.h
@@ -37,7 +37,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 class HorizontalAxis : public ChartAxis
 {
 public:
-    HorizontalAxis(QAbstractAxis *axis, ChartPresenter *presenter,bool intervalAxis = false);
+    HorizontalAxis(QAbstractAxis *axis, ChartPresenter *presenter, bool intervalAxis = false);
     ~HorizontalAxis();
 protected:
     void updateGeometry();
diff --git a/src/axis/qabstractaxis.cpp b/src/axis/qabstractaxis.cpp
index d06d0f9a..039cf1af 100644
--- a/src/axis/qabstractaxis.cpp
+++ b/src/axis/qabstractaxis.cpp
@@ -260,9 +260,9 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
   QChart when axis added.
 */
 
-QAbstractAxis::QAbstractAxis(QAbstractAxisPrivate &d, QObject *parent) :
-QObject(parent),
-d_ptr(&d)
+QAbstractAxis::QAbstractAxis(QAbstractAxisPrivate &d, QObject *parent)
+    : QObject(parent),
+      d_ptr(&d)
 {
 }
 
@@ -272,7 +272,8 @@ d_ptr(&d)
 
 QAbstractAxis::~QAbstractAxis()
 {
-    if(d_ptr->m_dataset) qFatal("Still binded axis detected !");
+    if (d_ptr->m_dataset)
+        qFatal("Still binded axis detected !");
 }
 
 /*!
@@ -280,10 +281,10 @@ QAbstractAxis::~QAbstractAxis()
  */
 void QAbstractAxis::setLinePen(const QPen &pen)
 {
-	if (d_ptr->m_axisPen!=pen) {
-	    d_ptr->m_axisPen = pen;
-	    d_ptr->emitUpdated();
-	}
+    if (d_ptr->m_axisPen != pen) {
+        d_ptr->m_axisPen = pen;
+        d_ptr->emitUpdated();
+    }
 }
 
 /*!
@@ -318,7 +319,7 @@ void QAbstractAxis::setLineVisible(bool visible)
         d_ptr->m_arrowVisible = visible;
         d_ptr->emitUpdated();
         emit lineVisibleChanged(visible);
-	}
+    }
 }
 
 bool QAbstractAxis::isLineVisible() const
@@ -332,7 +333,7 @@ void QAbstractAxis::setGridLineVisible(bool visible)
         d_ptr->m_gridLineVisible = visible;
         d_ptr->emitUpdated();
         emit gridVisibleChanged(visible);
-	}
+    }
 }
 
 bool QAbstractAxis::isGridLineVisible() const
@@ -348,7 +349,7 @@ void QAbstractAxis::setGridLinePen(const QPen &pen)
     if (d_ptr->m_gridLinePen != pen) {
         d_ptr->m_gridLinePen = pen;
         d_ptr->emitUpdated();
-	}
+    }
 }
 
 /*!
@@ -365,7 +366,7 @@ void QAbstractAxis::setLabelsVisible(bool visible)
         d_ptr->m_labelsVisible = visible;
         d_ptr->emitUpdated();
         emit labelsVisibleChanged(visible);
-	}
+    }
 }
 
 bool QAbstractAxis::labelsVisible() const
@@ -381,7 +382,7 @@ void QAbstractAxis::setLabelsPen(const QPen &pen)
     if (d_ptr->m_labelsPen != pen) {
         d_ptr->m_labelsPen = pen;
         d_ptr->emitUpdated();
-	}
+    }
 }
 
 /*!
@@ -400,7 +401,7 @@ void QAbstractAxis::setLabelsBrush(const QBrush &brush)
     if (d_ptr->m_labelsBrush != brush) {
         d_ptr->m_labelsBrush = brush;
         d_ptr->emitUpdated();
-	}
+    }
 }
 
 /*!
@@ -419,7 +420,7 @@ void QAbstractAxis::setLabelsFont(const QFont &font)
     if (d_ptr->m_labelsFont != font) {
         d_ptr->m_labelsFont = font;
         d_ptr->emitUpdated();
-	}
+    }
 }
 
 /*!
@@ -435,7 +436,7 @@ void QAbstractAxis::setLabelsAngle(int angle)
     if (d_ptr->m_labelsAngle != angle) {
         d_ptr->m_labelsAngle = angle;
         d_ptr->emitUpdated();
-	}
+    }
 }
 
 int QAbstractAxis::labelsAngle() const
@@ -463,7 +464,7 @@ void QAbstractAxis::setTitleVisible(bool visible)
     if (d_ptr->m_titleVisible != visible) {
         d_ptr->m_titleVisible = visible;
         d_ptr->emitUpdated();
-	}
+    }
 }
 
 bool QAbstractAxis::titleVisible() const
@@ -479,7 +480,7 @@ void QAbstractAxis::setTitlePen(const QPen &pen)
     if (d_ptr->m_titlePen != pen) {
         d_ptr->m_titlePen = pen;
         d_ptr->emitUpdated();
-	}
+    }
 }
 
 /*!
@@ -498,7 +499,7 @@ void QAbstractAxis::setTitleBrush(const QBrush &brush)
     if (d_ptr->m_titleBrush != brush) {
         d_ptr->m_titleBrush = brush;
         d_ptr->emitUpdated();
-	}
+    }
 }
 
 /*!
@@ -517,7 +518,7 @@ void QAbstractAxis::setTitleFont(const QFont &font)
     if (d_ptr->m_titleFont != font) {
         d_ptr->m_titleFont = font;
         d_ptr->emitUpdated();
-	}
+    }
 }
 
 /*!
@@ -528,17 +529,17 @@ 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;
-		d_ptr->emitUpdated();
-	}
+    if (d_ptr->m_title != title) {
+        d_ptr->m_title = title;
+        d_ptr->emitUpdated();
+    }
 }
 
 QString QAbstractAxis::title() const
 {
-	return d_ptr->m_title;
+    return d_ptr->m_title;
 }
 
 
@@ -548,7 +549,7 @@ void QAbstractAxis::setShadesVisible(bool visible)
         d_ptr->m_shadesVisible = visible;
         d_ptr->emitUpdated();
         emit shadesVisibleChanged(visible);
-	}
+    }
 }
 
 bool QAbstractAxis::shadesVisible() const
@@ -564,7 +565,7 @@ void QAbstractAxis::setShadesPen(const QPen &pen)
     if (d_ptr->m_shadesPen != pen) {
         d_ptr->m_shadesPen = pen;
         d_ptr->emitUpdated();
-	}
+    }
 }
 
 /*!
@@ -630,8 +631,8 @@ bool QAbstractAxis::isVisible() const
 */
 void QAbstractAxis::setVisible(bool visible)
 {
-    if(d_ptr->m_visible!=visible){
-        d_ptr->m_visible=visible;
+    if (d_ptr->m_visible != visible) {
+        d_ptr->m_visible = visible;
         d_ptr->emitUpdated();
         emit visibleChanged(visible);
     }
@@ -681,7 +682,7 @@ void QAbstractAxis::setMax(const QVariant &max)
 */
 void QAbstractAxis::setRange(const QVariant &min, const QVariant &max)
 {
-    d_ptr->setRange(min,max);
+    d_ptr->setRange(min, max);
 }
 
 
@@ -700,25 +701,25 @@ Qt::Alignment QAbstractAxis::alignment() const
 
 void QAbstractAxis::setAlignment(Qt::Alignment alignment)
 {
-    d_ptr->m_alignment=alignment;
+    d_ptr->m_alignment = alignment;
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-QAbstractAxisPrivate::QAbstractAxisPrivate(QAbstractAxis* q):
-    q_ptr(q),
-    m_orientation(Qt::Orientation(0)),
-    m_alignment(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)
+QAbstractAxisPrivate::QAbstractAxisPrivate(QAbstractAxis *q)
+    : q_ptr(q),
+      m_orientation(Qt::Orientation(0)),
+      m_alignment(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)
 {
 
 }
@@ -730,24 +731,24 @@ QAbstractAxisPrivate::~QAbstractAxisPrivate()
 
 void QAbstractAxisPrivate::emitUpdated()
 {
-    if(!m_dirty){
-        m_dirty=true;
+    if (!m_dirty) {
+        m_dirty = true;
         emit updated();
     }
 }
 
 void QAbstractAxisPrivate::setDirty(bool dirty)
 {
-    m_dirty=dirty;
+    m_dirty = dirty;
 }
 
 void QAbstractAxisPrivate::setOrientation(Qt::Orientation orientation)
 {
-    m_orientation=orientation;
-    if(m_orientation==Qt::Horizontal && !m_alignment)
-        m_alignment=Qt::AlignBottom;
-    else if(m_orientation==Qt::Vertical && !m_alignment)
-        m_alignment=Qt::AlignLeft;
+    m_orientation = orientation;
+    if (m_orientation == Qt::Horizontal && !m_alignment)
+        m_alignment = Qt::AlignBottom;
+    else if (m_orientation == Qt::Vertical && !m_alignment)
+        m_alignment = Qt::AlignLeft;
 }
 
 
diff --git a/src/axis/qabstractaxis.h b/src/axis/qabstractaxis.h
index c5aa82da..37b3c2e8 100644
--- a/src/axis/qabstractaxis.h
+++ b/src/axis/qabstractaxis.h
@@ -125,7 +125,7 @@ public:
 
     Qt::Orientation orientation() const;
     Qt::Alignment alignment() const;
-    void setAlignment( Qt::Alignment alignment);
+    void setAlignment(Qt::Alignment alignment);
 
     //range handling
     void setMin(const QVariant &min);
diff --git a/src/axis/valueaxis/chartvalueaxisx.cpp b/src/axis/valueaxis/chartvalueaxisx.cpp
index f3a72723..fb25c190 100644
--- a/src/axis/valueaxis/chartvalueaxisx.cpp
+++ b/src/axis/valueaxis/chartvalueaxisx.cpp
@@ -30,8 +30,9 @@
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
-ChartValueAxisX::ChartValueAxisX(QValueAxis *axis,ChartPresenter *presenter) : HorizontalAxis(axis,presenter),
-    m_tickCount(0),m_axis(axis)
+ChartValueAxisX::ChartValueAxisX(QValueAxis *axis, ChartPresenter *presenter)
+    : HorizontalAxis(axis, presenter),
+      m_tickCount(0), m_axis(axis)
 {
 }
 
@@ -41,13 +42,13 @@ ChartValueAxisX::~ChartValueAxisX()
 
 QVector<qreal> ChartValueAxisX::calculateLayout() const
 {
-    Q_ASSERT(m_tickCount>=2);
+    Q_ASSERT(m_tickCount >= 2);
 
     QVector<qreal> points;
     points.resize(m_tickCount);
 
-    const QRectF& gridRect = gridGeometry();
-    const qreal deltaX = gridRect.width()/(m_tickCount-1);
+    const QRectF &gridRect = gridGeometry();
+    const qreal deltaX = gridRect.width() / (m_tickCount - 1);
     for (int i = 0; i < m_tickCount; ++i) {
         int x = i * deltaX + gridRect.left();
         points[i] = x;
@@ -58,7 +59,8 @@ QVector<qreal> ChartValueAxisX::calculateLayout() const
 void ChartValueAxisX::updateGeometry()
 {
     const QVector<qreal>& layout = ChartAxis::layout();
-    if(layout.isEmpty()) return;
+    if (layout.isEmpty())
+        return;
     setLabels(createValueLabels(layout.size()));
     HorizontalAxis::updateGeometry();
 }
@@ -73,7 +75,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)
 
@@ -82,28 +84,27 @@ QSizeF ChartValueAxisX::sizeHint(Qt::SizeHint which, const QSizeF& constraint) c
 
     QSizeF base = ChartAxis::sizeHint(which, constraint);
     QStringList ticksList = createValueLabels(m_tickCount);
-    qreal width=0;
-    qreal height=0;
+    qreal width = 0;
+    qreal height = 0;
 
     switch (which) {
-    case Qt::MinimumSize:{
-        int count = qMax(ticksList.last().count(),ticksList.first().count());
-        width=fn.averageCharWidth()*count;
-        height=fn.height()+labelPadding();
-        width=qMax(width,base.width());
-        height+=base.height();
-        sh = QSizeF(width,height);
+    case Qt::MinimumSize: {
+        int count = qMax(ticksList.last().count(), ticksList.first().count());
+        width = fn.averageCharWidth() * count;
+        height = fn.height() + labelPadding();
+        width = qMax(width, base.width());
+        height += base.height();
+        sh = QSizeF(width, height);
         break;
     }
-    case Qt::PreferredSize:{
-        for (int i = 0; i < ticksList.size(); ++i)
-        {
-            width+=fn.averageCharWidth()*ticksList.at(i).count();
+    case Qt::PreferredSize: {
+        for (int i = 0; i < ticksList.size(); ++i) {
+            width += fn.averageCharWidth() * ticksList.at(i).count();
         }
-        height=fn.height()+labelPadding();
-        width=qMax(width,base.width());
-        height+=base.height();
-        sh = QSizeF(width,height);
+        height = fn.height() + labelPadding();
+        width = qMax(width, base.width());
+        height += base.height();
+        sh = QSizeF(width, height);
         break;
     }
     default:
diff --git a/src/axis/valueaxis/chartvalueaxisy.cpp b/src/axis/valueaxis/chartvalueaxisy.cpp
index 61580d17..24bde9c8 100644
--- a/src/axis/valueaxis/chartvalueaxisy.cpp
+++ b/src/axis/valueaxis/chartvalueaxisy.cpp
@@ -29,8 +29,10 @@
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
-ChartValueAxisY::ChartValueAxisY(QValueAxis *axis,ChartPresenter *presenter) : VerticalAxis(axis,presenter),
-    m_tickCount(0),m_axis(axis)
+ChartValueAxisY::ChartValueAxisY(QValueAxis *axis, ChartPresenter *presenter)
+    : VerticalAxis(axis, presenter),
+      m_tickCount(0),
+      m_axis(axis)
 {
 }
 
@@ -40,14 +42,14 @@ ChartValueAxisY::~ChartValueAxisY()
 
 QVector<qreal> ChartValueAxisY::calculateLayout() const
 {
-    Q_ASSERT(m_tickCount>=2);
+    Q_ASSERT(m_tickCount >= 2);
 
     QVector<qreal> points;
     points.resize(m_tickCount);
 
-    const QRectF& gridRect = gridGeometry();
+    const QRectF &gridRect = gridGeometry();
 
-    const qreal deltaY = gridRect.height()/(m_tickCount-1);
+    const qreal deltaY = gridRect.height() / (m_tickCount - 1);
     for (int i = 0; i < m_tickCount; ++i) {
         int y = i * -deltaY + gridRect.bottom();
         points[i] = y;
@@ -59,7 +61,8 @@ QVector<qreal> ChartValueAxisY::calculateLayout() const
 void ChartValueAxisY::updateGeometry()
 {
     const QVector<qreal> &layout = ChartAxis::layout();
-    if(layout.isEmpty()) return;
+    if (layout.isEmpty())
+        return;
     setLabels(createValueLabels(layout.size()));
     VerticalAxis::updateGeometry();
 }
@@ -74,7 +77,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)
 
@@ -82,29 +85,27 @@ QSizeF ChartValueAxisY::sizeHint(Qt::SizeHint which, const QSizeF& constraint) c
     QSizeF sh;
     QSizeF base = ChartAxis::sizeHint(which, constraint);
     QStringList ticksList = createValueLabels(m_tickCount);
-    qreal width=0;
-    qreal height=0;
+    qreal width = 0;
+    qreal height = 0;
 
     switch (which) {
     case Qt::MinimumSize: {
         int count = qMax(ticksList.first().count() , ticksList.last().count());
-        width=fn.averageCharWidth()*count+labelPadding();
-        height=fn.height();
-        height=qMax(height,base.height());
-        width+=base.width();
-        sh = QSizeF(width,height);
+        width = fn.averageCharWidth() * count + labelPadding();
+        height = fn.height();
+        height = qMax(height, base.height());
+        width += base.width();
+        sh = QSizeF(width, height);
         break;
     }
-    case Qt::PreferredSize:
-    {
-        for (int i = 0; i < ticksList.size(); ++i)
-        {
-            width=qMax(qreal(fn.averageCharWidth()*ticksList.at(i).count())+labelPadding(),width);
-            height+=fn.height();
+    case Qt::PreferredSize: {
+        for (int i = 0; i < ticksList.size(); ++i) {
+            width = qMax(qreal(fn.averageCharWidth() * ticksList.at(i).count()) + labelPadding(), width);
+            height += fn.height();
         }
-        height=qMax(height,base.height());
-        width+=base.width();
-        sh = QSizeF(width,height);
+        height = qMax(height, base.height());
+        width += base.width();
+        sh = QSizeF(width, height);
         break;
     }
     default:
diff --git a/src/axis/valueaxis/chartvalueaxisy_p.h b/src/axis/valueaxis/chartvalueaxisy_p.h
index c8373e33..71dc211c 100644
--- a/src/axis/valueaxis/chartvalueaxisy_p.h
+++ b/src/axis/valueaxis/chartvalueaxisy_p.h
@@ -50,7 +50,7 @@ protected:
     void handleAxisUpdated();
 private:
     int m_tickCount;
-    QValueAxis* m_axis;
+    QValueAxis *m_axis;
 };
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/axis/verticalaxis.cpp b/src/axis/verticalaxis.cpp
index 76b39ae4..8d8162dc 100644
--- a/src/axis/verticalaxis.cpp
+++ b/src/axis/verticalaxis.cpp
@@ -24,7 +24,8 @@
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
-VerticalAxis::VerticalAxis(QAbstractAxis *axis, ChartPresenter *presenter, bool intervalAxis):ChartAxis(axis,presenter,intervalAxis)
+VerticalAxis::VerticalAxis(QAbstractAxis *axis, ChartPresenter *presenter, bool intervalAxis)
+    : ChartAxis(axis, presenter, intervalAxis)
 {
 
 }
@@ -38,7 +39,8 @@ void VerticalAxis::updateGeometry()
 {
     const QVector<qreal> &layout = ChartAxis::layout();
 
-    if(layout.isEmpty()) return;
+    if (layout.isEmpty())
+        return;
 
     QStringList labelList = labels();
 
@@ -50,77 +52,73 @@ void VerticalAxis::updateGeometry()
     Q_ASSERT(labels.size() == labelList.size());
     Q_ASSERT(layout.size() == labelList.size());
 
-    const QRectF& axisRect = axisGeometry();
-    const QRectF& gridRect = gridGeometry();
+    const QRectF &axisRect = axisGeometry();
+    const QRectF &gridRect = gridGeometry();
 
     qreal height = axisRect.bottom();
 
-    QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem*>(axis.at(0));
+    QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem *>(axis.at(0));
 
-    if (alignment()==Qt::AlignLeft)
-    lineItem->setLine( axisRect.right() , gridRect.top(), axisRect.right(), gridRect.bottom());
-    else if(alignment()==Qt::AlignRight)
-    lineItem->setLine( axisRect.left() , gridRect.top(), axisRect.left(), gridRect.bottom());
+    if (alignment() == Qt::AlignLeft)
+        lineItem->setLine(axisRect.right() , gridRect.top(), axisRect.right(), gridRect.bottom());
+    else if (alignment() == Qt::AlignRight)
+        lineItem->setLine(axisRect.left() , gridRect.top(), axisRect.left(), gridRect.bottom());
 
     QFontMetrics fn(font());
 
     for (int i = 0; i < layout.size(); ++i) {
 
-        QGraphicsLineItem *gridItem = static_cast<QGraphicsLineItem*>(lines.at(i));
-        QGraphicsLineItem *tickItem = static_cast<QGraphicsLineItem*>(axis.at(i+1));
-        QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem*>(labels.at(i));
+        QGraphicsLineItem *gridItem = static_cast<QGraphicsLineItem *>(lines.at(i));
+        QGraphicsLineItem *tickItem = static_cast<QGraphicsLineItem *>(axis.at(i + 1));
+        QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem *>(labels.at(i));
 
         //grid line
-        gridItem->setLine( gridRect.left() , layout[i], gridRect.right(), layout[i]);
+        gridItem->setLine(gridRect.left() , layout[i], gridRect.right(), layout[i]);
 
         //label text
         QString text = labelList.at(i);
-        if (fn.boundingRect(text).width() > axisRect.right() - axisRect.left() - labelPadding() )
-        {
+        if (fn.boundingRect(text).width() > axisRect.right() - axisRect.left() - labelPadding()) {
             QString label = text + "...";
             while (fn.boundingRect(label).width() > axisRect.right() - axisRect.left() - labelPadding() && label.length() > 3)
-            label.remove(label.length() - 4, 1);
+                label.remove(label.length() - 4, 1);
             labelItem->setText(label);
-        }
-        else {
+        } else {
             labelItem->setText(text);
         }
-        const QRectF& rect = labelItem->boundingRect();
+        const QRectF &rect = labelItem->boundingRect();
         QPointF center = rect.center();
         labelItem->setTransformOriginPoint(center.x(), center.y());
 
         //ticks and label position
-        if (alignment()==Qt::AlignLeft) {
-            labelItem->setPos( axisRect.right() - rect.width() - labelPadding() , layout[i]-center.y());
-            tickItem->setLine( axisRect.right()- labelPadding(),layout[i], axisRect.right(),layout[i]);
-        }
-        else if(alignment()==Qt::AlignRight) {
-            labelItem->setPos( axisRect.left() + labelPadding() , layout[i]-center.y());
-            tickItem->setLine( axisRect.left(),layout[i], axisRect.left()+ labelPadding(),layout[i]);
+        if (alignment() == Qt::AlignLeft) {
+            labelItem->setPos(axisRect.right() - rect.width() - labelPadding() , layout[i] - center.y());
+            tickItem->setLine(axisRect.right() - labelPadding(), layout[i], axisRect.right(), layout[i]);
+        } else if (alignment() == Qt::AlignRight) {
+            labelItem->setPos(axisRect.left() + labelPadding() , layout[i] - center.y());
+            tickItem->setLine(axisRect.left(), layout[i], axisRect.left() + labelPadding(), layout[i]);
         }
-        if(intervalAxis()&& i+1!=layout.size()) {
-            const qreal delta = (layout[i+1] - layout[i])/2;
+        if (intervalAxis() && i + 1 != layout.size()) {
+            const qreal delta = (layout[i + 1] - layout[i]) / 2;
             labelItem->setPos(labelItem->pos().x() , layout[i] + delta - center.y());
         }
 
         //overlap detection
-        if(labelItem->pos().y() + rect.height() > height ||
+        if (labelItem->pos().y() + rect.height() > height ||
             labelItem->pos().y() + rect.height() > axisRect.bottom() ||
             labelItem->pos().y() < axisRect.top()) {
             labelItem->setVisible(false);
             gridItem->setVisible(false);
             tickItem->setVisible(false);
-        }
-        else {
+        } else {
             labelItem->setVisible(true);
             gridItem->setVisible(true);
-            height=labelItem->pos().y();
+            height = labelItem->pos().y();
         }
 
         //shades
-        if ((i+1)%2 && i>1) {
-            QGraphicsRectItem *rectItem = static_cast<QGraphicsRectItem*>(shades.at(i/2-1));
-            rectItem->setRect( gridRect.left(),layout[i], gridRect.width(),layout[i-1]-layout[i]);
+        if ((i + 1) % 2 && i > 1) {
+            QGraphicsRectItem *rectItem = static_cast<QGraphicsRectItem *>(shades.at(i / 2 - 1));
+            rectItem->setRect(gridRect.left(), layout[i], gridRect.width(), layout[i - 1] - layout[i]);
         }
 
         // check if the grid line and the axis tick should be shown
@@ -128,17 +126,17 @@ void VerticalAxis::updateGeometry()
         if (y < gridRect.top() || y > gridRect.bottom()) {
             gridItem->setVisible(false);
             tickItem->setVisible(false);
-            if( intervalAxis() && ( labelItem->pos().y() < gridRect.top() || labelItem->pos().y() + rect.height() > gridRect.bottom()))
-            labelItem->setVisible(false);
+            if (intervalAxis() && (labelItem->pos().y() < gridRect.top() || labelItem->pos().y() + rect.height() > gridRect.bottom()))
+                labelItem->setVisible(false);
         }
 
     }
     //begin/end grid line in case labels between
-    if(intervalAxis()) {
+    if (intervalAxis()) {
         QGraphicsLineItem *gridLine;
-        gridLine = static_cast<QGraphicsLineItem*>(lines.at(layout.size()));
+        gridLine = static_cast<QGraphicsLineItem *>(lines.at(layout.size()));
         gridLine->setLine(gridRect.left(), gridRect.top(), gridRect.right(), gridRect.top());
-        gridLine = static_cast<QGraphicsLineItem*>(lines.at(layout.size()+1));
+        gridLine = static_cast<QGraphicsLineItem *>(lines.at(layout.size() + 1));
         gridLine->setLine(gridRect.left(), gridRect.bottom(), gridRect.right(), gridRect.bottom());
     }
 }
diff --git a/src/chartdataset.cpp b/src/chartdataset.cpp
index 00b09653..e1816f1b 100644
--- a/src/chartdataset.cpp
+++ b/src/chartdataset.cpp
@@ -282,7 +282,7 @@ void ChartDataSet::removeAxis(QAbstractAxis *axis)
 
 void ChartDataSet::removeAllSeries()
 {
-    QList<QAbstractSeries*> series =   m_seriesDomainMap.keys();
+    QList<QAbstractSeries *> series =   m_seriesDomainMap.keys();
     foreach (QAbstractSeries *s , series)
         removeSeries(s);
 
diff --git a/src/chartlayout.cpp b/src/chartlayout.cpp
index edffe5ba..ac19e53b 100644
--- a/src/chartlayout.cpp
+++ b/src/chartlayout.cpp
@@ -31,10 +31,10 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
 static const qreal golden_ratio = 0.25;
 
-ChartLayout::ChartLayout(ChartPresenter* presenter):
-    m_presenter(presenter),
-    m_margins(20,20,20,20),
-    m_minChartRect(0,0,200,200)
+ChartLayout::ChartLayout(ChartPresenter *presenter)
+    : m_presenter(presenter),
+      m_margins(20, 20, 20, 20),
+      m_minChartRect(0, 0, 200, 200)
 {
 
 }
@@ -44,67 +44,65 @@ ChartLayout::~ChartLayout()
 
 }
 
-void ChartLayout::setGeometry(const QRectF& rect)
+void ChartLayout::setGeometry(const QRectF &rect)
 {
     if (!rect.isValid())
         return;
 
-    QList<ChartAxis*> axes = m_presenter->axisItems();
-    QList<ChartElement*> charts = m_presenter->chartItems();
-    ChartTitle* title = m_presenter->titleElement();
-    QLegend* legend = m_presenter->legend();
-    ChartBackground* background = m_presenter->backgroundElement();
+    QList<ChartAxis *> axes = m_presenter->axisItems();
+    QList<ChartElement *> charts = m_presenter->chartItems();
+    ChartTitle *title = m_presenter->titleElement();
+    QLegend *legend = m_presenter->legend();
+    ChartBackground *background = m_presenter->backgroundElement();
 
-    QRectF contentGeometry = calculateBackgroundGeometry(rect,background);
+    QRectF contentGeometry = calculateBackgroundGeometry(rect, background);
 
     contentGeometry = calculateContentGeometry(contentGeometry);
 
-    if (title && title->isVisible()) {
-        contentGeometry = calculateTitleGeometry(contentGeometry,title);
-    }
+    if (title && title->isVisible())
+        contentGeometry = calculateTitleGeometry(contentGeometry, title);
 
-    if (legend->isAttachedToChart() && legend->isVisible()) {
-        contentGeometry = calculateLegendGeometry(contentGeometry,legend);
-    }
+    if (legend->isAttachedToChart() && legend->isVisible())
+        contentGeometry = calculateLegendGeometry(contentGeometry, legend);
 
-    contentGeometry = calculateAxisGeometry(contentGeometry,axes);
+    contentGeometry = calculateAxisGeometry(contentGeometry, axes);
 
-    m_chartsRect = calculateChartsGeometry(contentGeometry,charts);
+    m_chartsRect = calculateChartsGeometry(contentGeometry, charts);
 
     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());
+    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());
+    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);
-    QRectF backgroundGeometry = geometry.adjusted(left,top,-right,-bottom);
-    if(background) background->setRect(backgroundGeometry);
+    QRectF backgroundGeometry = geometry.adjusted(left, top, -right, -bottom);
+    if (background)
+        background->setRect(backgroundGeometry);
     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);
+    return minimum.adjusted(0, 0, left + right, top + bottom);
 }
 
 
-QRectF ChartLayout::calculateAxisGeometry(const QRectF& geometry, const QList<ChartAxis*>& axes) const
+QRectF ChartLayout::calculateAxisGeometry(const QRectF &geometry, const QList<ChartAxis *>& axes) const
 {
-
     QSizeF left;
     QSizeF right;
     QSizeF bottom;
@@ -114,77 +112,78 @@ QRectF ChartLayout::calculateAxisGeometry(const QRectF& geometry, const QList<Ch
     int topCount = 0;
     int bottomCount = 0;
 
-    foreach(ChartAxis* axis , axes) {
+    foreach (ChartAxis *axis , axes) {
 
-        if(!axis->isVisible()) continue;
+        if (!axis->isVisible())
+            continue;
 
         QSizeF size = axis->effectiveSizeHint(Qt::MinimumSize);
 
-        switch(axis->alignment()){
+        switch (axis->alignment()) {
         case Qt::AlignLeft:
-           left.setWidth(left.width()+size.width());
-           left.setHeight(qMax(left.height(),size.height()));
-           leftCount++;
-           break;
+            left.setWidth(left.width() + size.width());
+            left.setHeight(qMax(left.height(), size.height()));
+            leftCount++;
+            break;
         case Qt::AlignRight:
-            right.setWidth(right.width()+size.width());
-            right.setHeight(qMax(right.height(),size.height()));
+            right.setWidth(right.width() + size.width());
+            right.setHeight(qMax(right.height(), size.height()));
             rightCount++;
             break;
         case Qt::AlignTop:
-            top.setWidth(qMax(top.width(),size.width()));
-            top.setHeight(top.height()+size.height());
+            top.setWidth(qMax(top.width(), size.width()));
+            top.setHeight(top.height() + size.height());
             topCount++;
             break;
         case Qt::AlignBottom:
-            bottom.setWidth(qMax(bottom.width(),size.width()));
+            bottom.setWidth(qMax(bottom.width(), size.width()));
             bottom.setHeight(bottom.height() + size.height());
             bottomCount++;
             break;
-
         }
     }
 
-    left.setWidth(qMax(qMax(top.width()/2,bottom.width()/2),left.width()));
-    left.setWidth(qMin(left.width(),golden_ratio*geometry.width()));
-    right.setWidth(qMax(qMax(top.width()/2,bottom.width()/2),right.width()));
-    right.setWidth(qMin(right.width(),golden_ratio*geometry.width()));
-    top.setHeight(qMax(qMax(left.height()/2,right.height()/2),top.height()));
-    bottom.setHeight(qMax(qMax(left.height()/2,right.height()/2),bottom.height()));
+    left.setWidth(qMax(qMax(top.width() / 2, bottom.width() / 2), left.width()));
+    left.setWidth(qMin(left.width(), golden_ratio * geometry.width()));
+    right.setWidth(qMax(qMax(top.width() / 2, bottom.width() / 2), right.width()));
+    right.setWidth(qMin(right.width(), golden_ratio * geometry.width()));
+    top.setHeight(qMax(qMax(left.height() / 2, right.height() / 2), top.height()));
+    bottom.setHeight(qMax(qMax(left.height() / 2, right.height() / 2), bottom.height()));
 
-    QRectF chartRect = geometry.adjusted(left.width(),top.height(),-right.width(),-bottom.height());
+    QRectF chartRect = geometry.adjusted(left.width(), top.height(), -right.width(), -bottom.height());
 
-    qreal leftOffset=0;
-    qreal rightOffset=0;
-    qreal topOffset=0;
-    qreal bottomOffset=0;
+    qreal leftOffset = 0;
+    qreal rightOffset = 0;
+    qreal topOffset = 0;
+    qreal bottomOffset = 0;
 
-    foreach(ChartAxis* axis , axes) {
+    foreach(ChartAxis * axis , axes) {
 
-        if(!axis->isVisible()) continue;
+        if (!axis->isVisible())
+            continue;
 
         QSizeF size = axis->effectiveSizeHint(Qt::MinimumSize);
 
-        switch(axis->alignment()){
-        case Qt::AlignLeft:{
-            qreal width = qMin(size.width(),left.width()/leftCount);
-            leftOffset+=width;
-            axis->setGeometry(QRect(chartRect.left()-leftOffset,chartRect.top()-(size.height()+1)/2,width,chartRect.height()+size.height()+2),chartRect);
+        switch (axis->alignment()) {
+        case Qt::AlignLeft: {
+            qreal width = qMin(size.width(), left.width() / leftCount);
+            leftOffset += width;
+            axis->setGeometry(QRect(chartRect.left() - leftOffset, chartRect.top() - (size.height() + 1) / 2, width, chartRect.height() + size.height() + 2), chartRect);
             break;
         }
-        case Qt::AlignRight:{
-            qreal width = qMin(size.width(),right.width()/rightCount);
-            axis->setGeometry(QRect(chartRect.right()+rightOffset,chartRect.top()-(size.height()+1)/2,width,chartRect.height()+size.height()+2),chartRect);
-            rightOffset+=width;
+        case Qt::AlignRight: {
+            qreal width = qMin(size.width(), right.width() / rightCount);
+            axis->setGeometry(QRect(chartRect.right() + rightOffset, chartRect.top() - (size.height() + 1) / 2, width, chartRect.height() + size.height() + 2), chartRect);
+            rightOffset += width;
             break;
         }
         case Qt::AlignTop:
-            axis->setGeometry(QRect(geometry.left(),chartRect.top()-topOffset - size.height(),geometry.width(),size.height()),chartRect);
-            topOffset+=size.height();
+            axis->setGeometry(QRect(geometry.left(), chartRect.top() - topOffset - size.height(), geometry.width(), size.height()), chartRect);
+            topOffset += size.height();
             break;
         case Qt::AlignBottom:
-            axis->setGeometry(QRect(geometry.left(),chartRect.bottom()+bottomOffset,geometry.width(),size.height()),chartRect);
-            bottomOffset+=size.height();
+            axis->setGeometry(QRect(geometry.left(), chartRect.bottom() + bottomOffset, geometry.width(), size.height()), chartRect);
+            bottomOffset += size.height();
             break;
         }
     }
@@ -192,72 +191,73 @@ QRectF ChartLayout::calculateAxisGeometry(const QRectF& geometry, const QList<Ch
     return chartRect;
 }
 
-QRectF ChartLayout::calculateAxisMinimum(const QRectF& minimum, const QList<ChartAxis*>& axes) const
+QRectF ChartLayout::calculateAxisMinimum(const QRectF &minimum, const QList<ChartAxis *>& axes) const
 {
     QSizeF left;
     QSizeF right;
     QSizeF bottom;
     QSizeF top;
 
-    foreach(ChartAxis* axis , axes) {
+    foreach (ChartAxis *axis , axes) {
 
         QSizeF size = axis->effectiveSizeHint(Qt::MinimumSize);
 
-        if(!axis->isVisible()) continue;
+        if (!axis->isVisible())
+            continue;
 
-        switch(axis->alignment()) {
-            case Qt::AlignLeft:
-            left.setWidth(left.width()+size.width());
-            left.setHeight(qMax(left.height()*2,size.height()));
+        switch (axis->alignment()) {
+        case Qt::AlignLeft:
+            left.setWidth(left.width() + size.width());
+            left.setHeight(qMax(left.height() * 2, size.height()));
             break;
-            case Qt::AlignRight:
-            right.setWidth(right.width()+size.width());
-            right.setHeight(qMax(right.height()*2,size.height()));
+        case Qt::AlignRight:
+            right.setWidth(right.width() + size.width());
+            right.setHeight(qMax(right.height() * 2, size.height()));
             break;
-            case Qt::AlignTop:
-            top.setWidth(qMax(top.width(),size.width()));
-            top.setHeight(top.height()+size.height());
+        case Qt::AlignTop:
+            top.setWidth(qMax(top.width(), size.width()));
+            top.setHeight(top.height() + size.height());
             break;
-            case Qt::AlignBottom:
-            bottom.setWidth(qMax(bottom.width(),size.width()));
+        case Qt::AlignBottom:
+            bottom.setWidth(qMax(bottom.width(), size.width()));
             bottom.setHeight(bottom.height() + size.height());
             break;
         }
     }
-    return minimum.adjusted(0,0,left.width() + right.width() + qMax(top.width(),bottom.width()), top.height() + bottom.height() + qMax(left.height(),right.height()));
+    return minimum.adjusted(0, 0, left.width() + right.width() + qMax(top.width(), bottom.width()), top.height() + bottom.height() + qMax(left.height(), right.height()));
 }
 
-QRectF ChartLayout::calculateLegendGeometry(const QRectF& geometry,QLegend* legend) const
+QRectF ChartLayout::calculateLegendGeometry(const QRectF &geometry, QLegend *legend) const
 {
-    QSizeF size = legend->effectiveSizeHint(Qt::PreferredSize,QSizeF(-1,-1));
+    QSizeF size = legend->effectiveSizeHint(Qt::PreferredSize, QSizeF(-1, -1));
     QRectF legendRect;
     QRectF result;
 
     switch (legend->alignment()) {
     case Qt::AlignTop: {
-        legendRect = QRectF(geometry.topLeft(),QSizeF(geometry.width(),size.height()));
-        result = geometry.adjusted(0,legendRect.height(),0,0);
+        legendRect = QRectF(geometry.topLeft(), QSizeF(geometry.width(), size.height()));
+        result = geometry.adjusted(0, legendRect.height(), 0, 0);
         break;
     }
     case Qt::AlignBottom: {
-        legendRect = QRectF(QPointF(geometry.left(),geometry.bottom()-size.height()),QSizeF(geometry.width(),size.height()));
-        result = geometry.adjusted(0,0,0,-legendRect.height());
+        legendRect = QRectF(QPointF(geometry.left(), geometry.bottom() - size.height()), QSizeF(geometry.width(), size.height()));
+        result = geometry.adjusted(0, 0, 0, -legendRect.height());
         break;
     }
     case Qt::AlignLeft: {
-        qreal width = qMin(size.width(),geometry.width()*golden_ratio);
-        legendRect = QRectF(geometry.topLeft(),QSizeF(width,geometry.height()));
-        result = geometry.adjusted(width,0,0,0);
+        qreal width = qMin(size.width(), geometry.width() * golden_ratio);
+        legendRect = QRectF(geometry.topLeft(), QSizeF(width, geometry.height()));
+        result = geometry.adjusted(width, 0, 0, 0);
         break;
     }
     case Qt::AlignRight: {
-        qreal width = qMin(size.width(),geometry.width()*golden_ratio);
-        legendRect = QRectF(QPointF(geometry.right()-width,geometry.top()),QSizeF(width,geometry.height()));
-        result = geometry.adjusted(0,0,-width,0);
+        qreal width = qMin(size.width(), geometry.width() * golden_ratio);
+        legendRect = QRectF(QPointF(geometry.right() - width, geometry.top()), QSizeF(width, geometry.height()));
+        result = geometry.adjusted(0, 0, -width, 0);
         break;
     }
     default: {
-        legendRect = QRectF(0,0,0,0);
+        legendRect = QRectF(0, 0, 0, 0);
         result = geometry;
         break;
     }
@@ -269,59 +269,55 @@ QRectF ChartLayout::calculateLegendGeometry(const QRectF& geometry,QLegend* lege
 }
 
 
-QRectF ChartLayout::calculateChartsGeometry(const QRectF& geometry, const QList<ChartElement*>& charts) const
+QRectF ChartLayout::calculateChartsGeometry(const QRectF &geometry, const QList<ChartElement *>& charts) const
 {
     Q_ASSERT(geometry.isValid());
-
-    foreach(ChartElement* chart, charts)
-    {
+    foreach (ChartElement *chart, charts)
         chart->handleGeometryChanged(geometry);
-    }
-
     return geometry;
 }
 
-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());
+    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();
-    title->setPos(center.x(),title->pos().y());
-    return geometry.adjusted(0,title->boundingRect().height(),0,0);
+    title->setPos(center.x(), title->pos().y());
+    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());
+    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<ChartAxis*> axes = m_presenter->axisItems();
-        ChartTitle* title = m_presenter->titleElement();
-        QLegend* legend = m_presenter->legend();
-        QRectF minimumRect(0,0,0,0);
+    if (which == Qt::MinimumSize) {
+        QList<ChartAxis *> 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);
-        minimumRect = calculateTitleMinimum(minimumRect,title);
-        minimumRect = calculateLegendMinimum(minimumRect,legend);
-        minimumRect = calculateAxisMinimum(minimumRect,axes);
+        minimumRect = calculateTitleMinimum(minimumRect, title);
+        minimumRect = calculateLegendMinimum(minimumRect, legend);
+        minimumRect = calculateAxisMinimum(minimumRect, axes);
         return  minimumRect.united(m_minChartRect).size().toSize();
-    }else
-        return QSize(-1,-1);
+    }
+    return QSize(-1, -1);
 }
 
-void ChartLayout::setMargins(const QMargins& margins)
+void ChartLayout::setMargins(const QMargins &margins)
 {
-    if(m_margins != margins){
+    if (m_margins != margins) {
         m_margins = margins;
         updateGeometry();
     }
diff --git a/src/chartlayout_p.h b/src/chartlayout_p.h
index f3552e72..fa126ef2 100644
--- a/src/chartlayout_p.h
+++ b/src/chartlayout_p.h
@@ -37,37 +37,37 @@ 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);
     QRectF chartsGeometry() const { return m_chartsRect;}
 
 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<ChartAxis*>& axes) const;
-    QRectF calculateLegendGeometry(const QRectF& geometry, QLegend* legend) const;
-    QRectF calculateAxisGeometry(const QRectF& geometry, const QList<ChartAxis*>& axes) const;
-    QRectF calculateChartsGeometry(const QRectF& geometry, const QList<ChartElement*>& charts) 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<ChartAxis*>& 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<ChartAxis *>& axes) const;
+    QRectF calculateLegendGeometry(const QRectF &geometry, QLegend *legend) const;
+    QRectF calculateAxisGeometry(const QRectF &geometry, const QList<ChartAxis *>& axes) const;
+    QRectF calculateChartsGeometry(const QRectF &geometry, const QList<ChartElement *>& charts) 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<ChartAxis *>& 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 9e0c2216..e431ac70 100644
--- a/src/chartpresenter.cpp
+++ b/src/chartpresenter.cpp
@@ -35,15 +35,16 @@
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
-ChartPresenter::ChartPresenter(QChart* chart,ChartDataSet* dataset):QObject(chart),
-m_chart(chart),
-m_dataset(dataset),
-m_chartTheme(0),
-m_options(QChart::NoAnimation),
-m_state(ShowState),
-m_layout(new ChartLayout(this)),
-m_background(0),
-m_title(0)
+ChartPresenter::ChartPresenter(QChart *chart, ChartDataSet *dataset)
+    : QObject(chart),
+      m_chart(chart),
+      m_dataset(dataset),
+      m_chartTheme(0),
+      m_options(QChart::NoAnimation),
+      m_state(ShowState),
+      m_layout(new ChartLayout(this)),
+      m_background(0),
+      m_title(0)
 {
 
 }
@@ -53,17 +54,16 @@ ChartPresenter::~ChartPresenter()
     delete m_chartTheme;
 }
 
-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)){
+    if (m_options.testFlag(QChart::GridAxisAnimations))
         item->setAnimation(new AxisAnimation(item));
-    }
 
-    QObject::connect(domain,SIGNAL(updated()),item,SLOT(handleDomainUpdated()));
-    QObject::connect(axis,SIGNAL(visibleChanged(bool)),this,SLOT(handleAxisVisibleChanged(bool)));
+    QObject::connect(domain, SIGNAL(updated()), item, SLOT(handleDomainUpdated()));
+    QObject::connect(axis, SIGNAL(visibleChanged(bool)), this, SLOT(handleAxisVisibleChanged(bool)));
 
     //initialize
     domain->emitUpdated();
@@ -76,42 +76,42 @@ void ChartPresenter::handleAxisAdded(QAbstractAxis* axis,Domain* domain)
     m_layout->invalidate();
 }
 
-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();
     item->disconnect();
-    QObject::disconnect(this,0,item,0);
+    QObject::disconnect(this, 0, item, 0);
     item->deleteLater();
 }
 
 
-void ChartPresenter::handleSeriesAdded(QAbstractSeries* series,Domain* domain)
+void ChartPresenter::handleSeriesAdded(QAbstractSeries *series, Domain *domain)
 {
     ChartElement *item = series->d_ptr->createGraphics(this);
     Q_ASSERT(item);
     item->setDomain(domain);
 
-    QObject::connect(domain,SIGNAL(updated()),item,SLOT(handleDomainUpdated()));
+    QObject::connect(domain, SIGNAL(updated()), item, SLOT(handleDomainUpdated()));
     //initialize
     item->handleDomainUpdated();
 
-    m_chartItems.insert(series,item);
+    m_chartItems.insert(series, item);
     m_layout->invalidate();
 }
 
-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<QAbstractAxis*, ChartAxis*> i(m_axisItems);
+    QMapIterator<QAbstractAxis *, ChartAxis *> i(m_axisItems);
 
     while (i.hasNext()) {
         i.next();
@@ -141,27 +141,26 @@ void ChartPresenter::selectVisibleAxis()
 
 void ChartPresenter::handleAxisVisibleChanged(bool visible)
 {
-    QAbstractAxis* axis = static_cast<QAbstractAxis*> (sender());
+    QAbstractAxis *axis = static_cast<QAbstractAxis *>(sender());
     Q_ASSERT(axis);
-    if(visible){
+    if (visible) {
 
-        QMapIterator<QAbstractAxis*, ChartAxis*> i(m_axisItems);
+        QMapIterator<QAbstractAxis *, ChartAxis *> i(m_axisItems);
 
         while (i.hasNext()) {
-        i.next();
-        if(i.key()==axis) {
-            continue;
-        }
-        if(i.key()->orientation()==axis->orientation()) {
-            i.key()->setVisible(false);
-        }
+            i.next();
+            if (i.key() == axis)
+                continue;
+            if (i.key()->orientation() == axis->orientation())
+                i.key()->setVisible(false);
         }
     }
 }
 
-void ChartPresenter::setTheme(QChart::ChartTheme theme,bool force)
+void ChartPresenter::setTheme(QChart::ChartTheme theme, bool force)
 {
-    if(m_chartTheme && m_chartTheme->id() == theme) return;
+    if (m_chartTheme && m_chartTheme->id() == theme)
+        return;
     delete m_chartTheme;
     m_chartTheme = ChartTheme::createTheme(theme);
     m_chartTheme->setForced(force);
@@ -182,8 +181,8 @@ QChart::ChartTheme ChartPresenter::theme()
 
 void ChartPresenter::setAnimationOptions(QChart::AnimationOptions options)
 {
-    if(m_options!=options) {
-        m_options=options;
+    if (m_options != options) {
+        m_options = options;
         resetAllElements();
     }
 
@@ -191,37 +190,37 @@ void ChartPresenter::setAnimationOptions(QChart::AnimationOptions options)
 
 void ChartPresenter::resetAllElements()
 {
-    QMapIterator<QAbstractAxis*, ChartAxis*> i(m_axisItems);
+    QMapIterator<QAbstractAxis *, ChartAxis *> i(m_axisItems);
     while (i.hasNext()) {
-           i.next();
-           Domain* domain = i.value()->domain();
-           QAbstractAxis* axis = i.key();
-           handleAxisRemoved(axis);
-           handleAxisAdded(axis,domain);
+        i.next();
+        Domain *domain = i.value()->domain();
+        QAbstractAxis *axis = i.key();
+        handleAxisRemoved(axis);
+        handleAxisAdded(axis, domain);
     }
 
-    QMapIterator<QAbstractSeries*, ChartElement*> j(m_chartItems);
-       while (j.hasNext()) {
-              j.next();
-              Domain* domain = j.value()->domain();
-              QAbstractSeries* series = j.key();
-              handleSeriesRemoved(series);
-              handleSeriesAdded(series,domain);
-       }
+    QMapIterator<QAbstractSeries *, ChartElement *> j(m_chartItems);
+    while (j.hasNext()) {
+        j.next();
+        Domain *domain = j.value()->domain();
+        QAbstractSeries *series = j.key();
+        handleSeriesRemoved(series);
+        handleSeriesAdded(series, domain);
+    }
 
-       layout()->invalidate();
+    layout()->invalidate();
 }
 
 void ChartPresenter::zoomIn(qreal factor)
 {
     QRectF rect = m_layout->chartsGeometry();
-    rect.setWidth(rect.width()/factor);
-    rect.setHeight(rect.height()/factor);
+    rect.setWidth(rect.width() / factor);
+    rect.setHeight(rect.height() / factor);
     rect.moveCenter(m_layout->chartsGeometry().center());
     zoomIn(rect);
 }
 
-void ChartPresenter::zoomIn(const QRectF& rect)
+void ChartPresenter::zoomIn(const QRectF &rect)
 {
     QRectF r = rect.normalized();
     r.translate(-m_layout->chartsGeometry().topLeft());
@@ -229,8 +228,8 @@ void ChartPresenter::zoomIn(const QRectF& rect)
         return;
 
     m_state = ZoomInState;
-    m_statePoint = QPointF(r.center().x()/m_layout->chartsGeometry().width(),r.center().y()/m_layout->chartsGeometry().height());
-    m_dataset->zoomInDomain(r,m_layout->chartsGeometry().size());
+    m_statePoint = QPointF(r.center().x() / m_layout->chartsGeometry().width(), r.center().y() / m_layout->chartsGeometry().height());
+    m_dataset->zoomInDomain(r, m_layout->chartsGeometry().size());
     m_state = ShowState;
 }
 
@@ -242,23 +241,23 @@ void ChartPresenter::zoomOut(qreal factor)
     chartRect.setSize(m_layout->chartsGeometry().size());
 
     QRectF rect;
-    rect.setSize(chartRect.size()/factor);
+    rect.setSize(chartRect.size() / factor);
     rect.moveCenter(chartRect.center());
     if (!rect.isValid())
         return;
-    m_statePoint = QPointF(rect.center().x()/m_layout->chartsGeometry().width(),rect.center().y()/m_layout->chartsGeometry().height());
+    m_statePoint = QPointF(rect.center().x() / m_layout->chartsGeometry().width(), rect.center().y() / m_layout->chartsGeometry().height());
     m_dataset->zoomOutDomain(rect, chartRect.size());
     m_state = ShowState;
 }
 
-void ChartPresenter::scroll(qreal dx,qreal dy)
+void ChartPresenter::scroll(qreal dx, qreal dy)
 {
-    if(dx<0) m_state=ScrollLeftState;
-    if(dx>0) m_state=ScrollRightState;
-    if(dy<0) m_state=ScrollUpState;
-    if(dy>0) m_state=ScrollDownState;
+    if (dx < 0) m_state = ScrollLeftState;
+    if (dx > 0) m_state = ScrollRightState;
+    if (dy < 0) m_state = ScrollUpState;
+    if (dy > 0) m_state = ScrollDownState;
 
-    m_dataset->scrollDomain(dx,dy,m_layout->chartsGeometry().size());
+    m_dataset->scrollDomain(dx, dy, m_layout->chartsGeometry().size());
     m_state = ShowState;
 }
 
@@ -287,21 +286,21 @@ void ChartPresenter::createTitleItem()
 
 void ChartPresenter::handleAnimationFinished()
 {
-   m_animations.removeAll(qobject_cast<ChartAnimation*>(sender()));
-   if(m_animations.empty()) emit animationsFinished();
+    m_animations.removeAll(qobject_cast<ChartAnimation *>(sender()));
+    if (m_animations.empty())
+        emit animationsFinished();
 }
 
-void ChartPresenter::startAnimation(ChartAnimation* animation)
+void ChartPresenter::startAnimation(ChartAnimation *animation)
 {
     if (animation->state() != QAbstractAnimation::Stopped) animation->stop();
-    QObject::connect(animation, SIGNAL(finished()),this,SLOT(handleAnimationFinished()),Qt::UniqueConnection);
-    if(!m_animations.isEmpty()){
+    QObject::connect(animation, SIGNAL(finished()), this, SLOT(handleAnimationFinished()), Qt::UniqueConnection);
+    if (!m_animations.isEmpty())
         m_animations.append(animation);
-    }
     QTimer::singleShot(0, animation, SLOT(start()));
 }
 
-void ChartPresenter::setBackgroundBrush(const QBrush& brush)
+void ChartPresenter::setBackgroundBrush(const QBrush &brush)
 {
     createBackgroundItem();
     m_background->setBrush(brush);
@@ -310,11 +309,12 @@ void ChartPresenter::setBackgroundBrush(const QBrush& brush)
 
 QBrush ChartPresenter::backgroundBrush() const
 {
-    if (!m_background) return QBrush();
+    if (!m_background)
+        return QBrush();
     return m_background->brush();
 }
 
-void ChartPresenter::setBackgroundPen(const QPen& pen)
+void ChartPresenter::setBackgroundPen(const QPen &pen)
 {
     createBackgroundItem();
     m_background->setPen(pen);
@@ -323,11 +323,12 @@ void ChartPresenter::setBackgroundPen(const QPen& pen)
 
 QPen ChartPresenter::backgroundPen() const
 {
-    if (!m_background) return QPen();
+    if (!m_background)
+        return QPen();
     return m_background->pen();
 }
 
-void ChartPresenter::setTitle(const QString& title)
+void ChartPresenter::setTitle(const QString &title)
 {
     createTitleItem();
     m_title->setText(title);
@@ -336,11 +337,12 @@ void ChartPresenter::setTitle(const QString& title)
 
 QString ChartPresenter::title() const
 {
-    if (!m_title) return QString();
+    if (!m_title)
+        return QString();
     return m_title->text();
 }
 
-void ChartPresenter::setTitleFont(const QFont& font)
+void ChartPresenter::setTitleFont(const QFont &font)
 {
     createTitleItem();
     m_title->setFont(font);
@@ -349,7 +351,8 @@ void ChartPresenter::setTitleFont(const QFont& font)
 
 QFont ChartPresenter::titleFont() const
 {
-    if (!m_title)  return QFont();
+    if (!m_title)
+        return QFont();
     return m_title->font();
 }
 
@@ -362,7 +365,8 @@ void ChartPresenter::setTitleBrush(const QBrush &brush)
 
 QBrush ChartPresenter::titleBrush() const
 {
-    if (!m_title) return QBrush();
+    if (!m_title)
+        return QBrush();
     return m_title->brush();
 }
 
@@ -375,7 +379,8 @@ void ChartPresenter::setBackgroundVisible(bool visible)
 
 bool ChartPresenter::isBackgroundVisible() const
 {
-    if (!m_background) return false;
+    if (!m_background)
+        return false;
     return m_background->isVisible();
 }
 
@@ -387,17 +392,18 @@ void ChartPresenter::setBackgroundDropShadowEnabled(bool enabled)
 
 bool ChartPresenter::isBackgroundDropShadowEnabled() const
 {
-    if (!m_background) return false;
+    if (!m_background)
+        return false;
     return m_background->isDropShadowEnabled();
 }
 
 
-ChartLayout* ChartPresenter::layout()
+ChartLayout *ChartPresenter::layout()
 {
     return m_layout;
 }
 
-QLegend* ChartPresenter::legend()
+QLegend *ChartPresenter::legend()
 {
     return m_chart->legend();
 }
@@ -407,22 +413,22 @@ void ChartPresenter::setVisible(bool visible)
     m_chart->setVisible(visible);
 }
 
-ChartBackground* ChartPresenter::backgroundElement()
+ChartBackground *ChartPresenter::backgroundElement()
 {
     return m_background;
 }
 
-QList<ChartAxis*>  ChartPresenter::axisItems() const
+QList<ChartAxis *>  ChartPresenter::axisItems() const
 {
     return m_axisItems.values();
 }
 
-QList<ChartElement*> ChartPresenter::chartItems() const
+QList<ChartElement *> ChartPresenter::chartItems() const
 {
     return m_chartItems.values();
 }
 
-ChartTitle* ChartPresenter::titleElement()
+ChartTitle *ChartPresenter::titleElement()
 {
     return m_title;
 }
diff --git a/src/chartpresenter_p.h b/src/chartpresenter_p.h
index 7466f72b..eb990846 100644
--- a/src/chartpresenter_p.h
+++ b/src/chartpresenter_p.h
@@ -78,29 +78,29 @@ 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<ChartAxis*> axisItems() const;
-    QList<ChartElement*> chartItems() const;
+    QGraphicsItem *rootItem() const { return m_chart; }
+    ChartBackground *backgroundElement();
+    ChartTitle *titleElement();
+    QList<ChartAxis *> axisItems() const;
+    QList<ChartElement *> chartItems() 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);
@@ -114,24 +114,24 @@ public:
 
     void setVisible(bool visible);
 
-    void setTheme(QChart::ChartTheme theme,bool force = true);
+    void setTheme(QChart::ChartTheme theme, bool force = true);
     QChart::ChartTheme theme();
 
     void setAnimationOptions(QChart::AnimationOptions options);
     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 scroll(qreal dx, qreal dy);
 
-    void startAnimation(ChartAnimation* animation);
+    void startAnimation(ChartAnimation *animation);
     State state() const { return m_state; }
     QPointF statePoint() const { return m_statePoint; }
 
     void resetAllElements();
 
-    ChartLayout* layout();
+    ChartLayout *layout();
 
 private:
     void createBackgroundItem();
@@ -139,10 +139,10 @@ 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:
@@ -152,18 +152,18 @@ Q_SIGNALS:
     void animationsFinished();
 
 private:
-    QChart* m_chart;
-    ChartDataSet* m_dataset;
+    QChart *m_chart;
+    ChartDataSet *m_dataset;
     ChartTheme *m_chartTheme;
-    QMap<QAbstractSeries*, ChartElement*> m_chartItems;
-    QMap<QAbstractAxis*, ChartAxis*> m_axisItems;
+    QMap<QAbstractSeries *, ChartElement *> m_chartItems;
+    QMap<QAbstractAxis *, ChartAxis *> m_axisItems;
     QChart::AnimationOptions m_options;
     State m_state;
     QPointF m_statePoint;
-    QList<ChartAnimation*> m_animations;
-    ChartLayout* m_layout;
-    ChartBackground* m_background;
-    ChartTitle* m_title;
+    QList<ChartAnimation *> m_animations;
+    ChartLayout *m_layout;
+    ChartBackground *m_background;
+    ChartTitle *m_title;
 };
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/legend/legendlayout.cpp b/src/legend/legendlayout.cpp
index ac72bf8a..8486840c 100644
--- a/src/legend/legendlayout.cpp
+++ b/src/legend/legendlayout.cpp
@@ -128,25 +128,25 @@ void LegendLayout::setAttachedGeometry(const QRectF &rect)
     switch (m_legend->alignment()) {
     case Qt::AlignTop:
     case Qt::AlignBottom: {
-            QPointF point(0, 0);
-            foreach (LegendMarker *marker, m_legend->d_ptr->markers()) {
-                if (marker->isVisible()) {
-                    marker->setGeometry(geometry);
-                    marker->setPos(point.x(), geometry.height() / 2 - marker->boundingRect().height() / 2);
-                    const QRectF& rect = marker->boundingRect();
-                    size = size.expandedTo(rect.size());
-                    qreal w = rect.width();
-                    m_width += w;
-                    point.setX(point.x() + w);
-                }
+        QPointF point(0, 0);
+        foreach (LegendMarker *marker, m_legend->d_ptr->markers()) {
+            if (marker->isVisible()) {
+                marker->setGeometry(geometry);
+                marker->setPos(point.x(), geometry.height() / 2 - marker->boundingRect().height() / 2);
+                const QRectF &rect = marker->boundingRect();
+                size = size.expandedTo(rect.size());
+                qreal w = rect.width();
+                m_width += w;
+                point.setX(point.x() + w);
             }
-            if (m_width < geometry.width())
-                m_legend->d_ptr->items()->setPos(geometry.width() / 2 - m_width / 2, geometry.top());
-            else
-                m_legend->d_ptr->items()->setPos(geometry.topLeft());
-            m_height = size.height();
         }
-        break;
+        if (m_width < geometry.width())
+            m_legend->d_ptr->items()->setPos(geometry.width() / 2 - m_width / 2, geometry.top());
+        else
+            m_legend->d_ptr->items()->setPos(geometry.topLeft());
+        m_height = size.height();
+    }
+    break;
     case Qt::AlignLeft:
     case Qt::AlignRight: {
         QPointF point(0, 0);
@@ -168,7 +168,7 @@ void LegendLayout::setAttachedGeometry(const QRectF &rect)
             m_legend->d_ptr->items()->setPos(geometry.topLeft());
         m_width = size.width();
         break;
-        }
+    }
     }
 
     m_minOffsetX = -left;
@@ -203,143 +203,143 @@ void LegendLayout::setDettachedGeometry(const QRectF &rect)
 
     switch (m_legend->alignment()) {
     case Qt::AlignTop: {
-            QPointF point(0, 0);
-            m_width = 0;
-            m_height = 0;
-            for (int i = 0; i < markers.count(); i++) {
-                LegendMarker *marker = markers.at(i);
-                if (marker->isVisible()) {
-                    marker->setGeometry(geometry);
-                    marker->setPos(point.x(), point.y());
-                    const QRectF &boundingRect = marker->boundingRect();
-                    qreal w = boundingRect.width();
-                    qreal h = boundingRect.height();
-                    m_width = qMax(m_width, w);
-                    m_height = qMax(m_height, h);
-                    point.setX(point.x() + w);
-                    if (point.x() + w > geometry.left() + geometry.width() - right) {
-                        // Next item would go off rect.
-                        point.setX(0);
-                        point.setY(point.y() + h);
-                        if (i + 1 < markers.count()) {
-                            m_height += h;
-                        }
+        QPointF point(0, 0);
+        m_width = 0;
+        m_height = 0;
+        for (int i = 0; i < markers.count(); i++) {
+            LegendMarker *marker = markers.at(i);
+            if (marker->isVisible()) {
+                marker->setGeometry(geometry);
+                marker->setPos(point.x(), point.y());
+                const QRectF &boundingRect = marker->boundingRect();
+                qreal w = boundingRect.width();
+                qreal h = boundingRect.height();
+                m_width = qMax(m_width, w);
+                m_height = qMax(m_height, h);
+                point.setX(point.x() + w);
+                if (point.x() + w > geometry.left() + geometry.width() - right) {
+                    // Next item would go off rect.
+                    point.setX(0);
+                    point.setY(point.y() + h);
+                    if (i + 1 < markers.count()) {
+                        m_height += h;
                     }
                 }
             }
-            m_legend->d_ptr->items()->setPos(geometry.topLeft());
-
-            m_minOffsetX = -left;
-            m_minOffsetY = -top;
-            m_maxOffsetX = m_width - geometry.width() - right;
-            m_maxOffsetY = m_height - geometry.height() - bottom;
         }
-        break;
+        m_legend->d_ptr->items()->setPos(geometry.topLeft());
+
+        m_minOffsetX = -left;
+        m_minOffsetY = -top;
+        m_maxOffsetX = m_width - geometry.width() - right;
+        m_maxOffsetY = m_height - geometry.height() - bottom;
+    }
+    break;
     case Qt::AlignBottom: {
-            QPointF point(0, geometry.height());
-            m_width = 0;
-            m_height = 0;
-            for (int i = 0; i < markers.count(); i++) {
-                LegendMarker *marker = markers.at(i);
-                if (marker->isVisible()) {
-                    marker->setGeometry(geometry);
-                    const QRectF& boundingRect = marker->boundingRect();
-                    qreal w = boundingRect.width();
-                    qreal h = boundingRect.height();
-                    m_width = qMax(m_width, w);
-                    m_height = qMax(m_height, h);
-                    marker->setPos(point.x(), point.y() - h);
-                    point.setX(point.x() + w);
-                    if (point.x() + w > geometry.left() + geometry.width() - right) {
-                        // Next item would go off rect.
-                        point.setX(0);
-                        point.setY(point.y() - h);
-                        if (i + 1 < markers.count()) {
-                            m_height += h;
-                        }
+        QPointF point(0, geometry.height());
+        m_width = 0;
+        m_height = 0;
+        for (int i = 0; i < markers.count(); i++) {
+            LegendMarker *marker = markers.at(i);
+            if (marker->isVisible()) {
+                marker->setGeometry(geometry);
+                const QRectF &boundingRect = marker->boundingRect();
+                qreal w = boundingRect.width();
+                qreal h = boundingRect.height();
+                m_width = qMax(m_width, w);
+                m_height = qMax(m_height, h);
+                marker->setPos(point.x(), point.y() - h);
+                point.setX(point.x() + w);
+                if (point.x() + w > geometry.left() + geometry.width() - right) {
+                    // Next item would go off rect.
+                    point.setX(0);
+                    point.setY(point.y() - h);
+                    if (i + 1 < markers.count()) {
+                        m_height += h;
                     }
                 }
             }
-            m_legend->d_ptr->items()->setPos(geometry.topLeft());
-
-            m_minOffsetX = -left;
-            m_minOffsetY = -m_height + geometry.height() - top;
-            m_maxOffsetX = m_width - geometry.width() - right;
-            m_maxOffsetY = -bottom;
         }
-        break;
+        m_legend->d_ptr->items()->setPos(geometry.topLeft());
+
+        m_minOffsetX = -left;
+        m_minOffsetY = -m_height + geometry.height() - top;
+        m_maxOffsetX = m_width - geometry.width() - right;
+        m_maxOffsetY = -bottom;
+    }
+    break;
     case Qt::AlignLeft: {
-            QPointF point(0, 0);
-            m_width = 0;
-            m_height = 0;
-            qreal maxWidth = 0;
-            for (int i = 0; i < markers.count(); i++) {
-                LegendMarker *marker = markers.at(i);
-                if (marker->isVisible()) {
-                    marker->setGeometry(geometry);
-                    const QRectF &boundingRect = marker->boundingRect();
-                    qreal w = boundingRect.width();
-                    qreal h = boundingRect.height();
-                    m_height = qMax(m_height, h);
-                    maxWidth = qMax(maxWidth, w);
-                    marker->setPos(point.x(), point.y());
-                    point.setY(point.y() + h);
-                    if (point.y() + h > geometry.bottom() - bottom) {
-                        // Next item would go off rect.
-                        point.setX(point.x() + maxWidth);
-                        point.setY(0);
-                        if (i + 1 < markers.count()) {
-                            m_width += maxWidth;
-                            maxWidth = 0;
-                        }
+        QPointF point(0, 0);
+        m_width = 0;
+        m_height = 0;
+        qreal maxWidth = 0;
+        for (int i = 0; i < markers.count(); i++) {
+            LegendMarker *marker = markers.at(i);
+            if (marker->isVisible()) {
+                marker->setGeometry(geometry);
+                const QRectF &boundingRect = marker->boundingRect();
+                qreal w = boundingRect.width();
+                qreal h = boundingRect.height();
+                m_height = qMax(m_height, h);
+                maxWidth = qMax(maxWidth, w);
+                marker->setPos(point.x(), point.y());
+                point.setY(point.y() + h);
+                if (point.y() + h > geometry.bottom() - bottom) {
+                    // Next item would go off rect.
+                    point.setX(point.x() + maxWidth);
+                    point.setY(0);
+                    if (i + 1 < markers.count()) {
+                        m_width += maxWidth;
+                        maxWidth = 0;
                     }
                 }
             }
-            m_width += maxWidth;
-            m_legend->d_ptr->items()->setPos(geometry.topLeft());
-
-            m_minOffsetX = -left;
-            m_minOffsetY = -top;
-            m_maxOffsetX = m_width - geometry.width() - right;
-            m_maxOffsetY = m_height - geometry.height() - bottom;
         }
-        break;
+        m_width += maxWidth;
+        m_legend->d_ptr->items()->setPos(geometry.topLeft());
+
+        m_minOffsetX = -left;
+        m_minOffsetY = -top;
+        m_maxOffsetX = m_width - geometry.width() - right;
+        m_maxOffsetY = m_height - geometry.height() - bottom;
+    }
+    break;
     case Qt::AlignRight: {
-            QPointF point(geometry.width(), 0);
-            m_width = 0;
-            m_height = 0;
-            qreal maxWidth = 0;
-            for (int i = 0; i < markers.count(); i++) {
-                LegendMarker *marker = markers.at(i);
-                if (marker->isVisible()) {
-                    marker->setGeometry(geometry);
-                    const QRectF &boundingRect = marker->boundingRect();
-                    qreal w = boundingRect.width();
-                    qreal h = boundingRect.height();
-                    m_height = qMax(m_height, h);
-                    maxWidth = qMax(maxWidth, w);
-                    marker->setPos(point.x() - w, point.y());
-                    point.setY(point.y() + h);
-                    if (point.y() + h > geometry.bottom() - bottom) {
-                        // Next item would go off rect.
-                        point.setX(point.x() - maxWidth);
-                        point.setY(0);
-                        if (i + 1 < markers.count()) {
-                            m_width += maxWidth;
-                            maxWidth = 0;
-                        }
+        QPointF point(geometry.width(), 0);
+        m_width = 0;
+        m_height = 0;
+        qreal maxWidth = 0;
+        for (int i = 0; i < markers.count(); i++) {
+            LegendMarker *marker = markers.at(i);
+            if (marker->isVisible()) {
+                marker->setGeometry(geometry);
+                const QRectF &boundingRect = marker->boundingRect();
+                qreal w = boundingRect.width();
+                qreal h = boundingRect.height();
+                m_height = qMax(m_height, h);
+                maxWidth = qMax(maxWidth, w);
+                marker->setPos(point.x() - w, point.y());
+                point.setY(point.y() + h);
+                if (point.y() + h > geometry.bottom() - bottom) {
+                    // Next item would go off rect.
+                    point.setX(point.x() - maxWidth);
+                    point.setY(0);
+                    if (i + 1 < markers.count()) {
+                        m_width += maxWidth;
+                        maxWidth = 0;
                     }
                 }
             }
-            m_width += maxWidth;
-            m_legend->d_ptr->items()->setPos(geometry.topLeft());
-
-            m_minOffsetX = - m_width + geometry.width() - left;
-            m_minOffsetY = -top;
-            m_maxOffsetX = - right;
-            m_maxOffsetY = m_height - geometry.height() - bottom;
         }
-        break;
+        m_width += maxWidth;
+        m_legend->d_ptr->items()->setPos(geometry.topLeft());
+
+        m_minOffsetX = - m_width + geometry.width() - left;
+        m_minOffsetY = -top;
+        m_maxOffsetX = - right;
+        m_maxOffsetY = m_height - geometry.height() - bottom;
+    }
+    break;
     default:
         break;
     }
diff --git a/src/legend/qlegend.cpp b/src/legend/qlegend.cpp
index 78f44b14..7434767f 100644
--- a/src/legend/qlegend.cpp
+++ b/src/legend/qlegend.cpp
@@ -173,7 +173,7 @@ QLegend::QLegend(QChart *chart): QGraphicsWidget(chart),
     setZValue(ChartPresenter::LegendZValue);
     setFlags(QGraphicsItem::ItemClipsChildrenToShape);
     QObject::connect(chart->d_ptr->m_dataset, SIGNAL(seriesAdded(QAbstractSeries*,Domain*)), d_ptr.data(), SLOT(handleSeriesAdded(QAbstractSeries*,Domain*)));
-    QObject::connect(chart->d_ptr->m_dataset, SIGNAL(seriesRemoved(QAbstractSeries*)),d_ptr.data(), SLOT(handleSeriesRemoved(QAbstractSeries*)));
+    QObject::connect(chart->d_ptr->m_dataset, SIGNAL(seriesRemoved(QAbstractSeries*)), d_ptr.data(), SLOT(handleSeriesRemoved(QAbstractSeries*)));
 //    QObject::connect(chart->d_ptr->m_dataset,SIGNAL(seriesUpdated(QAbstractSeries*)),d_ptr.data(),SLOT(handleSeriesUpdated(QAbstractSeries*)));
     setLayout(d_ptr->m_layout);
 }
diff --git a/src/piechart/piesliceitem.cpp b/src/piechart/piesliceitem.cpp
index 1df8382e..c21000f2 100644
--- a/src/piechart/piesliceitem.cpp
+++ b/src/piechart/piesliceitem.cpp
@@ -175,7 +175,7 @@ void PieSliceItem::updateGeometry()
             textCenter = m_data.m_center + offset(centerAngle, m_data.m_radius / 2);
         m_labelTextRect.moveCenter(textCenter);
         break;
-        }
+    }
     case QPieSlice::LabelInsideNormal: {
         QPointF textCenter;
         if (m_data.m_holeRadius > 0)
@@ -184,7 +184,7 @@ void PieSliceItem::updateGeometry()
             textCenter = m_data.m_center + offset(centerAngle, m_data.m_radius / 2);
         m_labelTextRect.moveCenter(textCenter);
         break;
-        }
+    }
     }
 
     //  bounding rect
diff --git a/src/piechart/qpiemodelmapper.cpp b/src/piechart/qpiemodelmapper.cpp
index 3f8cc3c1..4dc7147a 100644
--- a/src/piechart/qpiemodelmapper.cpp
+++ b/src/piechart/qpiemodelmapper.cpp
@@ -26,9 +26,9 @@
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
-QPieModelMapper::QPieModelMapper(QObject *parent) :
-    QObject(parent),
-    d_ptr(new QPieModelMapperPrivate(this))
+QPieModelMapper::QPieModelMapper(QObject *parent)
+    : QObject(parent),
+      d_ptr(new QPieModelMapperPrivate(this))
 {
 }
 
diff --git a/src/piechart/qpieseries.cpp b/src/piechart/qpieseries.cpp
index dbc0f23b..49d79484 100644
--- a/src/piechart/qpieseries.cpp
+++ b/src/piechart/qpieseries.cpp
@@ -409,7 +409,7 @@ bool QPieSeries::append(QList<QPieSlice *> slices)
 
     d->updateDerivativeData();
 
-    foreach (QPieSlice *s, slices) {
+    foreach(QPieSlice * s, slices) {
         connect(s, SIGNAL(valueChanged()), d, SLOT(sliceValueChanged()));
         connect(s, SIGNAL(clicked()), d, SLOT(sliceClicked()));
         connect(s, SIGNAL(hovered(bool)), d, SLOT(sliceHovered(bool)));
diff --git a/src/qchart.cpp b/src/qchart.cpp
index 27d195dc..ca049ecc 100644
--- a/src/qchart.cpp
+++ b/src/qchart.cpp
@@ -104,11 +104,12 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 /*!
  Constructs a chart object which is a child of a\a parent. Parameter \a wFlags is passed to the QGraphicsWidget constructor.
  */
-QChart::QChart(QGraphicsItem *parent, Qt::WindowFlags wFlags) : QGraphicsWidget(parent,wFlags),
-    d_ptr(new QChartPrivate())
+QChart::QChart(QGraphicsItem *parent, Qt::WindowFlags wFlags)
+    : QGraphicsWidget(parent, wFlags),
+      d_ptr(new QChartPrivate())
 {
     d_ptr->m_dataset = new ChartDataSet(this);
-    d_ptr->m_presenter = new ChartPresenter(this,d_ptr->m_dataset);
+    d_ptr->m_presenter = new ChartPresenter(this, d_ptr->m_dataset);
     d_ptr->createConnections();
     d_ptr->m_legend = new LegendScroller(this);
     d_ptr->m_presenter->setTheme(QChart::ChartThemeLight, false);
@@ -124,7 +125,7 @@ QChart::~QChart()
     //delete first presenter , since this is a root of all the graphical items
     setLayout(0);
     delete d_ptr->m_presenter;
-    d_ptr->m_presenter=0;
+    d_ptr->m_presenter = 0;
 }
 
 /*!
@@ -165,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);
 }
@@ -181,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);
 }
@@ -197,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);
 }
@@ -213,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);
 }
@@ -263,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);
 }
 
@@ -303,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);
 }
@@ -312,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);
 }
@@ -353,13 +355,13 @@ QAbstractAxis* QChart::axisY(QAbstractSeries *series) const
  */
 void QChart::createDefaultAxes()
 {
-	d_ptr->m_dataset->createDefaultAxes();
+    d_ptr->m_dataset->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;
 }
@@ -367,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->layout()->setMargins(margins);
 }
@@ -445,7 +447,7 @@ bool QChart::isDropShadowEnabled() const
 
   \sa addSeries(), removeSeries(), removeAllSeries()
 */
-QList<QAbstractSeries*> QChart::series() const
+QList<QAbstractSeries *> QChart::series() const
 {
     return d_ptr->m_dataset->series();
 }
@@ -455,10 +457,11 @@ QList<QAbstractSeries*> QChart::series() const
 
    \sa axisX(), axisY(), setAxisY(), createDefaultAxes()
 */
-void QChart::setAxisX(QAbstractAxis* axis , QAbstractSeries *series)
+void QChart::setAxisX(QAbstractAxis *axis , QAbstractSeries *series)
 {
-    if(axis->alignment()==Qt::AlignLeft || axis->alignment()==Qt::AlignRight) return;
-    d_ptr->m_dataset->setAxis(series,axis,Qt::Horizontal);
+    if (axis->alignment() == Qt::AlignLeft || axis->alignment() == Qt::AlignRight)
+        return;
+    d_ptr->m_dataset->setAxis(series, axis, Qt::Horizontal);
 }
 
 /*!
@@ -466,10 +469,11 @@ void QChart::setAxisX(QAbstractAxis* axis , QAbstractSeries *series)
 
    \sa axisX(), axisY(), setAxisX(), createDefaultAxes()
 */
-void QChart::setAxisY( QAbstractAxis* axis , QAbstractSeries *series)
+void QChart::setAxisY(QAbstractAxis *axis , QAbstractSeries *series)
 {
-    if(axis->alignment()==Qt::AlignTop || axis->alignment()==Qt::AlignBottom) return;
-    d_ptr->m_dataset->setAxis(series,axis,Qt::Vertical);
+    if (axis->alignment() == Qt::AlignTop || axis->alignment() == Qt::AlignBottom)
+        return;
+    d_ptr->m_dataset->setAxis(series, axis, Qt::Vertical);
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -489,10 +493,10 @@ QChartPrivate::~QChartPrivate()
 
 void QChartPrivate::createConnections()
 {
-    QObject::connect(m_dataset,SIGNAL(seriesAdded(QAbstractSeries*,Domain*)),m_presenter,SLOT(handleSeriesAdded(QAbstractSeries*,Domain*)));
-    QObject::connect(m_dataset,SIGNAL(seriesRemoved(QAbstractSeries*)),m_presenter,SLOT(handleSeriesRemoved(QAbstractSeries*)));
-    QObject::connect(m_dataset,SIGNAL(axisAdded(QAbstractAxis*,Domain*)),m_presenter,SLOT(handleAxisAdded(QAbstractAxis*,Domain*)));
-    QObject::connect(m_dataset,SIGNAL(axisRemoved(QAbstractAxis*)),m_presenter,SLOT(handleAxisRemoved(QAbstractAxis*)));
+    QObject::connect(m_dataset, SIGNAL(seriesAdded(QAbstractSeries*,Domain*)), m_presenter, SLOT(handleSeriesAdded(QAbstractSeries*,Domain*)));
+    QObject::connect(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries*)), m_presenter, SLOT(handleSeriesRemoved(QAbstractSeries*)));
+    QObject::connect(m_dataset, SIGNAL(axisAdded(QAbstractAxis*,Domain*)), m_presenter, SLOT(handleAxisAdded(QAbstractAxis*,Domain*)));
+    QObject::connect(m_dataset, SIGNAL(axisRemoved(QAbstractAxis*)), m_presenter, SLOT(handleAxisRemoved(QAbstractAxis*)));
     //QObject::connect(m_presenter, SIGNAL(marginsChanged(QRectF)), q_ptr, SIGNAL(marginsChanged(QRectF)));
 }
 
diff --git a/src/scatterchart/scatterchartitem.cpp b/src/scatterchart/scatterchartitem.cpp
index 82d2b23d..cedbd74f 100644
--- a/src/scatterchart/scatterchartitem.cpp
+++ b/src/scatterchart/scatterchartitem.cpp
@@ -67,7 +67,7 @@ void ScatterChartItem::createPoints(int count)
             const QRectF &rect = item->boundingRect();
             item->setPos(-rect.width() / 2, -rect.height() / 2);
             break;
-            }
+        }
         case QScatterSeries::MarkerShapeRectangle:
             item = new RectangleMarker(0, 0, m_size, m_size, this);
             item->setPos(-m_size / 2, -m_size / 2);
diff --git a/src/xychart/qxymodelmapper.cpp b/src/xychart/qxymodelmapper.cpp
index 8d72dcea..19d66670 100644
--- a/src/xychart/qxymodelmapper.cpp
+++ b/src/xychart/qxymodelmapper.cpp
@@ -29,9 +29,9 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 /*!
     Constructs a mapper object which is a child of \a parent.
 */
-QXYModelMapper::QXYModelMapper(QObject *parent):
-    QObject(parent),
-    d_ptr(new QXYModelMapperPrivate(this))
+QXYModelMapper::QXYModelMapper(QObject *parent)
+    : QObject(parent),
+      d_ptr(new QXYModelMapperPrivate(this))
 {
 }