Make the CoreFoundation event dispatcher depend on QtCore only

In anticipation of moving it to QtCore.

The call to QWindowSystemInterface::sendWindowSystemEvents() has been
moved to QIOSEventDispatcher by making processPostedEvents() virtual.

Change-Id: I9e03be4153a9f5f34e9a0ac942cdff572a44c318
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>

1 files changed, 16 insertions, 14 deletions

diff --git a/src/platformsupport/eventdispatchers/qeventdispatcher_cf_p.h b/src/platformsupport/eventdispatchers/qeventdispatcher_cf_p.h
index 1cd9ae4ebf..2fe5dea3d8 100644
--- a/src/platformsupport/eventdispatchers/qeventdispatcher_cf_p.h
+++ b/src/platformsupport/eventdispatchers/qeventdispatcher_cf_p.h
@@ -101,7 +101,7 @@ template <class T = QEventDispatcherCoreFoundation>
 class RunLoopSource
 {
 public:
-    typedef void (T::*CallbackFunction) ();
+    typedef bool (T::*CallbackFunction)();
 
     enum { kHighestPriority = 0 } RunLoopSourcePriority;
 
@@ -221,18 +221,8 @@ public:
     void interrupt();
     void flush();
 
-private:
-    RunLoopSource<> m_postedEventsRunLoopSource;
-    RunLoopObserver<> m_runLoopActivityObserver;
-
-    RunLoopModeTracker *m_runLoopModeTracker;
-
-    QTimerInfoList m_timerInfoList;
-    CFRunLoopTimerRef m_runLoopTimer;
-    CFRunLoopTimerRef m_blockedRunLoopTimer;
-    bool m_overdueTimerScheduled;
-
-    QCFSocketNotifier m_cfSocketNotifier;
+protected:
+    virtual bool processPostedEvents();
 
     struct ProcessEventsState
     {
@@ -251,7 +241,19 @@ private:
 
     ProcessEventsState m_processEvents;
 
-    void processPostedEvents();
+private:
+    RunLoopSource<> m_postedEventsRunLoopSource;
+    RunLoopObserver<> m_runLoopActivityObserver;
+
+    RunLoopModeTracker *m_runLoopModeTracker;
+
+    QTimerInfoList m_timerInfoList;
+    CFRunLoopTimerRef m_runLoopTimer;
+    CFRunLoopTimerRef m_blockedRunLoopTimer;
+    bool m_overdueTimerScheduled;
+
+    QCFSocketNotifier m_cfSocketNotifier;
+
     void processTimers(CFRunLoopTimerRef);
 
     void handleRunLoopActivity(CFRunLoopActivity activity);