From 8acfd5bce7292535ffa049731ca0df21780951f4 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sun, 26 Jun 2022 15:51:43 +0200 Subject: [PATCH] TD: minor fixes: * remove superfluous semi-colons * if a method is declared override then the keyword virtual should be dropped --- src/Mod/TechDraw/Gui/QGIView.h | 12 ++++++------ src/Mod/TechDraw/Gui/QGVPage.h | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Mod/TechDraw/Gui/QGIView.h b/src/Mod/TechDraw/Gui/QGIView.h index 71610e9def..cf52f19cde 100644 --- a/src/Mod/TechDraw/Gui/QGIView.h +++ b/src/Mod/TechDraw/Gui/QGIView.h @@ -146,9 +146,9 @@ public: virtual void addArbitraryItem(QGraphicsItem* qgi); // Mouse handling - virtual void mousePressEvent(QGraphicsSceneMouseEvent *event) override; - virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; boost::signals2::signal signalSelectPoint; @@ -158,10 +158,10 @@ public Q_SLOTS: protected: QGIView* getQGIVByName(std::string name); - virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; + QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; // Preselection events: - virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; - virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; + void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; + void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; virtual QRectF customChildrenBoundingRect(void) const; void dumpRect(const char* text, QRectF r); diff --git a/src/Mod/TechDraw/Gui/QGVPage.h b/src/Mod/TechDraw/Gui/QGVPage.h index 65cd5ff90f..c295cfb56f 100644 --- a/src/Mod/TechDraw/Gui/QGVPage.h +++ b/src/Mod/TechDraw/Gui/QGVPage.h @@ -81,13 +81,13 @@ public: virtual ~QGVPage(); /// Observer message from the ParameterGrp - virtual void OnChange(ParameterGrp::SubjectType &rCaller,ParameterGrp::MessageType Reason) override; + void OnChange(ParameterGrp::SubjectType &rCaller,ParameterGrp::MessageType Reason) override; void setRenderer(RendererType type = Native); void drawBackground(QPainter *p, const QRectF &rect) override; - QGSPage* getScene() {return m_scene; }; + QGSPage* getScene() {return m_scene; } void startBalloonPlacing(void); void cancelBalloonPlacing(void); @@ -104,15 +104,15 @@ public: void showGrid(bool state) {m_showGrid = state;} void updateViewport(void) {viewport()->repaint();} - bool isBalloonPlacing() {return balloonPlacing; }; - void setBalloonPlacing(bool s) {balloonPlacing = s;}; + bool isBalloonPlacing() {return balloonPlacing; } + void setBalloonPlacing(bool s) {balloonPlacing = s;} - QLabel* getBalloonCursor() {return balloonCursor;}; - void setBalloonCursor(QLabel* l) {balloonCursor = l;}; + QLabel* getBalloonCursor() {return balloonCursor;} + void setBalloonCursor(QLabel* l) {balloonCursor = l;} void kbPanScroll(int xMove = 1, int yMove = 1); - QPointF getBalloonCursorPos() {return balloonCursorPos;}; - void setBalloonCursorPos(QPoint p) { balloonCursorPos = p;}; + QPointF getBalloonCursorPos() {return balloonCursorPos;} + void setBalloonCursorPos(QPoint p) { balloonCursorPos = p;} public Q_SLOTS: void setHighQualityAntialiasing(bool highQualityAntialiasing); @@ -128,7 +128,7 @@ protected: void focusOutEvent(QFocusEvent *event) override; void keyPressEvent(QKeyEvent *event) override; void keyReleaseEvent(QKeyEvent *event) override; - virtual void contextMenuEvent(QContextMenuEvent *event) override; + void contextMenuEvent(QContextMenuEvent *event) override; static QColor SelectColor; static QColor PreselectColor; @@ -139,7 +139,7 @@ protected: void activateCursor(QCursor cursor); void resetCursor(); - virtual void drawForeground(QPainter *painter, const QRectF &rect) override; + void drawForeground(QPainter *painter, const QRectF &rect) override; std::string getNavStyleParameter(); Base::Type getStyleType(std::string model);