diff options
author | Robin Burchell <robin.burchell@collabora.com> | 2011-12-10 17:24:14 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-15 21:04:27 +0100 |
commit | 81d55783bb7649dd6fe71c01a18b64911fcea837 (patch) | |
tree | 9d353eb2c1957ebc2521fe18d1348a1e332b9c5b /src/platformsupport | |
parent | ec9ea7f3e819cb0c2da8c8977f9cc44688c9b6f6 (diff) |
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>
Diffstat (limited to 'src/platformsupport')
-rw-r--r-- | src/platformsupport/eventdispatchers/eventdispatchers.pri | 4 | ||||
-rw-r--r-- | src/platformsupport/eventdispatchers/qgenericunixeventdispatcher.cpp | 4 | ||||
-rw-r--r-- | src/platformsupport/eventdispatchers/qunixeventdispatcher_qpa.cpp (renamed from src/platformsupport/eventdispatchers/qeventdispatcher_qpa.cpp) | 12 | ||||
-rw-r--r-- | src/platformsupport/eventdispatchers/qunixeventdispatcher_qpa_p.h (renamed from src/platformsupport/eventdispatchers/qeventdispatcher_qpa_p.h) | 16 |
4 files changed, 18 insertions, 18 deletions
diff --git a/src/platformsupport/eventdispatchers/eventdispatchers.pri b/src/platformsupport/eventdispatchers/eventdispatchers.pri index 38aca26b42..9e6ff282ce 100644 --- a/src/platformsupport/eventdispatchers/eventdispatchers.pri +++ b/src/platformsupport/eventdispatchers/eventdispatchers.pri @@ -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\ } diff --git a/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher.cpp b/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher.cpp index ba783c547a..4f8784b068 100644 --- a/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher.cpp +++ b/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher.cpp @@ -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 diff --git a/src/platformsupport/eventdispatchers/qeventdispatcher_qpa.cpp b/src/platformsupport/eventdispatchers/qunixeventdispatcher_qpa.cpp index 8ccb181365..018d843b8b 100644 --- a/src/platformsupport/eventdispatchers/qeventdispatcher_qpa.cpp +++ b/src/platformsupport/eventdispatchers/qunixeventdispatcher_qpa.cpp @@ -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(); diff --git a/src/platformsupport/eventdispatchers/qeventdispatcher_qpa_p.h b/src/platformsupport/eventdispatchers/qunixeventdispatcher_qpa_p.h index 7aeb795742..f6f8364be3 100644 --- a/src/platformsupport/eventdispatchers/qeventdispatcher_qpa_p.h +++ b/src/platformsupport/eventdispatchers/qunixeventdispatcher_qpa_p.h @@ -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 |