diff --git a/examples/Axis/Labels/AdjustedCartesianAxis.h b/examples/Axis/Labels/AdjustedCartesianAxis.h
--- a/examples/Axis/Labels/AdjustedCartesianAxis.h
+++ b/examples/Axis/Labels/AdjustedCartesianAxis.h
@@ -33,7 +33,7 @@
 public:
     explicit AdjustedCartesianAxis( KChart::AbstractCartesianDiagram* diagram = 0 );
 
-    virtual const QString customizedLabel( const QString& label ) const;
+    const QString customizedLabel( const QString& label ) const override;
 
     void setBounds( qreal lower, qreal upper ) {
         m_lowerBound = lower;
diff --git a/examples/DrawIntoPainter/framewidget.h b/examples/DrawIntoPainter/framewidget.h
--- a/examples/DrawIntoPainter/framewidget.h
+++ b/examples/DrawIntoPainter/framewidget.h
@@ -34,7 +34,7 @@
 public:
     explicit FrameWidget( QWidget * parent = 0, Qt::WindowFlags f = 0 );
 
-    virtual void paintEvent( QPaintEvent* );
+    void paintEvent( QPaintEvent* ) override;
 
     void setChart( KChart::Chart* chart );
 
diff --git a/examples/DrawIntoPainter/mainwindow.h b/examples/DrawIntoPainter/mainwindow.h
--- a/examples/DrawIntoPainter/mainwindow.h
+++ b/examples/DrawIntoPainter/mainwindow.h
@@ -47,7 +47,7 @@
     /**
      * Adjusts the two small charts when the window is resized.
      */
-    /* reimp */ void resizeEvent ( QResizeEvent * );
+    void resizeEvent ( QResizeEvent * ) override;
 
 private slots:
 
diff --git a/examples/EmptyValues/mainwindow.h b/examples/EmptyValues/mainwindow.h
--- a/examples/EmptyValues/mainwindow.h
+++ b/examples/EmptyValues/mainwindow.h
@@ -34,7 +34,7 @@
 
 public:
     MainWindow( QWidget* parent = 0 );
-    virtual ~MainWindow() { }
+    ~MainWindow() override { }
 
 private:
     KChart::Chart* m_chart;
diff --git a/examples/Gantt/legend_example/entrydelegate.h b/examples/Gantt/legend_example/entrydelegate.h
--- a/examples/Gantt/legend_example/entrydelegate.h
+++ b/examples/Gantt/legend_example/entrydelegate.h
@@ -30,7 +30,7 @@
 public:
     explicit EntryDelegate( KGantt::ConstraintModel* constraintModel, QObject* parent = 0 );
     
-    bool editorEvent( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index );
+    bool editorEvent( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index ) override;
     
 private:
     void addConstraint(const QModelIndex & index1, const QModelIndex & index2);
diff --git a/examples/Gantt/legend_example/mainwindow.h b/examples/Gantt/legend_example/mainwindow.h
--- a/examples/Gantt/legend_example/mainwindow.h
+++ b/examples/Gantt/legend_example/mainwindow.h
@@ -42,8 +42,8 @@
 
 public:
     explicit MainWindow( QWidget * parent = 0, Qt::WindowFlags flags = 0 );
-    virtual ~MainWindow();
-    virtual void closeEvent(QCloseEvent *event);
+    ~MainWindow() override;
+    void closeEvent(QCloseEvent *event) override;
 
 private slots:
     void addNewEntry();
diff --git a/examples/Gantt/project/mainwindow.cpp b/examples/Gantt/project/mainwindow.cpp
--- a/examples/Gantt/project/mainwindow.cpp
+++ b/examples/Gantt/project/mainwindow.cpp
@@ -85,15 +85,15 @@
 public:
     explicit MyItemDelegate( QObject* parent=0 );
 
-    /*reimp*/ QWidget* createEditor( QWidget* parent,
-                                     const QStyleOptionViewItem& option,
-                                     const QModelIndex& idx ) const;
-    /*reimp*/ void setEditorData( QWidget* editor, const QModelIndex& index ) const;
-    /*reimp*/ void setModelData( QWidget* editor, QAbstractItemModel* model,
-                                  const QModelIndex & index ) const;
+    QWidget* createEditor( QWidget* parent,
+                           const QStyleOptionViewItem& option,
+                           const QModelIndex& idx ) const override;
+    void setEditorData( QWidget* editor, const QModelIndex& index ) const override;
+    void setModelData( QWidget* editor, QAbstractItemModel* model,
+                       const QModelIndex & index ) const override;
 protected:
-    /*reimp*/void drawDisplay( QPainter* painter, const QStyleOptionViewItem & option,
-                               const QRect& rect, const QString& text ) const;
+    void drawDisplay( QPainter* painter, const QStyleOptionViewItem & option,
+                      const QRect& rect, const QString& text ) const override;
 };
 
 MyItemDelegate::MyItemDelegate( QObject* parent )
@@ -159,11 +159,11 @@
         setFreeDays( QSet<Qt::DayOfWeek>() );
         setFreeDaysBrush( QBrush( Qt::NoBrush ) );
     }
-    ~DateTimeGrid() { }
+    ~DateTimeGrid() override { }
 
     //virtual void paintUserDefinedHeader(QPainter* painter, const QRectF& headerRect, const QRectF& exposedRect, qreal offset, const KGantt::DateTimeScaleFormatter* formatter, QWidget* widget = 0);
-    virtual void drawBackground(QPainter* painter, const QRectF& rect);
-    virtual void drawForeground(QPainter* painter, const QRectF& rect);
+    void drawBackground(QPainter* painter, const QRectF& rect) override;
+    void drawForeground(QPainter* painter, const QRectF& rect) override;
 };
 
 void DateTimeGrid::drawBackground(QPainter* painter, const QRectF& rect)
diff --git a/examples/Gantt/project/projectmodel.h b/examples/Gantt/project/projectmodel.h
--- a/examples/Gantt/project/projectmodel.h
+++ b/examples/Gantt/project/projectmodel.h
@@ -26,22 +26,22 @@
     Q_OBJECT
 public:
     explicit ProjectModel( QObject* parent = 0 );
-    virtual ~ProjectModel();
+    ~ProjectModel() override;
 
-    /*reimp*/ int rowCount( const QModelIndex& idx ) const;
-    /*reimp*/ int columnCount( const QModelIndex& idx ) const;
+    int rowCount( const QModelIndex& idx ) const override;
+    int columnCount( const QModelIndex& idx ) const override;
 
-    /*reimp*/ QModelIndex index( int row, int col, const QModelIndex& parent = QModelIndex() ) const;
-    /*reimp*/ QModelIndex parent( const QModelIndex& idx ) const;
+    QModelIndex index( int row, int col, const QModelIndex& parent = QModelIndex() ) const override;
+    QModelIndex parent( const QModelIndex& idx ) const override;
 
-    /*reimp*/QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const;
-    /*reimp*/ QVariant data( const QModelIndex& idx, int role = Qt::DisplayRole ) const;
-    /*reimp*/ bool setData( const QModelIndex& idx,  const QVariant& value,
-                            int role = Qt::DisplayRole );
+    QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const override;
+    QVariant data( const QModelIndex& idx, int role = Qt::DisplayRole ) const override;
+    bool setData( const QModelIndex& idx,  const QVariant& value,
+                  int role = Qt::DisplayRole ) override;
 
-    /*reimp*/ bool insertRows( int row, int count, const QModelIndex& parent = QModelIndex() );
+    bool insertRows( int row, int count, const QModelIndex& parent = QModelIndex() ) override;
 
-    /*reimp*/ Qt::ItemFlags flags( const QModelIndex& ) const;
+    Qt::ItemFlags flags( const QModelIndex& ) const override;
 
     bool load( const QString& filename );
     bool save( const QString& filename );
diff --git a/examples/Lines/Advanced/mainwindow.h b/examples/Lines/Advanced/mainwindow.h
--- a/examples/Lines/Advanced/mainwindow.h
+++ b/examples/Lines/Advanced/mainwindow.h
@@ -36,7 +36,7 @@
     MainWindow( QWidget* parent = 0 );
 
 private:
-    bool eventFilter(QObject* target, QEvent* event);
+    bool eventFilter(QObject* target, QEvent* event) override;
 
 private slots:
 
diff --git a/examples/NoValues/mainwindow.h b/examples/NoValues/mainwindow.h
--- a/examples/NoValues/mainwindow.h
+++ b/examples/NoValues/mainwindow.h
@@ -35,7 +35,7 @@
 
 public:
     MainWindow( QWidget* parent = 0 );
-    virtual ~MainWindow() { }
+    ~MainWindow() override { }
 
 private:
     KChart::Chart* m_chart;
diff --git a/examples/NoValues/mainwindow.cpp b/examples/NoValues/mainwindow.cpp
--- a/examples/NoValues/mainwindow.cpp
+++ b/examples/NoValues/mainwindow.cpp
@@ -42,19 +42,19 @@
         //qDebug() << "EmptyModel::EmptyModel()";
     }
 
-    ~EmptyModel()
+    ~EmptyModel() override
     {
         //qDebug() << "EmptyModel::~EmptyModel()";
     }
 
-    int columnCount( const QModelIndex& parent = QModelIndex() ) const
+    int columnCount( const QModelIndex& parent = QModelIndex() ) const override
     {
         Q_UNUSED( parent );
         //qDebug() << "EmptyModel::columnCount(...)";
         return 0;
     }
 
-    int rowCount( const QModelIndex& parent = QModelIndex() ) const
+    int rowCount( const QModelIndex& parent = QModelIndex() ) const override
     {
         Q_UNUSED( parent );
         //qDebug() << "EmptyModel::rowCount(...)";
@@ -64,24 +64,24 @@
 
     // NOTE: The following method will not be called by KD Chart,
     //       because the model is returning 0 for columnCount() / rowCount().
-    QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const
+    QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const override
     {
         Q_UNUSED( role );
         qDebug() << "EmptyModel::data(" << index.row() << index.column() << ")";
         Q_ASSERT_X( false, "EmptyModel::data", "We should not end here..." );
         return QVariant();
     }
 
-    QModelIndex index( int row, int column, const QModelIndex& parent = QModelIndex() ) const
+    QModelIndex index( int row, int column, const QModelIndex& parent = QModelIndex() ) const override
     {
         Q_UNUSED( row );
         Q_UNUSED( column );
         Q_UNUSED( parent );
         //qDebug() << "EmptyModel::index(" << row << column << ")";
         return QModelIndex();
     }
 
-    QModelIndex parent( const QModelIndex& parent ) const
+    QModelIndex parent( const QModelIndex& parent ) const override
     {
         Q_UNUSED( parent );
         //qDebug() << "EmptyModel::parent(...)";
diff --git a/examples/Plotter/BigDataset/Model.h b/examples/Plotter/BigDataset/Model.h
--- a/examples/Plotter/BigDataset/Model.h
+++ b/examples/Plotter/BigDataset/Model.h
@@ -38,13 +38,13 @@
     };
     Model();
 
-    int columnCount( const QModelIndex& parent ) const;
-    int rowCount( const QModelIndex& parent ) const;
+    int columnCount( const QModelIndex& parent ) const override;
+    int rowCount( const QModelIndex& parent ) const override;
 
-    QModelIndex index( int row, int column, const QModelIndex& parent ) const;
-    QModelIndex parent( const QModelIndex& index ) const;
+    QModelIndex index( int row, int column, const QModelIndex& parent ) const override;
+    QModelIndex parent( const QModelIndex& index ) const override;
 
-    QVariant data( const QModelIndex& index, int role ) const;
+    QVariant data( const QModelIndex& index, int role ) const override;
 
     void setFunction( Function f );
 
diff --git a/examples/Plotter/Timeline/timeaxis.h b/examples/Plotter/Timeline/timeaxis.h
--- a/examples/Plotter/Timeline/timeaxis.h
+++ b/examples/Plotter/Timeline/timeaxis.h
@@ -27,7 +27,7 @@
     Q_OBJECT
 public:
     explicit TimeAxis( KChart::AbstractCartesianDiagram* parent );
-    const QString customizedLabel( const QString& label ) const;
+    const QString customizedLabel( const QString& label ) const override;
 };
 
 
diff --git a/examples/Plotter/Timeline/timechartmodel.h b/examples/Plotter/Timeline/timechartmodel.h
--- a/examples/Plotter/Timeline/timechartmodel.h
+++ b/examples/Plotter/Timeline/timechartmodel.h
@@ -37,10 +37,10 @@
     void setVisibleStart( const QDateTime& start );
     void setVisibleEnd( const QDateTime& end );
 
-    QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const;
+    QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const override;
 
 protected:
-    bool filterAcceptsRow( int source_row, const QModelIndex& source_parent ) const;
+    bool filterAcceptsRow( int source_row, const QModelIndex& source_parent ) const override;
 
 private:
     QPair< QDateTime, QDateTime > range;
diff --git a/examples/Plotter/Timeline/timechartmodel.cpp b/examples/Plotter/Timeline/timechartmodel.cpp
--- a/examples/Plotter/Timeline/timechartmodel.cpp
+++ b/examples/Plotter/Timeline/timechartmodel.cpp
@@ -49,9 +49,6 @@
     setVisibleRange( range.first, end );
 }
 
-/*!
- \reimp
- */
 QVariant TimeChartModel::data( const QModelIndex& index, int role ) const
 {
     const QVariant v = QSortFilterProxyModel::data( index, role );
@@ -61,9 +58,6 @@
         return QDateTime::fromTime_t( 0 ).secsTo( v.toDateTime() ) / 3600.0;
 }
 
-/*!
- \reimp
- */
 bool TimeChartModel::filterAcceptsRow( int source_row, const QModelIndex& source_parent ) const
 {
     const QModelIndex index = sourceModel()->index( source_row, 0, source_parent );
diff --git a/examples/Sql/main.cpp b/examples/Sql/main.cpp
--- a/examples/Sql/main.cpp
+++ b/examples/Sql/main.cpp
@@ -43,14 +43,14 @@
 class TransposeProxyModel : public QAbstractProxyModel{
 public:
   explicit TransposeProxyModel(QObject* parent = 0) : QAbstractProxyModel(parent) {}
-  virtual ~TransposeProxyModel() {}
-  QModelIndex mapFromSource ( const QModelIndex & sourceIndex ) const { return index(sourceIndex.column(), sourceIndex.row()); }
-  QModelIndex mapToSource ( const QModelIndex & proxyIndex ) const { return sourceModel()->index(proxyIndex.column(), proxyIndex.row()); }
-  QModelIndex index(int r, int c, const QModelIndex &ind=QModelIndex()) const { Q_UNUSED(ind) return createIndex(r,c); }
-  QModelIndex parent(const QModelIndex&) const { return QModelIndex(); }
-  int rowCount(const QModelIndex &) const { return sourceModel()->columnCount(); }
-  int columnCount(const QModelIndex &) const { return sourceModel()->rowCount(); }
-  QVariant data(const QModelIndex &ind, int role) const { return sourceModel()->data(mapToSource(ind), role); }
+  ~TransposeProxyModel() override {}
+  QModelIndex mapFromSource ( const QModelIndex & sourceIndex ) const override { return index(sourceIndex.column(), sourceIndex.row()); }
+  QModelIndex mapToSource ( const QModelIndex & proxyIndex ) const override { return sourceModel()->index(proxyIndex.column(), proxyIndex.row()); }
+  QModelIndex index(int r, int c, const QModelIndex &ind=QModelIndex()) const override { Q_UNUSED(ind) return createIndex(r,c); }
+  QModelIndex parent(const QModelIndex&) const override { return QModelIndex(); }
+  int rowCount(const QModelIndex &) const override { return sourceModel()->columnCount(); }
+  int columnCount(const QModelIndex &) const override { return sourceModel()->rowCount(); }
+  QVariant data(const QModelIndex &ind, int role) const override { return sourceModel()->data(mapToSource(ind), role); }
 };
 
 /**
diff --git a/examples/Zoom/Keyboard/zoomwidget.h b/examples/Zoom/Keyboard/zoomwidget.h
--- a/examples/Zoom/Keyboard/zoomwidget.h
+++ b/examples/Zoom/Keyboard/zoomwidget.h
@@ -31,9 +31,9 @@
 
 protected:
     QPointF findNewZoomCenter( const QPoint & pos );
-    void mousePressEvent( QMouseEvent * e );
-    void wheelEvent( QWheelEvent* e );
-    void keyPressEvent( QKeyEvent* e );
+    void mousePressEvent( QMouseEvent * e ) override;
+    void wheelEvent( QWheelEvent* e ) override;
+    void keyPressEvent( QKeyEvent* e ) override;
 };
 
 
diff --git a/examples/demo/axissettings.h b/examples/demo/axissettings.h
--- a/examples/demo/axissettings.h
+++ b/examples/demo/axissettings.h
@@ -33,7 +33,7 @@
 
 public:
     explicit AxisSettings( KChart::Chart *chart, QWidget *parent = 0 );
-    ~AxisSettings();
+    ~AxisSettings() override;
 
 public Q_SLOTS:
     void diagramTypeChanged();
diff --git a/examples/demo/colorslider.h b/examples/demo/colorslider.h
--- a/examples/demo/colorslider.h
+++ b/examples/demo/colorslider.h
@@ -29,18 +29,18 @@
     Q_PROPERTY( QColor endColor READ endColor WRITE setStartColor NOTIFY endColorChanged )
 public:
     explicit ColorSlider( QWidget *parent = 0 );
-    ~ColorSlider();
+    ~ColorSlider() override;
     QColor startColor() const;
     void setStartColor( const QColor &color );
     QColor endColor() const;
     void setEndColor( const QColor &color );
-    QSize sizeHint() const;
+    QSize sizeHint() const override;
 
 protected:
-    void paintEvent( QPaintEvent *event );
-    void mousePressEvent(QMouseEvent *event );
-    void mouseReleaseEvent(QMouseEvent *event );
-    void mouseMoveEvent( QMouseEvent *event );
+    void paintEvent( QPaintEvent *event ) override;
+    void mousePressEvent(QMouseEvent *event ) override;
+    void mouseReleaseEvent(QMouseEvent *event ) override;
+    void mouseMoveEvent( QMouseEvent *event ) override;
 
 Q_SIGNALS:
     void startColorChanged();
diff --git a/examples/demo/datasetsettings.h b/examples/demo/datasetsettings.h
--- a/examples/demo/datasetsettings.h
+++ b/examples/demo/datasetsettings.h
@@ -33,7 +33,7 @@
 
 public:
     explicit DatasetSettings( KChart::Chart *chart, QWidget *parent = 0 );
-    ~DatasetSettings();
+    ~DatasetSettings() override;
     int datasetCount() const;
 public Q_SLOTS:
     void setDatasetCount( int value );
diff --git a/examples/demo/datasetsettings.cpp b/examples/demo/datasetsettings.cpp
--- a/examples/demo/datasetsettings.cpp
+++ b/examples/demo/datasetsettings.cpp
@@ -43,7 +43,7 @@
     Q_OBJECT
 public:
     Private( Chart *chart, DatasetSettings *q, QObject *parent );
-    ~Private();
+    ~Private() override;
 
     Ui::DatasetSettings *ui;
     int m_dataset;
diff --git a/examples/demo/datavaluesettings.h b/examples/demo/datavaluesettings.h
--- a/examples/demo/datavaluesettings.h
+++ b/examples/demo/datavaluesettings.h
@@ -32,7 +32,7 @@
 
 public:
     DataValueSettings( KChart::Chart *chart, QWidget* parent = 0 );
-    ~DataValueSettings();
+    ~DataValueSettings() override;
 
 public Q_SLOTS:
     void refresh();
diff --git a/examples/demo/diagramsettings.h b/examples/demo/diagramsettings.h
--- a/examples/demo/diagramsettings.h
+++ b/examples/demo/diagramsettings.h
@@ -32,7 +32,7 @@
 
 public:
     explicit DiagramSettings( KChart::Chart* chart, QWidget *parent = 0 );
-    ~DiagramSettings();
+    ~DiagramSettings() override;
 
 public Q_SLOTS:
     void refreshSettings();
diff --git a/examples/demo/diagramsettings.cpp b/examples/demo/diagramsettings.cpp
--- a/examples/demo/diagramsettings.cpp
+++ b/examples/demo/diagramsettings.cpp
@@ -47,7 +47,7 @@
     Q_OBJECT
 public:
     Private( Chart *chart = 0, DiagramSettings *q = 0 );
-    ~Private();
+    ~Private() override;
     void init();
     void setThreeDData( const AbstractThreeDAttributes &attr );
 
diff --git a/examples/demo/diagramtypedialog.h b/examples/demo/diagramtypedialog.h
--- a/examples/demo/diagramtypedialog.h
+++ b/examples/demo/diagramtypedialog.h
@@ -36,7 +36,7 @@
     enum DiagramType{ Bar, LyingBar, Line, Plotter, Pie };
     enum Subtype{ Normal, Percent, Stacked };
     explicit DiagramTypeDialog( KChart::Chart *chart, QWidget *parent = 0 );
-    ~DiagramTypeDialog();
+    ~DiagramTypeDialog() override;
 
     void setDefaultModels( QHash< DiagramType, QAbstractItemModel* > models );
 
diff --git a/examples/demo/gradientdialog.h b/examples/demo/gradientdialog.h
--- a/examples/demo/gradientdialog.h
+++ b/examples/demo/gradientdialog.h
@@ -30,7 +30,7 @@
 
 public:
     explicit GradientDialog( QWidget *parent = 0 );
-    ~GradientDialog();
+    ~GradientDialog() override;
     QGradient gradient() const;
     void setGradient( const QGradient &gradient );
     static QGradient getGradient( const QGradient &gradient, QWidget *parent = 0, const QString &title = QString() );
diff --git a/examples/demo/gradientdialog.cpp b/examples/demo/gradientdialog.cpp
--- a/examples/demo/gradientdialog.cpp
+++ b/examples/demo/gradientdialog.cpp
@@ -34,7 +34,7 @@
     Q_OBJECT
 public:
     Private( GradientDialog *qq );
-    ~Private();
+    ~Private() override;
     void init();
     ColorSlider *redSlider;
     ColorSlider *greenSlider;
diff --git a/examples/demo/mainwindow.h b/examples/demo/mainwindow.h
--- a/examples/demo/mainwindow.h
+++ b/examples/demo/mainwindow.h
@@ -27,7 +27,7 @@
     Q_OBJECT
 public:
     explicit MainWindow( QWidget *parent = 0 );
-    ~MainWindow();
+    ~MainWindow() override;
 
 signals:
 
diff --git a/examples/tools/TableModel.h b/examples/tools/TableModel.h
--- a/examples/tools/TableModel.h
+++ b/examples/tools/TableModel.h
@@ -42,24 +42,24 @@
     Q_OBJECT
 public:
     TableModel( QObject* parent = 0 );
-    ~TableModel();
+    ~TableModel() override;
 
     /** Return header data from the model.
         The model will use the first data row and the first data column of the
         physical data as source of column and row header data. This data is not
         exposed as model data, that means, the first model row and column will
         start at index (0, 0).
     */
     QVariant headerData( int section, Qt::Orientation orientation,
-                         int role = Qt::DisplayRole ) const;
+                         int role = Qt::DisplayRole ) const override;
 
