From 64c0702890e7a1866f16caa4c2e0d8c64f4f82d3 Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 28 Aug 2019 16:25:39 +0200 Subject: [PATCH] Fix warnings: fix -Winconsistent-missing-override fix -Wself-assign --- src/Mod/TechDraw/Gui/QGIFace.h | 8 ++++---- src/Mod/TechDraw/Gui/QGITile.cpp | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Mod/TechDraw/Gui/QGIFace.h b/src/Mod/TechDraw/Gui/QGIFace.h index 92c13c4568..5e3635a892 100644 --- a/src/Mod/TechDraw/Gui/QGIFace.h +++ b/src/Mod/TechDraw/Gui/QGIFace.h @@ -55,10 +55,10 @@ public: ~QGIFace(); enum {Type = QGraphicsItem::UserType + 104}; - int type() const { return Type;} - QRectF boundingRect() const; - QPainterPath shape() const; - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 ); + int type() const override { return Type;} + QRectF boundingRect() const override; + QPainterPath shape() const override; + virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 ) override; public: enum fillMode { diff --git a/src/Mod/TechDraw/Gui/QGITile.cpp b/src/Mod/TechDraw/Gui/QGITile.cpp index 08727d00f9..a51dbf6cab 100644 --- a/src/Mod/TechDraw/Gui/QGITile.cpp +++ b/src/Mod/TechDraw/Gui/QGITile.cpp @@ -229,7 +229,6 @@ void QGITile::makeText(void) m_qgTextC->setPlainText(m_textC); m_qgTextC->setColor(m_colCurrent); double textHeightC = m_qgTextC->boundingRect().height(); - textHeightC = textHeightC; if (m_row < 0) { // below line vOffset = m_high * (1 + verticalFudge); } else {