[Libreoffice-commits] core.git: avmedia/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Thu Jul 16 16:06:32 UTC 2020
avmedia/source/viewer/mediaevent_impl.hxx | 6 ++----
avmedia/source/vlc/inc/wrapper/Common.hxx | 10 +++-------
avmedia/source/vlc/inc/wrapper/EventHandler.hxx | 10 +++-------
avmedia/source/vlc/inc/wrapper/EventManager.hxx | 10 +++-------
avmedia/source/vlc/inc/wrapper/Instance.hxx | 10 +++-------
avmedia/source/vlc/inc/wrapper/Media.hxx | 10 +++-------
avmedia/source/vlc/inc/wrapper/Player.hxx | 10 +++-------
avmedia/source/vlc/inc/wrapper/ThreadsafeQueue.hxx | 10 +++-------
avmedia/source/vlc/vlcframegrabber.hxx | 5 ++---
avmedia/source/vlc/vlcmanager.hxx | 5 ++---
avmedia/source/vlc/vlcplayer.hxx | 5 ++---
avmedia/source/vlc/vlcwindow.hxx | 5 ++---
avmedia/source/vlc/wrapper/SymbolLoader.hxx | 10 +++-------
13 files changed, 34 insertions(+), 72 deletions(-)
New commits:
commit 2f6839b8b1c778cd01833a66c1cc92f1b5cf2667
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Jul 16 12:44:34 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Jul 16 18:05:48 2020 +0200
compact namespace: avmedia
Change-Id: I3f8d9c689724c6f522933604cc8e9cb041585546
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98896
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/avmedia/source/viewer/mediaevent_impl.hxx b/avmedia/source/viewer/mediaevent_impl.hxx
index 9c864ecff29d..1dc1c20ec2ff 100644
--- a/avmedia/source/viewer/mediaevent_impl.hxx
+++ b/avmedia/source/viewer/mediaevent_impl.hxx
@@ -27,9 +27,7 @@
#include <com/sun/star/awt/XFocusListener.hpp>
#include <vcl/vclptr.hxx>
-namespace avmedia
-{
- namespace priv
+namespace avmedia::priv
{
// - MediaEventListenersImpl -
@@ -72,7 +70,7 @@ namespace avmedia
VclPtr<vcl::Window> mpNotifyWindow;
mutable ::osl::Mutex maMutex;
};
- }
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/vlc/inc/wrapper/Common.hxx b/avmedia/source/vlc/inc/wrapper/Common.hxx
index c9b7f9682dd2..a7c48e586c67 100644
--- a/avmedia/source/vlc/inc/wrapper/Common.hxx
+++ b/avmedia/source/vlc/inc/wrapper/Common.hxx
@@ -9,11 +9,7 @@
#pragma once
-namespace avmedia
-{
-namespace vlc
-{
-namespace wrapper
+namespace avmedia::vlc::wrapper
{
class Common
{
@@ -23,7 +19,7 @@ namespace wrapper
static const char* LastErrorMessage();
};
}
-}
-}
+
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/vlc/inc/wrapper/EventHandler.hxx b/avmedia/source/vlc/inc/wrapper/EventHandler.hxx
index 955c8347839d..d0ecd1832caa 100644
--- a/avmedia/source/vlc/inc/wrapper/EventHandler.hxx
+++ b/avmedia/source/vlc/inc/wrapper/EventHandler.hxx
@@ -13,11 +13,7 @@
#include <salhelper/thread.hxx>
#include <wrapper/ThreadsafeQueue.hxx>
-namespace avmedia
-{
-namespace vlc
-{
-namespace wrapper
+namespace avmedia::vlc::wrapper
{
class EventHandler : public ::osl::Thread
{
@@ -36,7 +32,7 @@ namespace wrapper
ThreadsafeQueue< TCallback > mCallbackQueue;
};
}
-}
-}
+
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/vlc/inc/wrapper/EventManager.hxx b/avmedia/source/vlc/inc/wrapper/EventManager.hxx
index 9a85154831b1..30beac672384 100644
--- a/avmedia/source/vlc/inc/wrapper/EventManager.hxx
+++ b/avmedia/source/vlc/inc/wrapper/EventManager.hxx
@@ -15,11 +15,7 @@
struct libvlc_event_manager_t;
struct libvlc_event_t;
-namespace avmedia
-{
-namespace vlc
-{
-namespace wrapper
+namespace avmedia::vlc::wrapper
{
class EventHandler;
class EventManager
@@ -49,7 +45,7 @@ namespace wrapper
static void Handler( const libvlc_event_t *event, void *pData );
};
}
-}
-}
+
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/vlc/inc/wrapper/Instance.hxx b/avmedia/source/vlc/inc/wrapper/Instance.hxx
index 7e4ba7741019..46e4b76bb38e 100644
--- a/avmedia/source/vlc/inc/wrapper/Instance.hxx
+++ b/avmedia/source/vlc/inc/wrapper/Instance.hxx
@@ -11,11 +11,7 @@
struct libvlc_instance_t;
-namespace avmedia
-{
-namespace vlc
-{
-namespace wrapper
+namespace avmedia::vlc::wrapper
{
class Instance
{
@@ -35,7 +31,7 @@ namespace wrapper
libvlc_instance_t *mInstance;
};
}
-}
-}
+
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/vlc/inc/wrapper/Media.hxx b/avmedia/source/vlc/inc/wrapper/Media.hxx
index 288bb0d43198..3268e898e254 100644
--- a/avmedia/source/vlc/inc/wrapper/Media.hxx
+++ b/avmedia/source/vlc/inc/wrapper/Media.hxx
@@ -13,11 +13,7 @@ struct libvlc_media_t;
namespace rtl { class OUString; }
-namespace avmedia
-{
-namespace vlc
-{
-namespace wrapper
+namespace avmedia::vlc::wrapper
{
class Instance;
class Media
@@ -41,7 +37,7 @@ namespace wrapper
libvlc_media_t *mMedia;
};
}
-}
-}
+
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/vlc/inc/wrapper/Player.hxx b/avmedia/source/vlc/inc/wrapper/Player.hxx
index a41e01b10b9c..2ff4ff68958c 100644
--- a/avmedia/source/vlc/inc/wrapper/Player.hxx
+++ b/avmedia/source/vlc/inc/wrapper/Player.hxx
@@ -19,11 +19,7 @@ namespace rtl
class OUString;
}
-namespace avmedia
-{
-namespace vlc
-{
-namespace wrapper
+namespace avmedia::vlc::wrapper
{
class Media;
class Player
@@ -67,7 +63,7 @@ namespace wrapper
libvlc_media_player_t *mPlayer;
};
}
-}
-}
+
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/vlc/inc/wrapper/ThreadsafeQueue.hxx b/avmedia/source/vlc/inc/wrapper/ThreadsafeQueue.hxx
index f8eb480dd9aa..8265981e72d0 100644
--- a/avmedia/source/vlc/inc/wrapper/ThreadsafeQueue.hxx
+++ b/avmedia/source/vlc/inc/wrapper/ThreadsafeQueue.hxx
@@ -22,11 +22,7 @@
#include <osl/mutex.hxx>
#include <osl/conditn.hxx>
-namespace avmedia
-{
-namespace vlc
-{
-namespace wrapper
+namespace avmedia::vlc::wrapper
{
template<class T>
class ThreadsafeQueue
@@ -75,7 +71,7 @@ void ThreadsafeQueue<T>::pop( T& data )
mQueue.pop();
}
}
-}
-}
+
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/vlc/vlcframegrabber.hxx b/avmedia/source/vlc/vlcframegrabber.hxx
index 77684d6b9eff..60073a420c9e 100644
--- a/avmedia/source/vlc/vlcframegrabber.hxx
+++ b/avmedia/source/vlc/vlcframegrabber.hxx
@@ -24,8 +24,7 @@
#include "vlccommon.hxx"
#include <wrapper/Wrapper.hxx>
-namespace avmedia {
-namespace vlc {
+namespace avmedia::vlc {
typedef ::cppu::WeakImplHelper< css::media::XFrameGrabber,
css::lang::XServiceInfo > FrameGrabber_BASE;
@@ -47,6 +46,6 @@ public:
};
}
-}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/vlc/vlcmanager.hxx b/avmedia/source/vlc/vlcmanager.hxx
index 3615ab17d187..5bbbe609f799 100644
--- a/avmedia/source/vlc/vlcmanager.hxx
+++ b/avmedia/source/vlc/vlcmanager.hxx
@@ -24,8 +24,7 @@
#include <memory>
#include <cppuhelper/implbase.hxx>
-namespace avmedia {
-namespace vlc {
+namespace avmedia::vlc {
class Manager : public ::cppu::WeakImplHelper< css::media::XManager,
css::lang::XServiceInfo >
@@ -49,6 +48,6 @@ private:
};
}
-}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/vlc/vlcplayer.hxx b/avmedia/source/vlc/vlcplayer.hxx
index 4c3c03d0bd14..1ec64a534a60 100644
--- a/avmedia/source/vlc/vlcplayer.hxx
+++ b/avmedia/source/vlc/vlcplayer.hxx
@@ -29,8 +29,7 @@
#include <wrapper/Player.hxx>
#include <wrapper/EventManager.hxx>
-namespace avmedia {
-namespace vlc {
+namespace avmedia::vlc {
typedef ::cppu::WeakComponentImplHelper< css::media::XPlayer,
css::lang::XServiceInfo > VLC_Base;
@@ -81,6 +80,6 @@ private:
};
}
-}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/vlc/vlcwindow.hxx b/avmedia/source/vlc/vlcwindow.hxx
index e70c8e80fb88..b3d93377d409 100644
--- a/avmedia/source/vlc/vlcwindow.hxx
+++ b/avmedia/source/vlc/vlcwindow.hxx
@@ -21,8 +21,7 @@
#include "vlccommon.hxx"
#include <cppuhelper/implbase.hxx>
-namespace avmedia {
-namespace vlc {
+namespace avmedia::vlc {
class VLCPlayer;
class VLCWindow : public ::cppu::WeakImplHelper< css::media::XPlayerWindow,
@@ -69,6 +68,6 @@ public:
};
}
-}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/vlc/wrapper/SymbolLoader.hxx b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
index 64789b326ebf..7633c5956972 100644
--- a/avmedia/source/vlc/wrapper/SymbolLoader.hxx
+++ b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
@@ -21,11 +21,7 @@
#define SYM_MAP(a) { #a, reinterpret_cast<SymbolFunc *>(&a) }
-namespace avmedia
-{
-namespace vlc
-{
-namespace wrapper
+namespace avmedia::vlc::wrapper
{
typedef void (*SymbolFunc) (void);
@@ -120,7 +116,7 @@ struct ApiMap
return false;
}
}
-}
-}
+
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list