summaryrefslogtreecommitdiffstats
path: root/bridges/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-05-08 10:55:43 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-05-08 12:16:54 +0200
commit3eed23154170fcb8d313ff079d61c9701b77eefa (patch)
tree1c9b0daee609373cdd68141d4f7d203e99f5e1cf /bridges/inc
parentCppUnittest: ooxmlexport9: assert pages where possible (diff)
downloadcore-3eed23154170fcb8d313ff079d61c9701b77eefa.tar.gz
core-3eed23154170fcb8d313ff079d61c9701b77eefa.zip
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/inc')
-rw-r--r--bridges/inc/bridge.hxx4
-rw-r--r--bridges/inc/cppinterfaceproxy.hxx8
-rw-r--r--bridges/inc/types.hxx4
-rw-r--r--bridges/inc/unointerfaceproxy.hxx8
-rw-r--r--bridges/inc/vtablefactory.hxx4
-rw-r--r--bridges/inc/vtables.hxx4
6 files changed, 14 insertions, 18 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