AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make QCocoaEventDispatcher inherit from QAbstractEventDispatcher

Browse Source 
... instead of QEventDispatcherUNIX. The Cocoa dispatcher does not use
any of the facilities of the UNIX dispatcher, and it reimplements every
virtual method already (with the exception of flush(), which just needs
an empty implementation).

Change-Id: I24aefd169888946afac7800192a0f96770787718
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
This commit is contained in:
Bradley T. Hughes 2012-01-02 09:23:49 +01:00 committed by Qt by Nokia
parent 9ea608cb54
commit 7a597e6c43
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/platforms/cocoa/qcocoaeventdispatcher.h
View File

@ -87,10 +87,11 @@
// We mean it.
//
#include <QtCore/qabstracteventdispatcher.h>
#include <QtCore/qhash.h>
#include <QtCore/qstack.h>
#include <QtGui/qwindowdefs.h>
#include <QtCore/private/qeventdispatcher_unix_p.h>
#include <QtCore/private/qabstracteventdispatcher_p.h>
#include <CoreFoundation/CoreFoundation.h>
@ -104,7 +105,7 @@ typedef struct _QCocoaModalSessionInfo {
} QCocoaModalSessionInfo;
class QCocoaEventDispatcherPrivate;
class QCocoaEventDispatcher : public QEventDispatcherUNIX
class QCocoaEventDispatcher : public QAbstractEventDispatcher
{
Q_OBJECT
Q_DECLARE_PRIVATE(QCocoaEventDispatcher)
@ -128,6 +129,7 @@ public:
void wakeUp();
void interrupt();
void flush();
private:
//friend void qt_mac_select_timer_callbk(__EventLoopTimer*, void*);
@ -157,7 +159,7 @@ struct MacSocketInfo {
};
typedef QHash<int, MacSocketInfo *> MacSocketHash;
class QCocoaEventDispatcherPrivate : public QEventDispatcherUNIXPrivate
class QCocoaEventDispatcherPrivate : public QAbstractEventDispatcherPrivate
{
Q_DECLARE_PUBLIC(QCocoaEventDispatcher)

5
src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm
View File

@ -904,7 +904,7 @@ QCocoaEventDispatcherPrivate::QCocoaEventDispatcherPrivate()
}
QCocoaEventDispatcher::QCocoaEventDispatcher(QObject *parent)
: QEventDispatcherUNIX(*new QCocoaEventDispatcherPrivate, parent)
: QAbstractEventDispatcher(*new QCocoaEventDispatcherPrivate, parent)
{
Q_D(QCocoaEventDispatcher);
CFRunLoopSourceContext context;
@ -1051,6 +1051,9 @@ void QCocoaEventDispatcher::interrupt()
d->cancelWaitForMoreEvents();
}
void QCocoaEventDispatcher::flush()
{ }
QCocoaEventDispatcher::~QCocoaEventDispatcher()
{
Q_D(QCocoaEventDispatcher);