clang-tidy modernize-concat-nested-namespace in cppcanvas..cppuhelper

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

27 files changed, 37 insertions, 108 deletions

diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.cxx b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
index 84946014ef0b..b427142a874a 100644
--- a/cppcanvas/source/mtfrenderer/bitmapaction.cxx
+++ b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
@@ -38,9 +38,7 @@
 
 using namespace ::com::sun::star;
 
-namespace cppcanvas
-{
-    namespace internal
+namespace cppcanvas::internal
     {
         namespace
         {
@@ -217,6 +215,5 @@ namespace cppcanvas
                                                   rState );
         }
     }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx b/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx
index 9100188271d5..afaa100dce8f 100644
--- a/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx
+++ b/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx
@@ -29,9 +29,7 @@
 
 using namespace ::com::sun::star;
 
-namespace cppcanvas
-{
-    namespace internal
+namespace cppcanvas::internal
     {
         CachedPrimitiveBase::CachedPrimitiveBase( const CanvasSharedPtr& rCanvas,
                                                   bool                   bOnlyRedrawWithSameTransform ) :
@@ -79,6 +77,5 @@ namespace cppcanvas
                                     rTransformation );
         }
     }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 7c4d91b1a8a2..ca5b531138c7 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -228,9 +228,7 @@ namespace
     }
 }
 
-namespace cppcanvas
-{
-    namespace internal
+namespace cppcanvas::internal
     {
         // state stack manipulators
 
@@ -3072,6 +3070,5 @@ namespace cppcanvas
             }
         }
     }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/lineaction.cxx b/cppcanvas/source/mtfrenderer/lineaction.cxx
index e032432e6848..ba479ddc9e9e 100644
--- a/cppcanvas/source/mtfrenderer/lineaction.cxx
+++ b/cppcanvas/source/mtfrenderer/lineaction.cxx
@@ -36,9 +36,7 @@
 
 using namespace ::com::sun::star;
 
-namespace cppcanvas
-{
-    namespace internal
+namespace cppcanvas::internal
     {
         namespace
         {
@@ -152,6 +150,5 @@ namespace cppcanvas
         }
 
     }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/mtftools.cxx b/cppcanvas/source/mtfrenderer/mtftools.cxx
index 54ed0dbfaf3f..67e3fad6f720 100644
--- a/cppcanvas/source/mtfrenderer/mtftools.cxx
+++ b/cppcanvas/source/mtfrenderer/mtftools.cxx
@@ -36,9 +36,7 @@
 
 using namespace ::com::sun::star;
 
-namespace cppcanvas
-{
-    namespace tools
+namespace cppcanvas::tools
     {
         void initRenderState( rendering::RenderState&                   renderState,
                               const ::cppcanvas::internal::OutDevState& outdevState )
@@ -669,6 +667,5 @@ namespace cppcanvas
             createStrikeoutPolyPolygon(rStrikeoutPolyPoly, aStartPos, rLineWidth, rTextLineInfo);
         }
     }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/pointaction.cxx b/cppcanvas/source/mtfrenderer/pointaction.cxx
index 38896151b52e..67e2af712cd4 100644
--- a/cppcanvas/source/mtfrenderer/pointaction.cxx
+++ b/cppcanvas/source/mtfrenderer/pointaction.cxx
@@ -37,9 +37,7 @@
 
 using namespace ::com::sun::star;
 
-namespace cppcanvas
-{
-    namespace internal
+namespace cppcanvas::internal
     {
         namespace
         {
@@ -171,6 +169,5 @@ namespace cppcanvas
             return std::make_shared<PointAction>( rPoint, rCanvas, rState, rColor );
         }
     }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.cxx b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
index 15fa4f5bc776..5f570d662bfc 100644
--- a/cppcanvas/source/mtfrenderer/polypolyaction.cxx
+++ b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
@@ -38,9 +38,7 @@
 
 using namespace ::com::sun::star;
 
-namespace cppcanvas
-{
-    namespace internal
+namespace cppcanvas::internal
     {
         namespace
         {
@@ -503,6 +501,5 @@ namespace cppcanvas
         }
 
     }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx
index 93e54c11dba5..c6acfb330a11 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -49,9 +49,7 @@
 
 using namespace ::com::sun::star;
 
-namespace cppcanvas
-{
-    namespace internal
+namespace cppcanvas::internal
     {
         namespace
         {
@@ -2314,6 +2312,5 @@ namespace cppcanvas
             return ret;
         }
     }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/textlineshelper.cxx b/cppcanvas/source/mtfrenderer/textlineshelper.cxx
index db88e5cb5ee7..6bdc172e30ac 100644
--- a/cppcanvas/source/mtfrenderer/textlineshelper.cxx
+++ b/cppcanvas/source/mtfrenderer/textlineshelper.cxx
@@ -28,9 +28,7 @@ void initLineStyleWaveline(sal_uInt32 nLineStyle, bool& bIsWaveline, bool& bIsBo
 }
 }
 
-namespace cppcanvas
-{
-namespace internal
+namespace cppcanvas::internal
 {
 TextLinesHelper::TextLinesHelper(const CanvasSharedPtr& rCanvas, const OutDevState& rState)
     : mpCanvas(rCanvas)
@@ -123,5 +121,4 @@ void TextLinesHelper::render(const rendering::RenderState& rRenderState, bool bN
         xCanvas->fillPolyPolygon(mxStrikeout, rViewState, rRenderState);
 }
 }
-}
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
index 48be63ed8702..5636b7608109 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
@@ -56,9 +56,7 @@
 
 using namespace ::com::sun::star;
 
-namespace cppcanvas
-{
-    namespace internal
+namespace cppcanvas::internal
     {
         // free support functions
         // ======================
@@ -474,6 +472,5 @@ namespace cppcanvas
         }
 
     }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/tools/canvasgraphichelper.cxx b/cppcanvas/source/tools/canvasgraphichelper.cxx
index d67efbe8e7ef..a233eda34453 100644
--- a/cppcanvas/source/tools/canvasgraphichelper.cxx
+++ b/cppcanvas/source/tools/canvasgraphichelper.cxx
@@ -31,10 +31,7 @@ using namespace ::com::sun::star;
 
 /* Implementation of CanvasGraphicHelper class */
 
-namespace cppcanvas
-{
-
-    namespace internal
+namespace cppcanvas::internal
     {
         CanvasGraphicHelper::CanvasGraphicHelper( const CanvasSharedPtr& rParentCanvas ) :
             maClipPolyPolygon(),
@@ -87,6 +84,5 @@ namespace cppcanvas
         }
 
     }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/tools/tools.cxx b/cppcanvas/source/tools/tools.cxx
index de0e0d1c5169..5813851e0065 100644
--- a/cppcanvas/source/tools/tools.cxx
+++ b/cppcanvas/source/tools/tools.cxx
@@ -23,9 +23,7 @@
 
 using namespace ::com::sun::star;
 
-namespace cppcanvas
-{
-    namespace tools
+namespace cppcanvas::tools
     {
         uno::Sequence< double > intSRGBAToDoubleSequence( IntSRGBA aColor  )
         {
@@ -47,6 +45,5 @@ namespace cppcanvas
                               static_cast<sal_uInt8>( 255*rColor[3] + .5 ) );
         }
     }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implbitmap.cxx b/cppcanvas/source/wrapper/implbitmap.cxx
index 80d827de7105..e5e8b8734c85 100644
--- a/cppcanvas/source/wrapper/implbitmap.cxx
+++ b/cppcanvas/source/wrapper/implbitmap.cxx
@@ -26,10 +26,7 @@
 
 using namespace ::com::sun::star;
 
-namespace cppcanvas
-{
-
-    namespace internal
+namespace cppcanvas::internal
     {
 
         ImplBitmap::ImplBitmap( const CanvasSharedPtr&                      rParentCanvas,
@@ -110,6 +107,5 @@ namespace cppcanvas
             return mxBitmap;
         }
     }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.cxx b/cppcanvas/source/wrapper/implbitmapcanvas.cxx
index 506af5d1f198..3cd4085ad526 100644
--- a/cppcanvas/source/wrapper/implbitmapcanvas.cxx
+++ b/cppcanvas/source/wrapper/implbitmapcanvas.cxx
@@ -28,9 +28,7 @@
 
 using namespace ::com::sun::star;
 
-namespace cppcanvas
-{
-    namespace internal
+namespace cppcanvas::internal
     {
         ImplBitmapCanvas::ImplBitmapCanvas( const uno::Reference< rendering::XBitmapCanvas >& rCanvas ) :
             ImplCanvas( rCanvas ),
@@ -57,6 +55,5 @@ namespace cppcanvas
             return BitmapCanvasSharedPtr( new ImplBitmapCanvas( *this ) );
         }
     }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implcanvas.cxx b/cppcanvas/source/wrapper/implcanvas.cxx
index c16e06375231..e5c936dab908 100644
--- a/cppcanvas/source/wrapper/implcanvas.cxx
+++ b/cppcanvas/source/wrapper/implcanvas.cxx
@@ -31,9 +31,7 @@
 
 using namespace ::com::sun::star;
 
-namespace cppcanvas
-{
-    namespace internal
+namespace cppcanvas::internal
     {
 
         ImplCanvas::ImplCanvas( const uno::Reference< rendering::XCanvas >& xCanvas ) :
@@ -114,6 +112,5 @@ namespace cppcanvas
         }
 
     }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implcustomsprite.cxx b/cppcanvas/source/wrapper/implcustomsprite.cxx
index 5d19a9e9987b..999f312c3c2f 100644
--- a/cppcanvas/source/wrapper/implcustomsprite.cxx
+++ b/cppcanvas/source/wrapper/implcustomsprite.cxx
@@ -25,9 +25,7 @@
 
 using namespace ::com::sun::star;
 
-namespace cppcanvas
-{
-    namespace internal
+namespace cppcanvas::internal
     {
         ImplCustomSprite::ImplCustomSprite( const uno::Reference< rendering::XSpriteCanvas >&       rParentCanvas,
                                             const uno::Reference< rendering::XCustomSprite >&       rSprite,
@@ -68,6 +66,5 @@ namespace cppcanvas
             return mpLastCanvas;
         }
     }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implpolypolygon.cxx b/cppcanvas/source/wrapper/implpolypolygon.cxx
index d333d46a59d1..a7d1124e61fb 100644
--- a/cppcanvas/source/wrapper/implpolypolygon.cxx
+++ b/cppcanvas/source/wrapper/implpolypolygon.cxx
@@ -32,9 +32,7 @@
 using namespace ::com::sun::star;
 
 
-namespace cppcanvas
-{
-    namespace internal
+namespace cppcanvas::internal
     {
         ImplPolyPolygon::ImplPolyPolygon( const CanvasSharedPtr& rParentCanvas,
                                           const uno::Reference< rendering::XPolyPolygon2D >& rPolyPoly ) :
@@ -133,6 +131,5 @@ namespace cppcanvas
         }
 
     }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implsprite.cxx b/cppcanvas/source/wrapper/implsprite.cxx
index 12a4a13e3b88..432a393a82dc 100644
--- a/cppcanvas/source/wrapper/implsprite.cxx
+++ b/cppcanvas/source/wrapper/implsprite.cxx
@@ -27,9 +27,7 @@
 
 using namespace ::com::sun::star;
 
-namespace cppcanvas
-{
-    namespace internal
+namespace cppcanvas::internal
     {
 
         ImplSprite::ImplSprite( const uno::Reference< rendering::XSpriteCanvas >&       rParentCanvas,
@@ -188,6 +186,5 @@ namespace cppcanvas
                 mxSprite->setPriority(fPriority);
         }
     }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implspritecanvas.cxx b/cppcanvas/source/wrapper/implspritecanvas.cxx
index 6d42cf70f76f..0166ccd82d0a 100644
--- a/cppcanvas/source/wrapper/implspritecanvas.cxx
+++ b/cppcanvas/source/wrapper/implspritecanvas.cxx
@@ -27,9 +27,7 @@
 
 using namespace ::com::sun::star;
 
-namespace cppcanvas
-{
-    namespace internal
+namespace cppcanvas::internal
     {
         ImplSpriteCanvas::TransformationArbiter::TransformationArbiter() :
             maTransformation()
@@ -107,6 +105,5 @@ namespace cppcanvas
         }
 
     }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx
index ca81355210bb..78097e26e854 100644
--- a/cppu/qa/cppumaker/test_cppumaker.cxx
+++ b/cppu/qa/cppumaker/test_cppumaker.cxx
@@ -365,7 +365,7 @@
 
 #include <cstddef>
 
-namespace test { namespace codemaker { namespace cppumaker {
+namespace test::codemaker::cppumaker {
 
 static bool operator ==(
     test::codemaker::cppumaker::TestException1 const & e1,
@@ -376,7 +376,7 @@ static bool operator ==(
         && e1.m4.member1 == e2.m4.member1 && e1.m4.member2 == e2.m4.member2;
 }
 
-} } }
+}
 
 namespace {
 
diff --git a/cppu/qa/test_unotype.cxx b/cppu/qa/test_unotype.cxx
index 910afec9db95..829676a14d74 100644
--- a/cppu/qa/test_unotype.cxx
+++ b/cppu/qa/test_unotype.cxx
@@ -38,11 +38,11 @@
 #include <cppu/unotype.hxx>
 #include <rtl/ustring.hxx>
 
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
     class Any;
-} } } }
+}
 
-namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+namespace com::sun::star::uno { template <class interface_type> class Reference; }
 
 namespace {
 
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
index bb8af537c4b8..a0163939ffb5 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
@@ -510,13 +510,13 @@ bool Base::v_isValid(OUString * pReason)
     return m_pEnterable->isValid(pReason);
 }
 
-namespace cppu { namespace helper { namespace purpenv {
+namespace cppu::helper::purpenv {
 
 void Environment_initWithEnterable(uno_Environment * pEnvironment, cppu::Enterable * pEnterable)
 {
     new Base(pEnvironment, pEnterable);
 }
 
-}}}
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
index 6255b2f0b52a..f68a47390cdb 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
@@ -196,7 +196,7 @@ void Mapping::release()
 }
 
 
-namespace cppu { namespace helper { namespace purpenv {
+namespace cppu::helper::purpenv {
 
 void createMapping(uno_Mapping     ** ppMapping,
                    uno_Environment  * pFrom,
@@ -210,6 +210,6 @@ void createMapping(uno_Mapping     ** ppMapping,
     ::uno_registerMapping(ppMapping, s_free, pFrom, pTo, nullptr);
 }
 
-}}}
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/loadmodule.cxx b/cppu/source/uno/loadmodule.cxx
index 359227b24206..f3ba0ba21616 100644
--- a/cppu/source/uno/loadmodule.cxx
+++ b/cppu/source/uno/loadmodule.cxx
@@ -32,7 +32,7 @@
 
 #include "loadmodule.hxx"
 
-namespace cppu { namespace detail {
+namespace cppu::detail {
 
 #ifndef DISABLE_DYNLOADING
 
@@ -71,6 +71,6 @@ bool loadModule(osl::Module& rModule, OUString const & name) {
 
 #endif
 
-} }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/compat.cxx b/cppuhelper/source/compat.cxx
index 600cb369c2b5..f6572ea47ee0 100644
--- a/cppuhelper/source/compat.cxx
+++ b/cppuhelper/source/compat.cxx
@@ -26,7 +26,7 @@
 #include <osl/module.h>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace lang {
         class XMultiComponentFactory;
         class XMultiServiceFactory;
@@ -41,7 +41,7 @@ namespace com { namespace sun { namespace star {
         class XComponentContext;
         class XInterface;
     }
-} } }
+}
 
 // Stubs for removed functionality, to be killed when we bump cppuhelper SONAME
 
diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx
index 483ca5712766..e9a6cce3fd43 100644
--- a/cppuhelper/source/macro_expander.cxx
+++ b/cppuhelper/source/macro_expander.cxx
@@ -55,7 +55,7 @@ static Bootstrap const & get_unorc()
 
 }
 
-namespace cppuhelper { namespace detail {
+namespace cppuhelper::detail {
 
 OUString expandMacros(OUString const & text) {
     OUString t(text);
@@ -64,7 +64,7 @@ OUString expandMacros(OUString const & text) {
     return t;
 }
 
-} }
+}
 
 namespace
 {
@@ -157,7 +157,7 @@ Reference< XInterface > service_create(
 
 }
 
-namespace cppuhelper { namespace detail {
+namespace cppuhelper::detail {
 
 Reference< lang::XSingleComponentFactory > create_bootstrap_macro_expander_factory()
 {
@@ -177,6 +177,6 @@ Reference< lang::XSingleComponentFactory > create_bootstrap_macro_expander_facto
         SAL_NO_ACQUIRE);
 }
 
-} }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx
index a7ef2410eeb8..a11e52bbbb78 100644
--- a/cppuhelper/source/weak.cxx
+++ b/cppuhelper/source/weak.cxx
@@ -325,16 +325,7 @@ void OWeakAggObject::setDelegator( const Reference<XInterface > & rDelegator )
 }
 
 /** */ //for docpp
-namespace com
-{
-/** */ //for docpp
-namespace sun
-{
-/** */ //for docpp
-namespace star
-{
-/** */ //for docpp
-namespace uno
+namespace com::sun::star::uno
 {
 
 
@@ -535,8 +526,5 @@ Reference< XInterface > WeakReferenceHelper::get() const
 }
 
 }
-}
-}
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */