diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2015-02-27 08:14:49 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@digia.com> | 2015-02-27 09:19:17 +0000 |
| commit | 09e903e0743b3d3d58c31621b368ea317140b0f2 (patch) | |
| tree | bf4570201f919ca54bb3a60c9251837c7c8b673d /src | |
| parent | 99fd66b6612ac384be72563301b4231d4d612b71 (diff) | |
QQuickWindow: rename deliverGestureEvent to deliverNativeGestureEvent
Native gestures are distinct from QGestureEvent, and we might need
another deliver method for those eventually.
Change-Id: I969c9b830d1dc7a91ffbc6cae2bdb68552a58344
Reviewed-by: Andrew Knight <qt@panimo.net>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/quick/items/qquickwindow.cpp | 6 | ||||
| -rw-r--r-- | src/quick/items/qquickwindow_p.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index cb1af51b69..521ff1c4bb 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -1397,7 +1397,7 @@ bool QQuickWindow::event(QEvent *e) break; } case QEvent::NativeGesture: - d->deliverGestureEvent(d->contentItem, static_cast<QNativeGestureEvent*>(e)); + d->deliverNativeGestureEvent(d->contentItem, static_cast<QNativeGestureEvent*>(e)); break; default: break; @@ -1772,7 +1772,7 @@ void QQuickWindow::wheelEvent(QWheelEvent *event) } #endif // QT_NO_WHEELEVENT -bool QQuickWindowPrivate::deliverGestureEvent(QQuickItem *item, QNativeGestureEvent *event) +bool QQuickWindowPrivate::deliverNativeGestureEvent(QQuickItem *item, QNativeGestureEvent *event) { QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item); @@ -1784,7 +1784,7 @@ bool QQuickWindowPrivate::deliverGestureEvent(QQuickItem *item, QNativeGestureEv QQuickItem *child = children.at(ii); if (!child->isVisible() || !child->isEnabled() || QQuickItemPrivate::get(child)->culled) continue; - if (deliverGestureEvent(child, event)) + if (deliverNativeGestureEvent(child, event)) return true; } diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h index 4d5f831e92..c3ae6c054c 100644 --- a/src/quick/items/qquickwindow_p.h +++ b/src/quick/items/qquickwindow_p.h @@ -141,7 +141,7 @@ public: #ifndef QT_NO_WHEELEVENT bool deliverWheelEvent(QQuickItem *, QWheelEvent *); #endif - bool deliverGestureEvent(QQuickItem *, QNativeGestureEvent *); + bool deliverNativeGestureEvent(QQuickItem *, QNativeGestureEvent *); bool deliverTouchPoints(QQuickItem *, QTouchEvent *, const QList<QTouchEvent::TouchPoint> &, QSet<int> *, QHash<QQuickItem *, QList<QTouchEvent::TouchPoint> > *, QSet<QQuickItem*> *filtered); void deliverTouchEvent(QTouchEvent *); |