diff options
22 files changed, 38 insertions, 61 deletions
diff --git a/codemaker/source/commoncpp/commoncpp.cxx b/codemaker/source/commoncpp/commoncpp.cxx index 6774aedf4fba..b7eaac4ae59e 100644 --- a/codemaker/source/commoncpp/commoncpp.cxx +++ b/codemaker/source/commoncpp/commoncpp.cxx @@ -32,7 +32,7 @@ #include <vector> -namespace codemaker { namespace cpp { +namespace codemaker::cpp { OString scopedCppName(OString const & type, bool ns_alias) { @@ -293,6 +293,6 @@ OString translateUnoToCppIdentifier( } } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/codemaker/source/commonjava/commonjava.cxx b/codemaker/source/commonjava/commonjava.cxx index bdb1b02b63a7..d33969676ee6 100644 --- a/codemaker/source/commonjava/commonjava.cxx +++ b/codemaker/source/commonjava/commonjava.cxx @@ -34,7 +34,7 @@ #include <vector> -namespace codemaker { namespace java { +namespace codemaker::java { OString translateUnoToJavaType( codemaker::UnoType::Sort sort, OString const & nucleus, bool referenceType) @@ -130,6 +130,6 @@ OString translateUnoToJavaIdentifier( } } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/codemaker/source/cppumaker/dependencies.cxx b/codemaker/source/cppumaker/dependencies.cxx index 71855e2a9e47..eb257c6966af 100644 --- a/codemaker/source/cppumaker/dependencies.cxx +++ b/codemaker/source/cppumaker/dependencies.cxx @@ -35,7 +35,7 @@ #include "dependencies.hxx" -namespace codemaker { namespace cppumaker { +namespace codemaker::cppumaker { Dependencies::Dependencies( rtl::Reference< TypeManager > const & manager, OUString const & name): @@ -291,6 +291,6 @@ void Dependencies::insert(OUString const & name, Kind kind) { } } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/codemaker/source/cppumaker/dumputils.cxx b/codemaker/source/cppumaker/dumputils.cxx index ec4a586c4a17..1f993b3ef7d8 100644 --- a/codemaker/source/cppumaker/dumputils.cxx +++ b/codemaker/source/cppumaker/dumputils.cxx @@ -26,7 +26,7 @@ #include <sal/types.h> -namespace codemaker { namespace cppumaker { +namespace codemaker::cppumaker { bool dumpNamespaceOpen( FileStream & out, OUString const & entityName, bool fullModuleType) @@ -73,6 +73,6 @@ void dumpTypeIdentifier(FileStream & out, OUString const & entityName) { out << entityName.copy(entityName.lastIndexOf('.') + 1); } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/automationinvokedzone.cxx b/comphelper/source/misc/automationinvokedzone.cxx index 2134217a1eaa..4a71c4a51817 100644 --- a/comphelper/source/misc/automationinvokedzone.cxx +++ b/comphelper/source/misc/automationinvokedzone.cxx @@ -11,9 +11,7 @@ #include <comphelper/automationinvokedzone.hxx> -namespace comphelper -{ -namespace Automation +namespace comphelper::Automation { thread_local static int nActiveount = 0; @@ -31,6 +29,5 @@ AutomationInvokedZone::~AutomationInvokedZone() nActiveount--; } } -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/comphelper_module.cxx b/comphelper/source/misc/comphelper_module.cxx index 6f0d36b23888..9cf32546e1be 100644 --- a/comphelper/source/misc/comphelper_module.cxx +++ b/comphelper/source/misc/comphelper_module.cxx @@ -21,7 +21,7 @@ #include <comphelper_module.hxx> -namespace comphelper { namespace module +namespace comphelper::module { @@ -45,7 +45,7 @@ namespace comphelper { namespace module } -} } // namespace comphelper::module +} // namespace comphelper::module /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/comphelper_services.cxx b/comphelper/source/misc/comphelper_services.cxx index 5ab04afeadff..4fe3269efcfc 100644 --- a/comphelper/source/misc/comphelper_services.cxx +++ b/comphelper/source/misc/comphelper_services.cxx @@ -23,7 +23,7 @@ #include <rtl/instance.hxx> -namespace comphelper { namespace module +namespace comphelper::module { @@ -48,7 +48,7 @@ namespace comphelper { namespace module } -} } // namespace comphelper::module +} // namespace comphelper::module extern "C" SAL_DLLPUBLIC_EXPORT void* comphelp_component_getFactory( diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx index 2cab40dfa8f9..8a75db02f04b 100644 --- a/comphelper/source/misc/lok.cxx +++ b/comphelper/source/misc/lok.cxx @@ -14,10 +14,7 @@ #include <iostream> #include <map> -namespace comphelper -{ - -namespace LibreOfficeKit +namespace comphelper::LibreOfficeKit { static bool g_bActive(false); @@ -249,8 +246,6 @@ void statusIndicatorFinish() pStatusIndicatorCallback(pStatusIndicatorCallbackData, statusIndicatorCallbackType::Finish, 0); } -} // namespace LibreOfficeKit - } // namespace comphelper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/random.cxx b/comphelper/source/misc/random.cxx index f001b06195d6..260db3a544ca 100644 --- a/comphelper/source/misc/random.cxx +++ b/comphelper/source/misc/random.cxx @@ -25,9 +25,7 @@ // this is nothing but a simple wrapper around // the std::random generators -namespace comphelper -{ -namespace rng +namespace comphelper::rng { // underlying random number generator @@ -119,6 +117,5 @@ double uniform_real_distribution(double a, double b) } } // namespace -} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/servicedecl.cxx b/comphelper/source/misc/servicedecl.cxx index 410ef472ee26..ebbca601ecbe 100644 --- a/comphelper/source/misc/servicedecl.cxx +++ b/comphelper/source/misc/servicedecl.cxx @@ -28,8 +28,7 @@ using namespace com::sun::star; -namespace comphelper { -namespace service_decl { +namespace comphelper::service_decl { const char cDelim = ';'; @@ -156,7 +155,6 @@ void* component_getFactoryHelper( const char* pImplName, return nullptr; } -} // namespace service_decl } // namespace comphelper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/string.cxx b/comphelper/source/misc/string.cxx index 296c9ac016d3..ba84ff032b66 100644 --- a/comphelper/source/misc/string.cxx +++ b/comphelper/source/misc/string.cxx @@ -40,7 +40,7 @@ #include <com/sun/star/i18n/Collator.hpp> -namespace comphelper { namespace string { +namespace comphelper::string { namespace { @@ -492,6 +492,6 @@ OUString setToken(const OUString& rIn, sal_Int32 nToken, sal_Unicode cTok, return rIn; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/xmlsechelper.cxx b/comphelper/source/misc/xmlsechelper.cxx index d0b4b3074ca9..c8257c124755 100644 --- a/comphelper/source/misc/xmlsechelper.cxx +++ b/comphelper/source/misc/xmlsechelper.cxx @@ -26,9 +26,7 @@ using namespace std; -namespace comphelper -{ -namespace xmlsec +namespace comphelper::xmlsec { OUString GetCertificateKind( const css::security::CertificateKind &rKind ) { @@ -326,6 +324,5 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString) return aStr.makeStringAndClear(); } } -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/streaming/memorystream.cxx b/comphelper/source/streaming/memorystream.cxx index 940c9012f149..4e5beee9d032 100644 --- a/comphelper/source/streaming/memorystream.cxx +++ b/comphelper/source/streaming/memorystream.cxx @@ -33,7 +33,7 @@ #include <string.h> #include <vector> -namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com::sun::star::uno { class XComponentContext; } using ::cppu::OWeakObject; using ::cppu::WeakImplHelper; diff --git a/comphelper/source/xml/xmltools.cxx b/comphelper/source/xml/xmltools.cxx index 14809221d0e5..04e97406b293 100644 --- a/comphelper/source/xml/xmltools.cxx +++ b/comphelper/source/xml/xmltools.cxx @@ -69,9 +69,7 @@ namespace } } -namespace comphelper -{ - namespace xml +namespace comphelper::xml { OString makeXMLChaff() { @@ -105,5 +103,4 @@ namespace comphelper return str; } } -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx index ca8404a0c886..6cbde63f2000 100644 --- a/configmgr/source/configurationprovider.cxx +++ b/configmgr/source/configurationprovider.cxx @@ -59,7 +59,7 @@ #include "defaultprovider.hxx" #include "rootaccess.hxx" -namespace configmgr { namespace configuration_provider { +namespace configmgr::configuration_provider { namespace { @@ -460,6 +460,6 @@ createFactory( return new Factory; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/configmgr/source/configurationregistry.cxx b/configmgr/source/configurationregistry.cxx index f27e3c7b88cc..5e57e8bf387d 100644 --- a/configmgr/source/configurationregistry.cxx +++ b/configmgr/source/configurationregistry.cxx @@ -56,11 +56,11 @@ #include "configurationregistry.hxx" -namespace com { namespace sun { namespace star { namespace util { +namespace com::sun::star::util { class XFlushListener; -} } } } +} -namespace configmgr { namespace configuration_registry { +namespace configmgr::configuration_registry { namespace { @@ -644,6 +644,6 @@ css::uno::Sequence< OUString > getSupportedServiceNames() { return css::uno::Sequence< OUString > { "com.sun.star.configuration.ConfigurationRegistry" }; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/configmgr/source/dconf.cxx b/configmgr/source/dconf.cxx index da351bd917a0..430dc37cc071 100644 --- a/configmgr/source/dconf.cxx +++ b/configmgr/source/dconf.cxx @@ -111,7 +111,7 @@ extern "C" { // // TODO: support "mandatory" and "external"? -namespace configmgr { namespace dconf { +namespace configmgr::dconf { namespace { @@ -1590,6 +1590,6 @@ void writeModifications(Components & components, Data & data) { data.modifications.clear(); } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/configmgr/source/defaultprovider.cxx b/configmgr/source/defaultprovider.cxx index c456954bb332..d07dcd382d80 100644 --- a/configmgr/source/defaultprovider.cxx +++ b/configmgr/source/defaultprovider.cxx @@ -29,7 +29,7 @@ #include "defaultprovider.hxx" #include "lock.hxx" -namespace configmgr { namespace default_provider { +namespace configmgr::default_provider { css::uno::Reference< css::uno::XInterface > create( css::uno::Reference< css::uno::XComponentContext > const & context) @@ -48,6 +48,6 @@ css::uno::Sequence< OUString > getSupportedServiceNames() { return css::uno::Sequence< OUString > { "com.sun.star.configuration.DefaultProvider" }; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/configmgr/source/readonlyaccess.cxx b/configmgr/source/readonlyaccess.cxx index 079459dc747f..5da0f122cc7d 100644 --- a/configmgr/source/readonlyaccess.cxx +++ b/configmgr/source/readonlyaccess.cxx @@ -32,7 +32,7 @@ #include "readonlyaccess.hxx" #include "rootaccess.hxx" -namespace configmgr { namespace read_only_access { +namespace configmgr::read_only_access { namespace { @@ -124,6 +124,6 @@ css::uno::Sequence< OUString > getSupportedServiceNames() { return css::uno::Sequence< OUString > { "com.sun.star.configuration.ReadOnlyAccess" }; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/configmgr/source/readwriteaccess.cxx b/configmgr/source/readwriteaccess.cxx index 3cbf006c8ad4..376e70182d5f 100644 --- a/configmgr/source/readwriteaccess.cxx +++ b/configmgr/source/readwriteaccess.cxx @@ -32,7 +32,7 @@ #include "readwriteaccess.hxx" #include "rootaccess.hxx" -namespace configmgr { namespace read_write_access { +namespace configmgr::read_write_access { namespace { @@ -146,6 +146,6 @@ css::uno::Sequence< OUString > getSupportedServiceNames() { return css::uno::Sequence< OUString > { "com.sun.star.configuration.ReadWriteAccess" }; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/configmgr/source/update.cxx b/configmgr/source/update.cxx index 7529e21ef6f1..69e27f794990 100644 --- a/configmgr/source/update.cxx +++ b/configmgr/source/update.cxx @@ -40,7 +40,7 @@ #include "rootaccess.hxx" #include "update.hxx" -namespace configmgr { namespace update { +namespace configmgr::update { namespace { @@ -154,6 +154,6 @@ css::uno::Sequence< OUString > getSupportedServiceNames() { return css::uno::Sequence< OUString > { "com.sun.star.configuration.Update_Service" }; } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/configmgr/source/xmldata.cxx b/configmgr/source/xmldata.cxx index e919d08e7824..a2a05877674e 100644 --- a/configmgr/source/xmldata.cxx +++ b/configmgr/source/xmldata.cxx @@ -33,9 +33,7 @@ #include "type.hxx" #include "xmldata.hxx" -namespace configmgr { - -namespace xmldata { +namespace configmgr::xmldata { Type parseType( xmlreader::XmlReader const & reader, xmlreader::Span const & text) @@ -132,6 +130,4 @@ OUString parseTemplateReference( } -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |