Skip to content

Commit

Permalink
fix -Winconsistent-missing-override
Browse files Browse the repository at this point in the history
  • Loading branch information
wwmayer committed Feb 28, 2019
1 parent f9d30cd commit 2ccffbe
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
1 change: 1 addition & 0 deletions src/App/Application.cpp
Expand Up @@ -1211,6 +1211,7 @@ void printBacktrace(size_t skip=0)
void segmentation_fault_handler(int sig)
{
#if defined(FC_OS_LINUX)
(void)sig;
std::cerr << "Program received signal SIGSEGV, Segmentation fault.\n";
printBacktrace(2);
exit(1);
Expand Down
6 changes: 3 additions & 3 deletions src/Mod/TechDraw/Gui/QGICMark.h
Expand Up @@ -35,8 +35,8 @@ class TechDrawGuiExport QGICMark : public QGIVertex
~QGICMark() {}

enum {Type = QGraphicsItem::UserType + 171};
int type() const { return Type;}
virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 );
int type() const override { return Type;}
virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 ) override;

virtual QRectF boundingRect() const override;
virtual QPainterPath shape() const override;
Expand All @@ -48,7 +48,7 @@ class TechDrawGuiExport QGICMark : public QGIVertex
void setSize(float s);
float getThick() { return m_width; }
void setThick(float t);
virtual void setPrettyNormal();
virtual void setPrettyNormal() override;

double getMarkFuzz(void) const;

Expand Down
4 changes: 2 additions & 2 deletions src/Mod/TechDraw/Gui/QGIVertex.h
Expand Up @@ -35,8 +35,8 @@ class TechDrawGuiExport QGIVertex : public QGIPrimPath
~QGIVertex() {}

enum {Type = QGraphicsItem::UserType + 105};
int type() const { return Type;}
virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 );
int type() const override { return Type;}
virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 ) override;

int getProjIndex() const { return projIndex; }

Expand Down
12 changes: 6 additions & 6 deletions src/Mod/TechDraw/Gui/QGVPage.h
Expand Up @@ -61,7 +61,7 @@ class TechDrawGuiExport QGVPage : public QGraphicsView
virtual ~QGVPage();

void setRenderer(RendererType type = Native);
void drawBackground(QPainter *p, const QRectF &rect);
void drawBackground(QPainter *p, const QRectF &rect) override;

QGIView * addViewDimension(TechDraw::DrawViewDimension *dim);
QGIView * addProjectionGroup(TechDraw::DrawProjGroup *view);
Expand Down Expand Up @@ -108,11 +108,11 @@ public Q_SLOTS:
void setHighQualityAntialiasing(bool highQualityAntialiasing);

protected:
void wheelEvent(QWheelEvent *event);
void paintEvent(QPaintEvent *event);
void enterEvent(QEvent *event);
void mousePressEvent(QMouseEvent *event);
void mouseReleaseEvent(QMouseEvent *event);
void wheelEvent(QWheelEvent *event) override;
void paintEvent(QPaintEvent *event) override;
void enterEvent(QEvent *event) override;
void mousePressEvent(QMouseEvent *event) override;
void mouseReleaseEvent(QMouseEvent *event) override;
void keyPressEvent(QKeyEvent *event) override;
void kbPanScroll(int xMove = 1, int yMove = 1);

Expand Down

0 comments on commit 2ccffbe

Please sign in to comment.