-    int rowCount( const QModelIndex& parent = QModelIndex() ) const;
+    int rowCount( const QModelIndex& parent = QModelIndex() ) const override;
 
-    int columnCount( const QModelIndex& parent = QModelIndex() ) const;
+    int columnCount( const QModelIndex& parent = QModelIndex() ) const override;
 
-    QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const;
+    QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const override;
 
-    bool setData( const QModelIndex& index, const QVariant& value, int role = Qt::EditRole );
+    bool setData( const QModelIndex& index, const QVariant& value, int role = Qt::EditRole ) override;
 
     /** Load the table from a comma separated file.
      *
diff --git a/qtests/DrawIntoPainter/framewidget.h b/qtests/DrawIntoPainter/framewidget.h
--- a/qtests/DrawIntoPainter/framewidget.h
+++ b/qtests/DrawIntoPainter/framewidget.h
@@ -34,7 +34,7 @@
 public:
     explicit FrameWidget( QWidget * parent = 0, Qt::WindowFlags f = 0 );
 
-    virtual void paintEvent( QPaintEvent* );
+    void paintEvent( QPaintEvent* ) override;
 
     void setChart( KChart::Chart* chart );
 
diff --git a/qtests/DrawIntoPainter/mainwindow.h b/qtests/DrawIntoPainter/mainwindow.h
--- a/qtests/DrawIntoPainter/mainwindow.h
+++ b/qtests/DrawIntoPainter/mainwindow.h
@@ -46,7 +46,7 @@
         /**
          * Adjusts the two small charts when the window is resized.
          */
-        /* reimp */ void resizeEvent ( QResizeEvent * );
+        void resizeEvent ( QResizeEvent * ) override;
 
 private slots:
 
diff --git a/qtests/ParamVsParam/ModelParamVsParamPlot.h b/qtests/ParamVsParam/ModelParamVsParamPlot.h
--- a/qtests/ParamVsParam/ModelParamVsParamPlot.h
+++ b/qtests/ParamVsParam/ModelParamVsParamPlot.h
@@ -33,17 +33,12 @@
 		int						p_column2,
 		QObject					*p_parent = 0);
 
-	int columnCount(
-		const QModelIndex	&p_parent = QModelIndex()) const;
+	int columnCount(const QModelIndex &p_parent = QModelIndex()) const override;
 
 protected:
-	QVariant data(
-		const QModelIndex		&p_index,
-		int						p_role = Qt::DisplayRole) const;
+	QVariant data(const QModelIndex &p_index, int p_role = Qt::DisplayRole) const override;
 
-	virtual bool filterAcceptsColumn(
-		int						p_source_column,
-		const QModelIndex		&p_source_parent) const;
+	virtual bool filterAcceptsColumn(int p_source_column, const QModelIndex &p_source_parent) const override;
 
 private:
 	int					m_column1;
diff --git a/qtests/ParamVsParam/mainwindow.h b/qtests/ParamVsParam/mainwindow.h
--- a/qtests/ParamVsParam/mainwindow.h
+++ b/qtests/ParamVsParam/mainwindow.h
@@ -40,10 +40,8 @@
 	 Q_OBJECT
 
 public:
-	 MainWindow(
-		 QWidget					*p_parent =	0);
-
-	 virtual	~MainWindow();
+	MainWindow(QWidget *p_parent =	0);
+	~MainWindow() override;
 
 private slots:
 	void timeoutEditingFinished();
diff --git a/qtests/QLayout/main.cpp b/qtests/QLayout/main.cpp
--- a/qtests/QLayout/main.cpp
+++ b/qtests/QLayout/main.cpp
@@ -44,7 +44,7 @@
     }
 
 protected:
-    KDAB_REIMP void resizeEvent( QResizeEvent* ) {
+    KDAB_REIMP void resizeEvent( QResizeEvent* ) override {
         // Note that this is never called unless the widget is shown.
         qDebug() << "resizeEvent " << size();
     }
@@ -55,7 +55,7 @@
 public:
     explicit MyWidgetItem(QWidget *w) : QWidgetItem(w) { }
 
-    KDAB_REIMP bool isEmpty() const { return false; }
+    KDAB_REIMP bool isEmpty() const override { return false; }
 };
 
 class TestQLayout : public QObject
diff --git a/src/KChart/Cartesian/DiagramFlavors/KChartNormalBarDiagram_p.h b/src/KChart/Cartesian/DiagramFlavors/KChartNormalBarDiagram_p.h
--- a/src/KChart/Cartesian/DiagramFlavors/KChartNormalBarDiagram_p.h
+++ b/src/KChart/Cartesian/DiagramFlavors/KChartNormalBarDiagram_p.h
@@ -39,9 +39,9 @@
     public:
         explicit NormalBarDiagram( BarDiagram* );
         virtual ~NormalBarDiagram() {}
-        virtual BarDiagram::BarType type() const;
-        virtual const QPair<QPointF,  QPointF> calculateDataBoundaries() const;
-        virtual void paint( PaintContext* ctx );
+        virtual BarDiagram::BarType type() const override;
+        virtual const QPair<QPointF,  QPointF> calculateDataBoundaries() const override;
+        virtual void paint( PaintContext* ctx ) override;
     };
 
 }
diff --git a/src/KChart/Cartesian/DiagramFlavors/KChartNormalLineDiagram_p.h b/src/KChart/Cartesian/DiagramFlavors/KChartNormalLineDiagram_p.h
--- a/src/KChart/Cartesian/DiagramFlavors/KChartNormalLineDiagram_p.h
+++ b/src/KChart/Cartesian/DiagramFlavors/KChartNormalLineDiagram_p.h
@@ -39,9 +39,9 @@
     public:
         explicit NormalLineDiagram( LineDiagram* );
         virtual ~NormalLineDiagram() {}
-        virtual LineDiagram::LineType type() const;
-        virtual const QPair<QPointF,  QPointF> calculateDataBoundaries() const;
-        virtual void paint( PaintContext* ctx );
+        virtual LineDiagram::LineType type() const override;
+        virtual const QPair<QPointF,  QPointF> calculateDataBoundaries() const override;
+        virtual void paint( PaintContext* ctx ) override;
     };
 
 }
diff --git a/src/KChart/Cartesian/DiagramFlavors/KChartNormalLyingBarDiagram_p.h b/src/KChart/Cartesian/DiagramFlavors/KChartNormalLyingBarDiagram_p.h
--- a/src/KChart/Cartesian/DiagramFlavors/KChartNormalLyingBarDiagram_p.h
+++ b/src/KChart/Cartesian/DiagramFlavors/KChartNormalLyingBarDiagram_p.h
@@ -39,9 +39,9 @@
     public:
         explicit NormalLyingBarDiagram( BarDiagram* );
         virtual ~NormalLyingBarDiagram() {}
-        virtual BarDiagram::BarType type() const;
-        virtual const QPair<QPointF,  QPointF> calculateDataBoundaries() const;
-        virtual void paint( PaintContext* ctx );
+        virtual BarDiagram::BarType type() const override;
+        virtual const QPair<QPointF,  QPointF> calculateDataBoundaries() const override;
+        virtual void paint( PaintContext* ctx ) override;
     };
 
 }
diff --git a/src/KChart/Cartesian/DiagramFlavors/KChartNormalPlotter_p.h b/src/KChart/Cartesian/DiagramFlavors/KChartNormalPlotter_p.h
--- a/src/KChart/Cartesian/DiagramFlavors/KChartNormalPlotter_p.h
+++ b/src/KChart/Cartesian/DiagramFlavors/KChartNormalPlotter_p.h
@@ -40,9 +40,9 @@
     public:
         explicit NormalPlotter( Plotter* );
         virtual ~NormalPlotter() {}
-        virtual Plotter::PlotType type() const;
-        virtual const QPair< QPointF,  QPointF > calculateDataBoundaries() const;
-        virtual void paint( PaintContext* ctx );
+        virtual Plotter::PlotType type() const override;
+        virtual const QPair< QPointF,  QPointF > calculateDataBoundaries() const override;
+        virtual void paint( PaintContext* ctx ) override;
     };
 }
 
diff --git a/src/KChart/Cartesian/DiagramFlavors/KChartPercentBarDiagram_p.h b/src/KChart/Cartesian/DiagramFlavors/KChartPercentBarDiagram_p.h
--- a/src/KChart/Cartesian/DiagramFlavors/KChartPercentBarDiagram_p.h
+++ b/src/KChart/Cartesian/DiagramFlavors/KChartPercentBarDiagram_p.h
@@ -30,9 +30,9 @@
     public:
         explicit PercentBarDiagram( BarDiagram* );
         virtual ~PercentBarDiagram() {}
-        virtual BarDiagram::BarType type() const;
-        virtual const QPair<QPointF,  QPointF> calculateDataBoundaries() const;
-        virtual void paint( PaintContext* ctx );
+        virtual BarDiagram::BarType type() const override;
+        virtual const QPair<QPointF,  QPointF> calculateDataBoundaries() const override;
+        virtual void paint( PaintContext* ctx ) override;
     };
 
 }
diff --git a/src/KChart/Cartesian/DiagramFlavors/KChartPercentLineDiagram_p.h b/src/KChart/Cartesian/DiagramFlavors/KChartPercentLineDiagram_p.h
--- a/src/KChart/Cartesian/DiagramFlavors/KChartPercentLineDiagram_p.h
+++ b/src/KChart/Cartesian/DiagramFlavors/KChartPercentLineDiagram_p.h
@@ -29,9 +29,9 @@
     public:
         explicit PercentLineDiagram( LineDiagram* );
         virtual ~PercentLineDiagram() {}
-        virtual LineDiagram::LineType type() const;
-        virtual const QPair<QPointF,  QPointF> calculateDataBoundaries() const;
-        virtual void paint( PaintContext* ctx );
+        virtual LineDiagram::LineType type() const override;
+        virtual const QPair<QPointF,  QPointF> calculateDataBoundaries() const override;
+        virtual void paint( PaintContext* ctx ) override;
     };
 
 }
diff --git a/src/KChart/Cartesian/DiagramFlavors/KChartPercentLyingBarDiagram_p.h b/src/KChart/Cartesian/DiagramFlavors/KChartPercentLyingBarDiagram_p.h
--- a/src/KChart/Cartesian/DiagramFlavors/KChartPercentLyingBarDiagram_p.h
+++ b/src/KChart/Cartesian/DiagramFlavors/KChartPercentLyingBarDiagram_p.h
@@ -29,9 +29,9 @@
     public:
         explicit PercentLyingBarDiagram( BarDiagram* );
         virtual ~PercentLyingBarDiagram() {}
-        virtual BarDiagram::BarType type() const;
-        virtual const QPair<QPointF,  QPointF> calculateDataBoundaries() const;
-        virtual void paint( PaintContext* ctx );
+        virtual BarDiagram::BarType type() const override;
+        virtual const QPair<QPointF,  QPointF> calculateDataBoundaries() const override;
+        virtual void paint( PaintContext* ctx ) override;
     };
 
 }
diff --git a/src/KChart/Cartesian/DiagramFlavors/KChartPercentPlotter_p.h b/src/KChart/Cartesian/DiagramFlavors/KChartPercentPlotter_p.h
--- a/src/KChart/Cartesian/DiagramFlavors/KChartPercentPlotter_p.h
+++ b/src/KChart/Cartesian/DiagramFlavors/KChartPercentPlotter_p.h
@@ -29,9 +29,9 @@
     public:
         explicit PercentPlotter( Plotter* );
         virtual ~PercentPlotter() {}
-        virtual Plotter::PlotType type() const;
-        virtual const QPair< QPointF,  QPointF > calculateDataBoundaries() const;
-        virtual void paint( PaintContext* ctx );
+        virtual Plotter::PlotType type() const override;
+        virtual const QPair< QPointF,  QPointF > calculateDataBoundaries() const override;
+        virtual void paint( PaintContext* ctx ) override;
     };
 }
 
diff --git a/src/KChart/Cartesian/DiagramFlavors/KChartStackedBarDiagram_p.h b/src/KChart/Cartesian/DiagramFlavors/KChartStackedBarDiagram_p.h
--- a/src/KChart/Cartesian/DiagramFlavors/KChartStackedBarDiagram_p.h
+++ b/src/KChart/Cartesian/DiagramFlavors/KChartStackedBarDiagram_p.h
@@ -29,9 +29,9 @@
     public:
         explicit StackedBarDiagram( BarDiagram* );
         virtual ~StackedBarDiagram() {}
-        virtual BarDiagram::BarType type() const;
-        virtual const QPair<QPointF,  QPointF> calculateDataBoundaries() const;
-        virtual void paint( PaintContext* ctx );
+        virtual BarDiagram::BarType type() const override;
+        virtual const QPair<QPointF,  QPointF> calculateDataBoundaries() const override;
+        virtual void paint( PaintContext* ctx ) override;
     };
 
 }
diff --git a/src/KChart/Cartesian/DiagramFlavors/KChartStackedLineDiagram_p.h b/src/KChart/Cartesian/DiagramFlavors/KChartStackedLineDiagram_p.h
--- a/src/KChart/Cartesian/DiagramFlavors/KChartStackedLineDiagram_p.h
+++ b/src/KChart/Cartesian/DiagramFlavors/KChartStackedLineDiagram_p.h
@@ -29,9 +29,9 @@
     public:
         explicit StackedLineDiagram( LineDiagram* );
         virtual ~StackedLineDiagram() {}
-        virtual LineDiagram::LineType type() const;
-        virtual const QPair<QPointF,  QPointF> calculateDataBoundaries() const;
-        virtual void paint( PaintContext* ctx );
+        virtual LineDiagram::LineType type() const override;
+        virtual const QPair<QPointF,  QPointF> calculateDataBoundaries() const override;
+        virtual void paint( PaintContext* ctx ) override;
     };
 
 }
diff --git a/src/KChart/Cartesian/DiagramFlavors/KChartStackedLyingBarDiagram_p.h b/src/KChart/Cartesian/DiagramFlavors/KChartStackedLyingBarDiagram_p.h
--- a/src/KChart/Cartesian/DiagramFlavors/KChartStackedLyingBarDiagram_p.h
+++ b/src/KChart/Cartesian/DiagramFlavors/KChartStackedLyingBarDiagram_p.h
@@ -29,9 +29,9 @@
     public:
         explicit StackedLyingBarDiagram( BarDiagram* );
         virtual ~StackedLyingBarDiagram() {}
-        virtual BarDiagram::BarType type() const;
-        virtual const QPair<QPointF,  QPointF> calculateDataBoundaries() const;
-        virtual void paint( PaintContext* ctx );
+        virtual BarDiagram::BarType type() const override;
+        virtual const QPair<QPointF,  QPointF> calculateDataBoundaries() const override;
+        virtual void paint( PaintContext* ctx ) override;
     };
 
 }
diff --git a/src/KChart/Cartesian/DiagramFlavors/KChartStackedPlotter_p.h b/src/KChart/Cartesian/DiagramFlavors/KChartStackedPlotter_p.h
--- a/src/KChart/Cartesian/DiagramFlavors/KChartStackedPlotter_p.h
+++ b/src/KChart/Cartesian/DiagramFlavors/KChartStackedPlotter_p.h
@@ -37,9 +37,9 @@
     public:
         explicit StackedPlotter( Plotter* );
         virtual ~StackedPlotter() {}
-        virtual Plotter::PlotType type() const;
-        virtual const QPair< QPointF,  QPointF > calculateDataBoundaries() const;
-        virtual void paint( PaintContext* ctx );
+        virtual Plotter::PlotType type() const override;
+        virtual const QPair< QPointF,  QPointF > calculateDataBoundaries() const override;
+        virtual void paint( PaintContext* ctx ) override;
         double interpolateMissingValue( const CartesianDiagramDataCompressor::CachePosition& pos ) const;
     };
 }
diff --git a/src/KChart/Cartesian/KChartAbstractCartesianDiagram.h b/src/KChart/Cartesian/KChartAbstractCartesianDiagram.h
--- a/src/KChart/Cartesian/KChartAbstractCartesianDiagram.h
+++ b/src/KChart/Cartesian/KChartAbstractCartesianDiagram.h
@@ -86,8 +86,7 @@
           * Normally you don't need to call this method. It's handled automatically for you.
          */
         virtual void layoutPlanes();
-        /** \reimpl */
-        virtual void setCoordinatePlane( AbstractCoordinatePlane* plane );
+        void setCoordinatePlane( AbstractCoordinatePlane* plane ) override;
 
         /**
           * Makes this diagram use another diagram \a diagram as reference diagram with relative offset
@@ -108,12 +107,9 @@
           */
         virtual QPointF referenceDiagramOffset() const;
 
-        /* reimpl */
-        void setModel( QAbstractItemModel* model );
-        /* reimpl */
-        void setRootIndex( const QModelIndex& index );
-        /* reimpl */
-        void setAttributesModel( AttributesModel* model );
+        void setModel( QAbstractItemModel* model ) override;
+        void setRootIndex( const QModelIndex& index ) override;
+        void setAttributesModel( AttributesModel* model ) override;
 
     protected Q_SLOTS:
         void connectAttributesModel( AttributesModel* );
diff --git a/src/KChart/Cartesian/KChartAbstractCartesianDiagram_p.h b/src/KChart/Cartesian/KChartAbstractCartesianDiagram_p.h
--- a/src/KChart/Cartesian/KChartAbstractCartesianDiagram_p.h
+++ b/src/KChart/Cartesian/KChartAbstractCartesianDiagram_p.h
@@ -63,10 +63,9 @@
         {
         }
 
