diff --git a/toonz/sources/common/tfx/tpredictivecachemanager.cpp b/toonz/sources/common/tfx/tpredictivecachemanager.cpp index 3aa79c3..43b19d8 100644 --- a/toonz/sources/common/tfx/tpredictivecachemanager.cpp +++ b/toonz/sources/common/tfx/tpredictivecachemanager.cpp @@ -74,10 +74,9 @@ public: { } - void run( - TCacheResourceP &resource, const string &alias, - const TFxP &fx, double frame, const TRenderSettings &rs, - ResourceDeclaration *resData) + void run(TCacheResourceP &resource, const string &alias, + const TFxP &fx, double frame, const TRenderSettings &rs, + ResourceDeclaration *resData) { switch (m_renderStatus) { case TRenderer::IDLE: diff --git a/toonz/sources/common/tparam/tdoubleparam.cpp b/toonz/sources/common/tparam/tdoubleparam.cpp index 7c3813b..e26ecd1 100644 --- a/toonz/sources/common/tparam/tdoubleparam.cpp +++ b/toonz/sources/common/tparam/tdoubleparam.cpp @@ -351,16 +351,16 @@ public: ~Imp() {} - void copy(Imp& src) + void copy(std::unique_ptr const& src) { - m_grammar = src.m_grammar; - m_measureName = src.m_measureName; - m_measure = src.m_measure; - m_defaultValue = src.m_defaultValue; - m_minValue = src.m_minValue; - m_maxValue = src.m_maxValue; - m_keyframes = src.m_keyframes; - m_cycleEnabled = src.m_cycleEnabled; + m_grammar = src->m_grammar; + m_measureName = src->m_measureName; + m_measure = src->m_measure; + m_defaultValue = src->m_defaultValue; + m_minValue = src->m_minValue; + m_maxValue = src->m_maxValue; + m_keyframes = src->m_keyframes; + m_cycleEnabled = src->m_cycleEnabled; } void notify(const TParamChange &change) @@ -496,7 +496,7 @@ TDoubleParam::TDoubleParam(double v) TDoubleParam::TDoubleParam(const TDoubleParam &src) : TParam(src.getName()), m_imp(new TDoubleParam::Imp()) { - m_imp->copy(*src.m_imp); + m_imp->copy(src.m_imp); } //--------------------------------------------------------- @@ -510,7 +510,7 @@ TDoubleParam::~TDoubleParam() TDoubleParam &TDoubleParam::operator=(const TDoubleParam &dp) { setName(dp.getName()); - m_imp->copy(*dp.m_imp); + m_imp->copy(dp.m_imp); return *this; } @@ -522,7 +522,7 @@ void TDoubleParam::copy(TParam *src) if (!p) throw TException("invalid source for copy"); setName(src->getName()); - m_imp->copy(*p->m_imp); + m_imp->copy(p->m_imp); m_imp->notify(TParamChange(this, 0, 0, true, false, false)); }