From 2eb0e7594cc875dd0960822d9403b573ac00f739 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 13 Mar 2020 09:59:10 +0200 Subject: Revert "loplugin:constfields in stoc..svgio" This reverts commit 0ddf3e0a628599d01356cb5262b93faca073ee9f. Change-Id: I3e476399a465950defc15ac4d6199a638c4a4baf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90452 Tested-by: Jenkins Reviewed-by: Noel Grandin --- stoc/source/corereflection/base.hxx | 6 +++--- stoc/source/corereflection/crcomp.cxx | 2 +- stoc/source/implementationregistration/mergekeys.cxx | 4 ++-- stoc/source/inspect/introspection.cxx | 2 +- stoc/source/invocation/invocation.cxx | 2 +- stoc/source/invocation_adapterfactory/iafactory.cxx | 2 +- stoc/source/javavm/interact.hxx | 2 +- stoc/source/proxy_factory/proxyfac.cxx | 4 ++-- stoc/source/security/file_policy.cxx | 2 +- stoc/source/security/permissions.cxx | 8 ++++---- stoc/source/security/permissions.h | 2 +- stoc/source/servicemanager/servicemanager.cxx | 2 +- stoc/source/uriproc/UriReference.hxx | 10 +++++----- 13 files changed, 24 insertions(+), 24 deletions(-) (limited to 'stoc') diff --git a/stoc/source/corereflection/base.hxx b/stoc/source/corereflection/base.hxx index 4f8be7282230..02742fdb660e 100644 --- a/stoc/source/corereflection/base.hxx +++ b/stoc/source/corereflection/base.hxx @@ -140,8 +140,8 @@ class IdlClassImpl rtl::Reference m_xReflection; - OUString const _aName; - css::uno::TypeClass const _eTypeClass; + OUString _aName; + css::uno::TypeClass _eTypeClass; typelib_TypeDescription * _pTypeDescr; @@ -321,7 +321,7 @@ class IdlMemberImpl { rtl::Reference m_xReflection; - OUString const _aName; + OUString _aName; typelib_TypeDescription * _pTypeDescr; typelib_TypeDescription * _pDeclTypeDescr; diff --git a/stoc/source/corereflection/crcomp.cxx b/stoc/source/corereflection/crcomp.cxx index a42ee6742f92..da4ad43b83e6 100644 --- a/stoc/source/corereflection/crcomp.cxx +++ b/stoc/source/corereflection/crcomp.cxx @@ -40,7 +40,7 @@ class IdlCompFieldImpl , public XIdlField , public XIdlField2 { - sal_Int32 const _nOffset; + sal_Int32 _nOffset; public: IdlCompFieldImpl( IdlReflectionServiceImpl * pReflection, const OUString & rName, diff --git a/stoc/source/implementationregistration/mergekeys.cxx b/stoc/source/implementationregistration/mergekeys.cxx index 1a8f8fcce8c4..da7da509ebce 100644 --- a/stoc/source/implementationregistration/mergekeys.cxx +++ b/stoc/source/implementationregistration/mergekeys.cxx @@ -37,8 +37,8 @@ namespace { struct Link { - OUString const m_name; - OUString const m_target; + OUString m_name; + OUString m_target; Link( OUString const & name, OUString const & target ) : m_name( name ) diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx index 14ecf79af050..9317a5c35493 100644 --- a/stoc/source/inspect/introspection.cxx +++ b/stoc/source/inspect/introspection.cxx @@ -643,7 +643,7 @@ class ImplIntrospectionAccess : public IntrospectionAccessHelper friend class Implementation; // Object under examination - Any const maInspectedObject; + Any maInspectedObject; // As interface Reference mxIface; diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx index 9343e0865e22..8027442aa9b2 100644 --- a/stoc/source/invocation/invocation.cxx +++ b/stoc/source/invocation/invocation.cxx @@ -212,7 +212,7 @@ private: Reference _xENDirect, _xENIntrospection; - bool const mbFromOLE; + bool mbFromOLE; }; } diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx index 060170fe420f..e6a66cf8d126 100644 --- a/stoc/source/invocation_adapterfactory/iafactory.cxx +++ b/stoc/source/invocation_adapterfactory/iafactory.cxx @@ -132,7 +132,7 @@ struct AdapterImpl { oslInterlockedCount m_nRef; FactoryImpl * m_pFactory; - void * const m_key; // map key + void * m_key; // map key uno_Interface * m_pReceiver; // XInvocation receiver std::vector m_vInterfaces; diff --git a/stoc/source/javavm/interact.hxx b/stoc/source/javavm/interact.hxx index b994c94710f6..da0ae985e3db 100644 --- a/stoc/source/javavm/interact.hxx +++ b/stoc/source/javavm/interact.hxx @@ -54,7 +54,7 @@ private: virtual ~InteractionRequest() override; - css::uno::Any const m_aRequest; + css::uno::Any m_aRequest; css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > m_aContinuations; rtl::Reference< RetryContinuation > m_xRetryContinuation; diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx index fde960165078..eac0c2a5965b 100644 --- a/stoc/source/proxy_factory/proxyfac.cxx +++ b/stoc/source/proxy_factory/proxyfac.cxx @@ -162,8 +162,8 @@ struct binuno_Proxy : public uno_Interface { oslInterlockedCount m_nRefCount; ::rtl::Reference< ProxyRoot > m_root; - UnoInterfaceReference const m_target; - OUString const m_oid; + UnoInterfaceReference m_target; + OUString m_oid; TypeDescription m_typeDescr; binuno_Proxy( diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx index 97b0496a9c6b..7b70602f982c 100644 --- a/stoc/source/security/file_policy.cxx +++ b/stoc/source/security/file_policy.cxx @@ -134,7 +134,7 @@ Sequence< Any > FilePolicy::getDefaultPermissions() class PolicyReader { - OUString const m_fileName; + OUString m_fileName; oslFileHandle m_file; sal_Int32 m_linepos; diff --git a/stoc/source/security/permissions.cxx b/stoc/source/security/permissions.cxx index ed05614bb2a0..86e523e5a9fe 100644 --- a/stoc/source/security/permissions.cxx +++ b/stoc/source/security/permissions.cxx @@ -109,7 +109,7 @@ class SocketPermission : public Permission mutable OUString m_ip; mutable bool m_resolveErr; mutable bool m_resolvedHost; - bool const m_wildCardHost; + bool m_wildCardHost; inline bool resolveHost() const; @@ -271,10 +271,10 @@ namespace { class FilePermission : public Permission { static char const * s_actions []; - sal_Int32 const m_actions; + sal_Int32 m_actions; OUString m_url; - bool const m_allFiles; + bool m_allFiles; public: FilePermission( @@ -416,7 +416,7 @@ namespace { class RuntimePermission : public Permission { - OUString const m_name; + OUString m_name; public: RuntimePermission( diff --git a/stoc/source/security/permissions.h b/stoc/source/security/permissions.h index 49ee2a53d389..eb0b307787a4 100644 --- a/stoc/source/security/permissions.h +++ b/stoc/source/security/permissions.h @@ -34,7 +34,7 @@ class Permission : public ::salhelper::SimpleReferenceObject public: ::rtl::Reference< Permission > m_next; // mode - enum t_type { ALL, RUNTIME, SOCKET, FILE } const m_type; + enum t_type { ALL, RUNTIME, SOCKET, FILE } m_type; Permission( t_type type, diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx index d1930096ffe8..22f6ba76de54 100644 --- a/stoc/source/servicemanager/servicemanager.cxx +++ b/stoc/source/servicemanager/servicemanager.cxx @@ -162,7 +162,7 @@ Any ServiceEnumeration_Impl::nextElement() class PropertySetInfo_Impl : public WeakImplHelper< beans::XPropertySetInfo > { - Sequence< beans::Property > const m_properties; + Sequence< beans::Property > m_properties; public: explicit PropertySetInfo_Impl( Sequence< beans::Property > const & properties ) diff --git a/stoc/source/uriproc/UriReference.hxx b/stoc/source/uriproc/UriReference.hxx index 2f56bfc6f7ca..9ce7d150e23d 100644 --- a/stoc/source/uriproc/UriReference.hxx +++ b/stoc/source/uriproc/UriReference.hxx @@ -88,13 +88,13 @@ public: void clearFragment(); osl::Mutex m_mutex; - OUString const m_scheme; - OUString const m_authority; + OUString m_scheme; + OUString m_authority; OUString m_path; - OUString const m_query; + OUString m_query; OUString m_fragment; - bool const m_hasAuthority; - bool const m_hasQuery; + bool m_hasAuthority; + bool m_hasQuery; bool m_hasFragment; private: -- cgit