compact namespace: connectivity

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

12 files changed, 68 insertions, 111 deletions

diff --git a/include/connectivity/PColumn.hxx b/include/connectivity/PColumn.hxx
index 8e1aa77e19b3..f2319ad2a56e 100644
--- a/include/connectivity/PColumn.hxx
+++ b/include/connectivity/PColumn.hxx
@@ -33,9 +33,7 @@ namespace com::sun::star::container { class XNameAccess; }
 namespace com::sun::star::sdbc { class XDatabaseMetaData; }
 namespace com::sun::star::sdbc { class XResultSetMetaData; }
 
-namespace connectivity
-{
-    namespace parse
+namespace connectivity::parse
     {
         class OParseColumn;
 
@@ -144,7 +142,7 @@ namespace connectivity
         private:
             using OOrderColumn_BASE::createArrayHelper;
         };
-    }
+
 }
 
 #endif // INCLUDED_CONNECTIVITY_PCOLUMN_HXX
diff --git a/include/connectivity/dbconversion.hxx b/include/connectivity/dbconversion.hxx
index 5991682f7dfe..775201496e65 100644
--- a/include/connectivity/dbconversion.hxx
+++ b/include/connectivity/dbconversion.hxx
@@ -25,44 +25,36 @@
 
 namespace com::sun::star::uno { template <typename > class Reference; }
 
-namespace com
+namespace com::sun::star
 {
-    namespace sun
+    namespace lang
     {
-        namespace star
-        {
-            namespace lang
-            {
-                struct Locale;
-            }
-            namespace sdb
-            {
-                class XColumn;
-                class XColumnUpdate;
-            }
-            namespace beans
-            {
-                class XPropertySet;
-            }
-            namespace util
-            {
-                class XNumberFormatter;
-                class XNumberFormatsSupplier;
-                struct Time;
-                struct DateTime;
-            }
-            namespace script
-            {
-                class XTypeConverter;
-            }
-        }
+        struct Locale;
+    }
+    namespace sdb
+    {
+        class XColumn;
+        class XColumnUpdate;
+    }
+    namespace beans
+    {
+        class XPropertySet;
+    }
+    namespace util
+    {
+        class XNumberFormatter;
+        class XNumberFormatsSupplier;
+        struct Time;
+        struct DateTime;
+    }
+    namespace script
+    {
+        class XTypeConverter;
     }
 }
 
-namespace dbtools
+namespace dbtools::DBTypeConversion
 {
-    namespace DBTypeConversion
-    {
         OOO_DLLPUBLIC_DBTOOLS css::util::Date const & getStandardDate();
         /// @throws css::lang::IllegalArgumentException
         OOO_DLLPUBLIC_DBTOOLS void setValue(const css::uno::Reference< css::sdb::XColumnUpdate>& xVariant,
@@ -185,9 +177,8 @@ namespace dbtools
             sal_Int32 _nMaxLen,
             rtl_TextEncoding _eEncoding
        );
-    }
 
-} // namespace dbtools
+} // namespace dbtools::DBTypeConversion
 
 #endif // INCLUDED_CONNECTIVITY_DBCONVERSION_HXX
 
diff --git a/include/connectivity/dbexception.hxx b/include/connectivity/dbexception.hxx
index cf66bc06fc0d..4edd174e5635 100644
--- a/include/connectivity/dbexception.hxx
+++ b/include/connectivity/dbexception.hxx
@@ -24,23 +24,17 @@
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 
-namespace com
+namespace com::sun::star
 {
-    namespace sun
+    namespace sdb
     {
-        namespace star
-        {
-            namespace sdb
-            {
-                class SQLContext;
-                struct SQLErrorEvent;
-            }
-            namespace sdbc
-            {
-                class SQLWarning;
-                class SQLException;
-            }
-        }
+        class SQLContext;
+        struct SQLErrorEvent;
+    }
+    namespace sdbc
+    {
+        class SQLWarning;
+        class SQLException;
     }
 }
 
