From c82efb610bf556ea12cbe4f94568ac619897799f Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Mon, 13 Jan 2020 19:48:37 +0200
Subject: 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>
---
 ucb/source/ucp/ext/ucpext_content.cxx      | 4 ++--
 ucb/source/ucp/ext/ucpext_datasupplier.cxx | 4 ++--
 ucb/source/ucp/ext/ucpext_provider.cxx     | 4 ++--
 ucb/source/ucp/ext/ucpext_resultset.cxx    | 4 ++--
 ucb/source/ucp/ext/ucpext_services.cxx     | 4 ++--
 ucb/source/ucp/tdoc/tdoc_contentcaps.cxx   | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'ucb')

diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx
index 07b59b983fc7..2d445acc2a3e 100644
--- a/ucb/source/ucp/ext/ucpext_content.cxx
+++ b/ucb/source/ucp/ext/ucpext_content.cxx
@@ -45,7 +45,7 @@
 #include <algorithm>
 
 
-namespace ucb { namespace ucp { namespace ext
+namespace ucb::ucp::ext
 {
 
 
@@ -628,7 +628,7 @@ namespace ucb { namespace ucp { namespace ext
     }
 
 
-} } }   // namespace ucp::ext
+}   // namespace ucp::ext
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx
index acb415f3d903..92d78142bc7e 100644
--- a/ucb/source/ucp/ext/ucpext_datasupplier.cxx
+++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx
@@ -37,7 +37,7 @@
 #include <vector>
 
 
-namespace ucb { namespace ucp { namespace ext
+namespace ucb::ucp::ext
 {
 
 
@@ -341,7 +341,7 @@ namespace ucb { namespace ucp { namespace ext
     }
 
 
-} } }   // namespace ucp::ext
+} // namespace ucb::ucp::ext
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/ext/ucpext_provider.cxx b/ucb/source/ucp/ext/ucpext_provider.cxx
index 253cbbb91d79..5af819c90f6f 100644
--- a/ucb/source/ucp/ext/ucpext_provider.cxx
+++ b/ucb/source/ucp/ext/ucpext_provider.cxx
@@ -26,7 +26,7 @@
 #include <rtl/ustrbuf.hxx>
 
 
-namespace ucb { namespace ucp { namespace ext
+namespace ucb::ucp::ext
 {
 
 
@@ -176,7 +176,7 @@ namespace ucb { namespace ucp { namespace ext
     }
 
 
-} } }   // namespace ucb::ucp::ext
+}   // namespace ucb::ucp::ext
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/ext/ucpext_resultset.cxx b/ucb/source/ucp/ext/ucpext_resultset.cxx
index d2c5dc414d21..b810d2956149 100644
--- a/ucb/source/ucp/ext/ucpext_resultset.cxx
+++ b/ucb/source/ucp/ext/ucpext_resultset.cxx
@@ -24,7 +24,7 @@
 #include <ucbhelper/resultset.hxx>
 
 
-namespace ucb { namespace ucp { namespace ext
+namespace ucb::ucp::ext
 {
 
 
@@ -69,7 +69,7 @@ namespace ucb { namespace ucp { namespace ext
     }
 
 
-} } }   // namespace ucp::ext
+} // namespace ucb::ucp::ext
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/ext/ucpext_services.cxx b/ucb/source/ucp/ext/ucpext_services.cxx
index 0d38566336ea..b7ffde3d1b31 100644
--- a/ucb/source/ucp/ext/ucpext_services.cxx
+++ b/ucb/source/ucp/ext/ucpext_services.cxx
@@ -22,7 +22,7 @@
 #include <cppuhelper/implementationentry.hxx>
 
 
-namespace ucb { namespace ucp { namespace ext
+namespace ucb::ucp::ext
 {
 
 
@@ -42,7 +42,7 @@ namespace ucb { namespace ucp { namespace ext
     };
 
 
-} } }   // namespace ucb::ucp::ext
+}   // namespace ucb::ucp::ext
 
 
 extern "C"
diff --git a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
index 32b06df90fec..8b19f9ec94b8 100644
--- a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
@@ -62,9 +62,9 @@
 #include <sal/macros.h>
 #include "tdoc_content.hxx"
 
-namespace com { namespace sun { namespace star { namespace embed {
+namespace com::sun::star::embed {
     class XStorage;
-} } } }
+}
 
 using namespace com::sun::star;
 using namespace tdoc_ucp;
-- 
cgit