diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-01-13 19:48:37 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-01-31 18:36:09 +0100 |
| commit | c82efb610bf556ea12cbe4f94568ac619897799f (patch) | |
| tree | 997f443876b4f3c9f10a46f2d0df65093f9d8731 /svl | |
| parent | 04405edc3fac32938b8940bc767656ea6c7820f9 (diff) | |
clang-tidy modernize-concat-nested-namespace
Change-Id: Iab35a8b85b3ba1df791c774f40b037f9420a071a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86708
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/qa/unit/test_URIHelper.cxx | 4 | ||||
| -rw-r--r-- | svl/source/crypto/cryptosign.cxx | 6 | ||||
| -rw-r--r-- | svl/source/undo/undo.cxx | 4 | ||||
| -rw-r--r-- | svl/source/uno/pathservice.cxx | 4 |
4 files changed, 7 insertions, 11 deletions
diff --git a/svl/qa/unit/test_URIHelper.cxx b/svl/qa/unit/test_URIHelper.cxx index e4dfbb9dd939..dcfd64b871f6 100644 --- a/svl/qa/unit/test_URIHelper.cxx +++ b/svl/qa/unit/test_URIHelper.cxx @@ -50,10 +50,10 @@ #include <svl/urihelper.hxx> #include <unotools/charclass.hxx> -namespace com { namespace sun { namespace star { namespace ucb { +namespace com::sun::star::ucb { class XCommandEnvironment; class XContentEventListener; -} } } } +} namespace { diff --git a/svl/source/crypto/cryptosign.cxx b/svl/source/crypto/cryptosign.cxx index 34de60c3572c..483a9ee31638 100644 --- a/svl/source/crypto/cryptosign.cxx +++ b/svl/source/crypto/cryptosign.cxx @@ -880,9 +880,7 @@ bool CreateSigningCertificateAttribute(void const * pDerEncoded, int nDerEncoded } // anonymous namespace #endif //_WIN32 -namespace svl { - -namespace crypto { +namespace svl::crypto { static int AsHex(char ch) { @@ -2430,6 +2428,4 @@ bool Signing::Verify(SvStream& rStream, } -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx index 98b15675c00e..868982813f98 100644 --- a/svl/source/undo/undo.cxx +++ b/svl/source/undo/undo.cxx @@ -189,7 +189,7 @@ struct SfxUndoManager_Data SfxUndoManager_Data & operator= (const SfxUndoManager_Data &) = delete; }; -namespace svl { namespace undo { namespace impl +namespace svl::undo::impl { class LockGuard { @@ -335,7 +335,7 @@ namespace svl { namespace undo { namespace impl ::std::for_each( aListenersCopy.begin(), aListenersCopy.end(), notifier ); } } -} } } +} using namespace ::svl::undo::impl; diff --git a/svl/source/uno/pathservice.cxx b/svl/source/uno/pathservice.cxx index 3b4e0c178b2c..c0b951f15046 100644 --- a/svl/source/uno/pathservice.cxx +++ b/svl/source/uno/pathservice.cxx @@ -26,9 +26,9 @@ #include <com/sun/star/frame/XConfigManager.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -namespace com { namespace sun { namespace star { namespace uno { +namespace com::sun::star::uno { class XComponentContext; -} } } } +} namespace { |