diff options
Diffstat (limited to 'src/gui/kernel/qevent.h')
| -rw-r--r-- | src/gui/kernel/qevent.h | 300 |
1 files changed, 110 insertions, 190 deletions
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h index 3f8b53262f..a24f0c471c 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/kernel/qevent.h @@ -1,52 +1,19 @@ -/**************************************************************************** -** -** 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> @@ -59,13 +26,19 @@ # 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,11 +47,9 @@ class QGesture; class Q_GUI_EXPORT QInputEvent : public QEvent { - Q_EVENT_DISABLE_COPY(QInputEvent); + Q_DECL_EVENT_COMMON(QInputEvent) public: explicit QInputEvent(Type type, const QInputDevice *m_dev, Qt::KeyboardModifiers modifiers = Qt::NoModifier); - ~QInputEvent(); - QInputEvent *clone() const override { return new QInputEvent(*this); } const QInputDevice *device() const { return m_dev; } QInputDevice::DeviceType deviceType() const { return m_dev ? m_dev->type() : QInputDevice::DeviceType::Unknown; } @@ -100,21 +71,19 @@ protected: class Q_GUI_EXPORT QPointerEvent : public QInputEvent { - Q_EVENT_DISABLE_COPY(QPointerEvent); + Q_GADGET + Q_DECL_EVENT_COMMON(QPointerEvent) public: explicit QPointerEvent(Type type, const QPointingDevice *dev, Qt::KeyboardModifiers modifiers = Qt::NoModifier, const QList<QEventPoint> &points = {}); - ~QPointerEvent(); - - QPointerEvent *clone() const override { return new QPointerEvent(*this); } const QPointingDevice *pointingDevice() const; QPointingDevice::PointerType pointerType() const { return pointingDevice() ? pointingDevice()->pointerType() : QPointingDevice::PointerType::Unknown; } void setTimestamp(quint64 timestamp) override; - qsizetype pointCount() const { return m_points.count(); } - QEventPoint &point(qsizetype i) { return m_points[i]; } + 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; @@ -139,9 +108,10 @@ protected: class Q_GUI_EXPORT QSinglePointEvent : public QPointerEvent { Q_GADGET - Q_PROPERTY(QObject *exclusivePointGrabber READ exclusivePointGrabber WRITE setExclusivePointGrabber) + Q_PROPERTY(QObject *exclusivePointGrabber READ exclusivePointGrabber + WRITE setExclusivePointGrabber) - Q_EVENT_DISABLE_COPY(QSinglePointEvent); + Q_DECL_EVENT_COMMON(QSinglePointEvent) public: inline Qt::MouseButton button() const { return m_button; } inline Qt::MouseButtons buttons() const { return m_mouseState; } @@ -162,9 +132,8 @@ public: void setExclusivePointGrabber(QObject *exclusiveGrabber) { QPointerEvent::setExclusiveGrabber(points().first(), exclusiveGrabber); } - QSinglePointEvent *clone() const override { return new QSinglePointEvent(*this); } - 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); @@ -194,13 +163,10 @@ protected: class Q_GUI_EXPORT QEnterEvent : public QSinglePointEvent { - Q_EVENT_DISABLE_COPY(QEnterEvent); + Q_DECL_EVENT_COMMON(QEnterEvent) public: QEnterEvent(const QPointF &localPos, const QPointF &scenePos, const QPointF &globalPos, const QPointingDevice *device = QPointingDevice::primaryPointingDevice()); - ~QEnterEvent(); - - QEnterEvent *clone() const override { return new QEnterEvent(*this); } #if QT_DEPRECATED_SINCE(6, 0) #ifndef QT_NO_INTEGER_EVENT_COORDINATES @@ -228,11 +194,14 @@ public: class Q_GUI_EXPORT QMouseEvent : public QSinglePointEvent { - Q_EVENT_DISABLE_COPY(QMouseEvent); + 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, @@ -245,9 +214,6 @@ public: Qt::MouseButton button, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Qt::MouseEventSource source, const QPointingDevice *device = QPointingDevice::primaryPointingDevice()); - ~QMouseEvent(); - - QMouseEvent *clone() const override { return new QMouseEvent(*this); } #ifndef QT_NO_INTEGER_EVENT_COORDINATES inline QPoint pos() const { return position().toPoint(); } @@ -271,21 +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_EVENT_DISABLE_COPY(QHoverEvent); + 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(); - - QHoverEvent *clone() const override { return new QHoverEvent(*this); } +#endif #if QT_DEPRECATED_SINCE(6, 0) #ifndef QT_NO_INTEGER_EVENT_COORDINATES @@ -317,7 +286,7 @@ class Q_GUI_EXPORT QWheelEvent : public QSinglePointEvent Q_PROPERTY(Qt::ScrollPhase phase READ phase) Q_PROPERTY(bool inverted READ inverted) - Q_EVENT_DISABLE_COPY(QWheelEvent); + Q_DECL_EVENT_COMMON(QWheelEvent) public: enum { DefaultDeltasPerStep = 120 }; @@ -325,9 +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(); - - QWheelEvent *clone() const override { return new QWheelEvent(*this); } inline QPoint pixelDelta() const { return m_pixelDelta; } inline QPoint angleDelta() const { return m_angleDelta; } @@ -351,7 +317,7 @@ protected: #if QT_CONFIG(tabletevent) class Q_GUI_EXPORT QTabletEvent : public QSinglePointEvent { - Q_EVENT_DISABLE_COPY(QTabletEvent); + Q_DECL_EVENT_COMMON(QTabletEvent) public: QTabletEvent(Type t, const QPointingDevice *device, const QPointF &pos, const QPointF &globalPos, @@ -359,9 +325,6 @@ public: float tangentialPressure, qreal rotation, float z, Qt::KeyboardModifiers keyState, Qt::MouseButton button, Qt::MouseButtons buttons); - ~QTabletEvent(); - - QTabletEvent *clone() const override { return new QTabletEvent(*this); } #if QT_DEPRECATED_SINCE(6, 0) QT_DEPRECATED_VERSION_X_6_0("Use position()") @@ -406,16 +369,27 @@ protected: #if QT_CONFIG(gestures) class Q_GUI_EXPORT QNativeGestureEvent : public QSinglePointEvent { - Q_EVENT_DISABLE_COPY(QNativeGestureEvent); + 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, quint64 sequenceId, quint64 intArgument); - ~QNativeGestureEvent(); - - QNativeGestureEvent *clone() const override { return new QNativeGestureEvent(*this); } +#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 @@ -434,16 +408,21 @@ public: protected: quint64 m_sequenceId; - quint64 m_intValue; +#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) + QVector2D m_delta; +#else + QPointF m_delta; +#endif qreal m_realValue; Qt::NativeGestureType m_gestureType; - quint32 m_reserved; + quint32 m_fingerCount : 4; + quint32 m_reserved : 28; }; #endif // QT_CONFIG(gestures) class Q_GUI_EXPORT QKeyEvent : public QInputEvent { - Q_EVENT_DISABLE_COPY(QKeyEvent); + Q_DECL_EVENT_COMMON(QKeyEvent) public: QKeyEvent(Type type, int key, Qt::KeyboardModifiers modifiers, const QString& text = QString(), bool autorep = false, quint16 count = 1); @@ -451,9 +430,6 @@ public: quint32 nativeScanCode, quint32 nativeVirtualKey, quint32 nativeModifiers, const QString &text = QString(), bool autorep = false, quint16 count = 1, const QInputDevice *device = QInputDevice::primaryKeyboard()); - ~QKeyEvent(); - - QKeyEvent *clone() const override { return new QKeyEvent(*this); } int key() const { return m_key; } #if QT_CONFIG(shortcut) @@ -492,12 +468,9 @@ protected: class Q_GUI_EXPORT QFocusEvent : public QEvent { - Q_EVENT_DISABLE_COPY(QFocusEvent); + Q_DECL_EVENT_COMMON(QFocusEvent) public: explicit QFocusEvent(Type type, Qt::FocusReason reason=Qt::OtherFocusReason); - ~QFocusEvent(); - - QFocusEvent *clone() const override { return new QFocusEvent(*this); } inline bool gotFocus() const { return type() == FocusIn; } inline bool lostFocus() const { return type() == FocusOut; } @@ -511,13 +484,10 @@ private: class Q_GUI_EXPORT QPaintEvent : public QEvent { - Q_EVENT_DISABLE_COPY(QPaintEvent); + Q_DECL_EVENT_COMMON(QPaintEvent) public: explicit QPaintEvent(const QRegion& paintRegion); explicit QPaintEvent(const QRect &paintRect); - ~QPaintEvent(); - - QPaintEvent *clone() const override { return new QPaintEvent(*this); } inline const QRect &rect() const { return m_rect; } inline const QRegion ®ion() const { return m_region; } @@ -530,12 +500,9 @@ protected: class Q_GUI_EXPORT QMoveEvent : public QEvent { - Q_EVENT_DISABLE_COPY(QMoveEvent); + Q_DECL_EVENT_COMMON(QMoveEvent) public: QMoveEvent(const QPoint &pos, const QPoint &oldPos); - ~QMoveEvent(); - - QMoveEvent *clone() const override { return new QMoveEvent(*this); } inline const QPoint &pos() const { return m_pos; } inline const QPoint &oldPos() const { return m_oldPos;} @@ -546,12 +513,9 @@ protected: class Q_GUI_EXPORT QExposeEvent : public QEvent { - Q_EVENT_DISABLE_COPY(QExposeEvent); + Q_DECL_EVENT_COMMON(QExposeEvent) public: explicit QExposeEvent(const QRegion &m_region); - ~QExposeEvent(); - - QExposeEvent *clone() const override { return new QExposeEvent(*this); } #if QT_DEPRECATED_SINCE(6, 0) QT_DEPRECATED_VERSION_X_6_0("Handle QPaintEvent instead") @@ -560,11 +524,12 @@ public: protected: QRegion m_region; + friend class QWidgetWindow; }; class Q_GUI_EXPORT QPlatformSurfaceEvent : public QEvent { - Q_EVENT_DISABLE_COPY(QPlatformSurfaceEvent); + Q_DECL_EVENT_COMMON(QPlatformSurfaceEvent) public: enum SurfaceEventType { SurfaceCreated, @@ -572,9 +537,6 @@ public: }; explicit QPlatformSurfaceEvent(SurfaceEventType surfaceEventType); - ~QPlatformSurfaceEvent(); - - QPlatformSurfaceEvent *clone() const override { return new QPlatformSurfaceEvent(*this); } inline SurfaceEventType surfaceEventType() const { return m_surfaceEventType; } @@ -584,12 +546,9 @@ protected: class Q_GUI_EXPORT QResizeEvent : public QEvent { - Q_EVENT_DISABLE_COPY(QResizeEvent); + Q_DECL_EVENT_COMMON(QResizeEvent) public: QResizeEvent(const QSize &size, const QSize &oldSize); - ~QResizeEvent(); - - QResizeEvent *clone() const override { return new QResizeEvent(*this); } inline const QSize &size() const { return m_size; } inline const QSize &oldSize()const { return m_oldSize;} @@ -601,52 +560,48 @@ protected: class Q_GUI_EXPORT QCloseEvent : public QEvent { - Q_EVENT_DISABLE_COPY(QCloseEvent); + Q_DECL_EVENT_COMMON(QCloseEvent) public: QCloseEvent(); - ~QCloseEvent(); }; class Q_GUI_EXPORT QIconDragEvent : public QEvent { - Q_EVENT_DISABLE_COPY(QIconDragEvent); + Q_DECL_EVENT_COMMON(QIconDragEvent) public: QIconDragEvent(); - ~QIconDragEvent(); }; class Q_GUI_EXPORT QShowEvent : public QEvent { - Q_EVENT_DISABLE_COPY(QShowEvent); + Q_DECL_EVENT_COMMON(QShowEvent) public: QShowEvent(); - ~QShowEvent(); }; class Q_GUI_EXPORT QHideEvent : public QEvent { - Q_EVENT_DISABLE_COPY(QHideEvent); + Q_DECL_EVENT_COMMON(QHideEvent) public: QHideEvent(); - ~QHideEvent(); }; #ifndef QT_NO_CONTEXTMENU class Q_GUI_EXPORT QContextMenuEvent : public QInputEvent { - Q_EVENT_DISABLE_COPY(QContextMenuEvent); + Q_DECL_EVENT_COMMON(QContextMenuEvent) public: enum Reason { Mouse, Keyboard, Other }; 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(); - - QContextMenuEvent *clone() const override { return new QContextMenuEvent(*this); } +#endif inline int x() const { return m_pos.x(); } inline int y() const { return m_pos.y(); } @@ -668,7 +623,7 @@ protected: #ifndef QT_NO_INPUTMETHOD class Q_GUI_EXPORT QInputMethodEvent : public QEvent { - Q_EVENT_DISABLE_COPY(QInputMethodEvent); + Q_DECL_EVENT_COMMON(QInputMethodEvent) public: enum AttributeType { TextFormat, @@ -689,9 +644,6 @@ public: }; QInputMethodEvent(); QInputMethodEvent(const QString &preeditText, const QList<Attribute> &attributes); - ~QInputMethodEvent(); - - QInputMethodEvent *clone() const override { return new QInputMethodEvent(*this); } void setCommitString(const QString &commitString, int replaceFrom = 0, int replaceLength = 0); inline const QList<Attribute> &attributes() const { return m_attributes; } @@ -725,12 +677,9 @@ Q_DECLARE_TYPEINFO(QInputMethodEvent::Attribute, Q_RELOCATABLE_TYPE); class Q_GUI_EXPORT QInputMethodQueryEvent : public QEvent { - Q_EVENT_DISABLE_COPY(QInputMethodQueryEvent); + Q_DECL_EVENT_COMMON(QInputMethodQueryEvent) public: explicit QInputMethodQueryEvent(Qt::InputMethodQueries queries); - ~QInputMethodQueryEvent(); - - QInputMethodQueryEvent *clone() const override { return new QInputMethodQueryEvent(*this); } Qt::InputMethodQueries queries() const { return m_queries; } @@ -755,13 +704,10 @@ class QMimeData; class Q_GUI_EXPORT QDropEvent : public QEvent { - Q_EVENT_DISABLE_COPY(QDropEvent); + 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(); - - QDropEvent *clone() const override { return new QDropEvent(*this); } #if QT_DEPRECATED_SINCE(6, 0) QT_DEPRECATED_VERSION_X_6_0("Use position().toPoint()") @@ -802,13 +748,10 @@ protected: class Q_GUI_EXPORT QDragMoveEvent : public QDropEvent { - Q_EVENT_DISABLE_COPY(QDragMoveEvent); + 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(); - - QDragMoveEvent *clone() const override { return new QDragMoveEvent(*this); } inline QRect answerRect() const { return m_rect; } @@ -825,32 +768,27 @@ protected: class Q_GUI_EXPORT QDragEnterEvent : public QDragMoveEvent { - Q_EVENT_DISABLE_COPY(QDragEnterEvent); + 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_EVENT_DISABLE_COPY(QDragLeaveEvent); + Q_DECL_EVENT_COMMON(QDragLeaveEvent) public: QDragLeaveEvent(); - ~QDragLeaveEvent(); }; #endif // QT_CONFIG(draganddrop) class Q_GUI_EXPORT QHelpEvent : public QEvent { - Q_EVENT_DISABLE_COPY(QHelpEvent); + Q_DECL_EVENT_COMMON(QHelpEvent) public: QHelpEvent(Type type, const QPoint &pos, const QPoint &globalPos); - ~QHelpEvent(); - - QHelpEvent *clone() const override { return new QHelpEvent(*this); } inline int x() const { return m_pos.x(); } inline int y() const { return m_pos.y(); } @@ -868,12 +806,9 @@ private: #ifndef QT_NO_STATUSTIP class Q_GUI_EXPORT QStatusTipEvent : public QEvent { - Q_EVENT_DISABLE_COPY(QStatusTipEvent); + Q_DECL_EVENT_COMMON(QStatusTipEvent) public: explicit QStatusTipEvent(const QString &tip); - ~QStatusTipEvent(); - - QStatusTipEvent *clone() const override { return new QStatusTipEvent(*this); } inline QString tip() const { return m_tip; } private: @@ -884,12 +819,9 @@ private: #if QT_CONFIG(whatsthis) class Q_GUI_EXPORT QWhatsThisClickedEvent : public QEvent { - Q_EVENT_DISABLE_COPY(QWhatsThisClickedEvent); + Q_DECL_EVENT_COMMON(QWhatsThisClickedEvent) public: explicit QWhatsThisClickedEvent(const QString &href); - ~QWhatsThisClickedEvent(); - - QWhatsThisClickedEvent *clone() const override { return new QWhatsThisClickedEvent(*this); } inline QString href() const { return m_href; } private: @@ -900,12 +832,9 @@ private: #if QT_CONFIG(action) class Q_GUI_EXPORT QActionEvent : public QEvent { - Q_EVENT_DISABLE_COPY(QActionEvent); + Q_DECL_EVENT_COMMON(QActionEvent) public: QActionEvent(int type, QAction *action, QAction *before = nullptr); - ~QActionEvent(); - - QActionEvent *clone() const override { return new QActionEvent(*this); } inline QAction *action() const { return m_action; } inline QAction *before() const { return m_before; } @@ -917,17 +846,17 @@ private: class Q_GUI_EXPORT QFileOpenEvent : public QEvent { - Q_EVENT_DISABLE_COPY(QFileOpenEvent); + Q_DECL_EVENT_COMMON(QFileOpenEvent) public: explicit QFileOpenEvent(const QString &file); explicit QFileOpenEvent(const QUrl &url); - ~QFileOpenEvent(); - - QFileOpenEvent *clone() const override { return new QFileOpenEvent(*this); } 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; @@ -936,12 +865,9 @@ private: #ifndef QT_NO_TOOLBAR class Q_GUI_EXPORT QToolBarChangeEvent : public QEvent { - Q_EVENT_DISABLE_COPY(QToolBarChangeEvent); + Q_DECL_EVENT_COMMON(QToolBarChangeEvent) public: explicit QToolBarChangeEvent(bool t); - ~QToolBarChangeEvent(); - - QToolBarChangeEvent *clone() const override { return new QToolBarChangeEvent(*this); } inline bool toggle() const { return m_toggle; } private: @@ -952,14 +878,14 @@ private: #if QT_CONFIG(shortcut) class Q_GUI_EXPORT QShortcutEvent : public QEvent { - Q_EVENT_DISABLE_COPY(QShortcutEvent); + 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 *clone() const override { return new QShortcutEvent(*this); } + 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: @@ -971,12 +897,9 @@ protected: class Q_GUI_EXPORT QWindowStateChangeEvent: public QEvent { - Q_EVENT_DISABLE_COPY(QWindowStateChangeEvent); + Q_DECL_EVENT_COMMON(QWindowStateChangeEvent) public: explicit QWindowStateChangeEvent(Qt::WindowStates oldState, bool isOverride = false); - ~QWindowStateChangeEvent(); - - QWindowStateChangeEvent *clone() const override { return new QWindowStateChangeEvent(*this); } inline Qt::WindowStates oldState() const { return m_oldStates; } bool isOverride() const; @@ -992,7 +915,7 @@ Q_GUI_EXPORT QDebug operator<<(QDebug, const QEvent *); class Q_GUI_EXPORT QTouchEvent : public QPointerEvent { - Q_EVENT_DISABLE_COPY(QTouchEvent); + Q_DECL_EVENT_COMMON(QTouchEvent) public: using TouchPoint = QEventPoint; // source compat @@ -1008,9 +931,6 @@ public: QEventPoint::States touchPointStates, const QList<QEventPoint> &touchPoints = {}); #endif - ~QTouchEvent(); - - QTouchEvent *clone() const override { return new QTouchEvent(*this); } inline QObject *target() const { return m_target; } inline QEventPoint::States touchPointStates() const { return m_touchPointStates; } @@ -1030,12 +950,9 @@ protected: class Q_GUI_EXPORT QScrollPrepareEvent : public QEvent { - Q_EVENT_DISABLE_COPY(QScrollPrepareEvent); + Q_DECL_EVENT_COMMON(QScrollPrepareEvent) public: explicit QScrollPrepareEvent(const QPointF &startPos); - ~QScrollPrepareEvent(); - - QScrollPrepareEvent *clone() const override { return new QScrollPrepareEvent(*this); } QPointF startPos() const { return m_startPos; } @@ -1057,7 +974,7 @@ private: class Q_GUI_EXPORT QScrollEvent : public QEvent { - Q_EVENT_DISABLE_COPY(QScrollEvent); + Q_DECL_EVENT_COMMON(QScrollEvent) public: enum ScrollState { @@ -1067,9 +984,6 @@ public: }; QScrollEvent(const QPointF &contentPos, const QPointF &overshoot, ScrollState scrollState); - ~QScrollEvent(); - - QScrollEvent *clone() const override { return new QScrollEvent(*this); } QPointF contentPos() const { return m_contentPos; } QPointF overshootDistance() const { return m_overshoot; } @@ -1083,12 +997,9 @@ private: class Q_GUI_EXPORT QScreenOrientationChangeEvent : public QEvent { - Q_EVENT_DISABLE_COPY(QScreenOrientationChangeEvent); + Q_DECL_EVENT_COMMON(QScreenOrientationChangeEvent) public: QScreenOrientationChangeEvent(QScreen *screen, Qt::ScreenOrientation orientation); - ~QScreenOrientationChangeEvent(); - - QScreenOrientationChangeEvent *clone() const override { return new QScreenOrientationChangeEvent(*this); } QScreen *screen() const { return m_screen; } Qt::ScreenOrientation orientation() const { return m_orientation; } @@ -1100,18 +1011,27 @@ private: class Q_GUI_EXPORT QApplicationStateChangeEvent : public QEvent { - Q_EVENT_DISABLE_COPY(QApplicationStateChangeEvent); + Q_DECL_EVENT_COMMON(QApplicationStateChangeEvent) public: explicit QApplicationStateChangeEvent(Qt::ApplicationState state); - QApplicationStateChangeEvent *clone() const override { return new QApplicationStateChangeEvent(*this); } - 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 |