summaryrefslogtreecommitdiff
path: root/registry/source
diff options
context:
space:
mode:
Diffstat (limited to 'registry/source')
-rw-r--r--registry/source/keyimpl.cxx2
-rw-r--r--registry/source/keyimpl.hxx42
-rw-r--r--registry/source/reflwrit.cxx15
-rw-r--r--registry/source/regimpl.cxx8
-rw-r--r--registry/source/regimpl.hxx38
-rw-r--r--registry/source/regkey.cxx1
6 files changed, 49 insertions, 57 deletions
diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx
index 8a1234f76054..05993dd6ff87 100644
--- a/registry/source/keyimpl.cxx
+++ b/registry/source/keyimpl.cxx
@@ -26,8 +26,6 @@
#include "rtl/alloc.h"
#include "rtl/ustrbuf.hxx"
-using rtl::OUString;
-using rtl::OUStringBuffer;
using namespace store;
namespace { static char const VALUE_PREFIX[] = "$VL_"; }
diff --git a/registry/source/keyimpl.hxx b/registry/source/keyimpl.hxx
index 61fbb247d811..281872eb48da 100644
--- a/registry/source/keyimpl.hxx
+++ b/registry/source/keyimpl.hxx
@@ -28,7 +28,7 @@ class ORegKey
{
public:
- ORegKey(const rtl::OUString& keyName, ORegistry* pReg);
+ ORegKey(const OUString& keyName, ORegistry* pReg);
~ORegKey();
sal_uInt32 acquire()
@@ -39,62 +39,62 @@ public:
RegError releaseKey(RegKeyHandle hKey);
- RegError createKey(const rtl::OUString& keyName, RegKeyHandle* phNewKey);
+ RegError createKey(const OUString& keyName, RegKeyHandle* phNewKey);
- RegError openKey(const rtl::OUString& keyName, RegKeyHandle* phOpenKey);
+ RegError openKey(const OUString& keyName, RegKeyHandle* phOpenKey);
- RegError openSubKeys(const rtl::OUString& keyName,
+ RegError openSubKeys(const OUString& keyName,
RegKeyHandle** phOpenSubKeys,
sal_uInt32* pnSubKeys);
- RegError getKeyNames(const rtl::OUString& keyName,
+ RegError getKeyNames(const OUString& keyName,
rtl_uString*** pSubKeyNames,
sal_uInt32* pnSubKeys);
RegError closeKey(RegKeyHandle hKey);
- RegError deleteKey(const rtl::OUString& keyName);
+ RegError deleteKey(const OUString& keyName);
- RegError getValueInfo(const rtl::OUString& valueName,
+ RegError getValueInfo(const OUString& valueName,
RegValueType* pValueTye,
sal_uInt32* pValueSize) const;
- RegError setValue(const rtl::OUString& valueName,
+ RegError setValue(const OUString& valueName,
RegValueType vType,
RegValue value,
sal_uInt32 vSize);
- RegError setLongListValue(const rtl::OUString& valueName,
+ RegError setLongListValue(const OUString& valueName,
sal_Int32* pValueList,
sal_uInt32 len);
- RegError setStringListValue(const rtl::OUString& valueName,
+ RegError setStringListValue(const OUString& valueName,
sal_Char** pValueList,
sal_uInt32 len);
- RegError setUnicodeListValue(const rtl::OUString& valueName,
+ RegError setUnicodeListValue(const OUString& valueName,
sal_Unicode** pValueList,
sal_uInt32 len);
- RegError getValue(const rtl::OUString& valueName, RegValue value) const;
+ RegError getValue(const OUString& valueName, RegValue value) const;
- RegError getLongListValue(const rtl::OUString& valueName,
+ RegError getLongListValue(const OUString& valueName,
sal_Int32** pValueList,
sal_uInt32* pLen) const;
- RegError getStringListValue(const rtl::OUString& valueName,
+ RegError getStringListValue(const OUString& valueName,
sal_Char*** pValueList,
sal_uInt32* pLen) const;
- RegError getUnicodeListValue(const rtl::OUString& valueName,
+ RegError getUnicodeListValue(const OUString& valueName,
sal_Unicode*** pValueList,
sal_uInt32* pLen) const;
- RegError getKeyType(const rtl::OUString& name,
+ RegError getKeyType(const OUString& name,
RegKeyType* pKeyType) const;
- RegError getResolvedKeyName(const rtl::OUString& keyName,
- rtl::OUString& resolvedName);
+ RegError getResolvedKeyName(const OUString& keyName,
+ OUString& resolvedName);
bool isDeleted() const
{ return m_bDeleted != 0; }
@@ -121,17 +121,17 @@ public:
store::OStoreDirectory getStoreDir();
- const rtl::OUString& getName() const
+ const OUString& getName() const
{ return m_name; }
sal_uInt32 getRefCount() const
{ return m_refCount; }
- rtl::OUString getFullPath(rtl::OUString const & path) const;
+ OUString getFullPath(OUString const & path) const;
private:
sal_uInt32 m_refCount;
- rtl::OUString m_name;
+ OUString m_name;
int m_bDeleted:1;
int m_bModified:1;
ORegistry* m_pRegistry;
diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx
index 7e3242de6cd9..23b065d5614e 100644
--- a/registry/source/reflwrit.cxx
+++ b/registry/source/reflwrit.cxx
@@ -32,13 +32,12 @@
#include "reflcnst.hxx"
-using ::rtl::OString;
namespace {
-inline rtl::OString toByteString(rtl_uString const * str) {
- return rtl::OString(
+inline OString toByteString(rtl_uString const * str) {
+ return OString(
str->buffer, str->length, RTL_TEXTENCODING_UTF8,
OUSTRING_TO_OSTRING_CVTFLAGS);
}
@@ -662,8 +661,8 @@ public:
sal_uInt32 m_blopSize;
TypeWriter(typereg_Version version,
- rtl::OString const & documentation,
- rtl::OString const & fileName,
+ OString const & documentation,
+ OString const & fileName,
RTTypeClass RTTypeClass,
bool published,
const OString& typeName,
@@ -680,8 +679,8 @@ public:
};
TypeWriter::TypeWriter(typereg_Version version,
- rtl::OString const & documentation,
- rtl::OString const & fileName,
+ OString const & documentation,
+ OString const & fileName,
RTTypeClass RTTypeClass,
bool published,
const OString& typeName,
@@ -1416,7 +1415,7 @@ static TypeWriterImpl TYPEREG_CALLTYPE createEntry(
RTTypeClass typeClass, rtl_uString * typeName, rtl_uString * superTypeName,
sal_uInt16 fieldCount, sal_uInt16 methodCount, sal_uInt16 referenceCount)
{
- rtl::OUString empty;
+ OUString empty;
sal_uInt16 superTypeCount = rtl_uString_getLength(superTypeName) == 0
? 0 : 1;
TypeWriterImpl t = typereg_writer_create(
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index 998f2372ff07..30249d44b372 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -52,14 +52,10 @@
using namespace osl;
using namespace store;
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
-using ::rtl::OUStringBuffer;
-using ::rtl::OString;
namespace {
-void printString(rtl::OUString const & s) {
+void printString(OUString const & s) {
printf("\"");
for (sal_Int32 i = 0; i < s.getLength(); ++i) {
sal_Unicode c = s[i];
@@ -129,7 +125,7 @@ void printFieldOrReferenceFlags(RTFieldAccess flags) {
}
}
-void dumpType(typereg::Reader const & reader, rtl::OString const & indent) {
+void dumpType(typereg::Reader const & reader, OString const & indent) {
if (reader.isValid()) {
printf("version: %ld\n", static_cast< long >(reader.getVersion()));
printf("%sdocumentation: ", indent.getStr());
diff --git a/registry/source/regimpl.hxx b/registry/source/regimpl.hxx
index 20d777905dd7..deeae444311f 100644
--- a/registry/source/regimpl.hxx
+++ b/registry/source/regimpl.hxx
@@ -67,35 +67,35 @@ public:
sal_uInt32 release()
{ return --m_refCount; }
- RegError initRegistry(const rtl::OUString& name,
+ RegError initRegistry(const OUString& name,
RegAccessMode accessMode);
RegError closeRegistry();
- RegError destroyRegistry(const rtl::OUString& name);
+ RegError destroyRegistry(const OUString& name);
RegError acquireKey(RegKeyHandle hKey);
RegError releaseKey(RegKeyHandle hKey);
RegError createKey(RegKeyHandle hKey,
- const rtl::OUString& keyName,
+ const OUString& keyName,
RegKeyHandle* phNewKey);
RegError openKey(RegKeyHandle hKey,
- const rtl::OUString& keyName,
+ const OUString& keyName,
RegKeyHandle* phOpenKey);
RegError closeKey(RegKeyHandle hKey);
- RegError deleteKey(RegKeyHandle hKey, const rtl::OUString& keyName);
+ RegError deleteKey(RegKeyHandle hKey, const OUString& keyName);
RegError loadKey(RegKeyHandle hKey,
- const rtl::OUString& regFileName,
+ const OUString& regFileName,
sal_Bool bWarings=sal_False,
sal_Bool bReport=sal_False);
RegError saveKey(RegKeyHandle hKey,
- const rtl::OUString& regFileName,
+ const OUString& regFileName,
sal_Bool bWarings=sal_False,
sal_Bool bReport=sal_False);
@@ -114,25 +114,25 @@ public:
const store::OStoreFile& getStoreFile() const
{ return m_file; }
- const rtl::OUString& getName() const
+ const OUString& getName() const
{ return m_name; }
friend class ORegKey;
private:
- RegError eraseKey(ORegKey* pKey, const rtl::OUString& keyName);
+ RegError eraseKey(ORegKey* pKey, const OUString& keyName);
RegError deleteSubkeysAndValues(ORegKey* pKey);
RegError loadAndSaveValue(ORegKey* pTargetKey,
ORegKey* pSourceKey,
- const rtl::OUString& valueName,
+ const OUString& valueName,
sal_uInt32 nCut,
sal_Bool bWarnings=sal_False,
sal_Bool bReport=sal_False);
RegError checkBlop(store::OStoreStream& rValue,
- const rtl::OUString& sTargetPath,
+ const OUString& sTargetPath,
sal_uInt32 srcValueSize,
sal_uInt8* pSrcBuffer,
sal_Bool bReport=sal_False);
@@ -143,30 +143,30 @@ private:
RegError loadAndSaveKeys(ORegKey* pTargetKey,
ORegKey* pSourceKey,
- const rtl::OUString& keyName,
+ const OUString& keyName,
sal_uInt32 nCut,
sal_Bool bWarnings=sal_False,
sal_Bool bReport=sal_False);
- RegError dumpValue(const rtl::OUString& sPath,
- const rtl::OUString& sName,
+ RegError dumpValue(const OUString& sPath,
+ const OUString& sName,
sal_Int16 nSpace) const;
- RegError dumpKey(const rtl::OUString& sPath,
- const rtl::OUString& sName,
+ RegError dumpKey(const OUString& sPath,
+ const OUString& sName,
sal_Int16 nSpace) const;
- typedef boost::unordered_map< rtl::OUString, ORegKey*, rtl::OUStringHash > KeyMap;
+ typedef boost::unordered_map< OUString, ORegKey*, OUStringHash > KeyMap;
sal_uInt32 m_refCount;
osl::Mutex m_mutex;
bool m_readOnly;
bool m_isOpen;
- rtl::OUString m_name;
+ OUString m_name;
store::OStoreFile m_file;
KeyMap m_openKeyTable;
- const rtl::OUString ROOT;
+ const OUString ROOT;
};
#endif
diff --git a/registry/source/regkey.cxx b/registry/source/regkey.cxx
index 726f00d8c7bc..2e0d93c77303 100644
--- a/registry/source/regkey.cxx
+++ b/registry/source/regkey.cxx
@@ -25,7 +25,6 @@
#include "regimpl.hxx"
#include "keyimpl.hxx"
-using rtl::OUString;
//*********************************************************************
// acquireKey
generated by cgit (git 2.34.1) at 2025-01-25 12:56:12 +0000