[Libreoffice-commits] core.git: vcl/inc vcl/source

[Chris Sherlock (via logerrit)]

 vcl/inc/animate/AnimationRenderer.hxx    |    4 ++--
 vcl/source/animate/Animation.cxx         |    6 +++---
 vcl/source/animate/AnimationRenderer.cxx |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 756ff6f6dfb24048c43b682a95241d5548a1bb8f
Author:     Chris Sherlock <chris.sherloc...@gmail.com>
AuthorDate: Fri Jul 1 17:25:37 2022 +1000
Commit:     Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Thu Jul 28 16:27:19 2022 +0200

    vcl: Animation - cleanup pause functions and fields
    
    Change-Id: I8a338a92823bd4e4c1f8123d52711d0925357ee6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/76430
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>

diff --git a/vcl/inc/animate/AnimationRenderer.hxx 
b/vcl/inc/animate/AnimationRenderer.hxx
index 6b86d07bb2de..bc98f9ac3093 100644
--- a/vcl/inc/animate/AnimationRenderer.hxx
+++ b/vcl/inc/animate/AnimationRenderer.hxx
@@ -35,7 +35,7 @@ struct AnimationData
     VclPtr<OutputDevice>   pOutDev;
     void*           pRendererData;
     tools::Long     nRendererId;
-    bool            bPause;
+    bool            mbIsPaused;
 
     AnimationData();
 };
@@ -87,7 +87,7 @@ public:
     const Size&     getOutSizePix() const { return maSzPix; }
 
     void            pause( bool bIsPaused ) { mbIsPaused = bIsPaused; }
-    bool            isPause() const { return mbIsPaused; }
+    bool            isPaused() const { return mbIsPaused; }
 
     void            setMarked( bool bIsMarked ) { mbIsMarked = bIsMarked; }
     bool            isMarked() const { return mbIsMarked; }
diff --git a/vcl/source/animate/Animation.cxx b/vcl/source/animate/Animation.cxx
index f7d6a4f27a93..0922dec2bf37 100644
--- a/vcl/source/animate/Animation.cxx
+++ b/vcl/source/animate/Animation.cxx
@@ -314,7 +314,7 @@ IMPL_LINK_NOARG(Animation, ImplTimeoutHdl, Timer*, void)
                     pRenderer = 
static_cast<AnimationRenderer*>(pDataItem->pRendererData);
                 }
 
-                pRenderer->pause(pDataItem->bPause);
+                pRenderer->pause(pDataItem->mbIsPaused);
                 pRenderer->setMarked(true);
             }
 
@@ -326,7 +326,7 @@ IMPL_LINK_NOARG(Animation, ImplTimeoutHdl, Timer*, void)
 
             // check if every remaining view is paused
             bGlobalPause = std::all_of(maRenderers.cbegin(), 
maRenderers.cend(),
-                                       [](const auto& pRenderer) { return 
pRenderer->isPause(); });
+                                       [](const auto& pRenderer) { return 
pRenderer->isPaused(); });
 
             // reset marked state
             std::for_each(maRenderers.cbegin(), maRenderers.cend(),
@@ -685,7 +685,7 @@ AnimationData::AnimationData()
     : pOutDev(nullptr)
     , pRendererData(nullptr)
     , nRendererId(0)
-    , bPause(false)
+    , mbIsPaused(false)
 {
 }
 
diff --git a/vcl/source/animate/AnimationRenderer.cxx 
b/vcl/source/animate/AnimationRenderer.cxx
index 51aaa590d24b..e4ce509a694d 100644
--- a/vcl/source/animate/AnimationRenderer.cxx
+++ b/vcl/source/animate/AnimationRenderer.cxx
@@ -316,7 +316,7 @@ AnimationData* AnimationRenderer::createAnimationData() 
const
     pDataItem->pOutDev = mpRenderContext;
     pDataItem->pRendererData = const_cast<AnimationRenderer *>(this);
     pDataItem->nRendererId = mnRendererId;
-    pDataItem->bPause = mbIsPaused;
+    pDataItem->mbIsPaused = mbIsPaused;
 
     return pDataItem;
 }