summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/effectrewinder.cxx32
-rw-r--r--slideshow/source/engine/effectrewinder.hxx22
-rw-r--r--slideshow/source/engine/screenupdater.cxx12
-rw-r--r--slideshow/source/engine/slideshowimpl.cxx34
-rw-r--r--slideshow/source/engine/slideview.cxx4
-rw-r--r--slideshow/source/engine/usereventqueue.cxx4
-rw-r--r--slideshow/source/inc/event.hxx2
-rw-r--r--slideshow/source/inc/screenupdater.hxx6
-rw-r--r--slideshow/source/inc/unoview.hxx2
-rw-r--r--slideshow/source/inc/usereventqueue.hxx2
-rw-r--r--slideshow/test/testview.cxx2
11 files changed, 61 insertions, 61 deletions
diff --git a/slideshow/source/engine/effectrewinder.cxx b/slideshow/source/engine/effectrewinder.cxx
index b5a29fa63217..94985986a02c 100644
--- a/slideshow/source/engine/effectrewinder.cxx
+++ b/slideshow/source/engine/effectrewinder.cxx
@@ -44,12 +44,12 @@ namespace {
class RewinderEventHandler : public EventHandler
{
public:
- typedef ::boost::function<bool(void)> Action;
+ typedef ::boost::function<bool()> Action;
RewinderEventHandler (const Action& rAction) : maAction(rAction) {}
- virtual ~RewinderEventHandler (void) {}
+ virtual ~RewinderEventHandler() {}
private:
const Action maAction;
- virtual bool handleEvent (void) SAL_OVERRIDE { return maAction(); }
+ virtual bool handleEvent() SAL_OVERRIDE { return maAction(); }
};
@@ -59,7 +59,7 @@ class RewinderAnimationEventHandler : public AnimationEventHandler
public:
typedef ::boost::function<bool(const AnimationNodeSharedPtr& rpNode)> Action;
RewinderAnimationEventHandler (const Action& rAction) : maAction(rAction) {}
- virtual ~RewinderAnimationEventHandler (void) {}
+ virtual ~RewinderAnimationEventHandler() {}
private:
const Action maAction;
virtual bool handleAnimationEvent (const AnimationNodeSharedPtr& rpNode) SAL_OVERRIDE
@@ -94,7 +94,7 @@ EffectRewinder::EffectRewinder (
-void EffectRewinder::initialize (void)
+void EffectRewinder::initialize()
{
// Add some event handlers so that we are informed when
// a) an animation is started (we then check whether that belongs to a
@@ -121,7 +121,7 @@ void EffectRewinder::initialize (void)
-EffectRewinder::~EffectRewinder (void)
+EffectRewinder::~EffectRewinder()
{
dispose();
}
@@ -129,7 +129,7 @@ EffectRewinder::~EffectRewinder (void)
-void EffectRewinder::dispose (void)
+void EffectRewinder::dispose()
{
if (mpAsynchronousRewindEvent)
{
@@ -170,8 +170,8 @@ void EffectRewinder::setRootAnimationNode (
bool EffectRewinder::rewind (
const ::boost::shared_ptr<ScreenUpdater::UpdateLock>& rpPaintLock,
- const ::boost::function<void(void)>& rSlideRewindFunctor,
- const ::boost::function<void(void)>& rPreviousSlideFunctor)
+ const ::boost::function<void()>& rSlideRewindFunctor,
+ const ::boost::function<void()>& rPreviousSlideFunctor)
{
mpPaintLock = rpPaintLock;
@@ -227,7 +227,7 @@ bool EffectRewinder::rewind (
-void EffectRewinder::skipAllMainSequenceEffects (void)
+void EffectRewinder::skipAllMainSequenceEffects()
{
// Do not allow nested rewinds.
if (mpAsynchronousRewindEvent)
@@ -243,7 +243,7 @@ void EffectRewinder::skipAllMainSequenceEffects (void)
this,
nTotalMainSequenceEffectCount,
false,
- ::boost::function<void(void)>()),
+ ::boost::function<void()>()),
"EffectRewinder::asynchronousRewind");
mrEventQueue.addEvent(mpAsynchronousRewindEvent);
}
@@ -251,7 +251,7 @@ void EffectRewinder::skipAllMainSequenceEffects (void)
-sal_Int32 EffectRewinder::countMainSequenceEffects (void)
+sal_Int32 EffectRewinder::countMainSequenceEffects()
{
// Determine the number of main sequence effects.
sal_Int32 nMainSequenceNodeCount (0);
@@ -294,7 +294,7 @@ sal_Int32 EffectRewinder::countMainSequenceEffects (void)
-void EffectRewinder::skipSingleMainSequenceEffects (void)
+void EffectRewinder::skipSingleMainSequenceEffects()
{
// This basically just starts the next effect and then skips over its
// animation.
@@ -307,7 +307,7 @@ void EffectRewinder::skipSingleMainSequenceEffects (void)
-bool EffectRewinder::resetEffectCount (void)
+bool EffectRewinder::resetEffectCount()
{
mnMainSequenceEffectCount = 0;
return false;
@@ -354,7 +354,7 @@ bool EffectRewinder::notifyAnimationStart (const AnimationNodeSharedPtr& rpNode)
void EffectRewinder::asynchronousRewind (
sal_Int32 nEffectCount,
const bool bRedisplayCurrentSlide,
- const boost::function<void(void)>& rSlideRewindFunctor)
+ const boost::function<void()>& rSlideRewindFunctor)
{
OSL_ASSERT(mpAsynchronousRewindEvent);
@@ -398,7 +398,7 @@ void EffectRewinder::asynchronousRewind (
void EffectRewinder::asynchronousRewindToPreviousSlide (
- const ::boost::function<void(void)>& rSlideRewindFunctor)
+ const ::boost::function<void()>& rSlideRewindFunctor)
{
OSL_ASSERT(mpAsynchronousRewindEvent);
diff --git a/slideshow/source/engine/effectrewinder.hxx b/slideshow/source/engine/effectrewinder.hxx
index d334e2a85761..e44a63faa58b 100644
--- a/slideshow/source/engine/effectrewinder.hxx
+++ b/slideshow/source/engine/effectrewinder.hxx
@@ -53,13 +53,13 @@ public:
EventMultiplexer& rEventMultiplexer,
EventQueue& rEventQueue,
UserEventQueue& rUserEventQueue);
- ~EffectRewinder (void);
+ ~EffectRewinder();
/** Call Dispose() before the ownder of an EffectRewinder object dies so
that the EffectRewinder can release all references to the owner.
*/
- void dispose (void);
+ void dispose();
/** Store the root node of the animation tree. It is used in
CountMainSequenceEffects() to count the number of main sequence
@@ -90,13 +90,13 @@ public:
*/
bool rewind (
const ::boost::shared_ptr<ScreenUpdater::UpdateLock>& rpPaintLock,
- const ::boost::function<void(void)>& rSlideRewindFunctor,
- const ::boost::function<void(void)>& rPreviousSlideFunctor);
+ const ::boost::function<void()>& rSlideRewindFunctor,
+ const ::boost::function<void()>& rPreviousSlideFunctor);
/** Call this method after gotoPreviousEffect() triggered a slide change
to the previous slide.
*/
- void skipAllMainSequenceEffects (void);
+ void skipAllMainSequenceEffects();
private:
EventMultiplexer& mrEventMultiplexer;
@@ -122,9 +122,9 @@ private:
bool mbNonUserTriggeredMainSequenceEffectSeen;
- void initialize (void);
+ void initialize();
- bool resetEffectCount (void);
+ bool resetEffectCount();
/** Called by listeners when an animation (not necessarily of a main
sequence effect) starts.
*/
@@ -133,11 +133,11 @@ private:
/** Count the number of effects (or effect groups) in the main effect
sequence.
*/
- sal_Int32 countMainSequenceEffects (void);
+ sal_Int32 countMainSequenceEffects();
/** Skip the next main sequence effect.
*/
- void skipSingleMainSequenceEffects (void);
+ void skipSingleMainSequenceEffects();
/** Rewind the last effect of the main effect sequence by replaying all
previous effects.
@@ -152,7 +152,7 @@ private:
void asynchronousRewind (
sal_Int32 nEffectCount,
const bool bRedisplayCurrentSlide,
- const boost::function<void(void)>& rSlideRewindFunctor);
+ const boost::function<void()>& rSlideRewindFunctor);
/** Go to the previous slide and replay all of its main sequence effects
(or effect groups).
@@ -160,7 +160,7 @@ private:
This functor is used to go to the previous slide.
*/
void asynchronousRewindToPreviousSlide (
- const ::boost::function<void(void)>& rPreviousSlideFunctor);
+ const ::boost::function<void()>& rPreviousSlideFunctor);
};
} } // end of namespace ::slideshow::internal
diff --git a/slideshow/source/engine/screenupdater.cxx b/slideshow/source/engine/screenupdater.cxx
index ddb8b597c307..5210182ed887 100644
--- a/slideshow/source/engine/screenupdater.cxx
+++ b/slideshow/source/engine/screenupdater.cxx
@@ -32,8 +32,8 @@ namespace {
{
public:
UpdateLock (::slideshow::internal::ScreenUpdater& rUpdater, const bool bStartLocked);
- virtual ~UpdateLock (void);
- virtual void Activate (void) SAL_OVERRIDE;
+ virtual ~UpdateLock();
+ virtual void Activate() SAL_OVERRIDE;
private:
::slideshow::internal::ScreenUpdater& mrUpdater;
bool mbIsActivated;
@@ -200,13 +200,13 @@ namespace internal
boost::mem_fn(&View::updateScreen) );
}
- void ScreenUpdater::lockUpdates (void)
+ void ScreenUpdater::lockUpdates()
{
++mpImpl->mnLockCount;
OSL_ASSERT(mpImpl->mnLockCount>0);
}
- void ScreenUpdater::unlockUpdates (void)
+ void ScreenUpdater::unlockUpdates()
{
OSL_ASSERT(mpImpl->mnLockCount>0);
if (mpImpl->mnLockCount > 0)
@@ -241,7 +241,7 @@ UpdateLock::UpdateLock (
-UpdateLock::~UpdateLock (void)
+UpdateLock::~UpdateLock()
{
if (mbIsActivated)
mrUpdater.unlockUpdates();
@@ -250,7 +250,7 @@ UpdateLock::~UpdateLock (void)
-void UpdateLock::Activate (void)
+void UpdateLock::Activate()
{
if ( ! mbIsActivated)
{
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 3fc76235e7f7..a101eb1a295e 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -132,24 +132,24 @@ public:
/** Set the current time as the time at which the current frame is
displayed. From this the target time of the next frame is derived.
*/
- void MarkCurrentFrame (void);
+ void MarkCurrentFrame();
/** When there is time left until the next frame is due then wait.
Otherwise return without delay.
*/
- void Synchronize (void);
+ void Synchronize();
/** Activate frame synchronization when an animation is active and
frames are to be displayed in a steady rate. While active
Synchronize() will wait until the frame duration time has passed.
*/
- void Activate (void);
+ void Activate();
/** Deactivate frame sychronization when no animation is active and the
time between frames depends on user actions and other external
sources. While deactivated Synchronize() will return without delay.
*/
- void Deactivate (void);
+ void Deactivate();
private:
/** The timer that is used for synchronization is independent from the
@@ -337,7 +337,7 @@ private:
change takes place. Furthermore it does not show the slide
transition.
*/
- void redisplayCurrentSlide (void);
+ void redisplayCurrentSlide();
protected:
// WeakComponentImplHelperBase
@@ -403,13 +403,13 @@ private:
Do not call this method directly. Use WaitSymbolLock instead.
*/
- void requestWaitSymbol (void);
- void releaseWaitSymbol (void);
+ void requestWaitSymbol();
+ void releaseWaitSymbol();
class WaitSymbolLock {public:
WaitSymbolLock(SlideShowImpl& rSlideShowImpl) : mrSlideShowImpl(rSlideShowImpl)
{ mrSlideShowImpl.requestWaitSymbol(); }
- ~WaitSymbolLock(void)
+ ~WaitSymbolLock()
{ mrSlideShowImpl.releaseWaitSymbol(); }
private: SlideShowImpl& mrSlideShowImpl;
};
@@ -420,7 +420,7 @@ private:
/** This method is called asynchronously to finish the rewinding of an
effect to the previous slide that was initiated earlier.
*/
- void rewindEffectToPreviousSlide (void);
+ void rewindEffectToPreviousSlide();
/// all registered views
UnoViewContainer maViewContainer;
@@ -943,7 +943,7 @@ SlideSharedPtr SlideShowImpl::makeSlide(
return pSlide;
}
-void SlideShowImpl::requestWaitSymbol (void)
+void SlideShowImpl::requestWaitSymbol()
{
++mnWaitSymbolRequestCount;
OSL_ASSERT(mnWaitSymbolRequestCount>0);
@@ -960,7 +960,7 @@ void SlideShowImpl::requestWaitSymbol (void)
}
}
-void SlideShowImpl::releaseWaitSymbol (void)
+void SlideShowImpl::releaseWaitSymbol()
{
--mnWaitSymbolRequestCount;
OSL_ASSERT(mnWaitSymbolRequestCount>=0);
@@ -1201,7 +1201,7 @@ void SlideShowImpl::displaySlide(
maEffectRewinder.skipAllMainSequenceEffects();
}
-void SlideShowImpl::redisplayCurrentSlide (void)
+void SlideShowImpl::redisplayCurrentSlide()
{
osl::MutexGuard const guard( m_aMutex );
@@ -1267,7 +1267,7 @@ sal_Bool SlideShowImpl::previousEffect() throw (uno::RuntimeException, std::exce
}
}
-void SlideShowImpl::rewindEffectToPreviousSlide (void)
+void SlideShowImpl::rewindEffectToPreviousSlide()
{
// Show the wait symbol now and prevent it from showing temporary slide
// content while effects are played back.
@@ -2434,12 +2434,12 @@ FrameSynchronization::FrameSynchronization (const double nFrameDuration)
MarkCurrentFrame();
}
-void FrameSynchronization::MarkCurrentFrame (void)
+void FrameSynchronization::MarkCurrentFrame()
{
mnNextFrameTargetTime = maTimer.getElapsedTime() + mnFrameDuration;
}
-void FrameSynchronization::Synchronize (void)
+void FrameSynchronization::Synchronize()
{
if (mbIsActive)
{
@@ -2451,12 +2451,12 @@ void FrameSynchronization::Synchronize (void)
MarkCurrentFrame();
}
-void FrameSynchronization::Activate (void)
+void FrameSynchronization::Activate()
{
mbIsActive = true;
}
-void FrameSynchronization::Deactivate (void)
+void FrameSynchronization::Deactivate()
{
mbIsActive = false;
}
diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx
index a0dab4db4164..90d38699dab1 100644
--- a/slideshow/source/engine/slideview.cxx
+++ b/slideshow/source/engine/slideview.cxx
@@ -716,7 +716,7 @@ private:
virtual void _dispose() SAL_OVERRIDE;
virtual uno::Reference<presentation::XSlideShowView> getUnoView()const SAL_OVERRIDE;
virtual void setIsSoundEnabled (const bool bValue) SAL_OVERRIDE;
- virtual bool isSoundEnabled (void) const SAL_OVERRIDE;
+ virtual bool isSoundEnabled() const SAL_OVERRIDE;
// XEventListener:
virtual void SAL_CALL disposing( lang::EventObject const& evt )
@@ -1017,7 +1017,7 @@ void SlideView::setIsSoundEnabled (const bool bValue)
mbIsSoundEnabled = bValue;
}
-bool SlideView::isSoundEnabled (void) const
+bool SlideView::isSoundEnabled() const
{
return mbIsSoundEnabled;
}
diff --git a/slideshow/source/engine/usereventqueue.cxx b/slideshow/source/engine/usereventqueue.cxx
index 8404dc43f80a..af5f0529920d 100644
--- a/slideshow/source/engine/usereventqueue.cxx
+++ b/slideshow/source/engine/usereventqueue.cxx
@@ -247,7 +247,7 @@ public:
{ mbSkipTriggersNextEffect = bSkipTriggersNextEffect; }
/// Skip the current effect but do not trigger the next effect.
- void skipEffect (void) { handleEvent_impl(false); }
+ void skipEffect() { handleEvent_impl(false); }
private:
virtual bool handleEvent_impl() SAL_OVERRIDE
@@ -804,7 +804,7 @@ void UserEventQueue::registerMouseLeaveEvent( const EventSharedPtr& rEvent,
0.0 /* default prio */ ) );
}
-void UserEventQueue::callSkipEffectEventHandler (void)
+void UserEventQueue::callSkipEffectEventHandler()
{
::boost::shared_ptr<SkipEffectEventHandler> pHandler (
::boost::dynamic_pointer_cast<SkipEffectEventHandler>(mpSkipEffectEventHandler));
diff --git a/slideshow/source/inc/event.hxx b/slideshow/source/inc/event.hxx
index fad06458370d..60e9727a3874 100644
--- a/slideshow/source/inc/event.hxx
+++ b/slideshow/source/inc/event.hxx
@@ -64,7 +64,7 @@ public:
*/
virtual double getActivationTime( double nCurrentTime ) const = 0;
- const OUString& GetDescription (void) const { return msDescription; }
+ const OUString& GetDescription() const { return msDescription; }
private:
const OUString msDescription;
diff --git a/slideshow/source/inc/screenupdater.hxx b/slideshow/source/inc/screenupdater.hxx
index 183d031f3235..ade40964a3ca 100644
--- a/slideshow/source/inc/screenupdater.hxx
+++ b/slideshow/source/inc/screenupdater.hxx
@@ -102,7 +102,7 @@ namespace slideshow
class UpdateLock {
public:
- virtual void Activate (void) = 0;
+ virtual void Activate() = 0;
protected:
~UpdateLock() {}
@@ -119,12 +119,12 @@ namespace slideshow
/** Lock updates to prevent intermediate repaints.
*/
- void lockUpdates (void);
+ void lockUpdates();
/** When called as often as lockUpdates() then commitUpdates()
is called.
*/
- void unlockUpdates (void);
+ void unlockUpdates();
private:
struct ImplScreenUpdater;
diff --git a/slideshow/source/inc/unoview.hxx b/slideshow/source/inc/unoview.hxx
index 0a96cd2580ab..81ad021dcdad 100644
--- a/slideshow/source/inc/unoview.hxx
+++ b/slideshow/source/inc/unoview.hxx
@@ -60,7 +60,7 @@ namespace slideshow
/** Return whether the sound play back is enabled.
*/
- virtual bool isSoundEnabled (void) const = 0;
+ virtual bool isSoundEnabled() const = 0;
/** Tell the view whether it may play sounds. Disabling this
can be used to prevent different views to play the same
diff --git a/slideshow/source/inc/usereventqueue.hxx b/slideshow/source/inc/usereventqueue.hxx
index a09c962ef2d3..61dbab91a710 100644
--- a/slideshow/source/inc/usereventqueue.hxx
+++ b/slideshow/source/inc/usereventqueue.hxx
@@ -222,7 +222,7 @@ public:
or key presses that trigger the next effect. This method allows the
skipping of effects to be triggered programatically.
*/
- void callSkipEffectEventHandler (void);
+ void callSkipEffectEventHandler();
private:
/** Generically register an event on one of the handlers.
diff --git a/slideshow/test/testview.cxx b/slideshow/test/testview.cxx
index b382fac2cfd3..0901f1c866b9 100644
--- a/slideshow/test/testview.cxx
+++ b/slideshow/test/testview.cxx
@@ -277,7 +277,7 @@ public:
mbDisposed = true;
}
- virtual bool isSoundEnabled (void) const
+ virtual bool isSoundEnabled() const
{
return true;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-24 00:59:06 +0000