diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-05-10 09:19:36 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-05-10 18:28:34 +0200 |
commit | de61e14d0b6ee90cb4d170af340275d811b9fbbf (patch) | |
tree | bebbb5d2d82144c2ef73cb9a2918196b80ee5ddd /unoidl/source | |
parent | cb3e249e4dbc851f39bd80dfc7fd076543734c6d (diff) |
compact namespace in ucb..uui
Change-Id: I644d5e418028b4b4e66cf67b20a1155a689acab0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93906
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'unoidl/source')
-rw-r--r-- | unoidl/source/legacyprovider.hxx | 4 | ||||
-rw-r--r-- | unoidl/source/sourcefileprovider.hxx | 4 | ||||
-rw-r--r-- | unoidl/source/sourceprovider-parser-requires.hxx | 4 | ||||
-rw-r--r-- | unoidl/source/sourceprovider-parser.y | 4 | ||||
-rw-r--r-- | unoidl/source/sourceprovider-scanner.hxx | 4 | ||||
-rw-r--r-- | unoidl/source/sourceprovider-scanner.l | 4 | ||||
-rw-r--r-- | unoidl/source/sourcetreeprovider.hxx | 4 | ||||
-rw-r--r-- | unoidl/source/unoidlprovider.hxx | 4 |
8 files changed, 16 insertions, 16 deletions
diff --git a/unoidl/source/legacyprovider.hxx b/unoidl/source/legacyprovider.hxx index 4ef2712064db..ffee1affb7d0 100644 --- a/unoidl/source/legacyprovider.hxx +++ b/unoidl/source/legacyprovider.hxx @@ -16,7 +16,7 @@ #include <rtl/ref.hxx> #include <unoidl/unoidl.hxx> -namespace unoidl { namespace detail { +namespace unoidl::detail { class LegacyProvider: public Provider { public: @@ -37,7 +37,7 @@ private: mutable RegistryKey ucr_; }; -} } +} #endif diff --git a/unoidl/source/sourcefileprovider.hxx b/unoidl/source/sourcefileprovider.hxx index 3bef3e438fb5..bb3403b2d0d9 100644 --- a/unoidl/source/sourcefileprovider.hxx +++ b/unoidl/source/sourcefileprovider.hxx @@ -17,7 +17,7 @@ #include <rtl/ref.hxx> #include <unoidl/unoidl.hxx> -namespace unoidl { namespace detail { +namespace unoidl::detail { class SourceFileProvider: public Provider { public: @@ -37,7 +37,7 @@ private: std::map< OUString, rtl::Reference<Entity> > rootMap_; }; -} } +} #endif diff --git a/unoidl/source/sourceprovider-parser-requires.hxx b/unoidl/source/sourceprovider-parser-requires.hxx index 74b04d450d2b..8bfb10a823c5 100644 --- a/unoidl/source/sourceprovider-parser-requires.hxx +++ b/unoidl/source/sourceprovider-parser-requires.hxx @@ -21,7 +21,7 @@ typedef void * yyscan_t; -namespace unoidl { namespace detail { +namespace unoidl::detail { struct SourceProviderEntity; @@ -133,7 +133,7 @@ struct SourceProviderType { OUString typedefName; }; -} } +} #endif diff --git a/unoidl/source/sourceprovider-parser.y b/unoidl/source/sourceprovider-parser.y index d7111d0e3cfa..569f9022b953 100644 --- a/unoidl/source/sourceprovider-parser.y +++ b/unoidl/source/sourceprovider-parser.y @@ -3980,7 +3980,7 @@ deprecated_opt: %% -namespace unoidl { namespace detail { +namespace unoidl::detail { OUString SourceProviderType::getName() const { if (!typedefName.isEmpty()) { @@ -4473,6 +4473,6 @@ bool parse(OUString const & uri, SourceProviderScannerData * data) { return true; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unoidl/source/sourceprovider-scanner.hxx b/unoidl/source/sourceprovider-scanner.hxx index 9aca9a4046d3..282c0a18430c 100644 --- a/unoidl/source/sourceprovider-scanner.hxx +++ b/unoidl/source/sourceprovider-scanner.hxx @@ -26,7 +26,7 @@ #include "sourceprovider-parser-requires.hxx" #include <sourceprovider-parser.hxx> -namespace unoidl { namespace detail { +namespace unoidl::detail { struct SourceProviderScannerData; @@ -313,7 +313,7 @@ struct SourceProviderScannerData { bool parse(OUString const & uri, SourceProviderScannerData * data); -} } +} int yylex_init_extra( unoidl::detail::SourceProviderScannerData * user_defined, diff --git a/unoidl/source/sourceprovider-scanner.l b/unoidl/source/sourceprovider-scanner.l index 27a510000dd9..847138b56dd0 100644 --- a/unoidl/source/sourceprovider-scanner.l +++ b/unoidl/source/sourceprovider-scanner.l @@ -43,7 +43,7 @@ #include <sourceprovider-parser.hxx> #include "sourceprovider-scanner.hxx" -namespace unoidl { namespace detail { +namespace unoidl::detail { static std::size_t sourceProviderScannerInput( SourceProviderScannerData * data, char * buffer, std::size_t size) @@ -59,7 +59,7 @@ static std::size_t sourceProviderScannerInput( return size; } -} } +} #define YY_INPUT(buf, result, max_size) ((result) = \ ::unoidl::detail::sourceProviderScannerInput(yyextra, (buf), (max_size))) diff --git a/unoidl/source/sourcetreeprovider.hxx b/unoidl/source/sourcetreeprovider.hxx index d12fc9cef7e5..ece737f5256e 100644 --- a/unoidl/source/sourcetreeprovider.hxx +++ b/unoidl/source/sourcetreeprovider.hxx @@ -17,7 +17,7 @@ #include <rtl/ref.hxx> #include <unoidl/unoidl.hxx> -namespace unoidl { namespace detail { +namespace unoidl::detail { class SourceTreeProvider: public Provider { public: @@ -38,7 +38,7 @@ private: mutable std::map< OUString, rtl::Reference<Entity> > cache_; //TODO: at manager }; -} } +} #endif diff --git a/unoidl/source/unoidlprovider.hxx b/unoidl/source/unoidlprovider.hxx index 0013af54284f..1e80d7e44b6b 100644 --- a/unoidl/source/unoidlprovider.hxx +++ b/unoidl/source/unoidlprovider.hxx @@ -17,7 +17,7 @@ #include <sal/types.h> #include <unoidl/unoidl.hxx> -namespace unoidl { namespace detail { +namespace unoidl::detail { class MappedFile; struct MapEntry; @@ -51,6 +51,6 @@ private: NestedMap map_; }; -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |