8 files changed, 17 insertions, 21 deletions
diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx
index ca8404a0c886..6cbde63f2000 100644
--- a/configmgr/source/configurationprovider.cxx
+++ b/configmgr/source/configurationprovider.cxx
@@ -59,7 +59,7 @@
 #include "defaultprovider.hxx"
 #include "rootaccess.hxx"
 
-namespace configmgr { namespace configuration_provider {
+namespace configmgr::configuration_provider {
 
 namespace {
 
@@ -460,6 +460,6 @@ createFactory(
     return new Factory;
 }
 
-} }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configmgr/source/configurationregistry.cxx b/configmgr/source/configurationregistry.cxx
index f27e3c7b88cc..5e57e8bf387d 100644
--- a/configmgr/source/configurationregistry.cxx
+++ b/configmgr/source/configurationregistry.cxx
@@ -56,11 +56,11 @@
 
 #include "configurationregistry.hxx"
 
-namespace com { namespace sun { namespace star { namespace util {
+namespace com::sun::star::util {
     class XFlushListener;
-} } } }
+}
 
-namespace configmgr { namespace configuration_registry {
+namespace configmgr::configuration_registry {
 
 namespace {
 
@@ -644,6 +644,6 @@ css::uno::Sequence< OUString > getSupportedServiceNames() {
     return css::uno::Sequence< OUString > { "com.sun.star.configuration.ConfigurationRegistry" };
 }
 
-} }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configmgr/source/dconf.cxx b/configmgr/source/dconf.cxx
index da351bd917a0..430dc37cc071 100644
--- a/configmgr/source/dconf.cxx
+++ b/configmgr/source/dconf.cxx
@@ -111,7 +111,7 @@ extern "C" {
 //
 // TODO: support "mandatory" and "external"?
 
-namespace configmgr { namespace dconf {
+namespace configmgr::dconf {
 
 namespace {
 
@@ -1590,6 +1590,6 @@ void writeModifications(Components & components, Data & data) {
     data.modifications.clear();
 }
 
-} }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configmgr/source/defaultprovider.cxx b/configmgr/source/defaultprovider.cxx
index c456954bb332..d07dcd382d80 100644
--- a/configmgr/source/defaultprovider.cxx
+++ b/configmgr/source/defaultprovider.cxx
@@ -29,7 +29,7 @@
 #include "defaultprovider.hxx"
 #include "lock.hxx"
 
-namespace configmgr { namespace default_provider {
+namespace configmgr::default_provider {
 
 css::uno::Reference< css::uno::XInterface > create(
     css::uno::Reference< css::uno::XComponentContext > const & context)
@@ -48,6 +48,6 @@ css::uno::Sequence< OUString > getSupportedServiceNames() {
     return css::uno::Sequence< OUString > { "com.sun.star.configuration.DefaultProvider" };
 }
 
-} }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configmgr/source/readonlyaccess.cxx b/configmgr/source/readonlyaccess.cxx
index 079459dc747f..5da0f122cc7d 100644
--- a/configmgr/source/readonlyaccess.cxx
+++ b/configmgr/source/readonlyaccess.cxx
@@ -32,7 +32,7 @@
 #include "readonlyaccess.hxx"
 #include "rootaccess.hxx"
 
-namespace configmgr { namespace read_only_access {
+namespace configmgr::read_only_access {
 
 namespace {
 
@@ -124,6 +124,6 @@ css::uno::Sequence< OUString > getSupportedServiceNames() {
     return css::uno::Sequence< OUString > { "com.sun.star.configuration.ReadOnlyAccess" };
 }
 
-} }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configmgr/source/readwriteaccess.cxx b/configmgr/source/readwriteaccess.cxx
index 3cbf006c8ad4..376e70182d5f 100644
--- a/configmgr/source/readwriteaccess.cxx
+++ b/configmgr/source/readwriteaccess.cxx
@@ -32,7 +32,7 @@
 #include "readwriteaccess.hxx"
 #include "rootaccess.hxx"
 
-namespace configmgr { namespace read_write_access {
+namespace configmgr::read_write_access {
 
 namespace {
 
@@ -146,6 +146,6 @@ css::uno::Sequence< OUString > getSupportedServiceNames() {
     return css::uno::Sequence< OUString > { "com.sun.star.configuration.ReadWriteAccess" };
 }
 
-} }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configmgr/source/update.cxx b/configmgr/source/update.cxx
index 7529e21ef6f1..69e27f794990 100644
--- a/configmgr/source/update.cxx
+++ b/configmgr/source/update.cxx
@@ -40,7 +40,7 @@
 #include "rootaccess.hxx"
 #include "update.hxx"
 
-namespace configmgr { namespace update {
+namespace configmgr::update {
 
 namespace {
 
@@ -154,6 +154,6 @@ css::uno::Sequence< OUString > getSupportedServiceNames() {
     return css::uno::Sequence< OUString > { "com.sun.star.configuration.Update_Service" };
 }
 
-} }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configmgr/source/xmldata.cxx b/configmgr/source/xmldata.cxx
index e919d08e7824..a2a05877674e 100644
--- a/configmgr/source/xmldata.cxx
+++ b/configmgr/source/xmldata.cxx
@@ -33,9 +33,7 @@
 #include "type.hxx"
 #include "xmldata.hxx"
 
-namespace configmgr {
-
-namespace xmldata {
+namespace configmgr::xmldata {
 
 Type parseType(
     xmlreader::XmlReader const & reader, xmlreader::Span const & text)
@@ -132,6 +130,4 @@ OUString parseTemplateReference(
 
 }
 
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */