From ae8a74ea98bfa7cc10aa833f278cc34f9100f5a6 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Thu, 7 Sep 2023 11:38:45 +0400 Subject: [PATCH] Remove Q_OBJECT from CustomEmojiObject --- ui/widgets/fields/input_field.cpp | 7 +++++++ ui/widgets/fields/input_field.h | 5 ++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ui/widgets/fields/input_field.cpp b/ui/widgets/fields/input_field.cpp index 2bccfcb..795228e 100644 --- a/ui/widgets/fields/input_field.cpp +++ b/ui/widgets/fields/input_field.cpp @@ -1075,6 +1075,13 @@ CustomEmojiObject::CustomEmojiObject(Factory factory, Fn paused) CustomEmojiObject::~CustomEmojiObject() = default; +void *CustomEmojiObject::qt_metacast(const char *iid) { + if (QLatin1String(iid) == qobject_interface_iid()) { + return static_cast(this); + } + return QObject::qt_metacast(iid); +} + QSizeF CustomEmojiObject::intrinsicSize( QTextDocument *doc, int posInDocument, diff --git a/ui/widgets/fields/input_field.h b/ui/widgets/fields/input_field.h index 65692e0..13a5603 100644 --- a/ui/widgets/fields/input_field.h +++ b/ui/widgets/fields/input_field.h @@ -73,15 +73,14 @@ enum class InputSubmitSettings { }; class CustomEmojiObject : public QObject, public QTextObjectInterface { - Q_OBJECT - Q_INTERFACES(QTextObjectInterface) - public: using Factory = Fn(QStringView)>; CustomEmojiObject(Factory factory, Fn paused); ~CustomEmojiObject(); + void *qt_metacast(const char *iid) override; + QSizeF intrinsicSize( QTextDocument *doc, int posInDocument,