From f7b4315f9c1d0482e6cc48f0444b95ba6a7bac5b Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Mon, 3 Aug 2015 16:02:33 +1000 Subject: [PATCH] Add missing overrides --- src/app/nodetool/qgsmaptoolnodetool.h | 6 +++--- src/app/nodetool/qgsnodeeditor.cpp | 9 ++++++--- src/gui/editorwidgets/qgscheckboxwidgetfactory.h | 2 +- src/gui/qgsgeometryrubberband.h | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/app/nodetool/qgsmaptoolnodetool.h b/src/app/nodetool/qgsmaptoolnodetool.h index 466c5b931a9..74d8aec4413 100644 --- a/src/app/nodetool/qgsmaptoolnodetool.h +++ b/src/app/nodetool/qgsmaptoolnodetool.h @@ -34,7 +34,7 @@ class QgsMapToolNodeTool: public QgsMapToolEdit QgsMapToolNodeTool( QgsMapCanvas* canvas ); virtual ~QgsMapToolNodeTool(); - void canvasDoubleClickEvent( QMouseEvent * e ); + void canvasDoubleClickEvent( QMouseEvent * e ) override; //! mouse press event in map coordinates (eventually filtered) to be redefined in subclass void canvasMapPressEvent( QgsMapMouseEvent* e ) override; @@ -42,10 +42,10 @@ class QgsMapToolNodeTool: public QgsMapToolEdit //! mouse move event in map coordinates (eventually filtered) to be redefined in subclass void canvasMapMoveEvent( QgsMapMouseEvent* e ) override; - void keyPressEvent( QKeyEvent* e ); + void keyPressEvent( QKeyEvent* e ) override; //! called when map tool is being deactivated - void deactivate(); + void deactivate() override; public slots: void selectedFeatureDestroyed(); diff --git a/src/app/nodetool/qgsnodeeditor.cpp b/src/app/nodetool/qgsnodeeditor.cpp index a7c48e6a78b..b53bf7209bf 100644 --- a/src/app/nodetool/qgsnodeeditor.cpp +++ b/src/app/nodetool/qgsnodeeditor.cpp @@ -36,13 +36,15 @@ static const int MinRadiusRole = Qt::UserRole + 1; class CoordinateItemDelegate : public QStyledItemDelegate { public: - QString displayText( const QVariant & value, const QLocale & locale ) const + + QString displayText( const QVariant & value, const QLocale & locale ) const override { return locale.toString( value.toDouble(), 'f', 4 ); } protected: - QWidget* createEditor( QWidget * parent, const QStyleOptionViewItem & /*option*/, const QModelIndex & index ) const + + QWidget* createEditor( QWidget * parent, const QStyleOptionViewItem &, const QModelIndex & index ) const override { QLineEdit* lineEdit = new QLineEdit( parent ); QDoubleValidator* validator = new QDoubleValidator(); @@ -51,7 +53,8 @@ class CoordinateItemDelegate : public QStyledItemDelegate lineEdit->setValidator( validator ); return lineEdit; } - void setModelData( QWidget *editor, QAbstractItemModel *model, const QModelIndex &index ) const + + void setModelData( QWidget *editor, QAbstractItemModel *model, const QModelIndex &index ) const override { QLineEdit* lineEdit = qobject_cast( editor ); if ( lineEdit->hasAcceptableInput() ) diff --git a/src/gui/editorwidgets/qgscheckboxwidgetfactory.h b/src/gui/editorwidgets/qgscheckboxwidgetfactory.h index d03bf0fcbff..6f2a03b28f5 100644 --- a/src/gui/editorwidgets/qgscheckboxwidgetfactory.h +++ b/src/gui/editorwidgets/qgscheckboxwidgetfactory.h @@ -29,7 +29,7 @@ class GUI_EXPORT QgsCheckboxWidgetFactory : public QgsEditorWidgetFactory QgsEditorConfigWidget* configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const override; QgsEditorWidgetConfig readConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx ) override; void writeConfig( const QgsEditorWidgetConfig& config, QDomElement& configElement, QDomDocument& doc, const QgsVectorLayer* layer, int fieldIdx ) override; - QMap supportedWidgetTypes(); + QMap supportedWidgetTypes() override; }; #endif // QGSCHECKBOXWIDGETFACTORY_H diff --git a/src/gui/qgsgeometryrubberband.h b/src/gui/qgsgeometryrubberband.h index 14545db88e5..45b0f7e280d 100644 --- a/src/gui/qgsgeometryrubberband.h +++ b/src/gui/qgsgeometryrubberband.h @@ -82,7 +82,7 @@ class GUI_EXPORT QgsGeometryRubberBand: public QgsMapCanvasItem void setIconType( IconType iconType ) { mIconType = iconType; } protected: - virtual void paint( QPainter* painter ); + virtual void paint( QPainter* painter ) override; private: QgsAbstractGeometryV2* mGeometry;