From a80a2c6da241dac77f533bc702a1c7d94349a812 Mon Sep 17 00:00:00 2001
From: Kevin Krammer <kevin.krammer.qnx@kdab.com>
Date: Wed, 28 Mar 2012 13:20:40 +0200
Subject: Move screen event processing into its own class

The event handler class can then be reused when we have proper
BPS event support available from corelib

Change-Id: Iafe645e69248597377045c711108ce0acbe3984b
Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
---
 src/plugins/platforms/qnx/qqnxeventthread.h | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

(limited to 'src/plugins/platforms/qnx/qqnxeventthread.h')

diff --git a/src/plugins/platforms/qnx/qqnxeventthread.h b/src/plugins/platforms/qnx/qqnxeventthread.h
index 61831233e9..9724587c37 100644
--- a/src/plugins/platforms/qnx/qqnxeventthread.h
+++ b/src/plugins/platforms/qnx/qqnxeventthread.h
@@ -44,9 +44,6 @@
 
 #include <QtCore/QThread>
 
-#include <QtGui/QPlatformScreen>
-#include <QtGui/QWindowSystemInterface>
-
 #include <screen/screen.h>
 
 QT_BEGIN_NAMESPACE
@@ -54,7 +51,7 @@ QT_BEGIN_NAMESPACE
 class QQnxEventThread : public QThread
 {
 public:
-    QQnxEventThread(screen_context_t context, QPlatformScreen& screen);
+    explicit QQnxEventThread(screen_context_t context);
     virtual ~QQnxEventThread();
 
     static void injectKeyboardEvent(int flags, int sym, int mod, int scan, int cap);
@@ -63,26 +60,10 @@ protected:
     virtual void run();
 
 private:
-    enum {
-        MaximumTouchPoints = 10
-    };
-
     void shutdown();
-    void dispatchEvent(screen_event_t event);
-    void handleKeyboardEvent(screen_event_t event);
-    void handlePointerEvent(screen_event_t event);
-    void handleTouchEvent(screen_event_t event, int type);
-    void handleCloseEvent(screen_event_t event);
 
     screen_context_t m_screenContext;
-    QPlatformScreen& m_platformScreen;
     bool m_quit;
-    QPoint m_lastGlobalMousePoint;
-    QPoint m_lastLocalMousePoint;
-    Qt::MouseButtons m_lastButtonState;
-    screen_window_t m_lastMouseWindow;
-    QTouchDevice *m_touchDevice;
-    QWindowSystemInterface::TouchPoint m_touchPoints[MaximumTouchPoints];
 };
 
 QT_END_NAMESPACE
-- 
cgit v1.2.3


From 68ecbffb303490beef2ebfa7d8cdb66a7ca73469 Mon Sep 17 00:00:00 2001
From: Rafael Roquetto <rafael.roquetto.qnx@kdab.com>
Date: Mon, 26 Mar 2012 15:26:24 +0200
Subject: Remove the virtual keyword from reimpl. methods

Qt Coding Standards state that "when reimplementing a virtual method, do not
put the virtual keyword in the header file'".

Change-Id: I89ae34eee78ad5b58a3e41845384a656225ed658
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
---
 src/plugins/platforms/qnx/qqnxeventthread.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/plugins/platforms/qnx/qqnxeventthread.h')

diff --git a/src/plugins/platforms/qnx/qqnxeventthread.h b/src/plugins/platforms/qnx/qqnxeventthread.h
index 9724587c37..0bb26c3c06 100644
--- a/src/plugins/platforms/qnx/qqnxeventthread.h
+++ b/src/plugins/platforms/qnx/qqnxeventthread.h
@@ -57,7 +57,7 @@ public:
     static void injectKeyboardEvent(int flags, int sym, int mod, int scan, int cap);
 
 protected:
-    virtual void run();
+    void run();
 
 private:
     void shutdown();
-- 
cgit v1.2.3