use more compact namespace syntax in /include

excluding the UDK headers of course

Change-Id: Iac7ab83d60265f7d362c860776f1de9d5e444ec0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93268
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

27 files changed, 66 insertions, 96 deletions

diff --git a/include/unotools/ZipPackageHelper.hxx b/include/unotools/ZipPackageHelper.hxx
index 34e256176683..f647fed4083a 100644
--- a/include/unotools/ZipPackageHelper.hxx
+++ b/include/unotools/ZipPackageHelper.hxx
@@ -24,9 +24,9 @@
 
 #include <com/sun/star/uno/XInterface.hpp>
 
-namespace com { namespace sun { namespace star { namespace container { class XHierarchicalNameAccess; } } } }
-namespace com { namespace sun { namespace star { namespace lang { class XSingleServiceFactory; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::container { class XHierarchicalNameAccess; }
+namespace com::sun::star::lang { class XSingleServiceFactory; }
+namespace com::sun::star::uno { class XComponentContext; }
 
 namespace utl {
 
diff --git a/include/unotools/calendarwrapper.hxx b/include/unotools/calendarwrapper.hxx
index a81186ae4ba5..aa0bb345c95b 100644
--- a/include/unotools/calendarwrapper.hxx
+++ b/include/unotools/calendarwrapper.hxx
@@ -26,19 +26,9 @@
 #include <com/sun/star/i18n/Calendar2.hpp>
 #include <unotools/unotoolsdllapi.h>
 
-namespace com { namespace sun { namespace star {
-    namespace uno {
-        class XComponentContext;
-    }
-}}}
-
-namespace com { namespace sun { namespace star {
-    namespace i18n {
-        class XCalendar4;
-    }
-}}}
-
-namespace com { namespace sun { namespace star { namespace lang { struct Locale; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::i18n { class XCalendar4; }
+namespace com::sun::star::lang { struct Locale; }
 
 class UNOTOOLS_DLLPUBLIC CalendarWrapper
 {
diff --git a/include/unotools/charclass.hxx b/include/unotools/charclass.hxx
index a916f93eb92b..61a850da9570 100644
--- a/include/unotools/charclass.hxx
+++ b/include/unotools/charclass.hxx
@@ -29,13 +29,8 @@
 #include <osl/mutex.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 
-namespace com { namespace sun { namespace star {
-    namespace uno {
-        class XComponentContext;
-    }
-}}}
-
-namespace com { namespace sun { namespace star { namespace i18n { class XCharacterClassification; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::i18n { class XCharacterClassification; }
 
 const sal_Int32 nCharClassAlphaType =
     css::i18n::KCharacterType::UPPER |
diff --git a/include/unotools/closeveto.hxx b/include/unotools/closeveto.hxx
index b8f6ad00d699..bcc56766fb1d 100644
--- a/include/unotools/closeveto.hxx
+++ b/include/unotools/closeveto.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } }
+namespace com::sun::star::uno { class XInterface; }
 
 namespace utl
 {
diff --git a/include/unotools/cmdoptions.hxx b/include/unotools/cmdoptions.hxx
index b28c20638fc7..25bae43604fc 100644
--- a/include/unotools/cmdoptions.hxx
+++ b/include/unotools/cmdoptions.hxx
@@ -25,9 +25,9 @@
 #include <unotools/options.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+namespace com::sun::star::uno { template <typename > class Reference; }
 
-namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } }
+namespace com::sun::star::frame { class XFrame; }
 namespace osl { class Mutex; }
 
 /*-************************************************************************************************************
diff --git a/include/unotools/collatorwrapper.hxx b/include/unotools/collatorwrapper.hxx
index 12be0f6e94d2..595d9ccf4f41 100644
--- a/include/unotools/collatorwrapper.hxx
+++ b/include/unotools/collatorwrapper.hxx
@@ -24,12 +24,12 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
         class XComponentContext;
-}}}}
+}
 
-namespace com { namespace sun { namespace star { namespace i18n { class XCollator; } } } }
-namespace com { namespace sun { namespace star { namespace lang { struct Locale; } } } }
+namespace com::sun::star::i18n { class XCollator; }
+namespace com::sun::star::lang { struct Locale; }
 
 class UNOTOOLS_DLLPUBLIC CollatorWrapper
 {
diff --git a/include/unotools/compatibility.hxx b/include/unotools/compatibility.hxx
index 24f2da53e590..feae53faec8c 100644
--- a/include/unotools/compatibility.hxx
+++ b/include/unotools/compatibility.hxx
@@ -26,7 +26,7 @@
 #include <rtl/ustring.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+namespace com::sun::star::beans { struct PropertyValue; }
 namespace osl { class Mutex; }
 
 /*-************************************************************************************************************
diff --git a/include/unotools/configitem.hxx b/include/unotools/configitem.hxx
index 0c24857aef7b..e14aaf0f2418 100644
--- a/include/unotools/configitem.hxx
+++ b/include/unotools/configitem.hxx
@@ -28,7 +28,7 @@
 #include <unotools/options.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
-namespace com{ namespace sun{ namespace star{
+namespace com::sun::star {
     namespace uno{
         class Any;
     }
@@ -41,7 +41,7 @@ namespace com{ namespace sun{ namespace star{
     namespace util{
         class XChangesListener;
     }
-}}}
+}
 
 enum class ConfigItemMode
 {
diff --git a/include/unotools/configmgr.hxx b/include/unotools/configmgr.hxx
index e79629834db4..a4d46cb8e19e 100644
--- a/include/unotools/configmgr.hxx
+++ b/include/unotools/configmgr.hxx
@@ -28,9 +28,9 @@
 #include <sal/types.h>
 #include <unotools/unotoolsdllapi.h>
 
-namespace com { namespace sun { namespace star {
-    namespace container{ class XHierarchicalNameAccess; }
-} } }
+namespace com::sun::star::container {
+    class XHierarchicalNameAccess;
+}
 namespace utl { class ConfigItem; }
 
 namespace utl {
diff --git a/include/unotools/confignode.hxx b/include/unotools/confignode.hxx
index 9e3d57ee8b9a..ae967660e4cb 100644
--- a/include/unotools/confignode.hxx
+++ b/include/unotools/confignode.hxx
@@ -22,13 +22,13 @@
 #include <unotools/unotoolsdllapi.h>
 #include <unotools/eventlisteneradapter.hxx>
 
-namespace com { namespace sun { namespace star { namespace container { class XHierarchicalNameAccess; } } } }
-namespace com { namespace sun { namespace star { namespace container { class XNameAccess; } } } }
-namespace com { namespace sun { namespace star { namespace container { class XNameContainer; } } } }
-namespace com { namespace sun { namespace star { namespace container { class XNameReplace; } } } }
-namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
-namespace com { namespace sun { namespace star { namespace util { class XChangesBatch; } } } }
+namespace com::sun::star::container { class XHierarchicalNameAccess; }
+namespace com::sun::star::container { class XNameAccess; }
+namespace com::sun::star::container { class XNameContainer; }
+namespace com::sun::star::container { class XNameReplace; }
+namespace com::sun::star::lang { class XMultiServiceFactory; }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::util { class XChangesBatch; }
 
 namespace utl
 {
diff --git a/include/unotools/configvaluecontainer.hxx b/include/unotools/configvaluecontainer.hxx
index 708f6acc9292..c4447fca28f4 100644
--- a/include/unotools/configvaluecontainer.hxx
+++ b/include/unotools/configvaluecontainer.hxx
@@ -25,8 +25,8 @@
 #include <memory>
 
 
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::uno { template <typename > class Reference; }
+namespace com::sun::star::uno { class XComponentContext; }
 namespace osl { class Mutex; }
 
 namespace utl
diff --git a/include/unotools/datetime.hxx b/include/unotools/datetime.hxx
index c83da27040aa..0871edb31162 100644
--- a/include/unotools/datetime.hxx
+++ b/include/unotools/datetime.hxx
@@ -25,9 +25,9 @@
 #include <unotools/unotoolsdllapi.h>
 #include <rtl/ustring.hxx>
 
-namespace com { namespace sun { namespace star { namespace util { struct Date; } } } }
-namespace com { namespace sun { namespace star { namespace util { struct DateTime; } } } }
-namespace com { namespace sun { namespace star { namespace util { struct Time; } } } }
+namespace com::sun::star::util { struct Date; }
+namespace com::sun::star::util { struct DateTime; }
+namespace com::sun::star::util { struct Time; }
 
 class Date;
 class DateTime;
diff --git a/include/unotools/dynamicmenuoptions.hxx b/include/unotools/dynamicmenuoptions.hxx
index b9a1bac2911c..a2bb84e0acd8 100644
--- a/include/unotools/dynamicmenuoptions.hxx
+++ b/include/unotools/dynamicmenuoptions.hxx
@@ -25,7 +25,7 @@
 #include <unotools/options.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+namespace com::sun::star::beans { struct PropertyValue; }
 namespace osl { class Mutex; }
 
 /*-************************************************************************************************************
diff --git a/include/unotools/eventlisteneradapter.hxx b/include/unotools/eventlisteneradapter.hxx
index b3eeb4d5a052..92fbe212c586 100644
--- a/include/unotools/eventlisteneradapter.hxx
+++ b/include/unotools/eventlisteneradapter.hxx
@@ -24,8 +24,8 @@
 #include <com/sun/star/lang/EventObject.hpp>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
-namespace com { namespace sun { namespace star { namespace lang { class XComponent; } } } }
+namespace com::sun::star::uno { template <typename > class Reference; }
+namespace com::sun::star::lang { class XComponent; }
 
 namespace utl
 {
diff --git a/include/unotools/fontcfg.hxx b/include/unotools/fontcfg.hxx
index ae7e5c0cfb7e..bf457e02ba13 100644
--- a/include/unotools/fontcfg.hxx
+++ b/include/unotools/fontcfg.hxx
@@ -30,8 +30,8 @@
 #include <unordered_set>
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace container { class XNameAccess; } } } }
-namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
+namespace com::sun::star::container { class XNameAccess; }
+namespace com::sun::star::lang { class XMultiServiceFactory; }
 
 class LanguageTag;
 
diff --git a/include/unotools/historyoptions.hxx b/include/unotools/historyoptions.hxx
index fd852dde0d24..43c61b66788f 100644
--- a/include/unotools/historyoptions.hxx
+++ b/include/unotools/historyoptions.hxx
@@ -29,7 +29,7 @@
 
 #include <optional>
 
-namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+namespace com::sun::star::beans { struct PropertyValue; }
 
 // The method GetList() returns a list of property values.
 // Use follow defines to separate values by names.
diff --git a/include/unotools/intlwrapper.hxx b/include/unotools/intlwrapper.hxx
index 8a893eb78aad..49d1f8bf5438 100644
--- a/include/unotools/intlwrapper.hxx
+++ b/include/unotools/intlwrapper.hxx
@@ -26,7 +26,7 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
 
 class CollatorWrapper;
 class LocaleDataWrapper;
diff --git a/include/unotools/lingucfg.hxx b/include/unotools/lingucfg.hxx
index 82d2dfe5d0b3..b586b688fd95 100644
--- a/include/unotools/lingucfg.hxx
+++ b/include/unotools/lingucfg.hxx
@@ -28,8 +28,8 @@
 #include <i18nlangtag/lang.h>
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
-namespace com { namespace sun { namespace star { namespace util { class XChangesBatch; } } } }
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::util { class XChangesBatch; }
 
 class SvtLinguConfigItem;
 
diff --git a/include/unotools/localedatawrapper.hxx b/include/unotools/localedatawrapper.hxx
index 7c790e0ee8b0..7f393d9343f3 100644
--- a/include/unotools/localedatawrapper.hxx
+++ b/include/unotools/localedatawrapper.hxx
@@ -35,17 +35,12 @@
 #include <memory>
 #include <map>
 
-namespace com { namespace sun { namespace star {
-    namespace uno {
-        class XComponentContext;
-    }
-}}}
-
-namespace com { namespace sun { namespace star { namespace i18n { class XLocaleData5; } } } }
-namespace com { namespace sun { namespace star { namespace i18n { struct Calendar2; } } } }
-namespace com { namespace sun { namespace star { namespace i18n { struct Currency2; } } } }
-namespace com { namespace sun { namespace star { namespace i18n { struct FormatElement; } } } }
-namespace com { namespace sun { namespace star { namespace i18n { struct CalendarItem2; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::i18n { class XLocaleData5; }
+namespace com::sun::star::i18n { struct Calendar2; }
+namespace com::sun::star::i18n { struct Currency2; }
+namespace com::sun::star::i18n { struct FormatElement; }
+namespace com::sun::star::i18n { struct CalendarItem2; }
 
 class Date;
 namespace tools { class Time; }
diff --git a/include/unotools/mediadescriptor.hxx b/include/unotools/mediadescriptor.hxx
index da94f4188b3c..bba9ea9a9ab4 100644
--- a/include/unotools/mediadescriptor.hxx
+++ b/include/unotools/mediadescriptor.hxx
@@ -29,9 +29,9 @@
 #include <rtl/ustring.hxx>
 #include <unotools/unotoolsdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace io {
+namespace com::sun::star::io {
     class XInputStream;
-} } } }
+}
 namespace comphelper { class IDocPasswordVerifier; }
 
 namespace utl {
diff --git a/include/unotools/moduleoptions.hxx b/include/unotools/moduleoptions.hxx
index 9e73cba91ef0..969fac8ad598 100644
--- a/include/unotools/moduleoptions.hxx
+++ b/include/unotools/moduleoptions.hxx
@@ -28,8 +28,8 @@
 #include <memory>
 
 namespace osl { class Mutex; }
-namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
-namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::beans { struct PropertyValue; }
 
 /*-************************************************************************************************************
     @short          forward declaration to our private date container implementation
diff --git a/include/unotools/nativenumberwrapper.hxx b/include/unotools/nativenumberwrapper.hxx
index 88eb22f30c60..9f632f1f69fe 100644
--- a/include/unotools/nativenumberwrapper.hxx
+++ b/include/unotools/nativenumberwrapper.hxx
@@ -25,13 +25,8 @@
 #include <com/sun/star/i18n/NativeNumberXmlAttributes.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 
-namespace com { namespace sun { namespace star {
-    namespace uno {
-        class XComponentContext;
-    }
-}}}
-
-namespace com { namespace sun { namespace star { namespace i18n { class XNativeNumberSupplier2; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::i18n { class XNativeNumberSupplier2; }
 
 class UNLESS_MERGELIBS(UNOTOOLS_DLLPUBLIC) NativeNumberWrapper
 {
diff --git a/include/unotools/sharedunocomponent.hxx b/include/unotools/sharedunocomponent.hxx
index 81e2a253c6de..169e899ca75b 100644
--- a/include/unotools/sharedunocomponent.hxx
+++ b/include/unotools/sharedunocomponent.hxx
@@ -25,11 +25,11 @@
 #include <rtl/ref.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace lang {
         class XComponent;
     }
-} } }
+}
 
 namespace utl
 {
diff --git a/include/unotools/textsearch.hxx b/include/unotools/textsearch.hxx
index 68af444d8023..04a25a1a3c46 100644
--- a/include/unotools/textsearch.hxx
+++ b/include/unotools/textsearch.hxx
@@ -29,8 +29,8 @@
 
 class CharClass;
 
-namespace com { namespace sun { namespace star { namespace lang { struct Locale; } } } }
-namespace com { namespace sun { namespace star { namespace util { class XTextSearch2; } } } }
+namespace com::sun::star::lang { struct Locale; }
+namespace com::sun::star::util { class XTextSearch2; }
 
 namespace com {
     namespace sun {
diff --git a/include/unotools/transliterationwrapper.hxx b/include/unotools/transliterationwrapper.hxx
index a87cf29ca32c..138c1e8d1d0c 100644
--- a/include/unotools/transliterationwrapper.hxx
+++ b/include/unotools/transliterationwrapper.hxx
@@ -26,14 +26,9 @@
 #include <i18nlangtag/lang.h>
 #include <com/sun/star/uno/Reference.hxx>
 
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
-namespace com { namespace sun { namespace star { namespace i18n { class XExtendedTransliteration; } } } }
-
-namespace com { namespace sun { namespace star {
-    namespace uno {
-        class XComponentContext;
-    }
-}}}
+namespace com::sun::star::uno { template <typename > class Sequence; }
+namespace com::sun::star::i18n { class XExtendedTransliteration; }
+namespace com::sun::star::uno { class XComponentContext; }
 enum class TransliterationFlags;
 
 namespace utl
diff --git a/include/unotools/ucbhelper.hxx b/include/unotools/ucbhelper.hxx
index 82f5ed5d4db1..b00248011ed9 100644
--- a/include/unotools/ucbhelper.hxx
+++ b/include/unotools/ucbhelper.hxx
@@ -26,7 +26,7 @@
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace uno {
         class Any;
         class XComponentContext;
@@ -34,10 +34,10 @@ namespace com { namespace sun { namespace star {
     namespace ucb{
         class XCommandEnvironment;
     }
-} } }
+}
 namespace ucbhelper { class Content; }
 
-namespace utl { namespace UCBContentHelper {
+namespace utl::UCBContentHelper {
 
 UNOTOOLS_DLLPUBLIC bool IsDocument(OUString const & url);
 
@@ -106,7 +106,7 @@ UNOTOOLS_DLLPUBLIC bool EqualURLs(
 UNOTOOLS_DLLPUBLIC
     css::uno::Reference< css::ucb::XCommandEnvironment > getDefaultCommandEnvironment();
 
-} }
+}
 
 #endif
 
diff --git a/include/unotools/viewoptions.hxx b/include/unotools/viewoptions.hxx
index 8eb088077b54..c4e6a38e5e79 100644
--- a/include/unotools/viewoptions.hxx
+++ b/include/unotools/viewoptions.hxx
@@ -25,7 +25,7 @@
 #include <rtl/ustring.hxx>
 #include <unotools/options.hxx>
 
-namespace com { namespace sun { namespace star { namespace beans { struct NamedValue; } } } }
+namespace com::sun::star::beans { struct NamedValue; }
 namespace osl { class Mutex; }
 
 class SvtViewOptionsBase_Impl;