kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Remove Q_OBJECT from CustomEmojiObject

Browse source
This commit is contained in:
Ilya Fedin 2023-09-07 11:38:45 +04:00 • committed by John Preston
parent 9a17d4bd15
commit ae8a74ea98
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ui/widgets/fields/input_field.cpp
View file

@ -1075,6 +1075,13 @@ CustomEmojiObject::CustomEmojiObject(Factory factory, Fn<bool()> paused)
CustomEmojiObject::~CustomEmojiObject() = default; CustomEmojiObject::~CustomEmojiObject() = default;
void *CustomEmojiObject::qt_metacast(const char *iid) {
if (QLatin1String(iid) == qobject_interface_iid<QTextObjectInterface*>()) {
return static_cast<QTextObjectInterface*>(this);
}
return QObject::qt_metacast(iid);
}
QSizeF CustomEmojiObject::intrinsicSize( QSizeF CustomEmojiObject::intrinsicSize(
QTextDocument *doc, QTextDocument *doc,
int posInDocument, int posInDocument,

5
ui/widgets/fields/input_field.h
View file

@ -73,15 +73,14 @@ enum class InputSubmitSettings {
}; };
class CustomEmojiObject : public QObject, public QTextObjectInterface { class CustomEmojiObject : public QObject, public QTextObjectInterface {
Q_OBJECT
Q_INTERFACES(QTextObjectInterface)
public: public:
using Factory = Fn<std::unique_ptr<Text::CustomEmoji>(QStringView)>; using Factory = Fn<std::unique_ptr<Text::CustomEmoji>(QStringView)>;
CustomEmojiObject(Factory factory, Fn<bool()> paused); CustomEmojiObject(Factory factory, Fn<bool()> paused);
~CustomEmojiObject(); ~CustomEmojiObject();
void *qt_metacast(const char *iid) override;
QSizeF intrinsicSize( QSizeF intrinsicSize(
QTextDocument *doc, QTextDocument *doc,
int posInDocument, int posInDocument,