Skip to content

Commit 91de52e

Browse files
committed
fix warnings
1 parent 2e506fe commit 91de52e

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

Polyhedron/demo/Polyhedron/Scene.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class SCENE_EXPORT Scene :
5555
CGAL::Three::Scene_item* replaceItem(int index, CGAL::Three::Scene_item* item, bool emit_item_about_to_be_destroyed = false) Q_DECL_OVERRIDE;
5656
Q_INVOKABLE int erase(int) Q_DECL_OVERRIDE;
5757

58-
int erase(QList<int>);
58+
int erase(QList<int>) Q_DECL_OVERRIDE;
5959
int duplicate(int index) Q_DECL_OVERRIDE;
6060

6161
// Accessors (getters)

Polyhedron/demo/Polyhedron/Viewer.h

+23-23
Original file line numberDiff line numberDiff line change
@@ -40,35 +40,35 @@ class VIEWER_EXPORT Viewer : public CGAL::Three::Viewer_interface {
4040
void updateIds(CGAL::Three::Scene_item *)Q_DECL_OVERRIDE;
4141
//! overload several QGLViewer virtual functions
4242
//! Draws the scene.
43-
void draw();
43+
void draw()Q_DECL_OVERRIDE;
4444
//!This step happens after draw(). It is here that all the useful information is displayed, like the axis system or the informative text.
45-
void drawVisualHints();
45+
void drawVisualHints()Q_DECL_OVERRIDE;
4646
//! Deprecated. Does the same as draw().
47-
void fastDraw();
48-
bool isExtensionFound();
47+
void fastDraw()Q_DECL_OVERRIDE;
48+
bool isExtensionFound()Q_DECL_OVERRIDE;
4949
//! Initializes the OpenGL functions and sets the backGround color.
50-
void initializeGL();
50+
void initializeGL()Q_DECL_OVERRIDE;
5151
//! Draws the scene "with names" to allow picking.
52-
void drawWithNames();
52+
void drawWithNames()Q_DECL_OVERRIDE;
5353
/*! Uses the parameter pixel's coordinates to get the corresponding point
5454
* in the World frame. If this point is found, emits selectedPoint, selected,
5555
* and selectionRay signals.
5656
*/
57-
void postSelection(const QPoint&);
57+
void postSelection(const QPoint&)Q_DECL_OVERRIDE;
5858
//! Sets the picking matrix to allow the picking.
59-
void beginSelection(const QPoint &point);
59+
void beginSelection(const QPoint &point)Q_DECL_OVERRIDE;
6060
//! Sets the pick matrix to Identity once the picking is done.
61-
void endSelection(const QPoint &point);
61+
void endSelection(const QPoint &point)Q_DECL_OVERRIDE;
6262
//! Sets the scene for the viewer.
63-
void setScene(CGAL::Three::Scene_draw_interface* scene);
63+
void setScene(CGAL::Three::Scene_draw_interface* scene)Q_DECL_OVERRIDE;
6464
//! @returns the antialiasing state.
65-
bool antiAliasing() const;
65+
bool antiAliasing() const Q_DECL_OVERRIDE;
6666
//! @returns the fastDrawing state.
67-
bool inFastDrawing() const;
67+
bool inFastDrawing() const Q_DECL_OVERRIDE;
6868
//! Implementation of `Viewer_interface::inDrawWithNames()`
69-
bool inDrawWithNames() const;
69+
bool inDrawWithNames() const Q_DECL_OVERRIDE;
7070
//! Implementation of `Viewer_interface::attribBuffers()`
71-
void attribBuffers(int program_name) const;
71+
void attribBuffers(int program_name) const Q_DECL_OVERRIDE;
7272
//! Implementation of `Viewer_interface::getShaderProgram()`
7373
QOpenGLShaderProgram* getShaderProgram(int name) const Q_DECL_OVERRIDE;
7474
//!Declares a program names `name`, using `v_shader` as vertex shader and `f_shader` as fragment shader.
@@ -126,22 +126,22 @@ public Q_SLOTS:
126126
}
127127

128128
protected:
129-
void postDraw();
130-
void paintEvent(QPaintEvent *);
131-
void paintGL();
129+
void postDraw()Q_DECL_OVERRIDE;
130+
void paintEvent(QPaintEvent *)Q_DECL_OVERRIDE;
131+
void paintGL()Q_DECL_OVERRIDE;
132132

133133
//!Defines the behaviour for the mouse press events
134-
void mousePressEvent(QMouseEvent*);
135-
void wheelEvent(QWheelEvent *);
134+
void mousePressEvent(QMouseEvent*)Q_DECL_OVERRIDE;
135+
void wheelEvent(QWheelEvent *)Q_DECL_OVERRIDE;
136136
//!Defines the behaviour for the key press events
137-
void keyPressEvent(QKeyEvent*);
137+
void keyPressEvent(QKeyEvent*)Q_DECL_OVERRIDE;
138138
//!Deal with context menu events
139-
void contextMenuEvent(QContextMenuEvent*);
139+
void contextMenuEvent(QContextMenuEvent*)Q_DECL_OVERRIDE;
140140
//!Defines the behaviour for the key release events
141-
void keyReleaseEvent(QKeyEvent *);
141+
void keyReleaseEvent(QKeyEvent *)Q_DECL_OVERRIDE;
142142

143143

144-
void resizeGL(int w, int h);
144+
void resizeGL(int w, int h)Q_DECL_OVERRIDE;
145145

146146
protected:
147147
friend class Viewer_impl;

0 commit comments

Comments
 (0)