diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-01-14 15:21:05 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-01-14 15:49:03 +0100 |
commit | 9a578e9861d930782fd9432e79741d3378a30589 (patch) | |
tree | e5cfe33892f983f20abe96622138f4edb855fcf3 /bridges | |
parent | 03fd45dce6afa83fc1fcbcd890edb36affd61981 (diff) |
clang-tidy modernize-concat-nested-namespace in basic..canvas
Change-Id: I74a575e6ca7829ee252c0e315fc337ea223c944f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86758
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'bridges')
-rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx | 4 | ||||
-rw-r--r-- | bridges/source/cpp_uno/shared/bridge.cxx | 4 | ||||
-rw-r--r-- | bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx | 4 | ||||
-rw-r--r-- | bridges/source/cpp_uno/shared/types.cxx | 4 | ||||
-rw-r--r-- | bridges/source/cpp_uno/shared/unointerfaceproxy.cxx | 4 | ||||
-rw-r--r-- | bridges/source/cpp_uno/shared/vtables.cxx | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx index 80cae5ad699b..496702120ab4 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx @@ -300,7 +300,7 @@ static void cpp_call( } -namespace bridges { namespace cpp_uno { namespace shared { +namespace bridges::cpp_uno::shared { void unoInterfaceProxyDispatch( uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr, @@ -432,6 +432,6 @@ void unoInterfaceProxyDispatch( } } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/source/cpp_uno/shared/bridge.cxx b/bridges/source/cpp_uno/shared/bridge.cxx index 186d89aa1956..007373448bb3 100644 --- a/bridges/source/cpp_uno/shared/bridge.cxx +++ b/bridges/source/cpp_uno/shared/bridge.cxx @@ -31,7 +31,7 @@ #include <uno/environment.h> #include <uno/mapping.h> -namespace bridges { namespace cpp_uno { namespace shared { +namespace bridges::cpp_uno::shared { void freeMapping(uno_Mapping * pMapping) { @@ -205,6 +205,6 @@ Bridge::~Bridge() (*pCppEnv->aBase.release)( &pCppEnv->aBase ); } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx index 29b035fec3ab..e4ee7800a385 100644 --- a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx +++ b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx @@ -29,7 +29,7 @@ #include <memory> #include <new> -namespace bridges { namespace cpp_uno { namespace shared { +namespace bridges::cpp_uno::shared { void freeCppInterfaceProxy(uno_ExtEnvironment * pEnv, void * pInterface) { @@ -138,6 +138,6 @@ CppInterfaceProxy * CppInterfaceProxy::castInterfaceToProxy(void * pInterface) static_cast< char * >(pInterface) - offset); } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/source/cpp_uno/shared/types.cxx b/bridges/source/cpp_uno/shared/types.cxx index a22e3307173f..61dc3dabec88 100644 --- a/bridges/source/cpp_uno/shared/types.cxx +++ b/bridges/source/cpp_uno/shared/types.cxx @@ -23,7 +23,7 @@ #include <typelib/typeclass.h> #include <typelib/typedescription.h> -namespace bridges { namespace cpp_uno { namespace shared { +namespace bridges::cpp_uno::shared { bool isSimpleType(typelib_TypeClass typeClass) { return typeClass <= typelib_TypeClass_DOUBLE @@ -112,6 +112,6 @@ bool relatesToInterfaceType(typelib_TypeDescription const * type) { return false; } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx b/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx index 42037afe6e54..c3c560acb7de 100644 --- a/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx +++ b/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx @@ -25,7 +25,7 @@ #include <typelib/typedescription.h> #include <uno/dispatcher.h> -namespace bridges { namespace cpp_uno { namespace shared { +namespace bridges::cpp_uno::shared { void freeUnoInterfaceProxy(uno_ExtEnvironment * pEnv, void * pProxy) { @@ -120,6 +120,6 @@ UnoInterfaceProxy::UnoInterfaceProxy( UnoInterfaceProxy::~UnoInterfaceProxy() {} -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/source/cpp_uno/shared/vtables.cxx b/bridges/source/cpp_uno/shared/vtables.cxx index a9909eaee5ca..beda5ad29d44 100644 --- a/bridges/source/cpp_uno/shared/vtables.cxx +++ b/bridges/source/cpp_uno/shared/vtables.cxx @@ -109,7 +109,7 @@ template< typename T > bridges::cpp_uno::shared::VtableSlot doGetVtableSlot( } -namespace bridges { namespace cpp_uno { namespace shared { +namespace bridges::cpp_uno::shared { sal_Int32 getLocalFunctions(typelib_InterfaceTypeDescription const * type) { return type->nMembers == 0 @@ -141,6 +141,6 @@ VtableSlot getVtableSlot( return doGetVtableSlot(ifcMember); } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |