From 3eed23154170fcb8d313ff079d61c9701b77eefa Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Fri, 8 May 2020 10:55:43 +0200
Subject: 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>
---
 avmedia/source/gstreamer/gstframegrabber.hxx | 5 ++---
 avmedia/source/gstreamer/gstmanager.hxx      | 5 ++---
 avmedia/source/gstreamer/gstplayer.hxx       | 5 ++---
 avmedia/source/gstreamer/gstwindow.hxx       | 5 ++---
 avmedia/source/macavf/framegrabber.hxx       | 5 ++---
 avmedia/source/macavf/framegrabber.mm        | 5 ++---
 avmedia/source/macavf/macavfcommon.hxx       | 8 +++-----
 avmedia/source/macavf/manager.hxx            | 5 ++---
 avmedia/source/macavf/manager.mm             | 5 ++---
 avmedia/source/macavf/player.hxx             | 5 ++---
 avmedia/source/macavf/player.mm              | 5 ++---
 avmedia/source/macavf/window.hxx             | 5 ++---
 avmedia/source/macavf/window.mm              | 5 ++---
 avmedia/source/viewer/mediawindow_impl.hxx   | 8 ++++----
 avmedia/source/win/framegrabber.cxx          | 6 +++---
 avmedia/source/win/framegrabber.hxx          | 6 +++---
 avmedia/source/win/manager.cxx               | 6 +++---
 avmedia/source/win/manager.hxx               | 5 ++---
 avmedia/source/win/player.cxx                | 6 +++---
 avmedia/source/win/player.hxx                | 6 +++---
 avmedia/source/win/window.cxx                | 6 +++---
 avmedia/source/win/window.hxx                | 5 ++---
 22 files changed, 53 insertions(+), 69 deletions(-)

(limited to 'avmedia')

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: */
-- 
cgit