diff --git a/include/connectivity/paramwrapper.hxx b/include/connectivity/paramwrapper.hxx
index 1d55ea38d0d4..1911431b256f 100644
--- a/include/connectivity/paramwrapper.hxx
+++ b/include/connectivity/paramwrapper.hxx
@@ -40,9 +40,7 @@ namespace com::sun::star::sdbc { class XParameters; }
 namespace com::sun::star::sdb { class XSingleSelectQueryAnalyzer; }
 
 
-namespace dbtools
-{
-namespace param
+namespace dbtools::param
 {
 
 
@@ -190,7 +188,7 @@ namespace param
     typedef ::rtl::Reference< ParameterWrapperContainer >   ParametersContainerRef;
 
 
-} } // namespace dbtools::param
+} // namespace dbtools::param
 
 
 #endif // INCLUDED_CONNECTIVITY_PARAMWRAPPER_HXX
diff --git a/include/connectivity/sdbcx/IRefreshable.hxx b/include/connectivity/sdbcx/IRefreshable.hxx
index 3a9bd9a8c217..412ef8079356 100644
--- a/include/connectivity/sdbcx/IRefreshable.hxx
+++ b/include/connectivity/sdbcx/IRefreshable.hxx
@@ -21,9 +21,7 @@
 
 #include <connectivity/dbtoolsdllapi.hxx>
 
-namespace connectivity
-{
-    namespace sdbcx
+namespace connectivity::sdbcx
     {
         class OOO_DLLPUBLIC_DBTOOLS SAL_NO_VTABLE IRefreshableGroups
         {
@@ -51,7 +49,7 @@ namespace connectivity
         protected:
             ~IRefreshableColumns() {}
         };
-    }
+
 }
 #endif // INCLUDED_CONNECTIVITY_SDBCX_IREFRESHABLE_HXX
 
diff --git a/include/connectivity/sdbcx/VCollection.hxx b/include/connectivity/sdbcx/VCollection.hxx
index 525066876156..9e94d83cb964 100644
--- a/include/connectivity/sdbcx/VCollection.hxx
+++ b/include/connectivity/sdbcx/VCollection.hxx
@@ -41,9 +41,7 @@
 namespace com::sun::star::container { class XEnumeration; }
 
 
-namespace connectivity
-{
-    namespace sdbcx
+namespace connectivity::sdbcx
     {
 
         // the class OCollection is base class for collections :-)
@@ -219,7 +217,7 @@ namespace connectivity
             void disposeElements();
             void dropImpl(sal_Int32 _nIndex, bool _bReallyDrop = true);
         };
-    }
+
 }
 #endif // INCLUDED_CONNECTIVITY_SDBCX_VCOLLECTION_HXX
 
diff --git a/include/connectivity/sdbcx/VColumn.hxx b/include/connectivity/sdbcx/VColumn.hxx
index 68ad450c7fb3..e80e2da5e272 100644
--- a/include/connectivity/sdbcx/VColumn.hxx
+++ b/include/connectivity/sdbcx/VColumn.hxx
@@ -30,9 +30,7 @@
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
-namespace connectivity
-{
-    namespace sdbcx
+namespace connectivity::sdbcx
     {
         class OColumn;
         typedef ::comphelper::OIdPropertyArrayUsageHelper<OColumn> OColumn_PROP;
@@ -110,7 +108,7 @@ namespace connectivity
             // XDataDescriptorFactory
             virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  ) override;
         };
-    }
+
 }
 
 #endif // INCLUDED_CONNECTIVITY_SDBCX_VCOLUMN_HXX
diff --git a/include/connectivity/sdbcx/VDescriptor.hxx b/include/connectivity/sdbcx/VDescriptor.hxx
index 51737e190f0f..4127a423615a 100644
--- a/include/connectivity/sdbcx/VDescriptor.hxx
+++ b/include/connectivity/sdbcx/VDescriptor.hxx
@@ -25,9 +25,7 @@
 #include <comphelper/stl_types.hxx>
 #include <connectivity/dbtoolsdllapi.hxx>
 
