Kaydet (Commit) 69bf59d6 authored tarafından Adrien Ollier's avatar Adrien Ollier Kaydeden (comit) Mike Kaganski

makes implementation of Animation::operator =(const Animation&) concise

Using the logical AND, we can evaluate all the expressions
from left to right into a single and condensed expression.

Change-Id: I973061dcd34322c29565a478bf9b7ba757965231
Signed-off-by: 's avatarAdrien Ollier <adr.ollier@hotmail.fr>
Reviewed-on: https://gerrit.libreoffice.org/71651
Tested-by: Jenkins
Reviewed-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
üst e575a5e8
...@@ -86,25 +86,13 @@ Animation& Animation::operator=(const Animation& rAnimation) ...@@ -86,25 +86,13 @@ Animation& Animation::operator=(const Animation& rAnimation)
bool Animation::operator==(const Animation& rAnimation) const bool Animation::operator==(const Animation& rAnimation) const
{ {
const size_t nCount = maList.size(); return maList.size() == rAnimation.maList.size() && maBitmapEx == rAnimation.maBitmapEx
bool bRet = false; && maGlobalSize == rAnimation.maGlobalSize
&& std::equal(maList.begin(), maList.end(), rAnimation.maList.begin(),
if (rAnimation.maList.size() == nCount && rAnimation.maBitmapEx == maBitmapEx [](const std::unique_ptr<AnimationBitmap>& pAnim1,
&& rAnimation.maGlobalSize == maGlobalSize) const std::unique_ptr<AnimationBitmap>& pAnim2) -> bool {
{ return *pAnim1 == *pAnim2;
bRet = true; });
for (size_t n = 0; n < nCount; n++)
{
if ((*maList[n]) != (*rAnimation.maList[n]))
{
bRet = false;
break;
}
}
}
return bRet;
} }
void Animation::Clear() void Animation::Clear()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment