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>

13 files changed, 27 insertions, 37 deletions

diff --git a/include/svl/asiancfg.hxx b/include/svl/asiancfg.hxx
index 30dc1d7bcd0a..6ee88fe3575f 100644
--- a/include/svl/asiancfg.hxx
+++ b/include/svl/asiancfg.hxx
@@ -26,9 +26,9 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <svl/svldllapi.h>
 
-namespace com { namespace sun { namespace star { namespace lang {
+namespace com::sun::star::lang {
     struct Locale;
-} } } }
+}
 
 /// These constants define character compression in Asian text.
 /// Must match the values in com::sun::star::text::CharacterCompressionType.
diff --git a/include/svl/documentlockfile.hxx b/include/svl/documentlockfile.hxx
index 31a9edea7dee..f35e8a765f13 100644
--- a/include/svl/documentlockfile.hxx
+++ b/include/svl/documentlockfile.hxx
@@ -24,8 +24,8 @@
 
 #include <svl/lockfilecommon.hxx>
 
-namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } }
-namespace com { namespace sun { namespace star { namespace io { class XOutputStream; } } } }
+namespace com::sun::star::io { class XInputStream; }
+namespace com::sun::star::io { class XOutputStream; }
 
 namespace svt {
 
diff --git a/include/svl/ilstitem.hxx b/include/svl/ilstitem.hxx
index ec40762b6a43..af4932999dbd 100644
--- a/include/svl/ilstitem.hxx
+++ b/include/svl/ilstitem.hxx
@@ -24,7 +24,7 @@
 #include <svl/poolitem.hxx>
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } }
+namespace com::sun::star::uno { template <class E> class Sequence; }
 
 class SVL_DLLPUBLIC SfxIntegerListItem final : public SfxPoolItem
 {
diff --git a/include/svl/instrm.hxx b/include/svl/instrm.hxx
index cc7bc8e9b619..6ddccfeaf3c5 100644
--- a/include/svl/instrm.hxx
+++ b/include/svl/instrm.hxx
@@ -25,10 +25,10 @@
 #include <tools/stream.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace io {
+namespace com::sun::star::io {
     class XInputStream;
     class XSeekable;
-} } } }
+}
 
 class SvDataPipe_Impl;
 
diff --git a/include/svl/outstrm.hxx b/include/svl/outstrm.hxx
index 987dcdf796e8..f4e736542586 100644
--- a/include/svl/outstrm.hxx
+++ b/include/svl/outstrm.hxx
@@ -24,9 +24,9 @@
 #include <com/sun/star/uno/Reference.h>
 #include <tools/stream.hxx>
 
-namespace com { namespace sun { namespace star { namespace io {
+namespace com::sun::star::io {
     class XOutputStream;
-} } } }
+}
 
 
 class SVL_DLLPUBLIC SvOutputStream final : public SvStream
diff --git a/include/svl/ownlist.hxx b/include/svl/ownlist.hxx
index 7c3eae17b8ce..cd93e6436a67 100644
--- a/include/svl/ownlist.hxx
+++ b/include/svl/ownlist.hxx
@@ -24,13 +24,8 @@
 #include <rtl/ustring.hxx>
 #include <vector>
 
-namespace com { namespace sun { namespace star {
-    namespace beans {
-        struct PropertyValue;
-    }
-}}}
-
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::uno { template <typename > class Sequence; }
 
 class SvCommand
 /*
diff --git a/include/svl/sharecontrolfile.hxx b/include/svl/sharecontrolfile.hxx
index 3395f91d5a24..ddd29717a3d1 100644
--- a/include/svl/sharecontrolfile.hxx
+++ b/include/svl/sharecontrolfile.hxx
@@ -25,11 +25,11 @@
 #include <svl/lockfilecommon.hxx>
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } }
-namespace com { namespace sun { namespace star { namespace io { class XOutputStream; } } } }
-namespace com { namespace sun { namespace star { namespace io { class XSeekable; } } } }
-namespace com { namespace sun { namespace star { namespace io { class XStream; } } } }
-namespace com { namespace sun { namespace star { namespace io { class XTruncate; } } } }
+namespace com::sun::star::io { class XInputStream; }
+namespace com::sun::star::io { class XOutputStream; }
+namespace com::sun::star::io { class XSeekable; }
+namespace com::sun::star::io { class XStream; }
+namespace com::sun::star::io { class XTruncate; }
 
 namespace svt {
 
diff --git a/include/svl/sigstruct.hxx b/include/svl/sigstruct.hxx
index f6ee242c84d1..38c1ee5ed142 100644
--- a/include/svl/sigstruct.hxx
+++ b/include/svl/sigstruct.hxx
@@ -29,7 +29,7 @@
 #include <set>
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; } } } }
+namespace com::sun::star::graphic { class XGraphic; }
 
 /*
  * type of reference
diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx
index 9215cf82d7c8..48e558149881 100644
--- a/include/svl/slstitm.hxx
+++ b/include/svl/slstitm.hxx
@@ -25,7 +25,7 @@
 #include <svl/poolitem.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } }
+namespace com::sun::star::uno { template <class E> class Sequence; }
 
 class SVL_DLLPUBLIC SfxStringListItem final : public SfxPoolItem
 {
diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx
index 1ba5e63ad4f7..8de6231c1dc5 100644
--- a/include/svl/undo.hxx
+++ b/include/svl/undo.hxx
@@ -171,11 +171,11 @@ protected:
 };
 
 
-namespace svl { namespace undo { namespace impl
+namespace svl::undo::impl
 {
     class UndoManagerGuard;
     class LockGuard;
-} } }
+}
 
 struct SfxUndoManager_Data;
 class SVL_DLLPUBLIC SfxUndoManager
diff --git a/include/svl/urihelper.hxx b/include/svl/urihelper.hxx
index 5d8171e21efa..9f8588c97295 100644
--- a/include/svl/urihelper.hxx
+++ b/include/svl/urihelper.hxx
@@ -26,10 +26,10 @@
 #include <tools/link.hxx>
 #include <tools/urlobj.hxx>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace uno { class XComponentContext; }
     namespace uri { class XUriReference; }
-} } }
+}
 
 class CharClass;
 
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index 664ddbc25de7..244121d4afe7 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -35,9 +35,9 @@
 #include <memory>
 #include <set>
 
-namespace com { namespace sun { namespace star { namespace i18n { class XNumberFormatCode; } } } }
-namespace com { namespace sun { namespace star { namespace i18n { struct Currency; } } } }
-namespace com { namespace sun { namespace star { namespace i18n { struct NumberFormatCode; } } } }
+namespace com::sun::star::i18n { class XNumberFormatCode; }
+namespace com::sun::star::i18n { struct Currency; }
+namespace com::sun::star::i18n { struct NumberFormatCode; }
 
 class Date;
 class Color;
@@ -47,12 +47,7 @@ class CalendarWrapper;
 class ImpSvNumberformatScan;
 class ImpSvNumberInputScan;
 class SvNumberformat;
-
-namespace com { namespace sun { namespace star {
-    namespace uno {
-        class XComponentContext;
-    }
-}}}
+namespace com::sun::star::uno { class XComponentContext; }
 
 #define SV_COUNTRY_LANGUAGE_OFFSET     10000  // Max count of formats per country/language
 #define SV_MAX_COUNT_STANDARD_FORMATS  100    // Max count of builtin default formats per CL
diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx
index 6c9f5b062f4c..5b6f70243f96 100644
--- a/include/svl/zformat.hxx
+++ b/include/svl/zformat.hxx
@@ -28,7 +28,7 @@ namespace utl {
     class DigitGroupingIterator;
 }
 
-namespace com { namespace sun { namespace star { namespace i18n { struct NativeNumberXmlAttributes2; } } } }
+namespace com::sun::star::i18n { struct NativeNumberXmlAttributes2; }
 
 class Color;