diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-01-14 16:26:23 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-01-15 06:58:12 +0100 |
| commit | 248ddbc4e9191c7f980fc8d6df6337fc535faab0 (patch) | |
| tree | 89595ccb14efef0f3144709245942e2895af484d /cppuhelper | |
| parent | 21160cd09c3b7399bb34005a916ed5cd2866e43b (diff) | |
clang-tidy modernize-concat-nested-namespace in cppcanvas..cppuhelper
Change-Id: I0bb4ea91288a15fb590d077fb390c53be8b50400
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86801
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/source/compat.cxx | 4 | ||||
| -rw-r--r-- | cppuhelper/source/macro_expander.cxx | 8 | ||||
| -rw-r--r-- | cppuhelper/source/weak.cxx | 14 |
3 files changed, 7 insertions, 19 deletions
diff --git a/cppuhelper/source/compat.cxx b/cppuhelper/source/compat.cxx index 600cb369c2b5..f6572ea47ee0 100644 --- a/cppuhelper/source/compat.cxx +++ b/cppuhelper/source/compat.cxx @@ -26,7 +26,7 @@ #include <osl/module.h> #include <sal/types.h> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace lang { class XMultiComponentFactory; class XMultiServiceFactory; @@ -41,7 +41,7 @@ namespace com { namespace sun { namespace star { class XComponentContext; class XInterface; } -} } } +} // Stubs for removed functionality, to be killed when we bump cppuhelper SONAME diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx index 483ca5712766..e9a6cce3fd43 100644 --- a/cppuhelper/source/macro_expander.cxx +++ b/cppuhelper/source/macro_expander.cxx @@ -55,7 +55,7 @@ static Bootstrap const & get_unorc() } -namespace cppuhelper { namespace detail { +namespace cppuhelper::detail { OUString expandMacros(OUString const & text) { OUString t(text); @@ -64,7 +64,7 @@ OUString expandMacros(OUString const & text) { return t; } -} } +} namespace { @@ -157,7 +157,7 @@ Reference< XInterface > service_create( } -namespace cppuhelper { namespace detail { +namespace cppuhelper::detail { Reference< lang::XSingleComponentFactory > create_bootstrap_macro_expander_factory() { @@ -177,6 +177,6 @@ Reference< lang::XSingleComponentFactory > create_bootstrap_macro_expander_facto SAL_NO_ACQUIRE); } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx index a7ef2410eeb8..a11e52bbbb78 100644 --- a/cppuhelper/source/weak.cxx +++ b/cppuhelper/source/weak.cxx @@ -325,16 +325,7 @@ void OWeakAggObject::setDelegator( const Reference<XInterface > & rDelegator ) } /** */ //for docpp -namespace com -{ -/** */ //for docpp -namespace sun -{ -/** */ //for docpp -namespace star -{ -/** */ //for docpp -namespace uno +namespace com::sun::star::uno { @@ -535,8 +526,5 @@ Reference< XInterface > WeakReferenceHelper::get() const } } -} -} -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |