summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qwidget.cpp
diff options
context:
space:
mode:
authorDenis Dzyubenko <denis.dzyubenko@nokia.com>2009-08-03 13:04:43 (GMT)
committerDenis Dzyubenko <denis.dzyubenko@nokia.com>2009-08-04 14:22:43 (GMT)
commitfbee62af06ebe2c8cf6da1cc18a665c69c64eff7 (patch)
tree19557818b61c744a0513bf11f1f7ef8d465f62d6 /src/gui/kernel/qwidget.cpp
parent627c5c865d77cca1f0d6508f8facfe6c0bf4d363 (diff)
downloadQt-fbee62af06ebe2c8cf6da1cc18a665c69c64eff7.zip
Qt-fbee62af06ebe2c8cf6da1cc18a665c69c64eff7.tar.gz
Qt-fbee62af06ebe2c8cf6da1cc18a665c69c64eff7.tar.bz2
Renamed internal WinGesture event to NativeGesture.
It will also be used on Mac, so it doesn't make sense to keep it windows specific. Reviewed-by: trustme
Diffstat (limited to 'src/gui/kernel/qwidget.cpp')
-rw-r--r--src/gui/kernel/qwidget.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 43ac37d..5400146 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -7941,8 +7941,8 @@ bool QWidget::event(QEvent *event)
break;
}
#ifdef Q_WS_WIN
- case QEvent::WinGesture: {
- QWinGestureEvent *ev = static_cast<QWinGestureEvent*>(event);
+ case QEvent::NativeGesture: {
+ QNativeGestureEvent *ev = static_cast<QNativeGestureEvent*>(event);
QApplicationPrivate *qAppPriv = qApp->d_func();
QApplicationPrivate::WidgetStandardGesturesMap::iterator it;
it = qAppPriv->widgetGestures.find(this);
@@ -7950,15 +7950,15 @@ bool QWidget::event(QEvent *event)
Qt::GestureState state = Qt::GestureUpdated;
if (qAppPriv->lastGestureId == 0)
state = Qt::GestureStarted;
- QWinGestureEvent::Type type = ev->gestureType;
- if (ev->gestureType == QWinGestureEvent::GestureEnd) {
- type = (QWinGestureEvent::Type)qAppPriv->lastGestureId;
+ QNativeGestureEvent::Type type = ev->gestureType;
+ if (ev->gestureType == QNativeGestureEvent::GestureEnd) {
+ type = (QNativeGestureEvent::Type)qAppPriv->lastGestureId;
state = Qt::GestureFinished;
}
QGesture *gesture = 0;
switch (type) {
- case QWinGestureEvent::Pan: {
+ case QNativeGestureEvent::Pan: {
QPanGesture *pan = it.value().pan;
gesture = pan;
if (state == Qt::GestureStarted) {
@@ -7970,7 +7970,7 @@ bool QWidget::event(QEvent *event)
gesture->setPos(ev->position);
break;
}
- case QWinGestureEvent::Pinch:
+ case QNativeGestureEvent::Pinch:
break;
default:
break;
@@ -7984,7 +7984,7 @@ bool QWidget::event(QEvent *event)
emit gesture->finished();
event->accept();
}
- if (ev->gestureType == QWinGestureEvent::GestureEnd) {
+ if (ev->gestureType == QNativeGestureEvent::GestureEnd) {
qAppPriv->lastGestureId = 0;
} else {
qAppPriv->lastGestureId = type;