diff options
author | Noel <noel.grandin@collabora.co.uk> | 2021-01-28 20:29:16 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-01-29 09:25:12 +0100 |
commit | 1250aecd71fabde4dba990bfceb61bbe8e06b8ea (patch) | |
tree | 3c42ffdf68b7e81aba29228631a8cd34e2f11830 /registry/source | |
parent | 4f3987e0b1a995431478769c898b5ef151745254 (diff) |
loplugin:stringviewparam extend to new..
O[U]StringBuffer methods
Change-Id: I0ffbc33d54ae7c98b5652434f3370ee4f819f6f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110090
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'registry/source')
-rw-r--r-- | registry/source/keyimpl.cxx | 28 | ||||
-rw-r--r-- | registry/source/keyimpl.hxx | 14 | ||||
-rw-r--r-- | registry/source/regimpl.cxx | 12 | ||||
-rw-r--r-- | registry/source/regimpl.hxx | 6 | ||||
-rw-r--r-- | registry/source/registry.cxx | 2 | ||||
-rw-r--r-- | registry/source/regkey.cxx | 30 |
6 files changed, 46 insertions, 46 deletions
diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx index fff60d6e2449..abf8e0d1ef12 100644 --- a/registry/source/keyimpl.cxx +++ b/registry/source/keyimpl.cxx @@ -65,7 +65,7 @@ RegError ORegKey::releaseKey(RegKeyHandle hKey) // createKey -RegError ORegKey::createKey(const OUString& keyName, RegKeyHandle* phNewKey) +RegError ORegKey::createKey(std::u16string_view keyName, RegKeyHandle* phNewKey) { return m_pRegistry->createKey(this, keyName, phNewKey); } @@ -73,7 +73,7 @@ RegError ORegKey::createKey(const OUString& keyName, RegKeyHandle* phNewKey) // openKey -RegError ORegKey::openKey(const OUString& keyName, RegKeyHandle* phOpenKey) +RegError ORegKey::openKey(std::u16string_view keyName, RegKeyHandle* phOpenKey) { return m_pRegistry->openKey(this, keyName, phOpenKey); } @@ -81,7 +81,7 @@ RegError ORegKey::openKey(const OUString& keyName, RegKeyHandle* phOpenKey) // openSubKeys -RegError ORegKey::openSubKeys(const OUString& keyName, RegKeyHandle** phOpenSubKeys, sal_uInt32* pnSubKeys) +RegError ORegKey::openSubKeys(std::u16string_view keyName, RegKeyHandle** phOpenSubKeys, sal_uInt32* pnSubKeys) { RegError _ret = RegError::NO_ERROR; @@ -89,7 +89,7 @@ RegError ORegKey::openSubKeys(const OUString& keyName, RegKeyHandle** phOpenSubK *pnSubKeys = 0; ORegKey* pKey = this; - if ( !keyName.isEmpty() ) + if ( !keyName.empty() ) { _ret = openKey(keyName, reinterpret_cast<RegKeyHandle*>(&pKey)); if (_ret != RegError::NO_ERROR) @@ -132,7 +132,7 @@ RegError ORegKey::openSubKeys(const OUString& keyName, RegKeyHandle** phOpenSubK } *phOpenSubKeys = reinterpret_cast<RegKeyHandle*>(pSubKeys); - if (!keyName.isEmpty()) + if (!keyName.empty()) { (void) releaseKey(pKey); } @@ -142,7 +142,7 @@ RegError ORegKey::openSubKeys(const OUString& keyName, RegKeyHandle** phOpenSubK // getKeyNames -RegError ORegKey::getKeyNames(const OUString& keyName, +RegError ORegKey::getKeyNames(std::u16string_view keyName, rtl_uString*** pSubKeyNames, sal_uInt32* pnSubKeys) { @@ -150,7 +150,7 @@ RegError ORegKey::getKeyNames(const OUString& keyName, *pnSubKeys = 0; ORegKey* pKey = this; - if (!keyName.isEmpty()) + if (!keyName.empty()) { RegError _ret = openKey(keyName, reinterpret_cast<RegKeyHandle*>(&pKey)); if (_ret != RegError::NO_ERROR) @@ -189,7 +189,7 @@ RegError ORegKey::getKeyNames(const OUString& keyName, } *pSubKeyNames = pSubKeys; - if (!keyName.isEmpty()) + if (!keyName.empty()) { releaseKey(pKey); } @@ -207,7 +207,7 @@ RegError ORegKey::closeKey(RegKeyHandle hKey) // deleteKey -RegError ORegKey::deleteKey(const OUString& keyName) +RegError ORegKey::deleteKey(std::u16string_view keyName) { return m_pRegistry->deleteKey(this, keyName); } @@ -899,10 +899,10 @@ RegError ORegKey::getUnicodeListValue(std::u16string_view valueName, sal_Unicode } -RegError ORegKey::getResolvedKeyName(const OUString& keyName, +RegError ORegKey::getResolvedKeyName(std::u16string_view keyName, OUString& resolvedName) const { - if (keyName.isEmpty()) + if (keyName.empty()) return RegError::INVALID_KEYNAME; resolvedName = getFullPath(keyName); @@ -961,13 +961,13 @@ OStoreDirectory ORegKey::getStoreDir() const return rStoreDir; } -OUString ORegKey::getFullPath(OUString const & path) const { - OSL_ASSERT(!m_name.isEmpty() && !path.isEmpty()); +OUString ORegKey::getFullPath(std::u16string_view path) const { + OSL_ASSERT(!m_name.isEmpty() && !path.empty()); OUStringBuffer b(32); b.append(m_name); if (!b.isEmpty() && b[b.getLength() - 1] == '/') { if (path[0] == '/') { - b.append(path.subView(1)); + b.append(path.substr(1)); } else { b.append(path); } diff --git a/registry/source/keyimpl.hxx b/registry/source/keyimpl.hxx index 17b7023dce75..1958a7b6247e 100644 --- a/registry/source/keyimpl.hxx +++ b/registry/source/keyimpl.hxx @@ -42,21 +42,21 @@ public: RegError releaseKey(RegKeyHandle hKey); - RegError createKey(const OUString& keyName, RegKeyHandle* phNewKey); + RegError createKey(std::u16string_view keyName, RegKeyHandle* phNewKey); - RegError openKey(const OUString& keyName, RegKeyHandle* phOpenKey); + RegError openKey(std::u16string_view keyName, RegKeyHandle* phOpenKey); - RegError openSubKeys(const OUString& keyName, + RegError openSubKeys(std::u16string_view keyName, RegKeyHandle** phOpenSubKeys, sal_uInt32* pnSubKeys); - RegError getKeyNames(const OUString& keyName, + RegError getKeyNames(std::u16string_view keyName, rtl_uString*** pSubKeyNames, sal_uInt32* pnSubKeys); RegError closeKey(RegKeyHandle hKey); - RegError deleteKey(const OUString& keyName); + RegError deleteKey(std::u16string_view keyName); RegError getValueInfo(std::u16string_view valueName, RegValueType* pValueTye, @@ -93,7 +93,7 @@ public: sal_Unicode*** pValueList, sal_uInt32* pLen) const; - RegError getResolvedKeyName(const OUString& keyName, + RegError getResolvedKeyName(std::u16string_view keyName, OUString& resolvedName) const; bool isDeleted() const @@ -124,7 +124,7 @@ public: const OUString& getName() const { return m_name; } - OUString getFullPath(OUString const & path) const; + OUString getFullPath(std::u16string_view path) const; private: sal_uInt32 m_refCount; diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx index dc87985ab623..6201a38c7662 100644 --- a/registry/source/regimpl.cxx +++ b/registry/source/regimpl.cxx @@ -603,14 +603,14 @@ RegError ORegistry::releaseKey (RegKeyHandle hKey) return RegError::NO_ERROR; } -RegError ORegistry::createKey(RegKeyHandle hKey, const OUString& keyName, +RegError ORegistry::createKey(RegKeyHandle hKey, std::u16string_view keyName, RegKeyHandle* phNewKey) { ORegKey* pKey; *phNewKey = nullptr; - if (keyName.isEmpty()) + if (keyName.empty()) return RegError::INVALID_KEYNAME; REG_GUARD(m_mutex); @@ -660,14 +660,14 @@ RegError ORegistry::createKey(RegKeyHandle hKey, const OUString& keyName, return RegError::NO_ERROR; } -RegError ORegistry::openKey(RegKeyHandle hKey, const OUString& keyName, +RegError ORegistry::openKey(RegKeyHandle hKey, std::u16string_view keyName, RegKeyHandle* phOpenKey) { ORegKey* pKey; *phOpenKey = nullptr; - if (keyName.isEmpty()) + if (keyName.empty()) { return RegError::INVALID_KEYNAME; } @@ -735,10 +735,10 @@ RegError ORegistry::closeKey(RegKeyHandle hKey) return releaseKey(pKey); } -RegError ORegistry::deleteKey(RegKeyHandle hKey, const OUString& keyName) +RegError ORegistry::deleteKey(RegKeyHandle hKey, std::u16string_view keyName) { ORegKey* pKey = static_cast< ORegKey* >(hKey); - if (keyName.isEmpty()) + if (keyName.empty()) return RegError::INVALID_KEYNAME; REG_GUARD(m_mutex); diff --git a/registry/source/regimpl.hxx b/registry/source/regimpl.hxx index db2af7e77846..19fa6b1e3232 100644 --- a/registry/source/regimpl.hxx +++ b/registry/source/regimpl.hxx @@ -65,16 +65,16 @@ public: RegError releaseKey(RegKeyHandle hKey); RegError createKey(RegKeyHandle hKey, - const OUString& keyName, + std::u16string_view keyName, RegKeyHandle* phNewKey); RegError openKey(RegKeyHandle hKey, - const OUString& keyName, + std::u16string_view keyName, RegKeyHandle* phOpenKey); RegError closeKey(RegKeyHandle hKey); - RegError deleteKey(RegKeyHandle hKey, const OUString& keyName); + RegError deleteKey(RegKeyHandle hKey, std::u16string_view keyName); RegError loadKey(RegKeyHandle hKey, const OUString& regFileName, diff --git a/registry/source/registry.cxx b/registry/source/registry.cxx index eb2a38f6ba5a..1727dfc119dc 100644 --- a/registry/source/registry.cxx +++ b/registry/source/registry.cxx @@ -241,7 +241,7 @@ static RegError REGISTRY_CALLTYPE mergeKey(RegHandle hReg, if (keyName->length) { ORegKey* pNewKey = nullptr; - RegError _ret = pKey->createKey(keyName, reinterpret_cast<RegKeyHandle*>(&pNewKey)); + RegError _ret = pKey->createKey(OUString::unacquired(&keyName), reinterpret_cast<RegKeyHandle*>(&pNewKey)); if (_ret != RegError::NO_ERROR) return _ret; diff --git a/registry/source/regkey.cxx b/registry/source/regkey.cxx index 55b0bc80924e..4f0d518976d4 100644 --- a/registry/source/regkey.cxx +++ b/registry/source/regkey.cxx @@ -95,7 +95,7 @@ RegError REGISTRY_CALLTYPE createKey(RegKeyHandle hKey, if (pKey->isReadOnly()) return RegError::REGISTRY_READONLY; - return pKey->createKey(keyName, phNewKey); + return pKey->createKey(OUString::unacquired(&keyName), phNewKey); } @@ -114,7 +114,7 @@ RegError REGISTRY_CALLTYPE openKey(RegKeyHandle hKey, if (pKey->isDeleted()) return RegError::INVALID_KEY; - return pKey->openKey(keyName, phOpenKey); + return pKey->openKey(OUString::unacquired(&keyName), phOpenKey); } @@ -135,7 +135,7 @@ RegError REGISTRY_CALLTYPE openSubKeys(RegKeyHandle hKey, if (pKey->isDeleted()) return RegError::INVALID_KEY; - return pKey->openSubKeys(keyName, pphSubKeys, pnSubKeys); + return pKey->openSubKeys(OUString::unacquired(&keyName), pphSubKeys, pnSubKeys); } @@ -173,7 +173,7 @@ RegError REGISTRY_CALLTYPE deleteKey(RegKeyHandle hKey, if (pKey->isReadOnly()) return RegError::REGISTRY_READONLY; - return pKey->deleteKey(keyName); + return pKey->deleteKey(OUString::unacquired(&keyName)); } @@ -211,7 +211,7 @@ RegError REGISTRY_CALLTYPE setValue(RegKeyHandle hKey, if (keyName->length) { ORegKey* pSubKey = nullptr; - RegError _ret1 = pKey->openKey(keyName, reinterpret_cast<RegKeyHandle*>(&pSubKey)); + RegError _ret1 = pKey->openKey(OUString::unacquired(&keyName), reinterpret_cast<RegKeyHandle*>(&pSubKey)); if (_ret1 != RegError::NO_ERROR) return _ret1; @@ -253,7 +253,7 @@ RegError REGISTRY_CALLTYPE setLongListValue(RegKeyHandle hKey, if (keyName->length) { ORegKey* pSubKey = nullptr; - RegError _ret1 = pKey->openKey(keyName, reinterpret_cast<RegKeyHandle*>(&pSubKey)); + RegError _ret1 = pKey->openKey(OUString::unacquired(&keyName), reinterpret_cast<RegKeyHandle*>(&pSubKey)); if (_ret1 != RegError::NO_ERROR) return _ret1; @@ -295,7 +295,7 @@ RegError REGISTRY_CALLTYPE setStringListValue(RegKeyHandle hKey, if (keyName->length) { ORegKey* pSubKey = nullptr; - RegError _ret1 = pKey->openKey(keyName, reinterpret_cast<RegKeyHandle*>(&pSubKey)); + RegError _ret1 = pKey->openKey(OUString::unacquired(&keyName), reinterpret_cast<RegKeyHandle*>(&pSubKey)); if (_ret1 != RegError::NO_ERROR) return _ret1; @@ -337,7 +337,7 @@ RegError REGISTRY_CALLTYPE setUnicodeListValue(RegKeyHandle hKey, if (keyName->length) { ORegKey* pSubKey = nullptr; - RegError _ret1 = pKey->openKey(keyName, reinterpret_cast<RegKeyHandle*>(&pSubKey)); + RegError _ret1 = pKey->openKey(OUString::unacquired(&keyName), reinterpret_cast<RegKeyHandle*>(&pSubKey)); if (_ret1 != RegError::NO_ERROR) return _ret1; @@ -382,7 +382,7 @@ RegError REGISTRY_CALLTYPE getValueInfo(RegKeyHandle hKey, if (keyName->length) { ORegKey* pSubKey = nullptr; - RegError _ret = pKey->openKey(keyName, reinterpret_cast<RegKeyHandle*>(&pSubKey)); + RegError _ret = pKey->openKey(OUString::unacquired(&keyName), reinterpret_cast<RegKeyHandle*>(&pSubKey)); if (_ret != RegError::NO_ERROR) return _ret; @@ -428,7 +428,7 @@ RegError REGISTRY_CALLTYPE getValue(RegKeyHandle hKey, if (keyName->length) { ORegKey* pSubKey = nullptr; - RegError _ret1 = pKey->openKey(keyName, reinterpret_cast<RegKeyHandle*>(&pSubKey)); + RegError _ret1 = pKey->openKey(OUString::unacquired(&keyName), reinterpret_cast<RegKeyHandle*>(&pSubKey)); if (_ret1 != RegError::NO_ERROR) return _ret1; @@ -468,7 +468,7 @@ RegError REGISTRY_CALLTYPE getLongListValue(RegKeyHandle hKey, if (keyName->length) { ORegKey* pSubKey = nullptr; - RegError _ret1 = pKey->openKey(keyName, reinterpret_cast<RegKeyHandle*>(&pSubKey)); + RegError _ret1 = pKey->openKey(OUString::unacquired(&keyName), reinterpret_cast<RegKeyHandle*>(&pSubKey)); if (_ret1 != RegError::NO_ERROR) return _ret1; @@ -508,7 +508,7 @@ RegError REGISTRY_CALLTYPE getStringListValue(RegKeyHandle hKey, if (keyName->length) { ORegKey* pSubKey = nullptr; - RegError _ret1 = pKey->openKey(keyName, reinterpret_cast<RegKeyHandle*>(&pSubKey)); + RegError _ret1 = pKey->openKey(OUString::unacquired(&keyName), reinterpret_cast<RegKeyHandle*>(&pSubKey)); if (_ret1 != RegError::NO_ERROR) return _ret1; @@ -546,7 +546,7 @@ RegError REGISTRY_CALLTYPE getUnicodeListValue(RegKeyHandle hKey, if (keyName->length) { ORegKey* pSubKey = nullptr; - RegError _ret1 = pKey->openKey(keyName, reinterpret_cast<RegKeyHandle*>(&pSubKey)); + RegError _ret1 = pKey->openKey(OUString::unacquired(&keyName), reinterpret_cast<RegKeyHandle*>(&pSubKey)); if (_ret1 != RegError::NO_ERROR) return _ret1; @@ -623,7 +623,7 @@ RegError REGISTRY_CALLTYPE getResolvedKeyName(RegKeyHandle hKey, return RegError::INVALID_KEY; OUString resolvedName; - RegError _ret = pKey->getResolvedKeyName(keyName, resolvedName); + RegError _ret = pKey->getResolvedKeyName(OUString::unacquired(&keyName), resolvedName); if (_ret == RegError::NO_ERROR) rtl_uString_assign(pResolvedName, resolvedName.pData); return _ret; @@ -644,7 +644,7 @@ RegError REGISTRY_CALLTYPE getKeyNames(RegKeyHandle hKey, if (pKey->isDeleted()) return RegError::INVALID_KEY; - return pKey->getKeyNames(keyName, pSubKeyNames, pnSubKeys); + return pKey->getKeyNames(OUString::unacquired(&keyName), pSubKeyNames, pnSubKeys); } |