From da7489eb6aa9dfedb43f9be6e1b90e3ae06a75cc Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Fri, 10 Jul 2020 15:19:30 +0200
Subject: compact namespace decl

used
   git grep -lw namespace
    | xargs perl -i -p0e 's/(\w+)\s*.\{.\s*namespace\s*(\w+)/\1::\2/smg;'
 to do the initial replace, then compiled and fixed.

Change-Id: If69904d75940c851aeffab0e78c4ba02cc968d44
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98526
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 xmlsecurity/inc/documentsignaturehelper.hxx    | 12 ++++--------
 xmlsecurity/inc/documentsignaturemanager.hxx   |  8 +-------
 xmlsecurity/inc/pdfio/pdfdocument.hxx          | 12 +++---------
 xmlsecurity/inc/pdfsignaturehelper.hxx         | 13 ++-----------
 xmlsecurity/inc/xmlsignaturehelper.hxx         | 16 +++++++---------
 xmlsecurity/inc/xmlsignaturehelper2.hxx        | 12 ++++--------
 xmlsecurity/source/helper/ooxmlsecexporter.hxx | 13 ++-----------
 7 files changed, 23 insertions(+), 63 deletions(-)

(limited to 'xmlsecurity')

diff --git a/xmlsecurity/inc/documentsignaturehelper.hxx b/xmlsecurity/inc/documentsignaturehelper.hxx
index ccf71edd9c62..d96275a36a48 100644
--- a/xmlsecurity/inc/documentsignaturehelper.hxx
+++ b/xmlsecurity/inc/documentsignaturehelper.hxx
@@ -26,14 +26,10 @@
 
 #include <vector>
 
-namespace com {
-namespace sun {
-namespace star {
-namespace io {
-    class XStream; }
-namespace embed {
-    class XStorage; }
-}}}
+namespace com::sun::star {
+    namespace io { class XStream; }
+    namespace embed { class XStorage; }
+}
 
 namespace com::sun::star::xml::sax { class XDocumentHandler; }
 
diff --git a/xmlsecurity/inc/documentsignaturemanager.hxx b/xmlsecurity/inc/documentsignaturemanager.hxx
index e7149c3fe195..3854571e9ac3 100644
--- a/xmlsecurity/inc/documentsignaturemanager.hxx
+++ b/xmlsecurity/inc/documentsignaturemanager.hxx
@@ -30,11 +30,7 @@
 
 #include <com/sun/star/xml/crypto/XSEInitializer.hpp>
 
-namespace com
-{
-namespace sun
-{
-namespace star
+namespace com::sun::star
 {
 namespace beans
 {
@@ -57,8 +53,6 @@ namespace uno
 class XComponentContext;
 }
 }
-}
-}
 class PDFSignatureHelper;
 
 /// Manages signatures (addition, removal), used by DigitalSignaturesDialog.
diff --git a/xmlsecurity/inc/pdfio/pdfdocument.hxx b/xmlsecurity/inc/pdfio/pdfdocument.hxx
index 996bb1527bb8..e72a7edd2de7 100644
--- a/xmlsecurity/inc/pdfio/pdfdocument.hxx
+++ b/xmlsecurity/inc/pdfio/pdfdocument.hxx
@@ -13,19 +13,14 @@
 
 #include <xmlsecuritydllapi.h>
 
-namespace vcl
-{
-namespace filter
+namespace vcl::filter
 {
 class PDFObjectElement;
 }
-}
 struct SignatureInformation;
 class SvStream;
 
-namespace xmlsecurity
-{
-namespace pdfio
+namespace xmlsecurity::pdfio
 {
 /**
  * @param rInformation The actual result.
@@ -36,8 +31,7 @@ XMLSECURITY_DLLPUBLIC bool ValidateSignature(SvStream& rStream,
                                              vcl::filter::PDFObjectElement* pSignature,
                                              SignatureInformation& rInformation, bool bLast);
 
-} // namespace pdfio
-} // namespace xmlsecurity
+} // namespace xmlsecurity::pdfio
 
 #endif // INCLUDED_XMLSECURITY_INC_PDFIO_PDFDOCUMENT_HXX
 
diff --git a/xmlsecurity/inc/pdfsignaturehelper.hxx b/xmlsecurity/inc/pdfsignaturehelper.hxx
index f8f1e893beb2..25b0c42e6478 100644
--- a/xmlsecurity/inc/pdfsignaturehelper.hxx
+++ b/xmlsecurity/inc/pdfsignaturehelper.hxx
@@ -15,11 +15,7 @@
 
 #include <svl/sigstruct.hxx>
 
-namespace com
-{
-namespace sun
-{
-namespace star
+namespace com::sun::star
 {
 namespace frame
 {
@@ -37,16 +33,11 @@ namespace security
 {
 struct DocumentSignatureInformation;
 }
-namespace xml
-{
-namespace crypto
+namespace xml::crypto
 {
 class XSecurityEnvironment;
 }
 }
-}
-}
-}
 
 /// Handles signatures of a PDF file.
 class XMLSECURITY_DLLPUBLIC PDFSignatureHelper
diff --git a/xmlsecurity/inc/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsignaturehelper.hxx
index 2437686ea31b..85dc769d8268 100644
--- a/xmlsecurity/inc/xmlsignaturehelper.hxx
+++ b/xmlsecurity/inc/xmlsignaturehelper.hxx
@@ -31,15 +31,13 @@
 class DateTime;
 class UriBindingHelper;
 
-namespace com {
-namespace sun {
-namespace star {
-namespace io {
-    class XOutputStream;
-    class XInputStream; }
-namespace embed {
-    class XStorage; }
-}}}
+namespace com::sun::star {
+    namespace io {
+        class XOutputStream;
+        class XInputStream;
+    }
+    namespace embed { class XStorage; }
+}
 
 namespace com::sun::star::graphic { class XGraphic; }
 namespace com::sun::star::uno { class XComponentContext; }
diff --git a/xmlsecurity/inc/xmlsignaturehelper2.hxx b/xmlsecurity/inc/xmlsignaturehelper2.hxx
index 928ea19ed3fa..2b28fa0d410d 100644
--- a/xmlsecurity/inc/xmlsignaturehelper2.hxx
+++ b/xmlsecurity/inc/xmlsignaturehelper2.hxx
@@ -26,14 +26,10 @@
 
 #include <com/sun/star/xml/crypto/XUriBinding.hpp>
 
-namespace com {
-namespace sun {
-namespace star {
-namespace io {
-    class XInputStream; }
-namespace embed {
-    class XStorage; }
-}}}
+namespace com::sun::star {
+    namespace io { class XInputStream; }
+    namespace embed { class XStorage; }
+}
 
 // XUriBinding
 
diff --git a/xmlsecurity/source/helper/ooxmlsecexporter.hxx b/xmlsecurity/source/helper/ooxmlsecexporter.hxx
index 5d94da2fdb6c..5f432ae8fb5f 100644
--- a/xmlsecurity/source/helper/ooxmlsecexporter.hxx
+++ b/xmlsecurity/source/helper/ooxmlsecexporter.hxx
@@ -14,11 +14,7 @@
 
 #include <svl/sigstruct.hxx>
 
-namespace com
-{
-namespace sun
-{
-namespace star
+namespace com::sun::star
 {
 namespace embed
 {
@@ -28,16 +24,11 @@ namespace uno
 {
 class XComponentContext;
 }
-namespace xml
-{
-namespace sax
+namespace xml::sax
 {
 class XDocumentHandler;
 }
 }
-}
-}
-}
 
 /// Writes a single OOXML digital signature.
 class OOXMLSecExporter
-- 
cgit