diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-07-10 15:19:30 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-07-20 10:12:57 +0200 |
| commit | da7489eb6aa9dfedb43f9be6e1b90e3ae06a75cc (patch) | |
| tree | a83a32677046ede93c124af8edc8801bcb6e896f /include/svl | |
| parent | abea0d6647c7f1f7e76c73c26cb80e6a67dc5111 (diff) | |
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>
Diffstat (limited to 'include/svl')
| -rw-r--r-- | include/svl/cryptosign.hxx | 13 | ||||
| -rw-r--r-- | include/svl/sigstruct.hxx | 6 |
2 files changed, 4 insertions, 15 deletions
diff --git a/include/svl/cryptosign.hxx b/include/svl/cryptosign.hxx index 61905360a1b9..4171807be89c 100644 --- a/include/svl/cryptosign.hxx +++ b/include/svl/cryptosign.hxx @@ -18,19 +18,11 @@ #include <svl/svldllapi.h> -namespace com { -namespace sun { -namespace star { -namespace security { - class XCertificate; } -}}} - +namespace com::sun::star::security { class XCertificate; } class SvStream; struct SignatureInformation; -namespace svl { - -namespace crypto { +namespace svl::crypto { /// Converts a hex-encoded string into a byte array. SVL_DLLPUBLIC std::vector<unsigned char> DecodeHexString(const OString& rHex); @@ -85,7 +77,6 @@ private: }; } -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/sigstruct.hxx b/include/svl/sigstruct.hxx index 38c1ee5ed142..04cb45cbe18f 100644 --- a/include/svl/sigstruct.hxx +++ b/include/svl/sigstruct.hxx @@ -71,9 +71,7 @@ struct SignatureReferenceInformation typedef ::std::vector< SignatureReferenceInformation > SignatureReferenceInformations; -namespace svl -{ -namespace crypto +namespace svl::crypto { /// Specifies the algorithm used for signature generation and validation. enum class SignatureMethodAlgorithm @@ -82,7 +80,7 @@ enum class SignatureMethodAlgorithm ECDSA }; } -} + struct SignatureInformation { |