-    /** \reimpl */
     virtual CartesianDiagramDataCompressor::AggregatedDataValueAttributes aggregatedAttrs(
             const QModelIndex & index,
-            const CartesianDiagramDataCompressor::CachePosition * position ) const
+            const CartesianDiagramDataCompressor::CachePosition * position ) const override
     {
         if ( position )
             return compressor.aggregatedAttrs( diagram, index, *position );
diff --git a/src/KChart/Cartesian/KChartBarDiagram.h b/src/KChart/Cartesian/KChartBarDiagram.h
--- a/src/KChart/Cartesian/KChartBarDiagram.h
+++ b/src/KChart/Cartesian/KChartBarDiagram.h
@@ -50,7 +50,7 @@
 
     explicit BarDiagram(
         QWidget* parent = 0, CartesianCoordinatePlane* plane = 0 );
-    virtual ~BarDiagram();
+    ~BarDiagram() override;
 
     virtual BarDiagram * clone() const;
     /**
@@ -88,31 +88,26 @@
 
 #if defined(Q_COMPILER_MANGLES_RETURN_TYPE)
     // implement AbstractCartesianDiagram
-    /** \reimpl */
-    const int numberOfAbscissaSegments () const;
-    /** \reimpl */
-    const int numberOfOrdinateSegments () const;
+    const int numberOfAbscissaSegments () const override;
+    const int numberOfOrdinateSegments () const override;
 #else
     // implement AbstractCartesianDiagram
-    /** \reimpl */
-    int numberOfAbscissaSegments () const;
-    /** \reimpl */
-    int numberOfOrdinateSegments () const;
+    int numberOfAbscissaSegments () const override;
+    int numberOfOrdinateSegments () const override;
 #endif
 
 protected:
-    void paint ( PaintContext* paintContext );
+    void paint ( PaintContext* paintContext ) override;
 
 public:
-    void resize ( const QSizeF& area );
+    void resize ( const QSizeF& area ) override;
 
 protected:
-    virtual qreal threeDItemDepth( const QModelIndex & index ) const;
-    virtual qreal threeDItemDepth( int column ) const;
-    /** \reimpl */
-    const QPair<QPointF, QPointF> calculateDataBoundaries() const;
-    void paintEvent ( QPaintEvent* );
-    void resizeEvent ( QResizeEvent* );
+    qreal threeDItemDepth( const QModelIndex & index ) const override;
+    qreal threeDItemDepth( int column ) const override;
+    const QPair<QPointF, QPointF> calculateDataBoundaries() const override;
+    void paintEvent ( QPaintEvent* ) override;
+    void resizeEvent ( QResizeEvent* ) override;
 private:
 
     void calculateValueAndGapWidths( int rowCount, int colCount,
diff --git a/src/KChart/Cartesian/KChartCartesianAxis.h b/src/KChart/Cartesian/KChartCartesianAxis.h
--- a/src/KChart/Cartesian/KChartCartesianAxis.h
+++ b/src/KChart/Cartesian/KChartCartesianAxis.h
@@ -62,17 +62,15 @@
           * \sa AbstractCartesianDiagram::addAxis
           */
         explicit CartesianAxis ( AbstractCartesianDiagram* diagram = 0 );
-        ~CartesianAxis();
+        ~CartesianAxis() override;
 
         /**
          * Returns true if both axes have the same settings.
          */
         bool compare( const CartesianAxis* other ) const;
 
-        /** reimpl */
-        virtual void paint( QPainter* );
-        /** reimpl */
-        virtual void paintCtx( PaintContext* );
+        void paint( QPainter* ) override;
+        void paintCtx( PaintContext* ) override;
 
         /**
          * Sets the optional text displayed as chart title.
@@ -157,20 +155,13 @@
          */
         int customTickLength() const;
 
-        /** pure virtual in QLayoutItem */
-        virtual bool isEmpty() const;
-        /** pure virtual in QLayoutItem */
-        virtual Qt::Orientations expandingDirections() const;
-        /** pure virtual in QLayoutItem */
-        virtual QSize maximumSize() const;
-        /** pure virtual in QLayoutItem */
-        virtual QSize minimumSize() const;
-        /** pure virtual in QLayoutItem */
-        virtual QSize sizeHint() const;
-        /** pure virtual in QLayoutItem */
-        virtual void setGeometry( const QRect& r );
-        /** pure virtual in QLayoutItem */
-        virtual QRect geometry() const;
+        bool isEmpty() const override;
+        Qt::Orientations expandingDirections() const override;
+        QSize maximumSize() const override;
+        QSize minimumSize() const override;
+        QSize sizeHint() const override;
+        void setGeometry( const QRect& r ) override;
+        QRect geometry() const override;
 
     public Q_SLOTS:
         void setCachedSizeDirty() const;
diff --git a/src/KChart/Cartesian/KChartCartesianCoordinatePlane.h b/src/KChart/Cartesian/KChartCartesianCoordinatePlane.h
--- a/src/KChart/Cartesian/KChartCartesianCoordinatePlane.h
+++ b/src/KChart/Cartesian/KChartCartesianCoordinatePlane.h
@@ -45,9 +45,9 @@
 
     public:
         explicit CartesianCoordinatePlane ( Chart* parent = 0 );
-        ~CartesianCoordinatePlane();
+        ~CartesianCoordinatePlane() override;
 
-        void addDiagram ( AbstractDiagram* diagram );
+        void addDiagram ( AbstractDiagram* diagram ) override;
 
         /**
          * If @p onOff is true, enforce that X and Y distances are scaled by the same factor.
@@ -58,39 +58,39 @@
 
         bool doesIsometricScaling() const;
 
-        const QPointF translate ( const QPointF& diagramPoint ) const;
+        const QPointF translate ( const QPointF& diagramPoint ) const override;
 
         /**
          * \sa setZoomFactorX, setZoomCenter
          */
-        virtual qreal zoomFactorX() const;
+        qreal zoomFactorX() const override;
         /**
          * \sa setZoomFactorY, setZoomCenter
          */
-        virtual qreal zoomFactorY() const;
+        qreal zoomFactorY() const override;
 
         /**
          * \sa setZoomFactorX,setZoomFactorY
          */
-        virtual void setZoomFactors( qreal factorX, qreal factorY );
+        void setZoomFactors( qreal factorX, qreal factorY ) override;
         /**
          * \sa zoomFactorX, setZoomCenter
          */
-        virtual void setZoomFactorX( qreal factor );
+        void setZoomFactorX( qreal factor ) override;
         /**
          * \sa zoomFactorY, setZoomCenter
          */
-        virtual void setZoomFactorY( qreal factor );
+        void setZoomFactorY( qreal factor ) override;
 
         /**
          * \sa setZoomCenter, setZoomFactorX, setZoomFactorY
          */
-        virtual QPointF zoomCenter() const;
+        QPointF zoomCenter() const override;
 
         /**
          * \sa zoomCenter, setZoomFactorX, setZoomFactorY
          */
-        virtual void setZoomCenter( const QPointF& center );
+        void setZoomCenter( const QPointF& center ) override;
 
         /**
          * Allows to specify a fixed data-space / coordinate-space relation. If set
@@ -371,11 +371,9 @@
         /** Specifies the calculation mode for all Abscissa axes */
         void setAxesCalcModeX( AxesCalcMode mode );
 
-        /** reimpl */
-        virtual void paint( QPainter* );
+        void paint( QPainter* ) override;
 
-        /** reimpl */
-        AbstractCoordinatePlane* sharedAxisMasterPlane( QPainter* p = 0 );
+        AbstractCoordinatePlane* sharedAxisMasterPlane( QPainter* p = 0 ) override;
 
         /**
          * Returns the currently visible data range. Might be greater than the
@@ -434,10 +432,9 @@
         /**
          * reimplemented from AbstractCoordinatePlane
          */
-        void setGeometry( const QRect& r );
+        void setGeometry( const QRect& r ) override;
 
-        // reimplemented
-        Qt::Orientations expandingDirections() const;
+        Qt::Orientations expandingDirections() const override;
 
 
     public Q_SLOTS:
@@ -468,26 +465,26 @@
         QRectF adjustedToMaxEmptyInnerPercentage(
                 const QRectF& r, unsigned int percentX, unsigned int percentY ) const;
         virtual QRectF calculateRawDataBoundingRect() const;
-        virtual DataDimensionsList getDataDimensionsList() const;
+        DataDimensionsList getDataDimensionsList() const override;
         // the whole drawing area, includes diagrams and axes, but maybe smaller
         // than (width, height):
         virtual QRectF drawingArea() const;
     public:
         const QPointF translateBack( const QPointF& screenPoint ) const;
     protected:
         void paintEvent ( QPaintEvent* );
-        void layoutDiagrams();
+        void layoutDiagrams() override;
         // the following three return true if the new value is different from the old
         bool doneSetZoomFactorX( qreal factor );
         bool doneSetZoomFactorY( qreal factor );
         bool doneSetZoomCenter( const QPointF& center );
 
         void handleFixedDataCoordinateSpaceRelation( const QRectF& geometry );
 
         // reimplemented from QLayoutItem, via AbstractLayoutItem, AbstractArea, AbstractCoordinatePlane
-        bool hasHeightForWidth() const;
-        int heightForWidth( int w ) const;
-        QSize sizeHint() const;
+        bool hasHeightForWidth() const override;
+        int heightForWidth( int w ) const override;
+        QSize sizeHint() const override;
 
     protected Q_SLOTS:
         void slotLayoutChanged( AbstractDiagram* );
diff --git a/src/KChart/Cartesian/KChartCartesianCoordinatePlane_p.h b/src/KChart/Cartesian/KChartCartesianCoordinatePlane_p.h
--- a/src/KChart/Cartesian/KChartCartesianCoordinatePlane_p.h
+++ b/src/KChart/Cartesian/KChartCartesianCoordinatePlane_p.h
@@ -51,7 +51,7 @@
     explicit Private();
     virtual ~Private() {  }
 
-    virtual void initialize()
+    void initialize() override
     {
         bPaintIsRunning = false;
         coordinateTransformation.axesCalcModeX = Linear;
@@ -64,7 +64,7 @@
         return static_cast< Private * >( plane->d_func() );
     }
 
-    virtual bool isVisiblePoint( const AbstractCoordinatePlane * plane, const QPointF& point ) const
+    bool isVisiblePoint( const AbstractCoordinatePlane * plane, const QPointF& point ) const override
     {
         QPointF p = point;
         const CartesianCoordinatePlane* const ref =
diff --git a/src/KChart/Cartesian/KChartCartesianGrid.h b/src/KChart/Cartesian/KChartCartesianGrid.h
--- a/src/KChart/Cartesian/KChartCartesianGrid.h
+++ b/src/KChart/Cartesian/KChartCartesianGrid.h
@@ -50,14 +50,14 @@
         int maximalSteps() const;
         void setMaximalSteps(int maxsteps);
 
-        void drawGrid( PaintContext* context );
+        void drawGrid( PaintContext* context ) override;
 
     private:
         int m_minsteps;
         int m_maxsteps;
         
         DataDimensionsList calculateGrid(
-            const DataDimensionsList& rawDataDimensions ) const;
+            const DataDimensionsList& rawDataDimensions ) const override;
 
         /**
          * Helper function called by calculateGrid() to calculate the grid of one dimension.
diff --git a/src/KChart/Cartesian/KChartLeveyJenningsAxis.h b/src/KChart/Cartesian/KChartLeveyJenningsAxis.h
--- a/src/KChart/Cartesian/KChartLeveyJenningsAxis.h
+++ b/src/KChart/Cartesian/KChartLeveyJenningsAxis.h
@@ -57,7 +57,7 @@
           * \sa AbstractCartesianDiagram::addAxis
           */
         explicit LeveyJenningsAxis ( LeveyJenningsDiagram* diagram = 0 );
-        ~LeveyJenningsAxis();
+        ~LeveyJenningsAxis() override;
 
         LeveyJenningsGridAttributes::GridType type() const;
         void setType( LeveyJenningsGridAttributes::GridType type );
@@ -70,8 +70,7 @@
          */
         bool compare( const LeveyJenningsAxis* other ) const;
 
-        /** reimpl */
-        void paintCtx( PaintContext* );
+        void paintCtx( PaintContext* ) override;
 
     protected:
         virtual void paintAsOrdinate( PaintContext* );
diff --git a/src/KChart/Cartesian/KChartLeveyJenningsCoordinatePlane.h b/src/KChart/Cartesian/KChartLeveyJenningsCoordinatePlane.h
--- a/src/KChart/Cartesian/KChartLeveyJenningsCoordinatePlane.h
+++ b/src/KChart/Cartesian/KChartLeveyJenningsCoordinatePlane.h
@@ -47,7 +47,7 @@
         explicit LeveyJenningsCoordinatePlane( Chart* parent = 0 );
         ~LeveyJenningsCoordinatePlane();
 
-        void addDiagram( AbstractDiagram* diagram );
+        void addDiagram( AbstractDiagram* diagram ) override;
 
         LeveyJenningsGridAttributes gridAttributes() const;
         void setGridAttributes( const LeveyJenningsGridAttributes& attr );
diff --git a/src/KChart/Cartesian/KChartLeveyJenningsCoordinatePlane_p.h b/src/KChart/Cartesian/KChartLeveyJenningsCoordinatePlane_p.h
--- a/src/KChart/Cartesian/KChartLeveyJenningsCoordinatePlane_p.h
+++ b/src/KChart/Cartesian/KChartLeveyJenningsCoordinatePlane_p.h
@@ -57,7 +57,7 @@
             // grid is delete in base class dtor
         }
 
-        virtual void initialize()
+        void initialize() override
         {
             grid = new LeveyJenningsGrid();
         }
diff --git a/src/KChart/Cartesian/KChartLeveyJenningsDiagram.h b/src/KChart/Cartesian/KChartLeveyJenningsDiagram.h
--- a/src/KChart/Cartesian/KChartLeveyJenningsDiagram.h
+++ b/src/KChart/Cartesian/KChartLeveyJenningsDiagram.h
@@ -50,9 +50,9 @@
 
 public:
     explicit LeveyJenningsDiagram( QWidget* parent = 0, LeveyJenningsCoordinatePlane* plane = 0 );
-    virtual ~LeveyJenningsDiagram();
+    ~LeveyJenningsDiagram() override;
 
-    virtual LineDiagram * clone() const;
+    LineDiagram * clone() const override;
 
     enum Symbol
     {
@@ -98,14 +98,13 @@
     void setSymbol( Symbol symbol, const QString& filename );
     QString symbol( Symbol symbol ) const;
 
-    /* \reimpl */
-    void setModel( QAbstractItemModel* model );
+    void setModel( QAbstractItemModel* model ) override;
 
     QPair< QDateTime, QDateTime > timeRange() const;
     void setTimeRange( const QPair< QDateTime, QDateTime >& timeRange );
 
 protected:
-    void paint( PaintContext* paintContext );
+    void paint( PaintContext* paintContext ) override;
     void drawChanges( PaintContext* paintContext );
 
     virtual void drawDataPointSymbol( PaintContext* paintContext, const QPointF& pos, bool ok );
@@ -117,8 +116,7 @@
 
     QSvgRenderer* iconRenderer( Symbol symbol );
 
-    /** \reimpl */
-    const QPair<QPointF, QPointF> calculateDataBoundaries() const;
+    const QPair<QPointF, QPointF> calculateDataBoundaries() const override;
 
 protected Q_SLOTS:
     void calculateMeanAndStandardDeviation() const;
diff --git a/src/KChart/Cartesian/KChartLeveyJenningsDiagram.cpp b/src/KChart/Cartesian/KChartLeveyJenningsDiagram.cpp
--- a/src/KChart/Cartesian/KChartLeveyJenningsDiagram.cpp
+++ b/src/KChart/Cartesian/KChartLeveyJenningsDiagram.cpp
@@ -415,7 +415,6 @@
     return result;
 }
 
-/** \reimpl */
 const QPair<QPointF, QPointF> LeveyJenningsDiagram::calculateDataBoundaries() const
 {
     const qreal yMin = d->expectedMeanValue - 4 * d->expectedStandardDeviation;
@@ -505,7 +504,6 @@
     }
 }
 
-/** \reimpl */
 void LeveyJenningsDiagram::paint( PaintContext* ctx )
 {
     d->reverseMapper.clear();
diff --git a/src/KChart/Cartesian/KChartLeveyJenningsGrid.h b/src/KChart/Cartesian/KChartLeveyJenningsGrid.h
--- a/src/KChart/Cartesian/KChartLeveyJenningsGrid.h
+++ b/src/KChart/Cartesian/KChartLeveyJenningsGrid.h
@@ -42,14 +42,14 @@
         LeveyJenningsGrid() : CartesianGrid() {}
         virtual ~LeveyJenningsGrid() {}
 
-        void drawGrid( PaintContext* context );
+        void drawGrid( PaintContext* context ) override;
 
     private:
-        DataDimensionsList calculateGrid( const DataDimensionsList& rawDataDimensions ) const;
-        DataDimension calculateGridXY( const DataDimension& rawDataDimension, 
-                          Qt::Orientation orientation, bool adjustLower, bool adjustUpper ) const;
+        DataDimensionsList calculateGrid( const DataDimensionsList& rawDataDimensions ) const override;
+        DataDimension calculateGridXY( const DataDimension& rawDataDimension,
+                          Qt::Orientation orientation, bool adjustLower, bool adjustUpper ) const override;
         void calculateStepWidth( qreal start_, qreal end_, const QList<qreal>& granularities, Qt::Orientation orientation,
-                                 qreal& stepWidth, qreal& subStepWidth, bool adjustLower, bool adjustUpper ) const;
+                                 qreal& stepWidth, qreal& subStepWidth, bool adjustLower, bool adjustUpper ) const override;
     };
 
 }
diff --git a/src/KChart/Cartesian/KChartLineDiagram.h b/src/KChart/Cartesian/KChartLineDiagram.h
--- a/src/KChart/Cartesian/KChartLineDiagram.h
+++ b/src/KChart/Cartesian/KChartLineDiagram.h
@@ -53,7 +53,7 @@
     friend class LineDiagramType;
 
     explicit LineDiagram( QWidget* parent = 0, CartesianCoordinatePlane* plane = 0 );
-    virtual ~LineDiagram();
+    ~LineDiagram() override;
 
     virtual LineDiagram * clone() const;
 
@@ -115,32 +115,27 @@
 
 #if defined(Q_COMPILER_MANGLES_RETURN_TYPE)
     // implement AbstractCartesianDiagram
-    /* reimpl */
-    const int numberOfAbscissaSegments () const;
-    /* reimpl */
-    const int numberOfOrdinateSegments () const;
+    const int numberOfAbscissaSegments () const override;
+    const int numberOfOrdinateSegments () const override;
 #else
     // implement AbstractCartesianDiagram
-    /* reimpl */
-    int numberOfAbscissaSegments () const;
-    /* reimpl */
-    int numberOfOrdinateSegments () const;
+    int numberOfAbscissaSegments () const override;
+    int numberOfOrdinateSegments () const override;
 #endif
 
 protected:
-    void paint ( PaintContext* paintContext );
+    void paint ( PaintContext* paintContext ) override;
 
 public:
-    void resize ( const QSizeF& area );
+    void resize ( const QSizeF& area ) override;
 
 protected:
 
-    virtual qreal threeDItemDepth( const QModelIndex & index ) const;
-    virtual qreal threeDItemDepth( int column ) const;
-    /** \reimpl */
-    virtual const QPair<QPointF, QPointF> calculateDataBoundaries() const;
-    void paintEvent ( QPaintEvent* );
-    void resizeEvent ( QResizeEvent* );
+    qreal threeDItemDepth( const QModelIndex & index ) const override;
+    qreal threeDItemDepth( int column ) const override;
+    const QPair<QPointF, QPointF> calculateDataBoundaries() const override;
+    void paintEvent ( QPaintEvent* ) override;
+    void resizeEvent ( QResizeEvent* ) override;
 }; // End of class KChartLineDiagram
 
 }
diff --git a/src/KChart/Cartesian/KChartPlotter.h b/src/KChart/Cartesian/KChartPlotter.h
--- a/src/KChart/Cartesian/KChartPlotter.h
+++ b/src/KChart/Cartesian/KChartPlotter.h
@@ -103,34 +103,29 @@
 
 #if defined(Q_COMPILER_MANGLES_RETURN_TYPE)
     // implement AbstractCartesianDiagram
-    /* reimpl */
-    const int numberOfAbscissaSegments () const;
-    /* reimpl */
-    const int numberOfOrdinateSegments () const;
+    const int numberOfAbscissaSegments () const override;
+    const int numberOfOrdinateSegments () const override;
 #else
     // implement AbstractCartesianDiagram
-    /* reimpl */
-    int numberOfAbscissaSegments () const;
-    /* reimpl */
-    int numberOfOrdinateSegments () const;
+    int numberOfAbscissaSegments () const override;
+    int numberOfOrdinateSegments () const override;
 #endif
 
 protected Q_SLOTS:
     void connectAttributesModel( AttributesModel* );
 
 protected:
