diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-05-09 15:53:22 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-05-09 20:01:31 +0200 |
commit | 3c800667b75c6b5def45035d69be4fefc6cd3809 (patch) | |
tree | 082384750791b1ff14dbfb22086c3bc0ae11cb0d /package/inc | |
parent | 837b3f031050f9b858cb370446931f716b8d82e3 (diff) |
compact namespace in package
Change-Id: I9956f715e00a0c2814b79617f37dd0c09f049ad0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93858
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'package/inc')
-rw-r--r-- | package/inc/ByteChucker.hxx | 4 | ||||
-rw-r--r-- | package/inc/ByteGrabber.hxx | 4 | ||||
-rw-r--r-- | package/inc/CRC32.hxx | 4 | ||||
-rw-r--r-- | package/inc/ZipFile.hxx | 4 | ||||
-rw-r--r-- | package/inc/ZipPackage.hxx | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/package/inc/ByteChucker.hxx b/package/inc/ByteChucker.hxx index 03988e925ccb..156b41f6001a 100644 --- a/package/inc/ByteChucker.hxx +++ b/package/inc/ByteChucker.hxx @@ -27,9 +27,9 @@ #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace io { class XSeekable; class XOutputStream; } -} } } +} class ByteChucker final { css::uno::Reference < css::io::XOutputStream > xStream; diff --git a/package/inc/ByteGrabber.hxx b/package/inc/ByteGrabber.hxx index 7a8e0c379596..27d01deb1ca9 100644 --- a/package/inc/ByteGrabber.hxx +++ b/package/inc/ByteGrabber.hxx @@ -29,9 +29,9 @@ #include <osl/mutex.hxx> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace io { class XSeekable; class XInputStream; } -} } } +} class ByteGrabber final { ::osl::Mutex m_aMutex; diff --git a/package/inc/CRC32.hxx b/package/inc/CRC32.hxx index 0791875217cb..2539d8e8c44e 100644 --- a/package/inc/CRC32.hxx +++ b/package/inc/CRC32.hxx @@ -22,9 +22,9 @@ #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/uno/RuntimeException.hpp> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace io { class XInputStream; } -} } } +} class CRC32 final { sal_uInt32 nCRC; diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx index 3dceb036c3bd..221a89a69d76 100644 --- a/package/inc/ZipFile.hxx +++ b/package/inc/ZipFile.hxx @@ -34,10 +34,10 @@ #include <memory> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace uno { class XComponentContext; } namespace ucb { class XProgressHandler; } -} } } +} namespace rtl { template < class T > class Reference; diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx index d1f956068327..779e5cd7ed41 100644 --- a/package/inc/ZipPackage.hxx +++ b/package/inc/ZipPackage.hxx @@ -41,13 +41,13 @@ class ZipOutputStream; class ZipPackageFolder; class ZipFile; -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace container { class XNameContainer; } namespace io { class XStream; class XOutputStream; class XInputStream; class XSeekable; class XActiveDataStreamer; } namespace lang { class XMultiServiceFactory; } namespace uno { class XComponentContext; } namespace task { class XInteractionHandler; } -} } } +} enum InitialisationMode { |