Revert "loplugin:constfields in ucb"

This reverts commit d8f8b43759.

Change-Id: Iece88b16cfb2e4ff18dd82bbf6624dc64a33cebf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90519
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2020-03-15 16:29:08 +01:00
parent d7fd62cf68
commit 391497e8a9
38 changed files with 56 additions and 56 deletions
+1 -1
View File
@@ -36,7 +36,7 @@ public:
virtual OUString SAL_CALL getContentProviderScheme() override;
private:
OUString const m_aContentId;
OUString m_aContentId;
OUString m_aProviderScheme;
};
+1 -1
View File
@@ -36,7 +36,7 @@ class UcbPropertiesManager : public cppu::WeakImplHelper <
css::lang::XServiceInfo,
css::beans::XPropertySetInfo >
{
css::uno::Sequence< css::beans::Property > const m_pProps;
css::uno::Sequence< css::beans::Property > m_pProps;
private:
bool queryProperty( const OUString& rName,
+1 -1
View File
@@ -1055,7 +1055,7 @@ struct PersistentPropertySet_Impl
{
rtl::Reference<PropertySetRegistry> m_pCreator;
rtl::Reference<PropertySetInfo_Impl> m_pInfo;
OUString const m_aKey;
OUString m_aKey;
OUString m_aFullKey;
osl::Mutex m_aMutex;
std::unique_ptr<OInterfaceContainerHelper2> m_pDisposeEventListeners;
+1 -1
View File
@@ -69,7 +69,7 @@ struct SortListData
{
bool mbModified;
sal_IntPtr mnCurPos;
sal_IntPtr const mnOldPos;
sal_IntPtr mnOldPos;
explicit SortListData( sal_IntPtr nPos );
};
+2 -2
View File
@@ -28,8 +28,8 @@ namespace cmis
{
const css::uno::Reference< css::ucb::XCommandEnvironment>& m_xEnv;
static css::uno::WeakReference< css::ucb::XCommandEnvironment> sm_xEnv;
OUString const m_sUrl;
OUString const m_sBindingUrl;
OUString m_sUrl;
OUString m_sBindingUrl;
public:
AuthProvider ( const css::uno::Reference< css::ucb::XCommandEnvironment>& xEnv,
@@ -30,7 +30,7 @@ namespace cmis
{
const css::uno::Reference< css::ucb::XCommandEnvironment>& m_xEnv;
const css::uno::Reference< css::uno::XComponentContext >& m_xContext;
OUString const m_sHostname;
OUString m_sHostname;
public:
CertValidationHandler (
+2 -2
View File
@@ -69,11 +69,11 @@ private:
OUString m_sObjectPath;
OUString m_sObjectId;
OUString m_sURL;
cmis::URL const m_aURL;
cmis::URL m_aURL;
// Members to be set for non-persistent content
bool m_bTransient;
bool const m_bIsFolder;
bool m_bIsFolder;
libcmis::ObjectTypePtr m_pObjectType;
std::map< std::string, libcmis::PropertyPtr > m_pObjectProps;
+1 -1
View File
@@ -35,7 +35,7 @@ namespace cmis
{
private:
ChildrenProvider* m_pChildrenProvider;
sal_Int32 const mnOpenMode;
sal_Int32 mnOpenMode;
bool mbCountFinal;
void getData();
std::vector< ResultListEntry > maResults;
+2 -2
View File
@@ -49,8 +49,8 @@ class RepoContent : public ::ucbhelper::ContentImplHelper,
public ChildrenProvider
{
private:
ContentProvider* const m_pProvider;
URL const m_aURL;
ContentProvider* m_pProvider;
URL m_aURL;
OUString m_sRepositoryId;
std::vector< libcmis::RepositoryPtr > m_aRepositories;
+1 -1
View File
@@ -20,7 +20,7 @@ namespace cmis
class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper
{
ChildrenProvider* const m_pChildrenProvider;
ChildrenProvider* m_pChildrenProvider;
css::uno::Reference< css::ucb::XCommandEnvironment > m_xEnv;
private:
+2 -2
View File
@@ -201,8 +201,8 @@ namespace fileaccess {
JustInserted = 2,
Deleted = 4,
FullFeatured = 8 };
bool const m_bFolder;
sal_uInt16 m_nState;
bool m_bFolder;
sal_uInt16 m_nState;
osl::Mutex m_aMutex;
+2 -2
View File
@@ -129,8 +129,8 @@ class XInteractionSupplyNameImpl : public cppu::WeakImplHelper<
private:
XInteractionSupplyNameImpl* const p1;
XInteractionAbortImpl* const p2;
XInteractionSupplyNameImpl* p1;
XInteractionAbortImpl* p2;
css::uno::Reference<css::task::XInteractionRequest> m_xRequest;
+1 -1
View File
@@ -101,7 +101,7 @@ namespace fileaccess {
osl::Mutex m_aMutex;
css::uno::Sequence< css::uno::Any > m_aValueMap;
bool m_nWasNull;
TaskManager* const m_pMyShell;
TaskManager* m_pMyShell;
css::uno::Reference< css::script::XTypeConverter > m_xTypeConverter;
bool isIndexOutOfBounds( sal_Int32 nIndex );
+3 -3
View File
@@ -393,7 +393,7 @@ class XResultSet_impl :
bool m_nIsOpen;
sal_Int32 m_nRow;
bool m_nWasNull;
sal_Int32 const m_nOpenMode;
sal_Int32 m_nOpenMode;
bool m_bRowCountFinal;
typedef std::vector< css::uno::Reference< css::ucb::XContentIdentifier > > IdentSet;
@@ -405,8 +405,8 @@ class XResultSet_impl :
const OUString m_aBaseDirectory;
osl::Directory m_aFolder;
css::uno::Sequence< css::beans::Property > const m_sProperty;
css::uno::Sequence< css::ucb::NumberedSortingInfo > const m_sSortingInfo;
css::uno::Sequence< css::beans::Property > m_sProperty;
css::uno::Sequence< css::ucb::NumberedSortingInfo > m_sSortingInfo;
osl::Mutex m_aMutex;
osl::Mutex m_aEventListenerMutex;
+5 -5
View File
@@ -157,13 +157,13 @@ namespace fileaccess
class MyProperty
{
private:
OUString const PropertyName;
sal_Int32 const Handle;
bool const isNative;
css::uno::Type const Typ; // Duplicates information in Value
OUString PropertyName;
sal_Int32 Handle;
bool isNative;
css::uno::Type Typ; // Duplicates information in Value
css::uno::Any Value;
css::beans::PropertyState State;
sal_Int16 const Attributes;
sal_Int16 Attributes;
public:
explicit MyProperty( const OUString& thePropertyName );
MyProperty( bool theIsNative,
+1 -1
View File
@@ -113,7 +113,7 @@ private:
FTPURL m_aFTPURL;
bool m_bInserted;
bool m_bTitleSet;
css::ucb::ContentInfo const m_aInfo;
css::ucb::ContentInfo m_aInfo;
virtual css::uno::Sequence< css::beans::Property >
getProperties( const css::uno::Reference<
+1 -1
View File
@@ -51,7 +51,7 @@ namespace ftp {
private:
OUString const m_ident;
OUString m_ident;
};
}
+1 -1
View File
@@ -71,7 +71,7 @@ namespace ftp {
private:
XInteractionApproveImpl* const p1;
XInteractionApproveImpl* p1;
css::uno::Reference<css::task::XInteractionRequest> m_xRequest;
+1 -1
View File
@@ -50,7 +50,7 @@ namespace ftp {
FTPLoaderThread(const FTPLoaderThread&) = delete;
FTPLoaderThread& operator=(const FTPLoaderThread&) = delete;
oslThreadKey const m_threadKey;
oslThreadKey m_threadKey;
}; // end class FTPLoaderThread
+1 -1
View File
@@ -395,7 +395,7 @@ namespace ftp {
ItemSet m_aItems;
std::vector<OUString> m_aPath;
css::uno::Sequence< css::beans::Property > const
css::uno::Sequence< css::beans::Property >
m_sProperty;
osl::Mutex m_aMutex;
+2 -2
View File
@@ -47,8 +47,8 @@ public:
private:
css::uno::Reference< css::uno::XComponentContext > m_xContext;
css::uno::Reference< css::ucb::XContentProvider > m_xProvider;
css::uno::Sequence< css::beans::Property > const m_seq;
std::vector<FTPDirentry> const m_dirvec;
css::uno::Sequence< css::beans::Property > m_seq;
std::vector<FTPDirentry> m_dirvec;
};
}
+1 -1
View File
@@ -59,7 +59,7 @@ namespace ftp {
private:
sal_Int32 const n_err;
sal_Int32 n_err;
};
class CurlInput {
+1 -1
View File
@@ -64,7 +64,7 @@ class ContentProvider;
class Content : public ::ucbhelper::ContentImplHelper, public css::ucb::XContentCreator
{
private:
ContentProvider * const m_pProvider;
ContentProvider *m_pProvider;
GFile* mpFile;
GFileInfo *mpInfo;
bool mbTransient;
+2 -2
View File
@@ -36,7 +36,7 @@ struct ResultListEntry
css::uno::Reference< css::ucb::XContentIdentifier > xId;
css::uno::Reference< css::ucb::XContent > xContent;
css::uno::Reference< css::sdbc::XRow > xRow;
GFileInfo * const pInfo;
GFileInfo *pInfo;
explicit ResultListEntry( GFileInfo *pInInfo ) : pInfo(pInInfo)
{
@@ -55,7 +55,7 @@ class DataSupplier : public ucbhelper::ResultSetDataSupplier
{
private:
rtl::Reference< ::gio::Content > mxContent;
sal_Int32 const mnOpenMode;
sal_Int32 mnOpenMode;
bool mbCountFinal;
bool getData();
ResultList maResults;
+1 -1
View File
@@ -34,7 +34,7 @@ namespace gio
class InputStream final : public cppu::WeakImplHelper<css::io::XInputStream>
{
private:
GFileInputStream * const mpStream;
GFileInputStream *mpStream;
public:
explicit InputStream ( GFileInputStream *pStream );
+1 -1
View File
@@ -38,7 +38,7 @@ class OutputStream final :
public Seekable
{
private:
GFileOutputStream * const mpStream;
GFileOutputStream *mpStream;
public:
explicit OutputStream ( GFileOutputStream *pStream );
+1 -1
View File
@@ -37,7 +37,7 @@ class Seekable : public css::io::XTruncate,
public ::cppu::OWeakObject
{
private:
GSeekable * const mpStream;
GSeekable *mpStream;
public:
explicit Seekable( GSeekable *pStream );
virtual ~Seekable() override;
@@ -84,7 +84,7 @@ class HierarchyDataAccess : public cppu::OWeakObject,
uno::Reference< container::XElementAccess > m_xCfgEA;
uno::Reference< util::XChangesNotifier > m_xCfgCN;
uno::Reference< util::XChangesBatch > m_xCfgCB;
bool const m_bReadOnly;
bool m_bReadOnly;
public:
HierarchyDataAccess( const uno::Reference<
@@ -50,7 +50,7 @@ struct ResultListEntry
uno::Reference< ucb::XContentIdentifier > xId;
uno::Reference< ucb::XContent > xContent;
uno::Reference< sdbc::XRow > xRow;
HierarchyEntryData const aData;
HierarchyEntryData aData;
explicit ResultListEntry( const HierarchyEntryData& rEntry ) : aData( rEntry ) {}
};
@@ -73,8 +73,8 @@ struct DataSupplier_Impl
rtl::Reference< HierarchyContent > m_xContent;
uno::Reference< uno::XComponentContext > m_xContext;
HierarchyEntry m_aFolder;
HierarchyEntry::iterator const m_aIterator;
sal_Int32 const m_nOpenMode;
HierarchyEntry::iterator m_aIterator;
sal_Int32 m_nOpenMode;
bool m_bCountFinal;
DataSupplier_Impl(
+1 -1
View File
@@ -51,7 +51,7 @@ namespace {
struct ResultListEntry
{
OUString const aURL;
OUString aURL;
uno::Reference< ucb::XContentIdentifier > xId;
uno::Reference< ucb::XContent > xContent;
uno::Reference< sdbc::XRow > xRow;
+1 -1
View File
@@ -53,7 +53,7 @@ class Package : public cppu::OWeakObject,
{
friend ContentProvider;
OUString const m_aName;
OUString m_aName;
uno::Reference< container::XHierarchicalNameAccess > m_xNA;
ContentProvider* m_pOwner;
+1 -1
View File
@@ -47,7 +47,7 @@ namespace {
struct ResultListEntry
{
OUString const aURL;
OUString aURL;
uno::Reference< ucb::XContentIdentifier > xId;
uno::Reference< ucb::XContent > xContent;
uno::Reference< sdbc::XRow > xRow;
+1 -1
View File
@@ -174,7 +174,7 @@ private:
css::uno::Reference< css::embed::XTransactedObject > m_xWrappedTransObj;
css::uno::Reference< css::lang::XComponent > m_xWrappedComponent;
css::uno::Reference< css::lang::XTypeProvider > m_xWrappedTypeProv;
bool const m_bIsDocumentStorage;
bool m_bIsDocumentStorage;
StorageElementFactory::StorageMap::iterator m_aContainerIt;
+3 -3
View File
@@ -195,9 +195,9 @@ namespace webdav_ucp
struct ProppatchValue
{
ProppatchOperation const operation;
OUString const name;
css::uno::Any const value;
ProppatchOperation operation;
OUString name;
css::uno::Any value;
ProppatchValue( const ProppatchOperation o,
const OUString & n,
+1 -1
View File
@@ -63,7 +63,7 @@ typedef std::map< NeonLock *, LockInfo > LockInfoMap;
class NeonLockStore
{
osl::Mutex m_aMutex;
ne_lock_store * const m_pNeonLockStore;
ne_lock_store * m_pNeonLockStore;
rtl::Reference< TickerThread > m_pTickerThread;
LockInfoMap m_aLockInfoMap;
std::vector<NeonLock*> m_aRemoveDeferred;
+2 -2
View File
@@ -52,10 +52,10 @@ private:
OUString m_aProxyName;
sal_Int32 m_nPort;
sal_Int32 m_nProxyPort;
css::uno::Sequence< css::beans::NamedValue > const m_aFlags;
css::uno::Sequence< css::beans::NamedValue > m_aFlags;
HttpSession * m_pHttpSession;
bool m_bNeedNewSession = false; // Something happened that could invalidate m_pHttpSession
void * const m_pRequestData;
void * m_pRequestData;
const ucbhelper::InternetProxyDecider & m_rProxyDecider;
// @@@ This should really be per-request data. But Neon currently
+1 -1
View File
@@ -94,7 +94,7 @@ class Content : public ::ucbhelper::ContentImplHelper,
ResourceType m_eResourceTypeForLocks;
ContentProvider* m_pProvider; // No need for a ref, base class holds object
bool m_bTransient;
bool const m_bCollection;
bool m_bCollection;
bool m_bDidGetOrHead;
std::vector< OUString > m_aFailedPropNames;
// Options Cache lifetime
@@ -87,7 +87,7 @@ struct DataSupplier_Impl
ResultList m_Results;
rtl::Reference< Content > m_xContent;
uno::Reference< uno::XComponentContext > m_xContext;
sal_Int32 const m_nOpenMode;
sal_Int32 m_nOpenMode;
bool m_bCountFinal;
bool m_bThrowException;