Rename QEventDispatcherQPA to QUnixEventDispatcherQPA.
This removes confusion when we add a Linux-specific QPA dispatcher, and is technically more accurate, as QEDQPA was not 'the' QPA event dispatcher in the first place. Change-Id: I2a41d425f284522ee76ef86782d5eb2bdd805120 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>bb10
parent
ec9ea7f3e8
commit
81d55783bb
|
|
@ -1,10 +1,10 @@
|
|||
unix {
|
||||
SOURCES +=\
|
||||
$$PWD/qeventdispatcher_qpa.cpp\
|
||||
$$PWD/qunixeventdispatcher_qpa.cpp\
|
||||
$$PWD/qgenericunixeventdispatcher.cpp\
|
||||
|
||||
HEADERS +=\
|
||||
$$PWD/qeventdispatcher_qpa_p.h\
|
||||
$$PWD/qunixeventdispatcher_qpa_p.h\
|
||||
$$PWD/qgenericunixeventdispatcher_p.h\
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
****************************************************************************/
|
||||
|
||||
#include "qgenericunixeventdispatcher_p.h"
|
||||
#include "qeventdispatcher_qpa_p.h"
|
||||
#include "qunixeventdispatcher_qpa_p.h"
|
||||
#include "qeventdispatcher_glib_p.h"
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
|
@ -52,7 +52,7 @@ class QAbstractEventDispatcher *createUnixEventDispatcher()
|
|||
return new QPAEventDispatcherGlib();
|
||||
else
|
||||
#endif
|
||||
return new QEventDispatcherQPA();
|
||||
return new QUnixEventDispatcherQPA();
|
||||
}
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
|
||||
#include "qplatformdefs.h"
|
||||
#include "qcoreapplication.h"
|
||||
#include "qeventdispatcher_qpa_p.h"
|
||||
#include "qunixeventdispatcher_qpa_p.h"
|
||||
#include "private/qguiapplication_p.h"
|
||||
|
||||
#include <QWindowSystemInterface>
|
||||
|
|
@ -58,14 +58,14 @@ QT_BEGIN_NAMESPACE
|
|||
QT_USE_NAMESPACE
|
||||
|
||||
|
||||
QEventDispatcherQPA::QEventDispatcherQPA(QObject *parent)
|
||||
QUnixEventDispatcherQPA::QUnixEventDispatcherQPA(QObject *parent)
|
||||
: QEventDispatcherUNIX(parent)
|
||||
{ }
|
||||
|
||||
QEventDispatcherQPA::~QEventDispatcherQPA()
|
||||
QUnixEventDispatcherQPA::~QUnixEventDispatcherQPA()
|
||||
{ }
|
||||
|
||||
bool QEventDispatcherQPA::processEvents(QEventLoop::ProcessEventsFlags flags)
|
||||
bool QUnixEventDispatcherQPA::processEvents(QEventLoop::ProcessEventsFlags flags)
|
||||
{
|
||||
bool didSendEvents = QWindowSystemInterface::sendWindowSystemEvents(this, flags);
|
||||
|
||||
|
|
@ -76,13 +76,13 @@ bool QEventDispatcherQPA::processEvents(QEventLoop::ProcessEventsFlags flags)
|
|||
return didSendEvents;
|
||||
}
|
||||
|
||||
bool QEventDispatcherQPA::hasPendingEvents()
|
||||
bool QUnixEventDispatcherQPA::hasPendingEvents()
|
||||
{
|
||||
extern uint qGlobalPostedEventsCount(); // from qapplication.cpp
|
||||
return qGlobalPostedEventsCount() || QWindowSystemInterface::windowSystemEventsQueued();
|
||||
}
|
||||
|
||||
void QEventDispatcherQPA::flush()
|
||||
void QUnixEventDispatcherQPA::flush()
|
||||
{
|
||||
if(qApp)
|
||||
qApp->sendPostedEvents();
|
||||
|
|
@ -39,8 +39,8 @@
|
|||
**
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef QEVENTDISPATCHER_QPA_H
|
||||
#define QEVENTDISPATCHER_QPA_H
|
||||
#ifndef QUNIXEVENTDISPATCHER_QPA_H
|
||||
#define QUNIXEVENTDISPATCHER_QPA_H
|
||||
|
||||
//
|
||||
// W A R N I N G
|
||||
|
|
@ -58,16 +58,16 @@
|
|||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
class QEventDispatcherQPAPrivate;
|
||||
class QUnixEventDispatcherQPAPrivate;
|
||||
|
||||
class Q_PLATFORMSUPPORT_EXPORT QEventDispatcherQPA : public QEventDispatcherUNIX
|
||||
class Q_PLATFORMSUPPORT_EXPORT QUnixEventDispatcherQPA : public QEventDispatcherUNIX
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_DECLARE_PRIVATE(QEventDispatcherQPA)
|
||||
Q_DECLARE_PRIVATE(QUnixEventDispatcherQPA)
|
||||
|
||||
public:
|
||||
explicit QEventDispatcherQPA(QObject *parent = 0);
|
||||
~QEventDispatcherQPA();
|
||||
explicit QUnixEventDispatcherQPA(QObject *parent = 0);
|
||||
~QUnixEventDispatcherQPA();
|
||||
|
||||
bool processEvents(QEventLoop::ProcessEventsFlags flags);
|
||||
bool hasPendingEvents();
|
||||
|
|
@ -77,4 +77,4 @@ public:
|
|||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#endif // QEVENTDISPATCHER_QPA_H
|
||||
#endif // QUNIXEVENTDISPATCHER_QPA_H
|
||||
Loading…
Reference in New Issue