diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2011-09-19 15:05:12 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-19 16:37:51 +0200 |
| commit | a2010048300809f16c4de7f8f8281902098413d8 (patch) | |
| tree | 44261602803bc19014dfbbe51eee8f3467135137 /src/plugins/platforms/cocoa/qmultitouch_mac_p.h | |
| parent | 9d7e365918abd57a6336e59a23f36805a0df560a (diff) | |
Mac: Adapt multitouch code for cocoa to QWindowSystemInterface.
Change-Id: I4a80ed8a497dfb1b8b477e4a40ec91a16f1bb541
Reviewed-on: http://codereview.qt-project.org/5152
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa/qmultitouch_mac_p.h')
| -rw-r--r-- | src/plugins/platforms/cocoa/qmultitouch_mac_p.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/plugins/platforms/cocoa/qmultitouch_mac_p.h b/src/plugins/platforms/cocoa/qmultitouch_mac_p.h index c69c49984a..75967aba26 100644 --- a/src/plugins/platforms/cocoa/qmultitouch_mac_p.h +++ b/src/plugins/platforms/cocoa/qmultitouch_mac_p.h @@ -53,11 +53,9 @@ #ifndef QMULTITOUCH_MAC_P_H #define QMULTITOUCH_MAC_P_H -#ifdef QT_MAC_USE_COCOA #import <Cocoa/Cocoa.h> -#endif -#include <qevent.h> +#include <QtGui/QWindowSystemInterface> #include <qhash.h> #include <QtCore> @@ -65,12 +63,10 @@ QT_BEGIN_NAMESPACE -#ifdef QT_MAC_USE_COCOA - class QCocoaTouch { public: - static QList<QTouchEvent::TouchPoint> getCurrentTouchPointList(NSEvent *event, bool acceptSingleTouch); + static QList<QWindowSystemInterface::TouchPoint> getCurrentTouchPointList(NSEvent *event, bool acceptSingleTouch); static void setMouseInDraggingState(bool inDraggingState); private: @@ -81,7 +77,7 @@ class QCocoaTouch static int _touchCount; static bool _updateInternalStateOnly; - QTouchEvent::TouchPoint _touchPoint; + QWindowSystemInterface::TouchPoint _touchPoint; qint64 _identity; QCocoaTouch(NSTouch *nstouch); @@ -92,8 +88,6 @@ class QCocoaTouch static Qt::TouchPointState toTouchPointState(NSTouchPhase nsState); }; -#endif // QT_MAC_USE_COCOA - QT_END_NAMESPACE #endif // MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 |