-    void paint ( PaintContext* paintContext );
+    void paint ( PaintContext* paintContext ) override;
 
 public:
-    void resize ( const QSizeF& area );
+    void resize ( const QSizeF& area ) override;
 
 protected:
-    virtual qreal threeDItemDepth( const QModelIndex & index ) const;
-    virtual qreal threeDItemDepth( int column ) const;
-    /** \reimpl */
-    virtual const QPair<QPointF, QPointF> calculateDataBoundaries() const;
-    void paintEvent ( QPaintEvent* );
-    void resizeEvent ( QResizeEvent* );
+    qreal threeDItemDepth( const QModelIndex & index ) const override;
+    qreal threeDItemDepth( int column ) const override;
+    const QPair<QPointF, QPointF> calculateDataBoundaries() const override;
+    void paintEvent ( QPaintEvent* ) override;
+    void resizeEvent ( QResizeEvent* ) override;
 protected Q_SLOTS:
     void setDataBoundariesDirty();
     void calcMergeRadius();
diff --git a/src/KChart/Cartesian/KChartPlotter_p.h b/src/KChart/Cartesian/KChartPlotter_p.h
--- a/src/KChart/Cartesian/KChartPlotter_p.h
+++ b/src/KChart/Cartesian/KChartPlotter_p.h
@@ -58,7 +58,7 @@
     public:
         Private();
         Private( const Private& rhs );
-        ~Private();
+        ~Private() override;
 
         void setCompressorResolution(
             const QSizeF& size,
diff --git a/src/KChart/Cartesian/KChartStockDiagram.h b/src/KChart/Cartesian/KChartStockDiagram.h
--- a/src/KChart/Cartesian/KChartStockDiagram.h
+++ b/src/KChart/Cartesian/KChartStockDiagram.h
@@ -44,7 +44,7 @@
     };
 
     explicit StockDiagram( QWidget *parent = 0, CartesianCoordinatePlane *plane = 0 );
-    ~StockDiagram();
+    ~StockDiagram() override;
 
     void setType( Type type );
     Type type() const;
@@ -95,19 +95,19 @@
     virtual const int numberOfAbscissaSegments() const;
     virtual const int numberOfOrdinateSegments() const;
 #else
-    virtual int numberOfAbscissaSegments() const;
-    virtual int numberOfOrdinateSegments() const;
+    int numberOfAbscissaSegments() const override;
+    int numberOfOrdinateSegments() const override;
 #endif
 
-    virtual void paint( PaintContext *paintContext );
+    void paint( PaintContext *paintContext ) override;
 
-    virtual void resize( const QSizeF &size );
+    void resize( const QSizeF &size ) override;
 
-    virtual qreal threeDItemDepth( int column ) const;
-    virtual qreal threeDItemDepth( const QModelIndex &index ) const;
+    qreal threeDItemDepth( int column ) const override;
+    qreal threeDItemDepth( const QModelIndex &index ) const override;
 
 protected:
-    virtual const QPair<QPointF, QPointF> calculateDataBoundaries() const;
+    const QPair<QPointF, QPointF> calculateDataBoundaries() const override;
 };
 
 } // namespace KChart
diff --git a/src/KChart/ChartGraphicsItem.h b/src/KChart/ChartGraphicsItem.h
--- a/src/KChart/ChartGraphicsItem.h
+++ b/src/KChart/ChartGraphicsItem.h
@@ -39,7 +39,7 @@
 
         int row() const { return m_row; }
         int column() const { return m_column; }
-        int type() const { return Type; }
+        int type() const override { return Type; }
 
     private:
         int m_row;
diff --git a/src/KChart/KChartAbstractArea.h b/src/KChart/KChartAbstractArea.h
--- a/src/KChart/KChartAbstractArea.h
+++ b/src/KChart/KChartAbstractArea.h
@@ -51,7 +51,7 @@
     KCHART_DECLARE_PRIVATE_DERIVED( AbstractArea )
 
 public:
-    virtual ~AbstractArea() ;
+    ~AbstractArea() override ;
 
     /**
       * @brief Draws the background and frame, then calls paint().
@@ -65,7 +65,7 @@
       * Call paintAll, if you want the background and the frame to be drawn
       * before the normal paint() is invoked automatically.
       */
-    virtual void paintAll( QPainter& painter );
+    void paintAll( QPainter& painter ) override;
 
     /**
      * This is called at layout time by KChart::AutoSpacerLayoutItem::sizeHint().
@@ -122,8 +122,8 @@
 
 protected:
     AbstractArea();
-    virtual QRect areaGeometry() const;
-    virtual void positionHasChanged();
+    QRect areaGeometry() const override;
+    void positionHasChanged() override;
 
 Q_SIGNALS:
     void positionChanged( AbstractArea * );
diff --git a/src/KChart/KChartAbstractAreaWidget.h b/src/KChart/KChartAbstractAreaWidget.h
--- a/src/KChart/KChartAbstractAreaWidget.h
+++ b/src/KChart/KChartAbstractAreaWidget.h
@@ -55,7 +55,7 @@
       * class, but you would overwrite paint() instead.
       * @sa paint
       */
-    virtual void paintEvent( QPaintEvent* event );
+    void paintEvent( QPaintEvent* event ) override;
 
     /**
       * @brief Draws the background and frame, then calls paint().
@@ -101,9 +101,9 @@
     void positionChanged( AbstractAreaWidget * );
 
 protected:
-    virtual ~AbstractAreaWidget() ;
-    virtual QRect areaGeometry() const;
-    virtual void positionHasChanged();
+    ~AbstractAreaWidget() override;
+    QRect areaGeometry() const override;
+    void positionHasChanged() override;
 };
 
 }
diff --git a/src/KChart/KChartAbstractAxis.h b/src/KChart/KChartAbstractAxis.h
--- a/src/KChart/KChartAbstractAxis.h
+++ b/src/KChart/KChartAbstractAxis.h
@@ -60,7 +60,7 @@
 
     public:
         explicit AbstractAxis( AbstractDiagram* diagram = 0 );
-        virtual ~AbstractAxis();
+        ~AbstractAxis() override;
 
         // FIXME implement when code os ready for it:
         // virtual Area* clone() const = 0;
@@ -227,8 +227,8 @@
         */
         QStringList shortLabels() const;
 
-        virtual void setGeometry( const QRect& rect ) = 0;
-        virtual QRect geometry() const = 0;
+        void setGeometry( const QRect& rect ) override = 0;
+        QRect geometry() const override = 0;
 
         /**
             \brief Convenience function, returns the coordinate plane, in which this axis is used.
diff --git a/src/KChart/KChartAbstractCoordinatePlane.h b/src/KChart/KChartAbstractCoordinatePlane.h
--- a/src/KChart/KChartAbstractCoordinatePlane.h
+++ b/src/KChart/KChartAbstractCoordinatePlane.h
@@ -53,7 +53,7 @@
         explicit AbstractCoordinatePlane( Chart* parent = 0 );
 
     public:
-        virtual ~AbstractCoordinatePlane();
+        ~AbstractCoordinatePlane() override;
 
         /**
          * Adds a diagram to this coordinate plane.
@@ -255,25 +255,19 @@
         virtual AbstractCoordinatePlane* sharedAxisMasterPlane( QPainter* p = 0 ); // KChart 3: const method?
 
 
-        /** pure virtual in QLayoutItem */
-        virtual bool isEmpty() const;
-        /** pure virtual in QLayoutItem */
-        virtual Qt::Orientations expandingDirections() const;
-        /** pure virtual in QLayoutItem */
-        virtual QSize maximumSize() const;
-        /** pure virtual in QLayoutItem */
-        virtual QSize minimumSize() const;
-        /** pure virtual in QLayoutItem */
-        virtual QSize sizeHint() const;
+        bool isEmpty() const override;
+        Qt::Orientations expandingDirections() const override;
+        QSize maximumSize() const override;
+        QSize minimumSize() const override;
+        QSize sizeHint() const override;
         /** pure virtual in QLayoutItem
           *
           * \note Do not call this function directly, unless you know
           * exactly what you are doing.  Geometry management is done
           * by KD Chart's internal layouting measures.
           */
-        virtual void setGeometry( const QRect& r );
-        /** pure virtual in QLayoutItem */
-        virtual QRect geometry() const;
+        void setGeometry( const QRect& r ) override;
+        QRect geometry() const override;
 
         virtual void mousePressEvent( QMouseEvent* event );
         virtual void mouseDoubleClickEvent( QMouseEvent* event );
diff --git a/src/KChart/KChartAbstractDiagram.h b/src/KChart/KChartAbstractDiagram.h
--- a/src/KChart/KChartAbstractDiagram.h
+++ b/src/KChart/KChartAbstractDiagram.h
@@ -60,7 +60,7 @@
         explicit AbstractDiagram (
             QWidget* parent = 0, AbstractCoordinatePlane* plane = 0 );
     public:
-        virtual ~AbstractDiagram();
+        ~AbstractDiagram() override;
 
 
         /**
@@ -103,10 +103,10 @@
         virtual void resize ( const QSizeF& area );
 
         /** Associate a model with the diagram. */
-        virtual void setModel ( QAbstractItemModel * model );
+        void setModel ( QAbstractItemModel * model ) override;
 
         /** Associate a seleection model with the diagrom. */
-        virtual void setSelectionModel( QItemSelectionModel* selectionModel );
+        void setSelectionModel( QItemSelectionModel* selectionModel ) override;
 
         /**
          * Associate an AttributesModel with this diagram. Note that
@@ -160,31 +160,20 @@
 
        /** Set the root index in the model, where the diagram starts
         * referencing data for display. */
-        virtual void setRootIndex ( const QModelIndex& idx );
-
-        /** \reimpl */
-        virtual QRect visualRect(const QModelIndex &index) const;
-        /** \reimpl */
-        virtual void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible);
-        /** \reimpl */
-        virtual QModelIndex indexAt(const QPoint &point) const;
-        /** \reimpl */
-        virtual QModelIndex moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers);
-        /** \reimpl */
-        virtual int horizontalOffset() const;
-        /** \reimpl */
-        virtual int verticalOffset() const;
-        /** \reimpl */
-        virtual bool isIndexHidden(const QModelIndex &index) const;
-        /** \reimpl */
-        virtual void setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags command);
-        /** \reimpl */
-        virtual QRegion visualRegionForSelection(const QItemSelection &selection) const;
+        void setRootIndex ( const QModelIndex& idx ) override;
+
+        QRect visualRect(const QModelIndex &index) const override;
+        void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible) override;
+        QModelIndex indexAt(const QPoint &point) const override;
+        QModelIndex moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers) override;
+        int horizontalOffset() const override;
+        int verticalOffset() const override;
+        bool isIndexHidden(const QModelIndex &index) const override;
+        void setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags command) override;
+        QRegion visualRegionForSelection(const QItemSelection &selection) const override;
         virtual QRegion visualRegion(const QModelIndex &index) const;
-        /** \reimpl */
-        virtual void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles = QVector<int>());
-        /** \reimpl */
-        virtual void doItemsLayout();
+        void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles = QVector<int>()) override;
+        void doItemsLayout() override;
 
         /**
          * The coordinate plane associated with the diagram. This determines
diff --git a/src/KChart/KChartAbstractDiagram.cpp b/src/KChart/KChartAbstractDiagram.cpp
--- a/src/KChart/KChartAbstractDiagram.cpp
+++ b/src/KChart/KChartAbstractDiagram.cpp
@@ -205,7 +205,6 @@
     return index.model() == attributesModel() ? index : attributesModel()->mapFromSource( index );
 }
 
-/*! \reimpl */
 void AbstractDiagram::setRootIndex ( const QModelIndex& idx )
 {
     QAbstractItemView::setRootIndex( idx );
diff --git a/src/KChart/KChartAbstractProxyModel.h b/src/KChart/KChartAbstractProxyModel.h
--- a/src/KChart/KChartAbstractProxyModel.h
+++ b/src/KChart/KChartAbstractProxyModel.h
@@ -36,15 +36,11 @@
     public:
         explicit AbstractProxyModel( QObject* parent = 0 );
 
-        /*! \reimpl */ 
-        QModelIndex mapFromSource( const QModelIndex & sourceIndex ) const;
-        /*! \reimpl */ 
-        QModelIndex mapToSource( const QModelIndex &proxyIndex ) const;
+        QModelIndex mapFromSource( const QModelIndex & sourceIndex ) const override;
+        QModelIndex mapToSource( const QModelIndex &proxyIndex ) const override;
 
-        /*! \reimpl */
-        QModelIndex index( int row, int col, const QModelIndex& index ) const;
-        /*! \reimpl */ 
-        QModelIndex parent( const QModelIndex& index ) const;
+        QModelIndex index( int row, int col, const QModelIndex& index ) const override;
+        QModelIndex parent( const QModelIndex& index ) const override;
     };
 }
 
diff --git a/src/KChart/KChartAttributesModel.h b/src/KChart/KChartAttributesModel.h
--- a/src/KChart/KChartAttributesModel.h
+++ b/src/KChart/KChartAttributesModel.h
@@ -52,7 +52,7 @@
     };
 
     explicit AttributesModel( QAbstractItemModel* model, QObject * parent = 0 );
-    ~AttributesModel();
+    ~AttributesModel() override;
 
     /** Copies the internal data (maps and palette) of another
      *  AttributesModel* into this one.
@@ -88,27 +88,20 @@
       */
     QVariant data(int column, int role) const;
 
