From c11c9e52b46183f15d0603e29fc518c16db3edde Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Mon, 23 Nov 2020 11:32:21 +0100 Subject: Return subclass type from overrides of QEvent::clone 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 (cherry picked from commit 146b37cdf376fb2fde85fa27326acfbeb2a024e3) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/kernel/qcoreevent.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h index 2133ab6213..780b84f98d 100644 --- a/src/corelib/kernel/qcoreevent.h +++ b/src/corelib/kernel/qcoreevent.h @@ -371,7 +371,7 @@ public: ~QTimerEvent(); int timerId() const { return id; } - QEvent *clone() const override { return new QTimerEvent(*this); }; + QTimerEvent *clone() const override { return new QTimerEvent(*this); }; protected: int id; @@ -390,7 +390,7 @@ public: bool polished() const { return type() == ChildPolished; } bool removed() const { return type() == ChildRemoved; } - QEvent *clone() const override { return new QChildEvent(*this); }; + QChildEvent *clone() const override { return new QChildEvent(*this); }; protected: QObject *c; @@ -405,7 +405,7 @@ public: inline QByteArray propertyName() const { return n; } - QEvent *clone() const override { return new QDynamicPropertyChangeEvent(*this); }; + QDynamicPropertyChangeEvent *clone() const override { return new QDynamicPropertyChangeEvent(*this); }; private: QByteArray n; @@ -419,7 +419,7 @@ public: ~QDeferredDeleteEvent(); int loopLevel() const { return level; } - QEvent *clone() const override { return new QDeferredDeleteEvent(*this); }; + QDeferredDeleteEvent *clone() const override { return new QDeferredDeleteEvent(*this); }; private: int level; -- cgit v1.2.3