From b181deffd7d6038c8488b98b345e1ffabe7e39fb Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 2 Dec 2020 17:48:32 +0000 Subject: [PATCH] remove unused and internal QNativeGestureEvent Signed-off-by: Ivailo Monev --- src/core/kernel/qcoreevent.cpp | 1 - src/core/kernel/qcoreevent.h | 13 +++++-------- src/gui/kernel/qapplication.cpp | 13 ------------- src/gui/kernel/qevent.cpp | 10 ---------- src/gui/kernel/qevent_p.h | 27 --------------------------- 5 files changed, 5 insertions(+), 59 deletions(-) diff --git a/src/core/kernel/qcoreevent.cpp b/src/core/kernel/qcoreevent.cpp index fb766e401..18f34c068 100644 --- a/src/core/kernel/qcoreevent.cpp +++ b/src/core/kernel/qcoreevent.cpp @@ -227,7 +227,6 @@ QT_BEGIN_NAMESPACE \omitvalue ThreadChange \omitvalue NetworkReplyUpdated \omitvalue FutureCallOut - \omitvalue NativeGesture */ /*! diff --git a/src/core/kernel/qcoreevent.h b/src/core/kernel/qcoreevent.h index 6fc32bf0a..f3a12370f 100644 --- a/src/core/kernel/qcoreevent.h +++ b/src/core/kernel/qcoreevent.h @@ -205,16 +205,13 @@ public: TouchUpdate = 124, TouchEnd = 125, -#ifndef QT_NO_GESTURES - NativeGesture = 126, // Internal for platform gesture support -#endif - RequestSoftwareInputPanel = 127, - CloseSoftwareInputPanel = 128, + RequestSoftwareInputPanel = 126, + CloseSoftwareInputPanel = 127, - WinIdChange = 129, + WinIdChange = 128, #ifndef QT_NO_GESTURES - Gesture = 130, - GestureOverride = 131, + Gesture = 129, + GestureOverride = 130, #endif User = 1000, // first user event id diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index 0d24242e6..5c3b5877b 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -3615,19 +3615,6 @@ bool QApplication::notify(QObject *receiver, QEvent *e) } #ifndef QT_NO_GESTURES - case QEvent::NativeGesture: - { - // only propagate the first gesture event (after the GID_BEGIN) - QWidget *w = static_cast(receiver); - while (w) { - e->ignore(); - res = d->notify_helper(w, e); - if ((res && e->isAccepted()) || w->isWindow()) - break; - w = w->parentWidget(); - } - break; - } case QEvent::Gesture: case QEvent::GestureOverride: { diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index 6b2a84868..e506ca4d1 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -2096,8 +2096,6 @@ static const char *eventClassName(QEvent::Type t) case QEvent::Close: return "QCloseEvent"; #ifndef QT_NO_GESTURES - case QEvent::NativeGesture: - return "QNativeGestureEvent"; case QEvent::Gesture: case QEvent::GestureOverride: return "QGestureEvent"; @@ -2311,14 +2309,6 @@ QDebug operator<<(QDebug dbg, const QEvent *e) { case QEvent::ChildRemoved: dbg << "QChildEvent(" << eventTypeName(type) << ", " << (static_cast(e))->child() << ')'; break; -# ifndef QT_NO_GESTURES - case QEvent::NativeGesture: { - const QNativeGestureEvent *ne = static_cast(e); - dbg << "QNativeGestureEvent(type=" << ne->type() << ", percentage=" << ne->percentage - << "position=" << ne->position << ", angle=" << ne->angle << ')'; - } - break; -# endif // !QT_NO_GESTURES case QEvent::ContextMenu: dbg << "QContextMenuEvent(" << static_cast(e)->pos() << ')'; break; diff --git a/src/gui/kernel/qevent_p.h b/src/gui/kernel/qevent_p.h index c6b29d5be..574071fa9 100644 --- a/src/gui/kernel/qevent_p.h +++ b/src/gui/kernel/qevent_p.h @@ -80,33 +80,6 @@ public: qreal pressure; }; -#ifndef QT_NO_GESTURES -class QNativeGestureEvent : public QEvent -{ -public: - enum Type { - None, - GestureBegin, - GestureEnd, - Pan, - Zoom, - Rotate, - Swipe - }; - - QNativeGestureEvent() - : QEvent(QEvent::NativeGesture), gestureType(None), percentage(0) - { - } - - Type gestureType; - float percentage; - QPoint position; - float angle; -}; -#endif // QT_NO_GESTURES - - #ifndef QT_NO_CLIPBOARD class Q_GUI_EXPORT QClipboardEvent : public QEvent { -- 2.11.0