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>

6 files changed, 11 insertions, 28 deletions

diff --git a/slideshow/source/engine/slide/layer.hxx b/slideshow/source/engine/slide/layer.hxx
index 2d1b04bb1808..73f3fcce9c5a 100644
--- a/slideshow/source/engine/slide/layer.hxx
+++ b/slideshow/source/engine/slide/layer.hxx
@@ -29,9 +29,7 @@
 #include <memory>
 
 
-namespace slideshow
-{
-    namespace internal
+namespace slideshow::internal
     {
         class LayerEndUpdate;
         class Layer;
@@ -258,7 +256,6 @@ namespace slideshow
             bool                       mbClipSet; // true, if beginUpdate set a clip
         };
 
-    }
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SLIDE_LAYER_HXX
diff --git a/slideshow/source/engine/slide/layermanager.hxx b/slideshow/source/engine/slide/layermanager.hxx
index ec95e08f364c..1969f0cccbb0 100644
--- a/slideshow/source/engine/slide/layermanager.hxx
+++ b/slideshow/source/engine/slide/layermanager.hxx
@@ -34,9 +34,7 @@ namespace basegfx {
     class B2DRange;
 }
 
-namespace slideshow
-{
-    namespace internal
+namespace slideshow::internal
     {
         /** A hash map which maps the XShape to the corresponding Shape object.
 
@@ -357,7 +355,7 @@ namespace slideshow
         };
 
         typedef ::std::shared_ptr< LayerManager > LayerManagerSharedPtr;
-    }
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SLIDE_LAYERMANAGER_HXX
diff --git a/slideshow/source/engine/slide/shapemanagerimpl.hxx b/slideshow/source/engine/slide/shapemanagerimpl.hxx
index f084320cac99..5025450326e1 100644
--- a/slideshow/source/engine/slide/shapemanagerimpl.hxx
+++ b/slideshow/source/engine/slide/shapemanagerimpl.hxx
@@ -38,8 +38,7 @@
 #include <map>
 #include <memory>
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 /** Listener class for shape events
 
@@ -182,8 +181,7 @@ private:
     const css::uno::Reference<css::drawing::XDrawPage> mxDrawPage;
 };
 
-} // namespace internal
-} // namespace presentation
+} // namespace presentation::internal
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SLIDE_SHAPEMANAGERIMPL_HXX
 
diff --git a/slideshow/source/engine/slide/slideanimations.hxx b/slideshow/source/engine/slide/slideanimations.hxx
index 67bc6e036951..3ebc1b21b0fc 100644
--- a/slideshow/source/engine/slide/slideanimations.hxx
+++ b/slideshow/source/engine/slide/slideanimations.hxx
@@ -31,9 +31,7 @@ namespace com::sun::star::animations { class XAnimationNode; }
 
 /* Definition of SlideAnimations class */
 
-namespace slideshow
-{
-    namespace internal
+namespace slideshow::internal
     {
         /** This class generates and manages all animations of a slide.
 
@@ -101,7 +99,7 @@ namespace slideshow
             const basegfx::B2DVector maSlideSize;
             AnimationNodeSharedPtr   mpRootNode;
         };
-    }
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SLIDE_SLIDEANIMATIONS_HXX
diff --git a/slideshow/source/engine/slide/targetpropertiescreator.hxx b/slideshow/source/engine/slide/targetpropertiescreator.hxx
index 04dec8d59230..79c1e49a56a1 100644
--- a/slideshow/source/engine/slide/targetpropertiescreator.hxx
+++ b/slideshow/source/engine/slide/targetpropertiescreator.hxx
@@ -25,20 +25,14 @@
 
 using namespace ::com::sun::star;
 
-namespace slideshow
+namespace slideshow::internal::TargetPropertiesCreator
 {
-    namespace internal
-    {
-        namespace TargetPropertiesCreator
-        {
             /// Generate shape property list - set bInitial to true for initial slide state
             uno::Sequence< animations::TargetProperties > createTargetProperties(
                 const uno::Reference< animations::XAnimationNode >& rootNode,
                 bool bInitial );
-        }
 
-    } // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal::TargetPropertiesCreator
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SLIDE_TARGETPROPERTIESCREATOR_HXX
 
diff --git a/slideshow/source/engine/slide/userpaintoverlay.hxx b/slideshow/source/engine/slide/userpaintoverlay.hxx
index 5dab806a9e76..8e9f57d30388 100644
--- a/slideshow/source/engine/slide/userpaintoverlay.hxx
+++ b/slideshow/source/engine/slide/userpaintoverlay.hxx
@@ -29,9 +29,7 @@
 
 /* Definition of UserPaintOverlay class */
 
-namespace slideshow
-{
-    namespace internal
+namespace slideshow::internal
     {
         class EventMultiplexer;
         struct SlideShowContext;
@@ -77,7 +75,7 @@ namespace slideshow
             ::std::shared_ptr<PaintOverlayHandler>    mpHandler;
             EventMultiplexer&                           mrMultiplexer;
         };
-    }
+
 }
 
 #endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_SLIDE_USERPAINTOVERLAY_HXX