1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Return subclass type from overrides of QEvent::clone

Browse Source 
C++ allows overrides to return a covariant type, so if calling code has
already cast the callee down to the right type, don't require it to cast
the returned clone down as well.

Change-Id: I802f00a3c78e03047046986d0ed0a479b47573b8
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 146b37cdf376fb2fde85fa27326acfbeb2a024e3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Volker Hilsheimer 2020-11-23 11:32:21 +01:00 committed by Qt Cherry-pick Bot
parent b963f3aa0f
commit c11c9e52b4
2 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/kernel/qcoreevent.h
View File

@ -371,7 +371,7 @@ public:
~QTimerEvent(); ~QTimerEvent();
int timerId() const { return id; } int timerId() const { return id; }
QEvent *clone() const override { return new QTimerEvent(*this); }; QTimerEvent *clone() const override { return new QTimerEvent(*this); };
protected: protected:
int id; int id;
@ -390,7 +390,7 @@ public:
bool polished() const { return type() == ChildPolished; } bool polished() const { return type() == ChildPolished; }
bool removed() const { return type() == ChildRemoved; } bool removed() const { return type() == ChildRemoved; }
QEvent *clone() const override { return new QChildEvent(*this); }; QChildEvent *clone() const override { return new QChildEvent(*this); };
protected: protected:
QObject *c; QObject *c;
@ -405,7 +405,7 @@ public:
inline QByteArray propertyName() const { return n; } inline QByteArray propertyName() const { return n; }
QEvent *clone() const override { return new QDynamicPropertyChangeEvent(*this); }; QDynamicPropertyChangeEvent *clone() const override { return new QDynamicPropertyChangeEvent(*this); };
private: private:
QByteArray n; QByteArray n;
@ -419,7 +419,7 @@ public:
~QDeferredDeleteEvent(); ~QDeferredDeleteEvent();
int loopLevel() const { return level; } int loopLevel() const { return level; }
QEvent *clone() const override { return new QDeferredDeleteEvent(*this); }; QDeferredDeleteEvent *clone() const override { return new QDeferredDeleteEvent(*this); };
private: private:
int level; int level;

68
src/gui/kernel/qevent.h
View File

@ -78,7 +78,7 @@ class Q_GUI_EXPORT QInputEvent : public QEvent
public: public:
explicit QInputEvent(Type type, const QInputDevice *m_dev, Qt::KeyboardModifiers modifiers = Qt::NoModifier); explicit QInputEvent(Type type, const QInputDevice *m_dev, Qt::KeyboardModifiers modifiers = Qt::NoModifier);
~QInputEvent(); ~QInputEvent();
QEvent *clone() const override { return new QInputEvent(*this); } QInputEvent *clone() const override { return new QInputEvent(*this); }
const QInputDevice *device() const { return m_dev; } const QInputDevice *device() const { return m_dev; }
QInputDevice::DeviceType deviceType() const { return m_dev ? m_dev->type() : QInputDevice::DeviceType::Unknown; } QInputDevice::DeviceType deviceType() const { return m_dev ? m_dev->type() : QInputDevice::DeviceType::Unknown; }
@ -106,7 +106,7 @@ public:
Qt::KeyboardModifiers modifiers = Qt::NoModifier, const QList<QEventPoint> &points = {}); Qt::KeyboardModifiers modifiers = Qt::NoModifier, const QList<QEventPoint> &points = {});
~QPointerEvent(); ~QPointerEvent();
QEvent *clone() const override { return new QPointerEvent(*this); } QPointerEvent *clone() const override { return new QPointerEvent(*this); }
const QPointingDevice *pointingDevice() const; const QPointingDevice *pointingDevice() const;
QPointingDevice::PointerType pointerType() const { QPointingDevice::PointerType pointerType() const {
@ -162,7 +162,7 @@ public:
void setExclusivePointGrabber(QObject *exclusiveGrabber) void setExclusivePointGrabber(QObject *exclusiveGrabber)
{ QPointerEvent::setExclusiveGrabber(points().first(), exclusiveGrabber); } { QPointerEvent::setExclusiveGrabber(points().first(), exclusiveGrabber); }
QEvent *clone() const override { return new QSinglePointEvent(*this); } QSinglePointEvent *clone() const override { return new QSinglePointEvent(*this); }
protected: protected:
QSinglePointEvent(Type type, const QPointingDevice *dev, const QEventPoint &point, QSinglePointEvent(Type type, const QPointingDevice *dev, const QEventPoint &point,
@ -200,7 +200,7 @@ public:
const QPointingDevice *device = QPointingDevice::primaryPointingDevice()); const QPointingDevice *device = QPointingDevice::primaryPointingDevice());
~QEnterEvent(); ~QEnterEvent();
QEvent *clone() const override { return new QEnterEvent(*this); } QEnterEvent *clone() const override { return new QEnterEvent(*this); }
#if QT_DEPRECATED_SINCE(6, 0) #if QT_DEPRECATED_SINCE(6, 0)
#ifndef QT_NO_INTEGER_EVENT_COORDINATES #ifndef QT_NO_INTEGER_EVENT_COORDINATES
@ -247,7 +247,7 @@ public:
const QPointingDevice *device = QPointingDevice::primaryPointingDevice()); const QPointingDevice *device = QPointingDevice::primaryPointingDevice());
~QMouseEvent(); ~QMouseEvent();
QEvent *clone() const override { return new QMouseEvent(*this); } QMouseEvent *clone() const override { return new QMouseEvent(*this); }
#ifndef QT_NO_INTEGER_EVENT_COORDINATES #ifndef QT_NO_INTEGER_EVENT_COORDINATES
inline QPoint pos() const { return position().toPoint(); } inline QPoint pos() const { return position().toPoint(); }
@ -285,7 +285,7 @@ public:
const QPointingDevice *device = QPointingDevice::primaryPointingDevice()); const QPointingDevice *device = QPointingDevice::primaryPointingDevice());
~QHoverEvent(); ~QHoverEvent();
QEvent *clone() const override { return new QHoverEvent(*this); } QHoverEvent *clone() const override { return new QHoverEvent(*this); }
#if QT_DEPRECATED_SINCE(6, 0) #if QT_DEPRECATED_SINCE(6, 0)
#ifndef QT_NO_INTEGER_EVENT_COORDINATES #ifndef QT_NO_INTEGER_EVENT_COORDINATES
@ -327,7 +327,7 @@ public:
const QPointingDevice *device = QPointingDevice::primaryPointingDevice()); const QPointingDevice *device = QPointingDevice::primaryPointingDevice());
~QWheelEvent(); ~QWheelEvent();
QEvent *clone() const override { return new QWheelEvent(*this); } QWheelEvent *clone() const override { return new QWheelEvent(*this); }
inline QPoint pixelDelta() const { return m_pixelDelta; } inline QPoint pixelDelta() const { return m_pixelDelta; }
inline QPoint angleDelta() const { return m_angleDelta; } inline QPoint angleDelta() const { return m_angleDelta; }
@ -361,7 +361,7 @@ public:
Qt::MouseButton button, Qt::MouseButtons buttons); Qt::MouseButton button, Qt::MouseButtons buttons);
~QTabletEvent(); ~QTabletEvent();
QEvent *clone() const override { return new QTabletEvent(*this); } QTabletEvent *clone() const override { return new QTabletEvent(*this); }
#if QT_DEPRECATED_SINCE(6, 0) #if QT_DEPRECATED_SINCE(6, 0)
QT_DEPRECATED_VERSION_X_6_0("Use position()") QT_DEPRECATED_VERSION_X_6_0("Use position()")
@ -412,7 +412,7 @@ public:
const QPointF &globalPos, qreal value, quint64 sequenceId, quint64 intArgument); const QPointF &globalPos, qreal value, quint64 sequenceId, quint64 intArgument);
~QNativeGestureEvent(); ~QNativeGestureEvent();
QEvent *clone() const override { return new QNativeGestureEvent(*this); } QNativeGestureEvent *clone() const override { return new QNativeGestureEvent(*this); }
Qt::NativeGestureType gestureType() const { return m_gestureType; } Qt::NativeGestureType gestureType() const { return m_gestureType; }
qreal value() const { return m_realValue; } qreal value() const { return m_realValue; }
@ -453,7 +453,7 @@ public:
const QInputDevice *device = QInputDevice::primaryKeyboard()); const QInputDevice *device = QInputDevice::primaryKeyboard());
~QKeyEvent(); ~QKeyEvent();
QEvent *clone() const override { return new QKeyEvent(*this); } QKeyEvent *clone() const override { return new QKeyEvent(*this); }
int key() const { return m_key; } int key() const { return m_key; }
#if QT_CONFIG(shortcut) #if QT_CONFIG(shortcut)
@ -497,7 +497,7 @@ public:
explicit QFocusEvent(Type type, Qt::FocusReason reason=Qt::OtherFocusReason); explicit QFocusEvent(Type type, Qt::FocusReason reason=Qt::OtherFocusReason);
~QFocusEvent(); ~QFocusEvent();
QEvent *clone() const override { return new QFocusEvent(*this); } QFocusEvent *clone() const override { return new QFocusEvent(*this); }
inline bool gotFocus() const { return type() == FocusIn; } inline bool gotFocus() const { return type() == FocusIn; }
inline bool lostFocus() const { return type() == FocusOut; } inline bool lostFocus() const { return type() == FocusOut; }
@ -517,7 +517,7 @@ public:
explicit QPaintEvent(const QRect &paintRect); explicit QPaintEvent(const QRect &paintRect);
~QPaintEvent(); ~QPaintEvent();
QEvent *clone() const override { return new QPaintEvent(*this); } QPaintEvent *clone() const override { return new QPaintEvent(*this); }
inline const QRect &rect() const { return m_rect; } inline const QRect &rect() const { return m_rect; }
inline const QRegion &region() const { return m_region; } inline const QRegion &region() const { return m_region; }
@ -535,7 +535,7 @@ public:
QMoveEvent(const QPoint &pos, const QPoint &oldPos); QMoveEvent(const QPoint &pos, const QPoint &oldPos);
~QMoveEvent(); ~QMoveEvent();
QEvent *clone() const override { return new QMoveEvent(*this); } QMoveEvent *clone() const override { return new QMoveEvent(*this); }
inline const QPoint &pos() const { return m_pos; } inline const QPoint &pos() const { return m_pos; }
inline const QPoint &oldPos() const { return m_oldPos;} inline const QPoint &oldPos() const { return m_oldPos;}
@ -551,7 +551,7 @@ public:
explicit QExposeEvent(const QRegion &m_region); explicit QExposeEvent(const QRegion &m_region);
~QExposeEvent(); ~QExposeEvent();
QEvent *clone() const override { return new QExposeEvent(*this); } QExposeEvent *clone() const override { return new QExposeEvent(*this); }
#if QT_DEPRECATED_SINCE(6, 0) #if QT_DEPRECATED_SINCE(6, 0)
QT_DEPRECATED_VERSION_X_6_0("Handle QPaintEvent instead") QT_DEPRECATED_VERSION_X_6_0("Handle QPaintEvent instead")
@ -574,7 +574,7 @@ public:
explicit QPlatformSurfaceEvent(SurfaceEventType surfaceEventType); explicit QPlatformSurfaceEvent(SurfaceEventType surfaceEventType);
~QPlatformSurfaceEvent(); ~QPlatformSurfaceEvent();
QEvent *clone() const override { return new QPlatformSurfaceEvent(*this); } QPlatformSurfaceEvent *clone() const override { return new QPlatformSurfaceEvent(*this); }
inline SurfaceEventType surfaceEventType() const { return m_surfaceEventType; } inline SurfaceEventType surfaceEventType() const { return m_surfaceEventType; }
@ -589,7 +589,7 @@ public:
QResizeEvent(const QSize &size, const QSize &oldSize); QResizeEvent(const QSize &size, const QSize &oldSize);
~QResizeEvent(); ~QResizeEvent();
QEvent *clone() const override { return new QResizeEvent(*this); } QResizeEvent *clone() const override { return new QResizeEvent(*this); }
inline const QSize &size() const { return m_size; } inline const QSize &size() const { return m_size; }
inline const QSize &oldSize()const { return m_oldSize;} inline const QSize &oldSize()const { return m_oldSize;}
@ -646,7 +646,7 @@ public:
QContextMenuEvent(Reason reason, const QPoint &pos); QContextMenuEvent(Reason reason, const QPoint &pos);
~QContextMenuEvent(); ~QContextMenuEvent();
QEvent *clone() const override { return new QContextMenuEvent(*this); } QContextMenuEvent *clone() const override { return new QContextMenuEvent(*this); }
inline int x() const { return m_pos.x(); } inline int x() const { return m_pos.x(); }
inline int y() const { return m_pos.y(); } inline int y() const { return m_pos.y(); }
@ -691,7 +691,7 @@ public:
QInputMethodEvent(const QString &preeditText, const QList<Attribute> &attributes); QInputMethodEvent(const QString &preeditText, const QList<Attribute> &attributes);
~QInputMethodEvent(); ~QInputMethodEvent();
QEvent *clone() const override { return new QInputMethodEvent(*this); } QInputMethodEvent *clone() const override { return new QInputMethodEvent(*this); }
void setCommitString(const QString &commitString, int replaceFrom = 0, int replaceLength = 0); void setCommitString(const QString &commitString, int replaceFrom = 0, int replaceLength = 0);
inline const QList<Attribute> &attributes() const { return m_attributes; } inline const QList<Attribute> &attributes() const { return m_attributes; }
@ -730,7 +730,7 @@ public:
explicit QInputMethodQueryEvent(Qt::InputMethodQueries queries); explicit QInputMethodQueryEvent(Qt::InputMethodQueries queries);
~QInputMethodQueryEvent(); ~QInputMethodQueryEvent();
QEvent *clone() const override { return new QInputMethodQueryEvent(*this); } QInputMethodQueryEvent *clone() const override { return new QInputMethodQueryEvent(*this); }
Qt::InputMethodQueries queries() const { return m_queries; } Qt::InputMethodQueries queries() const { return m_queries; }
@ -761,7 +761,7 @@ public:
Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Type type = Drop); Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Type type = Drop);
~QDropEvent(); ~QDropEvent();
QEvent *clone() const override { return new QDropEvent(*this); } QDropEvent *clone() const override { return new QDropEvent(*this); }
#if QT_DEPRECATED_SINCE(6, 0) #if QT_DEPRECATED_SINCE(6, 0)
QT_DEPRECATED_VERSION_X_6_0("Use position().toPoint()") QT_DEPRECATED_VERSION_X_6_0("Use position().toPoint()")
@ -808,7 +808,7 @@ public:
Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Type type = DragMove); Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Type type = DragMove);
~QDragMoveEvent(); ~QDragMoveEvent();
QEvent *clone() const override { return new QDragMoveEvent(*this); } QDragMoveEvent *clone() const override { return new QDragMoveEvent(*this); }
inline QRect answerRect() const { return m_rect; } inline QRect answerRect() const { return m_rect; }
@ -850,7 +850,7 @@ public:
QHelpEvent(Type type, const QPoint &pos, const QPoint &globalPos); QHelpEvent(Type type, const QPoint &pos, const QPoint &globalPos);
~QHelpEvent(); ~QHelpEvent();
QEvent *clone() const override { return new QHelpEvent(*this); } QHelpEvent *clone() const override { return new QHelpEvent(*this); }
inline int x() const { return m_pos.x(); } inline int x() const { return m_pos.x(); }
inline int y() const { return m_pos.y(); } inline int y() const { return m_pos.y(); }
@ -873,7 +873,7 @@ public:
explicit QStatusTipEvent(const QString &tip); explicit QStatusTipEvent(const QString &tip);
~QStatusTipEvent(); ~QStatusTipEvent();
QEvent *clone() const override { return new QStatusTipEvent(*this); } QStatusTipEvent *clone() const override { return new QStatusTipEvent(*this); }
inline QString tip() const { return m_tip; } inline QString tip() const { return m_tip; }
private: private:
@ -889,7 +889,7 @@ public:
explicit QWhatsThisClickedEvent(const QString &href); explicit QWhatsThisClickedEvent(const QString &href);
~QWhatsThisClickedEvent(); ~QWhatsThisClickedEvent();
QEvent *clone() const override { return new QWhatsThisClickedEvent(*this); } QWhatsThisClickedEvent *clone() const override { return new QWhatsThisClickedEvent(*this); }
inline QString href() const { return m_href; } inline QString href() const { return m_href; }
private: private:
@ -905,7 +905,7 @@ public:
QActionEvent(int type, QAction *action, QAction *before = nullptr); QActionEvent(int type, QAction *action, QAction *before = nullptr);
~QActionEvent(); ~QActionEvent();
QEvent *clone() const override { return new QActionEvent(*this); } QActionEvent *clone() const override { return new QActionEvent(*this); }
inline QAction *action() const { return m_action; } inline QAction *action() const { return m_action; }
inline QAction *before() const { return m_before; } inline QAction *before() const { return m_before; }
@ -923,7 +923,7 @@ public:
explicit QFileOpenEvent(const QUrl &url); explicit QFileOpenEvent(const QUrl &url);
~QFileOpenEvent(); ~QFileOpenEvent();
QEvent *clone() const override { return new QFileOpenEvent(*this); } QFileOpenEvent *clone() const override { return new QFileOpenEvent(*this); }
inline QString file() const { return m_file; } inline QString file() const { return m_file; }
QUrl url() const { return m_url; } QUrl url() const { return m_url; }
@ -941,7 +941,7 @@ public:
explicit QToolBarChangeEvent(bool t); explicit QToolBarChangeEvent(bool t);
~QToolBarChangeEvent(); ~QToolBarChangeEvent();
QEvent *clone() const override { return new QToolBarChangeEvent(*this); } QToolBarChangeEvent *clone() const override { return new QToolBarChangeEvent(*this); }
inline bool toggle() const { return m_toggle; } inline bool toggle() const { return m_toggle; }
private: private:
@ -957,7 +957,7 @@ public:
QShortcutEvent(const QKeySequence &key, int id, bool ambiguous = false); QShortcutEvent(const QKeySequence &key, int id, bool ambiguous = false);
~QShortcutEvent(); ~QShortcutEvent();
QEvent *clone() const override { return new QShortcutEvent(*this); } QShortcutEvent *clone() const override { return new QShortcutEvent(*this); }
inline const QKeySequence &key() const { return m_sequence; } inline const QKeySequence &key() const { return m_sequence; }
inline int shortcutId() const { return m_shortcutId; } inline int shortcutId() const { return m_shortcutId; }
@ -976,7 +976,7 @@ public:
explicit QWindowStateChangeEvent(Qt::WindowStates oldState, bool isOverride = false); explicit QWindowStateChangeEvent(Qt::WindowStates oldState, bool isOverride = false);
~QWindowStateChangeEvent(); ~QWindowStateChangeEvent();
QEvent *clone() const override { return new QWindowStateChangeEvent(*this); } QWindowStateChangeEvent *clone() const override { return new QWindowStateChangeEvent(*this); }
inline Qt::WindowStates oldState() const { return m_oldStates; } inline Qt::WindowStates oldState() const { return m_oldStates; }
bool isOverride() const; bool isOverride() const;
@ -1010,7 +1010,7 @@ public:
#endif #endif
~QTouchEvent(); ~QTouchEvent();
QEvent *clone() const override { return new QTouchEvent(*this); } QTouchEvent *clone() const override { return new QTouchEvent(*this); }
inline QObject *target() const { return m_target; } inline QObject *target() const { return m_target; }
inline QEventPoint::States touchPointStates() const { return m_touchPointStates; } inline QEventPoint::States touchPointStates() const { return m_touchPointStates; }
@ -1035,7 +1035,7 @@ public:
explicit QScrollPrepareEvent(const QPointF &startPos); explicit QScrollPrepareEvent(const QPointF &startPos);
~QScrollPrepareEvent(); ~QScrollPrepareEvent();
QEvent *clone() const override { return new QScrollPrepareEvent(*this); } QScrollPrepareEvent *clone() const override { return new QScrollPrepareEvent(*this); }
QPointF startPos() const { return m_startPos; } QPointF startPos() const { return m_startPos; }
@ -1069,7 +1069,7 @@ public:
QScrollEvent(const QPointF &contentPos, const QPointF &overshoot, ScrollState scrollState); QScrollEvent(const QPointF &contentPos, const QPointF &overshoot, ScrollState scrollState);
~QScrollEvent(); ~QScrollEvent();
QEvent *clone() const override { return new QScrollEvent(*this); } QScrollEvent *clone() const override { return new QScrollEvent(*this); }
QPointF contentPos() const { return m_contentPos; } QPointF contentPos() const { return m_contentPos; }
QPointF overshootDistance() const { return m_overshoot; } QPointF overshootDistance() const { return m_overshoot; }
@ -1088,7 +1088,7 @@ public:
QScreenOrientationChangeEvent(QScreen *screen, Qt::ScreenOrientation orientation); QScreenOrientationChangeEvent(QScreen *screen, Qt::ScreenOrientation orientation);
~QScreenOrientationChangeEvent(); ~QScreenOrientationChangeEvent();
QEvent *clone() const override { return new QScreenOrientationChangeEvent(*this); } QScreenOrientationChangeEvent *clone() const override { return new QScreenOrientationChangeEvent(*this); }
QScreen *screen() const { return m_screen; } QScreen *screen() const { return m_screen; }
Qt::ScreenOrientation orientation() const { return m_orientation; } Qt::ScreenOrientation orientation() const { return m_orientation; }
@ -1104,7 +1104,7 @@ class Q_GUI_EXPORT QApplicationStateChangeEvent : public QEvent
public: public:
explicit QApplicationStateChangeEvent(Qt::ApplicationState state); explicit QApplicationStateChangeEvent(Qt::ApplicationState state);
QEvent *clone() const override { return new QApplicationStateChangeEvent(*this); } QApplicationStateChangeEvent *clone() const override { return new QApplicationStateChangeEvent(*this); }
Qt::ApplicationState applicationState() const { return m_applicationState; } Qt::ApplicationState applicationState() const { return m_applicationState; }