From 38e2837cb62f7cfeefc07d49a46faa5cf06c14ea Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 14 May 2019 19:31:06 +0300 Subject: [PATCH] Remove MOC for QtLottie. --- Telegram/ThirdParty/qtlottie | 2 +- .../QtBodymovin/private/bmbase_p.h | 2 -- .../QtBodymovin/private/bmconstants_p.h | 22 ------------------- .../QtBodymovin/private/bmrect_p.h | 2 -- Telegram/gyp/lib_lottie.gyp | 7 ------ 5 files changed, 1 insertion(+), 34 deletions(-) diff --git a/Telegram/ThirdParty/qtlottie b/Telegram/ThirdParty/qtlottie index 4ca937ed0f..2fa825bfd9 160000 --- a/Telegram/ThirdParty/qtlottie +++ b/Telegram/ThirdParty/qtlottie @@ -1 +1 @@ -Subproject commit 4ca937ed0f7158b5510c54429cc5e57adcf85f10 +Subproject commit 2fa825bfd9384b864e79861e8fa41273da8ab973 diff --git a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmbase_p.h b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmbase_p.h index 74195d978a..9445fea7fc 100644 --- a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmbase_p.h +++ b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmbase_p.h @@ -66,8 +66,6 @@ public: virtual BMBase *clone(BMBase *parent) const; - virtual bool setProperty(BMLiteral::PropertyType propertyType, QVariant value); - QString name() const; int type() const; diff --git a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmconstants_p.h b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmconstants_p.h index a88b49d1a2..a510ee3837 100644 --- a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmconstants_p.h +++ b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmconstants_p.h @@ -62,28 +62,6 @@ Q_DECLARE_LOGGING_CATEGORY(lcLottieQtBodymovinUpdate); Q_DECLARE_LOGGING_CATEGORY(lcLottieQtBodymovinRender); Q_DECLARE_LOGGING_CATEGORY(lcLottieQtBodymovinRenderThread); -class BODYMOVIN_EXPORT BMLiteral : public QObject -{ - Q_OBJECT -public: - enum ElementType { - Animation = 0, - LayerImage, - LayerNull, - LayerPrecomp, - LayerShape - }; - - enum PropertyType { - RectPosition, - RectSize, - RectRoundness - }; - Q_ENUM(PropertyType) - - explicit BMLiteral(QObject *parent = nullptr) : QObject(parent) {} -}; - QT_END_NAMESPACE #endif // BMCONSTANTS_P_H diff --git a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmrect_p.h b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmrect_p.h index 3dffd06207..a15964c7b9 100644 --- a/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmrect_p.h +++ b/Telegram/ThirdParty/qtlottie_helper/QtBodymovin/private/bmrect_p.h @@ -63,8 +63,6 @@ public: BMBase *clone(BMBase *parent) const override; - bool setProperty(BMLiteral::PropertyType propertyType, QVariant value) override; - void updateProperties(int frame) override; void render(LottieRenderer &renderer, int frame) const override; bool acceptsTrim() const override; diff --git a/Telegram/gyp/lib_lottie.gyp b/Telegram/gyp/lib_lottie.gyp index 4702a0e444..83ef24c5d9 100644 --- a/Telegram/gyp/lib_lottie.gyp +++ b/Telegram/gyp/lib_lottie.gyp @@ -8,12 +8,6 @@ 'includes': [ 'common.gypi', ], - 'variables': { - 'variables': { - 'moc_to_sources%': '1', - }, - 'moc_to_sources%': '<(moc_to_sources)', - }, 'targets': [{ 'target_name': 'lib_lottie', 'type': 'static_library', @@ -21,7 +15,6 @@ 'common.gypi', 'openssl.gypi', 'qt.gypi', - 'qt_moc.gypi', 'telegram_linux.gypi', 'pch.gypi', ],