diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-05-08 10:55:43 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-05-08 12:16:54 +0200 |
commit | 3eed23154170fcb8d313ff079d61c9701b77eefa (patch) | |
tree | 1c9b0daee609373cdd68141d4f7d203e99f5e1cf /bridges | |
parent | 01107a6c1954ceff2d3affc7369027150bf6c032 (diff) |
compact namespace in avmedia..bridges
Change-Id: Iba1282caadab91a0c6e1c044dbab5e6e15f3707b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93705
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'bridges')
28 files changed, 60 insertions, 62 deletions
diff --git a/bridges/inc/bridge.hxx b/bridges/inc/bridge.hxx index 9e33cb53bb91..5229c1d4ad5f 100644 --- a/bridges/inc/bridge.hxx +++ b/bridges/inc/bridge.hxx @@ -30,7 +30,7 @@ #include <uno/environment.h> #include <uno/mapping.h> -namespace bridges { namespace cpp_uno { namespace shared { +namespace bridges::cpp_uno::shared { // private: extern "C" void freeMapping(uno_Mapping *); @@ -112,7 +112,7 @@ private: typelib_InterfaceTypeDescription * pTypeDescr); }; -} } } +} #endif diff --git a/bridges/inc/cppinterfaceproxy.hxx b/bridges/inc/cppinterfaceproxy.hxx index 7d5ab7b167b2..145886436313 100644 --- a/bridges/inc/cppinterfaceproxy.hxx +++ b/bridges/inc/cppinterfaceproxy.hxx @@ -32,11 +32,9 @@ #include <uno/environment.h> #include "vtablefactory.hxx" -namespace com { namespace sun { namespace star { namespace uno { - class XInterface; -} } } } +namespace com::sun::star::uno { class XInterface; } -namespace bridges { namespace cpp_uno { namespace shared { +namespace bridges::cpp_uno::shared { class Bridge; @@ -96,7 +94,7 @@ private: uno_ExtEnvironment * pEnv, void * pInterface); }; -} } } +} #endif diff --git a/bridges/inc/types.hxx b/bridges/inc/types.hxx index 9612232228e3..03c24966ba0b 100644 --- a/bridges/inc/types.hxx +++ b/bridges/inc/types.hxx @@ -23,7 +23,7 @@ #include <typelib/typeclass.h> #include <typelib/typedescription.h> -namespace bridges { namespace cpp_uno { namespace shared { +namespace bridges::cpp_uno::shared { /** * Determines whether a type is a "simple" type (VOID, BOOLEAN, BYTE, SHORT, @@ -64,7 +64,7 @@ bool isSimpleType(typelib_TypeDescription const * type); */ bool relatesToInterfaceType(typelib_TypeDescription const * type); -} } } +} #endif diff --git a/bridges/inc/unointerfaceproxy.hxx b/bridges/inc/unointerfaceproxy.hxx index 5bc66988f181..5b9ad042367d 100644 --- a/bridges/inc/unointerfaceproxy.hxx +++ b/bridges/inc/unointerfaceproxy.hxx @@ -31,11 +31,9 @@ #include <uno/dispatcher.h> #include <uno/environment.h> -namespace com { namespace sun { namespace star { namespace uno { - class XInterface; -} } } } +namespace com::sun::star::uno { class XInterface; } -namespace bridges { namespace cpp_uno { namespace shared { +namespace bridges::cpp_uno::shared { class Bridge; @@ -103,7 +101,7 @@ private: friend void releaseProxy(uno_Interface * pUnoI); }; -} } } +} #endif diff --git a/bridges/inc/vtablefactory.hxx b/bridges/inc/vtablefactory.hxx index 369ea0b903bf..f64cdd86e1a5 100644 --- a/bridges/inc/vtablefactory.hxx +++ b/bridges/inc/vtablefactory.hxx @@ -36,7 +36,7 @@ #define USE_DOUBLE_MMAP #endif -namespace bridges { namespace cpp_uno { namespace shared { +namespace bridges::cpp_uno::shared { /** Hand out vtable structures for interface type descriptions. */ @@ -217,7 +217,7 @@ private: rtl_arena_type * m_arena; }; -} } } +} #endif diff --git a/bridges/inc/vtables.hxx b/bridges/inc/vtables.hxx index bf4edc6c3564..5f6af1a9e3ea 100644 --- a/bridges/inc/vtables.hxx +++ b/bridges/inc/vtables.hxx @@ -23,7 +23,7 @@ #include <sal/types.h> #include <typelib/typedescription.h> -namespace bridges { namespace cpp_uno { namespace shared { +namespace bridges::cpp_uno::shared { /** * Calculate the number of local functions of an interface type. @@ -95,7 +95,7 @@ VtableSlot getVtableSlot( VtableSlot getVtableSlot( typelib_InterfaceMethodTypeDescription const * ifcMember); -} } } +} #endif diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx index 9e2fa40f1a43..103cc51d73a4 100644 --- a/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx @@ -371,7 +371,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, @@ -496,6 +496,6 @@ void unoInterfaceProxyDispatch( } } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/source/cpp_uno/gcc3_ios/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_ios/uno2cpp.cxx index 30ae398816c7..eacd01332900 100644 --- a/bridges/source/cpp_uno/gcc3_ios/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_ios/uno2cpp.cxx @@ -430,7 +430,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, @@ -567,7 +567,7 @@ void unoInterfaceProxyDispatch( } } -} } } +} #endif diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx index 0847dfc76db5..d1928942eb06 100644 --- a/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx @@ -281,7 +281,7 @@ void call( } -namespace bridges { namespace cpp_uno { namespace shared { +namespace bridges::cpp_uno::shared { void unoInterfaceProxyDispatch( uno_Interface * pUnoI, typelib_TypeDescription const * pMemberDescr, @@ -368,6 +368,6 @@ void unoInterfaceProxyDispatch( } } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx index 0d77decd722a..48a5f862b9c1 100644 --- a/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx @@ -402,7 +402,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, @@ -531,6 +531,6 @@ void unoInterfaceProxyDispatch( } } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx index 97dbd9976fa1..b71ab2acbb0b 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx @@ -603,7 +603,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, @@ -739,6 +739,6 @@ void unoInterfaceProxyDispatch( } } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx index d15e47f321d2..43e9aabac8b1 100644 --- a/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx @@ -384,7 +384,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, @@ -521,6 +521,6 @@ void unoInterfaceProxyDispatch( } } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx index e1a602e5e766..0c3e90b57113 100644 --- a/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx @@ -565,7 +565,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, @@ -689,6 +689,6 @@ void unoInterfaceProxyDispatch( } } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx index c61a77baf07e..8d532b7749fe 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx @@ -265,7 +265,7 @@ namespace x86 } } -namespace bridges { namespace cpp_uno { namespace shared { +namespace bridges::cpp_uno::shared { void unoInterfaceProxyDispatch( uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr, @@ -387,6 +387,6 @@ void unoInterfaceProxyDispatch( } } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx index dbe7896d1ceb..de3aaf19855d 100644 --- a/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx @@ -362,7 +362,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, @@ -492,6 +492,6 @@ void unoInterfaceProxyDispatch( } } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx index 98efa29ecbd8..532e9d0d6921 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx @@ -468,7 +468,7 @@ namespace } -namespace bridges { namespace cpp_uno { namespace shared { +namespace bridges::cpp_uno::shared { void unoInterfaceProxyDispatch( uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr, @@ -596,6 +596,7 @@ void unoInterfaceProxyDispatch( } } } -}}} + +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/source/cpp_uno/gcc3_linux_mips64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_mips64/uno2cpp.cxx index abb43c1fea8a..e33969ae789c 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips64/uno2cpp.cxx @@ -459,7 +459,7 @@ namespace } -namespace bridges { namespace cpp_uno { namespace shared { +namespace bridges::cpp_uno::shared { void unoInterfaceProxyDispatch( uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr, @@ -587,6 +587,7 @@ void unoInterfaceProxyDispatch( } } } -}}} + +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx index a08f12389c90..cce78ba95ab1 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx @@ -557,7 +557,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, @@ -681,6 +681,6 @@ void unoInterfaceProxyDispatch( } } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx index 0933315f91b4..612495d83395 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx @@ -533,7 +533,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, @@ -657,6 +657,6 @@ void unoInterfaceProxyDispatch( } } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx index 663cf435d5b3..27d773706df1 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx @@ -503,7 +503,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, @@ -632,6 +632,6 @@ void unoInterfaceProxyDispatch( } } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx index faf5dc044c52..e2078ec6ca6e 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx @@ -407,7 +407,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, @@ -536,6 +536,6 @@ void unoInterfaceProxyDispatch( } } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx index 43b73257261a..efc9ded5640e 100644 --- a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx @@ -477,7 +477,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, @@ -604,6 +604,6 @@ void unoInterfaceProxyDispatch( } } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc64/uno2cpp.cxx index de17e3ca5d07..ed498d85862b 100644 --- a/bridges/source/cpp_uno/gcc3_linux_sparc64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_sparc64/uno2cpp.cxx @@ -721,7 +721,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, @@ -848,6 +848,6 @@ void unoInterfaceProxyDispatch( } } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx index 2f71e4410705..0b320a00c6ec 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_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, @@ -437,6 +437,6 @@ void unoInterfaceProxyDispatch( } } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx index 5b17378b911f..cd0bd2c743c6 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx @@ -229,7 +229,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, @@ -351,6 +351,6 @@ void unoInterfaceProxyDispatch( } } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx index 5b42401caed3..cdac6d3cda61 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx @@ -472,7 +472,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, @@ -599,6 +599,6 @@ void unoInterfaceProxyDispatch( } } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx index f215a92e9078..7c05112c41bf 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx @@ -328,7 +328,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, @@ -449,6 +449,6 @@ void unoInterfaceProxyDispatch( } } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx index 4415d525b0db..99f87e23d216 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx @@ -308,7 +308,7 @@ bool cpp_call( } -namespace bridges { namespace cpp_uno { namespace shared { +namespace bridges::cpp_uno::shared { void unoInterfaceProxyDispatch( uno_Interface * pUnoI, @@ -452,6 +452,6 @@ void unoInterfaceProxyDispatch( } } -} } } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |