[Libreoffice-commits] core.git: dbaccess/source desktop/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Thu Jan 16 07:23:20 UTC 2020
dbaccess/source/core/misc/sdbcoretools.cxx | 4 ++--
desktop/source/app/langselect.cxx | 4 ++--
desktop/source/app/userinstall.cxx | 4 ++--
desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 4 ++--
desktop/source/deployment/manager/dp_managerfac.cxx | 6 ++----
desktop/source/deployment/misc/dp_dependencies.cxx | 6 +-----
desktop/source/deployment/registry/component/dp_compbackenddb.cxx | 8 ++------
desktop/source/deployment/registry/component/dp_component.cxx | 8 ++------
desktop/source/deployment/registry/configuration/dp_configuration.cxx | 8 ++------
desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx | 8 ++------
desktop/source/deployment/registry/dp_backend.cxx | 4 +---
desktop/source/deployment/registry/dp_backenddb.cxx | 6 ++----
desktop/source/deployment/registry/executable/dp_executable.cxx | 8 ++------
desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx | 8 ++------
desktop/source/deployment/registry/help/dp_help.cxx | 8 ++------
desktop/source/deployment/registry/help/dp_helpbackenddb.cxx | 8 ++------
desktop/source/deployment/registry/package/dp_extbackenddb.cxx | 8 ++------
desktop/source/deployment/registry/package/dp_package.cxx | 8 ++------
desktop/source/deployment/registry/script/dp_lib_container.cxx | 6 +-----
desktop/source/deployment/registry/script/dp_script.cxx | 8 ++------
desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx | 8 ++------
desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx | 8 +-------
desktop/source/deployment/registry/sfwk/dp_sfwk.cxx | 10 ++--------
23 files changed, 42 insertions(+), 116 deletions(-)
New commits:
commit 0f0ae0e9fbe5b13c268486d46f545cb514134a65
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Jan 15 15:31:48 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Jan 16 08:22:45 2020 +0100
clang-tidy modernize-concat-nested-namespace in dbaccess..desktop
Change-Id: I35a3d422fe020a08f6c2678097252334a3951f7c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86848
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/dbaccess/source/core/misc/sdbcoretools.cxx b/dbaccess/source/core/misc/sdbcoretools.cxx
index 093fbd63befe..cc28d21b4f15 100644
--- a/dbaccess/source/core/misc/sdbcoretools.cxx
+++ b/dbaccess/source/core/misc/sdbcoretools.cxx
@@ -109,7 +109,7 @@ namespace dbaccess
return sDisplayMessage;
}
- namespace tools { namespace stor {
+ namespace tools::stor {
bool storageIsWritable_nothrow( const Reference< XStorage >& _rxStorage )
{
@@ -142,7 +142,7 @@ namespace dbaccess
return bSuccess;
}
- } } // tools::stor
+ }
} // namespace dbaccess
diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx
index 57f7d3831ff9..0b321f9285f4 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -45,7 +45,7 @@
#include "cmdlineargs.hxx"
#include "langselect.hxx"
-namespace desktop { namespace langselect {
+namespace desktop::langselect {
namespace {
@@ -146,6 +146,6 @@ bool prepareLocale() {
return true;
}
-} }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx
index 55c5a6fa01b0..f42b975c17d9 100644
--- a/desktop/source/app/userinstall.cxx
+++ b/desktop/source/app/userinstall.cxx
@@ -35,7 +35,7 @@
#include "userinstall.hxx"
-namespace desktop { namespace userinstall {
+namespace desktop::userinstall {
namespace {
@@ -170,6 +170,6 @@ Status finalize() {
}
}
-} }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 0dcbf641f3c0..28ff3563cc54 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -106,9 +106,9 @@
class KeyEvent;
class MouseEvent;
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
class XComponentContext;
-} } } }
+}
using namespace ::com::sun::star;
using dp_gui::UpdateDialog;
diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx
index f284c7e3cceb..7960b3ce6497 100644
--- a/desktop/source/deployment/manager/dp_managerfac.cxx
+++ b/desktop/source/deployment/manager/dp_managerfac.cxx
@@ -30,8 +30,7 @@ using namespace ::dp_misc;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-namespace dp_manager {
-namespace factory {
+namespace dp_manager::factory {
typedef ::cppu::WeakComponentImplHelper<
deployment::XPackageManagerFactory > t_pmfac_helper;
@@ -162,7 +161,6 @@ PackageManagerFactoryImpl::getPackageManager( OUString const & context )
return xRet;
}
-} // namespace factory
-} // namespace dp_manager
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx
index 49b64780ec04..adde640b91e9 100644
--- a/desktop/source/deployment/misc/dp_dependencies.cxx
+++ b/desktop/source/deployment/misc/dp_dependencies.cxx
@@ -91,9 +91,7 @@ OUString produceErrorText(
}
-namespace dp_misc {
-
-namespace Dependencies {
+namespace dp_misc::Dependencies {
css::uno::Sequence< css::uno::Reference< css::xml::dom::XElement > >
check(dp_misc::DescriptionInfoset const & infoset) {
@@ -182,6 +180,4 @@ OUString getErrorText(
}
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
index 143b4c3d1685..9b4945addf82 100644
--- a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
+++ b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
@@ -37,9 +37,7 @@ using namespace ::com::sun::star::uno;
#define ROOT_ELEMENT_NAME "component-backend-db"
#define KEY_ELEMENT_NAME "component"
-namespace dp_registry {
-namespace backend {
-namespace component {
+namespace dp_registry::backend::component {
ComponentBackendDb::ComponentBackendDb(
Reference<XComponentContext> const & xContext,
@@ -133,8 +131,6 @@ ComponentBackendDb::Data ComponentBackendDb::getEntry(OUString const & url)
}
-} // namespace bundle
-} // namespace backend
-} // namespace dp_registry
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index 25cdf78ab115..eb364a6e677e 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -58,9 +58,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ucb;
-namespace dp_registry {
-namespace backend {
-namespace component {
+namespace dp_registry::backend::component {
namespace {
#define IMPLEMENTATION_NAME "com.sun.star.comp.deployment.component.PackageRegistryBackend"
@@ -1700,9 +1698,7 @@ sdecl::ServiceDecl const serviceDecl(
IMPLEMENTATION_NAME,
BACKEND_SERVICE_NAME );
-} // namespace component
-} // namespace backend
-} // namespace dp_registry
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index ad34987632d0..47312a192ac5 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -57,9 +57,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ucb;
-namespace dp_registry {
-namespace backend {
-namespace configuration {
+namespace dp_registry::backend::configuration {
namespace {
class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
@@ -801,8 +799,6 @@ sdecl::ServiceDecl const serviceDecl(
"com.sun.star.comp.deployment.configuration.PackageRegistryBackend",
BACKEND_SERVICE_NAME );
-} // namespace configuration
-} // namespace backend
-} // namespace dp_registry
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
index ba8159775639..ab19d8cdf772 100644
--- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
@@ -37,9 +37,7 @@ using namespace ::com::sun::star::uno;
#define ROOT_ELEMENT_NAME "configuration-backend-db"
#define KEY_ELEMENT_NAME "configuration"
-namespace dp_registry {
-namespace backend {
-namespace configuration {
+namespace dp_registry::backend::configuration {
ConfigurationBackendDb::ConfigurationBackendDb(
Reference<XComponentContext> const & xContext,
@@ -162,8 +160,6 @@ std::vector<OUString> ConfigurationBackendDb::getAllDataUrls()
}
}
-} // namespace configuration
-} // namespace backend
-} // namespace dp_registry
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index bdab16126453..daee1d862bbf 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -53,8 +53,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ucb;
-namespace dp_registry {
-namespace backend {
+namespace dp_registry::backend {
PackageRegistryBackend::~PackageRegistryBackend()
@@ -766,7 +765,6 @@ Any Package::TypeInfo::getIcon( sal_Bool /*highContrast*/, sal_Bool /*smallIcon*
return Any();
}
-}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/dp_backenddb.cxx b/desktop/source/deployment/registry/dp_backenddb.cxx
index 6361742576b1..7b0ec523fe52 100644
--- a/desktop/source/deployment/registry/dp_backenddb.cxx
+++ b/desktop/source/deployment/registry/dp_backenddb.cxx
@@ -39,8 +39,7 @@
using namespace ::com::sun::star::uno;
-namespace dp_registry {
-namespace backend {
+namespace dp_registry::backend {
BackendDb::BackendDb(
Reference<css::uno::XComponentContext> const & xContext,
@@ -656,7 +655,6 @@ void RegisteredDb::addEntry(OUString const & url)
}
}
-} // namespace backend
-} // namespace dp_registry
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx
index 660ffc8a43df..157da6b2f6b2 100644
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -37,9 +37,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ucb;
using namespace dp_misc;
-namespace dp_registry {
-namespace backend {
-namespace executable {
+namespace dp_registry::backend::executable {
namespace {
class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
@@ -311,9 +309,7 @@ sdecl::ServiceDecl const serviceDecl(
"com.sun.star.comp.deployment.executable.PackageRegistryBackend",
BACKEND_SERVICE_NAME );
-} // namespace component
-} // namespace backend
-} // namespace dp_registry
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx b/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx
index e872ba181131..d4a044e00667 100644
--- a/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx
@@ -31,9 +31,7 @@ using namespace ::com::sun::star::uno;
#define ROOT_ELEMENT_NAME "executable-backend-db"
#define ENTRY_NAME "executable"
-namespace dp_registry {
-namespace backend {
-namespace executable {
+namespace dp_registry::backend::executable {
ExecutableBackendDb::ExecutableBackendDb(
Reference<XComponentContext> const & xContext,
@@ -63,8 +61,6 @@ OUString ExecutableBackendDb::getKeyElementName()
}
-} // namespace executable
-} // namespace backend
-} // namespace dp_registry
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index cba0ac01d7a7..f940ca963be2 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -49,9 +49,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ucb;
-namespace dp_registry {
-namespace backend {
-namespace help {
+namespace dp_registry::backend::help {
namespace {
@@ -600,8 +598,6 @@ sdecl::ServiceDecl const serviceDecl(
"com.sun.star.comp.deployment.help.PackageRegistryBackend",
BACKEND_SERVICE_NAME );
-} // namespace help
-} // namespace backend
-} // namespace dp_registry
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
index 7f9f7095be85..cbb9f991c25a 100644
--- a/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
+++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
@@ -37,9 +37,7 @@ using namespace ::com::sun::star::uno;
#define ROOT_ELEMENT_NAME "help-backend-db"
#define KEY_ELEMENT_NAME "help"
-namespace dp_registry {
-namespace backend {
-namespace help {
+namespace dp_registry::backend::help {
HelpBackendDb::HelpBackendDb(
Reference<XComponentContext> const & xContext,
@@ -128,8 +126,6 @@ std::vector<OUString> HelpBackendDb::getAllDataUrls()
return getOneChildFromAllEntries("data-url");
}
-} // namespace help
-} // namespace backend
-} // namespace dp_registry
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.cxx b/desktop/source/deployment/registry/package/dp_extbackenddb.cxx
index e47138d6598a..16766a913b8d 100644
--- a/desktop/source/deployment/registry/package/dp_extbackenddb.cxx
+++ b/desktop/source/deployment/registry/package/dp_extbackenddb.cxx
@@ -36,9 +36,7 @@ using namespace ::com::sun::star::uno;
#define ROOT_ELEMENT_NAME "extension-backend-db"
#define KEY_ELEMENT_NAME "extension"
-namespace dp_registry {
-namespace backend {
-namespace bundle {
+namespace dp_registry::backend::bundle {
ExtensionBackendDb::ExtensionBackendDb(
Reference<XComponentContext> const & xContext,
@@ -112,8 +110,6 @@ ExtensionBackendDb::Data ExtensionBackendDb::getEntry(OUString const & url)
}
}
-} // namespace bundle
-} // namespace backend
-} // namespace dp_registry
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 9ea8c47ea3db..3bb6f2c5bd40 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -81,9 +81,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-namespace dp_registry {
-namespace backend {
-namespace bundle {
+namespace dp_registry::backend::bundle {
namespace {
typedef cppu::ImplInheritanceHelper<PackageRegistryBackend,
@@ -1596,8 +1594,6 @@ Reference<deployment::XPackageRegistry> create(
return new BackendImpl( args, xComponentContext, xRootRegistry );
}
-} // namespace bundle
-} // namespace backend
-} // namespace dp_registry
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/script/dp_lib_container.cxx b/desktop/source/deployment/registry/script/dp_lib_container.cxx
index 96ac2517caea..3a6f30253fb0 100644
--- a/desktop/source/deployment/registry/script/dp_lib_container.cxx
+++ b/desktop/source/deployment/registry/script/dp_lib_container.cxx
@@ -37,9 +37,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ucb;
-namespace dp_registry {
-namespace backend {
-namespace script {
+namespace dp_registry::backend::script {
namespace {
OUString StrCannotDetermineLibName() { return DpResId(RID_STR_CANNOT_DETERMINE_LIBNAME); }
@@ -61,8 +59,6 @@ OUString LibraryContainer::get_libname(
return import.aName;
}
-}
-}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx
index a6c56bd81969..df9d93eaba5e 100644
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/desktop/source/deployment/registry/script/dp_script.cxx
@@ -40,9 +40,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ucb;
-namespace dp_registry {
-namespace backend {
-namespace script {
+namespace dp_registry::backend::script {
namespace {
typedef ::cppu::ImplInheritanceHelper<
@@ -459,8 +457,6 @@ sdecl::ServiceDecl const serviceDecl(
"com.sun.star.comp.deployment.script.PackageRegistryBackend",
BACKEND_SERVICE_NAME );
-} // namespace script
-} // namespace backend
-} // namespace dp_registry
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx b/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx
index 9f7d71363d1a..425fa4fe0579 100644
--- a/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx
+++ b/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx
@@ -34,9 +34,7 @@ using namespace ::com::sun::star::uno;
#define ROOT_ELEMENT_NAME "script-backend-db"
#define KEY_ELEMENT_NAME "script"
-namespace dp_registry {
-namespace backend {
-namespace script {
+namespace dp_registry::backend::script {
ScriptBackendDb::ScriptBackendDb(
Reference<XComponentContext> const & xContext,
@@ -66,8 +64,6 @@ OUString ScriptBackendDb::getKeyElementName()
}
-} // namespace executable
-} // namespace backend
-} // namespace dp_registry
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx
index 653d0a1a9d67..530924a07864 100644
--- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx
@@ -25,11 +25,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-namespace dp_registry
-{
-namespace backend
-{
-namespace sfwk
+namespace dp_registry::backend::sfwk
{
@@ -102,8 +98,6 @@ void SAL_CALL ParcelDescDocHandler::endElement( const OUString & aName )
}
-}
-}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index 4b66e51ede80..b1041ef31135 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -41,11 +41,7 @@ using namespace ::com::sun::star::ucb;
using namespace ::com::sun::star::script;
-namespace dp_registry
-{
-namespace backend
-{
-namespace sfwk
+namespace dp_registry::backend::sfwk
{
namespace {
@@ -358,8 +354,6 @@ sdecl::ServiceDecl const serviceDecl(
"com.sun.star.comp.deployment.sfwk.PackageRegistryBackend",
BACKEND_SERVICE_NAME );
-} // namespace sfwk
-} // namespace backend
-} // namespace dp_registry
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list