summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-05-08 10:59:40 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-05-08 12:40:03 +0200
commit6751a89552f6d739b4e1563143fd3a019478f513 (patch)
treee3a5490c5c505b0b17a3e952492e389974898978 /connectivity/source/drivers
parent15adfafee5b48d6f88a0b970c50e5c5bc77a4ab1 (diff)
compact namespace in canvas..cui
Change-Id: I7bd0c2a55b936896fcfe7e1a374871008a18618f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93706 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'connectivity/source/drivers')
-rw-r--r--connectivity/source/drivers/hsqldb/accesslog.cxx2
-rw-r--r--connectivity/source/drivers/hsqldb/accesslog.hxx2
-rw-r--r--connectivity/source/drivers/mork/MDriver.hxx8
-rw-r--r--connectivity/source/drivers/odbc/ORealDriver.hxx8
-rw-r--r--connectivity/source/drivers/postgresql/pq_xcolumns.hxx2
5 files changed, 11 insertions, 11 deletions
diff --git a/connectivity/source/drivers/hsqldb/accesslog.cxx b/connectivity/source/drivers/hsqldb/accesslog.cxx
index a5978cdae051..f7e0f10ee1ec 100644
--- a/connectivity/source/drivers/hsqldb/accesslog.cxx
+++ b/connectivity/source/drivers/hsqldb/accesslog.cxx
@@ -28,7 +28,7 @@
#include <osl/thread.h>
-namespace connectivity { namespace hsqldb
+namespace connectivity::hsqldb
{
typedef std::map<OUString, FILE *> TDebugStreamMap;
TDebugStreamMap& getStreams()
diff --git a/connectivity/source/drivers/hsqldb/accesslog.hxx b/connectivity/source/drivers/hsqldb/accesslog.hxx
index 304e3cb5c6a1..a4dc41f2d35e 100644
--- a/connectivity/source/drivers/hsqldb/accesslog.hxx
+++ b/connectivity/source/drivers/hsqldb/accesslog.hxx
@@ -26,7 +26,7 @@
#include <rtl/ustring.hxx>
#include <rtl/string.hxx>
-namespace connectivity { namespace hsqldb
+namespace connectivity::hsqldb
{
class LogFile
{
diff --git a/connectivity/source/drivers/mork/MDriver.hxx b/connectivity/source/drivers/mork/MDriver.hxx
index 3d644bbbc805..6f6946af6f5b 100644
--- a/connectivity/source/drivers/mork/MDriver.hxx
+++ b/connectivity/source/drivers/mork/MDriver.hxx
@@ -19,14 +19,14 @@
#define MORK_DRIVER_IMPL_NAME "com.sun.star.comp.sdbc.MorkDriver"
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace uno {
class XComponentContext;
class XInterface;
}
-} } }
+}
-namespace connectivity { namespace mork {
+namespace connectivity::mork {
class ProfileAccess;
class MorkDriver:
@@ -72,7 +72,7 @@ private:
OUString m_sProfilePath;
};
-} }
+}
#endif
diff --git a/connectivity/source/drivers/odbc/ORealDriver.hxx b/connectivity/source/drivers/odbc/ORealDriver.hxx
index fac79cc44677..cfecb38936d2 100644
--- a/connectivity/source/drivers/odbc/ORealDriver.hxx
+++ b/connectivity/source/drivers/odbc/ORealDriver.hxx
@@ -24,18 +24,18 @@
#include <com/sun/star/uno/Reference.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace lang { class XMultiServiceFactory; }
namespace uno { class XInterface; }
-} } }
+}
-namespace connectivity { namespace odbc {
+namespace connectivity::odbc {
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface >
ODBCDriver_CreateInstance( css::uno::Reference< css::lang::XMultiServiceFactory > const & factory);
-} }
+}
#endif
diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.hxx b/connectivity/source/drivers/postgresql/pq_xcolumns.hxx
index fa9f4680ca4e..ab8c47914516 100644
--- a/connectivity/source/drivers/postgresql/pq_xcolumns.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xcolumns.hxx
@@ -40,7 +40,7 @@
#include "pq_xcontainer.hxx"
#include "pq_xbase.hxx"
-namespace com { namespace sun { namespace star { namespace sdbc { class XRow; } } } }
+namespace com::sun::star::sdbc { class XRow; }
namespace pq_sdbc_driver
{