clang-tidy modernize-concat-nested-namespace in basic..canvas

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

4 files changed, 6 insertions, 19 deletions

diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx
index d8507fb1e29a..c9e4c71284a6 100644
--- a/canvas/source/tools/canvastools.cxx
+++ b/canvas/source/tools/canvastools.cxx
@@ -62,9 +62,7 @@
 
 using namespace ::com::sun::star;
 
-namespace canvas
-{
-    namespace tools
+namespace canvas::tools
     {
         geometry::RealSize2D createInfiniteSize2D()
         {
@@ -1319,8 +1317,6 @@ namespace canvas
             }
         }
 
-    } // namespace tools
-
-} // namespace canvas
+    } // namespace canvas
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/tools/elapsedtime.cxx b/canvas/source/tools/elapsedtime.cxx
index 28e1a660f2a1..a73ffc5936dc 100644
--- a/canvas/source/tools/elapsedtime.cxx
+++ b/canvas/source/tools/elapsedtime.cxx
@@ -23,8 +23,7 @@
 
 #include <tools/time.hxx>
 
-namespace canvas {
-namespace tools {
+namespace canvas::tools {
 
 double ElapsedTime::getSystemTime()
 {
@@ -125,7 +124,6 @@ void ElapsedTime::releaseTimer()
     m_bInHoldMode = false;
 }
 
-} // namespace tools
 } // namespace canvas
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/tools/verifyinput.cxx b/canvas/source/tools/verifyinput.cxx
index 7ca81c054330..fab7e13b684b 100644
--- a/canvas/source/tools/verifyinput.cxx
+++ b/canvas/source/tools/verifyinput.cxx
@@ -46,9 +46,7 @@
 
 using namespace ::com::sun::star;
 
-namespace canvas
-{
-    namespace tools
+namespace canvas::tools
     {
         void verifyInput( const geometry::RealPoint2D&              rPoint,
                           const char*                               pStr,
@@ -710,8 +708,6 @@ namespace canvas
         }
 
 
-    } // namespace tools
-
-} // namespace canvas
+    } // namespace canvas
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/vcl/impltools.cxx b/canvas/source/vcl/impltools.cxx
index 8b908c5a63bf..c1e913b99fe4 100644
--- a/canvas/source/vcl/impltools.cxx
+++ b/canvas/source/vcl/impltools.cxx
@@ -43,9 +43,7 @@
 
 using namespace ::com::sun::star;
 
-namespace vclcanvas
-{
-    namespace tools
+namespace vclcanvas::tools
     {
         ::BitmapEx bitmapExFromXBitmap( const uno::Reference< rendering::XBitmap >& xBitmap )
         {
@@ -219,6 +217,5 @@ namespace vclcanvas
             return vcl::bitmap::CanvasTransformBitmap(rBitmap, rTransform, aDestRect, aLocalTransform);
         }
     }
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */