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>

12 files changed, 22 insertions, 38 deletions

diff --git a/vcl/backendtest/outputdevice/bitmap.cxx b/vcl/backendtest/outputdevice/bitmap.cxx
index 2e7e0713294a..79cd3d3795cd 100644
--- a/vcl/backendtest/outputdevice/bitmap.cxx
+++ b/vcl/backendtest/outputdevice/bitmap.cxx
@@ -13,8 +13,7 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <bitmapwriteaccess.hxx>
 
-namespace vcl {
-namespace test {
+namespace vcl::test {
 
 Bitmap OutputDeviceTestBitmap::setupDrawTransformedBitmap()
 {
@@ -189,6 +188,6 @@ TestResult OutputDeviceTestBitmap::checkBlend(BitmapEx& rBitmapEx)
     return checkRectangles(aBitmap, aExpected);
 }
 
-}} // end namespace vcl::test
+} // end namespace vcl::test
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/backendtest/outputdevice/common.cxx b/vcl/backendtest/outputdevice/common.cxx
index a7e857ffd1fd..e76150c49c1f 100644
--- a/vcl/backendtest/outputdevice/common.cxx
+++ b/vcl/backendtest/outputdevice/common.cxx
@@ -12,8 +12,7 @@
 #include <bitmapwriteaccess.hxx>
 #include <salgdi.hxx>
 
-namespace vcl {
-namespace test {
+namespace vcl::test {
 
 namespace
 {
@@ -469,6 +468,6 @@ TestResult OutputDeviceTestCommon::checkBezier(Bitmap& rBitmap)
     return checkRectangles(rBitmap, aExpected);
 }
 
-}} // end namespace vcl::test
+} // end namespace vcl::test
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/backendtest/outputdevice/gradient.cxx b/vcl/backendtest/outputdevice/gradient.cxx
index 58e20e5d6092..9880fedd1e4c 100644
--- a/vcl/backendtest/outputdevice/gradient.cxx
+++ b/vcl/backendtest/outputdevice/gradient.cxx
@@ -11,8 +11,7 @@
 #include <test/outputdevice.hxx>
 #include <vcl/gradient.hxx>
 
-namespace vcl {
-namespace test {
+namespace vcl::test {
 
 Bitmap OutputDeviceTestGradient::setupLinearGradient()
 {
@@ -39,6 +38,6 @@ Bitmap OutputDeviceTestGradient::setupRadialGradient()
     return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(), maVDRectangle.GetSize());
 }
 
-}} // end namespace vcl::test
+} // end namespace vcl::test
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/backendtest/outputdevice/line.cxx b/vcl/backendtest/outputdevice/line.cxx
index a43c72a62dc0..b9236dcc210d 100644
--- a/vcl/backendtest/outputdevice/line.cxx
+++ b/vcl/backendtest/outputdevice/line.cxx
@@ -10,8 +10,7 @@
 
 #include <test/outputdevice.hxx>
 
-namespace vcl {
-namespace test {
+namespace vcl::test {
 
 namespace
 {
@@ -109,6 +108,6 @@ Bitmap OutputDeviceTestLine::setupAALines()
     return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(), maVDRectangle.GetSize());
 }
 
-}} // end namespace vcl::test
+} // end namespace vcl::test
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/backendtest/outputdevice/outputdevice.cxx b/vcl/backendtest/outputdevice/outputdevice.cxx
index 4f31501b6f3b..c05c03e06a3a 100644
--- a/vcl/backendtest/outputdevice/outputdevice.cxx
+++ b/vcl/backendtest/outputdevice/outputdevice.cxx
@@ -10,8 +10,7 @@
 
 #include <test/outputdevice.hxx>
 
-namespace vcl {
-namespace test {
+namespace vcl::test {
 
 Bitmap OutputDeviceTestAnotherOutDev::setupDrawOutDev()
 {
@@ -75,6 +74,6 @@ TestResult OutputDeviceTestAnotherOutDev::checkXOR(Bitmap& rBitmap)
     return checkRectangles(rBitmap, aExpected);
 }
 
-}} // end namespace vcl::test
+} // end namespace vcl::test
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/backendtest/outputdevice/pixel.cxx b/vcl/backendtest/outputdevice/pixel.cxx
index b231396ab7ff..71997868fdf6 100644
--- a/vcl/backendtest/outputdevice/pixel.cxx
+++ b/vcl/backendtest/outputdevice/pixel.cxx
@@ -10,8 +10,7 @@
 
 #include <test/outputdevice.hxx>
 
