From 26c29f6af74d516cb7b7975b1801a3d579d55a68 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 15 May 2019 19:54:08 +0300
Subject: [PATCH] QtLottie: Move everything to Lottie namespace.

---
 Telegram/SourceFiles/lottie/lottie_animation.cpp      | 4 ++--
 Telegram/SourceFiles/lottie/lottie_frame_renderer.cpp | 4 ++--
 Telegram/ThirdParty/qtlottie                          | 2 +-
 Telegram/gyp/lib_lottie.gyp                           | 9 ++++-----
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/lottie/lottie_animation.cpp b/Telegram/SourceFiles/lottie/lottie_animation.cpp
index 934fdbcff6..d233f6b1e0 100644
--- a/Telegram/SourceFiles/lottie/lottie_animation.cpp
+++ b/Telegram/SourceFiles/lottie/lottie_animation.cpp
@@ -16,7 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QFile>
 
 #include "logs.h"
-#include "rasterrenderer/lottierasterrenderer.h"
+#include "rasterrenderer/rasterrenderer.h"
 
 namespace Lottie {
 
@@ -43,7 +43,7 @@ std::unique_ptr<Animation> FromFile(const QString &path) {
 }
 
 std::unique_ptr<Animation> FromData(const QByteArray &data) {
-	return std::make_unique<Lottie::Animation>(data);
+	return std::make_unique<Animation>(data);
 }
 
 Animation::Animation(const QByteArray &content)
diff --git a/Telegram/SourceFiles/lottie/lottie_frame_renderer.cpp b/Telegram/SourceFiles/lottie/lottie_frame_renderer.cpp
index 8d33a6591a..fff050df0a 100644
--- a/Telegram/SourceFiles/lottie/lottie_frame_renderer.cpp
+++ b/Telegram/SourceFiles/lottie/lottie_frame_renderer.cpp
@@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lottie/lottie_frame_renderer.h"
 
 #include "lottie/lottie_animation.h"
-#include "rasterrenderer/lottierasterrenderer.h"
+#include "rasterrenderer/rasterrenderer.h"
 #include "logs.h"
 
 #include <range/v3/algorithm/find.hpp>
@@ -215,7 +215,7 @@ void SharedState::renderFrame(
 
 	const auto updated = crl::now();
 
-	LottieRasterRenderer renderer(&p);
+	RasterRenderer renderer(&p);
 	_scene.render(renderer, frame);
 
 	const auto finished = crl::now();
diff --git a/Telegram/ThirdParty/qtlottie b/Telegram/ThirdParty/qtlottie
index 15be485c69..20913173a9 160000
--- a/Telegram/ThirdParty/qtlottie
+++ b/Telegram/ThirdParty/qtlottie
@@ -1 +1 @@
-Subproject commit 15be485c6914a48b0031ceaa15a5ff53f5214985
+Subproject commit 20913173a9e72bd09d06a16245b15e9bd6dde517
diff --git a/Telegram/gyp/lib_lottie.gyp b/Telegram/gyp/lib_lottie.gyp
index 29b1f28f6c..e0d865ad0d 100644
--- a/Telegram/gyp/lib_lottie.gyp
+++ b/Telegram/gyp/lib_lottie.gyp
@@ -77,7 +77,7 @@
       '<(lottie_loc)/bodymovin/bmfreeformshape.cpp',
       '<(lottie_loc)/bodymovin/bmtrimpath.cpp',
       '<(lottie_loc)/bodymovin/bmpathtrimmer.cpp',
-      '<(lottie_loc)/bodymovin/lottierenderer.cpp',
+      '<(lottie_loc)/bodymovin/renderer.cpp',
       '<(lottie_loc)/bodymovin/trimpath.cpp',
       '<(lottie_loc)/bodymovin/bmfilleffect.cpp',
       '<(lottie_loc)/bodymovin/bmrepeater.cpp',
@@ -87,7 +87,6 @@
       '<(lottie_loc)/bodymovin/beziereasing.h',
       '<(lottie_loc)/bodymovin/bmbase.h',
       '<(lottie_loc)/bodymovin/bmbasictransform.h',
-      '<(lottie_loc)/bodymovin/bmconstants.h',
       '<(lottie_loc)/bodymovin/bmellipse.h',
       '<(lottie_loc)/bodymovin/bmfill.h',
       '<(lottie_loc)/bodymovin/bmfilleffect.h',
@@ -107,13 +106,13 @@
       '<(lottie_loc)/bodymovin/bmstroke.h',
       '<(lottie_loc)/bodymovin/bmtrimpath.h',
       '<(lottie_loc)/bodymovin/trimpath.h',
-      '<(lottie_loc)/bodymovin/lottierenderer.h',
+      '<(lottie_loc)/bodymovin/renderer.h',
       '<(lottie_loc)/bodymovin/bmpathtrimmer.h',
 
       # taken from qtlottie/src/imports/imports.pro
-      '<(lottie_loc)/imports/rasterrenderer/lottierasterrenderer.cpp',
+      '<(lottie_loc)/imports/rasterrenderer/rasterrenderer.cpp',
 
-      '<(lottie_loc)/imports/rasterrenderer/lottierasterrenderer.h',
+      '<(lottie_loc)/imports/rasterrenderer/rasterrenderer.h',
 
       # added to qtlottie/src/bodymovin/bodymovin.pro
       '<(lottie_loc)/bodymovin/bmasset.cpp',