diff options
Diffstat (limited to 'src/gui/kernel/qevent.cpp')
| -rw-r--r-- | src/gui/kernel/qevent.cpp | 581 |
1 files changed, 284 insertions, 297 deletions
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index 3c33731279..d8c11d72a6 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -1,49 +1,16 @@ -/**************************************************************************** -** -** 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 #include "qevent.h" + #include "qcursor.h" #include "private/qguiapplication_p.h" #include "private/qinputdevice_p.h" #include "private/qpointingdevice_p.h" #include "qpa/qplatformintegration.h" #include "private/qevent_p.h" +#include "private/qeventpoint_p.h" + #include "qfile.h" #include "qhashfunctions.h" #include "qmetaobject.h" @@ -51,14 +18,35 @@ #include "qevent_p.h" #include "qmath.h" #include "qloggingcategory.h" +#include "qpointer.h" #if QT_CONFIG(draganddrop) #include <qpa/qplatformdrag.h> #include <private/qdnd_p.h> #endif +#if QT_CONFIG(shortcut) +#include <private/qshortcut_p.h> +#endif + #include <private/qdebug_p.h> +#define Q_IMPL_POINTER_EVENT(Class) \ + Class::Class(const Class &) = default; \ + Class::~Class() = default; \ + Class* Class::clone() const \ + { \ + auto c = new Class(*this); \ + for (auto &point : c->m_points) \ + QMutableEventPoint::detach(point); \ + QEvent *e = c; \ + /* check that covariant return is safe to add */ \ + Q_ASSERT(reinterpret_cast<quintptr>(c) == reinterpret_cast<quintptr>(e)); \ + return c; \ + } + + + QT_BEGIN_NAMESPACE static_assert(sizeof(QMutableTouchEvent) == sizeof(QTouchEvent)); @@ -90,12 +78,7 @@ QEnterEvent::QEnterEvent(const QPointF &localPos, const QPointF &scenePos, const { } -/*! - \internal -*/ -QEnterEvent::~QEnterEvent() -{ -} +Q_IMPL_POINTER_EVENT(QEnterEvent) /*! \fn QPoint QEnterEvent::globalPos() const @@ -182,12 +165,7 @@ QInputEvent::QInputEvent(QEvent::Type type, QEvent::SinglePointEventTag, const Q : QEvent(type, QEvent::SinglePointEventTag{}), m_dev(dev), m_modState(modifiers), m_reserved(0) {} -/*! - \internal -*/ -QInputEvent::~QInputEvent() -{ -} +Q_IMPL_EVENT_COMMON(QInputEvent) /*! \fn QInputDevice *QInputEvent::device() const @@ -257,10 +235,12 @@ QInputEvent::~QInputEvent() */ /*! - \fn QEventPoint &QPointerEvent::point(qsizetype i) - Returns a QEventPoint reference for the point at index \a i. */ +QEventPoint &QPointerEvent::point(qsizetype i) +{ + return m_points[i]; +} /*! \fn const QList<QEventPoint> &QPointerEvent::points() const @@ -291,9 +271,7 @@ QPointerEvent::QPointerEvent(QEvent::Type type, QEvent::SinglePointEventTag, con { } -QPointerEvent::~QPointerEvent() -{ -} +Q_IMPL_POINTER_EVENT(QPointerEvent); /*! Returns the point whose \l {QEventPoint::id()}{id} matches the given \a id, @@ -309,12 +287,13 @@ QEventPoint *QPointerEvent::pointById(int id) } /*! - Returns \c true if every point in points() has an exclusiveGrabber(). + Returns \c true if every point in points() has either an exclusiveGrabber() + or one or more passiveGrabbers(). */ bool QPointerEvent::allPointsGrabbed() const { for (const auto &p : points()) { - if (exclusiveGrabber(p) && passiveGrabbers(p).isEmpty()) + if (!exclusiveGrabber(p) && passiveGrabbers(p).isEmpty()) return false; } return true; @@ -360,7 +339,7 @@ void QPointerEvent::setTimestamp(quint64 timestamp) { QInputEvent::setTimestamp(timestamp); for (auto &p : m_points) - QMutableEventPoint::from(p).setTimestamp(timestamp); + QMutableEventPoint::setTimestamp(p, timestamp); } /*! @@ -398,7 +377,7 @@ void QPointerEvent::setExclusiveGrabber(const QEventPoint &point, QObject *exclu Returns the list of objects that have been requested to receive all future update events and the release event containing the given \a point. - It's mainly for use in Qt Quick at this time. + It's only for use by \l {Qt Quick Input Handlers}. \sa QPointerEvent::addPassiveGrabber() */ @@ -418,7 +397,7 @@ QList<QPointer<QObject> > QPointerEvent::passiveGrabbers(const QEventPoint &poin future update events and the release event containing the given \a point, regardless where else those events may be delivered. - It's mainly for use in Qt Quick at this time. + It's only for use by \l {Qt Quick Input Handlers}. Returns \c false if \a grabber was already added, \c true otherwise. */ @@ -433,7 +412,7 @@ bool QPointerEvent::addPassiveGrabber(const QEventPoint &point, QObject *grabber Removes the passive \a grabber from the given \a point if it was previously added. Returns \c true if it had been a passive grabber before, \c false if not. - It's mainly for use in Qt Quick at this time. + It's only for use by \l {Qt Quick Input Handlers}. \sa QPointerEvent::addPassiveGrabber() */ @@ -447,7 +426,7 @@ bool QPointerEvent::removePassiveGrabber(const QEventPoint &point, QObject *grab /*! Removes all passive grabbers from the given \a point. - It's mainly for use in Qt Quick at this time. + It's only for use by \l {Qt Quick Input Handlers}. \sa QPointerEvent::addPassiveGrabber() */ @@ -548,30 +527,30 @@ QSinglePointEvent::QSinglePointEvent(QEvent::Type type, const QPointingDevice *d bool isWheel = (type == QEvent::Type::Wheel); auto devPriv = QPointingDevicePrivate::get(const_cast<QPointingDevice *>(pointingDevice())); auto epd = devPriv->pointById(0); - QMutableEventPoint &mut = QMutableEventPoint::from(epd->eventPoint); - Q_ASSERT(mut.device() == dev); - // mut is now a reference to a non-detached instance that lives in QPointingDevicePrivate::activePoints. + QEventPoint &p = epd->eventPoint; + Q_ASSERT(p.device() == dev); + // p is a reference to a non-detached instance that lives in QPointingDevicePrivate::activePoints. // Update persistent info in that instance. if (isPress || isWheel) - mut.setGlobalLastPosition(globalPos); + QMutableEventPoint::setGlobalLastPosition(p, globalPos); else - mut.setGlobalLastPosition(mut.globalPosition()); - mut.setGlobalPosition(globalPos); - if (isWheel && mut.state() != QEventPoint::State::Updated) - mut.setGlobalPressPosition(globalPos); + QMutableEventPoint::setGlobalLastPosition(p, p.globalPosition()); + QMutableEventPoint::setGlobalPosition(p, globalPos); + if (isWheel && p.state() != QEventPoint::State::Updated) + QMutableEventPoint::setGlobalPressPosition(p, globalPos); if (type == MouseButtonDblClick) - mut.setState(QEventPoint::State::Stationary); + QMutableEventPoint::setState(p, QEventPoint::State::Stationary); else if (button == Qt::NoButton || isWheel) - mut.setState(QEventPoint::State::Updated); + QMutableEventPoint::setState(p, QEventPoint::State::Updated); else if (isPress) - mut.setState(QEventPoint::State::Pressed); + QMutableEventPoint::setState(p, QEventPoint::State::Pressed); else - mut.setState(QEventPoint::State::Released); - mut.setScenePosition(scenePos); + QMutableEventPoint::setState(p, QEventPoint::State::Released); + QMutableEventPoint::setScenePosition(p, scenePos); // Now detach, and update the detached instance with ephemeral state. - mut.detach(); - mut.setPosition(localPos); - m_points.append(mut); + QMutableEventPoint::detach(p); + QMutableEventPoint::setPosition(p, localPos); + m_points.append(p); } /*! \internal @@ -595,6 +574,8 @@ QSinglePointEvent::QSinglePointEvent(QEvent::Type type, const QPointingDevice *d m_points << point; } +Q_IMPL_POINTER_EVENT(QSinglePointEvent) + /*! Returns \c true if this event represents a \l {button()}{button} being pressed. */ @@ -688,7 +669,10 @@ bool QSinglePointEvent::isEndEvent() const QCursor::pos() */ +#if QT_DEPRECATED_SINCE(6, 4) /*! + \deprecated [6.4] Use another constructor instead (global position is required). + Constructs a mouse event object originating from \a device. The \a type parameter must be one of QEvent::MouseButtonPress, @@ -719,6 +703,7 @@ QMouseEvent::QMouseEvent(Type type, const QPointF &localPos, Qt::MouseButton but button, buttons, modifiers) { } +#endif /*! Constructs a mouse event object originating from \a device. @@ -778,14 +763,10 @@ QMouseEvent::QMouseEvent(QEvent::Type type, const QPointF &localPos, const QPoin { } -/*! - \internal -*/ -QMouseEvent::~QMouseEvent() -{ -} +Q_IMPL_POINTER_EVENT(QMouseEvent) /*! + \fn Qt::MouseEventSource QMouseEvent::source() const \since 5.3 \deprecated [6.0] Use pointingDevice() instead. @@ -803,13 +784,24 @@ QMouseEvent::~QMouseEvent() \sa Qt::MouseEventSource \sa QGraphicsSceneMouseEvent::source() -*/ -#if QT_DEPRECATED_SINCE(6, 0) + + \note In Qt 5-based code, source() was often used to attempt to distinguish + mouse events from an actual mouse vs. those that were synthesized because + some legacy QQuickItem or QWidget subclass did not react to a QTouchEvent. + However, you could not tell whether it was synthesized from a QTouchEvent + or a QTabletEvent, and other information was lost. pointingDevice() + tells you the specific device that it came from, so you might check + \c {pointingDevice()->type()} or \c {pointingDevice()->capabilities()} to + decide how to react to this event. But it's even better to react to the + original event rather than handling only mouse events. +*/ +// Note: the docs mention 6.0 as a deprecation version. That is correct and +// intended, because we want our users to stop using it! Internally we will +// deprecate it when we port our code away from using it. Qt::MouseEventSource QMouseEvent::source() const { return Qt::MouseEventSource(m_source); } -#endif /*! \since 5.3 @@ -884,6 +876,7 @@ Qt::MouseEventFlags QMouseEvent::flags() const /*! \fn QPoint QMouseEvent::pos() const + \deprecated [6.0] Use position() instead. Returns the position of the mouse cursor, relative to the widget that received the event. @@ -1055,23 +1048,40 @@ Qt::MouseEventFlags QMouseEvent::flags() const The \a type parameter must be QEvent::HoverEnter, QEvent::HoverLeave, or QEvent::HoverMove. - The \a pos is the current mouse cursor's position relative to the - receiving widget, while \a oldPos is its previous such position. + The \a scenePos is the current mouse cursor's position relative to the + receiving window or scene, \a oldPos is its previous such position, and + \a globalPos is the mouse position in absolute coordinates. \a modifiers hold the state of all keyboard modifiers at the time of the event. */ -QHoverEvent::QHoverEvent(Type type, const QPointF &pos, const QPointF &oldPos, +QHoverEvent::QHoverEvent(Type type, const QPointF &scenePos, const QPointF &globalPos, const QPointF &oldPos, Qt::KeyboardModifiers modifiers, const QPointingDevice *device) - : QSinglePointEvent(type, device, pos, pos, pos, Qt::NoButton, Qt::NoButton, modifiers), m_oldPos(oldPos) + : QSinglePointEvent(type, device, scenePos, scenePos, globalPos, Qt::NoButton, Qt::NoButton, modifiers), m_oldPos(oldPos) { } +#if QT_DEPRECATED_SINCE(6, 3) /*! - \internal + \deprecated [6.3] Use the other constructor instead (global position is required). + + Constructs a hover event object originating from \a device. + + The \a type parameter must be QEvent::HoverEnter, + QEvent::HoverLeave, or QEvent::HoverMove. + + The \a pos is the current mouse cursor's position relative to the + receiving widget, while \a oldPos is its previous such position. + \a modifiers hold the state of all keyboard modifiers at the time + of the event. */ -QHoverEvent::~QHoverEvent() +QHoverEvent::QHoverEvent(Type type, const QPointF &pos, const QPointF &oldPos, + Qt::KeyboardModifiers modifiers, const QPointingDevice *device) + : QSinglePointEvent(type, device, pos, pos, pos, Qt::NoButton, Qt::NoButton, modifiers), m_oldPos(oldPos) { } +#endif + +Q_IMPL_POINTER_EVENT(QHoverEvent) #if QT_CONFIG(wheelevent) /*! @@ -1196,12 +1206,7 @@ QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF &globalPos, QPoint pi m_invertedScrolling = inverted; } -/*! - \internal -*/ -QWheelEvent::~QWheelEvent() -{ -} +Q_IMPL_POINTER_EVENT(QWheelEvent) /*! Returns \c true if this event's phase() is Qt::ScrollBegin. @@ -1381,12 +1386,7 @@ QKeyEvent::QKeyEvent(Type type, int key, Qt::KeyboardModifiers modifiers, } -/*! - \internal -*/ -QKeyEvent::~QKeyEvent() -{ -} +Q_IMPL_EVENT_COMMON(QKeyEvent) /*! \fn quint32 QKeyEvent::nativeScanCode() const @@ -1443,12 +1443,13 @@ QKeyEvent::~QKeyEvent() Returns the Unicode text that this key generated. - Return values when modifier keys such as - Shift, Control, Alt, and Meta are pressed - differ among platforms and could return an empty string. + The text is not limited to the printable range of Unicode + code points, and may include control characters or characters + from other Unicode categories, including QChar::Other_PrivateUse. - \note \l key() will always return a valid value, - independent of modifier keys. + The text may also be empty, for example when modifier keys such as + Shift, Control, Alt, and Meta are pressed (depending on the platform). + The key() function will always return a valid value. \sa Qt::WA_KeyCompression */ @@ -1560,12 +1561,7 @@ QFocusEvent::QFocusEvent(Type type, Qt::FocusReason reason) : QEvent(type), m_reason(reason) {} -/*! - \internal -*/ -QFocusEvent::~QFocusEvent() -{ -} +Q_IMPL_EVENT_COMMON(QFocusEvent) /*! Returns the reason for this focus event. @@ -1638,12 +1634,7 @@ QPaintEvent::QPaintEvent(const QRect &paintRect) {} -/*! - \internal -*/ -QPaintEvent::~QPaintEvent() -{ -} +Q_IMPL_EVENT_COMMON(QPaintEvent) /*! \fn const QRect &QPaintEvent::rect() const @@ -1685,12 +1676,7 @@ QMoveEvent::QMoveEvent(const QPoint &pos, const QPoint &oldPos) : QEvent(Move), m_pos(pos), m_oldPos(oldPos) {} -/*! - \internal -*/ -QMoveEvent::~QMoveEvent() -{ -} +Q_IMPL_EVENT_COMMON(QMoveEvent) /*! \fn const QPoint &QMoveEvent::pos() const @@ -1737,12 +1723,7 @@ QExposeEvent::QExposeEvent(const QRegion &exposeRegion) { } -/*! - \internal -*/ -QExposeEvent::~QExposeEvent() -{ -} +Q_IMPL_EVENT_COMMON(QExposeEvent) /*! \class QPlatformSurfaceEvent @@ -1786,12 +1767,7 @@ QPlatformSurfaceEvent::QPlatformSurfaceEvent(SurfaceEventType surfaceEventType) { } -/*! - \internal -*/ -QPlatformSurfaceEvent::~QPlatformSurfaceEvent() -{ -} +Q_IMPL_EVENT_COMMON(QPlatformSurfaceEvent) /*! \fn const QRegion &QExposeEvent::region() const @@ -1822,12 +1798,7 @@ QResizeEvent::QResizeEvent(const QSize &size, const QSize &oldSize) : QEvent(Resize), m_size(size), m_oldSize(oldSize) {} -/*! - \internal -*/ -QResizeEvent::~QResizeEvent() -{ -} +Q_IMPL_EVENT_COMMON(QResizeEvent) /*! \fn const QSize &QResizeEvent::size() const @@ -1869,10 +1840,6 @@ QResizeEvent::~QResizeEvent() special handling, you should reimplement the event handler and ignore() the event. - The \l{mainwindows/application#close event handler}{closeEvent() in the - Application example} shows a close event handler that - asks whether to save a document before closing. - If you want the widget to be deleted when it is closed, create it with the Qt::WA_DeleteOnClose flag. This is very useful for independent top-level windows in a multi-window application. @@ -1902,11 +1869,7 @@ QCloseEvent::QCloseEvent() : QEvent(Close) {} -/*! \internal -*/ -QCloseEvent::~QCloseEvent() -{ -} +Q_IMPL_EVENT_COMMON(QCloseEvent) /*! \class QIconDragEvent @@ -1935,10 +1898,7 @@ QIconDragEvent::QIconDragEvent() : QEvent(IconDrag) { ignore(); } -/*! \internal */ -QIconDragEvent::~QIconDragEvent() -{ -} +Q_IMPL_EVENT_COMMON(QIconDragEvent) /*! \class QContextMenuEvent @@ -1974,12 +1934,12 @@ QContextMenuEvent::QContextMenuEvent(Reason reason, const QPoint &pos, const QPo : QInputEvent(ContextMenu, QPointingDevice::primaryPointingDevice(), modifiers), m_pos(pos), m_globalPos(globalPos), m_reason(reason) {} +Q_IMPL_EVENT_COMMON(QContextMenuEvent) -/*! \internal */ -QContextMenuEvent::~QContextMenuEvent() -{ -} +#if QT_DEPRECATED_SINCE(6, 4) /*! + \deprecated [6.4] Use the other constructor instead (global position is required). + Constructs a context menu event object with the accept parameter flag set to false. @@ -2000,6 +1960,7 @@ QContextMenuEvent::QContextMenuEvent(Reason reason, const QPoint &pos) m_globalPos = QCursor::pos(); #endif } +#endif /*! \fn const QPoint &QContextMenuEvent::pos() const @@ -2134,7 +2095,7 @@ QContextMenuEvent::QContextMenuEvent(Reason reason, const QPoint &pos) has to be inserted to the widgets text directly before the preedit string. - If the commitString() should replace parts of the of the text in + If the commitString() should replace parts of the text in the editor, replacementLength() will contain the number of characters to be replaced. replacementStart() contains the position at which characters are to be replaced relative from the start of @@ -2290,9 +2251,7 @@ QInputMethodEvent::QInputMethodEvent(const QString &preeditText, const QList<Att { } -QInputMethodEvent::~QInputMethodEvent() -{ -} +Q_IMPL_EVENT_COMMON(QInputMethodEvent) /*! Sets the commit string to \a commitString. @@ -2302,7 +2261,7 @@ QInputMethodEvent::~QInputMethodEvent() result of the input operations and has to be inserted to the widgets text directly before the preedit string. - If the commit string should replace parts of the of the text in + If the commit string should replace parts of the text in the editor, \a replaceLength specifies the number of characters to be replaced. \a replaceFrom specifies the position at which characters are to be replaced relative from the start of @@ -2399,12 +2358,7 @@ QInputMethodQueryEvent::QInputMethodQueryEvent(Qt::InputMethodQueries queries) { } -/*! - \internal - */ -QInputMethodQueryEvent::~QInputMethodQueryEvent() -{ -} +Q_IMPL_EVENT_COMMON(QInputMethodQueryEvent) /*! Sets property \a query to \a value. @@ -2551,17 +2505,12 @@ QTabletEvent::QTabletEvent(Type type, const QPointingDevice *dev, const QPointF m_yTilt(yTilt), m_z(z) { - QMutableEventPoint &mut = QMutableEventPoint::from(point(0)); - mut.setPressure(pressure); - mut.setRotation(rotation); + QEventPoint &p = point(0); + QMutableEventPoint::setPressure(p, pressure); + QMutableEventPoint::setRotation(p, rotation); } -/*! - \internal -*/ -QTabletEvent::~QTabletEvent() -{ -} +Q_IMPL_POINTER_EVENT(QTabletEvent) /*! \fn qreal QTabletEvent::tangentialPressure() const @@ -2885,7 +2834,7 @@ QNativeGestureEvent::QNativeGestureEvent(Qt::NativeGestureType type, const QPoin Q_ASSERT(fingerCount < 16); // we store it in 4 bits unsigned } -QNativeGestureEvent::~QNativeGestureEvent() = default; +Q_IMPL_POINTER_EVENT(QNativeGestureEvent) /*! \fn QNativeGestureEvent::gestureType() const @@ -2988,12 +2937,7 @@ QDragMoveEvent::QDragMoveEvent(const QPoint& pos, Qt::DropActions actions, const , m_rect(pos, QSize(1, 1)) {} -/*! - Destroys the event. -*/ -QDragMoveEvent::~QDragMoveEvent() -{ -} +Q_IMPL_EVENT_COMMON(QDragMoveEvent) /*! \fn void QDragMoveEvent::accept(const QRect &rectangle) @@ -3106,10 +3050,7 @@ QDropEvent::QDropEvent(const QPointF& pos, Qt::DropActions actions, const QMimeD ignore(); } -/*! \internal */ -QDropEvent::~QDropEvent() -{ -} +Q_IMPL_EVENT_COMMON(QDropEvent) /*! @@ -3153,10 +3094,24 @@ void QDropEvent::setDropAction(Qt::DropAction action) */ /*! + \fn QPointF QDropEvent::position() const + \since 6.0 + + Returns the position where the drop was made. +*/ + +/*! \fn Qt::MouseButtons QDropEvent::mouseButtons() const \deprecated [6.0] Use buttons() instead. - Returns the mouse buttons that are pressed.. + Returns the mouse buttons that are pressed. +*/ + +/*! + \fn Qt::MouseButtons QDropEvent::buttons() const + \since 6.0 + + Returns the mouse buttons that are pressed. */ /*! @@ -3167,6 +3122,13 @@ void QDropEvent::setDropAction(Qt::DropAction action) */ /*! + \fn Qt::KeyboardModifiers QDropEvent::modifiers() const + \since 6.0 + + Returns the modifier keys that are pressed. +*/ + +/*! \fn void QDropEvent::setDropAction(Qt::DropAction action) Sets the \a action to be performed on the data by the target. @@ -3254,11 +3216,7 @@ QDragEnterEvent::QDragEnterEvent(const QPoint& point, Qt::DropActions actions, c : QDragMoveEvent(point, actions, data, buttons, modifiers, DragEnter) {} -/*! \internal -*/ -QDragEnterEvent::~QDragEnterEvent() -{ -} +Q_IMPL_EVENT_COMMON(QDragEnterEvent) /*! \class QDragMoveEvent @@ -3312,11 +3270,8 @@ QDragLeaveEvent::QDragLeaveEvent() : QEvent(DragLeave) {} -/*! \internal -*/ -QDragLeaveEvent::~QDragLeaveEvent() -{ -} +Q_IMPL_EVENT_COMMON(QDragLeaveEvent) + #endif // QT_CONFIG(draganddrop) /*! @@ -3398,11 +3353,7 @@ QHelpEvent::QHelpEvent(Type type, const QPoint &pos, const QPoint &globalPos) \sa pos(), globalX(), globalY() */ -/*! \internal -*/ -QHelpEvent::~QHelpEvent() -{ -} +Q_IMPL_EVENT_COMMON(QHelpEvent) #ifndef QT_NO_STATUSTIP @@ -3457,11 +3408,7 @@ QStatusTipEvent::QStatusTipEvent(const QString &tip) : QEvent(StatusTip), m_tip(tip) {} -/*! \internal -*/ -QStatusTipEvent::~QStatusTipEvent() -{ -} +Q_IMPL_EVENT_COMMON(QStatusTipEvent) /*! \fn QString QStatusTipEvent::tip() const @@ -3497,11 +3444,7 @@ QWhatsThisClickedEvent::QWhatsThisClickedEvent(const QString &href) : QEvent(WhatsThisClicked), m_href(href) {} -/*! \internal -*/ -QWhatsThisClickedEvent::~QWhatsThisClickedEvent() -{ -} +Q_IMPL_EVENT_COMMON(QWhatsThisClickedEvent) /*! \fn QString QWhatsThisClickedEvent::href() const @@ -3543,11 +3486,7 @@ QActionEvent::QActionEvent(int type, QAction *action, QAction *before) : QEvent(static_cast<QEvent::Type>(type)), m_action(action), m_before(before) {} -/*! \internal -*/ -QActionEvent::~QActionEvent() -{ -} +Q_IMPL_EVENT_COMMON(QActionEvent) /*! \fn QAction *QActionEvent::action() const @@ -3597,11 +3536,7 @@ QHideEvent::QHideEvent() : QEvent(Hide) {} -/*! \internal -*/ -QHideEvent::~QHideEvent() -{ -} +Q_IMPL_EVENT_COMMON(QHideEvent) /*! \class QShowEvent @@ -3627,11 +3562,7 @@ QShowEvent::QShowEvent() : QEvent(Show) {} -/*! \internal -*/ -QShowEvent::~QShowEvent() -{ -} +Q_IMPL_EVENT_COMMON(QShowEvent) /*! \class QFileOpenEvent @@ -3662,10 +3593,15 @@ QShowEvent::~QShowEvent() \snippet qfileopenevent/Info.plist Custom Info.plist - The following implementation of a QApplication subclass prints the path to - the file that was, for example, dropped on the Dock icon of the application. + The following implementation of a QApplication subclass shows how to handle + QFileOpenEvent to open the file that was, for example, dropped on the Dock + icon of the application. \snippet qfileopenevent/main.cpp QApplication subclass + + Note how \c{QFileOpenEvent::file()} is not guaranteed to be the name of a + local file that can be opened using QFile. The contents of the string depend + on the source application. */ /*! @@ -3688,29 +3624,28 @@ QFileOpenEvent::QFileOpenEvent(const QUrl &url) { } - -/*! \internal -*/ -QFileOpenEvent::~QFileOpenEvent() -{ -} +Q_IMPL_EVENT_COMMON(QFileOpenEvent) /*! \fn QString QFileOpenEvent::file() const - Returns the file that is being opened. + Returns the name of the file that the application should open. + + This is not guaranteed to be the path to a local file. */ /*! \fn QUrl QFileOpenEvent::url() const - Returns the url that is being opened. + Returns the url that the application should open. \since 4.6 */ +#if QT_DEPRECATED_SINCE(6, 6) /*! \fn bool QFileOpenEvent::openFile(QFile &file, QIODevice::OpenMode flags) const + \deprecated [6.6] interpret the string returned by file() Opens a QFile on the \a file referenced by this event in the mode specified by \a flags. Returns \c true if successful; otherwise returns \c false. @@ -3725,6 +3660,7 @@ bool QFileOpenEvent::openFile(QFile &file, QIODevice::OpenMode flags) const file.setFileName(m_file); return file.open(flags); } +#endif #ifndef QT_NO_TOOLBAR /*! @@ -3751,11 +3687,7 @@ QToolBarChangeEvent::QToolBarChangeEvent(bool t) : QEvent(ToolBarChange), m_toggle(t) {} -/*! \internal -*/ -QToolBarChangeEvent::~QToolBarChangeEvent() -{ -} +Q_IMPL_EVENT_COMMON(QToolBarChangeEvent) /*! \fn bool QToolBarChangeEvent::toggle() const @@ -3780,6 +3712,8 @@ QToolBarChangeEvent::~QToolBarChangeEvent() Constructs a shortcut event for the given \a key press, associated with the QShortcut ID \a id. + \deprecated use the other constructor + \a ambiguous specifies whether there is more than one QShortcut for the same key sequence. */ @@ -3789,12 +3723,29 @@ QShortcutEvent::QShortcutEvent(const QKeySequence &key, int id, bool ambiguous) } /*! - Destroys the event object. + Constructs a shortcut event for the given \a key press, + associated with the QShortcut \a shortcut. + \since 6.5 + + \a ambiguous specifies whether there is more than one QShortcut + for the same key sequence. */ -QShortcutEvent::~QShortcutEvent() +QShortcutEvent::QShortcutEvent(const QKeySequence &key, const QShortcut *shortcut, bool ambiguous) + : QEvent(Shortcut), m_sequence(key), m_shortcutId(0), m_ambiguous(ambiguous) { + if (shortcut) { + auto priv = static_cast<const QShortcutPrivate *>(QShortcutPrivate::get(shortcut)); + auto index = priv->sc_sequences.indexOf(key); + if (index < 0) { + qWarning() << "Given QShortcut does not contain key-sequence " << key; + return; + } + m_shortcutId = priv->sc_ids[index]; + } } +Q_IMPL_EVENT_COMMON(QShortcutEvent) + #endif // QT_CONFIG(shortcut) #ifndef QT_NO_DEBUG_STREAM @@ -3820,6 +3771,13 @@ static void formatUnicodeString(QDebug d, const QString &s) d << Qt::dec << '"'; } +static QDebug operator<<(QDebug dbg, const QInputMethodEvent::Attribute &attr) +{ + dbg << "[type= " << attr.type << ", start=" << attr.start << ", length=" << attr.length + << ", value=" << attr.value << ']'; + return dbg; +} + static inline void formatInputMethodEvent(QDebug d, const QInputMethodEvent *e) { d << "QInputMethodEvent("; @@ -3835,15 +3793,15 @@ static inline void formatInputMethodEvent(QDebug d, const QInputMethodEvent *e) d << ", replacementStart=" << e->replacementStart() << ", replacementLength=" << e->replacementLength(); } - if (const int attributeCount = e->attributes().size()) { + const auto attributes = e->attributes(); + auto it = attributes.cbegin(); + const auto end = attributes.cend(); + if (it != end) { d << ", attributes= {"; - for (int a = 0; a < attributeCount; ++a) { - const QInputMethodEvent::Attribute &at = e->attributes().at(a); - if (a) - d << ','; - d << "[type= " << at.type << ", start=" << at.start << ", length=" << at.length - << ", value=" << at.value << ']'; - } + d << *it; + ++it; + for (; it != end; ++it) + d << ',' << *it; d << '}'; } d << ')'; @@ -4095,10 +4053,7 @@ QDebug operator<<(QDebug dbg, const QEvent *e) bool isMouse = false; switch (type) { case QEvent::Expose: -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - dbg << "QExposeEvent(" << static_cast<const QExposeEvent *>(e)->region() << ')'; -QT_WARNING_POP + dbg << "QExposeEvent()"; break; case QEvent::Paint: dbg << "QPaintEvent(" << static_cast<const QPaintEvent *>(e)->region() << ')'; @@ -4173,6 +4128,10 @@ QT_WARNING_POP dbg << ", text=" << ke->text(); if (ke->isAutoRepeat()) dbg << ", autorepeat, count=" << ke->count(); + if (dbg.verbosity() > QDebug::DefaultVerbosity) { + dbg << ", nativeScanCode=" << ke->nativeScanCode(); + dbg << ", nativeVirtualKey=" << ke->nativeVirtualKey(); + } dbg << ')'; } break; @@ -4339,6 +4298,8 @@ QT_WARNING_POP /*! \fn int QShortcutEvent::shortcutId() const + \deprecated + Returns the ID of the QShortcut object for which this event was generated. @@ -4382,11 +4343,7 @@ bool QWindowStateChangeEvent::isOverride() const return m_override; } -/*! \internal -*/ -QWindowStateChangeEvent::~QWindowStateChangeEvent() -{ -} +Q_IMPL_EVENT_COMMON(QWindowStateChangeEvent) /*! @@ -4521,8 +4478,6 @@ QWindowStateChangeEvent::~QWindowStateChangeEvent() */ /*! - \deprecated [6.2] Use another constructor. - Constructs a QTouchEvent with the given \a eventType, \a device, \a touchPoints, and current keyboard \a modifiers at the time of the event. */ @@ -4536,10 +4491,11 @@ QTouchEvent::QTouchEvent(QEvent::Type eventType, { for (QEventPoint &point : m_points) { m_touchPointStates |= point.state(); - QMutableEventPoint::from(point).setDevice(device); + QMutableEventPoint::setDevice(point, device); } } +#if QT_DEPRECATED_SINCE(6, 0) /*! \deprecated [6.0] Use another constructor. @@ -4557,14 +4513,11 @@ QTouchEvent::QTouchEvent(QEvent::Type eventType, m_touchPointStates(touchPointStates) { for (QEventPoint &point : m_points) - QMutableEventPoint::from(point).setDevice(device); + QMutableEventPoint::setDevice(point, device); } +#endif // QT_DEPRECATED_SINCE(6, 0) -/*! - Destroys the QTouchEvent. -*/ -QTouchEvent::~QTouchEvent() -{ } +Q_IMPL_POINTER_EVENT(QTouchEvent) /*! Returns true if this event includes at least one newly-pressed touchpoint. @@ -4638,12 +4591,7 @@ QScrollPrepareEvent::QScrollPrepareEvent(const QPointF &startPos) { } -/*! - Destroys QScrollEvent. -*/ -QScrollPrepareEvent::~QScrollPrepareEvent() -{ -} +Q_IMPL_EVENT_COMMON(QScrollPrepareEvent) /*! \fn QPointF QScrollPrepareEvent::startPos() const @@ -4741,12 +4689,7 @@ QScrollEvent::QScrollEvent(const QPointF &contentPos, const QPointF &overshootDi { } -/*! - Destroys QScrollEvent. -*/ -QScrollEvent::~QScrollEvent() -{ -} +Q_IMPL_EVENT_COMMON(QScrollEvent) /*! \fn QPointF QScrollEvent::contentPos() const @@ -4783,12 +4726,7 @@ QScreenOrientationChangeEvent::QScreenOrientationChangeEvent(QScreen *screen, Qt { } -/*! - Destroys QScreenOrientationChangeEvent. -*/ -QScreenOrientationChangeEvent::~QScreenOrientationChangeEvent() -{ -} +Q_IMPL_EVENT_COMMON(QScreenOrientationChangeEvent) /*! \fn QScreen *QScreenOrientationChangeEvent::screen() const @@ -4811,12 +4749,57 @@ QApplicationStateChangeEvent::QApplicationStateChangeEvent(Qt::ApplicationState { } +Q_IMPL_EVENT_COMMON(QApplicationStateChangeEvent) + /*! \fn Qt::ApplicationState QApplicationStateChangeEvent::applicationState() const Returns the state of the application. */ +/*! + \class QChildWindowEvent + \inmodule QtGui + \since 6.7 + \brief The QChildWindowEvent class contains event parameters for + child window changes. + + \ingroup events + + Child window events are sent to windows when children are + added or removed. + + In both cases you can only rely on the child being a QWindow + — not any subclass thereof. This is because in the + QEvent::ChildWindowAdded case the subclass is not yet fully + constructed, and in the QEvent::ChildWindowRemoved case it + might have already been destructed. +*/ + +/*! + Constructs a child window event object of a particular \a type + for the \a childWindow. + + \a type can be QEvent::ChildWindowAdded or QEvent::ChildWindowRemoved. + + \sa child() +*/ +QChildWindowEvent::QChildWindowEvent(Type type, QWindow *childWindow) + : QEvent(type), c(childWindow) +{ +} + +Q_IMPL_EVENT_COMMON(QChildWindowEvent) + +/*! + \fn QWindow *QChildWindowEvent::child() const + + Returns the child window that was added or removed. +*/ + +QMutableTouchEvent::~QMutableTouchEvent() + = default; + /*! \internal Add the given \a point. */ @@ -4825,10 +4808,14 @@ void QMutableTouchEvent::addPoint(const QEventPoint &point) m_points.append(point); auto &added = m_points.last(); if (!added.device()) - QMutableEventPoint::from(added).setDevice(pointingDevice()); + QMutableEventPoint::setDevice(added, pointingDevice()); m_touchPointStates |= point.state(); } +QMutableSinglePointEvent::~QMutableSinglePointEvent() + = default; QT_END_NAMESPACE + +#include "moc_qevent.cpp" |