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>

13 files changed, 25 insertions, 27 deletions

diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx
index 011998838db2..9dade1c3f09a 100644
--- a/sal/osl/unx/file_url.cxx
+++ b/sal/osl/unx/file_url.cxx
@@ -743,8 +743,7 @@ oslFileError osl_getAbsoluteFileURL(
     return rc;
 }
 
-namespace osl {
-namespace detail {
+namespace osl::detail {
 
     /**
      No separate error code if unicode to text conversion or getenv fails because for the
@@ -762,7 +761,6 @@ namespace detail {
         return bfound;
     }
 }
-}
 
 namespace
 {
diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx
index 80ce83b1d2d0..f5168b60da89 100644
--- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx
+++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx
@@ -16,7 +16,7 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <rtl/ustrbuf.hxx>
 
-namespace test { namespace oustringbuffer {
+namespace test::oustringbuffer {
 
 class AppendChar: public CppUnit::TestFixture {
 private:
@@ -36,7 +36,7 @@ void AppendChar::testAppendChar() {
     CPPUNIT_ASSERT_EQUAL(u'a', s[0]);
 }
 
-} }
+}
 
 CPPUNIT_TEST_SUITE_REGISTRATION(test::oustringbuffer::AppendChar);
 
diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx
index 139b87bd4295..66231d8b856f 100644
--- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx
+++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx
@@ -24,7 +24,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
 
-namespace test { namespace oustringbuffer {
+namespace test::oustringbuffer {
 
 class ToString: public CppUnit::TestFixture {
 private:
@@ -35,7 +35,7 @@ private:
     CPPUNIT_TEST_SUITE_END();
 };
 
-} }
+}
 
 CPPUNIT_TEST_SUITE_REGISTRATION(test::oustringbuffer::ToString);
 
diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx
index 53f738285761..80643df2eba0 100644
--- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx
+++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx
@@ -26,7 +26,7 @@
 #include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 
-namespace test { namespace oustringbuffer {
+namespace test::oustringbuffer {
 
 class Utf32: public CppUnit::TestFixture {
 private:
@@ -40,7 +40,7 @@ private:
     CPPUNIT_TEST_SUITE_END();
 };
 
-} }
+}
 
 CPPUNIT_TEST_SUITE_REGISTRATION(test::oustringbuffer::Utf32);
 
diff --git a/sal/qa/rtl/strings/test_ostring_concat.cxx b/sal/qa/rtl/strings/test_ostring_concat.cxx
index fc310dbb58bd..bcb4a3e3bb23 100644
--- a/sal/qa/rtl/strings/test_ostring_concat.cxx
+++ b/sal/qa/rtl/strings/test_ostring_concat.cxx
@@ -37,7 +37,7 @@ template<> struct assertion_traits<std::type_info>
 };
 } // namespace
 
-namespace test { namespace ostring {
+namespace test::ostring {
 
 class StringConcat : public CppUnit::TestFixture
 {
@@ -176,7 +176,7 @@ void test::ostring::StringConcat::checkInvalid()
 #endif
 }
 
-}} // namespace
+} // namespace
 
 CPPUNIT_TEST_SUITE_REGISTRATION(test::ostring::StringConcat);
 
diff --git a/sal/qa/rtl/strings/test_ostring_stringliterals.cxx b/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
index 96272cdc9844..e513d56a5d8f 100644
--- a/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
+++ b/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
@@ -21,7 +21,7 @@ bool rtl_string_unittest_const_literal;
 bool rtl_string_unittest_const_literal_function;
 static bool rtl_string_unittest_non_const_literal_function;
 
-namespace test { namespace ostring {
+namespace test::ostring {
 
 class StringLiterals: public CppUnit::TestFixture
 {
@@ -256,7 +256,7 @@ void test::ostring::StringLiterals::checkBuffer()
 
 #undef CONST_CTOR_USED
 
-}} // namespace
+} // namespace
 
 CPPUNIT_TEST_SUITE_REGISTRATION(test::ostring::StringLiterals);
 
diff --git a/sal/qa/rtl/strings/test_oustring_compare.cxx b/sal/qa/rtl/strings/test_oustring_compare.cxx
index 2f4172e51493..c06d40c4d653 100644
--- a/sal/qa/rtl/strings/test_oustring_compare.cxx
+++ b/sal/qa/rtl/strings/test_oustring_compare.cxx
@@ -23,7 +23,7 @@
 #include <rtl/string.h>
 #include <rtl/ustring.hxx>
 
-namespace test { namespace oustring {
+namespace test::oustring {
 
 class Compare: public CppUnit::TestFixture
 {
@@ -39,7 +39,7 @@ CPPUNIT_TEST(compareTo);
 CPPUNIT_TEST_SUITE_END();
 };
 
-} }
+}
 
 CPPUNIT_TEST_SUITE_REGISTRATION(test::oustring::Compare);
 
diff --git a/sal/qa/rtl/strings/test_oustring_concat.cxx b/sal/qa/rtl/strings/test_oustring_concat.cxx
index b67a2938ea36..bae7b65bee7e 100644
--- a/sal/qa/rtl/strings/test_oustring_concat.cxx
+++ b/sal/qa/rtl/strings/test_oustring_concat.cxx
@@ -36,7 +36,7 @@ template<> struct assertion_traits<std::type_info>
 };
 } // namespace
 
-namespace test { namespace oustring {
+namespace test::oustring {
 
 class StringConcat : public CppUnit::TestFixture
 {
@@ -187,7 +187,7 @@ void test::oustring::StringConcat::checkInvalid()
 #endif
 }
 
-}} // namespace
+} // namespace
 
 CPPUNIT_TEST_SUITE_REGISTRATION(test::oustring::StringConcat);
 
diff --git a/sal/qa/rtl/strings/test_oustring_convert.cxx b/sal/qa/rtl/strings/test_oustring_convert.cxx
index 20d3a9221c79..cfae69f0012a 100644
--- a/sal/qa/rtl/strings/test_oustring_convert.cxx
+++ b/sal/qa/rtl/strings/test_oustring_convert.cxx
@@ -25,7 +25,7 @@
 #include <rtl/ustring.hxx>
 #include <sal/macros.h>
 
-namespace test { namespace oustring {
+namespace test::oustring {
 
 class Convert: public CppUnit::TestFixture
 {
@@ -37,7 +37,7 @@ private:
     CPPUNIT_TEST_SUITE_END();
 };
 
-} }
+}
 
 CPPUNIT_TEST_SUITE_REGISTRATION(test::oustring::Convert);
 
diff --git a/sal/qa/rtl/strings/test_oustring_endswith.cxx b/sal/qa/rtl/strings/test_oustring_endswith.cxx
index 33858e12ae23..7649de312f81 100644
--- a/sal/qa/rtl/strings/test_oustring_endswith.cxx
+++ b/sal/qa/rtl/strings/test_oustring_endswith.cxx
@@ -27,7 +27,7 @@
 #include <rtl/ustring.hxx>
 #include <sal/macros.h>
 
-namespace test { namespace oustring {
+namespace test::oustring {
 
 class EndsWith: public CppUnit::TestFixture
 {
@@ -39,7 +39,7 @@ private:
     CPPUNIT_TEST_SUITE_END();
 };
 
-} }
+}
 
 CPPUNIT_TEST_SUITE_REGISTRATION(test::oustring::EndsWith);
 
diff --git a/sal/qa/rtl/strings/test_oustring_startswith.cxx b/sal/qa/rtl/strings/test_oustring_startswith.cxx
index 43d4c9e921c4..a74671e6eef1 100644
--- a/sal/qa/rtl/strings/test_oustring_startswith.cxx
+++ b/sal/qa/rtl/strings/test_oustring_startswith.cxx
@@ -12,7 +12,7 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <rtl/ustring.hxx>
 
-namespace test { namespace oustring {
+namespace test::oustring {
 
 class StartsWith: public CppUnit::TestFixture
 {
@@ -24,7 +24,7 @@ private:
     CPPUNIT_TEST_SUITE_END();
 };
 
-} }
+}
 
 CPPUNIT_TEST_SUITE_REGISTRATION(test::oustring::StartsWith);
 
diff --git a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
index 9c7116ef5edb..9a014557ff59 100644
--- a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
+++ b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
@@ -26,7 +26,7 @@
 extern bool rtl_string_unittest_const_literal;
 bool rtl_string_unittest_invalid_conversion;
 
-namespace test { namespace oustring {
+namespace test::oustring {
 
 class StringLiterals: public CppUnit::TestFixture
 {
@@ -424,7 +424,7 @@ void test::oustring::StringLiterals::checkUtf16() {
     CPPUNIT_ASSERT_EQUAL(sal_Int32(5), b.lastIndexOf(u"ab"));
 }
 
-}} // namespace
+} // namespace
 
 CPPUNIT_TEST_SUITE_REGISTRATION(test::oustring::StringLiterals);
 
diff --git a/sal/qa/rtl/strings/test_strings_valuex.cxx b/sal/qa/rtl/strings/test_strings_valuex.cxx
index 85fee5f00dd8..6c9c836442e1 100644
--- a/sal/qa/rtl/strings/test_strings_valuex.cxx
+++ b/sal/qa/rtl/strings/test_strings_valuex.cxx
@@ -13,7 +13,7 @@
 #include <rtl/ustring.hxx>
 #include <iostream>
 
-namespace test { namespace strings {
+namespace test::strings {
 
 class valueX : public CppUnit::TestFixture {
 public:
@@ -34,7 +34,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 };
 
-} }
+}
 
 CPPUNIT_TEST_SUITE_REGISTRATION(test::strings::valueX);