#i10000# CodingStandards: aligned EffectRewinder class to module conventions; WaE: removed two unused vars

3 files changed, 40 insertions, 42 deletions

diff --git a/slideshow/source/engine/effectrewinder.cxx b/slideshow/source/engine/effectrewinder.cxx
index 91ffb40d6cce..b4fd51968a15 100644
--- a/slideshow/source/engine/effectrewinder.cxx
+++ b/slideshow/source/engine/effectrewinder.cxx
@@ -99,13 +99,13 @@ EffectRewinder::EffectRewinder (
       mpAsynchronousRewindEvent(),
       mxCurrentAnimationRootNode()
 {
-    Initialize();
+    initialize();
 }
 
 
 
 
-void EffectRewinder::Initialize (void)
+void EffectRewinder::initialize (void)
 {
     // Add some event handlers so that we are informed when
     // a) an animation is started (we then check whether that belongs to a
@@ -115,17 +115,17 @@ void EffectRewinder::Initialize (void)
 
     mpAnimationStartHandler.reset(
         new RewinderAnimationEventHandler(
-            ::boost::bind(&EffectRewinder::NotifyAnimationStart, this, _1)));
+            ::boost::bind(&EffectRewinder::notifyAnimationStart, this, _1)));
     mrEventMultiplexer.addAnimationStartHandler(mpAnimationStartHandler);
 
     mpSlideStartHandler.reset(
         new RewinderEventHandler(
-            ::boost::bind(&EffectRewinder::ResetEffectCount, this)));
+            ::boost::bind(&EffectRewinder::resetEffectCount, this)));
     mrEventMultiplexer.addSlideStartHandler(mpSlideStartHandler);
 
     mpSlideEndHandler.reset(
         new RewinderEventHandler(
-            ::boost::bind(&EffectRewinder::ResetEffectCount, this)));
+            ::boost::bind(&EffectRewinder::resetEffectCount, this)));
     mrEventMultiplexer.addSlideEndHandler(mpSlideEndHandler);
 }
 
@@ -134,13 +134,13 @@ void EffectRewinder::Initialize (void)
 
 EffectRewinder::~EffectRewinder (void)
 {
-    Dispose();
+    dispose();
 }
 
 
 
 
