Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Kubrick
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Games
Kubrick
Commits
83410714
Commit
83410714
authored
Jun 02, 2017
by
Andrius Štikonas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Q_DECL_OVERRIDE -> override.
parent
627259ef
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
src/gameglview.h
src/gameglview.h
+5
-5
src/kubrick.h
src/kubrick.h
+2
-2
No files found.
src/gameglview.h
View file @
83410714
...
...
@@ -72,12 +72,12 @@ protected:
*
* This method is called automatically by Qt once.
*/
void
initializeGL
()
Q_DECL_OVERRIDE
;
void
initializeGL
()
override
;
/**
* Called by Qt when the size of the GL view changes.
**/
void
resizeGL
(
int
w
,
int
h
)
Q_DECL_OVERRIDE
;
void
resizeGL
(
int
w
,
int
h
)
override
;
/**
* This method actually renders the scene. It is called automatically by Qt
...
...
@@ -86,15 +86,15 @@ protected:
*
* Do not call this method directly!
**/
void
paintGL
()
Q_DECL_OVERRIDE
;
void
paintGL
()
override
;
/**
* Handle mouse events. In these implementations, game->handleMouseEvent
* is called with event type, button, X co-ordinate and Y co-ordinate in
* OpenGL convention (zero at bottom of window).
**/
void
mousePressEvent
(
QMouseEvent
*
e
)
Q_DECL_OVERRIDE
;
void
mouseReleaseEvent
(
QMouseEvent
*
e
)
Q_DECL_OVERRIDE
;
void
mousePressEvent
(
QMouseEvent
*
e
)
override
;
void
mouseReleaseEvent
(
QMouseEvent
*
e
)
override
;
/**
* Check for an OpenGL error. Dump any error to stdout
...
...
src/kubrick.h
View file @
83410714
...
...
@@ -81,7 +81,7 @@ protected:
* been saved. This is as with a real Rubik Cube, which stays how it is
* when you stop playing with it.
*/
bool
queryClose
()
Q_DECL_OVERRIDE
;
bool
queryClose
()
override
;
protected
slots
:
void
optionsConfigureKeys
();
...
...
@@ -96,7 +96,7 @@ protected slots:
void
patternSelected
();
void
movesSelected
();
void
saveNewToolbarConfig
()
Q_DECL_OVERRIDE
;
void
saveNewToolbarConfig
()
override
;
private:
Game
*
game
;
// The game object.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment