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>

5 files changed, 11 insertions, 11 deletions

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: */