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 = nullptr ); - const QString customizedLabel( const QString& label ) const Q_DECL_OVERRIDE; + 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 = nullptr, Qt::WindowFlags f = Qt::WindowFlags() ); - void paintEvent( QPaintEvent* ) Q_DECL_OVERRIDE; + 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 * ) Q_DECL_OVERRIDE; + /* reimp */ void resizeEvent ( QResizeEvent * ) override; private slots: 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 = nullptr ); - bool editorEvent( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index ) Q_DECL_OVERRIDE; + 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 @@ -43,7 +43,7 @@ public: explicit MainWindow( QWidget * parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags() ); virtual ~MainWindow(); - void closeEvent(QCloseEvent *event) Q_DECL_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 @@ -88,13 +88,13 @@ /*reimp*/ QWidget* createEditor( QWidget* parent, const QStyleOptionViewItem& option, - const QModelIndex& idx ) const Q_DECL_OVERRIDE; - /*reimp*/ void setEditorData( QWidget* editor, const QModelIndex& index ) const Q_DECL_OVERRIDE; + const QModelIndex& idx ) const override; + /*reimp*/ void setEditorData( QWidget* editor, const QModelIndex& index ) const override; /*reimp*/ void setModelData( QWidget* editor, QAbstractItemModel* model, - const QModelIndex & index ) const Q_DECL_OVERRIDE; + const QModelIndex & index ) const override; protected: /*reimp*/void drawDisplay( QPainter* painter, const QStyleOptionViewItem & option, - const QRect& rect, const QString& text ) const Q_DECL_OVERRIDE; + const QRect& rect, const QString& text ) const override; }; MyItemDelegate::MyItemDelegate( QObject* parent ) @@ -163,8 +163,8 @@ ~DateTimeGrid() { } //virtual void paintUserDefinedHeader(QPainter* painter, const QRectF& headerRect, const QRectF& exposedRect, qreal offset, const KGantt::DateTimeScaleFormatter* formatter, QWidget* widget = 0); - void drawBackground(QPainter* painter, const QRectF& rect) Q_DECL_OVERRIDE; - void drawForeground(QPainter* painter, const QRectF& rect) Q_DECL_OVERRIDE; + 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 @@ -28,20 +28,20 @@ explicit ProjectModel( QObject* parent = nullptr ); virtual ~ProjectModel(); - /*reimp*/ int rowCount( const QModelIndex& idx ) const Q_DECL_OVERRIDE; - /*reimp*/ int columnCount( const QModelIndex& idx ) const Q_DECL_OVERRIDE; + /*reimp*/ int rowCount( const QModelIndex& idx ) const override; + /*reimp*/ int columnCount( const QModelIndex& idx ) const override; - /*reimp*/ QModelIndex index( int row, int col, const QModelIndex& parent = QModelIndex() ) const Q_DECL_OVERRIDE; - /*reimp*/ QModelIndex parent( const QModelIndex& idx ) const Q_DECL_OVERRIDE; + /*reimp*/ QModelIndex index( int row, int col, const QModelIndex& parent = QModelIndex() ) const override; + /*reimp*/ QModelIndex parent( const QModelIndex& idx ) const override; - /*reimp*/QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const Q_DECL_OVERRIDE; - /*reimp*/ QVariant data( const QModelIndex& idx, int role = Qt::DisplayRole ) const Q_DECL_OVERRIDE; + /*reimp*/QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const override; + /*reimp*/ QVariant data( const QModelIndex& idx, int role = Qt::DisplayRole ) const override; /*reimp*/ bool setData( const QModelIndex& idx, const QVariant& value, - int role = Qt::DisplayRole ) Q_DECL_OVERRIDE; + int role = Qt::DisplayRole ) override; - /*reimp*/ bool insertRows( int row, int count, const QModelIndex& parent = QModelIndex() ) Q_DECL_OVERRIDE; + /*reimp*/ bool insertRows( int row, int count, const QModelIndex& parent = QModelIndex() ) override; - /*reimp*/ Qt::ItemFlags flags( const QModelIndex& ) const Q_DECL_OVERRIDE; + /*reimp*/ 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 = nullptr ); private: - bool eventFilter(QObject* target, QEvent* event) Q_DECL_OVERRIDE; + bool eventFilter(QObject* target, QEvent* event) override; private slots: diff --git a/examples/NoValues/mainwindow.cpp b/examples/NoValues/mainwindow.cpp --- a/examples/NoValues/mainwindow.cpp +++ b/examples/NoValues/mainwindow.cpp @@ -47,14 +47,14 @@ //qDebug() << "EmptyModel::~EmptyModel()"; } - int columnCount( const QModelIndex& parent = QModelIndex() ) const Q_DECL_OVERRIDE + int columnCount( const QModelIndex& parent = QModelIndex() ) const override { Q_UNUSED( parent ); //qDebug() << "EmptyModel::columnCount(...)"; return 0; } - int rowCount( const QModelIndex& parent = QModelIndex() ) const Q_DECL_OVERRIDE + 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 Q_DECL_OVERRIDE + 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 Q_DECL_OVERRIDE + 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 Q_DECL_OVERRIDE + 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 Q_DECL_OVERRIDE; - int rowCount( const QModelIndex& parent ) const Q_DECL_OVERRIDE; + int columnCount( const QModelIndex& parent ) const override; + int rowCount( const QModelIndex& parent ) const override; - QModelIndex index( int row, int column, const QModelIndex& parent ) const Q_DECL_OVERRIDE; - QModelIndex parent( const QModelIndex& index ) const Q_DECL_OVERRIDE; + 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 Q_DECL_OVERRIDE; + 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 Q_DECL_OVERRIDE; + 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 Q_DECL_OVERRIDE; + QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const override; protected: - bool filterAcceptsRow( int source_row, const QModelIndex& source_parent ) const Q_DECL_OVERRIDE; + bool filterAcceptsRow( int source_row, const QModelIndex& source_parent ) const override; private: QPair< QDateTime, QDateTime > range; diff --git a/examples/Sql/main.cpp b/examples/Sql/main.cpp --- a/examples/Sql/main.cpp +++ b/examples/Sql/main.cpp @@ -44,13 +44,13 @@ public: explicit TransposeProxyModel(QObject* parent = nullptr) : QAbstractProxyModel(parent) {} virtual ~TransposeProxyModel() {} - QModelIndex mapFromSource ( const QModelIndex & sourceIndex ) const Q_DECL_OVERRIDE { return index(sourceIndex.column(), sourceIndex.row()); } - QModelIndex mapToSource ( const QModelIndex & proxyIndex ) const Q_DECL_OVERRIDE { return sourceModel()->index(proxyIndex.column(), proxyIndex.row()); } - QModelIndex index(int r, int c, const QModelIndex &ind=QModelIndex()) const Q_DECL_OVERRIDE { Q_UNUSED(ind) return createIndex(r,c); } - QModelIndex parent(const QModelIndex&) const Q_DECL_OVERRIDE { return QModelIndex(); } - int rowCount(const QModelIndex &) const Q_DECL_OVERRIDE { return sourceModel()->columnCount(); } - int columnCount(const QModelIndex &) const Q_DECL_OVERRIDE { return sourceModel()->rowCount(); } - QVariant data(const QModelIndex &ind, int role) const Q_DECL_OVERRIDE { return sourceModel()->data(mapToSource(ind), role); } + 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 ) Q_DECL_OVERRIDE; - void wheelEvent( QWheelEvent* e ) Q_DECL_OVERRIDE; - void keyPressEvent( QKeyEvent* e ) Q_DECL_OVERRIDE; + void mousePressEvent( QMouseEvent * e ) override; + void wheelEvent( QWheelEvent* e ) override; + void keyPressEvent( QKeyEvent* e ) override; }; diff --git a/examples/demo/colorslider.h b/examples/demo/colorslider.h --- a/examples/demo/colorslider.h +++ b/examples/demo/colorslider.h @@ -34,13 +34,13 @@ void setStartColor( const QColor &color ); QColor endColor() const; void setEndColor( const QColor &color ); - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; protected: - void paintEvent( QPaintEvent *event ) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *event ) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event ) Q_DECL_OVERRIDE; - void mouseMoveEvent( QMouseEvent *event ) Q_DECL_OVERRIDE; + 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/tools/TableModel.h b/examples/tools/TableModel.h --- a/examples/tools/TableModel.h +++ b/examples/tools/TableModel.h @@ -51,15 +51,15 @@ start at index (0, 0). */ QVariant headerData( int section, Qt::Orientation orientation, - int role = Qt::DisplayRole ) const Q_DECL_OVERRIDE; + int role = Qt::DisplayRole ) const override; - int rowCount( const QModelIndex& parent = QModelIndex() ) const Q_DECL_OVERRIDE; + int rowCount( const QModelIndex& parent = QModelIndex() ) const override; - int columnCount( const QModelIndex& parent = QModelIndex() ) const Q_DECL_OVERRIDE; + int columnCount( const QModelIndex& parent = QModelIndex() ) const override; - QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const Q_DECL_OVERRIDE; + QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const override; - bool setData( const QModelIndex& index, const QVariant& value, int role = Qt::EditRole ) Q_DECL_OVERRIDE; + 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 = nullptr, Qt::WindowFlags f = Qt::WindowFlags() ); - void paintEvent( QPaintEvent* ) Q_DECL_OVERRIDE; + 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 * ) Q_DECL_OVERRIDE; + /* reimp */ 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 @@ -34,16 +34,16 @@ QObject *p_parent = nullptr); int columnCount( - const QModelIndex &p_parent = QModelIndex()) const Q_DECL_OVERRIDE; + const QModelIndex &p_parent = QModelIndex()) const override; protected: QVariant data( const QModelIndex &p_index, - int p_role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + int p_role = Qt::DisplayRole) const override; bool filterAcceptsColumn( int p_source_column, - const QModelIndex &p_source_parent) const Q_DECL_OVERRIDE; + const QModelIndex &p_source_parent) const override; private: int m_column1; 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* ) Q_DECL_OVERRIDE { + 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 Q_DECL_OVERRIDE { 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() {} - BarDiagram::BarType type() const Q_DECL_OVERRIDE; - const QPair calculateDataBoundaries() const Q_DECL_OVERRIDE; - void paint( PaintContext* ctx ) Q_DECL_OVERRIDE; + BarDiagram::BarType type() const override; + const QPair calculateDataBoundaries() const override; + 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() {} - LineDiagram::LineType type() const Q_DECL_OVERRIDE; - const QPair calculateDataBoundaries() const Q_DECL_OVERRIDE; - void paint( PaintContext* ctx ) Q_DECL_OVERRIDE; + LineDiagram::LineType type() const override; + const QPair calculateDataBoundaries() const override; + 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() {} - BarDiagram::BarType type() const Q_DECL_OVERRIDE; - const QPair calculateDataBoundaries() const Q_DECL_OVERRIDE; - void paint( PaintContext* ctx ) Q_DECL_OVERRIDE; + BarDiagram::BarType type() const override; + const QPair calculateDataBoundaries() const override; + 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() {} - Plotter::PlotType type() const Q_DECL_OVERRIDE; - const QPair< QPointF, QPointF > calculateDataBoundaries() const Q_DECL_OVERRIDE; - void paint( PaintContext* ctx ) Q_DECL_OVERRIDE; + Plotter::PlotType type() const override; + const QPair< QPointF, QPointF > calculateDataBoundaries() const override; + 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() {} - BarDiagram::BarType type() const Q_DECL_OVERRIDE; - const QPair calculateDataBoundaries() const Q_DECL_OVERRIDE; - void paint( PaintContext* ctx ) Q_DECL_OVERRIDE; + BarDiagram::BarType type() const override; + const QPair calculateDataBoundaries() const override; + 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() {} - LineDiagram::LineType type() const Q_DECL_OVERRIDE; - const QPair calculateDataBoundaries() const Q_DECL_OVERRIDE; - void paint( PaintContext* ctx ) Q_DECL_OVERRIDE; + LineDiagram::LineType type() const override; + const QPair calculateDataBoundaries() const override; + 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() {} - BarDiagram::BarType type() const Q_DECL_OVERRIDE; - const QPair calculateDataBoundaries() const Q_DECL_OVERRIDE; - void paint( PaintContext* ctx ) Q_DECL_OVERRIDE; + BarDiagram::BarType type() const override; + const QPair calculateDataBoundaries() const override; + 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() {} - Plotter::PlotType type() const Q_DECL_OVERRIDE; - const QPair< QPointF, QPointF > calculateDataBoundaries() const Q_DECL_OVERRIDE; - void paint( PaintContext* ctx ) Q_DECL_OVERRIDE; + Plotter::PlotType type() const override; + const QPair< QPointF, QPointF > calculateDataBoundaries() const override; + 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() {} - BarDiagram::BarType type() const Q_DECL_OVERRIDE; - const QPair calculateDataBoundaries() const Q_DECL_OVERRIDE; - void paint( PaintContext* ctx ) Q_DECL_OVERRIDE; + BarDiagram::BarType type() const override; + const QPair calculateDataBoundaries() const override; + 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() {} - LineDiagram::LineType type() const Q_DECL_OVERRIDE; - const QPair calculateDataBoundaries() const Q_DECL_OVERRIDE; - void paint( PaintContext* ctx ) Q_DECL_OVERRIDE; + LineDiagram::LineType type() const override; + const QPair calculateDataBoundaries() const override; + 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() {} - BarDiagram::BarType type() const Q_DECL_OVERRIDE; - const QPair calculateDataBoundaries() const Q_DECL_OVERRIDE; - void paint( PaintContext* ctx ) Q_DECL_OVERRIDE; + BarDiagram::BarType type() const override; + const QPair calculateDataBoundaries() const override; + 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() {} - Plotter::PlotType type() const Q_DECL_OVERRIDE; - const QPair< QPointF, QPointF > calculateDataBoundaries() const Q_DECL_OVERRIDE; - void paint( PaintContext* ctx ) Q_DECL_OVERRIDE; + Plotter::PlotType type() const override; + const QPair< QPointF, QPointF > calculateDataBoundaries() const override; + 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 @@ -87,7 +87,7 @@ */ virtual void layoutPlanes(); /** \reimpl */ - void setCoordinatePlane( AbstractCoordinatePlane* plane ) Q_DECL_OVERRIDE; + void setCoordinatePlane( AbstractCoordinatePlane* plane ) override; /** * Makes this diagram use another diagram \a diagram as reference diagram with relative offset @@ -109,11 +109,11 @@ virtual QPointF referenceDiagramOffset() const; /* reimpl */ - void setModel( QAbstractItemModel* model ) Q_DECL_OVERRIDE; + void setModel( QAbstractItemModel* model ) override; /* reimpl */ - void setRootIndex( const QModelIndex& index ) Q_DECL_OVERRIDE; + void setRootIndex( const QModelIndex& index ) override; /* reimpl */ - void setAttributesModel( AttributesModel* model ) Q_DECL_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 @@ -66,7 +66,7 @@ /** \reimpl */ CartesianDiagramDataCompressor::AggregatedDataValueAttributes aggregatedAttrs( const QModelIndex & index, - const CartesianDiagramDataCompressor::CachePosition * position ) const Q_DECL_OVERRIDE + 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 @@ -95,24 +95,24 @@ #else // implement AbstractCartesianDiagram /** \reimpl */ - int numberOfAbscissaSegments () const Q_DECL_OVERRIDE; + int numberOfAbscissaSegments () const override; /** \reimpl */ - int numberOfOrdinateSegments () const Q_DECL_OVERRIDE; + int numberOfOrdinateSegments () const override; #endif protected: - void paint ( PaintContext* paintContext ) Q_DECL_OVERRIDE; + void paint ( PaintContext* paintContext ) override; public: - void resize ( const QSizeF& area ) Q_DECL_OVERRIDE; + void resize ( const QSizeF& area ) override; protected: - qreal threeDItemDepth( const QModelIndex & index ) const Q_DECL_OVERRIDE; - qreal threeDItemDepth( int column ) const Q_DECL_OVERRIDE; + qreal threeDItemDepth( const QModelIndex & index ) const override; + qreal threeDItemDepth( int column ) const override; /** \reimpl */ - const QPair calculateDataBoundaries() const Q_DECL_OVERRIDE; - void paintEvent ( QPaintEvent* ) Q_DECL_OVERRIDE; - void resizeEvent ( QResizeEvent* ) Q_DECL_OVERRIDE; + const QPair 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 @@ -72,9 +72,9 @@ bool compare( const CartesianAxis* other ) const; /** reimpl */ - void paint( QPainter* ) Q_DECL_OVERRIDE; + void paint( QPainter* ) override; /** reimpl */ - void paintCtx( PaintContext* ) Q_DECL_OVERRIDE; + void paintCtx( PaintContext* ) override; /** * Sets the optional text displayed as chart title. @@ -160,19 +160,19 @@ int customTickLength() const; /** pure virtual in QLayoutItem */ - bool isEmpty() const Q_DECL_OVERRIDE; + bool isEmpty() const override; /** pure virtual in QLayoutItem */ - Qt::Orientations expandingDirections() const Q_DECL_OVERRIDE; + Qt::Orientations expandingDirections() const override; /** pure virtual in QLayoutItem */ - QSize maximumSize() const Q_DECL_OVERRIDE; + QSize maximumSize() const override; /** pure virtual in QLayoutItem */ - QSize minimumSize() const Q_DECL_OVERRIDE; + QSize minimumSize() const override; /** pure virtual in QLayoutItem */ - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; /** pure virtual in QLayoutItem */ - void setGeometry( const QRect& r ) Q_DECL_OVERRIDE; + void setGeometry( const QRect& r ) override; /** pure virtual in QLayoutItem */ - QRect geometry() const Q_DECL_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 @@ -47,7 +47,7 @@ explicit CartesianCoordinatePlane ( Chart* parent = nullptr ); ~CartesianCoordinatePlane(); - void addDiagram ( AbstractDiagram* diagram ) Q_DECL_OVERRIDE; + 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 Q_DECL_OVERRIDE; + const QPointF translate ( const QPointF& diagramPoint ) const override; /** * \sa setZoomFactorX, setZoomCenter */ - qreal zoomFactorX() const Q_DECL_OVERRIDE; + qreal zoomFactorX() const override; /** * \sa setZoomFactorY, setZoomCenter */ - qreal zoomFactorY() const Q_DECL_OVERRIDE; + qreal zoomFactorY() const override; /** * \sa setZoomFactorX,setZoomFactorY */ - void setZoomFactors( qreal factorX, qreal factorY ) Q_DECL_OVERRIDE; + void setZoomFactors( qreal factorX, qreal factorY ) override; /** * \sa zoomFactorX, setZoomCenter */ - void setZoomFactorX( qreal factor ) Q_DECL_OVERRIDE; + void setZoomFactorX( qreal factor ) override; /** * \sa zoomFactorY, setZoomCenter */ - void setZoomFactorY( qreal factor ) Q_DECL_OVERRIDE; + void setZoomFactorY( qreal factor ) override; /** * \sa setZoomCenter, setZoomFactorX, setZoomFactorY */ - QPointF zoomCenter() const Q_DECL_OVERRIDE; + QPointF zoomCenter() const override; /** * \sa zoomCenter, setZoomFactorX, setZoomFactorY */ - void setZoomCenter( const QPointF& center ) Q_DECL_OVERRIDE; + void setZoomCenter( const QPointF& center ) override; /** * Allows to specify a fixed data-space / coordinate-space relation. If set @@ -372,10 +372,10 @@ void setAxesCalcModeX( AxesCalcMode mode ); /** reimpl */ - void paint( QPainter* ) Q_DECL_OVERRIDE; + void paint( QPainter* ) override; /** reimpl */ - AbstractCoordinatePlane* sharedAxisMasterPlane( QPainter* p = nullptr ) Q_DECL_OVERRIDE; + AbstractCoordinatePlane* sharedAxisMasterPlane( QPainter* p = nullptr ) override; /** * Returns the currently visible data range. Might be greater than the @@ -434,10 +434,10 @@ /** * reimplemented from AbstractCoordinatePlane */ - void setGeometry( const QRect& r ) Q_DECL_OVERRIDE; + void setGeometry( const QRect& r ) override; // reimplemented - Qt::Orientations expandingDirections() const Q_DECL_OVERRIDE; + Qt::Orientations expandingDirections() const override; public Q_SLOTS: @@ -468,26 +468,26 @@ QRectF adjustedToMaxEmptyInnerPercentage( const QRectF& r, unsigned int percentX, unsigned int percentY ) const; virtual QRectF calculateRawDataBoundingRect() const; - DataDimensionsList getDataDimensionsList() const Q_DECL_OVERRIDE; + 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() Q_DECL_OVERRIDE; + 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 Q_DECL_OVERRIDE; - int heightForWidth( int w ) const Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; + 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() { } - void initialize() Q_DECL_OVERRIDE + void initialize() override { bPaintIsRunning = false; coordinateTransformation.axesCalcModeX = Linear; @@ -64,7 +64,7 @@ return static_cast< Private * >( plane->d_func() ); } - bool isVisiblePoint( const AbstractCoordinatePlane * plane, const QPointF& point ) const Q_DECL_OVERRIDE + 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 ) Q_DECL_OVERRIDE; + void drawGrid( PaintContext* context ) override; private: int m_minsteps; int m_maxsteps; DataDimensionsList calculateGrid( - const DataDimensionsList& rawDataDimensions ) const Q_DECL_OVERRIDE; + 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 @@ -71,7 +71,7 @@ bool compare( const LeveyJenningsAxis* other ) const; /** reimpl */ - void paintCtx( PaintContext* ) Q_DECL_OVERRIDE; + 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 = nullptr ); ~LeveyJenningsCoordinatePlane(); - void addDiagram( AbstractDiagram* diagram ) Q_DECL_OVERRIDE; + 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 } - void initialize() Q_DECL_OVERRIDE + 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 @@ -52,7 +52,7 @@ explicit LeveyJenningsDiagram( QWidget* parent = nullptr, LeveyJenningsCoordinatePlane* plane = nullptr ); virtual ~LeveyJenningsDiagram(); - LineDiagram * clone() const Q_DECL_OVERRIDE; + LineDiagram * clone() const override; enum Symbol { @@ -99,13 +99,13 @@ QString symbol( Symbol symbol ) const; /* \reimpl */ - void setModel( QAbstractItemModel* model ) Q_DECL_OVERRIDE; + void setModel( QAbstractItemModel* model ) override; QPair< QDateTime, QDateTime > timeRange() const; void setTimeRange( const QPair< QDateTime, QDateTime >& timeRange ); protected: - void paint( PaintContext* paintContext ) Q_DECL_OVERRIDE; + void paint( PaintContext* paintContext ) override; void drawChanges( PaintContext* paintContext ); virtual void drawDataPointSymbol( PaintContext* paintContext, const QPointF& pos, bool ok ); @@ -118,7 +118,7 @@ QSvgRenderer* iconRenderer( Symbol symbol ); /** \reimpl */ - const QPair calculateDataBoundaries() const Q_DECL_OVERRIDE; + const QPair calculateDataBoundaries() const override; protected Q_SLOTS: void calculateMeanAndStandardDeviation() const; 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 ) Q_DECL_OVERRIDE; + void drawGrid( PaintContext* context ) override; private: - DataDimensionsList calculateGrid( const DataDimensionsList& rawDataDimensions ) const Q_DECL_OVERRIDE; + DataDimensionsList calculateGrid( const DataDimensionsList& rawDataDimensions ) const override; DataDimension calculateGridXY( const DataDimension& rawDataDimension, - Qt::Orientation orientation, bool adjustLower, bool adjustUpper ) const Q_DECL_OVERRIDE; + Qt::Orientation orientation, bool adjustLower, bool adjustUpper ) const override; void calculateStepWidth( qreal start_, qreal end_, const QList& granularities, Qt::Orientation orientation, - qreal& stepWidth, qreal& subStepWidth, bool adjustLower, bool adjustUpper ) const Q_DECL_OVERRIDE; + 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 @@ -122,25 +122,25 @@ #else // implement AbstractCartesianDiagram /* reimpl */ - int numberOfAbscissaSegments () const Q_DECL_OVERRIDE; + int numberOfAbscissaSegments () const override; /* reimpl */ - int numberOfOrdinateSegments () const Q_DECL_OVERRIDE; + int numberOfOrdinateSegments () const override; #endif protected: - void paint ( PaintContext* paintContext ) Q_DECL_OVERRIDE; + void paint ( PaintContext* paintContext ) override; public: - void resize ( const QSizeF& area ) Q_DECL_OVERRIDE; + void resize ( const QSizeF& area ) override; protected: - qreal threeDItemDepth( const QModelIndex & index ) const Q_DECL_OVERRIDE; - qreal threeDItemDepth( int column ) const Q_DECL_OVERRIDE; + qreal threeDItemDepth( const QModelIndex & index ) const override; + qreal threeDItemDepth( int column ) const override; /** \reimpl */ - const QPair calculateDataBoundaries() const Q_DECL_OVERRIDE; - void paintEvent ( QPaintEvent* ) Q_DECL_OVERRIDE; - void resizeEvent ( QResizeEvent* ) Q_DECL_OVERRIDE; + const QPair 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 @@ -110,27 +110,27 @@ #else // implement AbstractCartesianDiagram /* reimpl */ - int numberOfAbscissaSegments () const Q_DECL_OVERRIDE; + int numberOfAbscissaSegments () const override; /* reimpl */ - int numberOfOrdinateSegments () const Q_DECL_OVERRIDE; + int numberOfOrdinateSegments () const override; #endif protected Q_SLOTS: void connectAttributesModel( AttributesModel* ); protected: - void paint ( PaintContext* paintContext ) Q_DECL_OVERRIDE; + void paint ( PaintContext* paintContext ) override; public: - void resize ( const QSizeF& area ) Q_DECL_OVERRIDE; + void resize ( const QSizeF& area ) override; protected: - qreal threeDItemDepth( const QModelIndex & index ) const Q_DECL_OVERRIDE; - qreal threeDItemDepth( int column ) const Q_DECL_OVERRIDE; + qreal threeDItemDepth( const QModelIndex & index ) const override; + qreal threeDItemDepth( int column ) const override; /** \reimpl */ - const QPair calculateDataBoundaries() const Q_DECL_OVERRIDE; - void paintEvent ( QPaintEvent* ) Q_DECL_OVERRIDE; - void resizeEvent ( QResizeEvent* ) Q_DECL_OVERRIDE; + const QPair calculateDataBoundaries() const override; + void paintEvent ( QPaintEvent* ) override; + void resizeEvent ( QResizeEvent* ) override; protected Q_SLOTS: void setDataBoundariesDirty(); void calcMergeRadius(); 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 @@ -95,19 +95,19 @@ virtual const int numberOfAbscissaSegments() const; virtual const int numberOfOrdinateSegments() const; #else - int numberOfAbscissaSegments() const Q_DECL_OVERRIDE; - int numberOfOrdinateSegments() const Q_DECL_OVERRIDE; + int numberOfAbscissaSegments() const override; + int numberOfOrdinateSegments() const override; #endif - void paint( PaintContext *paintContext ) Q_DECL_OVERRIDE; + void paint( PaintContext *paintContext ) override; - void resize( const QSizeF &size ) Q_DECL_OVERRIDE; + void resize( const QSizeF &size ) override; - qreal threeDItemDepth( int column ) const Q_DECL_OVERRIDE; - qreal threeDItemDepth( const QModelIndex &index ) const Q_DECL_OVERRIDE; + qreal threeDItemDepth( int column ) const override; + qreal threeDItemDepth( const QModelIndex &index ) const override; protected: - const QPair calculateDataBoundaries() const Q_DECL_OVERRIDE; + const QPair 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 Q_DECL_OVERRIDE { 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 @@ -65,7 +65,7 @@ * Call paintAll, if you want the background and the frame to be drawn * before the normal paint() is invoked automatically. */ - void paintAll( QPainter& painter ) Q_DECL_OVERRIDE; + void paintAll( QPainter& painter ) override; /** * This is called at layout time by KChart::AutoSpacerLayoutItem::sizeHint(). @@ -122,8 +122,8 @@ protected: AbstractArea(); - QRect areaGeometry() const Q_DECL_OVERRIDE; - void positionHasChanged() Q_DECL_OVERRIDE; + 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 */ - void paintEvent( QPaintEvent* event ) Q_DECL_OVERRIDE; + void paintEvent( QPaintEvent* event ) override; /** * @brief Draws the background and frame, then calls paint(). @@ -102,8 +102,8 @@ protected: virtual ~AbstractAreaWidget() ; - QRect areaGeometry() const Q_DECL_OVERRIDE; - void positionHasChanged() Q_DECL_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 @@ -227,8 +227,8 @@ */ QStringList shortLabels() const; - void setGeometry( const QRect& rect ) Q_DECL_OVERRIDE = 0; - QRect geometry() const Q_DECL_OVERRIDE = 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 @@ -256,24 +256,24 @@ /** pure virtual in QLayoutItem */ - bool isEmpty() const Q_DECL_OVERRIDE; + bool isEmpty() const override; /** pure virtual in QLayoutItem */ - Qt::Orientations expandingDirections() const Q_DECL_OVERRIDE; + Qt::Orientations expandingDirections() const override; /** pure virtual in QLayoutItem */ - QSize maximumSize() const Q_DECL_OVERRIDE; + QSize maximumSize() const override; /** pure virtual in QLayoutItem */ - QSize minimumSize() const Q_DECL_OVERRIDE; + QSize minimumSize() const override; /** pure virtual in QLayoutItem */ - QSize sizeHint() const Q_DECL_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 KChart's internal layouting measures. */ - void setGeometry( const QRect& r ) Q_DECL_OVERRIDE; + void setGeometry( const QRect& r ) override; /** pure virtual in QLayoutItem */ - QRect geometry() const Q_DECL_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 @@ -103,10 +103,10 @@ virtual void resize ( const QSizeF& area ); /** Associate a model with the diagram. */ - void setModel ( QAbstractItemModel * model ) Q_DECL_OVERRIDE; + void setModel ( QAbstractItemModel * model ) override; /** Associate a seleection model with the diagrom. */ - void setSelectionModel( QItemSelectionModel* selectionModel ) Q_DECL_OVERRIDE; + void setSelectionModel( QItemSelectionModel* selectionModel ) override; /** * Associate an AttributesModel with this diagram. Note that @@ -160,31 +160,31 @@ /** Set the root index in the model, where the diagram starts * referencing data for display. */ - void setRootIndex ( const QModelIndex& idx ) Q_DECL_OVERRIDE; + void setRootIndex ( const QModelIndex& idx ) override; /** \reimpl */ - QRect visualRect(const QModelIndex &index) const Q_DECL_OVERRIDE; + QRect visualRect(const QModelIndex &index) const override; /** \reimpl */ - void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible) Q_DECL_OVERRIDE; + void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible) override; /** \reimpl */ - QModelIndex indexAt(const QPoint &point) const Q_DECL_OVERRIDE; + QModelIndex indexAt(const QPoint &point) const override; /** \reimpl */ - QModelIndex moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers) Q_DECL_OVERRIDE; + QModelIndex moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers) override; /** \reimpl */ - int horizontalOffset() const Q_DECL_OVERRIDE; + int horizontalOffset() const override; /** \reimpl */ - int verticalOffset() const Q_DECL_OVERRIDE; + int verticalOffset() const override; /** \reimpl */ - bool isIndexHidden(const QModelIndex &index) const Q_DECL_OVERRIDE; + bool isIndexHidden(const QModelIndex &index) const override; /** \reimpl */ - void setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags command) Q_DECL_OVERRIDE; + void setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags command) override; /** \reimpl */ - QRegion visualRegionForSelection(const QItemSelection &selection) const Q_DECL_OVERRIDE; + QRegion visualRegionForSelection(const QItemSelection &selection) const override; virtual QRegion visualRegion(const QModelIndex &index) const; /** \reimpl */ - void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector &roles = QVector()) Q_DECL_OVERRIDE; + void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector &roles = QVector()) override; /** \reimpl */ - void doItemsLayout() Q_DECL_OVERRIDE; + void doItemsLayout() override; /** * The coordinate plane associated with the diagram. This determines diff --git a/src/KChart/KChartAbstractProxyModel.h b/src/KChart/KChartAbstractProxyModel.h --- a/src/KChart/KChartAbstractProxyModel.h +++ b/src/KChart/KChartAbstractProxyModel.h @@ -37,14 +37,14 @@ explicit AbstractProxyModel( QObject* parent = nullptr ); /*! \reimpl */ - QModelIndex mapFromSource( const QModelIndex & sourceIndex ) const Q_DECL_OVERRIDE; + QModelIndex mapFromSource( const QModelIndex & sourceIndex ) const override; /*! \reimpl */ - QModelIndex mapToSource( const QModelIndex &proxyIndex ) const Q_DECL_OVERRIDE; + QModelIndex mapToSource( const QModelIndex &proxyIndex ) const override; /*! \reimpl */ - QModelIndex index( int row, int col, const QModelIndex& index ) const Q_DECL_OVERRIDE; + QModelIndex index( int row, int col, const QModelIndex& index ) const override; /*! \reimpl */ - QModelIndex parent( const QModelIndex& index ) const Q_DECL_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 @@ -89,26 +89,26 @@ QVariant data(int column, int role) const; /** \reimpl */ - QVariant headerData ( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const Q_DECL_OVERRIDE; + QVariant headerData ( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const override; /** \reimpl */ - int rowCount(const QModelIndex& ) const Q_DECL_OVERRIDE; + int rowCount(const QModelIndex& ) const override; /** \reimpl */ - int columnCount(const QModelIndex& ) const Q_DECL_OVERRIDE; + int columnCount(const QModelIndex& ) const override; /** \reimpl */ - QVariant data(const QModelIndex&, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + QVariant data(const QModelIndex&, int role = Qt::DisplayRole) const override; /** \reimpl */ - bool setData ( const QModelIndex & index, const QVariant & value, int role = Qt::DisplayRole) Q_DECL_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) Q_DECL_OVERRIDE; + 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 ) Q_DECL_OVERRIDE; + 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 @@ -451,27 +451,27 @@ /** * Adjusts the internal layout when the chart is resized. */ - /* reimp */ void resizeEvent ( QResizeEvent * event ) Q_DECL_OVERRIDE; + /* reimp */ 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 ) Q_DECL_OVERRIDE; + /* reimp */ void paintEvent( QPaintEvent* event ) override; /** reimp */ - void mousePressEvent( QMouseEvent* event ) Q_DECL_OVERRIDE; + void mousePressEvent( QMouseEvent* event ) override; /** reimp */ - void mouseDoubleClickEvent( QMouseEvent* event ) Q_DECL_OVERRIDE; + void mouseDoubleClickEvent( QMouseEvent* event ) override; /** reimp */ - void mouseMoveEvent( QMouseEvent* event ) Q_DECL_OVERRIDE; + void mouseMoveEvent( QMouseEvent* event ) override; /** reimp */ - void mouseReleaseEvent( QMouseEvent* event ) Q_DECL_OVERRIDE; + void mouseReleaseEvent( QMouseEvent* event ) override; /** reimp */ - bool event( QEvent* event ) Q_DECL_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 Q_DECL_OVERRIDE + QSize sizeHint() const override { QWidget* w = const_cast< MyWidgetItem * >( this )->widget(); return w->sizeHint(); } - QSize minimumSize() const Q_DECL_OVERRIDE + QSize minimumSize() const override { QWidget* w = const_cast< MyWidgetItem * >( this )->widget(); return w->minimumSize(); } - QSize maximumSize() const Q_DECL_OVERRIDE + 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 Q_DECL_OVERRIDE + 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) Q_DECL_OVERRIDE + void setGeometry(const QRect &g) override { QWidget* w = const_cast< MyWidgetItem * >( this )->widget(); w->setGeometry(g); } - QRect geometry() const Q_DECL_OVERRIDE + QRect geometry() const override { QWidget* w = const_cast< MyWidgetItem * >( this )->widget(); return w->geometry(); } - bool hasHeightForWidth() const Q_DECL_OVERRIDE + 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 Q_DECL_OVERRIDE + int heightForWidth( int width ) const override { QWidget* w = const_cast< MyWidgetItem * >( this )->widget(); int ret = w->heightForWidth( width ); return ret; } - bool isEmpty() const Q_DECL_OVERRIDE { + 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/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 = nullptr ); - QModelIndex buddy( const QModelIndex& index ) const Q_DECL_OVERRIDE; + QModelIndex buddy( const QModelIndex& index ) const override; - Qt::ItemFlags flags( const QModelIndex& index ) const Q_DECL_OVERRIDE; + Qt::ItemFlags flags( const QModelIndex& index ) const override; QModelIndex index( int row, int column, - const QModelIndex &parent = QModelIndex() ) const Q_DECL_OVERRIDE; - QModelIndex parent(const QModelIndex &child ) const Q_DECL_OVERRIDE; + 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 Q_DECL_OVERRIDE; + QModelIndex mapFromSource ( const QModelIndex & sourceIndex ) const override; /** Implements the mapping from the proxy to the source indexes. */ - QModelIndex mapToSource ( const QModelIndex& proxyIndex ) const Q_DECL_OVERRIDE; + QModelIndex mapToSource ( const QModelIndex& proxyIndex ) const override; /** Overloaded from base class. */ - QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE; + QVariant data(const QModelIndex &index, int role) const override; /** Overloaded from base class. */ - bool setData( const QModelIndex& index, const QVariant& value, int role ) Q_DECL_OVERRIDE; + 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 Q_DECL_OVERRIDE; + QVariant headerData ( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const override; /** Overloaded from base class. */ - void setSourceModel(QAbstractItemModel *sourceModel) Q_DECL_OVERRIDE; + 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 Q_DECL_OVERRIDE; + const QModelIndex & ) const override; /** Decide whether the row is accepted. */ - bool filterAcceptsRow ( int source_row, const QModelIndex & source_parent ) const Q_DECL_OVERRIDE; + bool filterAcceptsRow ( int source_row, const QModelIndex & source_parent ) const override; private: diff --git a/src/KChart/KChartLayoutItems.h b/src/KChart/KChartLayoutItems.h --- a/src/KChart/KChartLayoutItems.h +++ b/src/KChart/KChartLayoutItems.h @@ -117,19 +117,19 @@ TextAttributes textAttributes() const; /** pure virtual in QLayoutItem */ - bool isEmpty() const Q_DECL_OVERRIDE; + bool isEmpty() const override; /** pure virtual in QLayoutItem */ - Qt::Orientations expandingDirections() const Q_DECL_OVERRIDE; + Qt::Orientations expandingDirections() const override; /** pure virtual in QLayoutItem */ - QSize maximumSize() const Q_DECL_OVERRIDE; + QSize maximumSize() const override; /** pure virtual in QLayoutItem */ - QSize minimumSize() const Q_DECL_OVERRIDE; + QSize minimumSize() const override; /** pure virtual in QLayoutItem */ - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; /** pure virtual in QLayoutItem */ - void setGeometry( const QRect& r ) Q_DECL_OVERRIDE; + void setGeometry( const QRect& r ) override; /** pure virtual in QLayoutItem */ - QRect geometry() const Q_DECL_OVERRIDE; + QRect geometry() const override; virtual int marginWidth() const; @@ -141,7 +141,7 @@ virtual qreal realFontSize() const; virtual QFont realFont() const; - void paint( QPainter* ) Q_DECL_OVERRIDE; + void paint( QPainter* ) override; QPolygon boundingPolygon() const; private: @@ -187,21 +187,21 @@ TextAttributes textAttributes() const; /** pure virtual in QLayoutItem */ - bool isEmpty() const Q_DECL_OVERRIDE; + bool isEmpty() const override; /** pure virtual in QLayoutItem */ - Qt::Orientations expandingDirections() const Q_DECL_OVERRIDE; + Qt::Orientations expandingDirections() const override; /** pure virtual in QLayoutItem */ - QSize maximumSize() const Q_DECL_OVERRIDE; + QSize maximumSize() const override; /** pure virtual in QLayoutItem */ - QSize minimumSize() const Q_DECL_OVERRIDE; + QSize minimumSize() const override; /** pure virtual in QLayoutItem */ - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; /** pure virtual in QLayoutItem */ - void setGeometry( const QRect& r ) Q_DECL_OVERRIDE; + void setGeometry( const QRect& r ) override; /** pure virtual in QLayoutItem */ - QRect geometry() const Q_DECL_OVERRIDE; + QRect geometry() const override; - void paint( QPainter* painter ) Q_DECL_OVERRIDE; + void paint( QPainter* painter ) override; protected: int borderWidth() const; @@ -223,15 +223,15 @@ const QPen& pen, Qt::Alignment alignment = Qt::Alignment() ); - Qt::Orientations expandingDirections() const Q_DECL_OVERRIDE; - QRect geometry() const Q_DECL_OVERRIDE; - bool isEmpty() const Q_DECL_OVERRIDE; - QSize maximumSize() const Q_DECL_OVERRIDE; - QSize minimumSize() const Q_DECL_OVERRIDE; - void setGeometry( const QRect& r ) Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; + 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 paint( QPainter* ) Q_DECL_OVERRIDE; + void paint( QPainter* ) override; static void paintIntoRect( QPainter* painter, @@ -262,18 +262,18 @@ Qt::Alignment mLegendLineSymbolAlignment, Qt::Alignment alignment = Qt::Alignment() ); - Qt::Orientations expandingDirections() const Q_DECL_OVERRIDE; - QRect geometry() const Q_DECL_OVERRIDE; - bool isEmpty() const Q_DECL_OVERRIDE; - QSize maximumSize() const Q_DECL_OVERRIDE; - QSize minimumSize() const Q_DECL_OVERRIDE; - void setGeometry( const QRect& r ) Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; + 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; - void paint( QPainter* ) Q_DECL_OVERRIDE; + void paint( QPainter* ) override; static void paintIntoRect( QPainter* painter, @@ -305,15 +305,15 @@ const QPen& markerPen, Qt::Alignment alignment = Qt::Alignment() ); - Qt::Orientations expandingDirections() const Q_DECL_OVERRIDE; - QRect geometry() const Q_DECL_OVERRIDE; - bool isEmpty() const Q_DECL_OVERRIDE; - QSize maximumSize() const Q_DECL_OVERRIDE; - QSize minimumSize() const Q_DECL_OVERRIDE; - void setGeometry( const QRect& r ) Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; + 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 paint( QPainter* ) Q_DECL_OVERRIDE; + void paint( QPainter* ) override; private: AbstractDiagram* mDiagram; @@ -336,15 +336,15 @@ public: HorizontalLineLayoutItem(); - Qt::Orientations expandingDirections() const Q_DECL_OVERRIDE; - QRect geometry() const Q_DECL_OVERRIDE; - bool isEmpty() const Q_DECL_OVERRIDE; - QSize maximumSize() const Q_DECL_OVERRIDE; - QSize minimumSize() const Q_DECL_OVERRIDE; - void setGeometry( const QRect& r ) Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; + 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 paint( QPainter* ) Q_DECL_OVERRIDE; + void paint( QPainter* ) override; private: QRect mRect; @@ -359,15 +359,15 @@ public: VerticalLineLayoutItem(); - Qt::Orientations expandingDirections() const Q_DECL_OVERRIDE; - QRect geometry() const Q_DECL_OVERRIDE; - bool isEmpty() const Q_DECL_OVERRIDE; - QSize maximumSize() const Q_DECL_OVERRIDE; - QSize minimumSize() const Q_DECL_OVERRIDE; - void setGeometry( const QRect& r ) Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; + 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 paint( QPainter* ) Q_DECL_OVERRIDE; + void paint( QPainter* ) override; private: QRect mRect; @@ -450,15 +450,15 @@ bool layoutIsAtTopPosition, QHBoxLayout *rightLeftLayout, bool layoutIsAtLeftPosition, QVBoxLayout *topBottomLayout ); - Qt::Orientations expandingDirections() const Q_DECL_OVERRIDE; - QRect geometry() const Q_DECL_OVERRIDE; - bool isEmpty() const Q_DECL_OVERRIDE; - QSize maximumSize() const Q_DECL_OVERRIDE; - QSize minimumSize() const Q_DECL_OVERRIDE; - void setGeometry( const QRect& r ) Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; + 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 paint( QPainter* ) Q_DECL_OVERRIDE; + 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 @@ -78,10 +78,10 @@ */ bool compare( const Legend* other ) const; - void resizeEvent( QResizeEvent * event ) Q_DECL_OVERRIDE; // TODO: should be protected + void resizeEvent( QResizeEvent * event ) override; // TODO: should be protected - virtual void paint( QPainter* painter ) Q_DECL_OVERRIDE; - void setVisible( bool visible ) Q_DECL_OVERRIDE; + virtual 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 - void forceRebuild() Q_DECL_OVERRIDE; - - QSize minimumSizeHint() const Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; - bool hasHeightForWidth() const Q_DECL_OVERRIDE; - int heightForWidth( int width ) const Q_DECL_OVERRIDE; - void needSizeHint() Q_DECL_OVERRIDE; - void resizeLayout( const QSize& size ) Q_DECL_OVERRIDE; + 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 @@ -204,7 +204,7 @@ return value; } - void columnsInserted( const QModelIndex& parent, int start, int end ) Q_DECL_OVERRIDE + void columnsInserted( const QModelIndex& parent, int start, int end ) override { Q_ASSERT( m_model != nullptr ); Q_ASSERT( parent.model() == m_model || !parent.isValid() ); @@ -225,7 +225,7 @@ } } - void columnsRemoved( const QModelIndex& parent, int start, int end ) Q_DECL_OVERRIDE + void columnsRemoved( const QModelIndex& parent, int start, int end ) override { Q_ASSERT( m_model != nullptr ); Q_ASSERT( parent.model() == m_model || !parent.isValid() ); @@ -245,7 +245,7 @@ } } - void dataChanged( const QModelIndex& topLeft, const QModelIndex& bottomRight ) Q_DECL_OVERRIDE + void dataChanged( const QModelIndex& topLeft, const QModelIndex& bottomRight ) override { if ( !m_model ) return; @@ -277,12 +277,12 @@ } } - void layoutChanged() Q_DECL_OVERRIDE + void layoutChanged() override { modelReset(); } - void modelReset() Q_DECL_OVERRIDE + 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 ) Q_DECL_OVERRIDE + void rowsInserted( const QModelIndex& parent, int start, int end ) override { Q_ASSERT( m_model != nullptr ); 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 ) Q_DECL_OVERRIDE + void rowsRemoved( const QModelIndex& parent, int start, int end ) override { Q_ASSERT( m_model != nullptr ); Q_ASSERT( parent.model() == m_model || !parent.isValid() ); @@ -332,7 +332,7 @@ Q_ASSERT( m_cacheValid.count() == m_model->rowCount( m_rootIndex ) ); } - void resetModel() Q_DECL_OVERRIDE + void resetModel() override { // no need to disconnect, this is a response to SIGNAL( destroyed() ) m_model = nullptr; diff --git a/src/KChart/KChartTextArea.h b/src/KChart/KChartTextArea.h --- a/src/KChart/KChartTextArea.h +++ b/src/KChart/KChartTextArea.h @@ -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 ) Q_DECL_OVERRIDE; + void paintAll( QPainter& painter ) override; protected: TextArea(); - QRect areaGeometry() const Q_DECL_OVERRIDE; - void positionHasChanged() Q_DECL_OVERRIDE; + 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 Q_DECL_OVERRIDE; - QPointF referencePointLocation( KChartEnums::PositionValue position ) const Q_DECL_OVERRIDE; + const QPixmap& pixmap() const override; + QPointF referencePointLocation( KChartEnums::PositionValue position ) const override; // overload: return location of referencePoint(): QPointF referencePointLocation() const; protected: - void invalidate() const Q_DECL_OVERRIDE; + void invalidate() const override; private: /** Create a label with the given text and the given rotation 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 @@ -60,7 +60,7 @@ /** \reimpl */ // FIXME: Optimize when needed - qreal calcPercentValue( const QModelIndex & index ) const Q_DECL_OVERRIDE + 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 @@ -44,7 +44,7 @@ protected: // Implement AbstractDiagram /** \reimpl */ - void paint( PaintContext* paintContext ) Q_DECL_OVERRIDE; + void paint( PaintContext* paintContext ) override; public: /** @@ -70,23 +70,23 @@ bool isLabelCollisionAvoidanceEnabled() const; /** \reimpl */ - void resize ( const QSizeF& area ) Q_DECL_OVERRIDE; + void resize ( const QSizeF& area ) override; // Implement AbstractPolarDiagram /** \reimpl */ - qreal valueTotals () const Q_DECL_OVERRIDE; + qreal valueTotals () const override; /** \reimpl */ - qreal numberOfValuesPerDataset() const Q_DECL_OVERRIDE; + qreal numberOfValuesPerDataset() const override; /** \reimpl */ - qreal numberOfGridRings() const Q_DECL_OVERRIDE; + qreal numberOfGridRings() const override; virtual PieDiagram * clone() const; protected: /** \reimpl */ - const QPair calculateDataBoundaries() const Q_DECL_OVERRIDE; - void paintEvent( QPaintEvent* ) Q_DECL_OVERRIDE; - void resizeEvent( QResizeEvent* ) Q_DECL_OVERRIDE; + const QPair 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 @@ -44,9 +44,9 @@ explicit PolarCoordinatePlane ( Chart* parent = nullptr ); ~PolarCoordinatePlane(); - void addDiagram ( AbstractDiagram* diagram ) Q_DECL_OVERRIDE; + void addDiagram ( AbstractDiagram* diagram ) override; - const QPointF translate ( const QPointF& diagramPoint ) const Q_DECL_OVERRIDE; + 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; - qreal zoomFactorX() const Q_DECL_OVERRIDE; - qreal zoomFactorY() const Q_DECL_OVERRIDE; + qreal zoomFactorX() const override; + qreal zoomFactorY() const override; - void setZoomFactors( qreal factorX, qreal factorY ) Q_DECL_OVERRIDE; - void setZoomFactorX( qreal factor ) Q_DECL_OVERRIDE; - void setZoomFactorY( qreal factor ) Q_DECL_OVERRIDE; + void setZoomFactors( qreal factorX, qreal factorY ) override; + void setZoomFactorX( qreal factor ) override; + void setZoomFactorY( qreal factor ) override; - QPointF zoomCenter() const Q_DECL_OVERRIDE; + QPointF zoomCenter() const override; - void setZoomCenter( const QPointF& center ) Q_DECL_OVERRIDE; + void setZoomCenter( const QPointF& center ) override; /** * Set the attributes to be used for grid lines drawn in circular @@ -143,14 +143,14 @@ qreal radiusUnit() const; /** reimpl */ - void paint( QPainter* ) Q_DECL_OVERRIDE; + void paint( QPainter* ) override; protected: - DataDimensionsList getDataDimensionsList() const Q_DECL_OVERRIDE; + DataDimensionsList getDataDimensionsList() const override; void paintEvent ( QPaintEvent* ); void resizeEvent ( QResizeEvent* ); - void layoutDiagrams() Q_DECL_OVERRIDE; + 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() { } - void initialize() Q_DECL_OVERRIDE + 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 @@ -48,19 +48,19 @@ protected: // Implement AbstractDiagram /** \reimpl */ - void paint ( PaintContext* paintContext ) Q_DECL_OVERRIDE; + void paint ( PaintContext* paintContext ) override; public: /** \reimpl */ - void resize ( const QSizeF& area ) Q_DECL_OVERRIDE; + void resize ( const QSizeF& area ) override; // Implement AbstractPolarDiagram /** \reimpl */ - qreal valueTotals () const Q_DECL_OVERRIDE; + qreal valueTotals () const override; /** \reimpl */ - qreal numberOfValuesPerDataset() const Q_DECL_OVERRIDE; + qreal numberOfValuesPerDataset() const override; /** \reimpl */ - qreal numberOfGridRings() const Q_DECL_OVERRIDE; + qreal numberOfGridRings() const override; virtual PolarDiagram * clone() const; @@ -93,9 +93,9 @@ protected: /** \reimpl */ - const QPair calculateDataBoundaries() const Q_DECL_OVERRIDE; - void paintEvent ( QPaintEvent* ) Q_DECL_OVERRIDE; - void resizeEvent ( QResizeEvent* ) Q_DECL_OVERRIDE; + const QPair 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,11 @@ PolarGrid() : AbstractGrid() {} virtual ~PolarGrid() {} - void drawGrid( PaintContext* context ) Q_DECL_OVERRIDE; + void drawGrid( PaintContext* context ) override; private: DataDimensionsList calculateGrid( - const DataDimensionsList& rawDataDimensions ) const Q_DECL_OVERRIDE; + 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; - void initialize() Q_DECL_OVERRIDE + 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 @@ -50,14 +50,14 @@ bool calculateListAndReturnScale, qreal& newZoomX, qreal& newZoomY ); /** \reimpl */ - void resize ( const QSizeF& area ) Q_DECL_OVERRIDE; + void resize ( const QSizeF& area ) override; /** \reimpl */ - qreal valueTotals () const Q_DECL_OVERRIDE; + qreal valueTotals () const override; /** \reimpl */ - qreal numberOfValuesPerDataset() const Q_DECL_OVERRIDE; + qreal numberOfValuesPerDataset() const override; /** \reimpl */ - qreal numberOfGridRings() const Q_DECL_OVERRIDE; + qreal numberOfGridRings() const override; /** * if val is true the diagram will mirror the diagram datapoints @@ -86,10 +86,10 @@ protected: /** \reimpl */ - const QPair calculateDataBoundaries() const Q_DECL_OVERRIDE; - void paintEvent ( QPaintEvent* ) Q_DECL_OVERRIDE; - void resizeEvent ( QResizeEvent* ) Q_DECL_OVERRIDE; - void paint ( PaintContext* paintContext ) Q_DECL_OVERRIDE; + const QPair 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,11 @@ RadarGrid() : AbstractGrid() {} virtual ~RadarGrid() {} - void drawGrid( PaintContext* context ) Q_DECL_OVERRIDE; + void drawGrid( PaintContext* context ) override; private: DataDimensionsList calculateGrid( - const DataDimensionsList& rawDataDimensions ) const Q_DECL_OVERRIDE; + 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 @@ -42,19 +42,19 @@ protected: // Implement AbstractDiagram /** \reimpl */ - void paint( PaintContext* paintContext ) Q_DECL_OVERRIDE; + void paint( PaintContext* paintContext ) override; public: /** \reimpl */ - void resize( const QSizeF& area ) Q_DECL_OVERRIDE; + void resize( const QSizeF& area ) override; // Implement AbstractPolarDiagram /** \reimpl */ - qreal valueTotals() const Q_DECL_OVERRIDE; + qreal valueTotals() const override; /** \reimpl */ - qreal numberOfValuesPerDataset() const Q_DECL_OVERRIDE; - qreal numberOfDatasets() const Q_DECL_OVERRIDE; + qreal numberOfValuesPerDataset() const override; + qreal numberOfDatasets() const override; /** \reimpl */ - qreal numberOfGridRings() const Q_DECL_OVERRIDE; + qreal numberOfGridRings() const override; qreal valueTotals( int dataset ) const; @@ -73,9 +73,9 @@ protected: /** \reimpl */ - const QPair calculateDataBoundaries() const Q_DECL_OVERRIDE; - void paintEvent( QPaintEvent* ) Q_DECL_OVERRIDE; - void resizeEvent( QResizeEvent* ) Q_DECL_OVERRIDE; + const QPair 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 = nullptr ); virtual ~AbstractTernaryDiagram(); - void paint (PaintContext *paintContext) Q_DECL_OVERRIDE; + void paint (PaintContext *paintContext) override; virtual void addAxis( TernaryAxis* axis ); virtual void takeAxis( TernaryAxis* axis ); virtual TernaryAxisList axes () const; protected: - const QPair< QPointF, QPointF > calculateDataBoundaries () const Q_DECL_OVERRIDE = 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 @@ -45,18 +45,18 @@ explicit TernaryAxis ( AbstractTernaryDiagram* diagram = nullptr ); ~TernaryAxis(); - void paintAll( QPainter &) Q_DECL_OVERRIDE; - void paint (QPainter *) Q_DECL_OVERRIDE; - void paintCtx (PaintContext *) Q_DECL_OVERRIDE; - - QRect geometry () const Q_DECL_OVERRIDE; - void setGeometry (const QRect &rect) Q_DECL_OVERRIDE; - - bool isEmpty () const Q_DECL_OVERRIDE; - QSize minimumSize () const Q_DECL_OVERRIDE; - QSize maximumSize () const Q_DECL_OVERRIDE; - QSize sizeHint () const Q_DECL_OVERRIDE; - Qt::Orientations expandingDirections () const Q_DECL_OVERRIDE; + void paintAll( QPainter &) override; + void paint (QPainter *) override; + void paintCtx (PaintContext *) override; + + QRect geometry () const override; + void setGeometry (const QRect &rect) override; + + 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,14 +40,14 @@ explicit TernaryCoordinatePlane( Chart* parent = nullptr ); ~TernaryCoordinatePlane(); - void addDiagram( AbstractDiagram* diagram ) Q_DECL_OVERRIDE; + void addDiagram( AbstractDiagram* diagram ) override; - void layoutDiagrams() Q_DECL_OVERRIDE; + void layoutDiagrams() override; - const QPointF translate ( const QPointF& diagramPoint ) const Q_DECL_OVERRIDE; + const QPointF translate ( const QPointF& diagramPoint ) const override; - void paint( QPainter* ) Q_DECL_OVERRIDE; - DataDimensionsList getDataDimensionsList() const Q_DECL_OVERRIDE; + void paint( QPainter* ) override; + DataDimensionsList getDataDimensionsList() const override; /** \reimpl */ QSize minimumSizeHint() const; 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 } - void initialize() Q_DECL_OVERRIDE + 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 ) Q_DECL_OVERRIDE; - DataDimensionsList calculateGrid( const DataDimensionsList& rawDataDimensions ) const Q_DECL_OVERRIDE; + 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 @@ -39,11 +39,11 @@ explicit TernaryLineDiagram ( QWidget* parent = nullptr, TernaryCoordinatePlane* plane = nullptr ); virtual ~TernaryLineDiagram(); - void resize (const QSizeF &area) Q_DECL_OVERRIDE; - void paint (PaintContext *paintContext) Q_DECL_OVERRIDE; + void resize (const QSizeF &area) override; + void paint (PaintContext *paintContext) override; protected: - const QPair< QPointF, QPointF > calculateDataBoundaries () const Q_DECL_OVERRIDE; + 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 @@ -38,11 +38,11 @@ explicit TernaryPointDiagram ( QWidget* parent = nullptr, TernaryCoordinatePlane* plane = nullptr ); virtual ~TernaryPointDiagram(); - void resize (const QSizeF &area) Q_DECL_OVERRIDE; - void paint (PaintContext *paintContext) Q_DECL_OVERRIDE; + void resize (const QSizeF &area) override; + void paint (PaintContext *paintContext) override; protected: - const QPair< QPointF, QPointF > calculateDataBoundaries () const Q_DECL_OVERRIDE; + const QPair< QPointF, QPointF > calculateDataBoundaries () const override; }; } 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 = nullptr, GraphicsScene* scene = nullptr ); virtual ~ConstraintGraphicsItem(); - /*reimp*/ int type() const Q_DECL_OVERRIDE; + /*reimp*/ int type() const override; /*reimp (non virtual)*/GraphicsScene* scene() const; /*reimp*/ QString ganttToolTip() const; - /*reimp*/ QRectF boundingRect() const Q_DECL_OVERRIDE; + /*reimp*/ QRectF boundingRect() const override; /*reimp*/ void paint( QPainter* painter, const QStyleOptionGraphicsItem* option, - QWidget* widget = nullptr ) Q_DECL_OVERRIDE; + QWidget* widget = nullptr ) override; inline const Constraint& constraint() const { return m_constraint; } Constraint proxyConstraint() const; diff --git a/src/KGantt/kganttdatetimegrid.h b/src/KGantt/kganttdatetimegrid.h --- a/src/KGantt/kganttdatetimegrid.h +++ b/src/KGantt/kganttdatetimegrid.h @@ -80,18 +80,18 @@ void setNoInformationBrush( const QBrush& brush ); QBrush noInformationBrush() const; - /*reimp*/ Span mapToChart( const QModelIndex& idx ) const Q_DECL_OVERRIDE; + /*reimp*/ Span mapToChart( const QModelIndex& idx ) const override; /*reimp*/ bool mapFromChart( const Span& span, const QModelIndex& idx, - const QList& constraints=QList() ) const Q_DECL_OVERRIDE; - /*reimp*/ qreal mapToChart( const QVariant& value ) const Q_DECL_OVERRIDE; - /*reimp*/ QVariant mapFromChart( qreal x ) const Q_DECL_OVERRIDE; + const QList& constraints=QList() ) const override; + /*reimp*/ qreal mapToChart( const QVariant& value ) const override; + /*reimp*/ QVariant mapFromChart( qreal x ) const override; /*reimp*/ void paintGrid( QPainter* painter, const QRectF& sceneRect, const QRectF& exposedRect, AbstractRowController* rowController = nullptr, - QWidget* widget = nullptr ) Q_DECL_OVERRIDE; + QWidget* widget = nullptr ) override; /*reimp*/ void paintHeader( QPainter* painter, const QRectF& headerRect, const QRectF& exposedRect, - qreal offset, QWidget* widget = nullptr ) Q_DECL_OVERRIDE; + qreal offset, QWidget* widget = nullptr ) override; DateTimeTimeLine *timeLine() const; @@ -120,8 +120,8 @@ QRectF computeRect(const QDateTime& from, const QDateTime& to, const QRectF& rect) const; QPair dateTimeRange(const QRectF& rect) const; - /* reimp */ void drawBackground(QPainter* paint, const QRectF& rect) Q_DECL_OVERRIDE; - /* reimp */ void drawForeground(QPainter* paint, const QRectF& rect) Q_DECL_OVERRIDE; + /* reimp */ void drawBackground(QPainter* paint, const QRectF& rect) override; + /* reimp */ 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 @@ -1010,10 +1010,10 @@ public: virtual ~HourFormatter() {} - QString format( const QDateTime& dt ) Q_DECL_OVERRIDE { + 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 ) Q_DECL_OVERRIDE { + 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 ), @@ -1026,10 +1026,10 @@ class DayFormatter : public Private::DateTextFormatter { public: virtual ~DayFormatter() {} - QString format( const QDateTime& dt ) Q_DECL_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 ) Q_DECL_OVERRIDE { + 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 ), @@ -1050,10 +1050,10 @@ public: virtual ~DayFormatter() {} - QString format( const QDateTime& dt ) Q_DECL_OVERRIDE { + 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 ) Q_DECL_OVERRIDE { + 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 ), @@ -1066,10 +1066,10 @@ class WeekFormatter : public Private::DateTextFormatter { public: virtual ~WeekFormatter() {} - QString format( const QDateTime& dt ) Q_DECL_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 ) Q_DECL_OVERRIDE { + 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 ), @@ -1090,10 +1090,10 @@ public: virtual ~WeekFormatter() {} - QString format( const QDateTime& dt ) Q_DECL_OVERRIDE { + 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 ) Q_DECL_OVERRIDE { + 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 ), @@ -1107,10 +1107,10 @@ public: virtual ~MonthFormatter() {} - QString format( const QDateTime& dt ) Q_DECL_OVERRIDE { + 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 ) Q_DECL_OVERRIDE { + 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(); } @@ -1129,10 +1129,10 @@ public: virtual ~MonthFormatter() {} - QString format( const QDateTime& dt ) Q_DECL_OVERRIDE { + 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 ) Q_DECL_OVERRIDE { + 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(); } @@ -1144,10 +1144,10 @@ public: virtual ~YearFormatter() {} - QString format( const QDateTime& dt ) Q_DECL_OVERRIDE { + 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 ) Q_DECL_OVERRIDE { + 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 @@ -32,23 +32,23 @@ explicit ForwardingProxyModel( QObject* parent = nullptr ); virtual ~ForwardingProxyModel(); - /*reimp*/ QModelIndex mapFromSource ( const QModelIndex & sourceIndex ) const Q_DECL_OVERRIDE; - /*reimp*/ QModelIndex mapToSource ( const QModelIndex & proxyIndex ) const Q_DECL_OVERRIDE; + /*reimp*/ QModelIndex mapFromSource ( const QModelIndex & sourceIndex ) const override; + /*reimp*/ QModelIndex mapToSource ( const QModelIndex & proxyIndex ) const override; - /*reimp*/ void setSourceModel( QAbstractItemModel* model ) Q_DECL_OVERRIDE; + /*reimp*/ void setSourceModel( QAbstractItemModel* model ) override; - /*reimp*/ QModelIndex index( int row, int column, const QModelIndex& parent = QModelIndex() ) const Q_DECL_OVERRIDE; - /*reimp*/ QModelIndex parent( const QModelIndex& idx ) const Q_DECL_OVERRIDE; + /*reimp*/ QModelIndex index( int row, int column, const QModelIndex& parent = QModelIndex() ) const override; + /*reimp*/ QModelIndex parent( const QModelIndex& idx ) const override; - /*reimp*/ int rowCount( const QModelIndex& idx = QModelIndex() ) const Q_DECL_OVERRIDE; - /*reimp*/ int columnCount( const QModelIndex& idx = QModelIndex() ) const Q_DECL_OVERRIDE; + /*reimp*/ int rowCount( const QModelIndex& idx = QModelIndex() ) const override; + /*reimp*/ int columnCount( const QModelIndex& idx = QModelIndex() ) const override; - /*reimp*/ bool setData( const QModelIndex& index, const QVariant& value, int role = Qt::EditRole ) Q_DECL_OVERRIDE; + /*reimp*/ bool setData( const QModelIndex& index, const QVariant& value, int role = Qt::EditRole ) override; - /*reimp*/ QMimeData *mimeData(const QModelIndexList &indexes) const Q_DECL_OVERRIDE; - /*reimp*/ bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE; - /*reimp*/ QStringList mimeTypes() const Q_DECL_OVERRIDE; - /*reimp*/ Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE; + /*reimp*/ QMimeData *mimeData(const QModelIndexList &indexes) const override; + /*reimp*/ bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override; + /*reimp*/ QStringList mimeTypes() const override; + /*reimp*/ 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,7 +44,7 @@ explicit GraphicsItem( const QModelIndex& idx, QGraphicsItem* parent = nullptr, GraphicsScene* scene = nullptr ); virtual ~GraphicsItem(); - /*reimp*/int type() const Q_DECL_OVERRIDE; + /*reimp*/int type() const override; /*reimp (non-virtual)*/ GraphicsScene* scene() const; void updateItem( const Span& rowgeometry, const QPersistentModelIndex& idx ); @@ -73,19 +73,19 @@ QList startConstraints() const { return m_startConstraints; } QList endConstraints() const { return m_endConstraints; } - /*reimp*/ QRectF boundingRect() const Q_DECL_OVERRIDE; + /*reimp*/ QRectF boundingRect() const override; /*reimp*/ void paint( QPainter* painter, const QStyleOptionGraphicsItem* option, - QWidget* widget = nullptr ) Q_DECL_OVERRIDE; + QWidget* widget = nullptr ) override; - /*reimp*/ QVariant itemChange( GraphicsItemChange, const QVariant& value ) Q_DECL_OVERRIDE; + /*reimp*/ QVariant itemChange( GraphicsItemChange, const QVariant& value ) override; protected: - /*reimp*/ void focusInEvent( QFocusEvent* event ) Q_DECL_OVERRIDE; - /*reimp*/ void hoverMoveEvent( QGraphicsSceneHoverEvent* ) Q_DECL_OVERRIDE; - /*reimp*/ void hoverLeaveEvent( QGraphicsSceneHoverEvent* ) Q_DECL_OVERRIDE; - /*reimp*/ void mousePressEvent( QGraphicsSceneMouseEvent* ) Q_DECL_OVERRIDE; - /*reimp*/ void mouseReleaseEvent( QGraphicsSceneMouseEvent* ) Q_DECL_OVERRIDE; - /*reimp*/ void mouseDoubleClickEvent( QGraphicsSceneMouseEvent* ) Q_DECL_OVERRIDE; - /*reimp*/ void mouseMoveEvent( QGraphicsSceneMouseEvent* ) Q_DECL_OVERRIDE; + /*reimp*/ void focusInEvent( QFocusEvent* event ) override; + /*reimp*/ void hoverMoveEvent( QGraphicsSceneHoverEvent* ) override; + /*reimp*/ void hoverLeaveEvent( QGraphicsSceneHoverEvent* ) override; + /*reimp*/ void mousePressEvent( QGraphicsSceneMouseEvent* ) override; + /*reimp*/ void mouseReleaseEvent( QGraphicsSceneMouseEvent* ) override; + /*reimp*/ void mouseDoubleClickEvent( QGraphicsSceneMouseEvent* ) override; + /*reimp*/ 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 @@ -111,9 +111,9 @@ void pressed( const QModelIndex & index ); protected: - /*reimp*/ void helpEvent( QGraphicsSceneHelpEvent *helpEvent ) Q_DECL_OVERRIDE; - /*reimp*/ void drawBackground( QPainter* painter, const QRectF& rect ) Q_DECL_OVERRIDE; - /*reimp*/ void drawForeground( QPainter* painter, const QRectF& rect ) Q_DECL_OVERRIDE; + /*reimp*/ void helpEvent( QGraphicsSceneHelpEvent *helpEvent ) override; + /*reimp*/ void drawBackground( QPainter* painter, const QRectF& rect ) override; + /*reimp*/ 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 @@ -869,30 +869,30 @@ m_model = model; } - /*reimp*/int headerHeight() const Q_DECL_OVERRIDE { return 40; } + /*reimp*/int headerHeight() const override { return 40; } - /*reimp*/ bool isRowVisible( const QModelIndex& ) const Q_DECL_OVERRIDE { return true;} - /*reimp*/ bool isRowExpanded( const QModelIndex& ) const Q_DECL_OVERRIDE { return false; } - /*reimp*/ KGantt::Span rowGeometry( const QModelIndex& idx ) const Q_DECL_OVERRIDE + /*reimp*/ bool isRowVisible( const QModelIndex& ) const override { return true;} + /*reimp*/ bool isRowExpanded( const QModelIndex& ) const override { return false; } + /*reimp*/ KGantt::Span rowGeometry( const QModelIndex& idx ) const override { return KGantt::Span( idx.row() * ROW_HEIGHT, ROW_HEIGHT ); } - /*reimp*/ int maximumItemHeight() const Q_DECL_OVERRIDE { + /*reimp*/ int maximumItemHeight() const override { return ROW_HEIGHT/2; } - /*reimp*/int totalHeight() const Q_DECL_OVERRIDE { + /*reimp*/int totalHeight() const override { return m_model->rowCount()* ROW_HEIGHT; } - /*reimp*/ QModelIndex indexAt( int height ) const Q_DECL_OVERRIDE { + /*reimp*/ QModelIndex indexAt( int height ) const override { return m_model->index( height/ROW_HEIGHT, 0 ); } - /*reimp*/ QModelIndex indexBelow( const QModelIndex& idx ) const Q_DECL_OVERRIDE { + /*reimp*/ 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 Q_DECL_OVERRIDE { + /*reimp*/ QModelIndex indexAbove( const QModelIndex& idx ) const override { if ( !idx.isValid() )return QModelIndex(); return idx.model()->index( idx.row()-1, idx.column(), idx.parent() ); } diff --git a/src/KGantt/kganttgraphicsview.h b/src/KGantt/kganttgraphicsview.h --- a/src/KGantt/kganttgraphicsview.h +++ b/src/KGantt/kganttgraphicsview.h @@ -121,7 +121,7 @@ protected: void clearItems(); - /*reimp*/void resizeEvent( QResizeEvent* ) Q_DECL_OVERRIDE; + /*reimp*/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 @@ -38,9 +38,9 @@ public Q_SLOTS: void scrollTo( int ); protected: - /*reimp*/ bool event( QEvent* ev ) Q_DECL_OVERRIDE; - /*reimp*/ void paintEvent( QPaintEvent* ev ) Q_DECL_OVERRIDE; - /*reimp*/ void contextMenuEvent( QContextMenuEvent* ev ) Q_DECL_OVERRIDE; + /*reimp*/ bool event( QEvent* ev ) override; + /*reimp*/ void paintEvent( QPaintEvent* ev ) override; + /*reimp*/ void contextMenuEvent( QContextMenuEvent* ev ) override; private: qreal m_offset; }; diff --git a/src/KGantt/kganttlegend.h b/src/KGantt/kganttlegend.h --- a/src/KGantt/kganttlegend.h +++ b/src/KGantt/kganttlegend.h @@ -35,29 +35,29 @@ explicit Legend( QWidget* parent = nullptr ); virtual ~Legend(); - /*reimp*/ QModelIndex indexAt( const QPoint& point ) const Q_DECL_OVERRIDE; - /*reimp*/ QRect visualRect( const QModelIndex& index ) const Q_DECL_OVERRIDE; + /*reimp*/ QModelIndex indexAt( const QPoint& point ) const override; + /*reimp*/ QRect visualRect( const QModelIndex& index ) const override; - /*reimp*/ void scrollTo( const QModelIndex&, ScrollHint = EnsureVisible ) Q_DECL_OVERRIDE {} + /*reimp*/ void scrollTo( const QModelIndex&, ScrollHint = EnsureVisible ) override {} - /*reimp*/ QSize sizeHint() const Q_DECL_OVERRIDE; - /*reimp*/ QSize minimumSizeHint() const Q_DECL_OVERRIDE; + /*reimp*/ QSize sizeHint() const override; + /*reimp*/ QSize minimumSizeHint() const override; - /*reimp*/ void setModel( QAbstractItemModel* model ) Q_DECL_OVERRIDE; + /*reimp*/ 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 ) Q_DECL_OVERRIDE; + /*reimp*/ void paintEvent( QPaintEvent* event ) override; - /*reimp*/ int horizontalOffset() const Q_DECL_OVERRIDE { return 0; } - /*reimp*/ bool isIndexHidden( const QModelIndex& ) const Q_DECL_OVERRIDE { return false; } - /*reimp*/ QModelIndex moveCursor( CursorAction, Qt::KeyboardModifiers ) Q_DECL_OVERRIDE { return QModelIndex(); } - /*reimp*/ void setSelection( const QRect&, QItemSelectionModel::SelectionFlags ) Q_DECL_OVERRIDE {} - /*reimp*/ int verticalOffset() const Q_DECL_OVERRIDE { return 0; } - /*reimp*/ QRegion visualRegionForSelection( const QItemSelection& ) const Q_DECL_OVERRIDE { return QRegion(); } + /*reimp*/ int horizontalOffset() const override { return 0; } + /*reimp*/ bool isIndexHidden( const QModelIndex& ) const override { return false; } + /*reimp*/ QModelIndex moveCursor( CursorAction, Qt::KeyboardModifiers ) override { return QModelIndex(); } + /*reimp*/ void setSelection( const QRect&, QItemSelectionModel::SelectionFlags ) override {} + /*reimp*/ int verticalOffset() const override { return 0; } + /*reimp*/ 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 Q_DECL_OVERRIDE; - /*reimp*/ int maximumItemHeight() const Q_DECL_OVERRIDE; - /*reimp*/ int totalHeight() const Q_DECL_OVERRIDE; - /*reimp*/ bool isRowVisible( const QModelIndex& idx ) const Q_DECL_OVERRIDE; - /*reimp*/ bool isRowExpanded( const QModelIndex& idx ) const Q_DECL_OVERRIDE; - /*reimp*/ Span rowGeometry( const QModelIndex& idx ) const Q_DECL_OVERRIDE; - /*reimp*/ QModelIndex indexAt( int height ) const Q_DECL_OVERRIDE; - /*reimp*/ QModelIndex indexAbove( const QModelIndex& idx ) const Q_DECL_OVERRIDE; - /*reimp*/ QModelIndex indexBelow( const QModelIndex& idx ) const Q_DECL_OVERRIDE; + /*reimp*/ int headerHeight() const override; + /*reimp*/ int maximumItemHeight() const override; + /*reimp*/ int totalHeight() const override; + /*reimp*/ bool isRowVisible( const QModelIndex& idx ) const override; + /*reimp*/ bool isRowExpanded( const QModelIndex& idx ) const override; + /*reimp*/ Span rowGeometry( const QModelIndex& idx ) const override; + /*reimp*/ QModelIndex indexAt( int height ) const override; + /*reimp*/ QModelIndex indexAbove( const QModelIndex& idx ) const override; + /*reimp*/ 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 @@ -44,14 +44,14 @@ bool calendarMode() const; #endif - /*reimp*/ QModelIndex mapFromSource( const QModelIndex& idx) const Q_DECL_OVERRIDE; - /*reimp*/ QModelIndex mapToSource( const QModelIndex& proxyIdx ) const Q_DECL_OVERRIDE; + /*reimp*/ QModelIndex mapFromSource( const QModelIndex& idx) const override; + /*reimp*/ QModelIndex mapToSource( const QModelIndex& proxyIdx ) const override; - /*reimp*/ int rowCount( const QModelIndex& idx ) const Q_DECL_OVERRIDE; - /*reimp*/ int columnCount( const QModelIndex& idx ) const Q_DECL_OVERRIDE; + /*reimp*/ int rowCount( const QModelIndex& idx ) const override; + /*reimp*/ int columnCount( const QModelIndex& idx ) const override; - /*reimp*/ QVariant data( const QModelIndex& idx, int role = Qt::DisplayRole ) const Q_DECL_OVERRIDE; - /*reimp*/ bool setData( const QModelIndex& idx, const QVariant& value, int role=Qt::EditRole ) Q_DECL_OVERRIDE; + /*reimp*/ QVariant data( const QModelIndex& idx, int role = Qt::DisplayRole ) const override; + /*reimp*/ 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 @@ -30,21 +30,21 @@ explicit SummaryHandlingProxyModel( QObject* parent = nullptr ); virtual ~SummaryHandlingProxyModel(); - /*reimp*/ void setSourceModel( QAbstractItemModel* model ) Q_DECL_OVERRIDE; + /*reimp*/ void setSourceModel( QAbstractItemModel* model ) override; - /*reimp*/ QVariant data( const QModelIndex& proxyIndex, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; - /*reimp*/ bool setData( const QModelIndex& index, const QVariant& value, int role = Qt::EditRole ) Q_DECL_OVERRIDE; + /*reimp*/ QVariant data( const QModelIndex& proxyIndex, int role = Qt::DisplayRole) const override; + /*reimp*/ bool setData( const QModelIndex& index, const QVariant& value, int role = Qt::EditRole ) override; - /*reimp*/ Qt::ItemFlags flags( const QModelIndex& idx ) const Q_DECL_OVERRIDE; + /*reimp*/ Qt::ItemFlags flags( const QModelIndex& idx ) const override; protected: - /*reimp*/ void sourceModelReset() Q_DECL_OVERRIDE; - /*reimp*/ void sourceLayoutChanged() Q_DECL_OVERRIDE; - /*reimp*/ void sourceDataChanged( const QModelIndex& from, const QModelIndex& to ) Q_DECL_OVERRIDE; - /*reimp*/ void sourceColumnsAboutToBeInserted( const QModelIndex& idx, int start, int end ) Q_DECL_OVERRIDE; - /*reimp*/ void sourceColumnsAboutToBeRemoved( const QModelIndex& idx, int start, int end ) Q_DECL_OVERRIDE; - /*reimp*/ void sourceRowsAboutToBeInserted( const QModelIndex& idx, int start, int end ) Q_DECL_OVERRIDE; - /*reimp*/ void sourceRowsAboutToBeRemoved( const QModelIndex&, int start, int end ) Q_DECL_OVERRIDE; + /*reimp*/ void sourceModelReset() override; + /*reimp*/ void sourceLayoutChanged() override; + /*reimp*/ void sourceDataChanged( const QModelIndex& from, const QModelIndex& to ) override; + /*reimp*/ void sourceColumnsAboutToBeInserted( const QModelIndex& idx, int start, int end ) override; + /*reimp*/ void sourceColumnsAboutToBeRemoved( const QModelIndex& idx, int start, int end ) override; + /*reimp*/ void sourceRowsAboutToBeInserted( const QModelIndex& idx, int start, int end ) override; + /*reimp*/ 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 Q_DECL_OVERRIDE; - /*reimp*/ int maximumItemHeight() const Q_DECL_OVERRIDE; - /*reimp*/ int totalHeight() const Q_DECL_OVERRIDE; - /*reimp*/ bool isRowVisible( const QModelIndex& idx ) const Q_DECL_OVERRIDE; - /*reimp*/ bool isRowExpanded( const QModelIndex& idx ) const Q_DECL_OVERRIDE; - /*reimp*/ Span rowGeometry( const QModelIndex& idx ) const Q_DECL_OVERRIDE; - /*reimp*/ QModelIndex indexAt( int height ) const Q_DECL_OVERRIDE; - /*reimp*/ QModelIndex indexAbove( const QModelIndex& idx ) const Q_DECL_OVERRIDE; - /*reimp*/ QModelIndex indexBelow( const QModelIndex& idx ) const Q_DECL_OVERRIDE; + /*reimp*/ int headerHeight() const override; + /*reimp*/ int maximumItemHeight() const override; + /*reimp*/ int totalHeight() const override; + /*reimp*/ bool isRowVisible( const QModelIndex& idx ) const override; + /*reimp*/ bool isRowExpanded( const QModelIndex& idx ) const override; + /*reimp*/ Span rowGeometry( const QModelIndex& idx ) const override; + /*reimp*/ QModelIndex indexAt( int height ) const override; + /*reimp*/ QModelIndex indexAbove( const QModelIndex& idx ) const override; + /*reimp*/ 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 @@ -100,7 +100,7 @@ void collapseAll( QModelIndex index = QModelIndex() ); protected: - /*reimp*/ void resizeEvent(QResizeEvent*) Q_DECL_OVERRIDE; + /*reimp*/ 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=nullptr ) : QHeaderView( Qt::Horizontal, parent ) { } - QSize sizeHint() const Q_DECL_OVERRIDE { 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/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 = nullptr ) { TestRegistry::instance()->registerTestFactory( this, group ); } - Test * create() const Q_DECL_OVERRIDE { 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() Q_DECL_OVERRIDE; \ + 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 = nullptr ); - bool editorEvent( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index ) Q_DECL_OVERRIDE; + 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 @@ -43,7 +43,7 @@ /*reimp*/void addConstraint( const QModelIndex& from, const QModelIndex& to, - Qt::KeyboardModifiers modifiers ) Q_DECL_OVERRIDE + 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,31 @@ m_model = model; } - /*reimp*/int headerHeight() const Q_DECL_OVERRIDE { return 40; } + /*reimp*/int headerHeight() const override { return 40; } - /*reimp*/ bool isRowVisible( const QModelIndex& ) const Q_DECL_OVERRIDE { return true;} - /*reimp*/ bool isRowExpanded( const QModelIndex& ) const Q_DECL_OVERRIDE { return false; } - /*reimp*/ KGantt::Span rowGeometry( const QModelIndex& idx ) const Q_DECL_OVERRIDE + /*reimp*/ bool isRowVisible( const QModelIndex& ) const override { return true;} + /*reimp*/ bool isRowExpanded( const QModelIndex& ) const override { return false; } + /*reimp*/ 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 Q_DECL_OVERRIDE { + /*reimp*/ int maximumItemHeight() const override { return ROW_HEIGHT/2; } - /*reimp*/ int totalHeight() const Q_DECL_OVERRIDE { + /*reimp*/ int totalHeight() const override { return m_model.isNull()?0:m_model->rowCount()*ROW_HEIGHT; } - /*reimp*/ QModelIndex indexAt( int height ) const Q_DECL_OVERRIDE { + /*reimp*/ QModelIndex indexAt( int height ) const override { return m_model->index( height/ROW_HEIGHT, 0 ); } - /*reimp*/ QModelIndex indexBelow( const QModelIndex& idx ) const Q_DECL_OVERRIDE { + /*reimp*/ 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 Q_DECL_OVERRIDE { + /*reimp*/ 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 +78,7 @@ class MyStandardItemModel : public QStandardItemModel { public: - /*reimp*/bool setData( const QModelIndex& idx, const QVariant& value, int role ) Q_DECL_OVERRIDE + /*reimp*/bool setData( const QModelIndex& idx, const QVariant& value, int role ) override { //qDebug() << "MyStandardItemModel::setData("<