-    /** \reimpl */
-    QVariant headerData ( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const;
-    /** \reimpl */
-    int rowCount(const QModelIndex& ) const;
-    /** \reimpl */
-    int columnCount(const QModelIndex& ) const;
-    /** \reimpl */
-    QVariant data(const QModelIndex&, int role = Qt::DisplayRole) const;
-    /** \reimpl */
-    bool setData ( const QModelIndex & index, const QVariant & value, int role = Qt::DisplayRole);
+    QVariant headerData ( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const override;
+    int rowCount(const QModelIndex& ) const override;
+    int columnCount(const QModelIndex& ) const override;
+    QVariant data(const QModelIndex&, int role = Qt::DisplayRole) const override;
+    bool setData ( const QModelIndex & index, const QVariant & value, int role = Qt::DisplayRole) override;
     /** Remove any explicit attributes settings that might have been specified before. */
     bool resetData ( const QModelIndex & index, int role = Qt::DisplayRole);
-    /** \reimpl */
     bool setHeaderData ( int section, Qt::Orientation orientation, const QVariant & value,
-                         int role = Qt::DisplayRole);
+                         int role = Qt::DisplayRole) override;
     /** Returns default values for the header data. */
     virtual QVariant defaultHeaderData ( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const;
     /** Remove any explicit attributes settings that might have been specified before. */
     bool resetHeaderData ( int section, Qt::Orientation orientation, int role = Qt::DisplayRole);
-    /** \reimpl */
-    void setSourceModel ( QAbstractItemModel* sourceModel );
+    void setSourceModel ( QAbstractItemModel* sourceModel ) override;
 
     /** Define the default value for a certain role.
         Passing a default-constructed QVariant is equivalent to removing the default. */
diff --git a/src/KChart/KChartChart.h b/src/KChart/KChartChart.h
--- a/src/KChart/KChartChart.h
+++ b/src/KChart/KChartChart.h
@@ -106,7 +106,7 @@
 
     public:
         explicit Chart ( QWidget* parent = 0 );
-        ~Chart();
+        ~Chart() override;
 
         /**
          * @brief useNewLayoutSystem
@@ -451,27 +451,22 @@
         /**
           * Adjusts the internal layout when the chart is resized.
           */
-        /* reimp */ void resizeEvent ( QResizeEvent * event );
+        void resizeEvent ( QResizeEvent * event ) override;
 
         /**
           * @brief Draws the background and frame, then calls paint().
           *
           * In most cases there is no need to override this method in a derived
           * class, but if you do, do not forget to call paint().
           * @sa paint
           */
-        /* reimp */ void paintEvent( QPaintEvent* event );
-
-        /** reimp */
-        void mousePressEvent( QMouseEvent* event );
-        /** reimp */
-        void mouseDoubleClickEvent( QMouseEvent* event );
-        /** reimp */
-        void mouseMoveEvent( QMouseEvent* event );
-        /** reimp */
-        void mouseReleaseEvent( QMouseEvent* event );
-        /** reimp */
-        bool event( QEvent* event );
+        void paintEvent( QPaintEvent* event ) override;
+
+        void mousePressEvent( QMouseEvent* event ) override;
+        void mouseDoubleClickEvent( QMouseEvent* event ) override;
+        void mouseMoveEvent( QMouseEvent* event ) override;
+        void mouseReleaseEvent( QMouseEvent* event ) override;
+        bool event( QEvent* event ) override;
 
     private:
         // TODO move this to the private class
diff --git a/src/KChart/KChartChart.cpp b/src/KChart/KChartChart.cpp
--- a/src/KChart/KChartChart.cpp
+++ b/src/KChart/KChartChart.cpp
@@ -164,19 +164,19 @@
     // the Legends/Advanced example. It will not work well in various ways - won't get enough space and look
     // very broken, will inhibit resizing the window etc.
 
-    QSize sizeHint() const
+    QSize sizeHint() const override
     {
         QWidget* w = const_cast< MyWidgetItem * >( this )->widget();
         return w->sizeHint();
     }
 
-    QSize minimumSize() const
+    QSize minimumSize() const override
     {
         QWidget* w = const_cast< MyWidgetItem * >( this )->widget();
         return w->minimumSize();
     }
 
-    QSize maximumSize() const
+    QSize maximumSize() const override
     {
         // Not just passing on w->maximumSize() fixes that the size policy of Legend is disregarded, making
         // Legend take all available space, which makes both the Legend internal layout and the overall
@@ -197,7 +197,7 @@
         return ret;
     }
 
-    Qt::Orientations expandingDirections() const
+    Qt::Orientations expandingDirections() const override
     {
         QWidget* w = const_cast< MyWidgetItem * >( this )->widget();
         if ( isEmpty() ) {
@@ -207,34 +207,34 @@
         return e;
     }
 
-    void setGeometry(const QRect &g)
+    void setGeometry(const QRect &g) override
     {
         QWidget* w = const_cast< MyWidgetItem * >( this )->widget();
         w->setGeometry(g);
     }
 
-    QRect geometry() const
+    QRect geometry() const override
     {
         QWidget* w = const_cast< MyWidgetItem * >( this )->widget();
         return w->geometry();
     }
 
-    bool hasHeightForWidth() const
+    bool hasHeightForWidth() const override
     {
         QWidget* w = const_cast< MyWidgetItem * >( this )->widget();
         bool ret = !isEmpty() &&
         qobject_cast< Legend* >( w )->hasHeightForWidth();
         return ret;
     }
 
-    int heightForWidth( int width ) const
+    int heightForWidth( int width ) const override
     {
         QWidget* w = const_cast< MyWidgetItem * >( this )->widget();
         int ret = w->heightForWidth( width );
         return ret;
     }
 
-    bool isEmpty() const {
+    bool isEmpty() const override {
         QWidget* w = const_cast< MyWidgetItem * >( this )->widget();
         // legend->hide() should indeed hide the legend,
         // but a legend in a chart that hasn't been shown yet isn't hidden
diff --git a/src/KChart/KChartChart_p.h b/src/KChart/KChartChart_p.h
--- a/src/KChart/KChartChart_p.h
+++ b/src/KChart/KChartChart_p.h
@@ -164,7 +164,7 @@
 
         Private( Chart* );
 
-        virtual ~Private();
+        ~Private() override;
 
         void createLayouts();
         void updateDirtyLayouts();
diff --git a/src/KChart/KChartDatasetProxyModel.h b/src/KChart/KChartDatasetProxyModel.h
--- a/src/KChart/KChartDatasetProxyModel.h
+++ b/src/KChart/KChartDatasetProxyModel.h
@@ -59,31 +59,31 @@
         */
         explicit DatasetProxyModel ( QObject* parent = 0 );
 
-        QModelIndex buddy( const QModelIndex& index ) const;
+        QModelIndex buddy( const QModelIndex& index ) const override;
 
-        Qt::ItemFlags flags( const QModelIndex& index ) const;
+        Qt::ItemFlags flags( const QModelIndex& index ) const override;
 
         QModelIndex index( int row, int column,
-                           const QModelIndex &parent = QModelIndex() ) const;
-        QModelIndex parent(const QModelIndex &child ) const;
+                           const QModelIndex &parent = QModelIndex() ) const override;
+        QModelIndex parent(const QModelIndex &child ) const override;
 
         /** Implements the mapping from the source to the proxy indexes. */
-        QModelIndex mapFromSource ( const QModelIndex & sourceIndex ) const;
+        QModelIndex mapFromSource ( const QModelIndex & sourceIndex ) const override;
 
         /** Implements the mapping from the proxy to the source indexes. */
-        QModelIndex mapToSource ( const QModelIndex& proxyIndex ) const;
+        QModelIndex mapToSource ( const QModelIndex& proxyIndex ) const override;
 
         /** Overloaded from base class. */
-        QVariant data(const QModelIndex &index, int role) const;
+        QVariant data(const QModelIndex &index, int role) const override;
 
         /** Overloaded from base class. */
-        bool setData( const QModelIndex& index, const QVariant& value, int role );
+        bool setData( const QModelIndex& index, const QVariant& value, int role ) override;
 
         /** Overloaded from base class. */
-        QVariant headerData ( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const;
+        QVariant headerData ( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const override;
 
         /** Overloaded from base class. */
-        void setSourceModel(QAbstractItemModel *sourceModel);
+        void setSourceModel(QAbstractItemModel *sourceModel) override;
 
         /** Set the root index of the table in
 	    the source model */
@@ -120,11 +120,11 @@
     protected:
         /** Decide whether the column is accepted. */
         bool filterAcceptsColumn ( int sourceColumn,
-                                   const QModelIndex & ) const;
+                                   const QModelIndex & ) const override;
 
 
         /** Decide whether the row is accepted. */
-        bool filterAcceptsRow ( int source_row, const QModelIndex & source_parent ) const;
+        bool filterAcceptsRow ( int source_row, const QModelIndex & source_parent ) const override;
 
     private:
 
diff --git a/src/KChart/KChartDatasetSelector.h b/src/KChart/KChartDatasetSelector.h
--- a/src/KChart/KChartDatasetSelector.h
+++ b/src/KChart/KChartDatasetSelector.h
@@ -47,7 +47,7 @@
 
     public:
         explicit DatasetSelectorWidget ( QWidget* parent = 0 );
-        ~DatasetSelectorWidget();
+        ~DatasetSelectorWidget() override;
 
     public Q_SLOTS:
         void setSourceRowCount ( const int& rowCount );
diff --git a/src/KChart/KChartDiagramObserver.h b/src/KChart/KChartDiagramObserver.h
--- a/src/KChart/KChartDiagramObserver.h
+++ b/src/KChart/KChartDiagramObserver.h
@@ -46,7 +46,7 @@
          * Constructs a new observer observing the given diagram.
          */
         explicit DiagramObserver( AbstractDiagram * diagram, QObject* parent = 0 );
-        ~DiagramObserver();
+        ~DiagramObserver() override;
 
         const AbstractDiagram* diagram() const;
         AbstractDiagram* diagram();
diff --git a/src/KChart/KChartLayoutItems.h b/src/KChart/KChartLayoutItems.h
--- a/src/KChart/KChartLayoutItems.h
+++ b/src/KChart/KChartLayoutItems.h
@@ -116,20 +116,13 @@
         void setTextAttributes( const TextAttributes& a );
         TextAttributes textAttributes() const;
 
-        /** pure virtual in QLayoutItem */
-        virtual bool isEmpty() const;
-        /** pure virtual in QLayoutItem */
-        virtual Qt::Orientations expandingDirections() const;
-        /** pure virtual in QLayoutItem */
-        virtual QSize maximumSize() const;
-        /** pure virtual in QLayoutItem */
-        virtual QSize minimumSize() const;
-        /** pure virtual in QLayoutItem */
-        virtual QSize sizeHint() const;
-        /** pure virtual in QLayoutItem */
-        virtual void setGeometry( const QRect& r );
-        /** pure virtual in QLayoutItem */
-        virtual QRect geometry() const;
+        bool isEmpty() const override;
+        Qt::Orientations expandingDirections() const override;
+        QSize maximumSize() const override;
+        QSize minimumSize() const override;
+        QSize sizeHint() const override;
+        void setGeometry( const QRect& r ) override;
+        QRect geometry() const override;
 
         virtual int marginWidth() const;
 
@@ -141,7 +134,7 @@
         virtual qreal realFontSize() const;
         virtual QFont realFont() const;
 
-        virtual void paint( QPainter* );
+        void paint( QPainter* ) override;
 
         QPolygon boundingPolygon() const;
     private:
@@ -186,22 +179,15 @@
         void setTextAttributes( const TextAttributes& a );
         TextAttributes textAttributes() const;
 
-        /** pure virtual in QLayoutItem */
-        virtual bool isEmpty() const;
-        /** pure virtual in QLayoutItem */
-        virtual Qt::Orientations expandingDirections() const;
-        /** pure virtual in QLayoutItem */
-        virtual QSize maximumSize() const;
-        /** pure virtual in QLayoutItem */
-        virtual QSize minimumSize() const;
-        /** pure virtual in QLayoutItem */
-        virtual QSize sizeHint() const;
-        /** pure virtual in QLayoutItem */
-        virtual void setGeometry( const QRect& r );
-        /** pure virtual in QLayoutItem */
-        virtual QRect geometry() const;
-
-        virtual void paint( QPainter* painter );
+        bool isEmpty() const override;
+        Qt::Orientations expandingDirections() const override;
+        QSize maximumSize() const override;
+        QSize minimumSize() const override;
+        QSize sizeHint() const override;
+        void setGeometry( const QRect& r ) override;
+        QRect geometry() const override;
+
+        void paint( QPainter* painter ) override;
 
     protected:
         int borderWidth() const;
@@ -223,15 +209,15 @@
                               const QPen& pen,
                               Qt::Alignment alignment = 0 );
 
-            virtual Qt::Orientations expandingDirections() const;
-            virtual QRect geometry() const;
-            virtual bool isEmpty() const;
-            virtual QSize maximumSize() const;
-            virtual QSize minimumSize() const;
-            virtual void setGeometry( const QRect& r );
-            virtual QSize sizeHint() const;
+            Qt::Orientations expandingDirections() const override;
+            QRect geometry() const override;
+            bool isEmpty() const override;
+            QSize maximumSize() const override;
+            QSize minimumSize() const override;
+            void setGeometry( const QRect& r ) override;
+            QSize sizeHint() const override;
 
-            virtual void paint( QPainter* );
+            void paint( QPainter* ) override;
 
             static void paintIntoRect(
                     QPainter* painter,
@@ -262,18 +248,18 @@
                             Qt::Alignment mLegendLineSymbolAlignment,
                             Qt::Alignment alignment = 0 );
 
-            virtual Qt::Orientations expandingDirections() const;
-            virtual QRect geometry() const;
-            virtual bool isEmpty() const;
-            virtual QSize maximumSize() const;
-            virtual QSize minimumSize() const;
-            virtual void setGeometry( const QRect& r );
-            virtual QSize sizeHint() const;
+            Qt::Orientations expandingDirections() const override;
+            QRect geometry() const override;
+            bool isEmpty() const override;
+            QSize maximumSize() const override;
+            QSize minimumSize() const override;
+            void setGeometry( const QRect& r ) override;
+            QSize sizeHint() const override;
 
             void setLegendLineSymbolAlignment(Qt::Alignment legendLineSymbolAlignment);
             virtual Qt::Alignment legendLineSymbolAlignment() const;
 
-            virtual void paint( QPainter* );
+            void paint( QPainter* ) override;
 
             static void paintIntoRect(
                     QPainter* painter,
@@ -305,15 +291,15 @@
                                       const QPen& markerPen,
                                       Qt::Alignment alignment = 0 );
 
-            virtual Qt::Orientations expandingDirections() const;
-            virtual QRect geometry() const;
-            virtual bool isEmpty() const;
-            virtual QSize maximumSize() const;
-            virtual QSize minimumSize() const;
-            virtual void setGeometry( const QRect& r );
-            virtual QSize sizeHint() const;
+            Qt::Orientations expandingDirections() const override;
+            QRect geometry() const override;
+            bool isEmpty() const override;
+            QSize maximumSize() const override;
+            QSize minimumSize() const override;
+            void setGeometry( const QRect& r ) override;
+            QSize sizeHint() const override;
 
-            virtual void paint( QPainter* );
+            void paint( QPainter* ) override;
 
         private:
             AbstractDiagram* mDiagram;
@@ -336,15 +322,15 @@
     public:
         HorizontalLineLayoutItem();
 
-        virtual Qt::Orientations expandingDirections() const;
-        virtual QRect geometry() const;
-        virtual bool isEmpty() const;
-        virtual QSize maximumSize() const;
-        virtual QSize minimumSize() const;
-        virtual void setGeometry( const QRect& r );
-        virtual QSize sizeHint() const;
+        Qt::Orientations expandingDirections() const override;
+        QRect geometry() const override;
+        bool isEmpty() const override;
+        QSize maximumSize() const override;
+        QSize minimumSize() const override;
+        void setGeometry( const QRect& r ) override;
+        QSize sizeHint() const override;
 
-        virtual void paint( QPainter* );
+        void paint( QPainter* ) override;
 
     private:
         QRect mRect;
@@ -359,15 +345,15 @@
         public:
             VerticalLineLayoutItem();
 
-            virtual Qt::Orientations expandingDirections() const;
-            virtual QRect geometry() const;
-            virtual bool isEmpty() const;
-            virtual QSize maximumSize() const;
-            virtual QSize minimumSize() const;
-            virtual void setGeometry( const QRect& r );
-            virtual QSize sizeHint() const;
+            Qt::Orientations expandingDirections() const override;
+            QRect geometry() const override;
+            bool isEmpty() const override;
+            QSize maximumSize() const override;
+            QSize minimumSize() const override;
+            void setGeometry( const QRect& r ) override;
+            QSize sizeHint() const override;
 
-            virtual void paint( QPainter* );
+            void paint( QPainter* ) override;
 
         private:
             QRect mRect;
@@ -450,15 +436,15 @@
                     bool layoutIsAtTopPosition, QHBoxLayout *rightLeftLayout,
                     bool layoutIsAtLeftPosition,  QVBoxLayout *topBottomLayout );
 
-            virtual Qt::Orientations expandingDirections() const;
-            virtual QRect geometry() const;
-            virtual bool isEmpty() const;
-            virtual QSize maximumSize() const;
-            virtual QSize minimumSize() const;
-            virtual void setGeometry( const QRect& r );
-            virtual QSize sizeHint() const;
+            Qt::Orientations expandingDirections() const override;
+            QRect geometry() const override;
+            bool isEmpty() const override;
+            QSize maximumSize() const override;
+            QSize minimumSize() const override;
+            void setGeometry( const QRect& r ) override;
+            QSize sizeHint() const override;
 
-            virtual void paint( QPainter* );
+            void paint( QPainter* ) override;
 
         private:
             QRect mRect;
diff --git a/src/KChart/KChartLegend.h b/src/KChart/KChartLegend.h
--- a/src/KChart/KChartLegend.h
+++ b/src/KChart/KChartLegend.h
@@ -59,7 +59,7 @@
 public:
     explicit Legend( QWidget* parent = 0 );
     explicit Legend( KChart::AbstractDiagram* diagram, QWidget* parent = 0 );
-    virtual ~Legend();
+    ~Legend() override;
 
 
     enum LegendStyle { MarkersOnly     = 0,
@@ -78,10 +78,10 @@
      */
     bool compare( const Legend* other ) const;
 
-    virtual void resizeEvent( QResizeEvent * event ); // TODO: should be protected
+    void resizeEvent( QResizeEvent * event ) override; // TODO: should be protected
 
-    virtual void paint( QPainter* painter );
-    virtual void setVisible( bool visible );
+    void paint( QPainter* painter ) override;
+    void setVisible( bool visible ) override;
 
     /**
         Specifies the reference area for font size of title text,
@@ -380,14 +380,14 @@
     uint spacing() const;
 
     // called internally by KChart::Chart, when painting into a custom QPainter
-    virtual void forceRebuild();
-
-    virtual QSize minimumSizeHint() const;
-    virtual QSize sizeHint() const;
-    virtual bool hasHeightForWidth() const;
-    virtual int heightForWidth( int width ) const;
-    virtual void needSizeHint();
-    virtual void resizeLayout( const QSize& size );
+    void forceRebuild() override;
+
+    QSize minimumSizeHint() const override;
+    QSize sizeHint() const override;
+    bool hasHeightForWidth() const override;
+    int heightForWidth( int width ) const override;
+    void needSizeHint() override;
+    void resizeLayout( const QSize& size ) override;
 
 Q_SIGNALS:
     void destroyedLegend( Legend* );
diff --git a/src/KChart/KChartModelDataCache_p.h b/src/KChart/KChartModelDataCache_p.h
--- a/src/KChart/KChartModelDataCache_p.h
+++ b/src/KChart/KChartModelDataCache_p.h
@@ -58,7 +58,7 @@
             Q_OBJECT
         public:
             explicit ModelSignalMapperConnector( ModelSignalMapper& mapper );
-            ~ModelSignalMapperConnector();
+            ~ModelSignalMapperConnector() override;
 
             void connectSignals( QAbstractItemModel* model );
             void disconnectSignals( QAbstractItemModel* model );
@@ -100,7 +100,7 @@
         {
         }
 
-        virtual ~ModelDataCache()
+        ~ModelDataCache() override
         {
         }
 
@@ -204,7 +204,7 @@
             return value;
         }
 
-        void columnsInserted( const QModelIndex& parent, int start, int end )
+        void columnsInserted( const QModelIndex& parent, int start, int end ) override
         {
             Q_ASSERT( m_model != 0 );
             Q_ASSERT( parent.model() == m_model || !parent.isValid() );
@@ -225,7 +225,7 @@
             }
         }
 
-        void columnsRemoved( const QModelIndex& parent, int start, int end )
+        void columnsRemoved( const QModelIndex& parent, int start, int end ) override
         {
             Q_ASSERT( m_model != 0 );
             Q_ASSERT( parent.model() == m_model || !parent.isValid() );
@@ -245,7 +245,7 @@
             }
         }
 
-        void dataChanged( const QModelIndex& topLeft, const QModelIndex& bottomRight )
+        void dataChanged( const QModelIndex& topLeft, const QModelIndex& bottomRight ) override
         {
             if ( !m_model )
                 return;
@@ -277,12 +277,12 @@
             }
         }
 
-        void layoutChanged()
+        void layoutChanged() override
         {
             modelReset();
         }
 
-        void modelReset()
+        void modelReset() override
         {
             m_data.clear();
             m_cacheValid.clear();
@@ -297,7 +297,7 @@
             Q_ASSERT( m_cacheValid.count() == m_model->rowCount( m_rootIndex ) );
         }
 
-        void rowsInserted( const QModelIndex& parent, int start, int end )
+        void rowsInserted( const QModelIndex& parent, int start, int end ) override
         {
             Q_ASSERT( m_model != 0 );
             Q_ASSERT( parent.model() == m_model || !parent.isValid() );
@@ -315,7 +315,7 @@
             Q_ASSERT( m_cacheValid.count() == m_model->rowCount( m_rootIndex ) );
         }
 
-        void rowsRemoved( const QModelIndex& parent, int start, int end )
+        void rowsRemoved( const QModelIndex& parent, int start, int end ) override
         {
             Q_ASSERT( m_model != 0 );
             Q_ASSERT( parent.model() == m_model || !parent.isValid() );
@@ -332,7 +332,7 @@
             Q_ASSERT( m_cacheValid.count() == m_model->rowCount( m_rootIndex ) );
         }
 
-        void resetModel()
+        void resetModel() override
         {
             // no need to disconnect, this is a response to SIGNAL( destroyed() )
             m_model = 0;
diff --git a/src/KChart/KChartPalette.h b/src/KChart/KChartPalette.h
--- a/src/KChart/KChartPalette.h
+++ b/src/KChart/KChartPalette.h
@@ -51,7 +51,7 @@
     Palette( const Palette& );
     Palette &operator= ( const Palette & );
 
-    ~Palette();
+    ~Palette() override;
 
     /** Provide access to the three builtin palettes, one with standard bright
      * colors, one with more subdued colors, and one with rainbow colors.  */
diff --git a/src/KChart/KChartTextArea.h b/src/KChart/KChartTextArea.h
--- a/src/KChart/KChartTextArea.h
+++ b/src/KChart/KChartTextArea.h
@@ -50,7 +50,7 @@
 
 
 public:
-    virtual ~TextArea() ;
+    ~TextArea() override ;
 
 //    virtual TextArea * clone() const = 0;
     /**
@@ -65,12 +65,12 @@
       * Call paintAll, if you want the background and the frame to be drawn
       * before the normal paint() is invoked automatically.
       */
-    void paintAll( QPainter& painter );
+    void paintAll( QPainter& painter ) override;
 
 protected:
     TextArea();
-    virtual QRect areaGeometry() const;
-    virtual void positionHasChanged();
+    QRect areaGeometry() const override;
+    void positionHasChanged() override;
 
 Q_SIGNALS:
     void positionChanged( TextArea * );
diff --git a/src/KChart/KChartTextLabelCache.h b/src/KChart/KChartTextLabelCache.h
--- a/src/KChart/KChartTextLabelCache.h
+++ b/src/KChart/KChartTextLabelCache.h
@@ -113,13 +113,13 @@
     qreal angle() const;
 
     // reimpl PrerenderedElement:
-    const QPixmap& pixmap() const;
-    QPointF referencePointLocation( KChartEnums::PositionValue position ) const;
+    const QPixmap& pixmap() const override;
+    QPointF referencePointLocation( KChartEnums::PositionValue position ) const override;
     // overload: return location of referencePoint():
     QPointF referencePointLocation() const;
 
 protected:
-    void invalidate() const;
+    void invalidate() const override;
 
 private:
     /** Create a label with the given text and the given rotation
diff --git a/src/KChart/KChartWidget.h b/src/KChart/KChartWidget.h
--- a/src/KChart/KChartWidget.h
+++ b/src/KChart/KChartWidget.h
@@ -72,7 +72,7 @@
         explicit Widget( QWidget* parent = 0 );
 
         /** Destructor. */
-        ~Widget();
+        ~Widget() override;
         /** Sets the data in the given column using a QVector of qreal for the Y values. */
         void setDataset( int column, const QVector< qreal > & data, const QString& title = QString() );
         /** Sets the data in the given column using a QVector of QPairs
diff --git a/src/KChart/KTextDocument.h b/src/KChart/KTextDocument.h
--- a/src/KChart/KTextDocument.h
+++ b/src/KChart/KTextDocument.h
@@ -45,7 +45,7 @@
 public:
     explicit KTextDocument( QObject* parent = 0 );
     explicit KTextDocument( const QString& text, QObject* parent = 0 );
-    ~KTextDocument();
+    ~KTextDocument() override;
 
     QSize sizeHint();
     QSize minimumSizeHint();
diff --git a/src/KChart/Polar/KChartAbstractPolarDiagram.h b/src/KChart/Polar/KChartAbstractPolarDiagram.h
--- a/src/KChart/Polar/KChartAbstractPolarDiagram.h
+++ b/src/KChart/Polar/KChartAbstractPolarDiagram.h
@@ -39,7 +39,7 @@
     public:
         explicit AbstractPolarDiagram (
             QWidget* parent = 0, PolarCoordinatePlane* plane = 0 );
-        virtual ~AbstractPolarDiagram() {}
+        ~AbstractPolarDiagram() override {}
 
         virtual qreal valueTotals () const = 0;
         virtual qreal numberOfValuesPerDataset() const = 0;
diff --git a/src/KChart/Polar/KChartAbstractPolarDiagram_p.h b/src/KChart/Polar/KChartAbstractPolarDiagram_p.h
--- a/src/KChart/Polar/KChartAbstractPolarDiagram_p.h
+++ b/src/KChart/Polar/KChartAbstractPolarDiagram_p.h
@@ -58,9 +58,8 @@
             // just for consistency
         }
 
-    /** \reimpl */
     // FIXME: Optimize when needed
-    virtual qreal calcPercentValue( const QModelIndex & index ) const
+    qreal calcPercentValue( const QModelIndex & index ) const override
     {
         Q_ASSERT( index.isValid() );
         qreal sum = 0.0;
diff --git a/src/KChart/Polar/KChartPieDiagram.h b/src/KChart/Polar/KChartPieDiagram.h
--- a/src/KChart/Polar/KChartPieDiagram.h
+++ b/src/KChart/Polar/KChartPieDiagram.h
@@ -39,12 +39,11 @@
 public:
     explicit PieDiagram(
         QWidget* parent = 0, PolarCoordinatePlane* plane = 0 );
-    virtual ~PieDiagram();
+    ~PieDiagram() override;
 
 protected:
     // Implement AbstractDiagram
-    /** \reimpl */
-    virtual void paint( PaintContext* paintContext );
+    void paint( PaintContext* paintContext ) override;
 
 public:
     /**
@@ -69,24 +68,19 @@
     /// Return whether overlapping labels will be moved to until they don't overlap anymore.
     bool isLabelCollisionAvoidanceEnabled() const;
 
-    /** \reimpl */
-    virtual void resize ( const QSizeF& area );
+    void resize ( const QSizeF& area ) override;
 
     // Implement AbstractPolarDiagram
-    /** \reimpl */
-    virtual qreal valueTotals () const;
-    /** \reimpl */
-    virtual qreal numberOfValuesPerDataset() const;
-    /** \reimpl */
-    virtual qreal numberOfGridRings() const;
+    qreal valueTotals () const override;
+    qreal numberOfValuesPerDataset() const override;
+    qreal numberOfGridRings() const override;
 
     virtual PieDiagram * clone() const;
 
 protected:
-    /** \reimpl */
-    virtual const QPair<QPointF, QPointF> calculateDataBoundaries() const;
-    void paintEvent( QPaintEvent* );
-    void resizeEvent( QResizeEvent* );
+    const QPair<QPointF, QPointF> calculateDataBoundaries() const override;
+    void paintEvent( QPaintEvent* ) override;
+    void resizeEvent( QResizeEvent* ) override;
 
 private:
     // ### move to private class?
diff --git a/src/KChart/Polar/KChartPolarCoordinatePlane.h b/src/KChart/Polar/KChartPolarCoordinatePlane.h
--- a/src/KChart/Polar/KChartPolarCoordinatePlane.h
+++ b/src/KChart/Polar/KChartPolarCoordinatePlane.h
@@ -42,11 +42,11 @@
         typedef QList<CoordinateTransformation> CoordinateTransformationList;
 
         explicit PolarCoordinatePlane ( Chart* parent = 0 );
-        ~PolarCoordinatePlane();
+        ~PolarCoordinatePlane() override;
 
-        void addDiagram ( AbstractDiagram* diagram );
+        void addDiagram ( AbstractDiagram* diagram ) override;
 
-        const QPointF translate ( const QPointF& diagramPoint ) const;
+        const QPointF translate ( const QPointF& diagramPoint ) const override;
         const QPointF translatePolar ( const QPointF& diagramPoint ) const;
 
         /** \brief Specify the rotation of the coordinate plane.
@@ -64,16 +64,16 @@
           */
         qreal startPosition() const;
 
-        virtual qreal zoomFactorX() const;
-        virtual qreal zoomFactorY() const;
+        qreal zoomFactorX() const override;
+        qreal zoomFactorY() const override;
 
-        virtual void setZoomFactors( qreal factorX, qreal factorY );
-        virtual void setZoomFactorX( qreal factor );
-        virtual void setZoomFactorY( qreal factor );
+        void setZoomFactors( qreal factorX, qreal factorY ) override;
+        void setZoomFactorX( qreal factor ) override;
+        void setZoomFactorY( qreal factor ) override;
 
-        virtual QPointF zoomCenter() const;
+        QPointF zoomCenter() const override;
 
-        virtual void setZoomCenter( const QPointF& center );
+        void setZoomCenter( const QPointF& center ) override;
 
         /**
          * Set the attributes to be used for grid lines drawn in circular
@@ -142,15 +142,14 @@
         qreal angleUnit() const;
         qreal radiusUnit() const;
 
-        /** reimpl */
-        virtual void paint( QPainter* );
+        void paint( QPainter* ) override;
 
     protected:
-        virtual DataDimensionsList getDataDimensionsList() const;
+        DataDimensionsList getDataDimensionsList() const override;
         void paintEvent ( QPaintEvent* );
         void resizeEvent ( QResizeEvent* );
 
-        void layoutDiagrams();
+        void layoutDiagrams() override;
     protected Q_SLOTS:
         void slotLayoutChanged( AbstractDiagram* diagram );
         void adjustZoomAndRepaint();
diff --git a/src/KChart/Polar/KChartPolarCoordinatePlane_p.h b/src/KChart/Polar/KChartPolarCoordinatePlane_p.h
--- a/src/KChart/Polar/KChartPolarCoordinatePlane_p.h
+++ b/src/KChart/Polar/KChartPolarCoordinatePlane_p.h
@@ -100,7 +100,7 @@
 
     virtual ~Private() { }
 
-    virtual void initialize()
+    void initialize() override
     {
         grid = new PolarGrid();
     }
diff --git a/src/KChart/Polar/KChartPolarDiagram.h b/src/KChart/Polar/KChartPolarDiagram.h
--- a/src/KChart/Polar/KChartPolarDiagram.h
+++ b/src/KChart/Polar/KChartPolarDiagram.h
@@ -47,20 +47,15 @@
 
 protected:
     // Implement AbstractDiagram
-    /** \reimpl */
-    virtual void paint ( PaintContext* paintContext );
+    void paint ( PaintContext* paintContext ) override;
 
 public:
-    /** \reimpl */
-    virtual void resize ( const QSizeF& area );
+    void resize ( const QSizeF& area ) override;
 
     // Implement AbstractPolarDiagram
-    /** \reimpl */
-    virtual qreal valueTotals () const;
-    /** \reimpl */
-    virtual qreal numberOfValuesPerDataset() const;
-    /** \reimpl */
-    virtual qreal numberOfGridRings() const;
+    qreal valueTotals () const override;
+    qreal numberOfValuesPerDataset() const override;
+    virtual qreal numberOfGridRings() const override;
 
     virtual PolarDiagram * clone() const;
 
@@ -92,10 +87,9 @@
                          qreal& newZoomX, qreal& newZoomY ); // KChart 3: references -> pointers
 
 protected:
-    /** \reimpl */
-    virtual const QPair<QPointF, QPointF> calculateDataBoundaries() const;
-    void paintEvent ( QPaintEvent* );
-    void resizeEvent ( QResizeEvent* );
+    const QPair<QPointF, QPointF> calculateDataBoundaries() const override;
+    void paintEvent ( QPaintEvent* ) override;
+    void resizeEvent ( QResizeEvent* ) override;
     virtual void paintPolarMarkers( PaintContext* ctx, const QPolygonF& polygon );
 
 }; // End of class PolarDiagram
diff --git a/src/KChart/Polar/KChartPolarGrid.h b/src/KChart/Polar/KChartPolarGrid.h
--- a/src/KChart/Polar/KChartPolarGrid.h
+++ b/src/KChart/Polar/KChartPolarGrid.h
@@ -44,11 +44,10 @@
         PolarGrid() : AbstractGrid() {}
         virtual ~PolarGrid() {}
 
-        virtual void drawGrid( PaintContext* context );
+        void drawGrid( PaintContext* context ) override;
 
     private:
-        virtual DataDimensionsList calculateGrid(
-            const DataDimensionsList& rawDataDimensions ) const;
+        DataDimensionsList calculateGrid(const DataDimensionsList& rawDataDimensions ) const override;
     };
 
 }
diff --git a/src/KChart/Polar/KChartRadarCoordinatePlane_p.h b/src/KChart/Polar/KChartRadarCoordinatePlane_p.h
--- a/src/KChart/Polar/KChartRadarCoordinatePlane_p.h
+++ b/src/KChart/Polar/KChartRadarCoordinatePlane_p.h
@@ -47,7 +47,7 @@
     virtual ~Private() { }
     TextAttributes textAttributes;
     
-    virtual void initialize()
+    void initialize() override
     {
         grid = new RadarGrid();
     }
diff --git a/src/KChart/Polar/KChartRadarDiagram.h b/src/KChart/Polar/KChartRadarDiagram.h
--- a/src/KChart/Polar/KChartRadarDiagram.h
+++ b/src/KChart/Polar/KChartRadarDiagram.h
@@ -44,20 +44,16 @@
 public:
     explicit RadarDiagram(
         QWidget* parent = 0, RadarCoordinatePlane* plane = 0 );
-    virtual ~RadarDiagram();
+    ~RadarDiagram() override;
 
     virtual void paint ( PaintContext* paintContext,
                          bool calculateListAndReturnScale,
                          qreal& newZoomX, qreal& newZoomY );
-    /** \reimpl */
-    virtual void resize ( const QSizeF& area );
+    void resize ( const QSizeF& area ) override;
 
-    /** \reimpl */
-    virtual qreal valueTotals () const;
-    /** \reimpl */
-    virtual qreal numberOfValuesPerDataset() const;
-    /** \reimpl */
-    virtual qreal numberOfGridRings() const;
+    qreal valueTotals () const override;
+    qreal numberOfValuesPerDataset() const override;
+    qreal numberOfGridRings() const override;
 
     /**
      * if val is true the diagram will mirror the diagram datapoints
@@ -85,11 +81,10 @@
     void setFillAlpha(qreal alphaF);
 
 protected:
-    /** \reimpl */
-    virtual const QPair<QPointF, QPointF> calculateDataBoundaries() const;
-    void paintEvent ( QPaintEvent* );
-    void resizeEvent ( QResizeEvent* );
-    virtual void paint ( PaintContext* paintContext );
+    const QPair<QPointF, QPointF> calculateDataBoundaries() const override;
+    void paintEvent ( QPaintEvent* ) override;
+    void resizeEvent ( QResizeEvent* ) override;
+    void paint ( PaintContext* paintContext ) override;
 
 }; // End of class RadarDiagram
 
