summaryrefslogtreecommitdiff
path: root/slideshow/source/inc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 16:04:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:29 +0200
commitb36963c0a6a09f70ca6d8d607dd3249a3496497d (patch)
tree33e06dc8d227957cb31355277fb5cf20b9918628 /slideshow/source/inc
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'slideshow/source/inc')
-rw-r--r--slideshow/source/inc/delayevent.hxx8
-rw-r--r--slideshow/source/inc/interruptabledelayevent.hxx8
-rw-r--r--slideshow/source/inc/soundplayer.hxx4
-rw-r--r--slideshow/source/inc/wakeupevent.hxx8
4 files changed, 14 insertions, 14 deletions
diff --git a/slideshow/source/inc/delayevent.hxx b/slideshow/source/inc/delayevent.hxx
index 09efe7ed5a69..8cf7c5c6aecd 100644
--- a/slideshow/source/inc/delayevent.hxx
+++ b/slideshow/source/inc/delayevent.hxx
@@ -51,11 +51,11 @@ public:
mbWasFired(false) {}
// Event:
- virtual bool fire() SAL_OVERRIDE;
- virtual bool isCharged() const SAL_OVERRIDE;
- virtual double getActivationTime( double nCurrentTime ) const SAL_OVERRIDE;
+ virtual bool fire() override;
+ virtual bool isCharged() const override;
+ virtual double getActivationTime( double nCurrentTime ) const override;
// Disposable:
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
private:
double const mnTimeout;
diff --git a/slideshow/source/inc/interruptabledelayevent.hxx b/slideshow/source/inc/interruptabledelayevent.hxx
index a0cec175948d..f3cdd6c67cfa 100644
--- a/slideshow/source/inc/interruptabledelayevent.hxx
+++ b/slideshow/source/inc/interruptabledelayevent.hxx
@@ -44,7 +44,7 @@ namespace slideshow
{
}
- virtual bool fire() SAL_OVERRIDE
+ virtual bool fire() override
{
if( mpEvent && isCharged() )
{
@@ -57,7 +57,7 @@ namespace slideshow
return false;
}
- virtual bool isCharged() const SAL_OVERRIDE
+ virtual bool isCharged() const override
{
// pass on to wrappee - this ensures that we return
// false on isCharged(), even if the other event has
@@ -65,14 +65,14 @@ namespace slideshow
return mpEvent && mpEvent->isCharged();
}
- virtual double getActivationTime( double nCurrentTime ) const SAL_OVERRIDE
+ virtual double getActivationTime( double nCurrentTime ) const override
{
// enforce _our_ timeout to our clients (this
// overrides any timeout possibly set at the wrappee!)
return nCurrentTime + mnTimeout;
}
- virtual void dispose() SAL_OVERRIDE
+ virtual void dispose() override
{
mpEvent.reset();
}
diff --git a/slideshow/source/inc/soundplayer.hxx b/slideshow/source/inc/soundplayer.hxx
index e558d1c230ea..c97298ca9806 100644
--- a/slideshow/source/inc/soundplayer.hxx
+++ b/slideshow/source/inc/soundplayer.hxx
@@ -84,10 +84,10 @@ namespace slideshow
void setPlaybackLoop( bool bLoop );
// PauseEventHandler:
- virtual bool handlePause( bool bPauseShow ) SAL_OVERRIDE;
+ virtual bool handlePause( bool bPauseShow ) override;
// Disposable
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
private:
SoundPlayer(
diff --git a/slideshow/source/inc/wakeupevent.hxx b/slideshow/source/inc/wakeupevent.hxx
index 9751006fb89c..853ef58acbfd 100644
--- a/slideshow/source/inc/wakeupevent.hxx
+++ b/slideshow/source/inc/wakeupevent.hxx
@@ -45,10 +45,10 @@ public:
std::shared_ptr< ::canvas::tools::ElapsedTime > const& pTimeBase,
ActivitiesQueue & rActivityQueue );
- virtual void dispose() SAL_OVERRIDE;
- virtual bool fire() SAL_OVERRIDE;
- virtual bool isCharged() const SAL_OVERRIDE;
- virtual double getActivationTime( double nCurrentTime ) const SAL_OVERRIDE;
+ virtual void dispose() override;
+ virtual bool fire() override;
+ virtual bool isCharged() const override;
+ virtual double getActivationTime( double nCurrentTime ) const override;
/// Start the internal timer
void start();