diff --git a/GUI/Views/MaskWidgets/EllipseView.h b/GUI/Views/MaskWidgets/EllipseView.h index 977a108e1105f8f41d338c832bbaa356513941d8..c26277dabcafaf2a5ff0b83f2b62d5af8f522416 100644 --- a/GUI/Views/MaskWidgets/EllipseView.h +++ b/GUI/Views/MaskWidgets/EllipseView.h @@ -24,7 +24,7 @@ class EllipseView : public RectangleBaseView { Q_OBJECT public: - int type() const { return MaskEditorHelper::ELLIPSE; } + int type() const override { return MaskEditorHelper::ELLIPSE; } EllipseView(); @@ -38,12 +38,12 @@ protected: virtual void mouseMoveEvent(QGraphicsSceneMouseEvent* event) override; private: - void update_position(); - QRectF mask_rectangle(); - qreal left() const; - qreal right() const; - qreal top() const; - qreal bottom() const; + void update_position() override; + QRectF mask_rectangle() override; + qreal left() const override; + qreal right() const override; + qreal top() const override; + qreal bottom() const override; }; #endif // BORNAGAIN_GUI_VIEWS_MASKWIDGETS_ELLIPSEVIEW_H diff --git a/GUI/Views/MaskWidgets/IShape2DView.h b/GUI/Views/MaskWidgets/IShape2DView.h index c22e01eb898df957a077fd3409dee35fd8c7b89d..b608c9a64bf41a266c5bd1bb0efad53eb633032e 100644 --- a/GUI/Views/MaskWidgets/IShape2DView.h +++ b/GUI/Views/MaskWidgets/IShape2DView.h @@ -28,12 +28,12 @@ class IShape2DView : public QGraphicsObject { Q_OBJECT public: - virtual int type() const { return MaskEditorHelper::IMASKVIEW; } + int type() const override { return MaskEditorHelper::IMASKVIEW; } IShape2DView(); virtual ~IShape2DView(); - QRectF boundingRect() const; + QRectF boundingRect() const override; virtual void setParameterizedItem(SessionItem* item); virtual SessionItem* parameterizedItem(); diff --git a/GUI/Views/MaskWidgets/LineViews.h b/GUI/Views/MaskWidgets/LineViews.h index ee73fedd31b545441baa8fbbbb0a032edb8d6dc5..d57348a1c0bc6d5618666940373fc44f642d46bb 100644 --- a/GUI/Views/MaskWidgets/LineViews.h +++ b/GUI/Views/MaskWidgets/LineViews.h @@ -17,46 +17,48 @@ #include "GUI/Views/MaskWidgets/IShape2DView.h" + //! This is a view of VerticalLineItem mask class VerticalLineView : public IShape2DView { Q_OBJECT public: - int type() const { return MaskEditorHelper::VERTICALLINE; } + int type() const override { return MaskEditorHelper::VERTICALLINE; } VerticalLineView(); - virtual QPainterPath shape() const override; + QPainterPath shape() const override; protected slots: - virtual void update_view(); - virtual void onChangedX(); - virtual void onPropertyChange(const QString& propertyName); + void update_view() override; + void onChangedX() override; + void onPropertyChange(const QString& propertyName) override; protected: - void paint(QPainter* painter, const QStyleOptionGraphicsItem*, QWidget*); - QVariant itemChange(GraphicsItemChange change, const QVariant& value); + void paint(QPainter* painter, const QStyleOptionGraphicsItem*, QWidget*) override; + QVariant itemChange(GraphicsItemChange change, const QVariant& value) override; }; + //! This is a view of HorizontalLineItem mask class HorizontalLineView : public IShape2DView { Q_OBJECT public: - int type() const { return MaskEditorHelper::HORIZONTALLINE; } + int type() const override { return MaskEditorHelper::HORIZONTALLINE; } HorizontalLineView(); - virtual QPainterPath shape() const override; + QPainterPath shape() const override; protected slots: - virtual void update_view(); - virtual void onChangedY(); - virtual void onPropertyChange(const QString& propertyName); + void update_view() override; + void onChangedY() override; + void onPropertyChange(const QString& propertyName) override; protected: - void paint(QPainter* painter, const QStyleOptionGraphicsItem*, QWidget*); - QVariant itemChange(GraphicsItemChange change, const QVariant& value); + void paint(QPainter* painter, const QStyleOptionGraphicsItem*, QWidget*) override; + QVariant itemChange(GraphicsItemChange change, const QVariant& value) override; }; #endif // BORNAGAIN_GUI_VIEWS_MASKWIDGETS_LINEVIEWS_H diff --git a/GUI/Views/MaskWidgets/PolygonView.h b/GUI/Views/MaskWidgets/PolygonView.h index 1e3accbb8cb12ac5c85f89408a15169826a98859..f6b552fefff7697d00aebff12075692b19318c0e 100644 --- a/GUI/Views/MaskWidgets/PolygonView.h +++ b/GUI/Views/MaskWidgets/PolygonView.h @@ -24,11 +24,11 @@ class PolygonView : public IShape2DView { Q_OBJECT public: - int type() const { return MaskEditorHelper::POLYGON; } + int type() const override { return MaskEditorHelper::POLYGON; } PolygonView(); - void addView(IShape2DView* childView, int row); + void addView(IShape2DView* childView, int row) override; bool isClosedPolygon(); QPointF lastAddedPoint() const; virtual QPainterPath shape() const override; @@ -38,12 +38,12 @@ public slots: void onClosePolygonRequest(bool value); protected slots: - void update_view(); + void update_view() override; protected: virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem*, QWidget*) override; - QVariant itemChange(GraphicsItemChange change, const QVariant& value); - void mouseMoveEvent(QGraphicsSceneMouseEvent* event); + QVariant itemChange(GraphicsItemChange change, const QVariant& value) override; + void mouseMoveEvent(QGraphicsSceneMouseEvent* event) override; private: void update_polygon(); diff --git a/GUI/Views/MaskWidgets/RectangleBaseView.h b/GUI/Views/MaskWidgets/RectangleBaseView.h index 272e457f8bf1c9b084e5dbab2d31337a04944317..e07abc1adb391afe6b09e42575f784aa5ddb002b 100644 --- a/GUI/Views/MaskWidgets/RectangleBaseView.h +++ b/GUI/Views/MaskWidgets/RectangleBaseView.h @@ -25,7 +25,7 @@ class RectangleBaseView : public IShape2DView { Q_OBJECT public: - int type() const { return MaskEditorHelper::RECTANGLEBASE; } + int type() const override { return MaskEditorHelper::RECTANGLEBASE; } RectangleBaseView(); @@ -33,9 +33,9 @@ private slots: void onSizeHandleElementRequest(bool going_to_resize); protected: - QVariant itemChange(GraphicsItemChange change, const QVariant& value); - void mouseReleaseEvent(QGraphicsSceneMouseEvent* event); - void update_view(); + QVariant itemChange(GraphicsItemChange change, const QVariant& value) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent* event) override; + void update_view() override; virtual void update_bounding_rect(); virtual void update_position() = 0; diff --git a/GUI/Views/MaskWidgets/RectangleView.h b/GUI/Views/MaskWidgets/RectangleView.h index 3c02b581c2179682bc00bfadb0e248dad0502858..e0ec177c332b7e29b5673b1d83e850e26ef683c1 100644 --- a/GUI/Views/MaskWidgets/RectangleView.h +++ b/GUI/Views/MaskWidgets/RectangleView.h @@ -24,25 +24,25 @@ class RectangleView : public RectangleBaseView { Q_OBJECT public: - int type() const { return MaskEditorHelper::RECTANGLE; } + int type() const override { return MaskEditorHelper::RECTANGLE; } RectangleView(); virtual QPainterPath shape() const override; protected slots: - virtual void onChangedX(); - virtual void onChangedY(); - virtual void onPropertyChange(const QString& propertyName); + virtual void onChangedX() override; + virtual void onChangedY() override; + virtual void onPropertyChange(const QString& propertyName) override; protected: - void mouseMoveEvent(QGraphicsSceneMouseEvent* event); + void mouseMoveEvent(QGraphicsSceneMouseEvent* event) override; protected: - void update_position(); - QRectF mask_rectangle(); - qreal left() const; - qreal right() const; - qreal top() const; - qreal bottom() const; + void update_position() override; + QRectF mask_rectangle() override; + qreal left() const override; + qreal right() const override; + qreal top() const override; + qreal bottom() const override; }; #endif // BORNAGAIN_GUI_VIEWS_MASKWIDGETS_RECTANGLEVIEW_H