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 | |
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>
52 files changed, 117 insertions, 139 deletions
diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx b/avmedia/source/gstreamer/gstframegrabber.hxx index fce3edd70fe9..03c4af65f1a9 100644 --- a/avmedia/source/gstreamer/gstframegrabber.hxx +++ b/avmedia/source/gstreamer/gstframegrabber.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/media/XFrameGrabber.hpp> #include <cppuhelper/implbase.hxx> -namespace avmedia { namespace gstreamer { +namespace avmedia::gstreamer { typedef ::cppu::WeakImplHelper< css::media::XFrameGrabber, css::lang::XServiceInfo > FrameGrabber_BASE; @@ -55,7 +55,6 @@ private: explicit FrameGrabber( const OUString &aURL ); }; -} // namespace gst -} // namespace avmedia +} // avmedia::gst /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/gstreamer/gstmanager.hxx b/avmedia/source/gstreamer/gstmanager.hxx index cd7622f62d22..21a5245dd933 100644 --- a/avmedia/source/gstreamer/gstmanager.hxx +++ b/avmedia/source/gstreamer/gstmanager.hxx @@ -23,7 +23,7 @@ #include <cppuhelper/implbase.hxx> #include <com/sun/star/media/XManager.hpp> -namespace avmedia { namespace gstreamer { +namespace avmedia::gstreamer { class Manager : public ::cppu::WeakImplHelper< css::media::XManager, css::lang::XServiceInfo > @@ -42,7 +42,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; -} // namespace gstreamer -} // namespace avmedia +} // namespace avmedia::gstreamer /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx index bd778edfe859..1b7c7f23bce5 100644 --- a/avmedia/source/gstreamer/gstplayer.hxx +++ b/avmedia/source/gstreamer/gstplayer.hxx @@ -28,7 +28,7 @@ typedef struct _GstVideoOverlay GstVideoOverlay; -namespace avmedia { namespace gstreamer { +namespace avmedia::gstreamer { typedef ::cppu::WeakComponentImplHelper< css::media::XPlayer, @@ -102,7 +102,6 @@ private: osl::Condition maSizeCondition; }; -} // namespace gstreamer -} // namespace avmedia +} // namespace avmedia::gstreamer /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/gstreamer/gstwindow.hxx b/avmedia/source/gstreamer/gstwindow.hxx index 60b2aa835d6f..c9d633d5434f 100644 --- a/avmedia/source/gstreamer/gstwindow.hxx +++ b/avmedia/source/gstreamer/gstwindow.hxx @@ -25,7 +25,7 @@ #include <com/sun/star/media/XPlayerWindow.hpp> -namespace avmedia { namespace gstreamer { +namespace avmedia::gstreamer { class Player; @@ -77,7 +77,6 @@ private: css::media::ZoomLevel meZoomLevel; }; -} // namespace gstreamer -} // namespace avmedia +} // namespace avmedia::gstreamer /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/macavf/framegrabber.hxx b/avmedia/source/macavf/framegrabber.hxx index a0fceec3bf47..0b199991edaa 100644 --- a/avmedia/source/macavf/framegrabber.hxx +++ b/avmedia/source/macavf/framegrabber.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/media/XFrameGrabber.hpp> -namespace avmedia { namespace macavf { +namespace avmedia::macavf { class FrameGrabber : public ::cppu::WeakImplHelper< css::media::XFrameGrabber, css::lang::XServiceInfo > @@ -51,7 +51,6 @@ private: AVAssetImageGenerator* mpImageGen; }; -} // namespace macavf -} // namespace avmedia +} // namespace avmedia::macavf /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/macavf/framegrabber.mm b/avmedia/source/macavf/framegrabber.mm index 5bd9441f9dea..71180010305b 100644 --- a/avmedia/source/macavf/framegrabber.mm +++ b/avmedia/source/macavf/framegrabber.mm @@ -28,7 +28,7 @@ using namespace ::com::sun::star; -namespace avmedia { namespace macavf { +namespace avmedia::macavf { FrameGrabber::FrameGrabber( const uno::Reference< lang::XMultiServiceFactory >& /*rxMgr*/ ) : mpImageGen( nullptr ) @@ -101,7 +101,6 @@ uno::Sequence< OUString > SAL_CALL FrameGrabber::getSupportedServiceNames( ) return { AVMEDIA_MACAVF_FRAMEGRABBER_SERVICENAME }; } -} // namespace macavf -} // namespace avmedia +} // namespace avmedia::macavf /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/macavf/macavfcommon.hxx b/avmedia/source/macavf/macavfcommon.hxx index c682755ce8a8..699f495a0ddf 100644 --- a/avmedia/source/macavf/macavfcommon.hxx +++ b/avmedia/source/macavf/macavfcommon.hxx @@ -60,9 +60,7 @@ // MacAVObserver handles the notifications used in the AVFoundation framework -namespace avmedia { namespace macavf { -class MacAVObserverHandler; -} } +namespace avmedia::macavf { class MacAVObserverHandler; } typedef std::unordered_map<NSObject*,avmedia::macavf::MacAVObserverHandler*> HandlersForObject; @@ -74,7 +72,7 @@ typedef std::unordered_map<NSObject*,avmedia::macavf::MacAVObserverHandler*> Han - (void)onNotification:(NSNotification*)pNotification; @end -namespace avmedia { namespace macavf { +namespace avmedia::macavf { class MacAVObserverHandler { @@ -86,6 +84,6 @@ public: virtual bool handleObservation( NSString* pKeyPath ) = 0; }; -}} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/macavf/manager.hxx b/avmedia/source/macavf/manager.hxx index 2320e8bb4656..fbdcb61b3caf 100644 --- a/avmedia/source/macavf/manager.hxx +++ b/avmedia/source/macavf/manager.hxx @@ -25,7 +25,7 @@ #include <com/sun/star/media/XManager.hpp> -namespace avmedia { namespace macavf { +namespace avmedia::macavf { class Manager : public ::cppu::WeakImplHelper< css::media::XManager, css::lang::XServiceInfo > @@ -47,7 +47,6 @@ private: css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr; }; -} // namespace macavf -} // namespace avmedia +} // namespace avmedia::macavf /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/macavf/manager.mm b/avmedia/source/macavf/manager.mm index 8dd50f475630..7f3036c86faf 100644 --- a/avmedia/source/macavf/manager.mm +++ b/avmedia/source/macavf/manager.mm @@ -24,7 +24,7 @@ using namespace ::com::sun::star; -namespace avmedia { namespace macavf { +namespace avmedia::macavf { Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) : mxMgr( rxMgr ) @@ -66,7 +66,6 @@ uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames( ) return { AVMEDIA_MACAVF_MANAGER_SERVICENAME }; } -} // namespace macavf -} // namespace avmedia +} // namespace avmedia::macavf /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/macavf/player.hxx b/avmedia/source/macavf/player.hxx index 22867b1af20f..b9b49cc8cdac 100644 --- a/avmedia/source/macavf/player.hxx +++ b/avmedia/source/macavf/player.hxx @@ -25,7 +25,7 @@ #include <com/sun/star/media/XPlayer.hpp> -namespace avmedia { namespace macavf { +namespace avmedia::macavf { class Player : public MacAVObserverHandler @@ -79,7 +79,6 @@ private: bool mbLooping; }; -} // namespace macavf -} // namespace avmedia +} // namespace avmedia::macavf /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/macavf/player.mm b/avmedia/source/macavf/player.mm index 0ad415742ec8..dfe558524073 100644 --- a/avmedia/source/macavf/player.mm +++ b/avmedia/source/macavf/player.mm @@ -56,7 +56,7 @@ using namespace ::com::sun::star; @end -namespace avmedia { namespace macavf { +namespace avmedia::macavf { MacAVObserverObject* MacAVObserverHandler::mpMacAVObserverObject = nullptr; @@ -359,7 +359,6 @@ uno::Sequence< OUString > SAL_CALL Player::getSupportedServiceNames( ) return { AVMEDIA_MACAVF_PLAYER_SERVICENAME }; } -} // namespace macavf -} // namespace avmedia +} // namespace avmedia::macavf /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/macavf/window.hxx b/avmedia/source/macavf/window.hxx index 9f078cdd9b31..c494b6deffd4 100644 --- a/avmedia/source/macavf/window.hxx +++ b/avmedia/source/macavf/window.hxx @@ -33,7 +33,7 @@ - (void) play; @end -namespace avmedia { namespace macavf { +namespace avmedia::macavf { class Player; @@ -106,7 +106,6 @@ private: void ImplLayoutVideoWindow(); }; -} // namespace macavf -} // namespace avmedia +} // namespace avmedia::macavf /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/macavf/window.mm b/avmedia/source/macavf/window.mm index 523ee0b43eac..3c39a0725277 100644 --- a/avmedia/source/macavf/window.mm +++ b/avmedia/source/macavf/window.mm @@ -26,7 +26,7 @@ using namespace ::com::sun::star; -namespace avmedia { namespace macavf { +namespace avmedia::macavf { Window::Window( const uno::Reference< lang::XMultiServiceFactory >& i_rxMgr, Player& i_rPlayer, NSView* i_pParentView ) : mxMgr( i_rxMgr ) @@ -256,7 +256,6 @@ uno::Sequence< OUString > SAL_CALL Window::getSupportedServiceNames( ) return { AVMEDIA_MACAVF_WINDOW_SERVICENAME }; } -} // namespace macavf -} // namespace avmedia +} // namespace avmedia::macavf /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx index afee28f37dbc..8bceebb08d15 100644 --- a/avmedia/source/viewer/mediawindow_impl.hxx +++ b/avmedia/source/viewer/mediawindow_impl.hxx @@ -24,14 +24,14 @@ #include <mediacontrol.hxx> -namespace com { namespace sun { namespace star { namespace media { +namespace com::sun::star::media { class XPlayer; class XPlayerWindow; -}}}} +} -namespace com { namespace sun { namespace star { namespace uno { +namespace com::sun::star::uno { class XComponentContext; -}}}} +} class BitmapEx; diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx index 4ef3ce92f54a..09f5a6409616 100644 --- a/avmedia/source/win/framegrabber.cxx +++ b/avmedia/source/win/framegrabber.cxx @@ -44,7 +44,7 @@ using namespace ::com::sun::star; -namespace avmedia { namespace win { +namespace avmedia::win { FrameGrabber::FrameGrabber( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) : @@ -219,7 +219,7 @@ uno::Sequence< OUString > SAL_CALL FrameGrabber::getSupportedServiceNames( ) return { AVMEDIA_WIN_FRAMEGRABBER_SERVICENAME }; } -} // namespace win -} // namespace avmedia +} // namespace avmedia::win + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/win/framegrabber.hxx b/avmedia/source/win/framegrabber.hxx index cfd708b08353..aa5b8945e878 100644 --- a/avmedia/source/win/framegrabber.hxx +++ b/avmedia/source/win/framegrabber.hxx @@ -25,7 +25,7 @@ struct IMediaDet; -namespace avmedia { namespace win { +namespace avmedia::win { class FrameGrabber : public ::cppu::WeakImplHelper< css::media::XFrameGrabber, css::lang::XServiceInfo > @@ -51,7 +51,7 @@ private: OUString maURL; }; -} // namespace win -} // namespace avmedia +} // namespace avmedia::win + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/win/manager.cxx b/avmedia/source/win/manager.cxx index 1068fc9639e2..3615850a7cf3 100644 --- a/avmedia/source/win/manager.cxx +++ b/avmedia/source/win/manager.cxx @@ -28,7 +28,7 @@ using namespace ::com::sun::star; -namespace avmedia { namespace win { +namespace avmedia::win { Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) : mxMgr( rxMgr ) @@ -71,7 +71,7 @@ uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames( ) return { AVMEDIA_WIN_MANAGER_SERVICENAME }; } -} // namespace win -} // namespace avmedia +} // namespace avmedia::win + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/win/manager.hxx b/avmedia/source/win/manager.hxx index 54cda28390bf..77d1ce6ef815 100644 --- a/avmedia/source/win/manager.hxx +++ b/avmedia/source/win/manager.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/media/XManager.hpp> -namespace avmedia { namespace win { +namespace avmedia::win { class Manager : public ::cppu::WeakImplHelper< css::media::XManager, css::lang::XServiceInfo > @@ -46,7 +46,6 @@ private: css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr; }; -} // namespace win -} // namespace avmedia +} // namespace avmedia::win /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx index 4ca27603ce99..50323bb80725 100644 --- a/avmedia/source/win/player.cxx +++ b/avmedia/source/win/player.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star; -namespace avmedia { namespace win { +namespace avmedia::win { static LRESULT CALLBACK MediaPlayerWndProc_2( HWND hWnd,UINT nMsg, WPARAM nPar1, LPARAM nPar2 ) { @@ -457,7 +457,7 @@ uno::Sequence< OUString > SAL_CALL Player::getSupportedServiceNames( ) return { AVMEDIA_WIN_PLAYER_SERVICENAME }; } -} // namespace win -} // namespace avmedia +} // namespace avmedia::win + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/win/player.hxx b/avmedia/source/win/player.hxx index 9bdc0cb69c79..3708513688f7 100644 --- a/avmedia/source/win/player.hxx +++ b/avmedia/source/win/player.hxx @@ -43,7 +43,7 @@ struct IDDrawExclModeVideo; struct IDirectDraw; struct IDirectDrawSurface; -namespace avmedia { namespace win { +namespace avmedia::win { typedef ::cppu::WeakComponentImplHelper< css::media::XPlayer, css::lang::XServiceInfo > Player_BASE; @@ -113,7 +113,7 @@ private: void ImplLayoutVideoWindow(); }; -} // namespace win -} // namespace avmedia +} // namespace avmedia::win + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx index 7086f55eccaf..995ddd92cba4 100644 --- a/avmedia/source/win/window.cxx +++ b/avmedia/source/win/window.cxx @@ -33,7 +33,7 @@ using namespace ::com::sun::star; -namespace avmedia { namespace win { +namespace avmedia::win { static LRESULT CALLBACK MediaPlayerWndProc( HWND hWnd,UINT nMsg, WPARAM nPar1, LPARAM nPar2 ) { @@ -489,7 +489,7 @@ uno::Sequence< OUString > SAL_CALL Window::getSupportedServiceNames( ) return { AVMEDIA_WIN_WINDOW_SERVICENAME }; } -} // namespace win -} // namespace avmedia +} // namespace avmedia::win + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/win/window.hxx b/avmedia/source/win/window.hxx index 84b5423d9815..a947c1717091 100644 --- a/avmedia/source/win/window.hxx +++ b/avmedia/source/win/window.hxx @@ -31,7 +31,7 @@ struct IVideoWindow; -namespace avmedia { namespace win { +namespace avmedia::win { class Player; @@ -109,7 +109,6 @@ private: void ImplLayoutVideoWindow(); }; -} // namespace win -} // namespace avmedia +} // namespace avmedia::win /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index 76546f691d10..f5f3eea544e8 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -44,9 +44,7 @@ class ExtTextEngine; class TextView; class SvxSearchItem; -namespace com { namespace sun { namespace star { namespace beans { - class XMultiPropertySet; -} } } } +namespace com::sun::star::beans { class XMultiPropertySet; } namespace basctl { diff --git a/basctl/source/basicide/documentenumeration.hxx b/basctl/source/basicide/documentenumeration.hxx index 381f2aaf867d..084a4aa0cf09 100644 --- a/basctl/source/basicide/documentenumeration.hxx +++ b/basctl/source/basicide/documentenumeration.hxx @@ -23,12 +23,10 @@ #include <memory> #include <vector> -namespace com { namespace sun { namespace star { namespace uno { - class XComponentContext; -} } } } +namespace com::sun::star::uno { class XComponentContext; } -namespace basctl { namespace docs { +namespace basctl::docs { typedef std::vector< css::uno::Reference< css::frame::XController > > Controllers; @@ -87,6 +85,6 @@ namespace basctl { namespace docs { }; -} } // namespace basctl::docs +} // namespace basctl::docs /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ 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: */ |