diff --git a/src/KChart/Polar/KChartRadarGrid.h b/src/KChart/Polar/KChartRadarGrid.h
--- a/src/KChart/Polar/KChartRadarGrid.h
+++ b/src/KChart/Polar/KChartRadarGrid.h
@@ -44,11 +44,10 @@
         RadarGrid() : AbstractGrid() {}
         virtual ~RadarGrid() {}
 
-        virtual void drawGrid( PaintContext* context );
+        void drawGrid( PaintContext* context ) override;
 
     private:
-        virtual DataDimensionsList calculateGrid(
-            const DataDimensionsList& rawDataDimensions ) const;
+        DataDimensionsList calculateGrid(const DataDimensionsList& rawDataDimensions ) const override;
     };
 
 }
diff --git a/src/KChart/Polar/KChartRingDiagram.h b/src/KChart/Polar/KChartRingDiagram.h
--- a/src/KChart/Polar/KChartRingDiagram.h
+++ b/src/KChart/Polar/KChartRingDiagram.h
@@ -37,24 +37,19 @@
 public:
     explicit RingDiagram(
         QWidget* parent = 0, PolarCoordinatePlane* plane = 0 );
-    virtual ~RingDiagram();
+    ~RingDiagram() override;
 
 protected:
     // Implement AbstractDiagram
-    /** \reimpl */
-    virtual void paint( PaintContext* paintContext );
+    void paint( PaintContext* paintContext ) override;
 public:
-    /** \reimpl */
-    virtual void resize( const QSizeF& area );
+    void resize( const QSizeF& area ) override;
 
     // Implement AbstractPolarDiagram
-    /** \reimpl */
-    virtual qreal valueTotals() const;
-    /** \reimpl */
-    virtual qreal numberOfValuesPerDataset() const;
-    virtual qreal numberOfDatasets() const;
-    /** \reimpl */
-    virtual qreal numberOfGridRings() const;
+    qreal valueTotals() const override;
+    qreal numberOfValuesPerDataset() const override;
+    qreal numberOfDatasets() const override;
+    qreal numberOfGridRings() const override;
 
     qreal valueTotals( int dataset ) const;
 
@@ -72,10 +67,9 @@
     virtual bool expandWhenExploded() const;
 
 protected:
-    /** \reimpl */
-    virtual const QPair<QPointF, QPointF> calculateDataBoundaries() const;
-    void paintEvent( QPaintEvent* );
-    void resizeEvent( QResizeEvent* );
+    const QPair<QPointF, QPointF> calculateDataBoundaries() const override;
+    void paintEvent( QPaintEvent* ) override;
+    void resizeEvent( QResizeEvent* ) override;
 
 private:
     void drawOneSlice( QPainter* painter, uint dataset, uint slice, qreal granularity );
diff --git a/src/KChart/Ternary/KChartAbstractTernaryDiagram.h b/src/KChart/Ternary/KChartAbstractTernaryDiagram.h
--- a/src/KChart/Ternary/KChartAbstractTernaryDiagram.h
+++ b/src/KChart/Ternary/KChartAbstractTernaryDiagram.h
@@ -43,14 +43,14 @@
                                           TernaryCoordinatePlane* plane = 0 );
         virtual ~AbstractTernaryDiagram();
 
-        virtual void paint (PaintContext *paintContext);
+        void paint (PaintContext *paintContext) override;
 
         virtual void addAxis( TernaryAxis* axis );
         virtual void takeAxis( TernaryAxis* axis );
         virtual TernaryAxisList axes () const;
 
     protected:
-        virtual const QPair< QPointF, QPointF >  calculateDataBoundaries () const = 0;
+        const QPair< QPointF, QPointF >  calculateDataBoundaries () const override = 0;
 
     };
 
diff --git a/src/KChart/Ternary/KChartTernaryAxis.h b/src/KChart/Ternary/KChartTernaryAxis.h
--- a/src/KChart/Ternary/KChartTernaryAxis.h
+++ b/src/KChart/Ternary/KChartTernaryAxis.h
@@ -43,20 +43,20 @@
 
     public:
         explicit TernaryAxis ( AbstractTernaryDiagram* diagram = 0 );
-        ~TernaryAxis();
+        ~TernaryAxis() override;
 
-        virtual void  paintAll( QPainter &);
-        virtual void  paint (QPainter *);
-        virtual void  paintCtx (PaintContext *);
+        void  paintAll( QPainter &) override;
+        void  paint (QPainter *) override;
+        void  paintCtx (PaintContext *) override;
 
-        virtual QRect  geometry () const;
-        virtual void  setGeometry (const QRect &rect);
+        QRect  geometry () const override;
+        void  setGeometry (const QRect &rect) override;
 
-        virtual bool  isEmpty () const;
-        virtual QSize  minimumSize () const;
-        virtual QSize  maximumSize () const;
-        virtual QSize  sizeHint () const;
-        virtual Qt::Orientations  expandingDirections () const  ;
+        bool  isEmpty () const override;
+        QSize  minimumSize () const override;
+        QSize  maximumSize () const override;
+        QSize  sizeHint () const override;
+        Qt::Orientations  expandingDirections () const override  ;
 
         virtual const Position  position () const;
         virtual void  setPosition (Position p);
diff --git a/src/KChart/Ternary/KChartTernaryCoordinatePlane.h b/src/KChart/Ternary/KChartTernaryCoordinatePlane.h
--- a/src/KChart/Ternary/KChartTernaryCoordinatePlane.h
+++ b/src/KChart/Ternary/KChartTernaryCoordinatePlane.h
@@ -40,18 +40,16 @@
         explicit TernaryCoordinatePlane( Chart* parent = 0 );
         ~TernaryCoordinatePlane();
 
-        void addDiagram( AbstractDiagram* diagram );
+        void addDiagram( AbstractDiagram* diagram ) override;
 
-        void layoutDiagrams();
+        void layoutDiagrams() override;
 
-        const QPointF translate ( const QPointF& diagramPoint ) const;
+        const QPointF translate ( const QPointF& diagramPoint ) const override;
 
-        void paint( QPainter* );
-        DataDimensionsList getDataDimensionsList() const;
+        void paint( QPainter* ) override;
+        DataDimensionsList getDataDimensionsList() const override;
 
-        /** \reimpl */
         QSize minimumSizeHint() const;
-        /** \reimpl */
         QSizePolicy sizePolicy() const;
 
     private:
diff --git a/src/KChart/Ternary/KChartTernaryCoordinatePlane_p.h b/src/KChart/Ternary/KChartTernaryCoordinatePlane_p.h
--- a/src/KChart/Ternary/KChartTernaryCoordinatePlane_p.h
+++ b/src/KChart/Ternary/KChartTernaryCoordinatePlane_p.h
@@ -57,7 +57,7 @@
             // grid is delete in base class dtor
         }
 
