[Libreoffice-commits] core.git: avmedia/source

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Tue Jan 14 14:19:49 UTC 2020 

 avmedia/source/gstreamer/gstframegrabber.cxx |    3 +--
 avmedia/source/gstreamer/gstmanager.cxx      |    3 +--
 avmedia/source/gstreamer/gstplayer.cxx       |    3 +--
 avmedia/source/gstreamer/gstwindow.cxx       |    3 +--
 avmedia/source/viewer/mediaevent_impl.cxx    |    3 +--
 avmedia/source/viewer/mediawindow_impl.cxx   |    3 +--
 avmedia/source/vlc/vlcframegrabber.cxx       |    4 +---
 avmedia/source/vlc/vlcmanager.cxx            |    4 +---
 avmedia/source/vlc/vlcplayer.cxx             |    4 +---
 avmedia/source/vlc/vlcwindow.cxx             |    4 +---
 avmedia/source/vlc/wrapper/Common.cxx        |    8 +-------
 avmedia/source/vlc/wrapper/EventHandler.cxx  |    8 +-------
 avmedia/source/vlc/wrapper/EventManager.cxx  |    8 +-------
 avmedia/source/vlc/wrapper/Instance.cxx      |    8 +-------
 avmedia/source/vlc/wrapper/Media.cxx         |    8 +-------
 avmedia/source/vlc/wrapper/Player.cxx        |    8 +-------
 16 files changed, 16 insertions(+), 66 deletions(-)

New commits:
commit af4f3bd896bb554b71972da5379a490b869f24bb
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Jan 14 15:11:02 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Jan 14 15:19:16 2020 +0100

    clang-tidy modernize-concat-nested-namespace in avmedia
    
    Change-Id: I2ac6de9e56bf94b81602bd841383d937b3d7e908
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86756
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx
index bc183d563332..496a447103ec 100644
--- a/avmedia/source/gstreamer/gstframegrabber.cxx
+++ b/avmedia/source/gstreamer/gstframegrabber.cxx
@@ -36,7 +36,7 @@
 
 using namespace ::com::sun::star;
 
-namespace avmedia { namespace gstreamer {
+namespace avmedia::gstreamer {
 
 void FrameGrabber::disposePipeline()
 {
@@ -171,7 +171,6 @@ uno::Sequence< OUString > SAL_CALL FrameGrabber::getSupportedServiceNames()
     return { AVMEDIA_GST_FRAMEGRABBER_SERVICENAME };
 }
 
-} // namespace gstreamer
 } // namespace avmedia
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/gstreamer/gstmanager.cxx b/avmedia/source/gstreamer/gstmanager.cxx
index 0f4f055e4f59..0414437dfe3b 100644
--- a/avmedia/source/gstreamer/gstmanager.cxx
+++ b/avmedia/source/gstreamer/gstmanager.cxx
@@ -29,7 +29,7 @@
 
 using namespace ::com::sun::star;
 
-namespace avmedia { namespace gstreamer {
+namespace avmedia::gstreamer {
 
 Manager::Manager()
 {
@@ -66,7 +66,6 @@ uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames(  )
     return { AVMEDIA_GST_MANAGER_SERVICENAME };
 }
 
-} // namespace gstreamer
 } // namespace avmedia
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index 703ddcddc849..3ded8831b789 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -53,7 +53,7 @@
 
 using namespace ::com::sun::star;
 
-namespace avmedia { namespace gstreamer {
+namespace avmedia::gstreamer {
 
 namespace {
 
@@ -925,7 +925,6 @@ uno::Sequence< OUString > SAL_CALL Player::getSupportedServiceNames()
     return { AVMEDIA_GST_PLAYER_SERVICENAME };
 }
 
-} // namespace gstreamer
 } // namespace avmedia
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/gstreamer/gstwindow.cxx b/avmedia/source/gstreamer/gstwindow.cxx
index 98a6c78738bf..5c91cce1e920 100644
--- a/avmedia/source/gstreamer/gstwindow.cxx
+++ b/avmedia/source/gstreamer/gstwindow.cxx
@@ -29,7 +29,7 @@
 
 using namespace ::com::sun::star;
 
-namespace avmedia { namespace gstreamer {
+namespace avmedia::gstreamer {
 
 // Window
 
@@ -188,7 +188,6 @@ uno::Sequence< OUString > SAL_CALL Window::getSupportedServiceNames(  )
     return { AVMEDIA_GST_WINDOW_SERVICENAME };
 }
 
-} // namespace gstreamer
 } // namespace avmedia
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx
index 100bb0d83466..c90d12c32729 100644
--- a/avmedia/source/viewer/mediaevent_impl.cxx
+++ b/avmedia/source/viewer/mediaevent_impl.cxx
@@ -25,7 +25,7 @@
 
 using namespace ::com::sun::star;
 
-namespace avmedia { namespace priv {
+namespace avmedia::priv {
 
 MediaEventListenersImpl::MediaEventListenersImpl( vcl::Window& rEventWindow ) :
     mpNotifyWindow( &rEventWindow )
@@ -169,7 +169,6 @@ void SAL_CALL MediaEventListenersImpl::focusLost( const css::awt::FocusEvent& )
 }
 
 
-} // namespace priv
 } // namespace avmedia
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 70cc871854d6..9d2245b0a274 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -49,7 +49,7 @@
 #endif
 using namespace ::com::sun::star;
 
-namespace avmedia { namespace priv {
+namespace avmedia::priv {
 
 MediaWindowControl::MediaWindowControl(vcl::Window* pParent)
     : MediaControl(pParent, MEDIACONTROLSTYLE_MULTILINE)
@@ -672,7 +672,6 @@ void MediaWindowImpl::StartDrag(sal_Int8 nAction, const Point& rPosPixel)
         mpMediaWindow->StartDrag(nAction, rPosPixel);
 }
 
-} // namespace priv
 } // namespace avmedia
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/vlc/vlcframegrabber.cxx b/avmedia/source/vlc/vlcframegrabber.cxx
index 23cbe6c4730a..a2c17c0a70e7 100644
--- a/avmedia/source/vlc/vlcframegrabber.cxx
+++ b/avmedia/source/vlc/vlcframegrabber.cxx
@@ -38,8 +38,7 @@
 
 using namespace ::com::sun::star;
 
-namespace avmedia {
-namespace vlc {
+namespace avmedia::vlc {
 
 namespace
 {
@@ -127,7 +126,6 @@ sal_Bool SAL_CALL VLCFrameGrabber::supportsService( const OUString& serviceName
     return { AVMEDIA_VLC_GRABBER_SERVICENAME };
 }
 
-}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/vlc/vlcmanager.cxx b/avmedia/source/vlc/vlcmanager.cxx
index e82e88b604aa..2d378d82c427 100644
--- a/avmedia/source/vlc/vlcmanager.cxx
+++ b/avmedia/source/vlc/vlcmanager.cxx
@@ -22,8 +22,7 @@
 
 using namespace ::com::sun::star;
 
-namespace avmedia {
-namespace vlc {
+namespace avmedia::vlc {
 
 namespace
 {
@@ -120,7 +119,6 @@ uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames()
     return { VLC_SERVICENAME };
 }
 
-} // end namespace vlc
 } // end namespace avmedia
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index 0382b3e1c57c..bbb386240998 100644
--- a/avmedia/source/vlc/vlcplayer.cxx
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -28,8 +28,7 @@
 
 using namespace ::com::sun::star;
 
-namespace avmedia {
-namespace vlc {
+namespace avmedia::vlc {
 
 namespace
 {
@@ -247,7 +246,6 @@ sal_Bool SAL_CALL VLCPlayer::supportsService( const OUString& serviceName )
     return { AVMEDIA_VLC_PLAYER_SERVICENAME };
 }
 
-}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/vlc/vlcwindow.cxx b/avmedia/source/vlc/vlcwindow.cxx
index 36894d1f74e8..1cd0e1306a21 100644
--- a/avmedia/source/vlc/vlcwindow.cxx
+++ b/avmedia/source/vlc/vlcwindow.cxx
@@ -24,8 +24,7 @@
 
 using namespace ::com::sun::star;
 
-namespace avmedia {
-namespace vlc {
+namespace avmedia::vlc {
 
 namespace
 {
@@ -193,7 +192,6 @@ void SAL_CALL VLCWindow::removePaintListener( const uno::Reference< awt::XPaintL
 {
 }
 
-}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/vlc/wrapper/Common.cxx b/avmedia/source/vlc/wrapper/Common.cxx
index cadf00250ccb..4ee3a29778b6 100644
--- a/avmedia/source/vlc/wrapper/Common.cxx
+++ b/avmedia/source/vlc/wrapper/Common.cxx
@@ -17,11 +17,7 @@ namespace
     char *  ( * libvlc_errmsg ) ();
 }
 
-namespace avmedia
-{
-namespace vlc
-{
-namespace wrapper
+namespace avmedia::vlc::wrapper
 {
 bool Common::LoadSymbols()
 {
@@ -45,7 +41,5 @@ const char* Common::LastErrorMessage()
     return errorMsg == nullptr ? AVMEDIA_NO_ERROR : errorMsg;
 }
 }
-}
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/vlc/wrapper/EventHandler.cxx b/avmedia/source/vlc/wrapper/EventHandler.cxx
index 2cc40606c62b..a2a0db16eb32 100644
--- a/avmedia/source/vlc/wrapper/EventHandler.cxx
+++ b/avmedia/source/vlc/wrapper/EventHandler.cxx
@@ -9,11 +9,7 @@
 
 #include <wrapper/EventHandler.hxx>
 
-namespace avmedia
-{
-namespace vlc
-{
-namespace wrapper
+namespace avmedia::vlc::wrapper
 {
 EventHandler::EventHandler()
     : ::osl::Thread()
@@ -42,7 +38,5 @@ void EventHandler::run()
     } while ( true );
 }
 }
-}
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/vlc/wrapper/EventManager.cxx b/avmedia/source/vlc/wrapper/EventManager.cxx
index 5e7422e60dc5..27e56603ed16 100644
--- a/avmedia/source/vlc/wrapper/EventManager.cxx
+++ b/avmedia/source/vlc/wrapper/EventManager.cxx
@@ -25,11 +25,7 @@ namespace
                                     void *p_user_data );
 }
 
-namespace avmedia
-{
-namespace vlc
-{
-namespace wrapper
+namespace avmedia::vlc::wrapper
 {
 void EventManager::Handler( const libvlc_event_t *event, void *pData )
 {
@@ -84,7 +80,5 @@ void EventManager::onEndReached( const Callback& callback )
     registerSignal( libvlc_MediaPlayerEndReached, callback );
 }
 }
-}
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/vlc/wrapper/Instance.cxx b/avmedia/source/vlc/wrapper/Instance.cxx
index eb6dd99eb200..1226cb7ea220 100644
--- a/avmedia/source/vlc/wrapper/Instance.cxx
+++ b/avmedia/source/vlc/wrapper/Instance.cxx
@@ -17,11 +17,7 @@ namespace
     void ( *libvlc_retain ) ( libvlc_instance_t *p_instance );
 }
 
-namespace avmedia
-{
-namespace vlc
-{
-namespace wrapper
+namespace avmedia::vlc::wrapper
 {
     bool Instance::LoadSymbols()
     {
@@ -62,7 +58,5 @@ namespace wrapper
         libvlc_release( mInstance );
     }
 }
-}
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/vlc/wrapper/Media.cxx b/avmedia/source/vlc/wrapper/Media.cxx
index c6c74420ab53..f09aecd766fd 100644
--- a/avmedia/source/vlc/wrapper/Media.cxx
+++ b/avmedia/source/vlc/wrapper/Media.cxx
@@ -17,11 +17,7 @@
 
 struct libvlc_instance_t;
 
-namespace avmedia
-{
-namespace vlc
-{
-namespace wrapper
+namespace avmedia::vlc::wrapper
 {
 namespace
 {
@@ -109,7 +105,5 @@ Media::~Media()
     libvlc_media_release( mMedia );
 }
 }
-}
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/vlc/wrapper/Player.cxx b/avmedia/source/vlc/wrapper/Player.cxx
index 2f8e0d8903a0..acdda3754129 100644
--- a/avmedia/source/vlc/wrapper/Player.cxx
+++ b/avmedia/source/vlc/wrapper/Player.cxx
@@ -59,11 +59,7 @@ namespace { extern "C" {
     int ( *libvlc_audio_set_track ) (libvlc_media_player_t *p_mi, int i_track);
 } }
 
-namespace avmedia
-{
-namespace vlc
-{
-namespace wrapper
+namespace avmedia::vlc::wrapper
 {
     bool Player::LoadSymbols()
     {
@@ -241,7 +237,5 @@ namespace wrapper
         return libvlc_media_player_has_vout( mPlayer );
     }
 }
-}
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

More information about the Libreoffice-commits mailing list