From fbc206ebeecee30d552ab8dd197b7c26979a63df Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 14 May 2019 16:37:22 +0300 Subject: [PATCH] QtLottie: Enforce BM nodes parent. --- Telegram/ThirdParty/qtlottie | 2 +- .../qtlottie_helper/QtBodymovin/private/bmasset_p.h | 10 +++++----- .../qtlottie_helper/QtBodymovin/private/bmbase_p.h | 12 ++++++------ .../QtBodymovin/private/bmbasictransform_p.h | 10 +++++----- .../QtBodymovin/private/bmellipse_p.h | 10 +++++----- .../qtlottie_helper/QtBodymovin/private/bmfill_p.h | 8 ++++---- .../QtBodymovin/private/bmfilleffect_p.h | 9 +++++---- .../QtBodymovin/private/bmfreeformshape_p.h | 10 +++++----- .../qtlottie_helper/QtBodymovin/private/bmgfill_p.h | 8 ++++---- .../qtlottie_helper/QtBodymovin/private/bmgroup_p.h | 9 +++++---- .../qtlottie_helper/QtBodymovin/private/bmlayer_p.h | 12 ++++++------ .../qtlottie_helper/QtBodymovin/private/bmmasks_p.h | 4 +++- .../QtBodymovin/private/bmmaskshape_p.h | 10 +++++----- .../QtBodymovin/private/bmnulllayer_p.h | 8 ++++---- .../QtBodymovin/private/bmprecompasset_p.h | 8 ++++---- .../QtBodymovin/private/bmprecomplayer_p.h | 10 +++++----- .../QtBodymovin/private/bmproperty_p.h | 1 - .../qtlottie_helper/QtBodymovin/private/bmrect_p.h | 10 ++++------ .../QtBodymovin/private/bmrepeater_p.h | 10 +++++----- .../QtBodymovin/private/bmrepeatertransform_p.h | 10 +++++----- .../qtlottie_helper/QtBodymovin/private/bmround_p.h | 10 +++++----- .../qtlottie_helper/QtBodymovin/private/bmscene_p.h | 3 +-- .../qtlottie_helper/QtBodymovin/private/bmshape_p.h | 8 ++++---- .../QtBodymovin/private/bmshapelayer_p.h | 8 ++++---- .../QtBodymovin/private/bmshapetransform_p.h | 9 +++++---- .../qtlottie_helper/QtBodymovin/private/bmstroke_p.h | 8 ++++---- .../QtBodymovin/private/bmtrimpath_p.h | 10 +++++----- 27 files changed, 114 insertions(+), 113 deletions(-) diff --git a/Telegram/ThirdParty/qtlottie b/Telegram/ThirdParty/qtlottie index 26d3e9ff5f..2a529ab07b 160000 --- a/Telegram/ThirdParty/qtlottie +++ b/Telegram/ThirdParty/qtlottie @@ -1 +1 @@ -Subproject commit 26d3e9ff5f354a20e72b90e2a3d4d57bd73baa8c +Subproject commit 2a529ab07bd105e0cac1a58ad5cb77f2fdc8f20d diff --git a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmasset_p.h b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmasset_p.h index 76bcc12dd3..6eebeff53e 100644 --- a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmasset_p.h +++ b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmasset_p.h @@ -50,17 +50,17 @@ class LottieRenderer; class BODYMOVIN_EXPORT BMAsset : public BMBase { public: - BMAsset() = default; - explicit BMAsset (const BMAsset &other) = default; + BMAsset(BMBase *parent); + BMAsset(BMBase *parent, const BMAsset &other); ~BMAsset() = default; - BMAsset *clone() const override; + BMAsset *clone(BMBase *parent) const override; - static BMAsset *construct(QJsonObject definition); + static BMAsset *construct(BMBase *parent, QJsonObject definition); void parse(const QJsonObject &definition) override; - void resolveAssets(const std::function &resolver) override; + void resolveAssets(const std::function &resolver) override; QString id() const; diff --git a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmbase_p.h b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmbase_p.h index ea46721b90..3b3a9b8442 100644 --- a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmbase_p.h +++ b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmbase_p.h @@ -59,11 +59,12 @@ class BMScene; class BODYMOVIN_EXPORT BMBase { public: - BMBase() = default; - explicit BMBase(const BMBase &other); + BMBase(BMBase *parent); + BMBase(BMBase *parent, const BMBase &other); + BMBase(const BMBase &other) = delete; virtual ~BMBase(); - virtual BMBase *clone() const; + virtual BMBase *clone(BMBase *parent) const; virtual bool setProperty(BMLiteral::PropertyType propertyType, QVariant value); @@ -80,7 +81,6 @@ public: bool hidden() const; inline BMBase *parent() const { return m_parent; } - void setParent(BMBase *parent); const QList &children() const { return m_children; } void prependChild(BMBase *child); @@ -91,7 +91,7 @@ public: virtual void updateProperties(int frame); virtual void render(LottieRenderer &renderer, int frame) const; - virtual void resolveAssets(const std::function &resolver); + virtual void resolveAssets(const std::function &resolver); protected: virtual BMScene *resolveTopRoot() const; @@ -110,7 +110,7 @@ protected: friend class BMRenderer; private: - BMBase *m_parent = nullptr; + BMBase * const m_parent = nullptr; QList m_children; // Handle to the topmost element on which this element resides diff --git a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmbasictransform_p.h b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmbasictransform_p.h index f0027ab15c..5a9eac7382 100644 --- a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmbasictransform_p.h +++ b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmbasictransform_p.h @@ -54,13 +54,13 @@ class QJsonObject; class BODYMOVIN_EXPORT BMBasicTransform : public BMShape { public: - BMBasicTransform() = default; - explicit BMBasicTransform(const BMBasicTransform &other); - BMBasicTransform(const QJsonObject &definition, BMBase *parent = nullptr); + BMBasicTransform(BMBase *parent); + BMBasicTransform(BMBase *parent, const BMBasicTransform &other); + BMBasicTransform(BMBase *parent, const QJsonObject &definition); - BMBase *clone() const override; + BMBase *clone(BMBase *parent) const override; - void construct(const QJsonObject &definition); + void parse(const QJsonObject &definition); void updateProperties(int frame) override; void render(LottieRenderer &renderer, int frame) const override; diff --git a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmellipse_p.h b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmellipse_p.h index cf49898a5f..e206c8813d 100644 --- a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmellipse_p.h +++ b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmellipse_p.h @@ -60,13 +60,13 @@ class QJsonObject; class BODYMOVIN_EXPORT BMEllipse : public BMShape { public: - BMEllipse() = default; - explicit BMEllipse(const BMEllipse &other); - BMEllipse(const QJsonObject &definition, BMBase *parent = nullptr); + BMEllipse(BMBase *parent); + BMEllipse(BMBase *parent, const BMEllipse &other); + BMEllipse(BMBase *parent, const QJsonObject &definition); - BMBase *clone() const override; + BMBase *clone(BMBase *parent) const override; - void construct(const QJsonObject &definition); + void parse(const QJsonObject &definition); void updateProperties(int frame) override; void render(LottieRenderer &renderer, int frame) const override; diff --git a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmfill_p.h b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmfill_p.h index 64e1b8e198..2ba1bae859 100644 --- a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmfill_p.h +++ b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmfill_p.h @@ -52,11 +52,11 @@ QT_BEGIN_NAMESPACE class BODYMOVIN_EXPORT BMFill : public BMShape { public: - BMFill() = default; - explicit BMFill(const BMFill &other); - BMFill(const QJsonObject &definition, BMBase *parent = nullptr); + BMFill(BMBase *parent); + BMFill(BMBase *parent, const BMFill &other); + BMFill(BMBase *parent, const QJsonObject &definition); - BMBase *clone() const override; + BMBase *clone(BMBase *parent) const override; void updateProperties(int frame) override; diff --git a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmfilleffect_p.h b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmfilleffect_p.h index 38dee17f19..5921a9735f 100644 --- a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmfilleffect_p.h +++ b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmfilleffect_p.h @@ -54,12 +54,13 @@ class QJsonObject; class BODYMOVIN_EXPORT BMFillEffect : public BMBase { public: - BMFillEffect() = default; - explicit BMFillEffect(const BMFillEffect &other); + BMFillEffect(BMBase *parent); + BMFillEffect(BMBase *parent, const BMFillEffect &other); + BMFillEffect(BMBase *parent, const QJsonObject &definition); - BMBase *clone() const override; + BMBase *clone(BMBase *parent) const override; - void construct(const QJsonObject &definition); + void parse(const QJsonObject &definition); void updateProperties(int frame) override; void render(LottieRenderer &renderer, int frame) const override; diff --git a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmfreeformshape_p.h b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmfreeformshape_p.h index b8cba5ca51..ce25481482 100644 --- a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmfreeformshape_p.h +++ b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmfreeformshape_p.h @@ -56,13 +56,13 @@ class QJsonObject; class BODYMOVIN_EXPORT BMFreeFormShape : public BMShape { public: - BMFreeFormShape(); - explicit BMFreeFormShape(const BMFreeFormShape &other); - BMFreeFormShape(const QJsonObject &definition, BMBase *parent = nullptr); + BMFreeFormShape(BMBase *parent); + BMFreeFormShape(BMBase *parent, const BMFreeFormShape &other); + BMFreeFormShape(BMBase *parent, const QJsonObject &definition); - BMBase *clone() const override; + BMBase *clone(BMBase *parent) const override; - void construct(const QJsonObject &definition); + void parse(const QJsonObject &definition); void updateProperties(int frame) override; void render(LottieRenderer &renderer, int frame) const override; diff --git a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmgfill_p.h b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmgfill_p.h index 36f539bca3..93827bcc87 100644 --- a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmgfill_p.h +++ b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmgfill_p.h @@ -54,12 +54,12 @@ QT_BEGIN_NAMESPACE class BODYMOVIN_EXPORT BMGFill : public BMShape { public: - BMGFill() = default; - explicit BMGFill(const BMGFill &other); - BMGFill(const QJsonObject &definition, BMBase *parent = nullptr); + BMGFill(BMBase *parent); + BMGFill(BMBase *parent, const BMGFill &other); + BMGFill(BMBase *parent, const QJsonObject &definition); ~BMGFill() override; - BMBase *clone() const override; + BMBase *clone(BMBase *parent) const override; void updateProperties(int frame) override; void render(LottieRenderer &renderer, int frame) const override; diff --git a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmgroup_p.h b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmgroup_p.h index eb25598fea..f554db088b 100644 --- a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmgroup_p.h +++ b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmgroup_p.h @@ -57,12 +57,13 @@ class BMPathTrimmer; class BODYMOVIN_EXPORT BMGroup : public BMShape { public: - BMGroup() = default; - BMGroup(const QJsonObject &definition, BMBase *parent = nullptr); + BMGroup(BMBase *parent); + BMGroup(BMBase *parent, const BMGroup &other); + BMGroup(BMBase *parent, const QJsonObject &definition); - BMBase *clone() const override; + BMBase *clone(BMBase *parent) const override; - void construct(const QJsonObject& definition); + void parse(const QJsonObject& definition); void updateProperties(int frame) override; void render(LottieRenderer &renderer, int frame) const override; diff --git a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmlayer_p.h b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmlayer_p.h index 3ca2fba74b..4c9207ca4a 100644 --- a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmlayer_p.h +++ b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmlayer_p.h @@ -42,6 +42,7 @@ // #include +#include QT_BEGIN_NAMESPACE @@ -53,15 +54,15 @@ class BODYMOVIN_EXPORT BMLayer : public BMBase public: enum MatteClipMode {NoClip, Alpha, InvertedAlpha, Luminence, InvertedLuminence}; - BMLayer() = default; - explicit BMLayer (const BMLayer &other); + BMLayer(BMBase *parent); + BMLayer(BMBase *parent, const BMLayer &other); ~BMLayer() override; - static BMLayer *construct(QJsonObject definition); + static BMLayer *construct(BMBase *parent, QJsonObject definition); bool active(int frame) const override; - void parse(const QJsonObject &definition) override; + void parse(const QJsonObject &definition) override; void updateProperties(int frame) override; @@ -72,7 +73,6 @@ public: MatteClipMode clipMode() const; int layerId() const; - BMBasicTransform *transform() const; void renderFullTransform(LottieRenderer &renderer, int frame) const; protected: @@ -89,7 +89,7 @@ protected: bool m_3dLayer = false; BMBase *m_effects = nullptr; qreal m_stretch; - BMBasicTransform *m_layerTransform = nullptr; + BMBasicTransform m_layerTransform; BMMasks *m_masks = nullptr; int m_parentLayer = 0; diff --git a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmmasks_p.h b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmmasks_p.h index d3dc429fd4..87053ae361 100644 --- a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmmasks_p.h +++ b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmmasks_p.h @@ -56,7 +56,9 @@ class QJsonObject; class BODYMOVIN_EXPORT BMMasks : public BMBase { public: - BMBase *clone() const override; + BMMasks(BMBase *parent); + BMMasks(BMBase *parent, const BMMasks &other); + BMBase *clone(BMBase *parent) const override; void render(LottieRenderer &renderer, int frame) const override; diff --git a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmmaskshape_p.h b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmmaskshape_p.h index 2e938d7a8f..ab79b6c87f 100644 --- a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmmaskshape_p.h +++ b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmmaskshape_p.h @@ -56,13 +56,13 @@ class QJsonObject; class BODYMOVIN_EXPORT BMMaskShape : public BMShape { public: - BMMaskShape(); - explicit BMMaskShape(const BMMaskShape &other); - BMMaskShape(const QJsonObject &definition, BMBase *parent = nullptr); + BMMaskShape(BMBase *parent); + BMMaskShape(BMBase *parent, const BMMaskShape &other); + BMMaskShape(BMBase *parent, const QJsonObject &definition); - BMBase *clone() const override; + BMBase *clone(BMBase *parent) const override; - void construct(const QJsonObject &definition); + void parse(const QJsonObject &definition); void updateProperties(int frame) override; void render(LottieRenderer &renderer, int frame) const override; diff --git a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmnulllayer_p.h b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmnulllayer_p.h index 8d60430967..c0c63cc88f 100644 --- a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmnulllayer_p.h +++ b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmnulllayer_p.h @@ -55,12 +55,12 @@ class BMBasicTransform; class BODYMOVIN_EXPORT BMNullLayer final : public BMLayer { public: - BMNullLayer() = default; - explicit BMNullLayer(const BMNullLayer &other); - BMNullLayer(const QJsonObject &definition); + BMNullLayer(BMBase *parent); + BMNullLayer(BMBase *parent, const BMNullLayer &other); + BMNullLayer(BMBase *parent, const QJsonObject &definition); ~BMNullLayer() override; - BMBase *clone() const override; + BMBase *clone(BMBase *parent) const override; void render(LottieRenderer &render, int frame) const override; diff --git a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmprecompasset_p.h b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmprecompasset_p.h index 01e098b886..5efbd56e4a 100644 --- a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmprecompasset_p.h +++ b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmprecompasset_p.h @@ -50,12 +50,12 @@ class LottieRenderer; class BODYMOVIN_EXPORT BMPreCompAsset : public BMAsset { public: - BMPreCompAsset() = default; - explicit BMPreCompAsset (const BMPreCompAsset &other) = default; - BMPreCompAsset(const QJsonObject &definition); + BMPreCompAsset(BMBase *parent); + BMPreCompAsset(BMBase *parent, const BMPreCompAsset &other); + BMPreCompAsset(BMBase *parent, const QJsonObject &definition); ~BMPreCompAsset() = default; - BMPreCompAsset *clone() const override; + BMPreCompAsset *clone(BMBase *parent) const override; }; QT_END_NAMESPACE diff --git a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmprecomplayer_p.h b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmprecomplayer_p.h index 176eadd0f7..1786a2be63 100644 --- a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmprecomplayer_p.h +++ b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmprecomplayer_p.h @@ -55,16 +55,16 @@ class BMBasicTransform; class BODYMOVIN_EXPORT BMPreCompLayer final : public BMLayer { public: - BMPreCompLayer() = default; - explicit BMPreCompLayer(const BMPreCompLayer &other); - BMPreCompLayer(const QJsonObject &definition); + BMPreCompLayer(BMBase *parent); + BMPreCompLayer(BMBase *parent, const BMPreCompLayer &other); + BMPreCompLayer(BMBase *parent, const QJsonObject &definition); ~BMPreCompLayer() override; - BMBase *clone() const override; + BMBase *clone(BMBase *parent) const override; void updateProperties(int frame) override; void render(LottieRenderer &renderer, int frame) const override; - void resolveAssets(const std::function &resolver) override; + void resolveAssets(const std::function &resolver) override; QString refId() const; diff --git a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmproperty_p.h b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmproperty_p.h index 9455efe0c0..c584570e3d 100644 --- a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmproperty_p.h +++ b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmproperty_p.h @@ -51,7 +51,6 @@ #include #include -#include #include QT_BEGIN_NAMESPACE diff --git a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmrect_p.h b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmrect_p.h index fa75eed3d4..3dffd06207 100644 --- a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmrect_p.h +++ b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmrect_p.h @@ -57,13 +57,11 @@ QT_BEGIN_NAMESPACE class BODYMOVIN_EXPORT BMRect : public BMShape { public: - BMRect() = default; - explicit BMRect(const BMRect &other); - BMRect(const QJsonObject &definition, BMBase *parent = nullptr); + BMRect(BMBase *parent); + BMRect(BMBase *parent, const BMRect &other); + BMRect(BMBase *parent, const QJsonObject &definition); - BMBase *clone() const override; - - void construct(const QJsonObject &definition); + BMBase *clone(BMBase *parent) const override; bool setProperty(BMLiteral::PropertyType propertyType, QVariant value) override; diff --git a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmrepeater_p.h b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmrepeater_p.h index 151bdc6091..50009d02dc 100644 --- a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmrepeater_p.h +++ b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmrepeater_p.h @@ -53,13 +53,13 @@ class QJsonObject; class BODYMOVIN_EXPORT BMRepeater : public BMShape { public: - BMRepeater() = default; - explicit BMRepeater(const BMRepeater &other); - BMRepeater(const QJsonObject &definition, BMBase *parent = nullptr); + BMRepeater(BMBase *parent); + BMRepeater(BMBase *parent, const BMRepeater &other); + BMRepeater(BMBase *parent, const QJsonObject &definition); - BMBase *clone() const override; + BMBase *clone(BMBase *parent) const override; - void construct(const QJsonObject& definition); + void parse(const QJsonObject& definition); void updateProperties(int frame) override; void render(LottieRenderer &renderer, int frame) const override; diff --git a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmrepeatertransform_p.h b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmrepeatertransform_p.h index 86147a21e4..ee7bb37147 100644 --- a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmrepeatertransform_p.h +++ b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmrepeatertransform_p.h @@ -50,13 +50,13 @@ class QJsonObject; class BODYMOVIN_EXPORT BMRepeaterTransform : public BMBasicTransform { public: - BMRepeaterTransform() = default; - explicit BMRepeaterTransform(const BMRepeaterTransform &other); - BMRepeaterTransform(const QJsonObject &definition, BMBase *parent); + BMRepeaterTransform(BMBase *parent); + BMRepeaterTransform(BMBase *parent, const BMRepeaterTransform &other); + BMRepeaterTransform(BMBase *parent, const QJsonObject &definition); - BMBase *clone() const override; + BMBase *clone(BMBase *parent) const override; - void construct(const QJsonObject &definition); + void parse(const QJsonObject &definition); void updateProperties(int frame) override; void render(LottieRenderer &renderer, int frame) const override; diff --git a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmround_p.h b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmround_p.h index fc499ef474..b916eae017 100644 --- a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmround_p.h +++ b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmround_p.h @@ -59,13 +59,13 @@ class QJsonObject; class BODYMOVIN_EXPORT BMRound : public BMShape { public: - BMRound() = default; - explicit BMRound(const BMRound &other); - BMRound(const QJsonObject &definition, BMBase *parent = nullptr); + BMRound(BMBase *parent); + BMRound(BMBase *parent, const BMRound &other); + BMRound(BMBase *parent, const QJsonObject &definition); - BMBase *clone() const override; + BMBase *clone(BMBase *parent) const override; - void construct(const QJsonObject &definition); + void parse(const QJsonObject &definition); void updateProperties(int frame) override; void render(LottieRenderer &renderer, int frame) const override; diff --git a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmscene_p.h b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmscene_p.h index fc56d1d0d2..4281961d89 100644 --- a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmscene_p.h +++ b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmscene_p.h @@ -56,13 +56,12 @@ class BMAsset; class BODYMOVIN_EXPORT BMScene : public BMBase { public: - BMScene(); BMScene(const BMScene &other) = delete; BMScene &operator=(const BMScene &other) = delete; explicit BMScene(const QJsonObject &definition); virtual ~BMScene(); - BMBase *clone() const override; + BMBase *clone(BMBase *parent) const override; void updateProperties(int frame) override; void render(LottieRenderer &renderer, int frame) const override; diff --git a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmshape_p.h b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmshape_p.h index 97caad6346..c5dead0381 100644 --- a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmshape_p.h +++ b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmshape_p.h @@ -70,12 +70,12 @@ class BMTrimPath; class BODYMOVIN_EXPORT BMShape : public BMBase { public: - BMShape() = default; - explicit BMShape(const BMShape &other); + BMShape(BMBase *parent); + BMShape(BMBase *parent, const BMShape &other); - BMBase *clone() const override; + BMBase *clone(BMBase *parent) const override; - static BMShape *construct(QJsonObject definition, BMBase *parent = nullptr); + static BMShape *construct(BMBase *parent, QJsonObject definition); virtual const QPainterPath &path() const; virtual bool acceptsTrim() const; diff --git a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmshapelayer_p.h b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmshapelayer_p.h index 9d6607fd84..9a9db1218c 100644 --- a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmshapelayer_p.h +++ b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmshapelayer_p.h @@ -55,12 +55,12 @@ class BMBasicTransform; class BODYMOVIN_EXPORT BMShapeLayer final : public BMLayer { public: - BMShapeLayer() = default; - explicit BMShapeLayer(const BMShapeLayer &other); - BMShapeLayer(const QJsonObject &definition); + BMShapeLayer(BMBase *parent); + BMShapeLayer(BMBase *parent, const BMShapeLayer &other); + BMShapeLayer(BMBase *parent, const QJsonObject &definition); ~BMShapeLayer() override; - BMBase *clone() const override; + BMBase *clone(BMBase *parent) const override; void updateProperties(int frame) override; void render(LottieRenderer &render, int frame) const override; diff --git a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmshapetransform_p.h b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmshapetransform_p.h index ca633323ea..139346cb11 100644 --- a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmshapetransform_p.h +++ b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmshapetransform_p.h @@ -54,12 +54,13 @@ class QJsonObject; class BODYMOVIN_EXPORT BMShapeTransform : public BMBasicTransform { public: - explicit BMShapeTransform(const BMShapeTransform &other); - BMShapeTransform(const QJsonObject &definition, BMBase *parent); + BMShapeTransform(BMBase *parent); + BMShapeTransform(BMBase *parent, const BMShapeTransform &other); + BMShapeTransform(BMBase *parent, const QJsonObject &definition); - BMBase *clone() const override; + BMBase *clone(BMBase *parent) const override; - void construct(const QJsonObject &definition); + void parse(const QJsonObject &definition); void updateProperties(int frame) override; void render(LottieRenderer &renderer, int frame) const override; diff --git a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmstroke_p.h b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmstroke_p.h index 3ebaef9e86..f655c4ed62 100644 --- a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmstroke_p.h +++ b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmstroke_p.h @@ -52,11 +52,11 @@ QT_BEGIN_NAMESPACE class BODYMOVIN_EXPORT BMStroke : public BMShape { public: - BMStroke() = default; - explicit BMStroke(const BMStroke &other); - BMStroke(const QJsonObject &definition, BMBase *parent = nullptr); + BMStroke(BMBase *parent); + BMStroke(BMBase *parent, const BMStroke &other); + BMStroke(BMBase *parent, const QJsonObject &definition); - BMBase *clone() const override; + BMBase *clone(BMBase *parent) const override; void updateProperties(int frame) override; void render(LottieRenderer &renderer, int frame) const override; diff --git a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmtrimpath_p.h b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmtrimpath_p.h index faaa8dfc0e..99898537d6 100644 --- a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmtrimpath_p.h +++ b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmtrimpath_p.h @@ -52,15 +52,15 @@ QT_BEGIN_NAMESPACE class BODYMOVIN_EXPORT BMTrimPath : public BMShape { public: - BMTrimPath(); - BMTrimPath(const QJsonObject &definition, BMBase *parent = nullptr); - explicit BMTrimPath(const BMTrimPath &other); + BMTrimPath(BMBase *parent); + BMTrimPath(BMBase *parent, const BMTrimPath &other); + BMTrimPath(BMBase *parent, const QJsonObject &definition); void inherit(const BMTrimPath &other); - BMBase *clone() const override; + BMBase *clone(BMBase *parent) const override; - void construct(const QJsonObject &definition); + void parse(const QJsonObject &definition); void updateProperties(int frame) override; void render(LottieRenderer &renderer, int frame) const override;