iOS: Implement socket notifiers.

Create the QCFSocketNotifier class in platform support
which contains shared socket notifier support for
the Cocoa and iOS plugins. Remove the old code from
the Cocoa plugin.

The Cocoa code had one QCocoaEventDispatcher-specific
call: maybeCancelWaitForMoreEvents. Create a forwarding
function that is passed to QCFSocketNotifier.

Change-Id: Ibf9bd4745ba4f577a55f13d0cc00f5ae04447405
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/src/plugins/platforms/ios/qioseventdispatcher.mm b/src/plugins/platforms/ios/qioseventdispatcher.mm
index f6f60387d4..e9bf039047 100644
--- a/src/plugins/platforms/ios/qioseventdispatcher.mm
+++ b/src/plugins/platforms/ios/qioseventdispatcher.mm
@@ -155,6 +155,8 @@ QIOSEventDispatcher::QIOSEventDispatcher(QObject *parent)
     , m_interrupted(false)
     , m_runLoopTimerRef(0)
 {
+    m_cfSocketNotifier.setHostEventDispatcher(this);
+
     CFRunLoopRef mainRunLoop = CFRunLoopGetMain();
     CFRunLoopSourceContext context;
     bzero(&context, sizeof(CFRunLoopSourceContext));
@@ -184,6 +186,8 @@ QIOSEventDispatcher::~QIOSEventDispatcher()
     maybeStopCFRunLoopTimer();
     CFRunLoopRemoveSource(CFRunLoopGetMain(), m_blockingTimerRunLoopSource, kCFRunLoopCommonModes);
     CFRelease(m_blockingTimerRunLoopSource);
+
+    m_cfSocketNotifier.removeSocketNotifiers();
 }
 
 bool QIOSEventDispatcher::processEvents(QEventLoop::ProcessEventsFlags flags)
@@ -215,14 +219,12 @@ bool QIOSEventDispatcher::hasPendingEvents()
 
 void QIOSEventDispatcher::registerSocketNotifier(QSocketNotifier *notifier)
 {
-    qDebug() << __FUNCTION__ << "not implemented";
-    Q_UNUSED(notifier);
+    m_cfSocketNotifier.registerSocketNotifier(notifier);
 }
 
 void QIOSEventDispatcher::unregisterSocketNotifier(QSocketNotifier *notifier)
 {
-    qDebug() << __FUNCTION__ << "not implemented";
-    Q_UNUSED(notifier);
+    m_cfSocketNotifier.unregisterSocketNotifier(notifier);
 }
 
 void QIOSEventDispatcher::registerTimer(int timerId, int interval, Qt::TimerType timerType, QObject *obj)