summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qeventdispatcher_qpa.cpp
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2010-07-20 12:38:12 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2010-07-21 06:38:10 (GMT)
commitbc786ded04aa316f99cf9ac4cf8b714ee46575b5 (patch)
treed7bfc3959b767428da8e69d683cdf81e1be616ea /src/gui/kernel/qeventdispatcher_qpa.cpp
parenta7182f757e5414d7baf21fdc098f3f6649e6a1d6 (diff)
downloadQt-bc786ded04aa316f99cf9ac4cf8b714ee46575b5.zip
Qt-bc786ded04aa316f99cf9ac4cf8b714ee46575b5.tar.gz
Qt-bc786ded04aa316f99cf9ac4cf8b714ee46575b5.tar.bz2
Made the rest of QWindowSystemInterface callback functions thread safe
and cleaned up the headerfile
Diffstat (limited to 'src/gui/kernel/qeventdispatcher_qpa.cpp')
-rw-r--r--src/gui/kernel/qeventdispatcher_qpa.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/kernel/qeventdispatcher_qpa.cpp b/src/gui/kernel/qeventdispatcher_qpa.cpp
index f7f3db3..4464036 100644
--- a/src/gui/kernel/qeventdispatcher_qpa.cpp
+++ b/src/gui/kernel/qeventdispatcher_qpa.cpp
@@ -191,11 +191,11 @@ bool QEventDispatcherQPA::processEvents(QEventLoop::ProcessEventsFlags flags)
QApplication::sendPostedEvents();
while (!d->interrupt) { // also flushes output buffer ###can be optimized
- QWindowSystemInterface::UserEvent *event;
+ QWindowSystemInterfacePrivate::WindowSystemEvent *event;
if (!(flags & QEventLoop::ExcludeUserInputEvents)
- && QWindowSystemInterfacePrivate::userEventsQueued() > 0) {
+ && QWindowSystemInterfacePrivate::windowSystemEventsQueued() > 0) {
// process a pending user input event
- event = QWindowSystemInterfacePrivate::getUserEvent();
+ event = QWindowSystemInterfacePrivate::getWindowSystemEvent();
if (!event)
break;
} else {
@@ -208,7 +208,7 @@ bool QEventDispatcherQPA::processEvents(QEventLoop::ProcessEventsFlags flags)
}
nevents++;
- QApplicationPrivate::processUserEvent(event);
+ QApplicationPrivate::processWindowSystemEvent(event);
delete event;
}
@@ -222,7 +222,7 @@ bool QEventDispatcherQPA::processEvents(QEventLoop::ProcessEventsFlags flags)
bool QEventDispatcherQPA::hasPendingEvents()
{
extern uint qGlobalPostedEventsCount(); // from qapplication.cpp
- return qGlobalPostedEventsCount() || QWindowSystemInterfacePrivate::userEventsQueued();
+ return qGlobalPostedEventsCount() || QWindowSystemInterfacePrivate::windowSystemEventsQueued();
}
void QEventDispatcherQPA::registerSocketNotifier(QSocketNotifier *notifier)