diff --git a/examples/ekgchart/chartview.h b/examples/ekgchart/chartview.h
index 784f5d7..9e6bfe9 100644
--- a/examples/ekgchart/chartview.h
+++ b/examples/ekgchart/chartview.h
@@ -17,7 +17,7 @@ class ChartView: public QChartView
 {
     Q_OBJECT
 public:
-    ChartView(QWidget* parent=0);
+    ChartView(QWidget* parent = 0);
     virtual ~ChartView();
 
 public slots:
diff --git a/examples/presenterchart/chartview.h b/examples/presenterchart/chartview.h
index 27016aa..dfccacf 100644
--- a/examples/presenterchart/chartview.h
+++ b/examples/presenterchart/chartview.h
@@ -11,7 +11,7 @@ class ChartView: public QChartView
 {
     Q_OBJECT
 public:
-    ChartView(QWidget* parent=0);
+    ChartView(QWidget* parent = 0);
     virtual ~ChartView();
 
 public slots:
diff --git a/src/areachart/areachartitem_p.h b/src/areachart/areachartitem_p.h
index 6130d57..3f86311 100644
--- a/src/areachart/areachartitem_p.h
+++ b/src/areachart/areachartitem_p.h
@@ -22,8 +22,8 @@ public:
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
     QPainterPath shape() const;
 
-    LineChartItem* upperLineItem() const { return m_upper ;}
-    LineChartItem* lowerLineItem() const { return m_lower ;}
+    LineChartItem* upperLineItem() const { return m_upper; }
+    LineChartItem* lowerLineItem() const { return m_lower; }
 
     void updatePath();
 
@@ -55,13 +55,10 @@ private:
 class AreaBoundItem : public LineChartItem
 {
 public:
-    AreaBoundItem(AreaChartItem *item,QLineSeries *lineSeries):LineChartItem(lineSeries,0),
-    m_item(item){
-    };
+    AreaBoundItem(AreaChartItem *item,QLineSeries *lineSeries) : LineChartItem(lineSeries, 0), m_item(item) {}
+    ~AreaBoundItem(){}
 
-    ~AreaBoundItem(){};
-
-    void setLayout(QVector<QPointF> &points){
+    void setLayout(QVector<QPointF> &points) {
         LineChartItem::setLayout(points);
         m_item->updatePath();
     }
diff --git a/src/areachart/qareaseries.h b/src/areachart/qareaseries.h
index 6a9d4a8..e098a33 100644
--- a/src/areachart/qareaseries.h
+++ b/src/areachart/qareaseries.h
@@ -13,14 +13,14 @@ class QTCOMMERCIALCHART_EXPORT QAreaSeries : public QSeries
 {
     Q_OBJECT
 public:
-    QAreaSeries(QLineSeries *upperSeries, QLineSeries *lowerSeries=0);
+    QAreaSeries(QLineSeries *upperSeries, QLineSeries *lowerSeries = 0);
     virtual ~QAreaSeries();
 
 public: // from QChartSeries
-    virtual QSeriesType type() const { return QSeries::SeriesTypeArea;}
+    virtual QSeriesType type() const { return QSeries::SeriesTypeArea; }
 
-    QLineSeries* upperSeries() const { return m_upperSeries;}
-    QLineSeries* lowerSeries() const { return m_lowerSeries;}
+    QLineSeries* upperSeries() const { return m_upperSeries; }
+    QLineSeries* lowerSeries() const { return m_lowerSeries; }
 
     void setPen(const QPen &pen);
     QPen pen() const { return m_pen;}
@@ -29,7 +29,7 @@ public: // from QChartSeries
     QBrush brush() const { return m_brush;}
 
     void setPointsVisible(bool visible);
-    bool pointsVisible() const {return m_pointsVisible;}
+    bool pointsVisible() const { return m_pointsVisible; }
 
 //    bool setModel(QAbstractItemModel* model);
 //    void setModelMappingUpper(int modelX, int modelY, Qt::Orientation orientation = Qt::Vertical);
diff --git a/src/axis/axisitem_p.h b/src/axis/axisitem_p.h
index 68b7689..d052faf 100644
--- a/src/axis/axisitem_p.h
+++ b/src/axis/axisitem_p.h
@@ -18,7 +18,7 @@ public:
     Axis(QChartAxis *axis, ChartPresenter *presenter, AxisType type = X_AXIS);
     ~Axis();
 
-    AxisType axisType() const {return m_type;};
+    AxisType axisType() const { return m_type; }
 
     void setAxisOpacity(qreal opacity);
     qreal axisOpacity() const;
@@ -46,7 +46,7 @@ public:
     void setLabelsFont(const QFont &font);
 
     inline QRectF geometry() const { return m_rect; }
-    inline QVector<qreal> layout() { return m_layoutVector;};
+    inline QVector<qreal> layout() { return m_layoutVector; }
 
 public slots:
     void handleAxisUpdated();
@@ -91,7 +91,7 @@ class AxisItem: public QGraphicsLineItem
 {
 public:
 
-    AxisItem(Axis *axis, QGraphicsItem *parent=0) : QGraphicsLineItem(parent), m_axis(axis) {};
+    AxisItem(Axis *axis, QGraphicsItem *parent = 0) : QGraphicsLineItem(parent), m_axis(axis) {}
 
 protected:
    void mousePressEvent(QGraphicsSceneMouseEvent *event)
diff --git a/src/axis/qchartaxis.h b/src/axis/qchartaxis.h
index 7b7907f..5df7411 100644
--- a/src/axis/qchartaxis.h
+++ b/src/axis/qchartaxis.h
@@ -17,44 +17,44 @@ public:
     ~QChartAxis();
 
     //axis handling
-    bool isAxisVisible() const { return m_axisVisible;};
+    bool isAxisVisible() const { return m_axisVisible; }
     void setAxisVisible(bool visible);
     void setAxisPen(const QPen &pen);
-    QPen axisPen() const { return m_axisPen;};
+    QPen axisPen() const { return m_axisPen; }
 
     //grid handling
-    bool isGridLineVisible() const { return m_gridLineVisible;};
+    bool isGridLineVisible() const { return m_gridLineVisible; }
     void setGridLineVisible(bool visible);
     void setGridLinePen(const QPen &pen);
-    QPen gridLinePen() const {return m_gridLinePen;}
+    QPen gridLinePen() const { return m_gridLinePen; }
 
     //labels handling
-    bool labelsVisible() const { return m_labelsVisible;};
+    bool labelsVisible() const { return m_labelsVisible; }
     void setLabelsVisible(bool visible);
     void setLabelsPen(const QPen &pen);
     QPen labelsPen() const { return m_labelsPen;}
     void setLabelsBrush(const QBrush &brush);
-    QBrush labelsBrush() const { return m_labelsBrush;}
+    QBrush labelsBrush() const { return m_labelsBrush; }
     void setLabelsFont(const QFont &font);
-    QFont labelsFont() const { return m_labelsFont;}
+    QFont labelsFont() const { return m_labelsFont; }
     void setLabelsAngle(int angle);
-    int labelsAngle() const { return m_labelsAngle;};
+    int labelsAngle() const { return m_labelsAngle; }
 
     //shades handling
-    bool shadesVisible() const { return m_shadesVisible;};
+    bool shadesVisible() const { return m_shadesVisible; }
     void setShadesVisible(bool visible);
     void setShadesPen(const QPen &pen);
-    QPen shadesPen() const { return m_shadesPen;}
+    QPen shadesPen() const { return m_shadesPen; }
     void setShadesBrush(const QBrush &brush);
-    QBrush shadesBrush() const { return m_shadesBrush;}
+    QBrush shadesBrush() const { return m_shadesBrush; }
     void setShadesOpacity(qreal opacity);
-    qreal shadesOpacity() const { return m_shadesOpacity;}
+    qreal shadesOpacity() const { return m_shadesOpacity; }
 
     //range handling
     void setMin(qreal min);
-    qreal min() const { return m_min;};
+    qreal min() const { return m_min; }
     void setMax(qreal max);
-    qreal max() const { return m_max;};
+    qreal max() const { return m_max; }
     void setRange(qreal min, qreal max);
 
     //ticks handling
diff --git a/src/chart.cpp b/src/chart.cpp
index 50e95f4..9c64469 100644
--- a/src/chart.cpp
+++ b/src/chart.cpp
@@ -8,7 +8,7 @@ Chart::Chart(ChartPresenter *presenter):QObject(presenter),
     m_animator(0),
     m_presenter(presenter)
 {
-};
+}
 
 void Chart::setAnimator(ChartAnimator* animator)
 {
diff --git a/src/chartdataset_p.h b/src/chartdataset_p.h
index 9264e43..1e140ef 100644
--- a/src/chartdataset_p.h
+++ b/src/chartdataset_p.h
@@ -32,7 +32,7 @@ public:
     Domain* domain(QChartAxis* axis) const;
     QChartAxis* axis(QSeries* series) const;
 
-    QChartAxis* axisX() const { return m_axisX;};
+    QChartAxis* axisX() const { return m_axisX; }
     QChartAxis* axisY(QSeries* series = 0) const;
 
 signals:
diff --git a/src/chartitem_p.h b/src/chartitem_p.h
index f03b64e..1019f41 100644
--- a/src/chartitem_p.h
+++ b/src/chartitem_p.h
@@ -9,9 +9,9 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
 class ChartItem : public QGraphicsItem, public Chart
 {
-    enum ChartItemTypes{ AXIS_ITEM = UserType+1, XYLINE_ITEM};
+    enum ChartItemTypes{ AXIS_ITEM = UserType + 1, XYLINE_ITEM };
 public:
-    ChartItem(ChartPresenter *presenter):QGraphicsItem(presenter?presenter->rootItem():0),Chart(presenter){};
+    ChartItem(ChartPresenter *presenter) : QGraphicsItem(presenter ? presenter->rootItem() : 0), Chart(presenter) {}
 };
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/domain_p.h b/src/domain_p.h
index ecdec4a..3247e29 100644
--- a/src/domain_p.h
+++ b/src/domain_p.h
@@ -23,10 +23,10 @@ public:
     void setMinY(qreal min);
     void setMaxY(qreal max);
 
-    qreal minX() const {return m_minX;};
-    qreal maxX() const {return m_maxX;};
-    qreal minY() const {return m_minY;};
-    qreal maxY() const {return m_maxY;};
+    qreal minX() const { return m_minX; }
+    qreal maxX() const { return m_maxX; }
+    qreal minY() const { return m_minY; }
+    qreal maxY() const { return m_maxY; }
 
     qreal spanX() const;
     qreal spanY() const;
diff --git a/src/qchart.h b/src/qchart.h
index bbb8493..1850793 100644
--- a/src/qchart.h
+++ b/src/qchart.h
@@ -107,7 +107,7 @@ protected:
 protected:
     QScopedPointer<QChartPrivate> d_ptr;
     friend class QChartView;
-    Q_DISABLE_COPY(QChart);
+    Q_DISABLE_COPY(QChart)
 };
 
 QTCOMMERCIALCHART_END_NAMESPACE