ucb/source/cacher/cachedcontentresultset.hxx | 4 ++--
ucb/source/core/FileAccess.hxx | 8 ++++----
ucb/source/core/providermap.hxx | 4 ++--
ucb/source/core/ucb.hxx | 4 ++--
ucb/source/ucp/cmis/cmis_content.hxx | 4 ++--
ucb/source/ucp/cmis/cmis_repo_content.hxx | 4 ++--
ucb/source/ucp/ext/ucpext_content.hxx | 4 ++--
ucb/source/ucp/ext/ucpext_datasupplier.hxx | 4 ++--
ucb/source/ucp/ext/ucpext_provider.hxx | 4 ++--
ucb/source/ucp/ext/ucpext_resultset.hxx | 4 ++--
ucb/source/ucp/ftp/ftpcontent.hxx | 8 ++++----
ucb/source/ucp/gio/gio_content.hxx | 4 ++--
ucb/source/ucp/hierarchy/hierarchycontent.hxx | 12 ++++++------
ucb/source/ucp/hierarchy/hierarchydata.hxx | 4 ++--
ucb/source/ucp/hierarchy/hierarchyprovider.hxx | 4 ++--
ucb/source/ucp/inc/urihelper.hxx | 4 ++--
ucb/source/ucp/package/pkgcontent.hxx | 4 ++--
ucb/source/ucp/package/pkgprovider.hxx | 4 ++--
ucb/source/ucp/tdoc/tdoc_content.hxx | 4 ++--
ucb/source/ucp/tdoc/tdoc_provider.hxx | 8 ++++----
ucb/source/ucp/webdav-neon/ContentProperties.hxx | 4 ++--
ucb/source/ucp/webdav-neon/DAVSession.hxx | 8 ++++----
ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx | 8 ++++----
ucb/source/ucp/webdav-neon/DateTimeHelper.hxx | 4 ++--
ucb/source/ucp/webdav-neon/webdavcontent.hxx | 16 ++++++++--------
ucb/source/ucp/webdav/ContentProperties.hxx | 2 +-
ucb/source/ucp/webdav/DAVSession.hxx | 2 +-
ucb/source/ucp/webdav/DAVSessionFactory.hxx | 2 +-
ucb/source/ucp/webdav/DateTimeHelper.hxx | 2 +-
ucb/source/ucp/webdav/webdavcontent.hxx | 8 ++++----
ucb/source/ucp/webdav/webdavprovider.hxx | 2 +-
ucbhelper/source/provider/contentinfo.hxx | 2 +-
ucbhelper/source/provider/simpleioerrorrequest.hxx | 4 +---
unodevtools/source/skeletonmaker/skeletoncpp.hxx | 4 ++--
unodevtools/source/skeletonmaker/skeletonjava.hxx | 4 ++--
unoidl/source/legacyprovider.hxx | 4 ++--
unoidl/source/sourcefileprovider.hxx | 4 ++--
unoidl/source/sourceprovider-parser-requires.hxx | 4 ++--
unoidl/source/sourceprovider-parser.y | 4 ++--
unoidl/source/sourceprovider-scanner.hxx | 4 ++--
unoidl/source/sourceprovider-scanner.l | 4 ++--
unoidl/source/sourcetreeprovider.hxx | 4 ++--
unoidl/source/unoidlprovider.hxx | 4 ++--
unotools/IwyuFilter_unotools.yaml | 2 +-
unotools/inc/unotoolsservices.hxx | 2 +-
unotools/source/misc/ServiceDocumenter.hxx | 4 ++--
unoxml/inc/event.hxx | 4 ++--
unoxml/inc/mouseevent.hxx | 4 ++--
unoxml/inc/mutationevent.hxx | 4 ++--
unoxml/inc/uievent.hxx | 4 ++--
uui/source/getcontinuations.hxx | 4 ++--
uui/source/iahndl.hxx | 4 ++--
52 files changed, 117 insertions(+), 119 deletions(-)
New commits:
commit de61e14d0b6ee90cb4d170af340275d811b9fbbf
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Sun May 10 09:19:36 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun May 10 18:28:34 2020 +0200
compact namespace in ucb..uui
Change-Id: I644d5e418028b4b4e66cf67b20a1155a689acab0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93906
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/ucb/source/cacher/cachedcontentresultset.hxx
b/ucb/source/cacher/cachedcontentresultset.hxx
index d21b74d5fb61..f6a86e704aae 100644
--- a/ucb/source/cacher/cachedcontentresultset.hxx
+++ b/ucb/source/cacher/cachedcontentresultset.hxx
@@ -40,9 +40,9 @@
#define CACHED_CONTENT_RESULTSET_FACTORY_NAME
"com.sun.star.ucb.CachedContentResultSetFactory"
-namespace com { namespace sun { namespace star { namespace script {
+namespace com::sun::star::script {
class XTypeConverter;
-} } } }
+}
class CCRS_PropertySetInfo;
class CachedContentResultSet
diff --git a/ucb/source/core/FileAccess.hxx b/ucb/source/core/FileAccess.hxx
index dd5440e2a802..7b7b8a037103 100644
--- a/ucb/source/core/FileAccess.hxx
+++ b/ucb/source/core/FileAccess.hxx
@@ -26,10 +26,10 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <rtl/ustring.hxx>
-namespace com { namespace sun { namespace star {
-namespace lang { class XMultiServiceFactory; }
-namespace uno { class XInterface; }
-} } }
+namespace com::sun::star {
+ namespace lang { class XMultiServiceFactory; }
+ namespace uno { class XInterface; }
+}
#define IMPLEMENTATION_NAME "com.sun.star.comp.ucb.SimpleFileAccess"
diff --git a/ucb/source/core/providermap.hxx b/ucb/source/core/providermap.hxx
index 1a253f405f3a..f8eabca8a180 100644
--- a/ucb/source/core/providermap.hxx
+++ b/ucb/source/core/providermap.hxx
@@ -24,9 +24,9 @@
#include <com/sun/star/uno/Reference.h>
#include <regexpmap.hxx>
-namespace com { namespace sun { namespace star { namespace ucb {
+namespace com::sun::star::ucb {
class XContentProvider;
-} } } }
+}
class ProviderListEntry_Impl
diff --git a/ucb/source/core/ucb.hxx b/ucb/source/core/ucb.hxx
index 41cd606561e7..fc478cb07dc0 100644
--- a/ucb/source/core/ucb.hxx
+++ b/ucb/source/core/ucb.hxx
@@ -43,10 +43,10 @@
namespace comphelper { class OInterfaceContainerHelper2; }
-namespace com { namespace sun { namespace star { namespace ucb {
+namespace com::sun::star::ucb {
class XCommandInfo;
struct GlobalTransferCommandArgument2;
-} } } }
+}
class UniversalContentBroker :
public cppu::WeakImplHelper<
diff --git a/ucb/source/ucp/cmis/cmis_content.hxx
b/ucb/source/ucp/cmis/cmis_content.hxx
index 82f27ce3af53..61c45434e36e 100644
--- a/ucb/source/ucp/cmis/cmis_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_content.hxx
@@ -36,7 +36,7 @@
#include <list>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace beans {
struct Property;
struct PropertyValue;
@@ -44,7 +44,7 @@ namespace com { namespace sun { namespace star {
namespace sdbc {
class XRow;
}
-}}}
+}
namespace ucbhelper
{
class Content;
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.hxx
b/ucb/source/ucp/cmis/cmis_repo_content.hxx
index 241d9fb44853..67548a542570 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.hxx
@@ -25,7 +25,7 @@
#include <vector>
#include <list>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace beans {
struct Property;
struct PropertyValue;
@@ -33,7 +33,7 @@ namespace com { namespace sun { namespace star {
namespace sdbc {
class XRow;
}
-}}}
+}
namespace ucbhelper
{
class Content;
diff --git a/ucb/source/ucp/ext/ucpext_content.hxx
b/ucb/source/ucp/ext/ucpext_content.hxx
index ed0b6e93a5fd..a8f9956ead17 100644
--- a/ucb/source/ucp/ext/ucpext_content.hxx
+++ b/ucb/source/ucp/ext/ucpext_content.hxx
@@ -28,7 +28,7 @@
#include <optional>
-namespace ucb { namespace ucp { namespace ext
+namespace ucb::ucp::ext
{
@@ -129,7 +129,7 @@ namespace ucb { namespace ucp { namespace ext
};
-} } } // namespace ucb::ucp::ext
+} // namespace ucb::ucp::ext
#endif // INCLUDED_UCB_SOURCE_UCP_EXT_UCPEXT_CONTENT_HXX
diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.hxx
b/ucb/source/ucp/ext/ucpext_datasupplier.hxx
index c4c26172254a..28c6691d5f3f 100644
--- a/ucb/source/ucp/ext/ucpext_datasupplier.hxx
+++ b/ucb/source/ucp/ext/ucpext_datasupplier.hxx
@@ -26,7 +26,7 @@
#include <memory>
-namespace ucb { namespace ucp { namespace ext
+namespace ucb::ucp::ext
{
@@ -71,7 +71,7 @@ namespace ucb { namespace ucp { namespace ext
};
-} } } // namespace ucp::ext
+} // namespace ucp::ext
#endif // INCLUDED_UCB_SOURCE_UCP_EXT_UCPEXT_DATASUPPLIER_HXX
diff --git a/ucb/source/ucp/ext/ucpext_provider.hxx
b/ucb/source/ucp/ext/ucpext_provider.hxx
index 77f98f8f48b7..1f64e3733826 100644
--- a/ucb/source/ucp/ext/ucpext_provider.hxx
+++ b/ucb/source/ucp/ext/ucpext_provider.hxx
@@ -23,7 +23,7 @@
#include <ucbhelper/providerhelper.hxx>
-namespace ucb { namespace ucp { namespace ext
+namespace ucb::ucp::ext
{
@@ -56,7 +56,7 @@ namespace ucb { namespace ucp { namespace ext
};
-} } } // namespace ucb::ucp::ext
+} // namespace ucb::ucp::ext
#endif // INCLUDED_UCB_SOURCE_UCP_EXT_UCPEXT_PROVIDER_HXX
diff --git a/ucb/source/ucp/ext/ucpext_resultset.hxx
b/ucb/source/ucp/ext/ucpext_resultset.hxx
index 6fc963b4c31c..73817183642f 100644
--- a/ucb/source/ucp/ext/ucpext_resultset.hxx
+++ b/ucb/source/ucp/ext/ucpext_resultset.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
-namespace ucb { namespace ucp { namespace ext
+namespace ucb::ucp::ext
{
@@ -54,7 +54,7 @@ namespace ucb { namespace ucp { namespace ext
};
-} } } // namespace ucp::ext
+} // namespace ucp::ext
#endif // INCLUDED_UCB_SOURCE_UCP_EXT_UCPEXT_RESULTSET_HXX
diff --git a/ucb/source/ucp/ftp/ftpcontent.hxx
b/ucb/source/ucp/ftp/ftpcontent.hxx
index a44b73ffc392..90642fd7f88b 100644
--- a/ucb/source/ucp/ftp/ftpcontent.hxx
+++ b/ucb/source/ucp/ftp/ftpcontent.hxx
@@ -25,14 +25,14 @@
#include <com/sun/star/ucb/XContentCreator.hpp>
#include "ftpurl.hxx"
-namespace com { namespace sun { namespace star { namespace beans {
+namespace com::sun::star::beans {
struct Property;
struct PropertyValue;
-} } } }
+}
-namespace com { namespace sun { namespace star { namespace sdbc {
+namespace com::sun::star::sdbc {
class XRow;
-} } } }
+}
namespace ftp
diff --git a/ucb/source/ucp/gio/gio_content.hxx
b/ucb/source/ucp/gio/gio_content.hxx
index 7a41c7bca03d..d912ddac242d 100644
--- a/ucb/source/ucp/gio/gio_content.hxx
+++ b/ucb/source/ucp/gio/gio_content.hxx
@@ -31,7 +31,7 @@
#include <vector>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace beans {
struct Property;
struct PropertyValue;
@@ -39,7 +39,7 @@ namespace com { namespace sun { namespace star {
namespace sdbc {
class XRow;
}
-}}}
+}
namespace ucbhelper
{
class Content;
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.hxx
b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
index cff4a2832345..3e17ac35e643 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
@@ -27,18 +27,18 @@
#include "hierarchydata.hxx"
#include "hierarchyprovider.hxx"
-namespace com { namespace sun { namespace star { namespace beans {
+namespace com::sun::star::beans {
struct Property;
struct PropertyValue;
-} } } }
+}
-namespace com { namespace sun { namespace star { namespace sdbc {
+namespace com::sun::star::sdbc {
class XRow;
-} } } }
+}
-namespace com { namespace sun { namespace star { namespace ucb {
+namespace com::sun::star::ucb {
struct TransferInfo;
-} } } }
+}
namespace hierarchy_ucp
{
diff --git a/ucb/source/ucp/hierarchy/hierarchydata.hxx
b/ucb/source/ucp/hierarchy/hierarchydata.hxx
index 324d016ad352..8810964b39c0 100644
--- a/ucb/source/ucp/hierarchy/hierarchydata.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydata.hxx
@@ -26,14 +26,14 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <memory>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace container {
class XHierarchicalNameAccess;
}
namespace util {
class XOfficeInstallationDirectories;
}
-} } }
+}
namespace hierarchy_ucp
{
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
index debf126fcaaf..1bc72e034dc0 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
@@ -26,14 +26,14 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <unordered_map>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace container {
class XHierarchicalNameAccess;
}
namespace util {
class XOfficeInstallationDirectories;
}
-} } }
+}
namespace hierarchy_ucp {
diff --git a/ucb/source/ucp/inc/urihelper.hxx b/ucb/source/ucp/inc/urihelper.hxx
index 19d459181b2f..62a3a39635e6 100644
--- a/ucb/source/ucp/inc/urihelper.hxx
+++ b/ucb/source/ucp/inc/urihelper.hxx
@@ -25,7 +25,7 @@
#include <rtl/uri.hxx>
-namespace ucb_impl { namespace urihelper {
+namespace ucb_impl::urihelper {
inline OUString encodeSegment( const OUString & rSegment )
{
@@ -109,7 +109,7 @@ namespace ucb_impl { namespace urihelper {
return aResult.makeStringAndClear();
}
-} } // namespace
+} // namespace
#endif // INCLUDED_UCB_SOURCE_UCP_INC_URIHELPER_HXX
diff --git a/ucb/source/ucp/package/pkgcontent.hxx
b/ucb/source/ucp/package/pkgcontent.hxx
index c4d89c627f82..c17973775642 100644
--- a/ucb/source/ucp/package/pkgcontent.hxx
+++ b/ucb/source/ucp/package/pkgcontent.hxx
@@ -27,7 +27,7 @@
#include <ucbhelper/contenthelper.hxx>
#include "pkguri.hxx"
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace beans
{
struct Property;
@@ -51,7 +51,7 @@ namespace com { namespace sun { namespace star {
struct OpenCommandArgument2;
struct TransferInfo;
}
-} } }
+}
namespace package_ucp
{
diff --git a/ucb/source/ucp/package/pkgprovider.hxx
b/ucb/source/ucp/package/pkgprovider.hxx
index 072f33783614..327000b890e0 100644
--- a/ucb/source/ucp/package/pkgprovider.hxx
+++ b/ucb/source/ucp/package/pkgprovider.hxx
@@ -26,9 +26,9 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include "pkguri.hxx"
-namespace com { namespace sun { namespace star { namespace container {
+namespace com::sun::star::container {
class XHierarchicalNameAccess;
-} } } }
+}
namespace package_ucp {
diff --git a/ucb/source/ucp/tdoc/tdoc_content.hxx
b/ucb/source/ucp/tdoc/tdoc_content.hxx
index 6d3a484462a2..c8cf050f655c 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.hxx
@@ -24,13 +24,13 @@
#include <com/sun/star/ucb/XContentCreator.hpp>
#include "tdoc_provider.hxx"
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace sdbc { class XRow; }
namespace io { class XInputStream; class XOutputStream; }
namespace beans { struct PropertyValue; }
namespace ucb { struct OpenCommandArgument2; struct TransferInfo;
struct ContentInfo; }
-} } }
+}
namespace tdoc_ucp
{
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.hxx
b/ucb/source/ucp/tdoc/tdoc_provider.hxx
index 617156b14318..c1498cd488f3 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.hxx
@@ -30,13 +30,13 @@
#include "tdoc_docmgr.hxx"
#include "tdoc_storage.hxx"
-namespace com { namespace sun { namespace star { namespace embed {
+namespace com::sun::star::embed {
class XStorage;
-} } } }
+}
-namespace com { namespace sun { namespace star { namespace frame {
+namespace com::sun::star::frame {
class XModel;
-} } } }
+}
namespace tdoc_ucp {
diff --git a/ucb/source/ucp/webdav-neon/ContentProperties.hxx
b/ucb/source/ucp/webdav-neon/ContentProperties.hxx
index 163e4dcd51cd..8f11e8726286 100644
--- a/ucb/source/ucp/webdav-neon/ContentProperties.hxx
+++ b/ucb/source/ucp/webdav-neon/ContentProperties.hxx
@@ -37,9 +37,9 @@
#include <com/sun/star/uno/Sequence.hxx>
#include "DAVResource.hxx"
-namespace com { namespace sun { namespace star { namespace beans {
+namespace com::sun::star::beans {
struct Property;
-} } } }
+}
namespace webdav_ucp
{
diff --git a/ucb/source/ucp/webdav-neon/DAVSession.hxx
b/ucb/source/ucp/webdav-neon/DAVSession.hxx
index 52891f342fed..72eaf39bdbf0 100644
--- a/ucb/source/ucp/webdav-neon/DAVSession.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVSession.hxx
@@ -40,13 +40,13 @@
#include "DAVTypes.hxx"
#include "DAVRequestEnvironment.hxx"
-namespace com { namespace sun { namespace star { namespace beans {
+namespace com::sun::star::beans {
struct NamedValue;
-} } } }
+}
-namespace com { namespace sun { namespace star { namespace ucb {
+namespace com::sun::star::ucb {
struct Lock;
-} } } }
+}
namespace webdav_ucp
{
diff --git a/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx
b/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx
index bf5827e45836..d74e05aebbc1 100644
--- a/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx
@@ -42,13 +42,13 @@
using namespace com::sun::star;
-namespace com { namespace sun { namespace star { namespace beans {
+namespace com::sun::star::beans {
struct NamedValue;
-} } } }
+}
-namespace com { namespace sun { namespace star { namespace lang {
+namespace com::sun::star::lang {
class XMultiServiceFactory;
-} } } }
+}
namespace webdav_ucp
{
diff --git a/ucb/source/ucp/webdav-neon/DateTimeHelper.hxx
b/ucb/source/ucp/webdav-neon/DateTimeHelper.hxx
index 26635b894413..5abf6d400668 100644
--- a/ucb/source/ucp/webdav-neon/DateTimeHelper.hxx
+++ b/ucb/source/ucp/webdav-neon/DateTimeHelper.hxx
@@ -33,9 +33,9 @@
#include <sal/types.h>
#include <rtl/ustring.hxx>
-namespace com { namespace sun { namespace star { namespace util {
+namespace com::sun::star::util {
struct DateTime;
-} } } }
+}
namespace webdav_ucp
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.hxx
b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
index 1a2c4503036d..4a976a26b94c 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
@@ -39,25 +39,25 @@
#include "DAVResourceAccess.hxx"
#include "PropertyMap.hxx"
-namespace com { namespace sun { namespace star { namespace beans {
+namespace com::sun::star::beans {
struct Property;
struct PropertyValue;
-} } } }
+}
-namespace com { namespace sun { namespace star { namespace io {
+namespace com::sun::star::io {
class XInputStream;
-} } } }
+}
-namespace com { namespace sun { namespace star { namespace sdbc {
+namespace com::sun::star::sdbc {
class XRow;
-} } } }
+}
-namespace com { namespace sun { namespace star { namespace ucb {
+namespace com::sun::star::ucb {
struct OpenCommandArgument3;
struct PostCommandArgument2;
struct PropertyCommandArgument;
struct TransferInfo;
-} } } }
+}
namespace webdav_ucp
{
diff --git a/ucb/source/ucp/webdav/ContentProperties.hxx
b/ucb/source/ucp/webdav/ContentProperties.hxx
index 64fbb0584ca8..bb5a41eea85e 100644
--- a/ucb/source/ucp/webdav/ContentProperties.hxx
+++ b/ucb/source/ucp/webdav/ContentProperties.hxx
@@ -29,7 +29,7 @@
#include <com/sun/star/uno/Sequence.hxx>
#include "DAVResource.hxx"
-namespace com { namespace sun { namespace star { namespace beans {
+namespace com::sun::star::beans {
struct Property;
} } } }
diff --git a/ucb/source/ucp/webdav/DAVSession.hxx
b/ucb/source/ucp/webdav/DAVSession.hxx
index d2b65cc82577..3d77ec5d5ac2 100644
--- a/ucb/source/ucp/webdav/DAVSession.hxx
+++ b/ucb/source/ucp/webdav/DAVSession.hxx
@@ -30,7 +30,7 @@
#include "DAVTypes.hxx"
#include "DAVRequestEnvironment.hxx"
-namespace com { namespace sun { namespace star { namespace ucb {
+namespace com::sun::star::ucb {
struct Lock;
} } } }
diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.hxx
b/ucb/source/ucp/webdav/DAVSessionFactory.hxx
index 17a21bbfcc71..62d9cd7e13ea 100644
--- a/ucb/source/ucp/webdav/DAVSessionFactory.hxx
+++ b/ucb/source/ucp/webdav/DAVSessionFactory.hxx
@@ -34,7 +34,7 @@
using namespace com::sun::star;
-namespace com { namespace sun { namespace star { namespace lang {
+namespace com::sun::star::lang {
class XMultiServiceFactory;
} } } }
diff --git a/ucb/source/ucp/webdav/DateTimeHelper.hxx
b/ucb/source/ucp/webdav/DateTimeHelper.hxx
index a56d8fbc1a1a..d5c0d451b980 100644
--- a/ucb/source/ucp/webdav/DateTimeHelper.hxx
+++ b/ucb/source/ucp/webdav/DateTimeHelper.hxx
@@ -24,7 +24,7 @@
#include <sal/types.h>
#include <rtl/ustring.hxx>
-namespace com { namespace sun { namespace star { namespace util {
+namespace com::sun::star::util {
struct DateTime;
} } } }
diff --git a/ucb/source/ucp/webdav/webdavcontent.hxx
b/ucb/source/ucp/webdav/webdavcontent.hxx
index fbd8e6300f4b..814b338a741d 100644
--- a/ucb/source/ucp/webdav/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav/webdavcontent.hxx
@@ -30,20 +30,20 @@
#include "DAVResourceAccess.hxx"
#include "PropertyMap.hxx"
-namespace com { namespace sun { namespace star { namespace beans {
+namespace com::sun::star::beans {
struct Property;
struct PropertyValue;
} } } }
-namespace com { namespace sun { namespace star { namespace io {
+namespace com::sun::star::io {
class XInputStream;
} } } }
-namespace com { namespace sun { namespace star { namespace sdbc {
+namespace com::sun::star::sdbc {
class XRow;
} } } }
-namespace com { namespace sun { namespace star { namespace ucb {
+namespace com::sun::star::ucb {
struct OpenCommandArgument2;
struct PropertyCommandArgument;
struct PostCommandArgument2;
diff --git a/ucb/source/ucp/webdav/webdavprovider.hxx
b/ucb/source/ucp/webdav/webdavprovider.hxx
index b9a56f15c97c..322f530a1682 100644
--- a/ucb/source/ucp/webdav/webdavprovider.hxx
+++ b/ucb/source/ucp/webdav/webdavprovider.hxx
@@ -31,7 +31,7 @@
#include <ucbhelper/providerhelper.hxx>
#include "PropertyMap.hxx"
-namespace com { namespace sun { namespace star { namespace lang {
+namespace com::sun::star::lang {
class XSingleServiceFactory;
} } } }
diff --git a/ucbhelper/source/provider/contentinfo.hxx
b/ucbhelper/source/provider/contentinfo.hxx
index 3472ed49922c..01d10e07545f 100644
--- a/ucbhelper/source/provider/contentinfo.hxx
+++ b/ucbhelper/source/provider/contentinfo.hxx
@@ -28,7 +28,7 @@
#include <osl/mutex.hxx>
-namespace com { namespace sun { namespace star { namespace ucb { class
XCommandEnvironment; } } } }
+namespace com::sun::star::ucb { class XCommandEnvironment; }
namespace ucbhelper {
diff --git a/ucbhelper/source/provider/simpleioerrorrequest.hxx
b/ucbhelper/source/provider/simpleioerrorrequest.hxx
index 3a5225ac6a82..134f10a9aa5e 100644
--- a/ucbhelper/source/provider/simpleioerrorrequest.hxx
+++ b/ucbhelper/source/provider/simpleioerrorrequest.hxx
@@ -23,9 +23,7 @@
#include <com/sun/star/ucb/IOErrorCode.hpp>
#include <ucbhelper/interactionrequest.hxx>
-namespace com { namespace sun { namespace star { namespace ucb {
- class XCommandProcessor;
-} } } }
+namespace com::sun::star::ucb { class XCommandProcessor; }
namespace ucbhelper {
diff --git a/unodevtools/source/skeletonmaker/skeletoncpp.hxx
b/unodevtools/source/skeletonmaker/skeletoncpp.hxx
index 1c715faa669b..569280c5daa3 100644
--- a/unodevtools/source/skeletonmaker/skeletoncpp.hxx
+++ b/unodevtools/source/skeletonmaker/skeletoncpp.hxx
@@ -24,7 +24,7 @@
#include <codemaker/generatedtypeset.hxx>
#include "skeletoncommon.hxx"
-namespace skeletonmaker { namespace cpp {
+namespace skeletonmaker::cpp {
// referenceType
// 0 = no reference
@@ -89,7 +89,7 @@ void generateXDispatchProvider(std::ostream& o,
const OString & classname,
const ProtocolCmdMap & protocolCmdMap);
-} }
+}
#endif // INCLUDED_UNODEVTOOLS_SOURCE_SKELETONMAKER_SKELETONCPP_HXX
diff --git a/unodevtools/source/skeletonmaker/skeletonjava.hxx
b/unodevtools/source/skeletonmaker/skeletonjava.hxx
index 032be4748905..bc31b5dced70 100644
--- a/unodevtools/source/skeletonmaker/skeletonjava.hxx
+++ b/unodevtools/source/skeletonmaker/skeletonjava.hxx
@@ -24,7 +24,7 @@
#include <codemaker/generatedtypeset.hxx>
#include "skeletoncommon.hxx"
-namespace skeletonmaker { namespace java {
+namespace skeletonmaker::java {
void printType(
std::ostream & o, ProgramOptions const & options,
@@ -52,7 +52,7 @@ void generateXPropertySetBodies(std::ostream& o);
void generateXFastPropertySetBodies(std::ostream& o);
void generateXPropertyAccessBodies(std::ostream& o);
-} }
+}
#endif // INCLUDED_UNODEVTOOLS_SOURCE_SKELETONMAKER_SKELETONJAVA_HXX
diff --git a/unoidl/source/legacyprovider.hxx b/unoidl/source/legacyprovider.hxx
index 4ef2712064db..ffee1affb7d0 100644
--- a/unoidl/source/legacyprovider.hxx
+++ b/unoidl/source/legacyprovider.hxx
@@ -16,7 +16,7 @@
#include <rtl/ref.hxx>
#include <unoidl/unoidl.hxx>
-namespace unoidl { namespace detail {
+namespace unoidl::detail {
class LegacyProvider: public Provider {
public:
@@ -37,7 +37,7 @@ private:
mutable RegistryKey ucr_;
};
-} }
+}
#endif
diff --git a/unoidl/source/sourcefileprovider.hxx
b/unoidl/source/sourcefileprovider.hxx
index 3bef3e438fb5..bb3403b2d0d9 100644
--- a/unoidl/source/sourcefileprovider.hxx
+++ b/unoidl/source/sourcefileprovider.hxx
@@ -17,7 +17,7 @@
#include <rtl/ref.hxx>
#include <unoidl/unoidl.hxx>
-namespace unoidl { namespace detail {
+namespace unoidl::detail {
class SourceFileProvider: public Provider {
public:
@@ -37,7 +37,7 @@ private:
std::map< OUString, rtl::Reference<Entity> > rootMap_;
};
-} }
+}
#endif
diff --git a/unoidl/source/sourceprovider-parser-requires.hxx
b/unoidl/source/sourceprovider-parser-requires.hxx
index 74b04d450d2b..8bfb10a823c5 100644
--- a/unoidl/source/sourceprovider-parser-requires.hxx
+++ b/unoidl/source/sourceprovider-parser-requires.hxx
@@ -21,7 +21,7 @@
typedef void * yyscan_t;
-namespace unoidl { namespace detail {
+namespace unoidl::detail {
struct SourceProviderEntity;
@@ -133,7 +133,7 @@ struct SourceProviderType {
OUString typedefName;
};
-} }
+}
#endif
diff --git a/unoidl/source/sourceprovider-parser.y
b/unoidl/source/sourceprovider-parser.y
index d7111d0e3cfa..569f9022b953 100644
--- a/unoidl/source/sourceprovider-parser.y
+++ b/unoidl/source/sourceprovider-parser.y
@@ -3980,7 +3980,7 @@ deprecated_opt:
%%
-namespace unoidl { namespace detail {
+namespace unoidl::detail {
OUString SourceProviderType::getName() const {
if (!typedefName.isEmpty()) {
@@ -4473,6 +4473,6 @@ bool parse(OUString const & uri,
SourceProviderScannerData * data) {
return true;
}
-} }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unoidl/source/sourceprovider-scanner.hxx
b/unoidl/source/sourceprovider-scanner.hxx
index 9aca9a4046d3..282c0a18430c 100644
--- a/unoidl/source/sourceprovider-scanner.hxx
+++ b/unoidl/source/sourceprovider-scanner.hxx
@@ -26,7 +26,7 @@
#include "sourceprovider-parser-requires.hxx"
#include <sourceprovider-parser.hxx>
-namespace unoidl { namespace detail {
+namespace unoidl::detail {
struct SourceProviderScannerData;
@@ -313,7 +313,7 @@ struct SourceProviderScannerData {
bool parse(OUString const & uri, SourceProviderScannerData * data);
-} }
+}
int yylex_init_extra(
unoidl::detail::SourceProviderScannerData * user_defined,
diff --git a/unoidl/source/sourceprovider-scanner.l
b/unoidl/source/sourceprovider-scanner.l
index 27a510000dd9..847138b56dd0 100644
--- a/unoidl/source/sourceprovider-scanner.l
+++ b/unoidl/source/sourceprovider-scanner.l
@@ -43,7 +43,7 @@
#include <sourceprovider-parser.hxx>
#include "sourceprovider-scanner.hxx"
-namespace unoidl { namespace detail {
+namespace unoidl::detail {
static std::size_t sourceProviderScannerInput(
SourceProviderScannerData * data, char * buffer, std::size_t size)
@@ -59,7 +59,7 @@ static std::size_t sourceProviderScannerInput(
return size;
}
-} }
+}
#define YY_INPUT(buf, result, max_size) ((result) = \
::unoidl::detail::sourceProviderScannerInput(yyextra, (buf), (max_size)))
diff --git a/unoidl/source/sourcetreeprovider.hxx
b/unoidl/source/sourcetreeprovider.hxx
index d12fc9cef7e5..ece737f5256e 100644
--- a/unoidl/source/sourcetreeprovider.hxx
+++ b/unoidl/source/sourcetreeprovider.hxx
@@ -17,7 +17,7 @@
#include <rtl/ref.hxx>
#include <unoidl/unoidl.hxx>
-namespace unoidl { namespace detail {
+namespace unoidl::detail {
class SourceTreeProvider: public Provider {
public:
@@ -38,7 +38,7 @@ private:
mutable std::map< OUString, rtl::Reference<Entity> > cache_; //TODO: at
manager
};
-} }
+}
#endif
diff --git a/unoidl/source/unoidlprovider.hxx b/unoidl/source/unoidlprovider.hxx
index 0013af54284f..1e80d7e44b6b 100644
--- a/unoidl/source/unoidlprovider.hxx
+++ b/unoidl/source/unoidlprovider.hxx
@@ -17,7 +17,7 @@
#include <sal/types.h>
#include <unoidl/unoidl.hxx>
-namespace unoidl { namespace detail {
+namespace unoidl::detail {
class MappedFile;
struct MapEntry;
@@ -51,6 +51,6 @@ private:
NestedMap map_;
};
-} }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/IwyuFilter_unotools.yaml
b/unotools/IwyuFilter_unotools.yaml
index 52d7e7da280d..74d2033fad7e 100644
--- a/unotools/IwyuFilter_unotools.yaml
+++ b/unotools/IwyuFilter_unotools.yaml
@@ -3,7 +3,7 @@ assumeFilename: unotools/source/i18n/resmgr.cxx
blacklist:
unotools/inc/unotoolsservices.hxx:
# Needed for extern declaration
- - namespace comphelper { namespace service_decl { class ServiceDecl; } }
+ - namespace comphelper::service_decl { class ServiceDecl; } }
unotools/source/config/itemholder1.hxx:
# Base class needs complete type
- com/sun/star/lang/XEventListener.hpp
diff --git a/unotools/inc/unotoolsservices.hxx
b/unotools/inc/unotoolsservices.hxx
index 59d760a48246..8a99f09e99ac 100644
--- a/unotools/inc/unotoolsservices.hxx
+++ b/unotools/inc/unotoolsservices.hxx
@@ -12,7 +12,7 @@
#include <sal/config.h>
-namespace comphelper { namespace service_decl { class ServiceDecl; } }
+namespace comphelper::service_decl { class ServiceDecl; }
extern comphelper::service_decl::ServiceDecl const OTempFileServiceDecl;
extern comphelper::service_decl::ServiceDecl const ServiceDocumenterDecl;
diff --git a/unotools/source/misc/ServiceDocumenter.hxx
b/unotools/source/misc/ServiceDocumenter.hxx
index 874e3313c5c6..cad333ddb59a 100644
--- a/unotools/source/misc/ServiceDocumenter.hxx
+++ b/unotools/source/misc/ServiceDocumenter.hxx
@@ -14,7 +14,7 @@
namespace com::sun::star::uno { class XComponentContext; }
-namespace unotools { namespace misc {
+namespace unotools::misc {
class ServiceDocumenter : public ::cppu::WeakImplHelper<
css::script::XServiceDocumenter>
@@ -46,6 +46,6 @@ class ServiceDocumenter : public ::cppu::WeakImplHelper<
OUString m_sServiceBaseUrl;
};
-}}
+}
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unoxml/inc/event.hxx b/unoxml/inc/event.hxx
index d024ea9ce5b9..f44bb35f9b3b 100644
--- a/unoxml/inc/event.hxx
+++ b/unoxml/inc/event.hxx
@@ -29,7 +29,7 @@
#include <cppuhelper/implbase.hxx>
-namespace DOM {namespace events
+namespace DOM::events
{
class CEvent : public cppu::WeakImplHelper< css::xml::dom::events::XEvent >
{
@@ -65,7 +65,7 @@ public:
sal_Bool canBubbleArg,
sal_Bool cancelableArg) override;
};
-}}
+}
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unoxml/inc/mouseevent.hxx b/unoxml/inc/mouseevent.hxx
index abbf1ff2c82e..d88b1208e971 100644
--- a/unoxml/inc/mouseevent.hxx
+++ b/unoxml/inc/mouseevent.hxx
@@ -27,7 +27,7 @@
#include "uievent.hxx"
-namespace DOM { namespace events {
+namespace DOM::events {
typedef ::cppu::ImplInheritanceHelper< CUIEvent,
css::xml::dom::events::XMouseEvent >
CMouseEvent_Base;
@@ -98,7 +98,7 @@ public:
sal_Bool canBubbleArg,
sal_Bool cancelableArg) override;
};
-}}
+}
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unoxml/inc/mutationevent.hxx b/unoxml/inc/mutationevent.hxx
index 68145b270b3e..e06a3678ad87 100644
--- a/unoxml/inc/mutationevent.hxx
+++ b/unoxml/inc/mutationevent.hxx
@@ -32,7 +32,7 @@
#include "event.hxx"
-namespace DOM { namespace events {
+namespace DOM::events {
typedef ::cppu::ImplInheritanceHelper< CEvent,
css::xml::dom::events::XMutationEvent >
CMutationEvent_Base;
@@ -81,7 +81,7 @@ public:
sal_Bool canBubbleArg,
sal_Bool cancelableArg) override;
};
-}}
+}
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unoxml/inc/uievent.hxx b/unoxml/inc/uievent.hxx
index fc599a2e5428..4f449cd3dfaf 100644
--- a/unoxml/inc/uievent.hxx
+++ b/unoxml/inc/uievent.hxx
@@ -30,7 +30,7 @@
#include "event.hxx"
-namespace DOM { namespace events {
+namespace DOM::events {
typedef ::cppu::ImplInheritanceHelper< CEvent, css::xml::dom::events::XUIEvent
> CUIEvent_Base;
@@ -66,7 +66,7 @@ public:
sal_Bool canBubbleArg,
sal_Bool cancelableArg) override;
};
-}}
+}
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/getcontinuations.hxx b/uui/source/getcontinuations.hxx
index 03dc049f45d1..6ea1f55fa067 100644
--- a/uui/source/getcontinuations.hxx
+++ b/uui/source/getcontinuations.hxx
@@ -23,11 +23,11 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace task {
class XInteractionContinuation;
}
-} } }
+}
template< class t1 >
bool setContinuation(
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index 95f9d4ea06ce..872bc13ac469 100644
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -34,7 +34,7 @@
#include <unordered_map>
#include <vector>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace awt {
class XWindow;
}
@@ -55,7 +55,7 @@ namespace com { namespace sun { namespace star {
namespace ucb {
class NameClashResolveRequest;
}
-} } }
+}
namespace vcl { class Window; }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