-namespace vcl {
-namespace test {
+namespace vcl::test {
 
 namespace
 {
@@ -52,6 +51,6 @@ Bitmap OutputDeviceTestPixel::setupRectangle(bool bEnableAA)
     return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(), maVDRectangle.GetSize());
 }
 
-}} // end namespace vcl::test
+} // end namespace vcl::test
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/backendtest/outputdevice/polygon.cxx b/vcl/backendtest/outputdevice/polygon.cxx
index f0977abfb5f6..8d207ade9b64 100644
--- a/vcl/backendtest/outputdevice/polygon.cxx
+++ b/vcl/backendtest/outputdevice/polygon.cxx
@@ -10,8 +10,7 @@
 
 #include <test/outputdevice.hxx>
 
-namespace vcl {
-namespace test {
+namespace vcl::test {
 
 namespace
 {
@@ -153,6 +152,6 @@ Bitmap OutputDeviceTestPolygon::setupAALines()
     return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(), maVDRectangle.GetSize());
 }
 
-}} // end namespace vcl::test
+} // end namespace vcl::test
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/backendtest/outputdevice/polyline.cxx b/vcl/backendtest/outputdevice/polyline.cxx
index 53a9edab9d11..e1d1fd9e0ae0 100644
--- a/vcl/backendtest/outputdevice/polyline.cxx
+++ b/vcl/backendtest/outputdevice/polyline.cxx
@@ -10,8 +10,7 @@
 
 #include <test/outputdevice.hxx>
 
-namespace vcl {
-namespace test {
+namespace vcl::test {
 
 namespace
 {
@@ -135,6 +134,6 @@ Bitmap OutputDeviceTestPolyLine::setupAALines()
     return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(), maVDRectangle.GetSize());
 }
 
-}} // end namespace vcl::test
+} // end namespace vcl::test
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/backendtest/outputdevice/polyline_b2d.cxx b/vcl/backendtest/outputdevice/polyline_b2d.cxx
index 3674fa5d172c..65658d7aeb1d 100644
--- a/vcl/backendtest/outputdevice/polyline_b2d.cxx
+++ b/vcl/backendtest/outputdevice/polyline_b2d.cxx
@@ -11,9 +11,7 @@
 #include <test/outputdevice.hxx>
 #include <vcl/bitmapex.hxx>
 
-namespace vcl
-{
-namespace test
+namespace vcl::test
 {
 namespace
 {
@@ -124,7 +122,6 @@ Bitmap OutputDeviceTestPolyLineB2D::setupAABezier()
 
     return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(), maVDRectangle.GetSize());
 }
-}
 } // end namespace vcl::test
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/backendtest/outputdevice/polypolygon.cxx b/vcl/backendtest/outputdevice/polypolygon.cxx
index e5a527042bdc..a53acbaf72be 100644
--- a/vcl/backendtest/outputdevice/polypolygon.cxx
+++ b/vcl/backendtest/outputdevice/polypolygon.cxx
@@ -11,8 +11,7 @@
 #include <test/outputdevice.hxx>
 
 
-namespace vcl {
-namespace test {
+namespace vcl::test {
 
 namespace
 {
@@ -68,6 +67,6 @@ Bitmap OutputDeviceTestPolyPolygon::setupFilledRectangle(bool useLineColor)
     return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(), maVDRectangle.GetSize());
 }
 
-}} // end namespace vcl::test
+} // end namespace vcl::test
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/backendtest/outputdevice/polypolygon_b2d.cxx b/vcl/backendtest/outputdevice/polypolygon_b2d.cxx
index 977f73dcc1f4..737cfae195f2 100644
--- a/vcl/backendtest/outputdevice/polypolygon_b2d.cxx
+++ b/vcl/backendtest/outputdevice/polypolygon_b2d.cxx
@@ -10,9 +10,7 @@
 
 #include <test/outputdevice.hxx>
 
-namespace vcl
-{
-namespace test
+namespace vcl::test
 {
 namespace
 {
@@ -67,7 +65,6 @@ Bitmap OutputDeviceTestPolyPolygonB2D::setupFilledRectangle(bool useLineColor)
 
     return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(), maVDRectangle.GetSize());
 }
-}
 } // end namespace vcl::test
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/backendtest/outputdevice/rectangle.cxx b/vcl/backendtest/outputdevice/rectangle.cxx
index 033ebb3c54ae..8e7c0ba861aa 100644
--- a/vcl/backendtest/outputdevice/rectangle.cxx
+++ b/vcl/backendtest/outputdevice/rectangle.cxx
@@ -10,8 +10,7 @@
 
 #include <test/outputdevice.hxx>
 
-namespace vcl {
-namespace test {
+namespace vcl::test {
 
 namespace
 {
@@ -110,6 +109,6 @@ Bitmap OutputDeviceTestRect::setupInvert_TrackFrame()
     return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(), maVDRectangle.GetSize());
 }
 
-}} // end namespace vcl::test
+} // end namespace vcl::test
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */