diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-01-24 22:26:31 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-31 16:17:55 +0100 |
| commit | 3855233dab82946ba50ddd90ce86df035998da8e (patch) | |
| tree | 908cdc84626a17dde6450810f97859502dcddab3 /src/gui/kernel/qevent.h | |
| parent | 9a4d30d9995a806ca7c69692992383b28c655054 (diff) | |
Remove many deprecated methods
Remove methods that have been marked as deprecated
before Qt 4.6. Keep others, but inline them
where possible and mark them as QT_DEPRECATED_SINCE(5, 0).
Change-Id: If881821ae095f054b31cc13464f19e2007c20ed7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Diffstat (limited to 'src/gui/kernel/qevent.h')
| -rw-r--r-- | src/gui/kernel/qevent.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h index 7a3eb48235..93dea41de9 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/kernel/qevent.h @@ -764,10 +764,12 @@ public: friend class QApplicationPrivate; }; +#if QT_DEPRECATED_SINCE(5, 0) QT_DEPRECATED enum DeviceType { TouchScreen, TouchPad }; +#endif QTouchEvent(QEvent::Type eventType, QTouchDevice *device = 0, @@ -778,7 +780,9 @@ public: inline QWindow *window() const { return _window; } inline QObject *target() const { return _target; } +#if QT_DEPRECATED_SINCE(5, 0) QT_DEPRECATED inline QTouchEvent::DeviceType deviceType() const { return static_cast<DeviceType>(int(_device->type())); } +#endif inline Qt::TouchPointStates touchPointStates() const { return _touchPointStates; } inline const QList<QTouchEvent::TouchPoint> &touchPoints() const { return _touchPoints; } inline QTouchDevice *device() const { return _device; } |