QEventDispatcherQPA is now a small "leaf" class,
there is no need to inherit from it or make it
inherit another event dispatcher.
-QEventDispatcherQPAPrivate::QEventDispatcherQPAPrivate()
-{
-
-}
-
-QEventDispatcherQPAPrivate::~QEventDispatcherQPAPrivate()
-{
-
-}
QEventDispatcherQPA::QEventDispatcherQPA(QObject *parent)
QEventDispatcherQPA::QEventDispatcherQPA(QObject *parent)
- : EVENTDISPATCHERBASE(*new QEventDispatcherQPAPrivate, parent)
+ : QEventDispatcherUNIX(parent)
-QEventDispatcherQPA::QEventDispatcherQPA(EVENTDISPATCHERBASEPRIVATE &priv, QObject *parent)
- : EVENTDISPATCHERBASE(priv, parent)
-{ }
-
-
QEventDispatcherQPA::~QEventDispatcherQPA()
{ }
QEventDispatcherQPA::~QEventDispatcherQPA()
{ }
bool didSendEvents = QWindowSystemInterface::sendWindowSystemEvents(this, flags);
bool didSendEvents = QWindowSystemInterface::sendWindowSystemEvents(this, flags);
- if (EVENTDISPATCHERBASE::processEvents(flags)) {
- EVENTDISPATCHERBASE::processEvents(flags);
+ if (QEventDispatcherUNIX::processEvents(flags)) {
+ QEventDispatcherUNIX::processEvents(flags);
//
#include <QtCore/qglobal.h>
//
#include <QtCore/qglobal.h>
-#if defined(Q_OS_UNIX)
-#include "private/qeventdispatcher_unix_p.h"
-#define EVENTDISPATCHERBASE QEventDispatcherUNIX
-#define EVENTDISPATCHERBASEPRIVATE QEventDispatcherUNIXPrivate
-#elif defined(Q_OS_WIN)
-#include "private/qeventdispatcher_win_p.h"
-#define EVENTDISPATCHERBASE QEventDispatcherWin32
-#define EVENTDISPATCHERBASEPRIVATE QEventDispatcherWin32Private
-#endif
+#include <QtCore/private/qeventdispatcher_unix_p.h>
QT_BEGIN_NAMESPACE
class QEventDispatcherQPAPrivate;
QT_BEGIN_NAMESPACE
class QEventDispatcherQPAPrivate;
-class Q_GUI_EXPORT QEventDispatcherQPA : public EVENTDISPATCHERBASE
+class Q_GUI_EXPORT QEventDispatcherQPA : public QEventDispatcherUNIX
{
Q_OBJECT
Q_DECLARE_PRIVATE(QEventDispatcherQPA)
public:
explicit QEventDispatcherQPA(QObject *parent = 0);
{
Q_OBJECT
Q_DECLARE_PRIVATE(QEventDispatcherQPA)
public:
explicit QEventDispatcherQPA(QObject *parent = 0);
- QEventDispatcherQPA(EVENTDISPATCHERBASEPRIVATE &priv, QObject *parent);
~QEventDispatcherQPA();
bool processEvents(QEventLoop::ProcessEventsFlags flags);
~QEventDispatcherQPA();
bool processEvents(QEventLoop::ProcessEventsFlags flags);
-class Q_GUI_EXPORT QEventDispatcherQPAPrivate : public EVENTDISPATCHERBASEPRIVATE
-{
- Q_DECLARE_PUBLIC(QEventDispatcherQPA)
-public:
- QEventDispatcherQPAPrivate();
- ~QEventDispatcherQPAPrivate();
-};
-
QT_END_NAMESPACE
#endif // QEVENTDISPATCHER_QPA_H
QT_END_NAMESPACE
#endif // QEVENTDISPATCHER_QPA_H