eglfs: mark overriden methods with Q_DECL_OVERRIDE
authorGirish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Mon, 11 Jun 2012 15:04:41 +0000 (08:04 -0700)
committerQt by Nokia <qt-info@nokia.com>
Wed, 13 Jun 2012 21:59:17 +0000 (23:59 +0200)
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>
mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp
src/plugins/platforms/eglfs/qeglfscursor.h

index eb3357d..62efa73 100644 (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;
index 464b52e..4a3ba89 100644 (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;