diff options
Diffstat (limited to 'src/gui/kernel/qevent.h')
| -rw-r--r-- | src/gui/kernel/qevent.h | 448 |
1 files changed, 200 insertions, 248 deletions
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h index 190959cb16..a24f0c471c 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/kernel/qevent.h @@ -1,71 +1,44 @@ -/**************************************************************************** -** -** Copyright (C) 2020 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2020 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QEVENT_H #define QEVENT_H +#if 0 +#pragma qt_class(QtEvents) +#endif + #include <QtGui/qtguiglobal.h> #include <QtCore/qcoreevent.h> #include <QtCore/qiodevice.h> #include <QtCore/qlist.h> #include <QtCore/qnamespace.h> -#include <QtCore/qpointer.h> #include <QtCore/qstring.h> #include <QtCore/qurl.h> #include <QtCore/qvariant.h> +#include <QtGui/qeventpoint.h> #include <QtGui/qpointingdevice.h> #include <QtGui/qregion.h> -#include <QtGui/qvector2d.h> #include <QtGui/qwindowdefs.h> #if QT_CONFIG(shortcut) # include <QtGui/qkeysequence.h> #endif +class tst_QEvent; + QT_BEGIN_NAMESPACE class QFile; class QAction; class QMouseEvent; +template <typename T> class QPointer; class QPointerEvent; class QScreen; +#if QT_CONFIG(shortcut) +class QShortcut; +#endif class QTabletEvent; class QTouchEvent; #if QT_CONFIG(gestures) @@ -74,139 +47,43 @@ class QGesture; class Q_GUI_EXPORT QInputEvent : public QEvent { + Q_DECL_EVENT_COMMON(QInputEvent) public: explicit QInputEvent(Type type, const QInputDevice *m_dev, Qt::KeyboardModifiers modifiers = Qt::NoModifier); - ~QInputEvent(); + const QInputDevice *device() const { return m_dev; } QInputDevice::DeviceType deviceType() const { return m_dev ? m_dev->type() : QInputDevice::DeviceType::Unknown; } inline Qt::KeyboardModifiers modifiers() const { return m_modState; } inline void setModifiers(Qt::KeyboardModifiers modifiers) { m_modState = modifiers; } - inline ulong timestamp() const { return m_timeStamp; } - virtual void setTimestamp(ulong timestamp) { m_timeStamp = timestamp; } + inline quint64 timestamp() const { return m_timeStamp; } + virtual void setTimestamp(quint64 timestamp) { m_timeStamp = timestamp; } protected: - QInputEvent(Type type, PointerEventTag, const QInputDevice *m_dev, Qt::KeyboardModifiers modifiers = Qt::NoModifier); + QInputEvent(Type type, PointerEventTag, const QInputDevice *dev, Qt::KeyboardModifiers modifiers = Qt::NoModifier); + QInputEvent(Type type, SinglePointEventTag, const QInputDevice *dev, Qt::KeyboardModifiers modifiers = Qt::NoModifier); const QInputDevice *m_dev = nullptr; + quint64 m_timeStamp = 0; Qt::KeyboardModifiers m_modState = Qt::NoModifier; - ulong m_timeStamp = 0; - qint64 m_extra = 0; // reserved, unused for now -}; - -struct QEventPointPrivate; -class Q_GUI_EXPORT QEventPoint -{ - Q_GADGET - Q_PROPERTY(const QPointingDevice *device READ device) - Q_PROPERTY(int id READ id) - Q_PROPERTY(QPointingDeviceUniqueId uniqueId READ uniqueId) - Q_PROPERTY(State state READ state) - Q_PROPERTY(ulong timestamp READ timestamp) - Q_PROPERTY(qreal timeHeld READ timeHeld) - Q_PROPERTY(qreal pressure READ pressure) - Q_PROPERTY(qreal rotation READ rotation) - Q_PROPERTY(QSizeF ellipseDiameters READ ellipseDiameters) - Q_PROPERTY(QVector2D velocity READ velocity) - Q_PROPERTY(QPointF position READ position) - Q_PROPERTY(QPointF scenePosition READ scenePosition) - Q_PROPERTY(QPointF globalPosition READ globalPosition) -public: - enum State : quint8 { - Unknown = Qt::TouchPointUnknownState, - Stationary = Qt::TouchPointStationary, - Pressed = Qt::TouchPointPressed, - Updated = Qt::TouchPointMoved, - Released = Qt::TouchPointReleased - }; - Q_DECLARE_FLAGS(States, State) - Q_FLAG(States) - - QEventPoint(int id = -1, const QPointingDevice *device = nullptr); - QEventPoint(int pointId, State state, const QPointF &scenePosition, const QPointF &globalPosition); - QEventPoint(const QEventPoint &other); - QEventPoint &operator=(const QEventPoint &other); - ~QEventPoint(); - - QPointF position() const; - QPointF pressPosition() const; - QPointF grabPosition() const; - QPointF lastPosition() const; - QPointF scenePosition() const; - QPointF scenePressPosition() const; - QPointF sceneGrabPosition() const; - QPointF sceneLastPosition() const; - QPointF globalPosition() const; - QPointF globalPressPosition() const; - QPointF globalGrabPosition() const; - QPointF globalLastPosition() const; - -#if QT_DEPRECATED_SINCE(6, 0) - // QEventPoint replaces QTouchEvent::TouchPoint, so we need all its old accessors, for now - QT_DEPRECATED_VERSION_X_6_0("Use position()") - QPointF pos() const { return position(); } - QT_DEPRECATED_VERSION_X_6_0("Use pressPosition()") - QPointF startPos() const { return pressPosition(); } - QT_DEPRECATED_VERSION_X_6_0("Use scenePosition()") - QPointF scenePos() const { return scenePosition(); } - QT_DEPRECATED_VERSION_X_6_0("Use scenePressPosition()") - QPointF startScenePos() const { return scenePressPosition(); } - QT_DEPRECATED_VERSION_X_6_0("Use globalPosition()") - QPointF screenPos() const { return globalPosition(); } - QT_DEPRECATED_VERSION_X_6_0("Use globalPressPosition()") - QPointF startScreenPos() const { return globalPressPosition(); } - QT_DEPRECATED_VERSION_X_6_0("Use globalPressPosition()") - QPointF startNormalizedPos() const; - QT_DEPRECATED_VERSION_X_6_0("Use globalPosition()") - QPointF normalizedPos() const; - QT_DEPRECATED_VERSION_X_6_0("Use lastPosition()") - QPointF lastPos() const { return lastPosition(); } - QT_DEPRECATED_VERSION_X_6_0("Use sceneLastPosition()") - QPointF lastScenePos() const { return sceneLastPosition(); } - QT_DEPRECATED_VERSION_X_6_0("Use globalLastPosition()") - QPointF lastScreenPos() const { return globalLastPosition(); } - QT_DEPRECATED_VERSION_X_6_0("Use globalLastPosition()") - QPointF lastNormalizedPos() const; -#endif // QT_DEPRECATED_SINCE(6, 0) - QVector2D velocity() const; - State state() const; - const QPointingDevice *device() const; - int id() const; - QPointingDeviceUniqueId uniqueId() const; - ulong timestamp() const; - ulong lastTimestamp() const; - ulong pressTimestamp() const; - qreal timeHeld() const; - qreal pressure() const; - qreal rotation() const; - QSizeF ellipseDiameters() const; - - bool isAccepted() const; - void setAccepted(bool accepted = true); - -private: - QEventPointPrivate *d; - friend class QMutableEventPoint; - friend class QPointerEvent; + // fill up to the closest 8-byte aligned size: 48 + quint32 m_reserved = 0; }; -#ifndef QT_NO_DEBUG_STREAM -Q_GUI_EXPORT QDebug operator<<(QDebug, const QEventPoint *); -Q_GUI_EXPORT QDebug operator<<(QDebug, const QEventPoint &); -#endif - class Q_GUI_EXPORT QPointerEvent : public QInputEvent { + Q_GADGET + Q_DECL_EVENT_COMMON(QPointerEvent) public: explicit QPointerEvent(Type type, const QPointingDevice *dev, Qt::KeyboardModifiers modifiers = Qt::NoModifier, const QList<QEventPoint> &points = {}); - virtual ~QPointerEvent(); + const QPointingDevice *pointingDevice() const; QPointingDevice::PointerType pointerType() const { return pointingDevice() ? pointingDevice()->pointerType() : QPointingDevice::PointerType::Unknown; } - void setTimestamp(ulong timestamp) override; - qsizetype pointCount() const { return m_points.count(); } - QEventPoint &point(qsizetype i) { return m_points[i]; } + void setTimestamp(quint64 timestamp) override; + qsizetype pointCount() const { return m_points.size(); } + QEventPoint &point(qsizetype i); const QList<QEventPoint> &points() const { return m_points; } QEventPoint *pointById(int id); bool allPointsGrabbed() const; @@ -214,6 +91,7 @@ public: virtual bool isUpdateEvent() const { return false; } virtual bool isEndEvent() const { return false; } bool allPointsAccepted() const; + virtual void setAccepted(bool accepted) override; QObject *exclusiveGrabber(const QEventPoint &point) const; void setExclusiveGrabber(const QEventPoint &point, QObject *exclusiveGrabber); QList<QPointer <QObject>> passiveGrabbers(const QEventPoint &point) const; @@ -222,17 +100,19 @@ public: bool removePassiveGrabber(const QEventPoint &point, QObject *grabber); protected: + QPointerEvent(Type type, SinglePointEventTag, const QInputDevice *dev, Qt::KeyboardModifiers modifiers = Qt::NoModifier); + QList<QEventPoint> m_points; }; class Q_GUI_EXPORT QSinglePointEvent : public QPointerEvent { -public: - QSinglePointEvent(Type type, const QPointingDevice *dev, const QPointF &localPos, - const QPointF &scenePos, const QPointF &globalPos, - Qt::MouseButton button = Qt::NoButton, Qt::MouseButtons buttons = Qt::NoButton, - Qt::KeyboardModifiers modifiers = Qt::NoModifier); + Q_GADGET + Q_PROPERTY(QObject *exclusivePointGrabber READ exclusivePointGrabber + WRITE setExclusivePointGrabber) + Q_DECL_EVENT_COMMON(QSinglePointEvent) +public: inline Qt::MouseButton button() const { return m_button; } inline Qt::MouseButtons buttons() const { return m_mouseState; } @@ -247,24 +127,46 @@ public: bool isUpdateEvent() const override; bool isEndEvent() const override; + QObject *exclusivePointGrabber() const + { return QPointerEvent::exclusiveGrabber(points().first()); } + void setExclusivePointGrabber(QObject *exclusiveGrabber) + { QPointerEvent::setExclusiveGrabber(points().first(), exclusiveGrabber); } + protected: + friend class ::tst_QEvent; QSinglePointEvent(Type type, const QPointingDevice *dev, const QEventPoint &point, Qt::MouseButton button, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Qt::MouseEventSource source); + QSinglePointEvent(Type type, const QPointingDevice *dev, const QPointF &localPos, + const QPointF &scenePos, const QPointF &globalPos, + Qt::MouseButton button, Qt::MouseButtons buttons, + Qt::KeyboardModifiers modifiers, + Qt::MouseEventSource source = Qt::MouseEventNotSynthesized); Qt::MouseButton m_button = Qt::NoButton; Qt::MouseButtons m_mouseState = Qt::NoButton; - quint32 m_source : 8; // actually Qt::MouseEventSource - quint32 m_doubleClick : 1; - quint32 m_reserved : 7; // subclasses dovetail their flags, so we don't reserve all 32 bits here + Qt::MouseEventSource m_source; + /* + Fill up to the next 8-byte aligned size: 88 + We have 32bits left, use some for QSinglePointEvent subclasses so that + we don't end up with gaps. + */ + // split this in two quint16; with a quint32, MSVC would 32-bit align it + quint16 m_reserved; + quint16 m_reserved2 : 11; + // for QMouseEvent + quint16 m_doubleClick : 1; + // for QWheelEvent + quint16 m_phase : 3; + quint16 m_invertedScrolling : 1; }; class Q_GUI_EXPORT QEnterEvent : public QSinglePointEvent { + Q_DECL_EVENT_COMMON(QEnterEvent) public: QEnterEvent(const QPointF &localPos, const QPointF &scenePos, const QPointF &globalPos, const QPointingDevice *device = QPointingDevice::primaryPointingDevice()); - ~QEnterEvent(); #if QT_DEPRECATED_SINCE(6, 0) #ifndef QT_NO_INTEGER_EVENT_COORDINATES @@ -292,10 +194,14 @@ public: class Q_GUI_EXPORT QMouseEvent : public QSinglePointEvent { + Q_DECL_EVENT_COMMON(QMouseEvent) public: +#if QT_DEPRECATED_SINCE(6, 4) + QT_DEPRECATED_VERSION_X_6_4("Use another constructor") QMouseEvent(Type type, const QPointF &localPos, Qt::MouseButton button, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, const QPointingDevice *device = QPointingDevice::primaryPointingDevice()); +#endif QMouseEvent(Type type, const QPointF &localPos, const QPointF &globalPos, Qt::MouseButton button, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, @@ -308,7 +214,6 @@ public: Qt::MouseButton button, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Qt::MouseEventSource source, const QPointingDevice *device = QPointingDevice::primaryPointingDevice()); - ~QMouseEvent(); #ifndef QT_NO_INTEGER_EVENT_COORDINATES inline QPoint pos() const { return position().toPoint(); } @@ -332,18 +237,24 @@ public: QPointF windowPos() const { return scenePosition(); } QT_DEPRECATED_VERSION_X_6_0("Use globalPosition()") QPointF screenPos() const { return globalPosition(); } +#endif // QT_DEPRECATED_SINCE(6, 0) Qt::MouseEventSource source() const; Qt::MouseEventFlags flags() const; -#endif // QT_DEPRECATED_SINCE(6, 0) }; class Q_GUI_EXPORT QHoverEvent : public QSinglePointEvent { + Q_DECL_EVENT_COMMON(QHoverEvent) public: + QHoverEvent(Type type, const QPointF &scenePos, const QPointF &globalPos, const QPointF &oldPos, + Qt::KeyboardModifiers modifiers = Qt::NoModifier, + const QPointingDevice *device = QPointingDevice::primaryPointingDevice()); +#if QT_DEPRECATED_SINCE(6, 3) + QT_DEPRECATED_VERSION_X_6_3("Use the other constructor") QHoverEvent(Type type, const QPointF &pos, const QPointF &oldPos, Qt::KeyboardModifiers modifiers = Qt::NoModifier, const QPointingDevice *device = QPointingDevice::primaryPointingDevice()); - ~QHoverEvent(); +#endif #if QT_DEPRECATED_SINCE(6, 0) #ifndef QT_NO_INTEGER_EVENT_COORDINATES @@ -362,7 +273,6 @@ public: inline QPointF oldPosF() const { return m_oldPos; } protected: - quint32 m_reserved : 16; QPointF m_oldPos; // TODO remove? }; @@ -375,6 +285,8 @@ class Q_GUI_EXPORT QWheelEvent : public QSinglePointEvent Q_PROPERTY(QPoint angleDelta READ angleDelta) Q_PROPERTY(Qt::ScrollPhase phase READ phase) Q_PROPERTY(bool inverted READ inverted) + + Q_DECL_EVENT_COMMON(QWheelEvent) public: enum { DefaultDeltasPerStep = 120 }; @@ -382,7 +294,6 @@ public: Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Qt::ScrollPhase phase, bool inverted, Qt::MouseEventSource source = Qt::MouseEventNotSynthesized, const QPointingDevice *device = QPointingDevice::primaryPointingDevice()); - ~QWheelEvent(); inline QPoint pixelDelta() const { return m_pixelDelta; } inline QPoint angleDelta() const { return m_angleDelta; } @@ -398,9 +309,6 @@ public: Qt::MouseEventSource source() const { return Qt::MouseEventSource(m_source); } protected: - quint32 m_phase : 3; - quint32 m_invertedScrolling : 1; - quint32 m_reserved : 12; QPoint m_pixelDelta; QPoint m_angleDelta; }; @@ -409,14 +317,14 @@ protected: #if QT_CONFIG(tabletevent) class Q_GUI_EXPORT QTabletEvent : public QSinglePointEvent { + Q_DECL_EVENT_COMMON(QTabletEvent) public: QTabletEvent(Type t, const QPointingDevice *device, const QPointF &pos, const QPointF &globalPos, - qreal pressure, int xTilt, int yTilt, - qreal tangentialPressure, qreal rotation, int z, + qreal pressure, float xTilt, float yTilt, + float tangentialPressure, qreal rotation, float z, Qt::KeyboardModifiers keyState, Qt::MouseButton button, Qt::MouseButtons buttons); - ~QTabletEvent(); #if QT_DEPRECATED_SINCE(6, 0) QT_DEPRECATED_VERSION_X_6_0("Use position()") @@ -445,27 +353,43 @@ public: #endif inline qreal pressure() const { Q_ASSERT(!points().isEmpty()); return points().first().pressure(); } inline qreal rotation() const { Q_ASSERT(!points().isEmpty()); return points().first().rotation(); } - inline int z() const { return m_z; } + inline qreal z() const { return m_z; } inline qreal tangentialPressure() const { return m_tangential; } - inline int xTilt() const { return m_xTilt; } - inline int yTilt() const { return m_yTilt; } + inline qreal xTilt() const { return m_xTilt; } + inline qreal yTilt() const { return m_yTilt; } protected: - quint32 m_reserved : 16; - int m_xTilt, m_yTilt, m_z; - qreal m_tangential; + float m_tangential; + float m_xTilt; + float m_yTilt; + float m_z; }; #endif // QT_CONFIG(tabletevent) #if QT_CONFIG(gestures) class Q_GUI_EXPORT QNativeGestureEvent : public QSinglePointEvent { + Q_DECL_EVENT_COMMON(QNativeGestureEvent) public: +#if QT_DEPRECATED_SINCE(6, 2) + QT_DEPRECATED_VERSION_X_6_2("Use the other constructor") QNativeGestureEvent(Qt::NativeGestureType type, const QPointingDevice *dev, const QPointF &localPos, const QPointF &scenePos, - const QPointF &globalPos, qreal value, ulong sequenceId, quint64 intArgument); - ~QNativeGestureEvent(); - Qt::NativeGestureType gestureType() const { return Qt::NativeGestureType(m_gestureType); } + const QPointF &globalPos, qreal value, quint64 sequenceId, quint64 intArgument); +#endif + QNativeGestureEvent(Qt::NativeGestureType type, const QPointingDevice *dev, int fingerCount, + const QPointF &localPos, const QPointF &scenePos, const QPointF &globalPos, + qreal value, const QPointF &delta, quint64 sequenceId = UINT64_MAX); + + Qt::NativeGestureType gestureType() const { return m_gestureType; } + int fingerCount() const { return m_fingerCount; } qreal value() const { return m_realValue; } + QPointF delta() const { +#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) + return m_delta.toPointF(); +#else + return m_delta; +#endif + } #if QT_DEPRECATED_SINCE(6, 0) #ifndef QT_NO_INTEGER_EVENT_COORDINATES @@ -483,24 +407,29 @@ public: #endif protected: - quint32 m_gestureType : 4; - quint32 m_reserved : 12; + quint64 m_sequenceId; +#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) + QVector2D m_delta; +#else + QPointF m_delta; +#endif qreal m_realValue; - ulong m_sequenceId; - quint64 m_intValue; + Qt::NativeGestureType m_gestureType; + quint32 m_fingerCount : 4; + quint32 m_reserved : 28; }; #endif // QT_CONFIG(gestures) class Q_GUI_EXPORT QKeyEvent : public QInputEvent { + Q_DECL_EVENT_COMMON(QKeyEvent) public: QKeyEvent(Type type, int key, Qt::KeyboardModifiers modifiers, const QString& text = QString(), - bool autorep = false, ushort count = 1); + bool autorep = false, quint16 count = 1); QKeyEvent(Type type, int key, Qt::KeyboardModifiers modifiers, quint32 nativeScanCode, quint32 nativeVirtualKey, quint32 nativeModifiers, - const QString &text = QString(), bool autorep = false, ushort count = 1, + const QString &text = QString(), bool autorep = false, quint16 count = 1, const QInputDevice *device = QInputDevice::primaryKeyboard()); - ~QKeyEvent(); int key() const { return m_key; } #if QT_CONFIG(shortcut) @@ -517,25 +446,31 @@ public: inline quint32 nativeScanCode() const { return m_scanCode; } inline quint32 nativeVirtualKey() const { return m_virtualKey; } - inline quint32 nativeModifiers() const { return m_modifiers; } + inline quint32 nativeModifiers() const { return m_nativeModifiers; } + +#if QT_CONFIG(shortcut) + friend inline bool operator==(QKeyEvent *e, QKeySequence::StandardKey key) + { return (e ? e->matches(key) : false); } + friend inline bool operator==(QKeySequence::StandardKey key, QKeyEvent *e) + { return (e ? e->matches(key) : false); } +#endif // QT_CONFIG(shortcut) protected: QString m_text; int m_key; quint32 m_scanCode; quint32 m_virtualKey; - quint32 m_modifiers; - ushort m_count; - ushort m_autoRepeat:1; - // ushort reserved:15; + quint32 m_nativeModifiers; + quint16 m_count : 15; + quint16 m_autoRepeat : 1; }; class Q_GUI_EXPORT QFocusEvent : public QEvent { + Q_DECL_EVENT_COMMON(QFocusEvent) public: explicit QFocusEvent(Type type, Qt::FocusReason reason=Qt::OtherFocusReason); - ~QFocusEvent(); inline bool gotFocus() const { return type() == FocusIn; } inline bool lostFocus() const { return type() == FocusOut; } @@ -549,10 +484,10 @@ private: class Q_GUI_EXPORT QPaintEvent : public QEvent { + Q_DECL_EVENT_COMMON(QPaintEvent) public: explicit QPaintEvent(const QRegion& paintRegion); explicit QPaintEvent(const QRect &paintRect); - ~QPaintEvent(); inline const QRect &rect() const { return m_rect; } inline const QRegion ®ion() const { return m_region; } @@ -565,9 +500,9 @@ protected: class Q_GUI_EXPORT QMoveEvent : public QEvent { + Q_DECL_EVENT_COMMON(QMoveEvent) public: QMoveEvent(const QPoint &pos, const QPoint &oldPos); - ~QMoveEvent(); inline const QPoint &pos() const { return m_pos; } inline const QPoint &oldPos() const { return m_oldPos;} @@ -578,9 +513,9 @@ protected: class Q_GUI_EXPORT QExposeEvent : public QEvent { + Q_DECL_EVENT_COMMON(QExposeEvent) public: explicit QExposeEvent(const QRegion &m_region); - ~QExposeEvent(); #if QT_DEPRECATED_SINCE(6, 0) QT_DEPRECATED_VERSION_X_6_0("Handle QPaintEvent instead") @@ -589,10 +524,12 @@ public: protected: QRegion m_region; + friend class QWidgetWindow; }; class Q_GUI_EXPORT QPlatformSurfaceEvent : public QEvent { + Q_DECL_EVENT_COMMON(QPlatformSurfaceEvent) public: enum SurfaceEventType { SurfaceCreated, @@ -600,7 +537,6 @@ public: }; explicit QPlatformSurfaceEvent(SurfaceEventType surfaceEventType); - ~QPlatformSurfaceEvent(); inline SurfaceEventType surfaceEventType() const { return m_surfaceEventType; } @@ -610,9 +546,9 @@ protected: class Q_GUI_EXPORT QResizeEvent : public QEvent { + Q_DECL_EVENT_COMMON(QResizeEvent) public: QResizeEvent(const QSize &size, const QSize &oldSize); - ~QResizeEvent(); inline const QSize &size() const { return m_size; } inline const QSize &oldSize()const { return m_oldSize;} @@ -624,46 +560,48 @@ protected: class Q_GUI_EXPORT QCloseEvent : public QEvent { + Q_DECL_EVENT_COMMON(QCloseEvent) public: QCloseEvent(); - ~QCloseEvent(); }; class Q_GUI_EXPORT QIconDragEvent : public QEvent { + Q_DECL_EVENT_COMMON(QIconDragEvent) public: QIconDragEvent(); - ~QIconDragEvent(); }; class Q_GUI_EXPORT QShowEvent : public QEvent { + Q_DECL_EVENT_COMMON(QShowEvent) public: QShowEvent(); - ~QShowEvent(); }; class Q_GUI_EXPORT QHideEvent : public QEvent { + Q_DECL_EVENT_COMMON(QHideEvent) public: QHideEvent(); - ~QHideEvent(); }; #ifndef QT_NO_CONTEXTMENU class Q_GUI_EXPORT QContextMenuEvent : public QInputEvent { + Q_DECL_EVENT_COMMON(QContextMenuEvent) public: enum Reason { Mouse, Keyboard, Other }; QContextMenuEvent(Reason reason, const QPoint &pos, const QPoint &globalPos, - Qt::KeyboardModifiers modifiers); - QContextMenuEvent(Reason reason, const QPoint &pos, const QPoint &globalPos); + Qt::KeyboardModifiers modifiers = Qt::NoModifier); +#if QT_DEPRECATED_SINCE(6, 4) + QT_DEPRECATED_VERSION_X_6_4("Use the other constructor") QContextMenuEvent(Reason reason, const QPoint &pos); - ~QContextMenuEvent(); +#endif inline int x() const { return m_pos.x(); } inline int y() const { return m_pos.y(); } @@ -685,6 +623,7 @@ protected: #ifndef QT_NO_INPUTMETHOD class Q_GUI_EXPORT QInputMethodEvent : public QEvent { + Q_DECL_EVENT_COMMON(QInputMethodEvent) public: enum AttributeType { TextFormat, @@ -705,7 +644,6 @@ public: }; QInputMethodEvent(); QInputMethodEvent(const QString &preeditText, const QList<Attribute> &attributes); - ~QInputMethodEvent(); void setCommitString(const QString &commitString, int replaceFrom = 0, int replaceLength = 0); inline const QList<Attribute> &attributes() const { return m_attributes; } @@ -715,8 +653,6 @@ public: inline int replacementStart() const { return m_replacementStart; } inline int replacementLength() const { return m_replacementLength; } - QInputMethodEvent(const QInputMethodEvent &other); - inline friend bool operator==(const QInputMethodEvent::Attribute &lhs, const QInputMethodEvent::Attribute &rhs) { @@ -732,18 +668,18 @@ public: private: QString m_preedit; - QList<Attribute> m_attributes; QString m_commit; + QList<Attribute> m_attributes; int m_replacementStart; int m_replacementLength; }; -Q_DECLARE_TYPEINFO(QInputMethodEvent::Attribute, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QInputMethodEvent::Attribute, Q_RELOCATABLE_TYPE); class Q_GUI_EXPORT QInputMethodQueryEvent : public QEvent { + Q_DECL_EVENT_COMMON(QInputMethodQueryEvent) public: explicit QInputMethodQueryEvent(Qt::InputMethodQueries queries); - ~QInputMethodQueryEvent(); Qt::InputMethodQueries queries() const { return m_queries; } @@ -758,7 +694,7 @@ private: friend QTypeInfo<QueryPair>; QList<QueryPair> m_values; }; -Q_DECLARE_TYPEINFO(QInputMethodQueryEvent::QueryPair, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QInputMethodQueryEvent::QueryPair, Q_RELOCATABLE_TYPE); #endif // QT_NO_INPUTMETHOD @@ -768,10 +704,10 @@ class QMimeData; class Q_GUI_EXPORT QDropEvent : public QEvent { + Q_DECL_EVENT_COMMON(QDropEvent) public: QDropEvent(const QPointF& pos, Qt::DropActions actions, const QMimeData *data, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Type type = Drop); - ~QDropEvent(); #if QT_DEPRECATED_SINCE(6, 0) QT_DEPRECATED_VERSION_X_6_0("Use position().toPoint()") @@ -812,10 +748,10 @@ protected: class Q_GUI_EXPORT QDragMoveEvent : public QDropEvent { + Q_DECL_EVENT_COMMON(QDragMoveEvent) public: QDragMoveEvent(const QPoint &pos, Qt::DropActions actions, const QMimeData *data, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Type type = DragMove); - ~QDragMoveEvent(); inline QRect answerRect() const { return m_rect; } @@ -832,27 +768,27 @@ protected: class Q_GUI_EXPORT QDragEnterEvent : public QDragMoveEvent { + Q_DECL_EVENT_COMMON(QDragEnterEvent) public: QDragEnterEvent(const QPoint &pos, Qt::DropActions actions, const QMimeData *data, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers); - ~QDragEnterEvent(); }; class Q_GUI_EXPORT QDragLeaveEvent : public QEvent { + Q_DECL_EVENT_COMMON(QDragLeaveEvent) public: QDragLeaveEvent(); - ~QDragLeaveEvent(); }; #endif // QT_CONFIG(draganddrop) class Q_GUI_EXPORT QHelpEvent : public QEvent { + Q_DECL_EVENT_COMMON(QHelpEvent) public: QHelpEvent(Type type, const QPoint &pos, const QPoint &globalPos); - ~QHelpEvent(); inline int x() const { return m_pos.x(); } inline int y() const { return m_pos.y(); } @@ -870,9 +806,9 @@ private: #ifndef QT_NO_STATUSTIP class Q_GUI_EXPORT QStatusTipEvent : public QEvent { + Q_DECL_EVENT_COMMON(QStatusTipEvent) public: explicit QStatusTipEvent(const QString &tip); - ~QStatusTipEvent(); inline QString tip() const { return m_tip; } private: @@ -883,9 +819,9 @@ private: #if QT_CONFIG(whatsthis) class Q_GUI_EXPORT QWhatsThisClickedEvent : public QEvent { + Q_DECL_EVENT_COMMON(QWhatsThisClickedEvent) public: explicit QWhatsThisClickedEvent(const QString &href); - ~QWhatsThisClickedEvent(); inline QString href() const { return m_href; } private: @@ -896,26 +832,31 @@ private: #if QT_CONFIG(action) class Q_GUI_EXPORT QActionEvent : public QEvent { - QAction *m_action, *m_before; + Q_DECL_EVENT_COMMON(QActionEvent) public: QActionEvent(int type, QAction *action, QAction *before = nullptr); - ~QActionEvent(); inline QAction *action() const { return m_action; } inline QAction *before() const { return m_before; } +private: + QAction *m_action; + QAction *m_before; }; #endif // QT_CONFIG(action) class Q_GUI_EXPORT QFileOpenEvent : public QEvent { + Q_DECL_EVENT_COMMON(QFileOpenEvent) public: explicit QFileOpenEvent(const QString &file); explicit QFileOpenEvent(const QUrl &url); - ~QFileOpenEvent(); inline QString file() const { return m_file; } QUrl url() const { return m_url; } +#if QT_DEPRECATED_SINCE(6, 6) + QT_DEPRECATED_VERSION_X_6_6("Interpret the string returned by file()") bool openFile(QFile &file, QIODevice::OpenMode flags) const; +#endif private: QString m_file; QUrl m_url; @@ -924,38 +865,41 @@ private: #ifndef QT_NO_TOOLBAR class Q_GUI_EXPORT QToolBarChangeEvent : public QEvent { + Q_DECL_EVENT_COMMON(QToolBarChangeEvent) public: explicit QToolBarChangeEvent(bool t); - ~QToolBarChangeEvent(); inline bool toggle() const { return m_toggle; } private: - uint m_toggle : 1; + bool m_toggle; }; #endif #if QT_CONFIG(shortcut) class Q_GUI_EXPORT QShortcutEvent : public QEvent { + Q_DECL_EVENT_COMMON(QShortcutEvent) public: + // Note this is publicly deprecated, but should remain as internal constructor: QShortcutEvent(const QKeySequence &key, int id, bool ambiguous = false); - ~QShortcutEvent(); + QShortcutEvent(const QKeySequence &key, const QShortcut *shortcut = nullptr, bool ambiguous = false); inline const QKeySequence &key() const { return m_sequence; } + // Note this is publicly deprecated, but should remain as internal getter: inline int shortcutId() const { return m_shortcutId; } inline bool isAmbiguous() const { return m_ambiguous; } protected: QKeySequence m_sequence; - bool m_ambiguous; int m_shortcutId; + bool m_ambiguous; }; #endif class Q_GUI_EXPORT QWindowStateChangeEvent: public QEvent { + Q_DECL_EVENT_COMMON(QWindowStateChangeEvent) public: explicit QWindowStateChangeEvent(Qt::WindowStates oldState, bool isOverride = false); - ~QWindowStateChangeEvent(); inline Qt::WindowStates oldState() const { return m_oldStates; } bool isOverride() const; @@ -969,13 +913,9 @@ private: Q_GUI_EXPORT QDebug operator<<(QDebug, const QEvent *); #endif -#if QT_CONFIG(shortcut) -inline bool operator==(QKeyEvent *e, QKeySequence::StandardKey key){return (e ? e->matches(key) : false);} -inline bool operator==(QKeySequence::StandardKey key, QKeyEvent *e){return (e ? e->matches(key) : false);} -#endif // QT_CONFIG(shortcut) - class Q_GUI_EXPORT QTouchEvent : public QPointerEvent { + Q_DECL_EVENT_COMMON(QTouchEvent) public: using TouchPoint = QEventPoint; // source compat @@ -991,7 +931,6 @@ public: QEventPoint::States touchPointStates, const QList<QEventPoint> &touchPoints = {}); #endif - ~QTouchEvent(); inline QObject *target() const { return m_target; } inline QEventPoint::States touchPointStates() const { return m_touchPointStates; } @@ -1011,30 +950,31 @@ protected: class Q_GUI_EXPORT QScrollPrepareEvent : public QEvent { + Q_DECL_EVENT_COMMON(QScrollPrepareEvent) public: explicit QScrollPrepareEvent(const QPointF &startPos); - ~QScrollPrepareEvent(); - QPointF startPos() const; + QPointF startPos() const { return m_startPos; } - QSizeF viewportSize() const; - QRectF contentPosRange() const; - QPointF contentPos() const; + QSizeF viewportSize() const { return m_viewportSize; } + QRectF contentPosRange() const { return m_contentPosRange; } + QPointF contentPos() const { return m_contentPos; } void setViewportSize(const QSizeF &size); void setContentPosRange(const QRectF &rect); void setContentPos(const QPointF &pos); private: - QPointF m_startPos; - QSizeF m_viewportSize; QRectF m_contentPosRange; + QSizeF m_viewportSize; + QPointF m_startPos; QPointF m_contentPos; }; class Q_GUI_EXPORT QScrollEvent : public QEvent { + Q_DECL_EVENT_COMMON(QScrollEvent) public: enum ScrollState { @@ -1044,11 +984,10 @@ public: }; QScrollEvent(const QPointF &contentPos, const QPointF &overshoot, ScrollState scrollState); - ~QScrollEvent(); - QPointF contentPos() const; - QPointF overshootDistance() const; - ScrollState scrollState() const; + QPointF contentPos() const { return m_contentPos; } + QPointF overshootDistance() const { return m_overshoot; } + ScrollState scrollState() const { return m_state; } private: QPointF m_contentPos; @@ -1058,12 +997,12 @@ private: class Q_GUI_EXPORT QScreenOrientationChangeEvent : public QEvent { + Q_DECL_EVENT_COMMON(QScreenOrientationChangeEvent) public: QScreenOrientationChangeEvent(QScreen *screen, Qt::ScreenOrientation orientation); - ~QScreenOrientationChangeEvent(); - QScreen *screen() const; - Qt::ScreenOrientation orientation() const; + QScreen *screen() const { return m_screen; } + Qt::ScreenOrientation orientation() const { return m_orientation; } private: QScreen *m_screen; @@ -1072,14 +1011,27 @@ private: class Q_GUI_EXPORT QApplicationStateChangeEvent : public QEvent { + Q_DECL_EVENT_COMMON(QApplicationStateChangeEvent) public: explicit QApplicationStateChangeEvent(Qt::ApplicationState state); - Qt::ApplicationState applicationState() const; + + Qt::ApplicationState applicationState() const { return m_applicationState; } private: Qt::ApplicationState m_applicationState; }; +class Q_GUI_EXPORT QChildWindowEvent : public QEvent +{ + Q_DECL_EVENT_COMMON(QChildWindowEvent) +public: + explicit QChildWindowEvent(Type type, QWindow *childWindow); + QWindow *child() const { return c; } + +private: + QWindow *c; +}; + QT_END_NAMESPACE #endif // QEVENT_H |