diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-07-19 20:43:52 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-07-19 21:52:35 +0200 |
commit | b53907cc966f658dfac16254e1fa1fe72079b9a3 (patch) | |
tree | d761268c2cd5eff43fe1c0dd09fc5e04415f0e04 /slideshow/source/engine/activities | |
parent | 9e7baa477530f96da6fbeeb07f0f6405a93bfe05 (diff) |
compact namespace: slideshow
Change-Id: I8ff0ddc85aa75c25b7881e4696043031ad8d9ce3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99009
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'slideshow/source/engine/activities')
7 files changed, 14 insertions, 28 deletions
diff --git a/slideshow/source/engine/activities/accumulation.hxx b/slideshow/source/engine/activities/accumulation.hxx index 02a19815af1b..ec04195597af 100644 --- a/slideshow/source/engine/activities/accumulation.hxx +++ b/slideshow/source/engine/activities/accumulation.hxx @@ -24,9 +24,7 @@ #include <rtl/ustring.hxx> -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Generic accumulation. @@ -78,7 +76,7 @@ namespace slideshow // cumulative behaviour for bools. return bCurrValue; } - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_ACTIVITIES_ACCUMULATION_HXX diff --git a/slideshow/source/engine/activities/activitybase.hxx b/slideshow/source/engine/activities/activitybase.hxx index fdf492aca9ef..e76c84d8e6c5 100644 --- a/slideshow/source/engine/activities/activitybase.hxx +++ b/slideshow/source/engine/activities/activitybase.hxx @@ -25,8 +25,7 @@ #include <animatableshape.hxx> #include <shapeattributelayer.hxx> -namespace slideshow { -namespace internal { +namespace slideshow::internal { /** Base class for animation activities. @@ -137,8 +136,7 @@ private: bool mbIsActive; }; -} // namespace internal -} // namespace presentation +} // namespace presentation::internal #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_ACTIVITIES_ACTIVITYBASE_HXX diff --git a/slideshow/source/engine/activities/activityparameters.hxx b/slideshow/source/engine/activities/activityparameters.hxx index a8835a4cce21..9df762838530 100644 --- a/slideshow/source/engine/activities/activityparameters.hxx +++ b/slideshow/source/engine/activities/activityparameters.hxx @@ -28,8 +28,7 @@ #include <optional> #include <vector> -namespace slideshow { -namespace internal { +namespace slideshow::internal { /** Parameter struct for animation activities @@ -128,8 +127,7 @@ struct ActivityParameters const bool mbAutoReverse; }; -} // namespace internal -} // namespace presentation +} // namespace presentation::internal #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_ACTIVITIES_ACTIVITYPARAMETERS_HXX diff --git a/slideshow/source/engine/activities/continuousactivitybase.hxx b/slideshow/source/engine/activities/continuousactivitybase.hxx index 1aeea9d173b2..8fd19d421e0c 100644 --- a/slideshow/source/engine/activities/continuousactivitybase.hxx +++ b/slideshow/source/engine/activities/continuousactivitybase.hxx @@ -22,9 +22,7 @@ #include "simplecontinuousactivitybase.hxx" -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Simple, continuous animation. @@ -59,7 +57,7 @@ namespace slideshow virtual void simplePerform( double nSimpleTime, sal_uInt32 nRepeatCount ) const override; }; - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_ACTIVITIES_CONTINUOUSACTIVITYBASE_HXX diff --git a/slideshow/source/engine/activities/continuouskeytimeactivitybase.hxx b/slideshow/source/engine/activities/continuouskeytimeactivitybase.hxx index 5b9f66278be4..2238db22852c 100644 --- a/slideshow/source/engine/activities/continuouskeytimeactivitybase.hxx +++ b/slideshow/source/engine/activities/continuouskeytimeactivitybase.hxx @@ -25,9 +25,7 @@ #include <basegfx/utils/keystoplerp.hxx> -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Interpolated, key-times animation. @@ -68,7 +66,7 @@ namespace slideshow private: const ::basegfx::utils::KeyStopLerp maLerper; }; - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_ACTIVITIES_CONTINUOUSKEYTIMEACTIVITYBASE_HXX diff --git a/slideshow/source/engine/activities/discreteactivitybase.hxx b/slideshow/source/engine/activities/discreteactivitybase.hxx index 205f9e9e4193..1332ad3c5539 100644 --- a/slideshow/source/engine/activities/discreteactivitybase.hxx +++ b/slideshow/source/engine/activities/discreteactivitybase.hxx @@ -26,9 +26,7 @@ #include <vector> -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Specialization of ActivityBase for discrete time activities. @@ -73,7 +71,7 @@ namespace slideshow const double mnSimpleDuration; sal_uInt32 mnCurrPerformCalls; }; - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_ACTIVITIES_DISCRETEACTIVITYBASE_HXX diff --git a/slideshow/source/engine/activities/simplecontinuousactivitybase.hxx b/slideshow/source/engine/activities/simplecontinuousactivitybase.hxx index b59b8b7031f2..fb4f746054db 100644 --- a/slideshow/source/engine/activities/simplecontinuousactivitybase.hxx +++ b/slideshow/source/engine/activities/simplecontinuousactivitybase.hxx @@ -23,9 +23,7 @@ #include "activitybase.hxx" #include <canvas/elapsedtime.hxx> -namespace slideshow -{ - namespace internal +namespace slideshow::internal { /** Simple, continuous animation. @@ -73,7 +71,7 @@ namespace slideshow /// Actual number of frames shown until now. sal_uInt32 mnCurrPerformCalls; }; - } + } #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_ACTIVITIES_SIMPLECONTINUOUSACTIVITYBASE_HXX |