summaryrefslogtreecommitdiff
path: root/registry/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-01-28 13:50:17 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-01-28 13:50:37 +0100
commit4e3da621fe26c2ad85258692c63a044d0541bd64 (patch)
tree05607d0de471c5d9451b197945243f735ee168b0 /registry/source
parent4b60941b60262be4861f5e8fba95366d3187c445 (diff)
Some more loplugin:cstylecast clean-up
Change-Id: I132d22e2af3cf673c17d8964f690d48990834884
Diffstat (limited to 'registry/source')
-rw-r--r--registry/source/keyimpl.cxx8
-rw-r--r--registry/source/regimpl.cxx4
-rw-r--r--registry/source/registry.cxx8
-rw-r--r--registry/source/regkey.cxx18
4 files changed, 19 insertions, 19 deletions
diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx
index 3913c8289250..e8c1a67160fa 100644
--- a/registry/source/keyimpl.cxx
+++ b/registry/source/keyimpl.cxx
@@ -90,7 +90,7 @@ RegError ORegKey::openSubKeys(const OUString& keyName, RegKeyHandle** phOpenSubK
ORegKey* pKey = this;
if ( !keyName.isEmpty() )
{
- _ret = openKey(keyName, (RegKeyHandle*)&pKey);
+ _ret = openKey(keyName, reinterpret_cast<RegKeyHandle*>(&pKey));
if (_ret != REG_NO_ERROR)
return _ret;
}
@@ -113,7 +113,7 @@ RegError ORegKey::openSubKeys(const OUString& keyName, RegKeyHandle** phOpenSubK
OUString const sSubKeyName = iter.m_pszName;
ORegKey* pOpenSubKey = 0;
- _ret = pKey->openKey(sSubKeyName, (RegKeyHandle*)&pOpenSubKey);
+ _ret = pKey->openKey(sSubKeyName, reinterpret_cast<RegKeyHandle*>(&pOpenSubKey));
if (_ret != REG_NO_ERROR)
{
*phOpenSubKeys = NULL;
@@ -130,7 +130,7 @@ RegError ORegKey::openSubKeys(const OUString& keyName, RegKeyHandle** phOpenSubK
_err = rStoreDir.next(iter);
}
- *phOpenSubKeys = (RegKeyHandle*)pSubKeys;
+ *phOpenSubKeys = reinterpret_cast<RegKeyHandle*>(pSubKeys);
if (!keyName.isEmpty())
{
(void) releaseKey(pKey);
@@ -154,7 +154,7 @@ RegError ORegKey::getKeyNames(const OUString& keyName,
ORegKey* pKey = this;
if (!keyName.isEmpty())
{
- _ret = openKey(keyName, (RegKeyHandle*)&pKey);
+ _ret = openKey(keyName, reinterpret_cast<RegKeyHandle*>(&pKey));
if (_ret != REG_NO_ERROR)
return _ret;
}
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index 039cde3270b7..90c1ceed4284 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -830,7 +830,7 @@ RegError ORegistry::eraseKey(ORegKey* pKey, const OUString& keyName)
}
ORegKey* pOldKey = 0;
- _ret = pKey->openKey(keyName, (RegKeyHandle*)&pOldKey);
+ _ret = pKey->openKey(keyName, reinterpret_cast<RegKeyHandle*>(&pOldKey));
if (_ret != REG_NO_ERROR)
return _ret;
@@ -1363,7 +1363,7 @@ RegError ORegistry::loadAndSaveKeys(ORegKey* pTargetKey,
}
ORegKey* pTmpKey = 0;
- _ret = pSourceKey->openKey(keyName, (RegKeyHandle*)&pTmpKey);
+ _ret = pSourceKey->openKey(keyName, reinterpret_cast<RegKeyHandle*>(&pTmpKey));
if (_ret != REG_NO_ERROR)
return _ret;
diff --git a/registry/source/registry.cxx b/registry/source/registry.cxx
index fc1412dfbcc3..961b1ac6b645 100644
--- a/registry/source/registry.cxx
+++ b/registry/source/registry.cxx
@@ -264,14 +264,14 @@ static RegError REGISTRY_CALLTYPE loadKey(RegHandle hReg,
ORegKey* pNewKey = 0;
- RegError _ret = pKey->openKey(keyName, (RegKeyHandle*)&pNewKey);
+ RegError _ret = pKey->openKey(keyName, reinterpret_cast<RegKeyHandle*>(&pNewKey));
if (_ret == REG_NO_ERROR)
{
pKey->releaseKey(pNewKey);
pKey->deleteKey(keyName);
}
- _ret = pKey->createKey(keyName, (RegKeyHandle*)&pNewKey);
+ _ret = pKey->createKey(keyName, reinterpret_cast<RegKeyHandle*>(&pNewKey));
if (_ret != REG_NO_ERROR)
return _ret;
@@ -312,7 +312,7 @@ static RegError REGISTRY_CALLTYPE saveKey(RegHandle hReg,
return REG_INVALID_KEY;
ORegKey* pNewKey = 0;
- RegError _ret = pKey->openKey(keyName, (RegKeyHandle*)&pNewKey);
+ RegError _ret = pKey->openKey(keyName, reinterpret_cast<RegKeyHandle*>(&pNewKey));
if (_ret != REG_NO_ERROR)
return _ret;
@@ -355,7 +355,7 @@ static RegError REGISTRY_CALLTYPE mergeKey(RegHandle hReg,
if (keyName->length)
{
ORegKey* pNewKey = 0;
- RegError _ret = pKey->createKey(keyName, (RegKeyHandle*)&pNewKey);
+ RegError _ret = pKey->createKey(keyName, reinterpret_cast<RegKeyHandle*>(&pNewKey));
if (_ret != REG_NO_ERROR)
return _ret;
diff --git a/registry/source/regkey.cxx b/registry/source/regkey.cxx
index 2512dfd253d8..6e314e02a639 100644
--- a/registry/source/regkey.cxx
+++ b/registry/source/regkey.cxx
@@ -218,7 +218,7 @@ RegError REGISTRY_CALLTYPE setValue(RegKeyHandle hKey,
if (keyName->length)
{
ORegKey* pSubKey = 0;
- RegError _ret1 = pKey->openKey(keyName, (RegKeyHandle*)&pSubKey);
+ RegError _ret1 = pKey->openKey(keyName, reinterpret_cast<RegKeyHandle*>(&pSubKey));
if (_ret1 != REG_NO_ERROR)
return _ret1;
@@ -260,7 +260,7 @@ RegError REGISTRY_CALLTYPE setLongListValue(RegKeyHandle hKey,
if (keyName->length)
{
ORegKey* pSubKey = 0;
- RegError _ret1 = pKey->openKey(keyName, (RegKeyHandle*)&pSubKey);
+ RegError _ret1 = pKey->openKey(keyName, reinterpret_cast<RegKeyHandle*>(&pSubKey));
if (_ret1 != REG_NO_ERROR)
return _ret1;
@@ -302,7 +302,7 @@ RegError REGISTRY_CALLTYPE setStringListValue(RegKeyHandle hKey,
if (keyName->length)
{
ORegKey* pSubKey = 0;
- RegError _ret1 = pKey->openKey(keyName, (RegKeyHandle*)&pSubKey);
+ RegError _ret1 = pKey->openKey(keyName, reinterpret_cast<RegKeyHandle*>(&pSubKey));
if (_ret1 != REG_NO_ERROR)
return _ret1;
@@ -344,7 +344,7 @@ RegError REGISTRY_CALLTYPE setUnicodeListValue(RegKeyHandle hKey,
if (keyName->length)
{
ORegKey* pSubKey = 0;
- RegError _ret1 = pKey->openKey(keyName, (RegKeyHandle*)&pSubKey);
+ RegError _ret1 = pKey->openKey(keyName, reinterpret_cast<RegKeyHandle*>(&pSubKey));
if (_ret1 != REG_NO_ERROR)
return _ret1;
@@ -389,7 +389,7 @@ RegError REGISTRY_CALLTYPE getValueInfo(RegKeyHandle hKey,
if (keyName->length)
{
ORegKey* pSubKey = 0;
- RegError _ret = pKey->openKey(keyName, (RegKeyHandle*)&pSubKey);
+ RegError _ret = pKey->openKey(keyName, reinterpret_cast<RegKeyHandle*>(&pSubKey));
if (_ret != REG_NO_ERROR)
return _ret;
@@ -435,7 +435,7 @@ RegError REGISTRY_CALLTYPE getValue(RegKeyHandle hKey,
if (keyName->length)
{
ORegKey* pSubKey = 0;
- RegError _ret1 = pKey->openKey(keyName, (RegKeyHandle*)&pSubKey);
+ RegError _ret1 = pKey->openKey(keyName, reinterpret_cast<RegKeyHandle*>(&pSubKey));
if (_ret1 != REG_NO_ERROR)
return _ret1;
@@ -474,7 +474,7 @@ RegError REGISTRY_CALLTYPE getLongListValue(RegKeyHandle hKey,
if (keyName->length)
{
ORegKey* pSubKey = 0;
- RegError _ret1 = pKey->openKey(keyName, (RegKeyHandle*)&pSubKey);
+ RegError _ret1 = pKey->openKey(keyName, reinterpret_cast<RegKeyHandle*>(&pSubKey));
if (_ret1 != REG_NO_ERROR)
return _ret1;
@@ -513,7 +513,7 @@ RegError REGISTRY_CALLTYPE getStringListValue(RegKeyHandle hKey,
if (keyName->length)
{
ORegKey* pSubKey = 0;
- RegError _ret1 = pKey->openKey(keyName, (RegKeyHandle*)&pSubKey);
+ RegError _ret1 = pKey->openKey(keyName, reinterpret_cast<RegKeyHandle*>(&pSubKey));
if (_ret1 != REG_NO_ERROR)
return _ret1;
@@ -550,7 +550,7 @@ RegError REGISTRY_CALLTYPE getUnicodeListValue(RegKeyHandle hKey,
if (keyName->length)
{
ORegKey* pSubKey = 0;
- RegError _ret1 = pKey->openKey(keyName, (RegKeyHandle*)&pSubKey);
+ RegError _ret1 = pKey->openKey(keyName, reinterpret_cast<RegKeyHandle*>(&pSubKey));
if (_ret1 != REG_NO_ERROR)
return _ret1;