From 011aeb131ed904d948b69d6444ff58cdbfd4990c Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Wed, 23 Nov 2016 02:02:53 +0300 Subject: Examples: Remove a redundant virtual specifier for overriders It's a good practice to use override without virtual: https://github.com/isocpp/CppCoreGuidelines/blob/master/CppCoreGuidelines.md#Rh-override Change-Id: I5c2d73600e6c706424589c0487133c03a4ef3629 Reviewed-by: Friedemann Kleint --- examples/widgets/graphicsview/boxes/glbuffers.h | 12 ++++---- examples/widgets/graphicsview/boxes/qtbox.h | 32 +++++++++++----------- examples/widgets/graphicsview/boxes/scene.h | 22 +++++++-------- .../widgets/graphicsview/dragdroprobot/main.cpp | 2 +- .../graphicsview/weatheranchorlayout/main.cpp | 2 +- 5 files changed, 35 insertions(+), 35 deletions(-) (limited to 'examples/widgets/graphicsview') diff --git a/examples/widgets/graphicsview/boxes/glbuffers.h b/examples/widgets/graphicsview/boxes/glbuffers.h index 0c2ff43c7e..0b80c8c4ae 100644 --- a/examples/widgets/graphicsview/boxes/glbuffers.h +++ b/examples/widgets/graphicsview/boxes/glbuffers.h @@ -110,8 +110,8 @@ public: GLTexture2D(int width, int height); explicit GLTexture2D(const QString& fileName, int width = 0, int height = 0); void load(int width, int height, QRgb *data); - virtual void bind() override; - virtual void unbind() override; + void bind() override; + void unbind() override; }; class GLTexture3D : public GLTexture @@ -121,8 +121,8 @@ public: // TODO: Implement function below //GLTexture3D(const QString& fileName, int width = 0, int height = 0); void load(int width, int height, int depth, QRgb *data); - virtual void bind() override; - virtual void unbind() override; + void bind() override; + void unbind() override; }; class GLTextureCube : public GLTexture @@ -131,8 +131,8 @@ public: GLTextureCube(int size); explicit GLTextureCube(const QStringList& fileNames, int size = 0); void load(int size, int face, QRgb *data); - virtual void bind() override; - virtual void unbind() override; + void bind() override; + void unbind() override; }; // TODO: Define and implement class below diff --git a/examples/widgets/graphicsview/boxes/qtbox.h b/examples/widgets/graphicsview/boxes/qtbox.h index e283dccfb4..f8ee9bdb0a 100644 --- a/examples/widgets/graphicsview/boxes/qtbox.h +++ b/examples/widgets/graphicsview/boxes/qtbox.h @@ -63,18 +63,18 @@ public: ItemBase(int size, int x, int y); virtual ~ItemBase(); - virtual QRectF boundingRect() const override; - virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; + QRectF boundingRect() const override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; protected: virtual ItemBase *createNew(int size, int x, int y) = 0; - virtual void contextMenuEvent(QGraphicsSceneContextMenuEvent *event) override; - virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; - virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *event) override; - virtual void mousePressEvent(QGraphicsSceneMouseEvent *event) override; - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; - virtual void keyPressEvent(QKeyEvent *event) override; - virtual void wheelEvent(QGraphicsSceneWheelEvent *event) override; - virtual int type() const override; + void contextMenuEvent(QGraphicsSceneContextMenuEvent *event) override; + void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; + void hoverMoveEvent(QGraphicsSceneHoverEvent *event) override; + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; + void wheelEvent(QGraphicsSceneWheelEvent *event) override; + int type() const override; bool isInResizeArea(const QPointF &pos); static void duplicateSelectedItems(QGraphicsScene *scene); @@ -92,9 +92,9 @@ class QtBox : public ItemBase public: QtBox(int size, int x, int y); virtual ~QtBox(); - virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; protected: - virtual ItemBase *createNew(int size, int x, int y) override; + ItemBase *createNew(int size, int x, int y) override; private: QVector3D m_vertices[8]; QVector3D m_texCoords[4]; @@ -106,9 +106,9 @@ class CircleItem : public ItemBase { public: CircleItem(int size, int x, int y); - virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; protected: - virtual ItemBase *createNew(int size, int x, int y) override; + ItemBase *createNew(int size, int x, int y) override; QColor m_color; }; @@ -117,9 +117,9 @@ class SquareItem : public ItemBase { public: SquareItem(int size, int x, int y); - virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; protected: - virtual ItemBase *createNew(int size, int x, int y) override; + ItemBase *createNew(int size, int x, int y) override; QPixmap m_image; }; diff --git a/examples/widgets/graphicsview/boxes/scene.h b/examples/widgets/graphicsview/boxes/scene.h index b76fb1057c..3f367a8dce 100644 --- a/examples/widgets/graphicsview/boxes/scene.h +++ b/examples/widgets/graphicsview/boxes/scene.h @@ -87,7 +87,7 @@ public slots: signals: void colorChanged(QRgb color, int id); protected: - virtual void mousePressEvent(QMouseEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; void setColor(QRgb color); // also emits colorChanged() private: QGraphicsScene *m_dialogParentScene; @@ -120,9 +120,9 @@ class GraphicsWidget : public QGraphicsProxyWidget public: GraphicsWidget() : QGraphicsProxyWidget(0, Qt::Window) {} protected: - virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; - virtual void resizeEvent(QGraphicsSceneResizeEvent *event) override; - virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; + QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; + void resizeEvent(QGraphicsSceneResizeEvent *event) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; }; class TwoSidedGraphicsWidget : public QObject @@ -162,7 +162,7 @@ signals: void shaderChanged(int); void doubleClicked(); protected: - virtual void mouseDoubleClickEvent(QMouseEvent *event) override; + void mouseDoubleClickEvent(QMouseEvent *event) override; QVector m_parameterNames; QComboBox *m_textureCombo; @@ -189,7 +189,7 @@ signals: void doubleClicked(); void newItemTriggered(ItemDialog::ItemType type); protected: - virtual void mouseDoubleClickEvent(QMouseEvent *event) override; + void mouseDoubleClickEvent(QMouseEvent *event) override; }; class Scene : public QGraphicsScene @@ -198,7 +198,7 @@ class Scene : public QGraphicsScene public: Scene(int width, int height, int maxTextureSize); ~Scene(); - virtual void drawBackground(QPainter *painter, const QRectF &rect) override; + void drawBackground(QPainter *painter, const QRectF &rect) override; public slots: void setShader(int index); @@ -214,10 +214,10 @@ protected: void defaultStates(); void renderCubemaps(); - virtual void mousePressEvent(QGraphicsSceneMouseEvent *event) override; - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; - virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; - virtual void wheelEvent(QGraphicsSceneWheelEvent * event) override; + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; + void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; + void wheelEvent(QGraphicsSceneWheelEvent * event) override; private: void initGL(); QPointF pixelPosToViewPos(const QPointF& p); diff --git a/examples/widgets/graphicsview/dragdroprobot/main.cpp b/examples/widgets/graphicsview/dragdroprobot/main.cpp index ff3758ac60..20cec92d26 100644 --- a/examples/widgets/graphicsview/dragdroprobot/main.cpp +++ b/examples/widgets/graphicsview/dragdroprobot/main.cpp @@ -63,7 +63,7 @@ public: } protected: - virtual void resizeEvent(QResizeEvent *) override + void resizeEvent(QResizeEvent *) override { } }; diff --git a/examples/widgets/graphicsview/weatheranchorlayout/main.cpp b/examples/widgets/graphicsview/weatheranchorlayout/main.cpp index ec1f73bf9c..81db2780b4 100644 --- a/examples/widgets/graphicsview/weatheranchorlayout/main.cpp +++ b/examples/widgets/graphicsview/weatheranchorlayout/main.cpp @@ -69,7 +69,7 @@ public: { } - virtual void resizeEvent(QResizeEvent *event) override + void resizeEvent(QResizeEvent *event) override { w->setGeometry(0, 0, event->size().width(), event->size().height()); } -- cgit v1.2.3