summaryrefslogtreecommitdiff
path: root/registry
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /registry
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff)
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'registry')
-rw-r--r--registry/inc/registry/reader.hxx64
-rw-r--r--registry/inc/registry/reflread.hxx96
-rw-r--r--registry/inc/registry/reflwrit.hxx64
-rw-r--r--registry/inc/registry/registry.hxx148
-rw-r--r--registry/inc/registry/writer.hxx30
-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
-rw-r--r--registry/test/testmerge.cxx1
-rw-r--r--registry/test/testregcpp.cxx3
-rw-r--r--registry/tools/fileurl.cxx1
-rw-r--r--registry/tools/fileurl.hxx2
-rw-r--r--registry/tools/regcompare.cxx40
-rw-r--r--registry/tools/regview.cxx1
-rw-r--r--registry/workben/regspeed.cxx2
-rw-r--r--registry/workben/regtest.cxx2
19 files changed, 271 insertions, 289 deletions
diff --git a/registry/inc/registry/reader.hxx b/registry/inc/registry/reader.hxx
index 7e2d200ff653..a867f3b1185a 100644
--- a/registry/inc/registry/reader.hxx
+++ b/registry/inc/registry/reader.hxx
@@ -141,13 +141,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getDocumentation() const {
+ OUString getDocumentation() const {
rtl_uString * s = 0;
typereg_reader_getDocumentation(m_handle, &s);
if (s == 0) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -159,13 +159,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
@deprecated
*/
- rtl::OUString getFileName() const {
+ OUString getFileName() const {
rtl_uString * s = 0;
typereg_reader_getFileName(m_handle, &s);
if (s == 0) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -200,13 +200,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getTypeName() const {
+ OUString getTypeName() const {
rtl_uString * s = 0;
typereg_reader_getTypeName(m_handle, &s);
if (s == 0) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -229,13 +229,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getSuperTypeName(sal_uInt16 index) const {
+ OUString getSuperTypeName(sal_uInt16 index) const {
rtl_uString * s = 0;
typereg_reader_getSuperTypeName(m_handle, &s, index);
if (s == 0) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -257,13 +257,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getFieldDocumentation(sal_uInt16 index) const {
+ OUString getFieldDocumentation(sal_uInt16 index) const {
rtl_uString * s = 0;
typereg_reader_getFieldDocumentation(m_handle, &s, index);
if (s == 0) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -276,13 +276,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
@deprecated
*/
- rtl::OUString getFieldFileName(sal_uInt16 index) const {
+ OUString getFieldFileName(sal_uInt16 index) const {
rtl_uString * s = 0;
typereg_reader_getFieldFileName(m_handle, &s, index);
if (s == 0) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -305,13 +305,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getFieldName(sal_uInt16 index) const {
+ OUString getFieldName(sal_uInt16 index) const {
rtl_uString * s = 0;
typereg_reader_getFieldName(m_handle, &s, index);
if (s == 0) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -323,13 +323,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getFieldTypeName(sal_uInt16 index) const {
+ OUString getFieldTypeName(sal_uInt16 index) const {
rtl_uString * s = 0;
typereg_reader_getFieldTypeName(m_handle, &s, index);
if (s == 0) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -370,13 +370,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getMethodDocumentation(sal_uInt16 index) const {
+ OUString getMethodDocumentation(sal_uInt16 index) const {
rtl_uString * s = 0;
typereg_reader_getMethodDocumentation(m_handle, &s, index);
if (s == 0) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -399,13 +399,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getMethodName(sal_uInt16 index) const {
+ OUString getMethodName(sal_uInt16 index) const {
rtl_uString * s = 0;
typereg_reader_getMethodName(m_handle, &s, index);
if (s == 0) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -417,13 +417,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getMethodReturnTypeName(sal_uInt16 index) const {
+ OUString getMethodReturnTypeName(sal_uInt16 index) const {
rtl_uString * s = 0;
typereg_reader_getMethodReturnTypeName(m_handle, &s, index);
if (s == 0) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -468,7 +468,7 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getMethodParameterName(
+ OUString getMethodParameterName(
sal_uInt16 methodIndex, sal_uInt16 parameterIndex) const
{
rtl_uString * s = 0;
@@ -477,7 +477,7 @@ public:
if (s == 0) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -493,7 +493,7 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getMethodParameterTypeName(
+ OUString getMethodParameterTypeName(
sal_uInt16 methodIndex, sal_uInt16 parameterIndex) const
{
rtl_uString * s = 0;
@@ -502,7 +502,7 @@ public:
if (s == 0) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -529,7 +529,7 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getMethodExceptionTypeName(
+ OUString getMethodExceptionTypeName(
sal_uInt16 methodIndex, sal_uInt16 exceptionIndex) const
{
rtl_uString * s = 0;
@@ -538,7 +538,7 @@ public:
if (s == 0) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -561,13 +561,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getReferenceDocumentation(sal_uInt16 index) const {
+ OUString getReferenceDocumentation(sal_uInt16 index) const {
rtl_uString * s = 0;
typereg_reader_getReferenceDocumentation(m_handle, &s, index);
if (s == 0) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
/**
@@ -604,13 +604,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- rtl::OUString getReferenceTypeName(sal_uInt16 index) const {
+ OUString getReferenceTypeName(sal_uInt16 index) const {
rtl_uString * s = 0;
typereg_reader_getReferenceTypeName(m_handle, &s, index);
if (s == 0) {
throw std::bad_alloc();
}
- return rtl::OUString(s, SAL_NO_ACQUIRE);
+ return OUString(s, SAL_NO_ACQUIRE);
}
private:
diff --git a/registry/inc/registry/reflread.hxx b/registry/inc/registry/reflread.hxx
index 9627be639fad..a3e6378f8443 100644
--- a/registry/inc/registry/reflread.hxx
+++ b/registry/inc/registry/reflread.hxx
@@ -151,11 +151,11 @@ public:
/** returns the full qualified name of the type.
*/
- inline ::rtl::OUString getTypeName() const;
+ inline OUString getTypeName() const;
/** returns the full qualified name of the supertype.
*/
- inline ::rtl::OUString getSuperTypeName() const;
+ inline OUString getSuperTypeName() const;
/** @deprecated
returns the unique identifier for an interface type as an out parameter.
@@ -168,11 +168,11 @@ public:
/** returns the documentation string of this type.
*/
- inline ::rtl::OUString getDoku() const;
+ inline OUString getDoku() const;
/** returns the IDL filename where the type is defined.
*/
- inline ::rtl::OUString getFileName() const;
+ inline OUString getFileName() const;
/** returns the number of fields (attributes/properties, enum values or number
of constants in a module).
@@ -182,11 +182,11 @@ public:
/** returns the name of the field specified by index.
*/
- inline ::rtl::OUString getFieldName( sal_uInt16 index ) const;
+ inline OUString getFieldName( sal_uInt16 index ) const;
/** returns the full qualified name of the field specified by index.
*/
- inline ::rtl::OUString getFieldType( sal_uInt16 index ) const;
+ inline OUString getFieldType( sal_uInt16 index ) const;
/** returns the access mode of the field specified by index.
*/
@@ -202,14 +202,14 @@ public:
Each field of a type can have their own documentation.
*/
- inline ::rtl::OUString getFieldDoku( sal_uInt16 index ) const;
+ inline OUString getFieldDoku( sal_uInt16 index ) const;
/** returns the IDL filename of the field specified by index.
The IDL filename of a field can differ from the filename of the ype itself
because modules and also constants can be defined in different IDL files.
*/
- inline ::rtl::OUString getFieldFileName( sal_uInt16 index ) const;
+ inline OUString getFieldFileName( sal_uInt16 index ) const;
/** returns the number of methods of an interface type.
*/
@@ -217,7 +217,7 @@ public:
/** returns the name of the method specified by index.
*/
- inline ::rtl::OUString getMethodName( sal_uInt16 index ) const;
+ inline OUString getMethodName( sal_uInt16 index ) const;
/** returns number of parameters of the method specified by index.
*/
@@ -228,14 +228,14 @@ public:
@param index indicates the method
@param paramIndex indeciates the parameter which type will be returned.
*/
- inline ::rtl::OUString getMethodParamType( sal_uInt16 index, sal_uInt16 paramIndex ) const;
+ inline OUString getMethodParamType( sal_uInt16 index, sal_uInt16 paramIndex ) const;
/** returns the name of a parameter.
@param index indicates the method
@param paramIndex indiciates the parameter which name will be returned.
*/
- inline ::rtl::OUString getMethodParamName( sal_uInt16 index, sal_uInt16 paramIndex ) const;
+ inline OUString getMethodParamName( sal_uInt16 index, sal_uInt16 paramIndex ) const;
/** returns the parameter mode, if it is an in, out or inout parameter.
@@ -255,11 +255,11 @@ public:
@param index indicates the method
@param excIndex indeciates the exception which typename will be returned.
*/
- inline ::rtl::OUString getMethodExcType( sal_uInt16 index, sal_uInt16 excIndex ) const;
+ inline OUString getMethodExcType( sal_uInt16 index, sal_uInt16 excIndex ) const;
/** returns the full qualified return type of the method specified by index.
*/
- inline ::rtl::OUString getMethodReturnType( sal_uInt16 index ) const;
+ inline OUString getMethodReturnType( sal_uInt16 index ) const;
/** returns the full qualified exception type of the specified exception.
@@ -271,7 +271,7 @@ public:
@param index indicates the method.
*/
- inline ::rtl::OUString getMethodDoku( sal_uInt16 index ) const;
+ inline OUString getMethodDoku( sal_uInt16 index ) const;
/** returns the number of references (supported interfaces, exported services).
*/
@@ -281,7 +281,7 @@ public:
@param index indicates the reference.
*/
- inline ::rtl::OUString getReferenceName( sal_uInt16 index ) const;
+ inline OUString getReferenceName( sal_uInt16 index ) const;
/** returns the type of the reference specified by index.
@@ -293,7 +293,7 @@ public:
@param index indicates the reference.
*/
- inline ::rtl::OUString getReferenceDoku( sal_uInt16 index ) const;
+ inline OUString getReferenceDoku( sal_uInt16 index ) const;
/** returns the access mode of the reference specified by index.
@@ -356,16 +356,16 @@ inline sal_uInt16 RegistryTypeReader::getMajorVersion() const
inline RTTypeClass RegistryTypeReader::getTypeClass() const
{ return m_pApi->getTypeClass(m_hImpl); }
-inline ::rtl::OUString RegistryTypeReader::getTypeName() const
+inline OUString RegistryTypeReader::getTypeName() const
{
- ::rtl::OUString sRet;
+ OUString sRet;
m_pApi->getTypeName(m_hImpl, &sRet.pData);
return sRet;
}
-inline ::rtl::OUString RegistryTypeReader::getSuperTypeName() const
+inline OUString RegistryTypeReader::getSuperTypeName() const
{
- ::rtl::OUString sRet;
+ OUString sRet;
m_pApi->getSuperTypeName(m_hImpl, &sRet.pData);
return sRet;
}
@@ -373,16 +373,16 @@ inline ::rtl::OUString RegistryTypeReader::getSuperTypeName() const
inline void RegistryTypeReader::getUik(RTUik& uik) const
{ m_pApi->getUik(m_hImpl, &uik); }
-inline ::rtl::OUString RegistryTypeReader::getDoku() const
+inline OUString RegistryTypeReader::getDoku() const
{
- ::rtl::OUString sRet;
+ OUString sRet;
m_pApi->getDoku(m_hImpl, &sRet.pData);
return sRet;
}
-inline ::rtl::OUString RegistryTypeReader::getFileName() const
+inline OUString RegistryTypeReader::getFileName() const
{
- ::rtl::OUString sRet;
+ OUString sRet;
m_pApi->getFileName(m_hImpl, &sRet.pData);
return sRet;
}
@@ -390,16 +390,16 @@ inline ::rtl::OUString RegistryTypeReader::getFileName() const
inline sal_uInt32 RegistryTypeReader::getFieldCount() const
{ return m_pApi->getFieldCount(m_hImpl); }
-inline ::rtl::OUString RegistryTypeReader::getFieldName( sal_uInt16 index ) const
+inline OUString RegistryTypeReader::getFieldName( sal_uInt16 index ) const
{
- ::rtl::OUString sRet;
+ OUString sRet;
m_pApi->getFieldName(m_hImpl, &sRet.pData, index);
return sRet;
}
-inline ::rtl::OUString RegistryTypeReader::getFieldType( sal_uInt16 index ) const
+inline OUString RegistryTypeReader::getFieldType( sal_uInt16 index ) const
{
- ::rtl::OUString sRet;
+ OUString sRet;
m_pApi->getFieldType(m_hImpl, &sRet.pData, index);
return sRet;
}
@@ -414,16 +414,16 @@ inline RTConstValue RegistryTypeReader::getFieldConstValue( sal_uInt16 index ) c
return ret;
}
-inline ::rtl::OUString RegistryTypeReader::getFieldDoku( sal_uInt16 index ) const
+inline OUString RegistryTypeReader::getFieldDoku( sal_uInt16 index ) const
{
- ::rtl::OUString sRet;
+ OUString sRet;
m_pApi->getFieldDoku(m_hImpl, &sRet.pData, index);
return sRet;
}
-inline ::rtl::OUString RegistryTypeReader::getFieldFileName( sal_uInt16 index ) const
+inline OUString RegistryTypeReader::getFieldFileName( sal_uInt16 index ) const
{
- ::rtl::OUString sRet;
+ OUString sRet;
m_pApi->getFieldFileName(m_hImpl, &sRet.pData, index);
return sRet;
}
@@ -431,9 +431,9 @@ inline ::rtl::OUString RegistryTypeReader::getFieldFileName( sal_uInt16 index )
inline sal_uInt32 RegistryTypeReader::getMethodCount() const
{ return m_pApi->getMethodCount(m_hImpl); }
-inline ::rtl::OUString RegistryTypeReader::getMethodName( sal_uInt16 index ) const
+inline OUString RegistryTypeReader::getMethodName( sal_uInt16 index ) const
{
- ::rtl::OUString sRet;
+ OUString sRet;
m_pApi->getMethodName(m_hImpl, &sRet.pData, index);
return sRet;
}
@@ -441,16 +441,16 @@ inline ::rtl::OUString RegistryTypeReader::getMethodName( sal_uInt16 index ) con
inline sal_uInt32 RegistryTypeReader::getMethodParamCount( sal_uInt16 index ) const
{ return m_pApi->getMethodParamCount(m_hImpl, index); }
-inline ::rtl::OUString RegistryTypeReader::getMethodParamType( sal_uInt16 index, sal_uInt16 paramIndex ) const
+inline OUString RegistryTypeReader::getMethodParamType( sal_uInt16 index, sal_uInt16 paramIndex ) const
{
- ::rtl::OUString sRet;
+ OUString sRet;
m_pApi->getMethodParamType(m_hImpl, &sRet.pData, index, paramIndex);
return sRet;
}
-inline ::rtl::OUString RegistryTypeReader::getMethodParamName( sal_uInt16 index, sal_uInt16 paramIndex ) const
+inline OUString RegistryTypeReader::getMethodParamName( sal_uInt16 index, sal_uInt16 paramIndex ) const
{
- ::rtl::OUString sRet;
+ OUString sRet;
m_pApi->getMethodParamName(m_hImpl, &sRet.pData, index, paramIndex);
return sRet;
}
@@ -461,16 +461,16 @@ inline RTParamMode RegistryTypeReader::getMethodParamMode( sal_uInt16 index, sal
inline sal_uInt32 RegistryTypeReader::getMethodExcCount( sal_uInt16 index ) const
{ return m_pApi->getMethodExcCount(m_hImpl, index); }
-inline ::rtl::OUString RegistryTypeReader::getMethodExcType( sal_uInt16 index, sal_uInt16 excIndex ) const
+inline OUString RegistryTypeReader::getMethodExcType( sal_uInt16 index, sal_uInt16 excIndex ) const
{
- ::rtl::OUString sRet;
+ OUString sRet;
m_pApi->getMethodExcType(m_hImpl, &sRet.pData, index, excIndex);
return sRet;
}
-inline ::rtl::OUString RegistryTypeReader::getMethodReturnType( sal_uInt16 index ) const
+inline OUString RegistryTypeReader::getMethodReturnType( sal_uInt16 index ) const
{
- ::rtl::OUString sRet;
+ OUString sRet;
m_pApi->getMethodReturnType(m_hImpl, &sRet.pData, index);
return sRet;
}
@@ -478,9 +478,9 @@ inline ::rtl::OUString RegistryTypeReader::getMethodReturnType( sal_uInt16 index
inline RTMethodMode RegistryTypeReader::getMethodMode( sal_uInt16 index ) const
{ return m_pApi->getMethodMode(m_hImpl, index); }
-inline ::rtl::OUString RegistryTypeReader::getMethodDoku( sal_uInt16 index ) const
+inline OUString RegistryTypeReader::getMethodDoku( sal_uInt16 index ) const
{
- ::rtl::OUString sRet;
+ OUString sRet;
m_pApi->getMethodDoku(m_hImpl, &sRet.pData, index);
return sRet;
}
@@ -488,9 +488,9 @@ inline ::rtl::OUString RegistryTypeReader::getMethodDoku( sal_uInt16 index ) con
inline sal_uInt32 RegistryTypeReader::getReferenceCount() const
{ return m_pApi->getReferenceCount(m_hImpl); }
-inline ::rtl::OUString RegistryTypeReader::getReferenceName( sal_uInt16 index ) const
+inline OUString RegistryTypeReader::getReferenceName( sal_uInt16 index ) const
{
- ::rtl::OUString sRet;
+ OUString sRet;
m_pApi->getReferenceName(m_hImpl, &sRet.pData, index);
return sRet;
}
@@ -498,9 +498,9 @@ inline ::rtl::OUString RegistryTypeReader::getReferenceName( sal_uInt16 index )
inline RTReferenceType RegistryTypeReader::getReferenceType( sal_uInt16 index ) const
{ return m_pApi->getReferenceType(m_hImpl, index); }
-inline ::rtl::OUString RegistryTypeReader::getReferenceDoku( sal_uInt16 index ) const
+inline OUString RegistryTypeReader::getReferenceDoku( sal_uInt16 index ) const
{
- ::rtl::OUString sRet;
+ OUString sRet;
m_pApi->getReferenceDoku(m_hImpl, &sRet.pData, index);
return sRet;
}
diff --git a/registry/inc/registry/reflwrit.hxx b/registry/inc/registry/reflwrit.hxx
index ae96ac6720d7..3da3d7d21590 100644
--- a/registry/inc/registry/reflwrit.hxx
+++ b/registry/inc/registry/reflwrit.hxx
@@ -94,8 +94,8 @@ public:
exported services ...)
*/
inline RegistryTypeWriter(RTTypeClass RTTypeClass,
- const ::rtl::OUString& typeName,
- const ::rtl::OUString& superTypeName,
+ const OUString& typeName,
+ const OUString& superTypeName,
sal_uInt16 fieldCount,
sal_uInt16 methodCount,
sal_uInt16 referenceCount);
@@ -126,11 +126,11 @@ public:
This documentation should be the same as the documentation which is provided
for this type in IDL.
*/
- inline void setDoku(const ::rtl::OUString& doku);
+ inline void setDoku(const OUString& doku);
/** sets the IDL filename where this type is defined.
*/
- inline void setFileName(const ::rtl::OUString& fileName);
+ inline void setFileName(const OUString& fileName);
/** sets the data for a field member of a type blob.
@@ -144,10 +144,10 @@ public:
for enum values or constants.
*/
inline void setFieldData( sal_uInt16 index,
- const ::rtl::OUString& name,
- const ::rtl::OUString& typeName,
- const ::rtl::OUString& doku,
- const ::rtl::OUString& fileName,
+ const OUString& name,
+ const OUString& typeName,
+ const OUString& doku,
+ const OUString& fileName,
RTFieldAccess access,
RTConstValue constValue = RTConstValue());
@@ -162,12 +162,12 @@ public:
@param doku specifies the documentation string of the field.
*/
inline void setMethodData(sal_uInt16 index,
- const ::rtl::OUString& name,
- const ::rtl::OUString& returnTypeName,
+ const OUString& name,
+ const OUString& returnTypeName,
RTMethodMode mode,
sal_uInt16 paramCount,
sal_uInt16 excCount,
- const ::rtl::OUString& doku);
+ const OUString& doku);
/** sets the data for the specified parameter of a method.
@@ -179,8 +179,8 @@ public:
*/
inline void setParamData(sal_uInt16 index,
sal_uInt16 paramIndex,
- const ::rtl::OUString& type,
- const ::rtl::OUString& name,
+ const OUString& type,
+ const OUString& name,
RTParamMode mode);
/** sets the data for the specified exception of a mehtod.
@@ -191,7 +191,7 @@ public:
*/
inline void setExcData(sal_uInt16 index,
sal_uInt16 excIndex,
- const ::rtl::OUString& type);
+ const OUString& type);
/** returns a pointer to the new type blob.
@@ -213,9 +213,9 @@ public:
@param access specifies the access mode of the reference.
*/
inline void setReferenceData( sal_uInt16 index,
- const ::rtl::OUString& name,
+ const OUString& name,
RTReferenceType refType,
- const ::rtl::OUString& doku,
+ const OUString& doku,
RTFieldAccess access = RT_ACCESS_INVALID);
protected:
@@ -229,8 +229,8 @@ protected:
inline RegistryTypeWriter::RegistryTypeWriter(RTTypeClass RTTypeClass,
- const ::rtl::OUString& typeName,
- const ::rtl::OUString& superTypeName,
+ const OUString& typeName,
+ const OUString& superTypeName,
sal_uInt16 fieldCount,
sal_uInt16 methodCount,
sal_uInt16 referenceCount)
@@ -271,10 +271,10 @@ inline RegistryTypeWriter& RegistryTypeWriter::operator == (const RegistryTypeWr
}
inline void RegistryTypeWriter::setFieldData( sal_uInt16 index,
- const ::rtl::OUString& name,
- const ::rtl::OUString& typeName,
- const ::rtl::OUString& doku,
- const ::rtl::OUString& fileName,
+ const OUString& name,
+ const OUString& typeName,
+ const OUString& doku,
+ const OUString& fileName,
RTFieldAccess access,
RTConstValue constValue)
{
@@ -283,12 +283,12 @@ inline void RegistryTypeWriter::setFieldData( sal_uInt16 index,
inline void RegistryTypeWriter::setMethodData(sal_uInt16 index,
- const ::rtl::OUString& name,
- const ::rtl::OUString& returnTypeName,
+ const OUString& name,
+ const OUString& returnTypeName,
RTMethodMode mode,
sal_uInt16 paramCount,
sal_uInt16 excCount,
- const ::rtl::OUString& doku)
+ const OUString& doku)
{
m_pApi->setMethodData(m_hImpl, index, name.pData, returnTypeName.pData, mode, paramCount, excCount, doku.pData);
}
@@ -299,20 +299,20 @@ inline void RegistryTypeWriter::setUik(const RTUik& uik)
m_pApi->setUik(m_hImpl, &uik);
}
-inline void RegistryTypeWriter::setDoku(const ::rtl::OUString& doku)
+inline void RegistryTypeWriter::setDoku(const OUString& doku)
{
m_pApi->setDoku(m_hImpl, doku.pData);
}
-inline void RegistryTypeWriter::setFileName(const ::rtl::OUString& doku)
+inline void RegistryTypeWriter::setFileName(const OUString& doku)
{
m_pApi->setFileName(m_hImpl, doku.pData);
}
inline void RegistryTypeWriter::setParamData(sal_uInt16 index,
sal_uInt16 paramIndex,
- const ::rtl::OUString& type,
- const ::rtl::OUString& name,
+ const OUString& type,
+ const OUString& name,
RTParamMode mode)
{
m_pApi->setParamData(m_hImpl, index, paramIndex, type.pData, name.pData, mode);
@@ -320,7 +320,7 @@ inline void RegistryTypeWriter::setParamData(sal_uInt16 index,
inline void RegistryTypeWriter::setExcData(sal_uInt16 index,
sal_uInt16 excIndex,
- const ::rtl::OUString& type)
+ const OUString& type)
{
m_pApi->setExcData(m_hImpl, index, excIndex, type.pData);
}
@@ -337,9 +337,9 @@ inline sal_uInt32 RegistryTypeWriter::getBlopSize()
inline void RegistryTypeWriter::setReferenceData( sal_uInt16 index,
- const ::rtl::OUString& name,
+ const OUString& name,
RTReferenceType refType,
- const ::rtl::OUString& doku,
+ const OUString& doku,
RTFieldAccess access)
{
m_pApi->setReferenceData(m_hImpl, index, name.pData, refType, doku.pData, access);
diff --git a/registry/inc/registry/registry.hxx b/registry/inc/registry/registry.hxx
index 239a916cc3c4..d165c594adff 100644
--- a/registry/inc/registry/registry.hxx
+++ b/registry/inc/registry/registry.hxx
@@ -126,14 +126,14 @@ public:
inline RegError openRootKey(RegistryKey& rRootKey);
/// returns the name of the current registry data file.
- inline ::rtl::OUString getName();
+ inline OUString getName();
/** creates a new registry with the specified name and creates a root key.
@param registryName specifies the name of the new registry.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError create(const ::rtl::OUString& registryName);
+ inline RegError create(const OUString& registryName);
/** opens a registry with the specified name.
@@ -142,7 +142,7 @@ public:
@param accessMode specifies the access mode for the registry, REG_READONLY or REG_READWRITE.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError open(const ::rtl::OUString& registryName,
+ inline RegError open(const OUString& registryName,
RegAccessMode accessMode);
/// closes explicitly the current registry data file.
@@ -154,7 +154,7 @@ public:
itselfs will be destroyed.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError destroy(const ::rtl::OUString& registryName);
+ inline RegError destroy(const OUString& registryName);
/** loads registry information from a specified file and save it under the
specified keyName.
@@ -168,8 +168,8 @@ public:
@return REG_NO_ERROR if succeeds else an error code.
*/
inline RegError loadKey(RegistryKey& rKey,
- const ::rtl::OUString& keyName,
- const ::rtl::OUString& regFileName);
+ const OUString& keyName,
+ const OUString& regFileName);
/** saves the registry information of the specified key and all subkeys and save
it in the specified file.
@@ -183,8 +183,8 @@ public:
@return REG_NO_ERROR if succeeds else an error code.
*/
inline RegError saveKey(RegistryKey& rKey,
- const ::rtl::OUString& keyName,
- const ::rtl::OUString& regFileName);
+ const OUString& keyName,
+ const OUString& regFileName);
/** merges the registry information of the specified key with the registry
information of the specified file.
@@ -202,8 +202,8 @@ public:
restore the state before merging.
*/
inline RegError mergeKey(RegistryKey& rKey,
- const ::rtl::OUString& keyName,
- const ::rtl::OUString& regFileName,
+ const OUString& keyName,
+ const OUString& regFileName,
sal_Bool bWarnings = sal_False,
sal_Bool bReport = sal_False);
@@ -287,7 +287,7 @@ public:
inline ~RegistryKeyNames();
/// returns the name of the key sepecified by index.
- inline ::rtl::OUString getElement(sal_uInt32 index);
+ inline OUString getElement(sal_uInt32 index);
/// returns the length of the array.
inline sal_uInt32 getLength();
@@ -417,7 +417,7 @@ public:
inline sal_Bool isReadOnly() const;
/// returns the full qualified name of the key beginning with the rootkey.
- inline ::rtl::OUString getName();
+ inline OUString getName();
/** creates a new key or opens a key if the specified key already exists.
@@ -426,7 +426,7 @@ public:
@param rNewKey references a RegistryKey which will be filled with the new or open key.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError createKey(const ::rtl::OUString& keyName,
+ inline RegError createKey(const OUString& keyName,
RegistryKey& rNewKey);
/** opens the specified key.
@@ -436,7 +436,7 @@ public:
@param rOpenKey references a RegistryKey which will be filled with the open key.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError openKey(const ::rtl::OUString& keyName,
+ inline RegError openKey(const OUString& keyName,
RegistryKey& rOpenKey);
/** opens all subkeys of the specified key.
@@ -446,7 +446,7 @@ public:
@param rSubKeys reference a RegistryKeyArray which will be filled with the open subkeys.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError openSubKeys(const ::rtl::OUString& keyName,
+ inline RegError openSubKeys(const OUString& keyName,
RegistryKeyArray& rSubKeys);
/** returns an array with the names of all subkeys of the specified key.
@@ -456,7 +456,7 @@ public:
@param rSubKeyNames reference a RegistryKeyNames array which will be filled with the subkey names.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError getKeyNames(const ::rtl::OUString& keyName,
+ inline RegError getKeyNames(const OUString& keyName,
RegistryKeyNames& rSubKeyNames);
/** closes all keys specified in the array.
@@ -471,7 +471,7 @@ public:
@param keyName specifies the name of the key which will be deleted.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError deleteKey(const ::rtl::OUString& keyName);
+ inline RegError deleteKey(const OUString& keyName);
/// closes explicitly the current key
inline RegError closeKey();
@@ -489,7 +489,7 @@ public:
@param valueSize specifies the size of pData in bytes
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError setValue(const ::rtl::OUString& keyName,
+ inline RegError setValue(const OUString& keyName,
RegValueType valueType,
RegValue pValue,
sal_uInt32 valueSize);
@@ -503,7 +503,7 @@ public:
@param len specifies the length of the list (the array referenced by pValueList).
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError setLongListValue(const ::rtl::OUString& keyName,
+ inline RegError setLongListValue(const OUString& keyName,
sal_Int32* pValueList,
sal_uInt32 len);
@@ -516,7 +516,7 @@ public:
@param len specifies the length of the list (the array referenced by pValueList).
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError setStringListValue(const ::rtl::OUString& keyName,
+ inline RegError setStringListValue(const OUString& keyName,
sal_Char** pValueList,
sal_uInt32 len);
@@ -529,7 +529,7 @@ public:
@param len specifies the length of the list (the array referenced by pValueList).
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError setUnicodeListValue(const ::rtl::OUString& keyName,
+ inline RegError setUnicodeListValue(const OUString& keyName,
sal_Unicode** pValueList,
sal_uInt32 len);
@@ -542,7 +542,7 @@ public:
@param pValueSize returns the size of the value in bytes or the length of a list value.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError getValueInfo(const ::rtl::OUString& keyName,
+ inline RegError getValueInfo(const OUString& keyName,
RegValueType* pValueType,
sal_uInt32* pValueSize);
@@ -554,7 +554,7 @@ public:
@param pValue points to an allocated memory block receiving the data of the value.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError getValue(const ::rtl::OUString& keyName,
+ inline RegError getValue(const OUString& keyName,
RegValue pValue);
/** gets a long list value of a key.
@@ -565,7 +565,7 @@ public:
@param rValueList references a RegistryValueList which will be filled with the long values.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError getLongListValue(const ::rtl::OUString& keyName,
+ inline RegError getLongListValue(const OUString& keyName,
RegistryValueList<sal_Int32>& rValueList);
/** gets an ascii list value of a key.
@@ -576,7 +576,7 @@ public:
@param rValueList references a RegistryValueList which will be filled with the ascii values.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError getStringListValue(const ::rtl::OUString& keyName,
+ inline RegError getStringListValue(const OUString& keyName,
RegistryValueList<sal_Char*>& rValueList);
/** gets a unicode value of a key.
@@ -587,7 +587,7 @@ public:
@param rValueList reference a RegistryValueList which will be filled with the unicode values.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError getUnicodeListValue(const ::rtl::OUString& keyName,
+ inline RegError getUnicodeListValue(const OUString& keyName,
RegistryValueList<sal_Unicode*>& rValueList);
/** used to create a link.
@@ -596,8 +596,8 @@ public:
@return REG_INVALID_LINK
*/
- inline RegError createLink(const ::rtl::OUString& linkName,
- const ::rtl::OUString& linkTarget);
+ inline RegError createLink(const OUString& linkName,
+ const OUString& linkTarget);
/** used to delete a link.
@@ -605,7 +605,7 @@ public:
@return REG_INVALID_LINK
*/
- inline RegError deleteLink(const ::rtl::OUString& linkName);
+ inline RegError deleteLink(const OUString& linkName);
/** returns the type of the specified key.
@@ -613,7 +613,7 @@ public:
@param pKeyType returns the type of the key (always RG_KEYTYPE).
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError getKeyType(const ::rtl::OUString& name,
+ inline RegError getKeyType(const OUString& name,
RegKeyType* pKeyType) const;
/** used to return the target of a link.
@@ -622,8 +622,8 @@ public:
@return REG_INVALID_LINK
*/
- inline RegError getLinkTarget(const ::rtl::OUString& linkName,
- ::rtl::OUString& rLinkTarget) const;
+ inline RegError getLinkTarget(const OUString& linkName,
+ OUString& rLinkTarget) const;
/** resolves a keyname.
@@ -633,12 +633,12 @@ public:
@param[out] rResolvedName the resolved name.
@return REG_NO_ERROR if succeeds else an error code.
*/
- inline RegError getResolvedKeyName(const ::rtl::OUString& keyName,
+ inline RegError getResolvedKeyName(const OUString& keyName,
sal_Bool firstLinkOnly,
- ::rtl::OUString& rResolvedName) const;
+ OUString& rResolvedName) const;
/// returns the name of the registry in which the key is defined.
- inline ::rtl::OUString getRegistryName();
+ inline OUString getRegistryName();
/// returns the registry in which the key is defined.
Registry getRegistry() const { return m_registry; }
@@ -736,13 +736,13 @@ inline RegistryKeyNames::~RegistryKeyNames()
m_registry.m_pApi->freeKeyNames(m_pKeyNames, m_length);
}
-inline ::rtl::OUString RegistryKeyNames::getElement(sal_uInt32 index)
+inline OUString RegistryKeyNames::getElement(sal_uInt32 index)
{
if (m_pKeyNames && index < m_length)
return m_pKeyNames[index];
else
- return ::rtl::OUString();
+ return OUString();
}
inline sal_uInt32 RegistryKeyNames::getLength()
@@ -834,15 +834,15 @@ inline sal_Bool RegistryKey::isReadOnly() const
return sal_False;
}
-inline ::rtl::OUString RegistryKey::getName()
+inline OUString RegistryKey::getName()
{
- ::rtl::OUString sRet;
+ OUString sRet;
if (m_registry.isValid())
m_registry.m_pApi->getKeyName(m_hImpl, &sRet.pData);
return sRet;
}
-inline RegError RegistryKey::createKey(const ::rtl::OUString& keyName,
+inline RegError RegistryKey::createKey(const OUString& keyName,
RegistryKey& rNewKey)
{
if (rNewKey.isValid()) rNewKey.closeKey();
@@ -855,7 +855,7 @@ inline RegError RegistryKey::createKey(const ::rtl::OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::openKey(const ::rtl::OUString& keyName,
+inline RegError RegistryKey::openKey(const OUString& keyName,
RegistryKey& rOpenKey)
{
if (rOpenKey.isValid()) rOpenKey.closeKey();
@@ -869,7 +869,7 @@ inline RegError RegistryKey::openKey(const ::rtl::OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::openSubKeys(const ::rtl::OUString& keyName,
+inline RegError RegistryKey::openSubKeys(const OUString& keyName,
RegistryKeyArray& rSubKeys)
{
if (m_registry.isValid())
@@ -891,7 +891,7 @@ inline RegError RegistryKey::openSubKeys(const ::rtl::OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::getKeyNames(const ::rtl::OUString& keyName,
+inline RegError RegistryKey::getKeyNames(const OUString& keyName,
RegistryKeyNames& rSubKeyNames)
{
if (m_registry.isValid())
@@ -921,7 +921,7 @@ inline RegError RegistryKey::closeSubKeys(RegistryKeyArray& rSubKeys)
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::deleteKey(const ::rtl::OUString& keyName)
+inline RegError RegistryKey::deleteKey(const OUString& keyName)
{
if (m_registry.isValid())
return m_registry.m_pApi->deleteKey(m_hImpl, keyName.pData);
@@ -952,7 +952,7 @@ inline void RegistryKey::releaseKey()
}
}
-inline RegError RegistryKey::setValue(const ::rtl::OUString& keyName,
+inline RegError RegistryKey::setValue(const OUString& keyName,
RegValueType valueType,
RegValue pValue,
sal_uInt32 valueSize)
@@ -964,7 +964,7 @@ inline RegError RegistryKey::setValue(const ::rtl::OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::setLongListValue(const ::rtl::OUString& keyName,
+inline RegError RegistryKey::setLongListValue(const OUString& keyName,
sal_Int32* pValueList,
sal_uInt32 len)
{
@@ -975,7 +975,7 @@ inline RegError RegistryKey::setLongListValue(const ::rtl::OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::setStringListValue(const ::rtl::OUString& keyName,
+inline RegError RegistryKey::setStringListValue(const OUString& keyName,
sal_Char** pValueList,
sal_uInt32 len)
{
@@ -986,7 +986,7 @@ inline RegError RegistryKey::setStringListValue(const ::rtl::OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::setUnicodeListValue(const ::rtl::OUString& keyName,
+inline RegError RegistryKey::setUnicodeListValue(const OUString& keyName,
sal_Unicode** pValueList,
sal_uInt32 len)
{
@@ -997,7 +997,7 @@ inline RegError RegistryKey::setUnicodeListValue(const ::rtl::OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::getValueInfo(const ::rtl::OUString& keyName,
+inline RegError RegistryKey::getValueInfo(const OUString& keyName,
RegValueType* pValueType,
sal_uInt32* pValueSize)
{
@@ -1007,7 +1007,7 @@ inline RegError RegistryKey::getValueInfo(const ::rtl::OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::getValue(const ::rtl::OUString& keyName,
+inline RegError RegistryKey::getValue(const OUString& keyName,
RegValue pValue)
{
if (m_registry.isValid())
@@ -1016,7 +1016,7 @@ inline RegError RegistryKey::getValue(const ::rtl::OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::getLongListValue(const ::rtl::OUString& keyName,
+inline RegError RegistryKey::getLongListValue(const OUString& keyName,
RegistryValueList<sal_Int32>& rValueList)
{
if (m_registry.isValid())
@@ -1039,7 +1039,7 @@ inline RegError RegistryKey::getLongListValue(const ::rtl::OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::getStringListValue(const ::rtl::OUString& keyName,
+inline RegError RegistryKey::getStringListValue(const OUString& keyName,
RegistryValueList<sal_Char*>& rValueList)
{
if (m_registry.isValid())
@@ -1062,7 +1062,7 @@ inline RegError RegistryKey::getStringListValue(const ::rtl::OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::getUnicodeListValue(const ::rtl::OUString& keyName,
+inline RegError RegistryKey::getUnicodeListValue(const OUString& keyName,
RegistryValueList<sal_Unicode*>& rValueList)
{
if (m_registry.isValid())
@@ -1085,8 +1085,8 @@ inline RegError RegistryKey::getUnicodeListValue(const ::rtl::OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::createLink(const ::rtl::OUString& linkName,
- const ::rtl::OUString& linkTarget)
+inline RegError RegistryKey::createLink(const OUString& linkName,
+ const OUString& linkTarget)
{
if (m_registry.isValid())
return m_registry.m_pApi->createLink(m_hImpl, linkName.pData, linkTarget.pData);
@@ -1094,7 +1094,7 @@ inline RegError RegistryKey::createLink(const ::rtl::OUString& linkName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::deleteLink(const ::rtl::OUString& linkName)
+inline RegError RegistryKey::deleteLink(const OUString& linkName)
{
if (m_registry.isValid())
return m_registry.m_pApi->deleteLink(m_hImpl, linkName.pData);
@@ -1102,7 +1102,7 @@ inline RegError RegistryKey::deleteLink(const ::rtl::OUString& linkName)
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::getKeyType(const ::rtl::OUString& keyName,
+inline RegError RegistryKey::getKeyType(const OUString& keyName,
RegKeyType* pKeyType) const
{
if (m_registry.isValid())
@@ -1111,8 +1111,8 @@ inline RegError RegistryKey::getKeyType(const ::rtl::OUString& keyName,
return REG_INVALID_KEY;
}
-inline RegError RegistryKey::getLinkTarget(const ::rtl::OUString& linkName,
- ::rtl::OUString& rLinkTarget) const
+inline RegError RegistryKey::getLinkTarget(const OUString& linkName,
+ OUString& rLinkTarget) const
{
if (m_registry.isValid())
{
@@ -1124,9 +1124,9 @@ inline RegError RegistryKey::getLinkTarget(const ::rtl::OUString& linkName,
}
-inline RegError RegistryKey::getResolvedKeyName(const ::rtl::OUString& keyName,
+inline RegError RegistryKey::getResolvedKeyName(const OUString& keyName,
sal_Bool firstLinkOnly,
- ::rtl::OUString& rResolvedName) const
+ OUString& rResolvedName) const
{
if (m_registry.isValid())
return m_registry.m_pApi->getResolvedKeyName(m_hImpl,
@@ -1137,13 +1137,13 @@ inline RegError RegistryKey::getResolvedKeyName(const ::rtl::OUString& keyName,
return REG_INVALID_KEY;
}
-inline ::rtl::OUString RegistryKey::getRegistryName()
+inline OUString RegistryKey::getRegistryName()
{
if (m_registry.isValid())
{
return m_registry.getName();
} else
- return ::rtl::OUString();
+ return OUString();
}
//-----------------------------------------------------------------------------
@@ -1193,21 +1193,21 @@ inline RegError Registry::openRootKey(RegistryKey& rRootKey)
return m_pApi->openRootKey(m_hImpl, &rRootKey.m_hImpl);
}
-inline ::rtl::OUString Registry::getName()
+inline OUString Registry::getName()
{
- ::rtl::OUString sRet;
+ OUString sRet;
m_pApi->getName(m_hImpl, &sRet.pData);
return sRet;
}
-inline RegError Registry::create(const ::rtl::OUString& registryName)
+inline RegError Registry::create(const OUString& registryName)
{
if (m_hImpl)
m_pApi->release(m_hImpl);
return m_pApi->createRegistry(registryName.pData, &m_hImpl);
}
-inline RegError Registry::open(const ::rtl::OUString& registryName,
+inline RegError Registry::open(const OUString& registryName,
RegAccessMode accessMode)
{
if (m_hImpl)
@@ -1223,7 +1223,7 @@ inline RegError Registry::close()
return ret;
}
-inline RegError Registry::destroy(const ::rtl::OUString& registryName)
+inline RegError Registry::destroy(const OUString& registryName)
{
RegError ret = m_pApi->destroyRegistry(m_hImpl, registryName.pData);
if ( !ret && registryName.isEmpty() )
@@ -1232,18 +1232,18 @@ inline RegError Registry::destroy(const ::rtl::OUString& registryName)
}
inline RegError Registry::loadKey(RegistryKey& rKey,
- const ::rtl::OUString& keyName,
- const ::rtl::OUString& regFileName)
+ const OUString& keyName,
+ const OUString& regFileName)
{ return m_pApi->loadKey(m_hImpl, rKey.m_hImpl, keyName.pData, regFileName.pData); }
inline RegError Registry::saveKey(RegistryKey& rKey,
- const ::rtl::OUString& keyName,
- const ::rtl::OUString& regFileName)
+ const OUString& keyName,
+ const OUString& regFileName)
{ return m_pApi->saveKey(m_hImpl, rKey.m_hImpl, keyName.pData, regFileName.pData); }
inline RegError Registry::mergeKey(RegistryKey& rKey,
- const ::rtl::OUString& keyName,
- const ::rtl::OUString& regFileName,
+ const OUString& keyName,
+ const OUString& regFileName,
sal_Bool bWarnings,
sal_Bool bReport)
{ return m_pApi->mergeKey(m_hImpl, rKey.m_hImpl, keyName.pData, regFileName.pData, bWarnings, bReport); }
diff --git a/registry/inc/registry/writer.hxx b/registry/inc/registry/writer.hxx
index 082b9853488e..cfdf479853df 100644
--- a/registry/inc/registry/writer.hxx
+++ b/registry/inc/registry/writer.hxx
@@ -70,9 +70,9 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
Writer(
- typereg_Version version, rtl::OUString const & documentation,
- rtl::OUString const & fileName, RTTypeClass typeClass, bool published,
- rtl::OUString const & typeName, sal_uInt16 superTypeCount,
+ typereg_Version version, OUString const & documentation,
+ OUString const & fileName, RTTypeClass typeClass, bool published,
+ OUString const & typeName, sal_uInt16 superTypeCount,
sal_uInt16 fieldCount, sal_uInt16 methodCount,
sal_uInt16 referenceCount):
m_handle(
@@ -103,7 +103,7 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
- void setSuperTypeName(sal_uInt16 index, rtl::OUString const & typeName) {
+ void setSuperTypeName(sal_uInt16 index, OUString const & typeName) {
if (!typereg_writer_setSuperTypeName(m_handle, index, typeName.pData)) {
throw std::bad_alloc();
}
@@ -129,9 +129,9 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
void setFieldData(
- sal_uInt16 index, rtl::OUString const & documentation,
- rtl::OUString const & fileName, RTFieldAccess flags, rtl::OUString const & name,
- rtl::OUString const & typeName, RTConstValue const & value)
+ sal_uInt16 index, OUString const & documentation,
+ OUString const & fileName, RTFieldAccess flags, OUString const & name,
+ OUString const & typeName, RTConstValue const & value)
{
if (!typereg_writer_setFieldData(
m_handle, index, documentation.pData, fileName.pData, flags,
@@ -161,9 +161,9 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
void setMethodData(
- sal_uInt16 index, rtl::OUString const & documentation,
- RTMethodMode flags, rtl::OUString const & name,
- rtl::OUString const & returnTypeName, sal_uInt16 parameterCount,
+ sal_uInt16 index, OUString const & documentation,
+ RTMethodMode flags, OUString const & name,
+ OUString const & returnTypeName, sal_uInt16 parameterCount,
sal_uInt16 exceptionCount)
{
if (!typereg_writer_setMethodData(
@@ -193,8 +193,8 @@ public:
*/
void setMethodParameterData(
sal_uInt16 methodIndex, sal_uInt16 parameterIndex,
- RTParamMode flags, rtl::OUString const & name,
- rtl::OUString const & typeName)
+ RTParamMode flags, OUString const & name,
+ OUString const & typeName)
{
if (!typereg_writer_setMethodParameterData(
m_handle, methodIndex, parameterIndex, flags, name.pData,
@@ -219,7 +219,7 @@ public:
*/
void setMethodExceptionTypeName(
sal_uInt16 methodIndex, sal_uInt16 exceptionIndex,
- rtl::OUString const & typeName)
+ OUString const & typeName)
{
if (!typereg_writer_setMethodExceptionTypeName(
m_handle, methodIndex, exceptionIndex, typeName.pData))
@@ -245,9 +245,9 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
void setReferenceData(
- sal_uInt16 index, rtl::OUString const & documentation,
+ sal_uInt16 index, OUString const & documentation,
RTReferenceType sort, RTFieldAccess flags,
- rtl::OUString const & typeName)
+ OUString const & typeName)
{
if (!typereg_writer_setReferenceData(
m_handle, index, documentation.pData, sort, flags,
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
diff --git a/registry/test/testmerge.cxx b/registry/test/testmerge.cxx
index 7d1c9e5aa99e..f1b063c0d4e7 100644
--- a/registry/test/testmerge.cxx
+++ b/registry/test/testmerge.cxx
@@ -32,7 +32,6 @@
using namespace std;
-using ::rtl::OUString;
sal_Int32 lValue1 = 123456789;
sal_Int32 lValue2 = 54321;
diff --git a/registry/test/testregcpp.cxx b/registry/test/testregcpp.cxx
index 59b51c9379a9..87b06d04ce93 100644
--- a/registry/test/testregcpp.cxx
+++ b/registry/test/testregcpp.cxx
@@ -31,9 +31,6 @@
using namespace std;
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
-using ::rtl::OString;
void test_coreReflection()
{
diff --git a/registry/tools/fileurl.cxx b/registry/tools/fileurl.cxx
index e70941113889..2813ef36b5c8 100644
--- a/registry/tools/fileurl.cxx
+++ b/registry/tools/fileurl.cxx
@@ -33,7 +33,6 @@
#define SEPARATOR '\\'
#endif
-using rtl::OUString;
using osl::FileBase;
namespace registry
diff --git a/registry/tools/fileurl.hxx b/registry/tools/fileurl.hxx
index 9a28314800c7..cec372468bbc 100644
--- a/registry/tools/fileurl.hxx
+++ b/registry/tools/fileurl.hxx
@@ -27,7 +27,7 @@ namespace registry
namespace tools
{
-rtl::OUString convertToFileUrl(char const * filename, size_t length);
+OUString convertToFileUrl(char const * filename, size_t length);
} // namespace tools
} // namespace registry
diff --git a/registry/tools/regcompare.cxx b/registry/tools/regcompare.cxx
index 49ba6cd6b87c..4aac38d4a5c3 100644
--- a/registry/tools/regcompare.cxx
+++ b/registry/tools/regcompare.cxx
@@ -37,7 +37,7 @@
using namespace rtl;
using namespace registry::tools;
-typedef std::set< rtl::OUString > StringSet;
+typedef std::set< OUString > StringSet;
class Options_Impl : public Options
{
@@ -80,12 +80,12 @@ protected:
#define U2S( s ) OUStringToOString(s, RTL_TEXTENCODING_UTF8).getStr()
-inline rtl::OUString makeOUString (std::string const & s)
+inline OUString makeOUString (std::string const & s)
{
- return rtl::OUString(s.c_str(), s.size(), RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS);
+ return OUString(s.c_str(), s.size(), RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS);
}
-inline rtl::OUString shortName(rtl::OUString const & fullName)
+inline OUString shortName(OUString const & fullName)
{
return fullName.copy(fullName.lastIndexOf('/') + 1);
}
@@ -441,7 +441,7 @@ static void printConstValue(RTConstValue& constValue)
case RT_TYPE_STRING:
fprintf(
stdout, "%s",
- (rtl::OUStringToOString(
+ (OUStringToOString(
constValue.m_value.aString, RTL_TEXTENCODING_UTF8).
getStr()));
break;
@@ -553,11 +553,11 @@ static sal_uInt32 checkConstValue(Options_Impl const & options,
fprintf(
stdout, " Field %d: Value1 = %s != Value2 = %s\n",
index1,
- rtl::OUStringToOString(
- rtl::OUString::valueOf(constValue1.m_value.aHyper),
+ OUStringToOString(
+ OUString::valueOf(constValue1.m_value.aHyper),
RTL_TEXTENCODING_ASCII_US).getStr(),
- rtl::OUStringToOString(
- rtl::OUString::valueOf(constValue2.m_value.aHyper),
+ OUStringToOString(
+ OUString::valueOf(constValue2.m_value.aHyper),
RTL_TEXTENCODING_ASCII_US).getStr());
}
return 1;
@@ -572,13 +572,13 @@ static sal_uInt32 checkConstValue(Options_Impl const & options,
fprintf(
stdout, " Field %d: Value1 = %s != Value2 = %s\n",
index1,
- rtl::OUStringToOString(
- rtl::OUString::valueOf(
+ OUStringToOString(
+ OUString::valueOf(
static_cast< sal_Int64 >(
constValue1.m_value.aUHyper)),
RTL_TEXTENCODING_ASCII_US).getStr(),
- rtl::OUStringToOString(
- rtl::OUString::valueOf(
+ OUStringToOString(
+ OUString::valueOf(
static_cast< sal_Int64 >(
constValue2.m_value.aUHyper)),
RTL_TEXTENCODING_ASCII_US).getStr());
@@ -1644,10 +1644,10 @@ static sal_uInt32 checkValueDifference(
static bool hasPublishedChildren(Options_Impl const & options, RegistryKey & key)
{
RegistryKeyNames subKeyNames;
- key.getKeyNames(rtl::OUString(), subKeyNames);
+ key.getKeyNames(OUString(), subKeyNames);
for (sal_uInt32 i = 0; i < subKeyNames.getLength(); ++i)
{
- rtl::OUString keyName(subKeyNames.getElement(i));
+ OUString keyName(subKeyNames.getElement(i));
if (!options.matchedWithExcludeKey(keyName))
{
keyName = keyName.copy(keyName.lastIndexOf('/') + 1);
@@ -1668,7 +1668,7 @@ static bool hasPublishedChildren(Options_Impl const & options, RegistryKey & key
{
RegValueType type;
sal_uInt32 size;
- if (subKey.getValueInfo(rtl::OUString(), &type, &size) != REG_NO_ERROR)
+ if (subKey.getValueInfo(OUString(), &type, &size) != REG_NO_ERROR)
{
if (options.forceOutput())
{
@@ -1684,7 +1684,7 @@ static bool hasPublishedChildren(Options_Impl const & options, RegistryKey & key
{
bool published = false;
std::vector< sal_uInt8 > value(size);
- if (subKey.getValue(rtl::OUString(), &value[0]) != REG_NO_ERROR)
+ if (subKey.getValue(OUString(), &value[0]) != REG_NO_ERROR)
{
if (options.forceOutput())
{
@@ -1747,7 +1747,7 @@ static sal_uInt32 checkDifferences(
}
else
{
- rtl::OUString keyName(subKeyNames1.getElement(i));
+ OUString keyName(subKeyNames1.getElement(i));
if (!options.matchedWithExcludeKey(keyName))
{
keyName = keyName.copy(keyName.lastIndexOf('/') + 1);
@@ -1769,7 +1769,7 @@ static sal_uInt32 checkDifferences(
{
RegValueType type;
sal_uInt32 size;
- if (subKey.getValueInfo(rtl::OUString(), &type, &size) != REG_NO_ERROR)
+ if (subKey.getValueInfo(OUString(), &type, &size) != REG_NO_ERROR)
{
if (options.forceOutput())
{
@@ -1785,7 +1785,7 @@ static sal_uInt32 checkDifferences(
else if (type == RG_VALUETYPE_BINARY)
{
std::vector< sal_uInt8 > value(size);
- if (subKey.getValue(rtl::OUString(), &value[0]) != REG_NO_ERROR)
+ if (subKey.getValue(OUString(), &value[0]) != REG_NO_ERROR)
{
if (options.forceOutput())
{
diff --git a/registry/tools/regview.cxx b/registry/tools/regview.cxx
index 6b2c19f0f73f..bdd72b22bb6b 100644
--- a/registry/tools/regview.cxx
+++ b/registry/tools/regview.cxx
@@ -26,7 +26,6 @@
#include <stdio.h>
#include <string.h>
-using rtl::OUString;
using namespace registry::tools;
#if (defined UNX)
diff --git a/registry/workben/regspeed.cxx b/registry/workben/regspeed.cxx
index c127202779ad..a202b197cf01 100644
--- a/registry/workben/regspeed.cxx
+++ b/registry/workben/regspeed.cxx
@@ -88,8 +88,6 @@ protected:
};
#endif
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
#if (defined UNX)
int main( int argc, char * argv[] )
diff --git a/registry/workben/regtest.cxx b/registry/workben/regtest.cxx
index 3652839b5bc3..52cf41336a00 100644
--- a/registry/workben/regtest.cxx
+++ b/registry/workben/regtest.cxx
@@ -27,8 +27,6 @@
using namespace std;
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
#if (defined UNX)
int main()
generated by cgit (git 2.34.1) at 2025-01-10 05:16:31 +0000