[Libreoffice-commits] core.git: include/registry registry/source store/source
Noel Grandin
noel.grandin at collabora.co.uk
Mon Jul 17 08:20:51 UTC 2017
include/registry/registry.hxx | 12 ++++++------
include/registry/typereg_reader.hxx | 2 +-
include/registry/writer.h | 2 +-
registry/source/reflread.cxx | 4 ++--
registry/source/reflwrit.cxx | 14 +++++++-------
registry/source/regimpl.cxx | 12 ++++++------
registry/source/regimpl.hxx | 8 ++++----
store/source/stordir.cxx | 4 ++--
store/source/stordir.hxx | 4 ++--
store/source/storlckb.cxx | 4 ++--
store/source/storlckb.hxx | 4 ++--
11 files changed, 35 insertions(+), 35 deletions(-)
New commits:
commit 6f3b39499f9c6c88d637b621ef9ec6189d4fb9ff
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Jul 17 09:34:50 2017 +0200
loplugin:constparams in store,registry
Change-Id: I5633203b372a9abd0138a396958c235ea8aaf66d
Reviewed-on: https://gerrit.libreoffice.org/40039
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/registry/registry.hxx b/include/registry/registry.hxx
index ca282da84bc2..e590c2354dd7 100644
--- a/include/registry/registry.hxx
+++ b/include/registry/registry.hxx
@@ -216,7 +216,7 @@ protected:
@param phKeys points to an array of open keys.
@param length specifies the length of the array specified by phKeys.
*/
- inline void setKeyHandles(Registry& registry, RegKeyHandle* phKeys, sal_uInt32 length);
+ inline void setKeyHandles(Registry const & registry, RegKeyHandle* phKeys, sal_uInt32 length);
/// stores the number of open subkeys, the number of elements.
sal_uInt32 m_length;
@@ -254,7 +254,7 @@ protected:
@param pKeyNames points to an array of key names.
@param length specifies the length of the array specified by pKeyNames.
*/
- inline void setKeyNames(Registry& registry, rtl_uString** pKeyNames, sal_uInt32 length);
+ inline void setKeyNames(Registry const & registry, rtl_uString** pKeyNames, sal_uInt32 length);
/// stores the number of key names, the number of elements.
sal_uInt32 m_length;
@@ -560,7 +560,7 @@ public:
protected:
/** sets the internal registry on which this key should work.
*/
- inline void setRegistry(Registry& registry);
+ inline void setRegistry(Registry const & registry);
/// @endcond
@@ -596,7 +596,7 @@ inline sal_uInt32 RegistryKeyArray::getLength()
return m_length;
}
-inline void RegistryKeyArray::setKeyHandles(Registry& registry,
+inline void RegistryKeyArray::setKeyHandles(Registry const & registry,
RegKeyHandle* phKeys,
sal_uInt32 length)
{
@@ -631,7 +631,7 @@ inline sal_uInt32 RegistryKeyNames::getLength()
return m_length;
}
-inline void RegistryKeyNames::setKeyNames(Registry& registry,
+inline void RegistryKeyNames::setKeyNames(Registry const & registry,
rtl_uString** pKeyNames,
sal_uInt32 length)
{
@@ -663,7 +663,7 @@ inline RegistryKey::RegistryKey(const RegistryKey& toCopy)
}
/// @cond INTERNAL
-inline void RegistryKey::setRegistry(Registry& registry)
+inline void RegistryKey::setRegistry(Registry const & registry)
{
m_registry = registry;
}
diff --git a/include/registry/typereg_reader.hxx b/include/registry/typereg_reader.hxx
index 64c2261f4e0e..d8639ed28121 100644
--- a/include/registry/typereg_reader.hxx
+++ b/include/registry/typereg_reader.hxx
@@ -91,7 +91,7 @@ REG_DLLPUBLIC void SAL_CALL typereg_reader_release(void * handle);
@since UDK 3.2.0
*/
-REG_DLLPUBLIC typereg_Version SAL_CALL typereg_reader_getVersion(void * handle);
+REG_DLLPUBLIC typereg_Version SAL_CALL typereg_reader_getVersion(void const * handle);
/**
Returns the documentation of a type reader.
diff --git a/include/registry/writer.h b/include/registry/writer.h
index e05b09634ede..56ab9c925bf7 100644
--- a/include/registry/writer.h
+++ b/include/registry/writer.h
@@ -185,7 +185,7 @@ REG_DLLPUBLIC sal_Bool SAL_CALL typereg_writer_setMethodData(
@since UDK 3.2.0
*/
REG_DLLPUBLIC sal_Bool SAL_CALL typereg_writer_setMethodParameterData(
- void * handle, sal_uInt16 methodIndex, sal_uInt16 parameterIndex,
+ void const * handle, sal_uInt16 methodIndex, sal_uInt16 parameterIndex,
RTParamMode flags, rtl_uString const * name, rtl_uString const * typeName)
SAL_THROW_EXTERN_C();
diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx
index 343943516490..a93602ffda47 100644
--- a/registry/source/reflread.cxx
+++ b/registry/source/reflread.cxx
@@ -1263,10 +1263,10 @@ void TYPEREG_CALLTYPE typereg_reader_release(void * hEntry)
}
}
-typereg_Version TYPEREG_CALLTYPE typereg_reader_getVersion(void * handle) {
+typereg_Version TYPEREG_CALLTYPE typereg_reader_getVersion(void const * handle) {
if (handle != nullptr) {
try {
- return static_cast< TypeRegistryEntry * >(handle)->getVersion();
+ return static_cast< TypeRegistryEntry const * >(handle)->getVersion();
} catch (BlopObject::BoundsError &) {
SAL_WARN("registry", "bad data");
}
diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx
index 6432ac4290a4..f80c83f1cfeb 100644
--- a/registry/source/reflwrit.cxx
+++ b/registry/source/reflwrit.cxx
@@ -1144,10 +1144,10 @@ sal_Bool TYPEREG_CALLTYPE typereg_writer_setFieldData(
static void TYPEREG_CALLTYPE setFieldData(TypeWriterImpl hEntry,
sal_uInt16 index,
- rtl_uString* name,
- rtl_uString* typeName,
- rtl_uString* doku,
- rtl_uString* fileName,
+ rtl_uString const * name,
+ rtl_uString const * typeName,
+ rtl_uString const * doku,
+ rtl_uString const * fileName,
RTFieldAccess access,
RTValueType valueType,
RTConstValueUnion constValue)
@@ -1175,12 +1175,12 @@ sal_Bool TYPEREG_CALLTYPE typereg_writer_setMethodData(
}
sal_Bool TYPEREG_CALLTYPE typereg_writer_setMethodParameterData(
- void * handle, sal_uInt16 methodIndex, sal_uInt16 parameterIndex,
+ void const * handle, sal_uInt16 methodIndex, sal_uInt16 parameterIndex,
RTParamMode flags, rtl_uString const * name, rtl_uString const * typeName)
SAL_THROW_EXTERN_C()
{
try {
- static_cast< TypeWriter * >(handle)->
+ static_cast< TypeWriter const * >(handle)->
m_methods[methodIndex].m_params[parameterIndex].setData(
toByteString(typeName), toByteString(name), flags);
} catch (std::bad_alloc &) {
@@ -1281,7 +1281,7 @@ sal_Bool TYPEREG_CALLTYPE typereg_writer_setSuperTypeName(
}
static TypeWriterImpl TYPEREG_CALLTYPE createEntry(
- RTTypeClass typeClass, rtl_uString * typeName, rtl_uString * superTypeName,
+ RTTypeClass typeClass, rtl_uString const * typeName, rtl_uString const * superTypeName,
sal_uInt16 fieldCount, sal_uInt16 methodCount, sal_uInt16 referenceCount)
{
OUString empty;
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index ab517844801b..44c00d7fad54 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -896,7 +896,7 @@ RegError ORegistry::loadKey(RegKeyHandle hKey, const OUString& regFileName,
}
RegError ORegistry::loadAndSaveValue(ORegKey* pTargetKey,
- ORegKey* pSourceKey,
+ ORegKey const * pSourceKey,
const OUString& valueName,
sal_uInt32 nCut,
bool bWarnings,
@@ -1021,7 +1021,7 @@ RegError ORegistry::loadAndSaveValue(ORegKey* pTargetKey,
RegError ORegistry::checkBlop(OStoreStream& rValue,
const OUString& sTargetPath,
sal_uInt32 srcValueSize,
- sal_uInt8* pSrcBuffer,
+ sal_uInt8 const * pSrcBuffer,
bool bReport)
{
RegistryTypeReader reader(pSrcBuffer, srcValueSize);
@@ -1123,8 +1123,8 @@ RegError ORegistry::checkBlop(OStoreStream& rValue,
}
}
-static sal_uInt32 checkTypeReaders(RegistryTypeReader& reader1,
- RegistryTypeReader& reader2,
+static sal_uInt32 checkTypeReaders(RegistryTypeReader const & reader1,
+ RegistryTypeReader const & reader2,
std::set< OUString >& nameSet)
{
sal_uInt32 count=0;
@@ -1145,8 +1145,8 @@ static sal_uInt32 checkTypeReaders(RegistryTypeReader& reader1,
}
RegError ORegistry::mergeModuleValue(OStoreStream& rTargetValue,
- RegistryTypeReader& reader,
- RegistryTypeReader& reader2)
+ RegistryTypeReader const & reader,
+ RegistryTypeReader const & reader2)
{
std::set< OUString > nameSet;
sal_uInt32 count = checkTypeReaders(reader, reader2, nameSet);
diff --git a/registry/source/regimpl.hxx b/registry/source/regimpl.hxx
index 4e96a8818747..17afa55d5d1c 100644
--- a/registry/source/regimpl.hxx
+++ b/registry/source/regimpl.hxx
@@ -104,7 +104,7 @@ private:
RegError deleteSubkeysAndValues(ORegKey* pKey);
RegError loadAndSaveValue(ORegKey* pTargetKey,
- ORegKey* pSourceKey,
+ ORegKey const * pSourceKey,
const OUString& valueName,
sal_uInt32 nCut,
bool bWarnings,
@@ -113,12 +113,12 @@ private:
static RegError checkBlop(store::OStoreStream& rValue,
const OUString& sTargetPath,
sal_uInt32 srcValueSize,
- sal_uInt8* pSrcBuffer,
+ sal_uInt8 const * pSrcBuffer,
bool bReport);
static RegError mergeModuleValue(store::OStoreStream& rTargetValue,
- RegistryTypeReader& reader,
- RegistryTypeReader& reader2);
+ RegistryTypeReader const & reader,
+ RegistryTypeReader const & reader2);
RegError loadAndSaveKeys(ORegKey* pTargetKey,
ORegKey* pSourceKey,
diff --git a/store/source/stordir.cxx b/store/source/stordir.cxx
index ec18b81176a3..552828edfaab 100644
--- a/store/source/stordir.cxx
+++ b/store/source/stordir.cxx
@@ -101,8 +101,8 @@ bool OStoreDirectory_Impl::isKindOf (sal_uInt32 nTypeId)
*/
storeError OStoreDirectory_Impl::create (
OStorePageManager *pManager,
- rtl_String *pPath,
- rtl_String *pName,
+ rtl_String const *pPath,
+ rtl_String const *pName,
storeAccessMode eMode)
{
rtl::Reference<OStorePageManager> xManager (pManager);
diff --git a/store/source/stordir.hxx b/store/source/stordir.hxx
index 2d9408a74649..8874e00b596d 100644
--- a/store/source/stordir.hxx
+++ b/store/source/stordir.hxx
@@ -51,8 +51,8 @@ public:
*/
storeError create (
OStorePageManager *pManager,
- rtl_String *pPath,
- rtl_String *pName,
+ rtl_String const *pPath,
+ rtl_String const *pName,
storeAccessMode eAccessMode);
/** iterate.
diff --git a/store/source/storlckb.cxx b/store/source/storlckb.cxx
index 05297cd38e03..aff9066064c4 100644
--- a/store/source/storlckb.cxx
+++ b/store/source/storlckb.cxx
@@ -75,8 +75,8 @@ bool OStoreLockBytes::isKindOf (sal_uInt32 nTypeId)
*/
storeError OStoreLockBytes::create (
OStorePageManager *pManager,
- rtl_String *pPath,
- rtl_String *pName,
+ rtl_String const *pPath,
+ rtl_String const *pName,
storeAccessMode eMode)
{
rtl::Reference<OStorePageManager> xManager (pManager);
diff --git a/store/source/storlckb.hxx b/store/source/storlckb.hxx
index 1303c3574b87..7346d7490915 100644
--- a/store/source/storlckb.hxx
+++ b/store/source/storlckb.hxx
@@ -51,8 +51,8 @@ public:
*/
storeError create (
OStorePageManager *pManager,
- rtl_String *pPath,
- rtl_String *pName,
+ rtl_String const *pPath,
+ rtl_String const *pName,
storeAccessMode eAccessMode);
/** Read at Offset into Buffer.
More information about the Libreoffice-commits
mailing list