diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-05-08 10:59:40 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-05-08 12:40:03 +0200 |
commit | 6751a89552f6d739b4e1563143fd3a019478f513 (patch) | |
tree | e3a5490c5c505b0b17a3e952492e389974898978 /connectivity | |
parent | 15adfafee5b48d6f88a0b970c50e5c5bc77a4ab1 (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')
-rw-r--r-- | connectivity/qa/connectivity/ado/DriverTest.cxx | 4 | ||||
-rw-r--r-- | connectivity/source/drivers/hsqldb/accesslog.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/drivers/hsqldb/accesslog.hxx | 2 | ||||
-rw-r--r-- | connectivity/source/drivers/mork/MDriver.hxx | 8 | ||||
-rw-r--r-- | connectivity/source/drivers/odbc/ORealDriver.hxx | 8 | ||||
-rw-r--r-- | connectivity/source/drivers/postgresql/pq_xcolumns.hxx | 2 | ||||
-rw-r--r-- | connectivity/source/inc/ado/ADriver.hxx | 4 | ||||
-rw-r--r-- | connectivity/source/inc/calc/CConnection.hxx | 4 | ||||
-rw-r--r-- | connectivity/source/inc/calc/CTable.hxx | 8 | ||||
-rw-r--r-- | connectivity/source/inc/component/CTable.hxx | 8 | ||||
-rw-r--r-- | connectivity/source/inc/hsqldb/HStorageAccess.hxx | 4 | ||||
-rw-r--r-- | connectivity/source/inc/hsqldb/HTools.hxx | 4 | ||||
-rw-r--r-- | connectivity/source/inc/hsqldb/HView.hxx | 4 | ||||
-rw-r--r-- | connectivity/source/inc/java/ContextClassLoader.hxx | 4 | ||||
-rw-r--r-- | connectivity/source/inc/java/GlobalRef.hxx | 4 | ||||
-rw-r--r-- | connectivity/source/inc/java/LocalRef.hxx | 4 | ||||
-rw-r--r-- | connectivity/source/inc/java/sql/ConnectionLog.hxx | 12 |
17 files changed, 42 insertions, 44 deletions
diff --git a/connectivity/qa/connectivity/ado/DriverTest.cxx b/connectivity/qa/connectivity/ado/DriverTest.cxx index 311ef6f11687..f4dd0ebc2791 100644 --- a/connectivity/qa/connectivity/ado/DriverTest.cxx +++ b/connectivity/qa/connectivity/ado/DriverTest.cxx @@ -30,7 +30,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::uno; -namespace connectivity { namespace ado { +namespace connectivity::ado { class AdoDriverTest: public test::BootstrapFixture @@ -136,6 +136,6 @@ void AdoDriverTest::test_select_default_all() CPPUNIT_TEST_SUITE_REGISTRATION(AdoDriverTest); -}} +} CPPUNIT_PLUGIN_IMPLEMENT(); 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 { diff --git a/connectivity/source/inc/ado/ADriver.hxx b/connectivity/source/inc/ado/ADriver.hxx index 96f9f3ca213d..22b23b4cada7 100644 --- a/connectivity/source/inc/ado/ADriver.hxx +++ b/connectivity/source/inc/ado/ADriver.hxx @@ -26,9 +26,7 @@ #include <cppuhelper/compbase.hxx> #include <connectivity/CommonTools.hxx> -namespace com { namespace sun { namespace star { namespace lang { - class XMultiServiceFactory; -}}}} +namespace com::sun::star::lang { class XMultiServiceFactory; } namespace connectivity { diff --git a/connectivity/source/inc/calc/CConnection.hxx b/connectivity/source/inc/calc/CConnection.hxx index 3cd139635a2c..088f4799452a 100644 --- a/connectivity/source/inc/calc/CConnection.hxx +++ b/connectivity/source/inc/calc/CConnection.hxx @@ -25,9 +25,9 @@ #include <com/sun/star/frame/XTerminateListener.hpp> #include <unotools/closeveto.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace sheet { class XSpreadsheetDocument; } -} } } +} namespace utl { class CloseVeto; } diff --git a/connectivity/source/inc/calc/CTable.hxx b/connectivity/source/inc/calc/CTable.hxx index 057ba2a2354d..b9835c222fc4 100644 --- a/connectivity/source/inc/calc/CTable.hxx +++ b/connectivity/source/inc/calc/CTable.hxx @@ -22,13 +22,13 @@ #include <component/CTable.hxx> #include <tools/date.hxx> -namespace com { namespace sun { namespace star { namespace sheet { +namespace com::sun::star::sheet { class XSpreadsheet; -} } } } +} -namespace com { namespace sun { namespace star { namespace util { +namespace com::sun::star::util { class XNumberFormats; -} } } } +} namespace connectivity diff --git a/connectivity/source/inc/component/CTable.hxx b/connectivity/source/inc/component/CTable.hxx index 69f50ad44b43..5068f88d56ee 100644 --- a/connectivity/source/inc/component/CTable.hxx +++ b/connectivity/source/inc/component/CTable.hxx @@ -22,13 +22,13 @@ #include <file/FTable.hxx> -namespace com { namespace sun { namespace star { namespace sheet { +namespace com::sun::star::sheet { class XSpreadsheet; -} } } } +} -namespace com { namespace sun { namespace star { namespace util { +namespace com::sun::star::util { class XNumberFormats; -} } } } +} namespace connectivity diff --git a/connectivity/source/inc/hsqldb/HStorageAccess.hxx b/connectivity/source/inc/hsqldb/HStorageAccess.hxx index c0ae65541530..457d1eaffc73 100644 --- a/connectivity/source/inc/hsqldb/HStorageAccess.hxx +++ b/connectivity/source/inc/hsqldb/HStorageAccess.hxx @@ -24,10 +24,10 @@ #include <jni.h> -namespace connectivity { namespace hsqldb +namespace connectivity::hsqldb { class DataLogFile; -} } +} jint read_from_storage_stream( JNIEnv * env, jstring name, jstring key ); jint read_from_storage_stream_into_buffer( JNIEnv * env, jstring name, jstring key, jbyteArray buffer, jint off, jint len ); diff --git a/connectivity/source/inc/hsqldb/HTools.hxx b/connectivity/source/inc/hsqldb/HTools.hxx index 1c568ccc30cf..be30e8e281ee 100644 --- a/connectivity/source/inc/hsqldb/HTools.hxx +++ b/connectivity/source/inc/hsqldb/HTools.hxx @@ -23,7 +23,7 @@ #include <rtl/ustrbuf.hxx> -namespace connectivity { namespace hsqldb +namespace connectivity::hsqldb { class HTools @@ -44,7 +44,7 @@ namespace connectivity { namespace hsqldb }; -} } // namespace connectivity::hsqldb +} // namespace connectivity::hsqldb #endif // INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HTOOLS_HXX diff --git a/connectivity/source/inc/hsqldb/HView.hxx b/connectivity/source/inc/hsqldb/HView.hxx index a14d75ccfa44..3e158c753d1b 100644 --- a/connectivity/source/inc/hsqldb/HView.hxx +++ b/connectivity/source/inc/hsqldb/HView.hxx @@ -29,7 +29,7 @@ #include <cppuhelper/implbase1.hxx> -namespace connectivity { namespace hsqldb +namespace connectivity::hsqldb { typedef ::connectivity::sdbcx::OView HView_Base; @@ -83,7 +83,7 @@ namespace connectivity { namespace hsqldb }; -} } // namespace connectivity::hsqldb +} // namespace connectivity::hsqldb #endif // INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HVIEW_HXX diff --git a/connectivity/source/inc/java/ContextClassLoader.hxx b/connectivity/source/inc/java/ContextClassLoader.hxx index e8fc1ac15725..dea3fb58b50a 100644 --- a/connectivity/source/inc/java/ContextClassLoader.hxx +++ b/connectivity/source/inc/java/ContextClassLoader.hxx @@ -28,7 +28,7 @@ namespace comphelper } -namespace connectivity { namespace jdbc +namespace connectivity::jdbc { class ContextClassLoaderScope { @@ -74,7 +74,7 @@ namespace connectivity { namespace jdbc }; -} } // namespace connectivity::jdbc +} // namespace connectivity::jdbc #endif // INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_CONTEXTCLASSLOADER_HXX diff --git a/connectivity/source/inc/java/GlobalRef.hxx b/connectivity/source/inc/java/GlobalRef.hxx index 5c00ac2562f6..80888cb48810 100644 --- a/connectivity/source/inc/java/GlobalRef.hxx +++ b/connectivity/source/inc/java/GlobalRef.hxx @@ -24,7 +24,7 @@ #include <java/lang/Object.hxx> -namespace connectivity { namespace jdbc +namespace connectivity::jdbc { /** helper class to hold a local ref to a JNI object */ @@ -97,7 +97,7 @@ namespace connectivity { namespace jdbc }; -} } // namespace connectivity::jdbc +} // namespace connectivity::jdbc #endif // INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_GLOBALREF_HXX diff --git a/connectivity/source/inc/java/LocalRef.hxx b/connectivity/source/inc/java/LocalRef.hxx index 3730cf8913d3..5973405acea5 100644 --- a/connectivity/source/inc/java/LocalRef.hxx +++ b/connectivity/source/inc/java/LocalRef.hxx @@ -23,7 +23,7 @@ #include <jni.h> -namespace connectivity { namespace jdbc +namespace connectivity::jdbc { /** helper class to hold a local ref to a JNI object @@ -84,7 +84,7 @@ namespace connectivity { namespace jdbc }; -} } // namespace connectivity::jdbc +} // namespace connectivity::jdbc #endif // INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_LOCALREF_HXX diff --git a/connectivity/source/inc/java/sql/ConnectionLog.hxx b/connectivity/source/inc/java/sql/ConnectionLog.hxx index ea3033e81612..780b7f27eb2c 100644 --- a/connectivity/source/inc/java/sql/ConnectionLog.hxx +++ b/connectivity/source/inc/java/sql/ConnectionLog.hxx @@ -27,15 +27,15 @@ // Strange enough, GCC requires the following forward declarations of the various // convertLogArgToString flavors to be *before* the inclusion of comphelper/logging.hxx -namespace com { namespace sun { namespace star { namespace util +namespace com::sun::star::util { struct Date; struct Time; struct DateTime; -} } } } +} -namespace comphelper { namespace log { namespace convert +namespace comphelper::log::convert { @@ -45,7 +45,7 @@ namespace comphelper { namespace log { namespace convert OUString convertLogArgToString( const css::util::DateTime& _rDateTime ); -} } } +} #include <comphelper/logging.hxx> @@ -56,7 +56,7 @@ namespace connectivity } -namespace connectivity { namespace java { namespace sql { +namespace connectivity::java::sql { typedef ::comphelper::EventLogger ConnectionLog_Base; class ConnectionLog : public ConnectionLog_Base @@ -122,7 +122,7 @@ namespace connectivity { namespace java { namespace sql { }; -} } } // namespace connectivity::java::sql +} // namespace connectivity::java::sql #endif // INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_CONNECTIONLOG_HXX |