-namespace connectivity
-{
-    namespace sdbcx
+namespace connectivity::sdbcx
     {
 
         // = ODescriptor
@@ -77,9 +75,9 @@ namespace connectivity
             // retrieves the ODescriptor implementation of a given UNO component, and returns its ->isNew flag
             static bool isNew( const css::uno::Reference< css::uno::XInterface >& _rxDescriptor );
         };
-    }
 
 }
+
 #endif // INCLUDED_CONNECTIVITY_SDBCX_VDESCRIPTOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/sdbcx/VTable.hxx b/include/connectivity/sdbcx/VTable.hxx
index 3489fc9b8245..47cb6d672998 100644
--- a/include/connectivity/sdbcx/VTable.hxx
+++ b/include/connectivity/sdbcx/VTable.hxx
@@ -40,9 +40,7 @@
 
 namespace com::sun::star::sdbc { class XDatabaseMetaData; }
 
-namespace connectivity
-{
-    namespace sdbcx
+namespace connectivity::sdbcx
     {
 
         class OTable;
@@ -136,7 +134,7 @@ namespace connectivity
             // helper method
             virtual css::uno::Reference< css::sdbc::XDatabaseMetaData> getMetaData() const;
         };
-    }
+
 }
 
 #endif // INCLUDED_CONNECTIVITY_SDBCX_VTABLE_HXX
diff --git a/include/connectivity/sdbcx/VView.hxx b/include/connectivity/sdbcx/VView.hxx
index e1a56a9fe85e..192eb8a79734 100644
--- a/include/connectivity/sdbcx/VView.hxx
+++ b/include/connectivity/sdbcx/VView.hxx
@@ -32,9 +32,7 @@
 
 namespace com::sun::star::sdbc { class XDatabaseMetaData; }
 
-namespace connectivity
-{
-    namespace sdbcx
+namespace connectivity::sdbcx
     {
 
         typedef ::cppu::WeakImplHelper< css::lang::XServiceInfo,
@@ -87,7 +85,7 @@ namespace connectivity
             virtual OUString SAL_CALL getName(  ) override;
             virtual void SAL_CALL setName( const OUString& ) override;
         };
-    }
+
 }
 
 #endif // INCLUDED_CONNECTIVITY_SDBCX_VVIEW_HXX
diff --git a/include/connectivity/sqlnode.hxx b/include/connectivity/sqlnode.hxx
index 450040596557..7f394ef49de3 100644
--- a/include/connectivity/sqlnode.hxx
+++ b/include/connectivity/sqlnode.hxx
@@ -31,25 +31,19 @@ namespace com::sun::star::lang { struct Locale; }
 namespace com::sun::star::sdbc { class SQLException; }
 namespace com::sun::star::sdbc { class XDatabaseMetaData; }
 
-namespace com
+namespace com::sun::star
 {
-    namespace sun
+    namespace beans
     {
-        namespace star
-        {
-            namespace beans
-            {
-                class XPropertySet;
-            }
-            namespace util
-            {
-                class XNumberFormatter;
-            }
-            namespace container
-            {
-                class XNameAccess;
-            }
-        }
+        class XPropertySet;
+    }
+    namespace util
+    {
+        class XNumberFormatter;
+    }
+    namespace container
+    {
+        class XNameAccess;
     }
 }
 
diff --git a/include/connectivity/sqlparse.hxx b/include/connectivity/sqlparse.hxx
index 814615aef5b4..2cd85ba69fa7 100644
--- a/include/connectivity/sqlparse.hxx
+++ b/include/connectivity/sqlparse.hxx
@@ -34,21 +34,15 @@
 namespace com::sun::star::i18n { class XCharacterClassification; }
 namespace com::sun::star::i18n { class XLocaleData4; }
 
-namespace com
+namespace com::sun::star
 {
-    namespace sun
+    namespace beans
     {
-        namespace star
-        {
-            namespace beans
-            {
-                class XPropertySet;
-            }
-            namespace util
-            {
-                class XNumberFormatter;
-            }
-        }
+        class XPropertySet;
+    }
+    namespace util
+    {
+        class XNumberFormatter;
     }
 }