AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

eglfs: mark overriden methods with Q_DECL_OVERRIDE

Browse Source 
The current cursor implementation can be a bit hard to read
without hints about which methods are overriden.

Change-Id: I3376890a13be46e1ece03d1442dd5a15ccd61382
Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Girish Ramakrishnan 2012-06-11 08:04:41 -07:00 committed by Qt by Nokia
parent 58d1b8253e
commit 4b7a4c40d8
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp
View File

@ -201,7 +201,7 @@ public:
eglMakeCurrent(m_screen->display(), EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
}
void changeCursor(QCursor *cursor, QWindow *window) {
void changeCursor(QCursor *cursor, QWindow *window) Q_DECL_OVERRIDE {
if (!setCurrentCursor(cursor))
return;
@ -214,18 +214,19 @@ public:
drawInLayer();
}
void setPos(const QPoint &pos) {
void setPos(const QPoint &pos) Q_DECL_OVERRIDE {
m_pos = pos;
moveDispmanxLayer(m_window, cursorRect().topLeft());
}
void pointerEvent(const QMouseEvent &event) {
void pointerEvent(const QMouseEvent &event) Q_DECL_OVERRIDE {
if (event.type() != QEvent::MouseMove)
return;
m_pos = event.pos();
moveDispmanxLayer(m_window, cursorRect().topLeft());
}
void paintOnScreen() { }
void paintOnScreen() Q_DECL_OVERRIDE { }
private:
EGLConfig m_config;
EGLContext m_context;

8
src/plugins/platforms/eglfs/qeglfscursor.h
View File

@ -57,11 +57,11 @@ public:
QEglFSCursor(QEglFSScreen *screen);
~QEglFSCursor();
void changeCursor(QCursor *cursor, QWindow *widget);
void pointerEvent(const QMouseEvent &event);
void changeCursor(QCursor *cursor, QWindow *widget) Q_DECL_OVERRIDE;
void pointerEvent(const QMouseEvent &event) Q_DECL_OVERRIDE;
QPoint pos() const;
void setPos(const QPoint &pos);
QPoint pos() const Q_DECL_OVERRIDE;
void setPos(const QPoint &pos) Q_DECL_OVERRIDE;
QRect cursorRect() const;