summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2019-04-03 13:48:33 +0300
committerKonstantin Ritt <ritt.ks@gmail.com>2019-04-09 04:26:19 +0000
commit381cf7475268f303983e1a91ec0a01d0dfe60f7a (patch)
tree6e647a79b07a0a0eee263b5e3598991809cebd6f
parent738cf406be309034a529686ab79baad795be7544 (diff)
BatchRenderer: minor clean-up
Change-Id: I19fa7a3e2d62fcb752e699e1578d64e4330026e0 Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
-rw-r--r--src/imports/rasterrenderer/batchrenderer.cpp2
-rw-r--r--src/imports/rasterrenderer/batchrenderer.h17
2 files changed, 7 insertions, 12 deletions
diff --git a/src/imports/rasterrenderer/batchrenderer.cpp b/src/imports/rasterrenderer/batchrenderer.cpp
index cc168a6..6b64e7a 100644
--- a/src/imports/rasterrenderer/batchrenderer.cpp
+++ b/src/imports/rasterrenderer/batchrenderer.cpp
@@ -222,7 +222,7 @@ void BatchRenderer::run()
}
}
-int BatchRenderer::parse(BMBase* rootElement, QByteArray jsonSource)
+int BatchRenderer::parse(BMBase *rootElement, const QByteArray &jsonSource) const
{
QJsonDocument doc = QJsonDocument::fromJson(jsonSource);
QJsonObject rootObj = doc.object();
diff --git a/src/imports/rasterrenderer/batchrenderer.h b/src/imports/rasterrenderer/batchrenderer.h
index a790358..4ede260 100644
--- a/src/imports/rasterrenderer/batchrenderer.h
+++ b/src/imports/rasterrenderer/batchrenderer.h
@@ -57,7 +57,7 @@ class BatchRenderer : public QThread
};
public:
- virtual ~BatchRenderer();
+ ~BatchRenderer() override;
BatchRenderer(BatchRenderer const &) = delete;
void operator=(BatchRenderer const&) = delete;
@@ -80,20 +80,12 @@ public slots:
void setCacheSize(int size);
protected:
- virtual void run();
+ void run() override;
- int parse(BMBase* rootElement, QByteArray jsonSource);
+ int parse(BMBase *rootElement, const QByteArray &jsonSource) const;
- void prerender();
void prerender(Entry *animEntry);
-protected:
- QHash<LottieAnimation*, Entry*> m_animData;
- int m_cacheSize = 2;
- int m_currentFrame = 0;
-
- LottieAnimation *m_animation = nullptr;
-
private:
BatchRenderer() = default;
@@ -104,6 +96,9 @@ private:
QMutex m_mutex;
QWaitCondition m_waitCondition;
+
+ int m_cacheSize = 2;
+ QHash<LottieAnimation *, Entry *> m_animData;
};
QT_END_NAMESPACE