-void EffectRewinder::Dispose (void)
+void EffectRewinder::dispose (void)
 {
     if (mpAsynchronousRewindEvent)
     {
@@ -170,7 +170,7 @@ void EffectRewinder::Dispose (void)
 
 
 
-void EffectRewinder::SetRootAnimationNode (
+void EffectRewinder::setRootAnimationNode (
     const uno::Reference<animations::XAnimationNode>& xRootNode)
 {
     mxCurrentAnimationRootNode = xRootNode;
@@ -179,7 +179,7 @@ void EffectRewinder::SetRootAnimationNode (
 
 
 
-bool EffectRewinder::Rewind (
+bool EffectRewinder::rewind (
     const ::boost::shared_ptr<ScreenUpdater::UpdateLock>& rpPaintLock,
     const ::boost::function<void(void)>& rSlideRewindFunctor,
     const ::boost::function<void(void)>& rPreviousSlideFunctor)
@@ -210,7 +210,7 @@ bool EffectRewinder::Rewind (
         // Go back to the previous slide.
         mpAsynchronousRewindEvent = makeEvent(
             ::boost::bind(
-                &EffectRewinder::AsynchronousRewindToPreviousSlide,
+                &EffectRewinder::asynchronousRewindToPreviousSlide,
                 this,
                 rPreviousSlideFunctor));
     }
@@ -220,7 +220,7 @@ bool EffectRewinder::Rewind (
         // call other methods.
         mpAsynchronousRewindEvent = makeEvent(
             ::boost::bind(
-                &EffectRewinder::AsynchronousRewind,
+                &EffectRewinder::asynchronousRewind,
                 this,
                 nSkipCount,
                 true,
@@ -236,7 +236,7 @@ bool EffectRewinder::Rewind (
 
 
 
-void EffectRewinder::SkipAllMainSequenceEffects (void)
+void EffectRewinder::skipAllMainSequenceEffects (void)
 {
     // Do not allow nested rewinds.
     if (mpAsynchronousRewindEvent)
@@ -245,10 +245,10 @@ void EffectRewinder::SkipAllMainSequenceEffects (void)
         return;
     }
 
-    const int nTotalMainSequenceEffectCount (CountMainSequenceEffects());
+    const int nTotalMainSequenceEffectCount (countMainSequenceEffects());
     mpAsynchronousRewindEvent = makeEvent(
         ::boost::bind(
-            &EffectRewinder::AsynchronousRewind,
+            &EffectRewinder::asynchronousRewind,
             this,
             nTotalMainSequenceEffectCount,
             false,
@@ -259,7 +259,7 @@ void EffectRewinder::SkipAllMainSequenceEffects (void)
 
 
 
-sal_Int32 EffectRewinder::CountMainSequenceEffects (void)
+sal_Int32 EffectRewinder::countMainSequenceEffects (void)
 {
     // Determine the number of main sequence effects.
     sal_Int32 nMainSequenceNodeCount (0);
@@ -305,16 +305,16 @@ sal_Int32 EffectRewinder::CountMainSequenceEffects (void)
 
 
 
-void EffectRewinder::SkipSomeMainSequenceEffects (sal_Int32 nSkipCount)
+void EffectRewinder::skipSomeMainSequenceEffects (sal_Int32 nSkipCount)
 {
     while (--nSkipCount >= 0)
-        SkipSingleMainSequenceEffects();
+        skipSingleMainSequenceEffects();
 }
 
 
 
 
-void EffectRewinder::SkipSingleMainSequenceEffects (void)
+void EffectRewinder::skipSingleMainSequenceEffects (void)
 {
     // This basically just starts the next effect and then skips over its
     // animation.
@@ -327,7 +327,7 @@ void EffectRewinder::SkipSingleMainSequenceEffects (void)
 
 
 
-bool EffectRewinder::ResetEffectCount (void)
+bool EffectRewinder::resetEffectCount (void)
 {
     mnMainSequenceEffectCount = 0;
     return false;
@@ -336,7 +336,7 @@ bool EffectRewinder::ResetEffectCount (void)
 
 
 
-bool EffectRewinder::NotifyAnimationStart (const AnimationNodeSharedPtr& rpNode)
+bool EffectRewinder::notifyAnimationStart (const AnimationNodeSharedPtr& rpNode)
 {
     // This notification is only relevant for us when the rpNode belongs to
     // the main sequence.
@@ -355,7 +355,7 @@ bool EffectRewinder::NotifyAnimationStart (const AnimationNodeSharedPtr& rpNode)
 
 
 
-void EffectRewinder::AsynchronousRewind (
+void EffectRewinder::asynchronousRewind (
     sal_Int32 nEffectCount,
     const bool bRedisplayCurrentSlide,
     const boost::function<void(void)>& rSlideRewindFunctor)
@@ -370,7 +370,7 @@ void EffectRewinder::AsynchronousRewind (
             rSlideRewindFunctor();
         mpAsynchronousRewindEvent = makeEvent(
             ::boost::bind(
-                &EffectRewinder::AsynchronousRewind,
+                &EffectRewinder::asynchronousRewind,
                 this,
                 nEffectCount,
                 false,
@@ -381,7 +381,7 @@ void EffectRewinder::AsynchronousRewind (
     {
         mrEventQueue.forceEmpty();
         while (--nEffectCount >= 0)
-            SkipSingleMainSequenceEffects();
+            skipSingleMainSequenceEffects();
 
         mpAsynchronousRewindEvent.reset();
         mpPaintLock.reset();
@@ -391,7 +391,7 @@ void EffectRewinder::AsynchronousRewind (
 
 
 
-void EffectRewinder::AsynchronousRewindToPreviousSlide (
+void EffectRewinder::asynchronousRewindToPreviousSlide (
     const ::boost::function<void(void)>& rSlideRewindFunctor)
 {
     OSL_ASSERT(mpAsynchronousRewindEvent);
diff --git a/slideshow/source/engine/effectrewinder.hxx b/slideshow/source/engine/effectrewinder.hxx
index 3aeca5a907c5..c00131233b0e 100644
--- a/slideshow/source/engine/effectrewinder.hxx
+++ b/slideshow/source/engine/effectrewinder.hxx
@@ -72,13 +72,13 @@ public:
         that the EffectRewinder can release all references to the owner.
 
     */
-    void Dispose (void);
+    void dispose (void);
 
     /** Store the root node of the animation tree.  It is used in
         CountMainSequenceEffects() to count the number of main sequence
         effects (or effect groups.)
     */
-    void SetRootAnimationNode (
+    void setRootAnimationNode (
         const css::uno::Reference<css::animations::XAnimationNode>& xRootNode);
 
     /** Rewind one effect of the main effect sequence.  When the current
@@ -101,7 +101,7 @@ public:
             This functor is called to switch to the previous slide.  When it
             is called then the other functor is not called.
     */
-    bool Rewind (
+    bool rewind (
         const ::boost::shared_ptr<ScreenUpdater::UpdateLock>& rpPaintLock,
         const ::boost::function<void(void)>& rSlideRewindFunctor,
         const ::boost::function<void(void)>& rPreviousSlideFunctor);
@@ -109,7 +109,7 @@ public:
     /** Call this method after gotoPreviousEffect() triggered a slide change
         to the previous slide.
     */
-    void SkipAllMainSequenceEffects (void);
+    void skipAllMainSequenceEffects (void);
 
 private:
     EventMultiplexer& mrEventMultiplexer;
@@ -133,26 +133,26 @@ private:
     css::uno::Reference<css::animations::XAnimationNode> mxCurrentAnimationRootNode;
     ::boost::shared_ptr<ScreenUpdater::UpdateLock> mpPaintLock;
 
-    void Initialize (void);
+    void initialize (void);
 
-    bool ResetEffectCount (void);
+    bool resetEffectCount (void);
     /** Called by listeners when an animation (not necessarily of a main
         sequence effect) starts.
     */
-    bool NotifyAnimationStart (const AnimationNodeSharedPtr& rpNode);
+    bool notifyAnimationStart (const AnimationNodeSharedPtr& rpNode);
 
     /** Count the number of effects (or effect groups) in the main effect
         sequence.
     */
-    sal_Int32 CountMainSequenceEffects (void);
+    sal_Int32 countMainSequenceEffects (void);
 
     /** Skip the next main sequence effect.
     */
-    void SkipSingleMainSequenceEffects (void);
+    void skipSingleMainSequenceEffects (void);
 
     /** Skip the specified number of main sequence effects.
     */
-    void SkipSomeMainSequenceEffects (const sal_Int32 nSkipCount);
+    void skipSomeMainSequenceEffects (const sal_Int32 nSkipCount);
 
     /** Rewind the last effect of the main effect sequence by replaying all
         previous effects.
@@ -164,7 +164,7 @@ private:
         @param rSlideRewindFunctor
             This functor is used to redisplay the current slide.
     */
-    void AsynchronousRewind (
+    void asynchronousRewind (
         sal_Int32 nEffectCount,
         const bool bRedisplayCurrentSlide,
         const boost::function<void(void)>& rSlideRewindFunctor);
@@ -174,7 +174,7 @@ private:
         @param rPreviousSlideFunctor
             This functor is used to go to the previous slide.
     */
-    void AsynchronousRewindToPreviousSlide (
+    void asynchronousRewindToPreviousSlide (
         const ::boost::function<void(void)>& rPreviousSlideFunctor);
 };
 
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 162b3cb8dc2c..919cd478c160 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -538,7 +538,7 @@ void SlideShowImpl::disposing()
 {
     osl::MutexGuard const guard( m_aMutex );
 
-    maEffectRewinder.Dispose();
+    maEffectRewinder.dispose();
 
     // stop slide transition sound, if any:
     stopSlideTransitionSound();
@@ -948,7 +948,7 @@ void SlideShowImpl::displaySlide(
     if (isDisposed())
         return;
 
-    maEffectRewinder.SetRootAnimationNode(xRootNode);
+    maEffectRewinder.setRootAnimationNode(xRootNode);
 
     // precondition: must only be called from the main thread!
     DBG_TESTSOLARMUTEX();
@@ -1063,7 +1063,7 @@ void SlideShowImpl::displaySlide(
     // slide to this one.  To complete this we have to play back all main
     // sequence effects on this slide.
     if (bSkipAllMainSequenceEffects)
-        maEffectRewinder.SkipAllMainSequenceEffects();
+        maEffectRewinder.skipAllMainSequenceEffects();
 }
 
 void SlideShowImpl::redisplayCurrentSlide (void)
@@ -1076,8 +1076,6 @@ void SlideShowImpl::redisplayCurrentSlide (void)
     // precondition: must only be called from the main thread!
     DBG_TESTSOLARMUTEX();
     stopShow();
-    bool bSkipAllMainSequenceEffects (false);
-    bool bSkipSlideTransition (true);
 
     OSL_ENSURE( !maViewContainer.empty(), "### no views!" );
     if (maViewContainer.empty())
@@ -1128,7 +1126,7 @@ sal_Bool SlideShowImpl::previousEffect() throw (uno::RuntimeException)
         return true;
     else
     {
-        return maEffectRewinder.Rewind(
+        return maEffectRewinder.rewind(
             maScreenUpdater.createLock(false),
             ::boost::bind(&SlideShowImpl::redisplayCurrentSlide, this),
             ::boost::bind(&SlideShowImpl::rewindEffectToPreviousSlide, this));