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 /configmgr | |
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 'configmgr')
-rw-r--r-- | configmgr/source/access.hxx | 4 | ||||
-rw-r--r-- | configmgr/source/broadcaster.hxx | 4 | ||||
-rw-r--r-- | configmgr/source/childaccess.hxx | 4 | ||||
-rw-r--r-- | configmgr/source/components.hxx | 4 | ||||
-rw-r--r-- | configmgr/source/configurationprovider.hxx | 8 | ||||
-rw-r--r-- | configmgr/source/configurationregistry.hxx | 8 | ||||
-rw-r--r-- | configmgr/source/dconf.hxx | 4 | ||||
-rw-r--r-- | configmgr/source/defaultprovider.hxx | 8 | ||||
-rw-r--r-- | configmgr/source/readonlyaccess.hxx | 8 | ||||
-rw-r--r-- | configmgr/source/readwriteaccess.hxx | 8 | ||||
-rw-r--r-- | configmgr/source/rootaccess.hxx | 4 | ||||
-rw-r--r-- | configmgr/source/type.hxx | 4 | ||||
-rw-r--r-- | configmgr/source/update.hxx | 8 | ||||
-rw-r--r-- | configmgr/source/valueparser.hxx | 4 |
14 files changed, 40 insertions, 40 deletions
diff --git a/configmgr/source/access.hxx b/configmgr/source/access.hxx index 5c6075ecbf6d..910df97a50bc 100644 --- a/configmgr/source/access.hxx +++ b/configmgr/source/access.hxx @@ -53,7 +53,7 @@ #include "modifications.hxx" #include "type.hxx" -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace beans { class XHierarchicalPropertySetInfo; class XPropertiesChangeListener; @@ -69,7 +69,7 @@ namespace com { namespace sun { namespace star { class XInterface; } namespace util { struct ElementChange; } -} } } +} namespace configmgr { diff --git a/configmgr/source/broadcaster.hxx b/configmgr/source/broadcaster.hxx index e0a5fc4ce962..bdb39adfbcbf 100644 --- a/configmgr/source/broadcaster.hxx +++ b/configmgr/source/broadcaster.hxx @@ -31,7 +31,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/util/ChangesEvent.hpp> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace beans { class XPropertiesChangeListener; class XPropertyChangeListener; @@ -39,7 +39,7 @@ namespace com { namespace sun { namespace star { namespace container { class XContainerListener; } namespace lang { class XEventListener; } namespace util { class XChangesListener; } -} } } +} namespace configmgr { diff --git a/configmgr/source/childaccess.hxx b/configmgr/source/childaccess.hxx index 7a5a692d56a9..bbf4e25e7755 100644 --- a/configmgr/source/childaccess.hxx +++ b/configmgr/source/childaccess.hxx @@ -34,11 +34,11 @@ #include "access.hxx" -namespace com { namespace sun { namespace star { namespace uno { +namespace com::sun::star::uno { class Any; class Type; class XInterface; -} } } } +} namespace configmgr { diff --git a/configmgr/source/components.hxx b/configmgr/source/components.hxx index 8db06909b192..87b8116d1d7f 100644 --- a/configmgr/source/components.hxx +++ b/configmgr/source/components.hxx @@ -33,13 +33,13 @@ #include "data.hxx" #include "modifications.hxx" -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace beans { class XPropertySet; } namespace uno { class Any; class XComponentContext; } -} } } +} namespace configmgr { diff --git a/configmgr/source/configurationprovider.hxx b/configmgr/source/configurationprovider.hxx index c8e28e11f823..6f9696127374 100644 --- a/configmgr/source/configurationprovider.hxx +++ b/configmgr/source/configurationprovider.hxx @@ -26,15 +26,15 @@ #include <com/sun/star/uno/Sequence.hxx> #include <cppuhelper/factory.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace lang { class XSingleComponentFactory; } namespace uno { class XComponentContext; class XInterface; } -} } } +} -namespace configmgr { namespace configuration_provider { +namespace configmgr::configuration_provider { css::uno::Reference< css::uno::XInterface > createDefault( css::uno::Reference< css::uno::XComponentContext > @@ -50,7 +50,7 @@ createFactory( cppu::ComponentFactoryFunc, OUString const &, css::uno::Sequence< OUString > const &, rtl_ModuleCount *); -} } +} #endif diff --git a/configmgr/source/configurationregistry.hxx b/configmgr/source/configurationregistry.hxx index 0477facb3d65..5f74880590aa 100644 --- a/configmgr/source/configurationregistry.hxx +++ b/configmgr/source/configurationregistry.hxx @@ -25,14 +25,14 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace uno { class XComponentContext; class XInterface; } -} } } +} -namespace configmgr { namespace configuration_registry { +namespace configmgr::configuration_registry { css::uno::Reference< css::uno::XInterface > create( @@ -44,7 +44,7 @@ OUString getImplementationName(); css::uno::Sequence< OUString > getSupportedServiceNames(); -} } +} #endif diff --git a/configmgr/source/dconf.hxx b/configmgr/source/dconf.hxx index f7f59703754c..aee033cf50e3 100644 --- a/configmgr/source/dconf.hxx +++ b/configmgr/source/dconf.hxx @@ -17,13 +17,13 @@ namespace configmgr { struct Data; } -namespace configmgr { namespace dconf { +namespace configmgr::dconf { void readLayer(Data & data, int layer); void writeModifications(Components & components, Data & data); -} } +} #endif diff --git a/configmgr/source/defaultprovider.hxx b/configmgr/source/defaultprovider.hxx index 59e4222461d0..da97bc8baa55 100644 --- a/configmgr/source/defaultprovider.hxx +++ b/configmgr/source/defaultprovider.hxx @@ -25,14 +25,14 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace uno { class XComponentContext; class XInterface; } -} } } +} -namespace configmgr { namespace default_provider { +namespace configmgr::default_provider { css::uno::Reference< css::uno::XInterface > create( @@ -44,7 +44,7 @@ OUString getImplementationName(); css::uno::Sequence< OUString > getSupportedServiceNames(); -} } +} #endif diff --git a/configmgr/source/readonlyaccess.hxx b/configmgr/source/readonlyaccess.hxx index 48c14946d6f7..7d80c986a3f8 100644 --- a/configmgr/source/readonlyaccess.hxx +++ b/configmgr/source/readonlyaccess.hxx @@ -13,14 +13,14 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace uno { class XComponentContext; class XInterface; } -} } } +} -namespace configmgr { namespace read_only_access { +namespace configmgr::read_only_access { css::uno::Reference< css::uno::XInterface > create( @@ -32,7 +32,7 @@ OUString getImplementationName(); css::uno::Sequence< OUString > getSupportedServiceNames(); -} } +} #endif diff --git a/configmgr/source/readwriteaccess.hxx b/configmgr/source/readwriteaccess.hxx index 0413af35e60d..8e84a8607069 100644 --- a/configmgr/source/readwriteaccess.hxx +++ b/configmgr/source/readwriteaccess.hxx @@ -13,14 +13,14 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace uno { class XComponentContext; class XInterface; } -} } } +} -namespace configmgr { namespace read_write_access { +namespace configmgr::read_write_access { css::uno::Reference< css::uno::XInterface > create( @@ -32,7 +32,7 @@ OUString getImplementationName(); css::uno::Sequence< OUString > getSupportedServiceNames(); -} } +} #endif diff --git a/configmgr/source/rootaccess.hxx b/configmgr/source/rootaccess.hxx index 0b2003f64f67..1e97e5f00e5c 100644 --- a/configmgr/source/rootaccess.hxx +++ b/configmgr/source/rootaccess.hxx @@ -34,13 +34,13 @@ #include "access.hxx" #include "modifications.hxx" -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace uno { class Any; class Type; } namespace util { class XChangesListener; } -} } } +} namespace configmgr { diff --git a/configmgr/source/type.hxx b/configmgr/source/type.hxx index eaac26ec1c2e..db49513a0df3 100644 --- a/configmgr/source/type.hxx +++ b/configmgr/source/type.hxx @@ -23,10 +23,10 @@ #include <sal/config.h> #include <sal/types.h> -namespace com { namespace sun { namespace star { namespace uno { +namespace com::sun::star::uno { class Any; class Type; -} } } } +} namespace configmgr { diff --git a/configmgr/source/update.hxx b/configmgr/source/update.hxx index 85d8c895a5b3..7fd9244d9137 100644 --- a/configmgr/source/update.hxx +++ b/configmgr/source/update.hxx @@ -25,14 +25,14 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace uno { class XComponentContext; class XInterface; } -} } } +} -namespace configmgr { namespace update { +namespace configmgr::update { css::uno::Reference< css::uno::XInterface > create( @@ -44,7 +44,7 @@ OUString getImplementationName(); css::uno::Sequence< OUString > getSupportedServiceNames(); -} } +} #endif diff --git a/configmgr/source/valueparser.hxx b/configmgr/source/valueparser.hxx index ccf2422b78a1..62ff3727d33d 100644 --- a/configmgr/source/valueparser.hxx +++ b/configmgr/source/valueparser.hxx @@ -32,9 +32,9 @@ #include "type.hxx" -namespace com { namespace sun { namespace star { namespace uno { +namespace com::sun::star::uno { class Any; -} } } } +} namespace xmlreader { struct Span; } namespace configmgr { |