diff options
-rw-r--r-- | qgraphicssystem_dd.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/qgraphicssystem_dd.cpp b/qgraphicssystem_dd.cpp index 50452eb..2285061 100644 --- a/qgraphicssystem_dd.cpp +++ b/qgraphicssystem_dd.cpp @@ -23,7 +23,7 @@ #include "qgraphicssystem_dd.h" -#include <QtGui/private/qapplication_p.h> +#include <QWindowSystemInterface> #include <QtGui/private/qpixmap_raster_p.h> #include <QtGui/qapplication.h> @@ -265,29 +265,25 @@ void QDevDaysGraphicsSystem::eventDispatcher() qDebug() << "SYSTEM: received event" << m_message.type << window; switch (m_message.type) { case Event::GeometryChangeEvent: { - QApplicationPrivate::handleGeometryChange(window, m_message.rect.toRect()); + QWindowSystemInterface::handleGeometryChange(window, m_message.rect.toRect()); break; } case Event::MousePressEvent: { // ### we don't support multiple buttons or any keyboard modifiers QPoint pos = m_message.rect.topLeft().toPoint(); - QMouseEvent me(QEvent::MouseButtonPress, pos, pos + window->pos(), - Qt::LeftButton, Qt::NoButton, Qt::NoModifier); - QApplicationPrivate::handleMouseEvent(window, me); + Qt::MouseButtons b = Qt::LeftButton; + QWindowSystemInterface::handleMouseEvent(window, pos, pos+window->pos(), b); break; } case Event::MouseReleaseEvent: { // ### we don't support multiple buttons or any keyboard modifiers QPoint pos = m_message.rect.topLeft().toPoint(); - QMouseEvent me(QEvent::MouseButtonRelease, pos, pos + window->pos(), - Qt::LeftButton, Qt::NoButton, Qt::NoModifier); - QApplicationPrivate::handleMouseEvent(window, me); + Qt::MouseButtons b = Qt::NoButton; + QWindowSystemInterface::handleMouseEvent(window, pos, pos + window->pos(), b); break; } case Event::KeyPressEvent: { - QKeyEvent ke(QEvent::KeyPress, m_message.value, Qt::NoModifier); - QApplicationPrivate::handleKeyEvent(window, &ke); + QWindowSystemInterface::handleKeyEvent(window, QEvent::KeyPress, m_message.value, Qt::NoModifier); break; } case Event::KeyReleaseEvent: { - QKeyEvent ke(QEvent::KeyRelease, m_message.value, Qt::NoModifier); - QApplicationPrivate::handleKeyEvent(window, &ke); + QWindowSystemInterface::handleKeyEvent(window, QEvent::KeyRelease, m_message.value, Qt::NoModifier); break; } } break; } |