clang-tidy modernize-concat-nested-namespace

Change-Id: Iab35a8b85b3ba1df791c774f40b037f9420a071a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86708
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

7 files changed, 9 insertions, 29 deletions

diff --git a/slideshow/source/engine/slide/layer.cxx b/slideshow/source/engine/slide/layer.cxx
index c8ec5f5f57f8..01ce4efa4bcd 100644
--- a/slideshow/source/engine/slide/layer.cxx
+++ b/slideshow/source/engine/slide/layer.cxx
@@ -29,10 +29,8 @@
 
 using namespace ::com::sun::star;
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         Layer::Layer( Dummy                     ) :
             maViewEntries(),
             maBounds(),
@@ -269,7 +267,6 @@ namespace slideshow
             return LayerSharedPtr( new Layer );
         }
 
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx
index eb97b32da11d..e7890641da4f 100644
--- a/slideshow/source/engine/slide/layermanager.cxx
+++ b/slideshow/source/engine/slide/layermanager.cxx
@@ -40,10 +40,8 @@ namespace
     }
 }
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         template<typename LayerFunc,
                  typename ShapeFunc> void LayerManager::manageViews(
                      LayerFunc layerFunc,
@@ -826,7 +824,6 @@ namespace slideshow
 
             mbLayerAssociationDirty = false;
         }
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/slide/shapemanagerimpl.cxx b/slideshow/source/engine/slide/shapemanagerimpl.cxx
index f9480ef51403..7863f7e7412b 100644
--- a/slideshow/source/engine/slide/shapemanagerimpl.cxx
+++ b/slideshow/source/engine/slide/shapemanagerimpl.cxx
@@ -38,8 +38,7 @@ using namespace css::uno;
 using namespace css::drawing;
 using namespace css::system;
 
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
 
 ShapeManagerImpl::ShapeManagerImpl( EventMultiplexer&            rMultiplexer,
                                     LayerManagerSharedPtr const& rLayerManager,
@@ -421,7 +420,6 @@ void ShapeManagerImpl::notifyIntrinsicAnimationsDisabled()
 }
 
 
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/slide/slideanimations.cxx b/slideshow/source/engine/slide/slideanimations.cxx
index a6d526ba5a55..d433b7af1409 100644
--- a/slideshow/source/engine/slide/slideanimations.cxx
+++ b/slideshow/source/engine/slide/slideanimations.cxx
@@ -25,10 +25,8 @@
 
 using namespace ::com::sun::star;
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         SlideAnimations::SlideAnimations( const SlideShowContext&     rContext,
                                           const ::basegfx::B2DVector& rSlideSize ) :
             maContext( rContext ),
@@ -103,7 +101,6 @@ namespace slideshow
             mpRootNode->end();
         }
 
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx
index ebd16911d2c0..3a1039a004ed 100644
--- a/slideshow/source/engine/slide/slideimpl.cxx
+++ b/slideshow/source/engine/slide/slideimpl.cxx
@@ -51,9 +51,7 @@
 using namespace ::com::sun::star;
 
 
-namespace slideshow
-{
-namespace internal
+namespace slideshow::internal
 {
 namespace
 {
@@ -1102,7 +1100,6 @@ SlideSharedPtr createSlide( const uno::Reference< drawing::XDrawPage >&
     return pRet;
 }
 
-} // namespace internal
 } // namespace slideshow
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/slide/targetpropertiescreator.cxx b/slideshow/source/engine/slide/targetpropertiescreator.cxx
index 0701526937b5..89ef8c835a83 100644
--- a/slideshow/source/engine/slide/targetpropertiescreator.cxx
+++ b/slideshow/source/engine/slide/targetpropertiescreator.cxx
@@ -30,9 +30,7 @@
 #include "targetpropertiescreator.hxx"
 #include <tools.hxx>
 
-namespace slideshow
-{
-namespace internal
+namespace slideshow::internal
 {
     namespace
     {
@@ -366,7 +364,6 @@ namespace internal
         return aRes;
     }
 
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx b/slideshow/source/engine/slide/userpaintoverlay.cxx
index 179b937d874a..045c455e69fe 100644
--- a/slideshow/source/engine/slide/userpaintoverlay.cxx
+++ b/slideshow/source/engine/slide/userpaintoverlay.cxx
@@ -39,10 +39,8 @@
 
 using namespace ::com::sun::star;
 
-namespace slideshow
+namespace slideshow::internal
 {
-    namespace internal
-    {
         class PaintOverlayHandler : public MouseEventHandler,
                                     public ViewEventHandler,
                     public UserPaintEventHandler
@@ -482,7 +480,6 @@ namespace slideshow
                 TOOLS_WARN_EXCEPTION("slideshow", "");
             }
         }
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */