From dfd72c6e6c5aab58bd56c8f7854e94df2230bd8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Lind?= Date: Wed, 27 Jul 2011 16:54:53 +0200 Subject: Make QPlatformIntegration not have a factory for eventdispatcher MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit but rather an accessor for the guiThreadEventDispatcher Change-Id: I1b9ba14efc9f338c5a67e3e24ddb0caf76c07413 Reviewed-on: http://codereview.qt.nokia.com/2321 Reviewed-by: Qt Sanity Bot Reviewed-by: Samuel Rødal --- src/plugins/platforms/openwfd/qopenwfddevice.cpp | 4 ++-- src/plugins/platforms/openwfd/qopenwfdintegration.cpp | 8 ++++---- src/plugins/platforms/openwfd/qopenwfdintegration.h | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) (limited to 'src/plugins/platforms/openwfd') diff --git a/src/plugins/platforms/openwfd/qopenwfddevice.cpp b/src/plugins/platforms/openwfd/qopenwfddevice.cpp index fb63468725..d3ff6d45d8 100644 --- a/src/plugins/platforms/openwfd/qopenwfddevice.cpp +++ b/src/plugins/platforms/openwfd/qopenwfddevice.cpp @@ -83,8 +83,8 @@ QOpenWFDDevice::QOpenWFDDevice(QOpenWFDIntegration *integration, WFDint device_e } } - int copyFd = wfdDeviceEventGetFD(mDevice,mEvent); - mEventSocketNotifier = new QSocketNotifier(copyFd,QSocketNotifier::Read,this); + int fd = wfdDeviceEventGetFD(mDevice,mEvent); + mEventSocketNotifier = new QSocketNotifier(fd,QSocketNotifier::Read,this); connect(mEventSocketNotifier,SIGNAL(activated(int)),SLOT(readEvents())); mCommitedDevice = true; diff --git a/src/plugins/platforms/openwfd/qopenwfdintegration.cpp b/src/plugins/platforms/openwfd/qopenwfdintegration.cpp index 2494e7f030..63d7b6a31f 100644 --- a/src/plugins/platforms/openwfd/qopenwfdintegration.cpp +++ b/src/plugins/platforms/openwfd/qopenwfdintegration.cpp @@ -63,8 +63,9 @@ QOpenWFDIntegration::QOpenWFDIntegration() : QPlatformIntegration() , mPrinterSupport(new QGenericUnixPrinterSupport) + , mEventDispatcher(createUnixEventDispatcher()) { - QGuiApplicationPrivate::instance()->setEventDispatcher(createEventDispatcher()); + QGuiApplicationPrivate::instance()->setEventDispatcher(mEventDispatcher); int numberOfDevices = wfdEnumerateDevices(0,0,0); WFDint devices[numberOfDevices]; @@ -118,10 +119,9 @@ QPlatformBackingStore *QOpenWFDIntegration::createPlatformBackingStore(QWindow * return new QOpenWFDBackingStore(window); } -QAbstractEventDispatcher *QOpenWFDIntegration::createEventDispatcher() const +QAbstractEventDispatcher *QOpenWFDIntegration::guiThreadEventDispatcher() const { - QAbstractEventDispatcher *eventDispatcher = createUnixEventDispatcher(); - return eventDispatcher; + return mEventDispatcher; } QPlatformFontDatabase *QOpenWFDIntegration::fontDatabase() const diff --git a/src/plugins/platforms/openwfd/qopenwfdintegration.h b/src/plugins/platforms/openwfd/qopenwfdintegration.h index 9b7b5329dc..18d87fd90e 100644 --- a/src/plugins/platforms/openwfd/qopenwfdintegration.h +++ b/src/plugins/platforms/openwfd/qopenwfdintegration.h @@ -62,7 +62,7 @@ public: QPlatformGLContext *createPlatformGLContext(QGuiGLContext *context) const; //This should not be a factory interface, but rather a accessor - QAbstractEventDispatcher *createEventDispatcher() const; + QAbstractEventDispatcher *guiThreadEventDispatcher() const; QPlatformFontDatabase *fontDatabase() const; @@ -78,6 +78,7 @@ private: QPlatformFontDatabase *mFontDatabase; QPlatformNativeInterface *mNativeInterface; QPlatformPrinterSupport *mPrinterSupport; + QAbstractEventDispatcher *mEventDispatcher; }; QT_END_NAMESPACE -- cgit v1.2.3