Remove Q_OBJECT from CustomEmojiObject
This commit is contained in:
parent
9a17d4bd15
commit
ae8a74ea98
2 changed files with 9 additions and 3 deletions
|
|
@ -1075,6 +1075,13 @@ CustomEmojiObject::CustomEmojiObject(Factory factory, Fn<bool()> paused)
|
|||
|
||||
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(
|
||||
QTextDocument *doc,
|
||||
int posInDocument,
|
||||
|
|
|
|||
|
|
@ -73,15 +73,14 @@ enum class InputSubmitSettings {
|
|||
};
|
||||
|
||||
class CustomEmojiObject : public QObject, public QTextObjectInterface {
|
||||
Q_OBJECT
|
||||
Q_INTERFACES(QTextObjectInterface)
|
||||
|
||||
public:
|
||||
using Factory = Fn<std::unique_ptr<Text::CustomEmoji>(QStringView)>;
|
||||
|
||||
CustomEmojiObject(Factory factory, Fn<bool()> paused);
|
||||
~CustomEmojiObject();
|
||||
|
||||
void *qt_metacast(const char *iid) override;
|
||||
|
||||
QSizeF intrinsicSize(
|
||||
QTextDocument *doc,
|
||||
int posInDocument,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue