OSDN Git Service

remove unused and internal QNativeGestureEvent
authorIvailo Monev <xakepa10@gmail.com>
Wed, 2 Dec 2020 17:48:32 +0000 (17:48 +0000)
committerIvailo Monev <xakepa10@gmail.com>
Wed, 2 Dec 2020 17:48:32 +0000 (17:48 +0000)
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
src/core/kernel/qcoreevent.cpp
src/core/kernel/qcoreevent.h
src/gui/kernel/qapplication.cpp
src/gui/kernel/qevent.cpp
src/gui/kernel/qevent_p.h

index fb766e4..18f34c0 100644 (file)
@@ -227,7 +227,6 @@ QT_BEGIN_NAMESPACE
     \omitvalue ThreadChange
     \omitvalue NetworkReplyUpdated
     \omitvalue FutureCallOut
-    \omitvalue NativeGesture
 */
 
 /*!
index 6fc32bf..f3a1237 100644 (file)
@@ -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
index 0d24242..5c3b587 100644 (file)
@@ -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<QWidget *>(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:
     {
index 6b2a848..e506ca4 100644 (file)
@@ -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<const QChildEvent*>(e))->child() << ')';
         break;
-#  ifndef QT_NO_GESTURES
-    case QEvent::NativeGesture: {
-        const QNativeGestureEvent *ne = static_cast<const QNativeGestureEvent *>(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<const QContextMenuEvent *>(e)->pos() << ')';
         break;
index c6b29d5..574071f 100644 (file)
@@ -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
 {