kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

fix -Winconsistent-missing-override

Browse Source
This commit is contained in:
wmayer
2019-02-28 22:55:46 +01:00
parent f9d30cdc7c
commit 2ccffbe406
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/App/Application.cpp
View File

@@ -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);

6
src/Mod/TechDraw/Gui/QGICMark.h
View File

@@ -35,8 +35,8 @@ public:
~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;
@@ -48,7 +48,7 @@ public:
void setSize(float s);
float getThick() { return m_width; }
void setThick(float t);
virtual void setPrettyNormal();
virtual void setPrettyNormal() override;
double getMarkFuzz(void) const;

4
src/Mod/TechDraw/Gui/QGIVertex.h
View File

@@ -35,8 +35,8 @@ public:
~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; }

12
src/Mod/TechDraw/Gui/QGVPage.h
View File

@@ -61,7 +61,7 @@ public:
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);
@@ -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);