-        virtual void initialize()
+        void initialize() override
         {
             grid = new TernaryGrid();
             xUnit = 0.0;
diff --git a/src/KChart/Ternary/KChartTernaryGrid.h b/src/KChart/Ternary/KChartTernaryGrid.h
--- a/src/KChart/Ternary/KChartTernaryGrid.h
+++ b/src/KChart/Ternary/KChartTernaryGrid.h
@@ -45,8 +45,8 @@
 
         virtual ~TernaryGrid();
 
-        void drawGrid( PaintContext* context );
-        DataDimensionsList calculateGrid( const DataDimensionsList& rawDataDimensions ) const;
+        void drawGrid( PaintContext* context ) override;
+        DataDimensionsList calculateGrid( const DataDimensionsList& rawDataDimensions ) const override;
 
         /** Returns two QSizeF objects specifying the dimension of the
             margins needed between each corner of the diagram and the
diff --git a/src/KChart/Ternary/KChartTernaryLineDiagram.h b/src/KChart/Ternary/KChartTernaryLineDiagram.h
--- a/src/KChart/Ternary/KChartTernaryLineDiagram.h
+++ b/src/KChart/Ternary/KChartTernaryLineDiagram.h
@@ -37,13 +37,13 @@
 
     public:
         explicit TernaryLineDiagram ( QWidget* parent = 0, TernaryCoordinatePlane* plane = 0 );
-        virtual ~TernaryLineDiagram();
+        ~TernaryLineDiagram() override;
 
-        void resize (const QSizeF &area);
-        void paint (PaintContext *paintContext);
+        void resize (const QSizeF &area) override;
+        void paint (PaintContext *paintContext) override;
 
     protected:
-        const QPair< QPointF, QPointF > calculateDataBoundaries () const;
+        const QPair< QPointF, QPointF > calculateDataBoundaries () const override;
 
     };
 }
diff --git a/src/KChart/Ternary/KChartTernaryPointDiagram.h b/src/KChart/Ternary/KChartTernaryPointDiagram.h
--- a/src/KChart/Ternary/KChartTernaryPointDiagram.h
+++ b/src/KChart/Ternary/KChartTernaryPointDiagram.h
@@ -36,13 +36,13 @@
 
     public:
         explicit TernaryPointDiagram ( QWidget* parent = 0, TernaryCoordinatePlane* plane = 0 );
-        virtual ~TernaryPointDiagram();
+        ~TernaryPointDiagram() override;
 
-        virtual void resize (const QSizeF &area);
-        virtual void paint (PaintContext *paintContext);
+        void resize (const QSizeF &area) override;
+        void paint (PaintContext *paintContext) override;
 
     protected:
-        virtual const QPair< QPointF, QPointF >  calculateDataBoundaries () const;
+        const QPair< QPointF, QPointF >  calculateDataBoundaries () const override;
     };
 
 }
diff --git a/src/KGantt/kganttabstractgrid.h b/src/KGantt/kganttabstractgrid.h
--- a/src/KGantt/kganttabstractgrid.h
+++ b/src/KGantt/kganttabstractgrid.h
@@ -41,7 +41,7 @@
     public:
 
         AbstractGrid(QObject* parent = 0);
-        virtual ~AbstractGrid();
+        ~AbstractGrid() override;
 
         QAbstractItemModel* model() const;
         QModelIndex rootIndex() const;
diff --git a/src/KGantt/kganttconstraintgraphicsitem.h b/src/KGantt/kganttconstraintgraphicsitem.h
--- a/src/KGantt/kganttconstraintgraphicsitem.h
+++ b/src/KGantt/kganttconstraintgraphicsitem.h
@@ -35,14 +35,14 @@
                                          QGraphicsItem* parent = 0, GraphicsScene* scene = 0 );
         virtual ~ConstraintGraphicsItem();
 
-        /*reimp*/ int type() const;
-        /*reimp (non virtual)*/GraphicsScene* scene() const;
+        int type() const override;
+        GraphicsScene* scene() const;
 
-        /*reimp*/ QString ganttToolTip() const;
+        QString ganttToolTip() const;
 
-        /*reimp*/ QRectF boundingRect() const;
-        /*reimp*/ void paint( QPainter* painter, const QStyleOptionGraphicsItem* option,
-                              QWidget* widget = 0 );
+        QRectF boundingRect() const override;
+        void paint( QPainter* painter, const QStyleOptionGraphicsItem* option,
+                    QWidget* widget = 0 ) override;
 
         inline const Constraint& constraint() const { return m_constraint; }
         Constraint proxyConstraint() const;
diff --git a/src/KGantt/kganttconstraintmodel.h b/src/KGantt/kganttconstraintmodel.h
--- a/src/KGantt/kganttconstraintmodel.h
+++ b/src/KGantt/kganttconstraintmodel.h
@@ -32,7 +32,7 @@
         KGANTT_DECLARE_PRIVATE_DERIVED_PARENT( ConstraintModel, QObject* )
      public:
         explicit ConstraintModel( QObject* parent=0 );
-        virtual ~ConstraintModel();
+        ~ConstraintModel() override;
 
         /**
         * Subclassing ConstraintModel and overriding addConstraint() and removeConstraint() can provide
diff --git a/src/KGantt/kganttconstraintproxy.h b/src/KGantt/kganttconstraintproxy.h
--- a/src/KGantt/kganttconstraintproxy.h
+++ b/src/KGantt/kganttconstraintproxy.h
@@ -36,7 +36,7 @@
         Q_OBJECT
     public:
         explicit ConstraintProxy( QObject* parent = 0 );
-        virtual ~ConstraintProxy();
+        ~ConstraintProxy() override;
 
         void setSourceModel( ConstraintModel* src );
         void setDestinationModel( ConstraintModel* dest );
diff --git a/src/KGantt/kganttdatetimegrid.h b/src/KGantt/kganttdatetimegrid.h
--- a/src/KGantt/kganttdatetimegrid.h
+++ b/src/KGantt/kganttdatetimegrid.h
@@ -44,7 +44,7 @@
         };
 	
         DateTimeGrid();
-        virtual ~DateTimeGrid();
+        ~DateTimeGrid() override;
 
         QDateTime startDateTime() const;
         void setStartDateTime( const QDateTime& dt );
@@ -78,18 +78,18 @@
         void setNoInformationBrush( const QBrush& brush );
         QBrush noInformationBrush() const;
 
-        /*reimp*/ Span mapToChart( const QModelIndex& idx ) const;
-        /*reimp*/ bool mapFromChart( const Span& span, const QModelIndex& idx,
-                                     const QList<Constraint>& constraints=QList<Constraint>() ) const;
-        /*reimp*/ qreal mapToChart( const QVariant& value ) const;
-        /*reimp*/ QVariant mapFromChart( qreal x ) const;
-        /*reimp*/ void paintGrid( QPainter* painter, 
-                                  const QRectF& sceneRect, const QRectF& exposedRect,
-                                  AbstractRowController* rowController = 0,
-                                  QWidget* widget=0 );
-        /*reimp*/ void paintHeader( QPainter* painter, 
-                                    const QRectF& headerRect, const QRectF& exposedRect,
-                                    qreal offset, QWidget* widget=0 );
+        Span mapToChart( const QModelIndex& idx ) const override;
+        bool mapFromChart( const Span& span, const QModelIndex& idx,
+                                     const QList<Constraint>& constraints=QList<Constraint>() ) const override;
+        qreal mapToChart( const QVariant& value ) const override;
+        QVariant mapFromChart( qreal x ) const override;
+        void paintGrid( QPainter* painter, 
+                        const QRectF& sceneRect, const QRectF& exposedRect,
+                        AbstractRowController* rowController = 0,
+                        QWidget* widget=0 ) override;
+        void paintHeader( QPainter* painter, 
+                          const QRectF& headerRect, const QRectF& exposedRect,
+                          qreal offset, QWidget* widget=0 ) override;
 
     protected:
         virtual void paintHourScaleHeader( QPainter* painter, 
@@ -116,8 +116,8 @@
         QRectF computeRect(const QDateTime& from, const QDateTime& to, const QRectF& rect) const;
         QPair<QDateTime, QDateTime> dateTimeRange(const QRectF& rect) const;
 
-        /* reimp */ void drawBackground(QPainter* paint, const QRectF& rect);
-        /* reimp */ void drawForeground(QPainter* paint, const QRectF& rect);
+        void drawBackground(QPainter* paint, const QRectF& rect) override;
+        void drawForeground(QPainter* paint, const QRectF& rect) override;
     };
 
     class KGANTT_EXPORT DateTimeScaleFormatter
diff --git a/src/KGantt/kganttdatetimegrid.cpp b/src/KGantt/kganttdatetimegrid.cpp
--- a/src/KGantt/kganttdatetimegrid.cpp
+++ b/src/KGantt/kganttdatetimegrid.cpp
@@ -1008,12 +1008,14 @@
 {
     class HourFormatter : public Private::DateTextFormatter {
     public:
-        virtual ~HourFormatter() {}
+        ~HourFormatter() override {}
 
-        QString format( const QDateTime& dt ) {
+        QString format( const QDateTime& dt ) override
+        {
             return dt.time().toString( QString::fromLatin1( "hh" ) );
         }
-        QRect textRect( qreal x, qreal offset, qreal dayWidth, const QRectF& headerRect, const QDateTime& dt ) {
+        QRect textRect( qreal x, qreal offset, qreal dayWidth, const QRectF& headerRect, const QDateTime& dt ) override
+        {
             Q_UNUSED(dt);
 
             return QRectF( QPointF( x, headerRect.top() ) + QPointF( -offset + 1.0, headerRect.height() / 2.0 ),
@@ -1025,11 +1027,13 @@
 
     class DayFormatter : public Private::DateTextFormatter {
     public:
-        virtual ~DayFormatter() {}
-        QString format( const QDateTime& dt ) {
+        ~DayFormatter() override {}
+        QString format( const QDateTime& dt ) override
+        {
             return dt.date().toString();
         }
-        QRect textRect( qreal x, qreal offset, qreal dayWidth, const QRectF& headerRect, const QDateTime& dt ) {
+        QRect textRect( qreal x, qreal offset, qreal dayWidth, const QRectF& headerRect, const QDateTime& dt ) override
+        {
             Q_UNUSED(dt);
 
             return QRectF( QPointF( x, headerRect.top() ) + QPointF( -offset, 0.0 ),
@@ -1048,12 +1052,14 @@
 {
     class DayFormatter : public Private::DateTextFormatter {
     public:
-        virtual ~DayFormatter() {}
+        ~DayFormatter() override {}
 
-        QString format( const QDateTime& dt ) {
+        QString format( const QDateTime& dt ) override
+        {
             return dt.toString( QString::fromLatin1( "ddd" ) ).left( 1 );
         }
-        QRect textRect( qreal x, qreal offset, qreal dayWidth, const QRectF& headerRect, const QDateTime& dt ) {
+        QRect textRect( qreal x, qreal offset, qreal dayWidth, const QRectF& headerRect, const QDateTime& dt ) override
+        {
             Q_UNUSED(dt);
 
             return QRectF( QPointF( x, headerRect.top() ) + QPointF( -offset + 1.0, headerRect.height() / 2.0 ),
@@ -1065,11 +1071,13 @@
 
     class WeekFormatter : public Private::DateTextFormatter {
     public:
-        virtual ~WeekFormatter() {}
-        QString format( const QDateTime& dt ) {
+        ~WeekFormatter() override {}
+        QString format( const QDateTime& dt ) override
+        {
             return QString::number(dt.date().weekNumber()) + QLatin1String("/") + QString::number(dt.date().year());
         }
-        QRect textRect( qreal x, qreal offset, qreal dayWidth, const QRectF& headerRect, const QDateTime& dt ) {
+        QRect textRect( qreal x, qreal offset, qreal dayWidth, const QRectF& headerRect, const QDateTime& dt ) override
+        {
             Q_UNUSED(dt);
 
             return QRectF( QPointF( x, headerRect.top() ) + QPointF( -offset, 0.0 ),
@@ -1088,12 +1096,14 @@
 {
     class WeekFormatter : public Private::DateTextFormatter {
     public:
-        virtual ~WeekFormatter() {}
+        ~WeekFormatter() override {}
 
-        QString format( const QDateTime& dt ) {
+        QString format( const QDateTime& dt ) override
+        {
             return QString::number( dt.date().weekNumber() );
         }
-        QRect textRect( qreal x, qreal offset, qreal dayWidth, const QRectF& headerRect, const QDateTime& dt ) {
+        QRect textRect( qreal x, qreal offset, qreal dayWidth, const QRectF& headerRect, const QDateTime& dt ) override
+        {
             Q_UNUSED(dt);
 
             return QRectF( QPointF( x, headerRect.top() ) + QPointF( -offset, headerRect.height() / 2.0 ),
@@ -1105,12 +1115,14 @@
 
     class MonthFormatter : public Private::DateTextFormatter {
     public:
-        virtual ~MonthFormatter() {}
+        ~MonthFormatter() override {}
 
-        QString format( const QDateTime& dt ) {
+        QString format( const QDateTime& dt ) override
+        {
             return QLocale().monthName(dt.date().month(), QLocale::LongFormat) + QLatin1String("/") + QString::number(dt.date().year());
         }
-        QRect textRect( qreal x, qreal offset, qreal dayWidth, const QRectF& headerRect, const QDateTime& dt ) {
+        QRect textRect( qreal x, qreal offset, qreal dayWidth, const QRectF& headerRect, const QDateTime& dt ) override
+        {
             return QRectF( QPointF( x, headerRect.top() ) + QPointF( -offset, 0.0 ),
                            QSizeF( dayWidth * dt.date().daysInMonth(), headerRect.height() / 2.0 ) ).toRect();
         }
@@ -1127,12 +1139,14 @@
 {
     class MonthFormatter : public Private::DateTextFormatter {
     public:
-        virtual ~MonthFormatter() {}
+        ~MonthFormatter() override {}
 
-        QString format( const QDateTime& dt ) {
+        QString format( const QDateTime& dt ) override
+        {
             return QLocale().monthName(dt.date().month(), QLocale::ShortFormat) + QLatin1String("/") + QString::number(dt.date().year());
         }
-        QRect textRect( qreal x, qreal offset, qreal dayWidth, const QRectF& headerRect, const QDateTime& dt ) {
+        QRect textRect( qreal x, qreal offset, qreal dayWidth, const QRectF& headerRect, const QDateTime& dt ) override
+        {
             return QRectF( QPointF( x, headerRect.top() ) + QPointF( -offset, headerRect.height() / 2.0 ),
                            QSizeF( dayWidth * dt.date().daysInMonth(), headerRect.height() / 2.0 ) ).toRect();
         }
@@ -1142,12 +1156,14 @@
 
     class YearFormatter : public Private::DateTextFormatter {
     public:
-        virtual ~YearFormatter() {}
+        ~YearFormatter() override {}
 
-        QString format( const QDateTime& dt ) {
+        QString format( const QDateTime& dt ) override
+        {
             return QString::number( dt.date().year() );
         }
-        QRect textRect( qreal x, qreal offset, qreal dayWidth, const QRectF& headerRect, const QDateTime& dt ) {
+        QRect textRect( qreal x, qreal offset, qreal dayWidth, const QRectF& headerRect, const QDateTime& dt ) override
+        {
             return QRectF( QPointF( x, headerRect.top() ) + QPointF( -offset, 0.0 ),
                            QSizeF( dayWidth * dt.date().daysInYear(), headerRect.height() / 2.0 ) ).toRect();
         }
diff --git a/src/KGantt/kganttforwardingproxymodel.h b/src/KGantt/kganttforwardingproxymodel.h
--- a/src/KGantt/kganttforwardingproxymodel.h
+++ b/src/KGantt/kganttforwardingproxymodel.h
@@ -30,25 +30,25 @@
         Q_DISABLE_COPY(ForwardingProxyModel)
     public:
         explicit ForwardingProxyModel( QObject* parent=0 );
-        virtual ~ForwardingProxyModel();
+        ~ForwardingProxyModel() override;
 
-        /*reimp*/ QModelIndex mapFromSource ( const QModelIndex & sourceIndex ) const;
-        /*reimp*/ QModelIndex mapToSource ( const QModelIndex & proxyIndex ) const;
+        QModelIndex mapFromSource ( const QModelIndex & sourceIndex ) const override;
+        QModelIndex mapToSource ( const QModelIndex & proxyIndex ) const override;
 
-        /*reimp*/ void setSourceModel( QAbstractItemModel* model );
+        void setSourceModel( QAbstractItemModel* model ) override;
 
-        /*reimp*/ QModelIndex index( int row, int column, const QModelIndex& parent = QModelIndex() ) const;
-        /*reimp*/ QModelIndex parent( const QModelIndex& idx ) const;
+        QModelIndex index( int row, int column, const QModelIndex& parent = QModelIndex() ) const override;
+        QModelIndex parent( const QModelIndex& idx ) const override;
 
-        /*reimp*/ int rowCount( const QModelIndex& idx = QModelIndex() ) const;
-        /*reimp*/ int columnCount( const QModelIndex& idx = QModelIndex() ) const;
+        int rowCount( const QModelIndex& idx = QModelIndex() ) const override;
+        int columnCount( const QModelIndex& idx = QModelIndex() ) const override;
 
-        /*reimp*/ bool setData( const QModelIndex& index, const QVariant& value, int role = Qt::EditRole );
+        bool setData( const QModelIndex& index, const QVariant& value, int role = Qt::EditRole ) override;
 
-        /*reimp*/ QMimeData *mimeData(const QModelIndexList &indexes) const;
-        /*reimp*/ bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent);
-        /*reimp*/ QStringList mimeTypes() const;
-        /*reimp*/ Qt::DropActions supportedDropActions() const;
+        QMimeData *mimeData(const QModelIndexList &indexes) const override;
+        bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override;
+        QStringList mimeTypes() const override;
+        Qt::DropActions supportedDropActions() const override;
     
     protected Q_SLOTS:
         virtual void sourceModelAboutToBeReset();
diff --git a/src/KGantt/kganttgraphicsitem.h b/src/KGantt/kganttgraphicsitem.h
--- a/src/KGantt/kganttgraphicsitem.h
+++ b/src/KGantt/kganttgraphicsitem.h
@@ -44,8 +44,8 @@
         explicit GraphicsItem( const QModelIndex& idx, QGraphicsItem* parent = 0, GraphicsScene* scene = 0 );
         virtual ~GraphicsItem();
 
-        /*reimp*/int type() const;
-        /*reimp (non-virtual)*/ GraphicsScene* scene() const;
+        int type() const override;
+        GraphicsScene* scene() const;
 
         void updateItem( const Span& rowgeometry, const QPersistentModelIndex& idx );
 
@@ -73,19 +73,19 @@
         QList<ConstraintGraphicsItem*> startConstraints() const { return m_startConstraints; }
         QList<ConstraintGraphicsItem*> endConstraints() const { return m_endConstraints; }
 
-        /*reimp*/ QRectF boundingRect() const;
-        /*reimp*/ void paint( QPainter* painter, const QStyleOptionGraphicsItem* option,
-                              QWidget* widget = 0 );
+        QRectF boundingRect() const override;
+        void paint( QPainter* painter, const QStyleOptionGraphicsItem* option,
+                    QWidget* widget = 0 ) override;
 
-        /*reimp*/ QVariant itemChange( GraphicsItemChange, const QVariant& value );
+        QVariant itemChange( GraphicsItemChange, const QVariant& value ) override;
     protected:
-        /*reimp*/ void focusInEvent( QFocusEvent* event );
-        /*reimp*/ void hoverMoveEvent( QGraphicsSceneHoverEvent* );
-        /*reimp*/ void hoverLeaveEvent( QGraphicsSceneHoverEvent* );
-        /*reimp*/ void mousePressEvent( QGraphicsSceneMouseEvent* );
-        /*reimp*/ void mouseReleaseEvent( QGraphicsSceneMouseEvent* );
-        /*reimp*/ void mouseDoubleClickEvent( QGraphicsSceneMouseEvent* );
-        /*reimp*/ void mouseMoveEvent( QGraphicsSceneMouseEvent* );
+        void focusInEvent( QFocusEvent* event ) override;
+        void hoverMoveEvent( QGraphicsSceneHoverEvent* ) override;
+        void hoverLeaveEvent( QGraphicsSceneHoverEvent* ) override;
+        void mousePressEvent( QGraphicsSceneMouseEvent* ) override;
+        void mouseReleaseEvent( QGraphicsSceneMouseEvent* ) override;
+        void mouseDoubleClickEvent( QGraphicsSceneMouseEvent* ) override;
+        void mouseMoveEvent( QGraphicsSceneMouseEvent* ) override;
 
     private:
         void init();
diff --git a/src/KGantt/kganttgraphicsscene.h b/src/KGantt/kganttgraphicsscene.h
--- a/src/KGantt/kganttgraphicsscene.h
+++ b/src/KGantt/kganttgraphicsscene.h
@@ -47,7 +47,7 @@
         KGANTT_DECLARE_PRIVATE_BASE_POLYMORPHIC( GraphicsScene )
     public:
         explicit GraphicsScene( QObject* parent=0 );
-        virtual ~GraphicsScene();
+        ~GraphicsScene() override;
 
         //qreal dateTimeToSceneX( const QDateTime& dt ) const;
         //QDateTime sceneXtoDateTime( qreal x ) const;
@@ -111,9 +111,9 @@
         void pressed( const QModelIndex & index );
 
     protected:
-        /*reimp*/ void helpEvent( QGraphicsSceneHelpEvent *helpEvent );
-        /*reimp*/ void drawBackground( QPainter* painter, const QRectF& rect );
-        /*reimp*/ void drawForeground( QPainter* painter, const QRectF& rect );
+        void helpEvent( QGraphicsSceneHelpEvent *helpEvent ) override;
+        void drawBackground( QPainter* painter, const QRectF& rect ) override;
+        void drawForeground( QPainter* painter, const QRectF& rect ) override;
 
     public Q_SLOTS:
         void setModel( QAbstractItemModel* );
diff --git a/src/KGantt/kganttgraphicsscene.cpp b/src/KGantt/kganttgraphicsscene.cpp
--- a/src/KGantt/kganttgraphicsscene.cpp
+++ b/src/KGantt/kganttgraphicsscene.cpp
@@ -867,30 +867,35 @@
         m_model = model;
     }
 
-    /*reimp*/int headerHeight() const { return 40; }
+    int headerHeight() const override { return 40; }
 
-    /*reimp*/ bool isRowVisible( const QModelIndex& ) const { return true;}
-    /*reimp*/ bool isRowExpanded( const QModelIndex& ) const { return false; }
-    /*reimp*/ KGantt::Span rowGeometry( const QModelIndex& idx ) const
+    bool isRowVisible( const QModelIndex& ) const override { return true;}
+    bool isRowExpanded( const QModelIndex& ) const override { return false; }
+    KGantt::Span rowGeometry( const QModelIndex& idx ) const override
     {
         return KGantt::Span( idx.row() * ROW_HEIGHT, ROW_HEIGHT );
     }
-    /*reimp*/ int maximumItemHeight() const {
+    int maximumItemHeight() const override
+    {
         return ROW_HEIGHT/2;
     }
-    /*reimp*/int totalHeight() const {
+    int totalHeight() const override
+    {
         return m_model->rowCount()* ROW_HEIGHT;
     }
 
-    /*reimp*/ QModelIndex indexAt( int height ) const {
+    QModelIndex indexAt( int height ) const override
+    {
         return m_model->index( height/ROW_HEIGHT, 0 );
     }
 
-    /*reimp*/ QModelIndex indexBelow( const QModelIndex& idx ) const {
+    QModelIndex indexBelow( const QModelIndex& idx ) const override
+    {
         if ( !idx.isValid() )return QModelIndex();
         return idx.model()->index( idx.row()+1, idx.column(), idx.parent() );
     }
-    /*reimp*/ QModelIndex indexAbove( const QModelIndex& idx ) const {
+    QModelIndex indexAbove( const QModelIndex& idx ) const override
+    {
         if ( !idx.isValid() )return QModelIndex();
         return idx.model()->index( idx.row()-1, idx.column(), idx.parent() );
     }
@@ -905,7 +910,7 @@
            m_destroyedFlag( destroyedFlag )
     {}
 
-    ~TestLineItem()
+    ~TestLineItem() override
     { *m_destroyedFlag = true; }
 
 private:
diff --git a/src/KGantt/kganttgraphicsview.h b/src/KGantt/kganttgraphicsview.h
--- a/src/KGantt/kganttgraphicsview.h
+++ b/src/KGantt/kganttgraphicsview.h
@@ -63,7 +63,7 @@
     public:
 
         explicit GraphicsView( QWidget* parent=0 );
-        virtual ~GraphicsView();
+        ~GraphicsView() override;
 
         QAbstractItemModel* model() const;
         QAbstractProxyModel* summaryHandlingModel() const;
@@ -121,7 +121,7 @@
 
     protected:
         void clearItems();
-        /*reimp*/void resizeEvent( QResizeEvent* );
+        void resizeEvent( QResizeEvent* ) override;
     private:
         friend class View;
 
diff --git a/src/KGantt/kganttgraphicsview_p.h b/src/KGantt/kganttgraphicsview_p.h
--- a/src/KGantt/kganttgraphicsview_p.h
+++ b/src/KGantt/kganttgraphicsview_p.h
@@ -31,16 +31,16 @@
         Q_OBJECT
     public:
         explicit HeaderWidget( GraphicsView* parent );
-        virtual ~HeaderWidget();
+        ~HeaderWidget() override;
 
         GraphicsView* view() const { return qobject_cast<GraphicsView*>( parent() );}
 
     public Q_SLOTS:
         void scrollTo( int );
     protected:
-        /*reimp*/ bool event( QEvent* ev );
-        /*reimp*/ void paintEvent( QPaintEvent* ev );
-        /*reimp*/ void contextMenuEvent( QContextMenuEvent* ev );
+        bool event( QEvent* ev ) override;
+        void paintEvent( QPaintEvent* ev ) override;
+        void contextMenuEvent( QContextMenuEvent* ev ) override;
     private:
         qreal m_offset;
     };
diff --git a/src/KGantt/kganttitemdelegate.h b/src/KGantt/kganttitemdelegate.h
--- a/src/KGantt/kganttitemdelegate.h
+++ b/src/KGantt/kganttitemdelegate.h
@@ -43,7 +43,7 @@
         };
 
         explicit ItemDelegate( QObject* parent = 0 );
-        virtual ~ItemDelegate();
+        ~ItemDelegate() override;
 
         void setDefaultBrush( ItemType type, const QBrush& brush );
         QBrush defaultBrush( ItemType type ) const;
diff --git a/src/KGantt/kganttlegend.h b/src/KGantt/kganttlegend.h
--- a/src/KGantt/kganttlegend.h
+++ b/src/KGantt/kganttlegend.h
@@ -33,31 +33,31 @@
         KGANTT_DECLARE_PRIVATE_BASE_POLYMORPHIC( Legend )
     public:
         explicit Legend( QWidget* parent = 0 );
-        virtual ~Legend();
+        ~Legend() override;
 
-        /*reimp*/ QModelIndex indexAt( const QPoint& point ) const;
-        /*reimp*/ QRect visualRect( const QModelIndex& index ) const;
+        QModelIndex indexAt( const QPoint& point ) const override;
+        QRect visualRect( const QModelIndex& index ) const override;
 
-        /*reimp*/ void scrollTo( const QModelIndex&, ScrollHint = EnsureVisible ) {}
+        void scrollTo( const QModelIndex&, ScrollHint = EnsureVisible ) override {}
 
-        /*reimp*/ QSize sizeHint() const;
-        /*reimp*/ QSize minimumSizeHint() const;
+        QSize sizeHint() const override;
+        QSize minimumSizeHint() const override;
 
-        /*reimp*/ void setModel( QAbstractItemModel* model );
+        void setModel( QAbstractItemModel* model ) override;
 
     protected:
         virtual QRect drawItem( QPainter* painter, const QModelIndex& index, const QPoint& pos = QPoint() ) const;
         virtual QSize measureItem( const QModelIndex& index, bool recursive = true ) const;
         virtual StyleOptionGanttItem getStyleOption( const QModelIndex& index ) const;
 
-        /*reimp*/ void paintEvent( QPaintEvent* event );
+        void paintEvent( QPaintEvent* event ) override;
 
-        /*reimp*/ int horizontalOffset() const { return 0; }
-        /*reimp*/ bool isIndexHidden( const QModelIndex& ) const { return false; }
-        /*reimp*/ QModelIndex moveCursor( CursorAction, Qt::KeyboardModifiers ) { return QModelIndex(); }
-        /*reimp*/ void setSelection( const QRect&, QItemSelectionModel::SelectionFlags ) {}
-        /*reimp*/ int verticalOffset() const { return 0; }
-        /*reimp*/ QRegion visualRegionForSelection( const QItemSelection& ) const { return QRegion(); }
+        int horizontalOffset() const override { return 0; }
+        bool isIndexHidden( const QModelIndex& ) const override { return false; }
+        QModelIndex moveCursor( CursorAction, Qt::KeyboardModifiers ) override { return QModelIndex(); }
+        void setSelection( const QRect&, QItemSelectionModel::SelectionFlags ) override {}
+        int verticalOffset() const override { return 0; }
+        QRegion visualRegionForSelection( const QItemSelection& ) const override { return QRegion(); }
 
     protected Q_SLOTS:
         virtual void modelDataChanged();
diff --git a/src/KGantt/kganttlistviewrowcontroller.h b/src/KGantt/kganttlistviewrowcontroller.h
--- a/src/KGantt/kganttlistviewrowcontroller.h
+++ b/src/KGantt/kganttlistviewrowcontroller.h
@@ -34,15 +34,15 @@
 	ListViewRowController( QListView* lv, QAbstractProxyModel* proxy );
         ~ListViewRowController();
 
-        /*reimp*/ int headerHeight() const;
-        /*reimp*/ int maximumItemHeight() const;
-        /*reimp*/ int totalHeight() const;
-        /*reimp*/ bool isRowVisible( const QModelIndex& idx ) const;
-        /*reimp*/ bool isRowExpanded( const QModelIndex& idx ) const;
-        /*reimp*/ Span rowGeometry( const QModelIndex& idx ) const;
-        /*reimp*/ QModelIndex indexAt( int height ) const;
-        /*reimp*/ QModelIndex indexAbove( const QModelIndex& idx ) const;
-        /*reimp*/ QModelIndex indexBelow( const QModelIndex& idx ) const;
+        int headerHeight() const override;
+        int maximumItemHeight() const override;
+        int totalHeight() const override;
+        bool isRowVisible( const QModelIndex& idx ) const override;
+        bool isRowExpanded( const QModelIndex& idx ) const override;
+        Span rowGeometry( const QModelIndex& idx ) const override;
+        QModelIndex indexAt( int height ) const override;
+        QModelIndex indexAbove( const QModelIndex& idx ) const override;
+        QModelIndex indexBelow( const QModelIndex& idx ) const override;
     };
 }
 
diff --git a/src/KGantt/kganttproxymodel.h b/src/KGantt/kganttproxymodel.h
--- a/src/KGantt/kganttproxymodel.h
+++ b/src/KGantt/kganttproxymodel.h
@@ -29,7 +29,7 @@
         KGANTT_DECLARE_PRIVATE_BASE_POLYMORPHIC( ProxyModel )
     public:
         explicit ProxyModel( QObject* parent=0 );
-        virtual ~ProxyModel();
+        ~ProxyModel() override;
 
         void setColumn( int ganttrole, int col );
         void removeColumn( int ganttrole );
@@ -44,14 +44,14 @@
         bool calendarMode() const;
 #endif
 
-        /*reimp*/ QModelIndex mapFromSource( const QModelIndex& idx) const;
-        /*reimp*/ QModelIndex mapToSource( const QModelIndex& proxyIdx ) const;
+        QModelIndex mapFromSource( const QModelIndex& idx) const override;
+        QModelIndex mapToSource( const QModelIndex& proxyIdx ) const override;
 
-        /*reimp*/ int rowCount( const QModelIndex& idx ) const;
-        /*reimp*/ int columnCount( const QModelIndex& idx ) const;
+        int rowCount( const QModelIndex& idx ) const override;
+        int columnCount( const QModelIndex& idx ) const override;
 
-        /*reimp*/ QVariant data( const QModelIndex& idx, int role = Qt::DisplayRole ) const;
-        /*reimp*/ bool setData( const QModelIndex& idx, const QVariant& value, int role=Qt::EditRole );
+        QVariant data( const QModelIndex& idx, int role = Qt::DisplayRole ) const override;
+        bool setData( const QModelIndex& idx, const QVariant& value, int role=Qt::EditRole ) override;
     };
 }
 
diff --git a/src/KGantt/kganttsummaryhandlingproxymodel.h b/src/KGantt/kganttsummaryhandlingproxymodel.h
--- a/src/KGantt/kganttsummaryhandlingproxymodel.h
+++ b/src/KGantt/kganttsummaryhandlingproxymodel.h
@@ -28,23 +28,23 @@
         KGANTT_DECLARE_PRIVATE_BASE_POLYMORPHIC( SummaryHandlingProxyModel )
     public:
         explicit SummaryHandlingProxyModel( QObject* parent=0 );
-        virtual ~SummaryHandlingProxyModel();
+        ~SummaryHandlingProxyModel() override;
 
-        /*reimp*/ void setSourceModel( QAbstractItemModel* model );
+        void setSourceModel( QAbstractItemModel* model ) override;
 
-        /*reimp*/ QVariant data( const QModelIndex& proxyIndex, int role = Qt::DisplayRole) const;
-        /*reimp*/ bool setData( const QModelIndex& index, const QVariant& value, int role = Qt::EditRole );
+        QVariant data( const QModelIndex& proxyIndex, int role = Qt::DisplayRole) const override;
+        bool setData( const QModelIndex& index, const QVariant& value, int role = Qt::EditRole ) override;
 
-        /*reimp*/ Qt::ItemFlags flags( const QModelIndex& idx ) const;
+        Qt::ItemFlags flags( const QModelIndex& idx ) const override;
 
     protected:
-        /*reimp*/ void sourceModelReset();
-        /*reimp*/ void sourceLayoutChanged();
-        /*reimp*/ void sourceDataChanged( const QModelIndex& from, const QModelIndex& to );
-        /*reimp*/ void sourceColumnsAboutToBeInserted( const QModelIndex& idx, int start, int end );
-        /*reimp*/ void sourceColumnsAboutToBeRemoved( const QModelIndex& idx, int start, int end );
-        /*reimp*/ void sourceRowsAboutToBeInserted( const QModelIndex& idx, int start, int end );
-        /*reimp*/ void sourceRowsAboutToBeRemoved( const QModelIndex&, int start, int end );
+        void sourceModelReset() override;
+        void sourceLayoutChanged() override;
+        void sourceDataChanged( const QModelIndex& from, const QModelIndex& to ) override;
+        void sourceColumnsAboutToBeInserted( const QModelIndex& idx, int start, int end ) override;
+        void sourceColumnsAboutToBeRemoved( const QModelIndex& idx, int start, int end ) override;
+        void sourceRowsAboutToBeInserted( const QModelIndex& idx, int start, int end ) override;
+        void sourceRowsAboutToBeRemoved( const QModelIndex&, int start, int end ) override;
     };
 }
 
diff --git a/src/KGantt/kgantttreeviewrowcontroller.h b/src/KGantt/kgantttreeviewrowcontroller.h
--- a/src/KGantt/kgantttreeviewrowcontroller.h
+++ b/src/KGantt/kgantttreeviewrowcontroller.h
@@ -34,15 +34,15 @@
         TreeViewRowController( QTreeView* tv, QAbstractProxyModel* proxy );
         virtual ~TreeViewRowController();
 
-        /*reimp*/ int headerHeight() const;
-        /*reimp*/ int maximumItemHeight() const;
-        /*reimp*/ int totalHeight() const;
-        /*reimp*/ bool isRowVisible( const QModelIndex& idx ) const;
-        /*reimp*/ bool isRowExpanded( const QModelIndex& idx ) const;
-        /*reimp*/ Span rowGeometry( const QModelIndex& idx ) const;
-        /*reimp*/ QModelIndex indexAt( int height ) const;
-        /*reimp*/ QModelIndex indexAbove( const QModelIndex& idx ) const;
-        /*reimp*/ QModelIndex indexBelow( const QModelIndex& idx ) const;
+        int headerHeight() const override;
+        int maximumItemHeight() const override;
+        int totalHeight() const override;
+        bool isRowVisible( const QModelIndex& idx ) const override;
+        bool isRowExpanded( const QModelIndex& idx ) const override;
+        Span rowGeometry( const QModelIndex& idx ) const override;
+        QModelIndex indexAt( int height ) const override;
+        QModelIndex indexAbove( const QModelIndex& idx ) const override;
+        QModelIndex indexBelow( const QModelIndex& idx ) const override;
     };
 }
 
diff --git a/src/KGantt/kganttview.h b/src/KGantt/kganttview.h
--- a/src/KGantt/kganttview.h
+++ b/src/KGantt/kganttview.h
@@ -53,7 +53,7 @@
     public:
 
         explicit View(QWidget* parent=0);
-        virtual ~View();
+        ~View() override;
 
         QAbstractItemModel* model() const;
         QItemSelectionModel* selectionModel() const;
@@ -100,7 +100,7 @@
         void collapseAll( QModelIndex index = QModelIndex() );
 
     protected:
-        /*reimp*/ void resizeEvent(QResizeEvent*);
+        void resizeEvent(QResizeEvent*) override;
     };
 }
 
diff --git a/src/KGantt/kganttview.cpp b/src/KGantt/kganttview.cpp
--- a/src/KGantt/kganttview.cpp
+++ b/src/KGantt/kganttview.cpp
@@ -48,7 +48,7 @@
         explicit HeaderView( QWidget* parent=0 ) : QHeaderView( Qt::Horizontal, parent ) {
         }
 
-        QSize sizeHint() const { QSize s = QHeaderView::sizeHint(); s.rheight() *= 2; return s; }
+        QSize sizeHint() const override { QSize s = QHeaderView::sizeHint(); s.rheight() *= 2; return s; }
     };
 }
 
diff --git a/src/KGantt/kganttview_p.h b/src/KGantt/kganttview_p.h
--- a/src/KGantt/kganttview_p.h
+++ b/src/KGantt/kganttview_p.h
@@ -53,7 +53,7 @@
         Q_OBJECT
     public:
         explicit KGanttTreeView( QAbstractProxyModel* proxy, QWidget* parent=0 );
-        virtual ~KGanttTreeView();
+        ~KGanttTreeView() override;
 
         AbstractRowController* rowController() { return &m_controller; }
 
diff --git a/src/KGantt/unittest/test.h b/src/KGantt/unittest/test.h
--- a/src/KGantt/unittest/test.h
+++ b/src/KGantt/unittest/test.h
@@ -148,7 +148,7 @@
     GenericFactory( const char * group=0 ) {
       TestRegistry::instance()->registerTestFactory( this, group );
     }
-    Test * create() const { return new T_Test(); }
+    Test * create() const override { return new T_Test(); }
   };
 
 }
@@ -189,7 +189,7 @@
         class Class##Test : public KDAB::UnitTest::Test {  \
         public:                                                 \
             Class##Test() : Test( #Namespace "::" #Class ) {}    \
-            void run();                                         \
+            void run() override;                                         \
         };                                                      \
     }                                                           \
     KDAB_EXPORT_SCOPED_UNITTEST( Namespace, Class##Test, Group ) \
diff --git a/tests/Gantt/apireview/entrydelegate.h b/tests/Gantt/apireview/entrydelegate.h
--- a/tests/Gantt/apireview/entrydelegate.h
+++ b/tests/Gantt/apireview/entrydelegate.h
@@ -30,7 +30,7 @@
 public:
     EntryDelegate( KGantt::ConstraintModel* constraintModel, QObject* parent = 0 );
     
-    bool editorEvent( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index );
+    bool editorEvent( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index ) override;
     
 private:
     void addConstraint(const QModelIndex & index1, const QModelIndex & index2);
diff --git a/tests/Gantt/customconstraints/main.cpp b/tests/Gantt/customconstraints/main.cpp
--- a/tests/Gantt/customconstraints/main.cpp
+++ b/tests/Gantt/customconstraints/main.cpp
@@ -41,9 +41,9 @@
     {
     }
 
-    /*reimp*/void addConstraint( const QModelIndex& from,
-                                 const QModelIndex& to,
-                                 Qt::KeyboardModifiers modifiers )
+    void addConstraint( const QModelIndex& from,
+                        const QModelIndex& to,
+                        Qt::KeyboardModifiers modifiers ) override
     {
         qDebug() << "MyGraphicsView::addConstraint()";
         if ( isReadOnly() ) return;
diff --git a/tests/Gantt/gfxview/main.cpp b/tests/Gantt/gfxview/main.cpp
--- a/tests/Gantt/gfxview/main.cpp
+++ b/tests/Gantt/gfxview/main.cpp
@@ -43,31 +43,36 @@
         m_model = model;
     }
 
-    /*reimp*/int headerHeight() const { return 40; }
+    int headerHeight() const override { return 40; }
 
-    /*reimp*/ bool isRowVisible( const QModelIndex& ) const { return true;}
-    /*reimp*/ bool isRowExpanded( const QModelIndex& ) const { return false; }
-    /*reimp*/ KGantt::Span rowGeometry( const QModelIndex& idx ) const
+    bool isRowVisible( const QModelIndex& ) const override { return true;}
+    bool isRowExpanded( const QModelIndex& ) const override { return false; }
+    KGantt::Span rowGeometry( const QModelIndex& idx ) const override
     {
         qDebug() << "rowGeometry(" << idx.row()<<")";
         return KGantt::Span( idx.row()*ROW_HEIGHT, ROW_HEIGHT );
     }
-    /*reimp*/ int maximumItemHeight() const {
+    int maximumItemHeight() const override
+    {
         return ROW_HEIGHT/2;
     }
-    /*reimp*/ int totalHeight() const {
+    int totalHeight() const override
+    {
         return m_model.isNull()?0:m_model->rowCount()*ROW_HEIGHT;
     }
 
-    /*reimp*/ QModelIndex indexAt( int height ) const {
+    QModelIndex indexAt( int height ) const override
+    {
         return m_model->index( height/ROW_HEIGHT, 0 );
     }
 
-    /*reimp*/ QModelIndex indexBelow( const QModelIndex& idx ) const {
+    QModelIndex indexBelow( const QModelIndex& idx ) const override
+    {
         if ( !idx.isValid() )return QModelIndex();
         return idx.model()->index( idx.row()+1, idx.column(), idx.parent() );
     }
-    /*reimp*/ QModelIndex indexAbove( const QModelIndex& idx ) const {
+    QModelIndex indexAbove( const QModelIndex& idx ) const override
+    {
         if ( !idx.isValid() )return QModelIndex();
         return idx.model()->index( idx.row()-1, idx.column(), idx.parent() );
     }
@@ -78,7 +83,7 @@
 
 class MyStandardItemModel : public QStandardItemModel {
 public:
-    /*reimp*/bool setData( const QModelIndex& idx, const QVariant& value, int role )
+    bool setData( const QModelIndex& idx, const QVariant& value, int role ) override
     {
         //qDebug() << "MyStandardItemModel::setData("<<idx<< value<<role<<")";
         return QStandardItemModel::setData( idx, value, role );
diff --git a/tests/Gantt/headers/main.cpp b/tests/Gantt/headers/main.cpp
--- a/tests/Gantt/headers/main.cpp
+++ b/tests/Gantt/headers/main.cpp
@@ -34,10 +34,10 @@
 public:
     MyDateTimeScaleFormatter();
 
-    /*reimp*/QDateTime nextRangeBegin( const QDateTime& datetime ) const;
-    /*reimp*/QDateTime currentRangeBegin( const QDateTime& datetime ) const;
+    QDateTime nextRangeBegin( const QDateTime& datetime ) const override;
+    QDateTime currentRangeBegin( const QDateTime& datetime ) const override;
 
-    /*reimp*/QString text( const QDateTime& dt ) const;
+    QString text( const QDateTime& dt ) const override;
 };
 
 MyDateTimeScaleFormatter::MyDateTimeScaleFormatter()
@@ -72,7 +72,7 @@
         : QHeaderView( Qt::Horizontal, parent ) {
     }
 
-    /*reimp*/QSize sizeHint() const {
+    QSize sizeHint() const override {
         QSize s = QHeaderView::sizeHint(); s.rheight() *= 3; return s;
     }
 };
diff --git a/tests/Gantt/reorder/main.cpp b/tests/Gantt/reorder/main.cpp
--- a/tests/Gantt/reorder/main.cpp
+++ b/tests/Gantt/reorder/main.cpp
@@ -57,13 +57,15 @@
         m_tasks.push_back( task );
     }
 
-    /*reimp*/int rowCount( const QModelIndex& index = QModelIndex() ) const {
+    int rowCount( const QModelIndex& index = QModelIndex() ) const override
+    {
         return index.isValid()?0:m_tasks.size();
     }
-    /*reimp*/int columnCount( const QModelIndex& index = QModelIndex() ) const {
+    int columnCount( const QModelIndex& index = QModelIndex() ) const override
+    {
         return index.isValid()?0:4;
     }
-    /*reimp*/QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const
+    QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const override
     {
         if ( index.isValid() && index.row() < rowCount() && index.column() < columnCount() ) {
             switch ( index.column() ) {
@@ -129,7 +131,7 @@
 #endif
     }
 
-    ~MoveHelper() {
+    ~MoveHelper() override {
         qDebug() << "Moving row" << m_row1 << "to" << m_row2;
         showContraints( "Before:" );
         m_model->moveRow( m_row1, m_row2 );