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 /cppuhelper | |
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 'cppuhelper')
-rw-r--r-- | cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx | 2 | ||||
-rw-r--r-- | cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx | 2 | ||||
-rw-r--r-- | cppuhelper/source/loadsharedlibcomponentfactory.hxx | 8 | ||||
-rw-r--r-- | cppuhelper/source/macro_expander.hxx | 4 | ||||
-rw-r--r-- | cppuhelper/source/servicemanager.hxx | 4 | ||||
-rw-r--r-- | cppuhelper/source/typemanager.hxx | 4 |
6 files changed, 11 insertions, 13 deletions
diff --git a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx index 2447c816522f..4de84ba3a28b 100644 --- a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx +++ b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx @@ -48,7 +48,7 @@ #include <rtl/ustring.hxx> #include <sal/types.h> -namespace com { namespace sun { namespace star { +namespace com::sun::star { class XEventListener; } } } diff --git a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx index 4e0d3a9258bd..d6679dae5392 100644 --- a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx +++ b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx @@ -62,7 +62,7 @@ #include <limits> #include <ostream> -namespace com { namespace sun { namespace star { +namespace com::sun::star { struct EventObject; } } } diff --git a/cppuhelper/source/loadsharedlibcomponentfactory.hxx b/cppuhelper/source/loadsharedlibcomponentfactory.hxx index 9e870f459455..033fc8f3263b 100644 --- a/cppuhelper/source/loadsharedlibcomponentfactory.hxx +++ b/cppuhelper/source/loadsharedlibcomponentfactory.hxx @@ -16,15 +16,15 @@ #include "servicemanager.hxx" -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace lang { class XMultiServiceFactory; } namespace uno { class Environment; class XInterface; } -} } } +} -namespace cppuhelper { namespace detail { +namespace cppuhelper::detail { css::uno::Environment getEnvironment( OUString const & name, OUString const & implementation); @@ -37,7 +37,7 @@ void loadSharedLibComponentFactory( WrapperConstructorFn * constructorFunction, css::uno::Reference<css::uno::XInterface> * factory); -} } +} #endif diff --git a/cppuhelper/source/macro_expander.hxx b/cppuhelper/source/macro_expander.hxx index b0762330c325..4a2740beb965 100644 --- a/cppuhelper/source/macro_expander.hxx +++ b/cppuhelper/source/macro_expander.hxx @@ -24,9 +24,7 @@ #include <com/sun/star/uno/Reference.hxx> -namespace com { namespace sun { namespace star { namespace lang { - class XSingleComponentFactory; -} } } } +namespace com::sun::star::lang { class XSingleComponentFactory; } namespace cppuhelper { diff --git a/cppuhelper/source/servicemanager.hxx b/cppuhelper/source/servicemanager.hxx index a4363a1b8e63..ceac7c15a698 100644 --- a/cppuhelper/source/servicemanager.hxx +++ b/cppuhelper/source/servicemanager.hxx @@ -32,9 +32,9 @@ #include <osl/mutex.hxx> #include <rtl/ustring.hxx> -namespace com { namespace sun { namespace star { namespace lang { +namespace com::sun::star::lang { class XSingleComponentFactory; -} } } } +} namespace cppu { struct ContextEntry_Init; } namespace com :: sun :: star :: lang { class XSingleServiceFactory; } namespace com :: sun :: star :: uno { class XComponentContext; } diff --git a/cppuhelper/source/typemanager.hxx b/cppuhelper/source/typemanager.hxx index 1547a5c0c21d..bc086693a631 100644 --- a/cppuhelper/source/typemanager.hxx +++ b/cppuhelper/source/typemanager.hxx @@ -24,9 +24,9 @@ #include <rtl/ref.hxx> #include <sal/types.h> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace reflection { class XTypeDescription; } -} } } +} namespace unoidl { class ConstantGroupEntity; class Entity; |