Kaydet (Commit) f0e7b79d authored tarafından Stephan Bergmann's avatar Stephan Bergmann

URE headers do not have "using rtl::OUString"

Change-Id: I525b93371dbd89dafa6916f7c3696423f44753f6
üst 33b59c55
......@@ -141,13 +141,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
OUString getDocumentation() const {
rtl::OUString getDocumentation() const {
rtl_uString * s = 0;
typereg_reader_getDocumentation(m_handle, &s);
if (s == 0) {
throw std::bad_alloc();
}
return OUString(s, SAL_NO_ACQUIRE);
return rtl::OUString(s, SAL_NO_ACQUIRE);
}
/**
......@@ -159,13 +159,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
@deprecated
*/
OUString getFileName() const {
rtl::OUString getFileName() const {
rtl_uString * s = 0;
typereg_reader_getFileName(m_handle, &s);
if (s == 0) {
throw std::bad_alloc();
}
return OUString(s, SAL_NO_ACQUIRE);
return rtl::OUString(s, SAL_NO_ACQUIRE);
}
/**
......@@ -200,13 +200,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
OUString getTypeName() const {
rtl::OUString getTypeName() const {
rtl_uString * s = 0;
typereg_reader_getTypeName(m_handle, &s);
if (s == 0) {
throw std::bad_alloc();
}
return OUString(s, SAL_NO_ACQUIRE);
return rtl::OUString(s, SAL_NO_ACQUIRE);
}
/**
......@@ -229,13 +229,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
OUString getSuperTypeName(sal_uInt16 index) const {
rtl::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 OUString(s, SAL_NO_ACQUIRE);
return rtl::OUString(s, SAL_NO_ACQUIRE);
}
/**
......@@ -257,13 +257,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
OUString getFieldDocumentation(sal_uInt16 index) const {
rtl::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 OUString(s, SAL_NO_ACQUIRE);
return rtl::OUString(s, SAL_NO_ACQUIRE);
}
/**
......@@ -276,13 +276,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
@deprecated
*/
OUString getFieldFileName(sal_uInt16 index) const {
rtl::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 OUString(s, SAL_NO_ACQUIRE);
return rtl::OUString(s, SAL_NO_ACQUIRE);
}
/**
......@@ -305,13 +305,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
OUString getFieldName(sal_uInt16 index) const {
rtl::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 OUString(s, SAL_NO_ACQUIRE);
return rtl::OUString(s, SAL_NO_ACQUIRE);
}
/**
......@@ -323,13 +323,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
OUString getFieldTypeName(sal_uInt16 index) const {
rtl::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 OUString(s, SAL_NO_ACQUIRE);
return rtl::OUString(s, SAL_NO_ACQUIRE);
}
/**
......@@ -370,13 +370,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
OUString getMethodDocumentation(sal_uInt16 index) const {
rtl::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 OUString(s, SAL_NO_ACQUIRE);
return rtl::OUString(s, SAL_NO_ACQUIRE);
}
/**
......@@ -399,13 +399,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
OUString getMethodName(sal_uInt16 index) const {
rtl::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 OUString(s, SAL_NO_ACQUIRE);
return rtl::OUString(s, SAL_NO_ACQUIRE);
}
/**
......@@ -417,13 +417,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
OUString getMethodReturnTypeName(sal_uInt16 index) const {
rtl::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 OUString(s, SAL_NO_ACQUIRE);
return rtl::OUString(s, SAL_NO_ACQUIRE);
}
/**
......@@ -468,7 +468,7 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
OUString getMethodParameterName(
rtl::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 OUString(s, SAL_NO_ACQUIRE);
return rtl::OUString(s, SAL_NO_ACQUIRE);
}
/**
......@@ -493,7 +493,7 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
OUString getMethodParameterTypeName(
rtl::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 OUString(s, SAL_NO_ACQUIRE);
return rtl::OUString(s, SAL_NO_ACQUIRE);
}
/**
......@@ -529,7 +529,7 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
OUString getMethodExceptionTypeName(
rtl::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 OUString(s, SAL_NO_ACQUIRE);
return rtl::OUString(s, SAL_NO_ACQUIRE);
}
/**
......@@ -561,13 +561,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
OUString getReferenceDocumentation(sal_uInt16 index) const {
rtl::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 OUString(s, SAL_NO_ACQUIRE);
return rtl::OUString(s, SAL_NO_ACQUIRE);
}
/**
......@@ -604,13 +604,13 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
OUString getReferenceTypeName(sal_uInt16 index) const {
rtl::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 OUString(s, SAL_NO_ACQUIRE);
return rtl::OUString(s, SAL_NO_ACQUIRE);
}
private:
......
This diff is collapsed.
......@@ -94,8 +94,8 @@ public:
exported services ...)
*/
inline RegistryTypeWriter(RTTypeClass RTTypeClass,
const OUString& typeName,
const OUString& superTypeName,
const rtl::OUString& typeName,
const rtl::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 OUString& doku);
inline void setDoku(const rtl::OUString& doku);
/** sets the IDL filename where this type is defined.
*/
inline void setFileName(const OUString& fileName);
inline void setFileName(const rtl::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 OUString& name,
const OUString& typeName,
const OUString& doku,
const OUString& fileName,
const rtl::OUString& name,
const rtl::OUString& typeName,
const rtl::OUString& doku,
const rtl::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 OUString& name,
const OUString& returnTypeName,
const rtl::OUString& name,
const rtl::OUString& returnTypeName,
RTMethodMode mode,
sal_uInt16 paramCount,
sal_uInt16 excCount,
const OUString& doku);
const rtl::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 OUString& type,
const OUString& name,
const rtl::OUString& type,
const rtl::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 OUString& type);
const rtl::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 OUString& name,
const rtl::OUString& name,
RTReferenceType refType,
const OUString& doku,
const rtl::OUString& doku,
RTFieldAccess access = RT_ACCESS_INVALID);
protected:
......@@ -229,8 +229,8 @@ protected:
inline RegistryTypeWriter::RegistryTypeWriter(RTTypeClass RTTypeClass,
const OUString& typeName,
const OUString& superTypeName,
const rtl::OUString& typeName,
const rtl::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 OUString& name,
const OUString& typeName,
const OUString& doku,
const OUString& fileName,
const rtl::OUString& name,
const rtl::OUString& typeName,
const rtl::OUString& doku,
const rtl::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 OUString& name,
const OUString& returnTypeName,
const rtl::OUString& name,
const rtl::OUString& returnTypeName,
RTMethodMode mode,
sal_uInt16 paramCount,
sal_uInt16 excCount,
const OUString& doku)
const rtl::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 OUString& doku)
inline void RegistryTypeWriter::setDoku(const rtl::OUString& doku)
{
m_pApi->setDoku(m_hImpl, doku.pData);
}
inline void RegistryTypeWriter::setFileName(const OUString& doku)
inline void RegistryTypeWriter::setFileName(const rtl::OUString& doku)
{
m_pApi->setFileName(m_hImpl, doku.pData);
}
inline void RegistryTypeWriter::setParamData(sal_uInt16 index,
sal_uInt16 paramIndex,
const OUString& type,
const OUString& name,
const rtl::OUString& type,
const rtl::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 OUString& type)
const rtl::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 OUString& name,
const rtl::OUString& name,
RTReferenceType refType,
const OUString& doku,
const rtl::OUString& doku,
RTFieldAccess access)
{
m_pApi->setReferenceData(m_hImpl, index, name.pData, refType, doku.pData, access);
......
This diff is collapsed.
......@@ -70,9 +70,9 @@ public:
@exception std::bad_alloc is raised if an out-of-memory condition occurs
*/
Writer(
typereg_Version version, OUString const & documentation,
OUString const & fileName, RTTypeClass typeClass, bool published,
OUString const & typeName, sal_uInt16 superTypeCount,
typereg_Version version, rtl::OUString const & documentation,
rtl::OUString const & fileName, RTTypeClass typeClass, bool published,
rtl::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, OUString const & typeName) {
void setSuperTypeName(sal_uInt16 index, rtl::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, OUString const & documentation,
OUString const & fileName, RTFieldAccess flags, OUString const & name,
OUString const & typeName, RTConstValue const & value)
sal_uInt16 index, rtl::OUString const & documentation,
rtl::OUString const & fileName, RTFieldAccess flags, rtl::OUString const & name,
rtl::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, OUString const & documentation,
RTMethodMode flags, OUString const & name,
OUString const & returnTypeName, sal_uInt16 parameterCount,
sal_uInt16 index, rtl::OUString const & documentation,
RTMethodMode flags, rtl::OUString const & name,
rtl::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, OUString const & name,
OUString const & typeName)
RTParamMode flags, rtl::OUString const & name,
rtl::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,
OUString const & typeName)
rtl::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, OUString const & documentation,
sal_uInt16 index, rtl::OUString const & documentation,
RTReferenceType sort, RTFieldAccess flags,
OUString const & typeName)
rtl::OUString const & typeName)
{
if (!typereg_writer_setReferenceData(
m_handle, index, documentation.pData, sort, flags,
......
......@@ -80,7 +80,7 @@ namespace rtl
/** Opens a bootstrap argment container
@see rtl_bootstrap_args_open()
*/
inline Bootstrap(const OUString & iniName);
inline Bootstrap(const rtl::OUString & iniName);
/** Closes a bootstrap argument container
@see rtl_bootstrap_args_close()
......@@ -180,7 +180,7 @@ namespace rtl
_handle = 0;
}
inline Bootstrap::Bootstrap(const OUString & iniName)
inline Bootstrap::Bootstrap(const rtl::OUString & iniName)
{
if(!iniName.isEmpty())
_handle = rtl_bootstrap_args_open(iniName.pData);
......
......@@ -99,8 +99,8 @@ public:
*/
inline storeError create (
storeFileHandle hFile,
OUString const & rPath,
OUString const & rName,
rtl::OUString const & rPath,
rtl::OUString const & rName,
storeAccessMode eMode) SAL_THROW(())
{
if (m_hImpl)
......@@ -264,8 +264,8 @@ public:
*/
inline storeError create (
storeFileHandle hFile,
OUString const & rPath,
OUString const & rName,
rtl::OUString const & rPath,
rtl::OUString const & rName,
storeAccessMode eMode) SAL_THROW(())
{
if (m_hImpl)
......@@ -429,7 +429,7 @@ public:
@see store_openFile()
*/
inline storeError create (
OUString const & rFilename,
rtl::OUString const & rFilename,
storeAccessMode eAccessMode,
sal_uInt16 nPageSize = STORE_DEFAULT_PAGESIZE) SAL_THROW(())
{
......@@ -504,8 +504,8 @@ public:
@see store_attrib()
*/
inline storeError attrib (
OUString const & rPath,
OUString const & rName,
rtl::OUString const & rPath,
rtl::OUString const & rName,
sal_uInt32 nMask1,
sal_uInt32 nMask2,
sal_uInt32 & rnAttrib) SAL_THROW(())
......@@ -520,8 +520,8 @@ public:
@see store_attrib()
*/
inline storeError attrib (
OUString const & rPath,
OUString const & rName,
rtl::OUString const & rPath,
rtl::OUString const & rName,
sal_uInt32 nMask1,
sal_uInt32 nMask2) SAL_THROW(())
{
......@@ -535,8 +535,8 @@ public:
@see store_link()
*/
inline storeError link (
OUString const & rSrcPath, OUString const & rSrcName,
OUString const & rDstPath, OUString const & rDstName) SAL_THROW(())
rtl::OUString const & rSrcPath, rtl::OUString const & rSrcName,
rtl::OUString const & rDstPath, rtl::OUString const & rDstName) SAL_THROW(())
{
if (!m_hImpl)
return store_E_InvalidHandle;
......@@ -549,8 +549,8 @@ public:
@see store_symlink()
*/
inline storeError symlink (
OUString const & rSrcPath, OUString const & rSrcName,
OUString const & rDstPath, OUString const & rDstName) SAL_THROW(())
rtl::OUString const & rSrcPath, rtl::OUString const & rSrcName,
rtl::OUString const & rDstPath, rtl::OUString const & rDstName) SAL_THROW(())
{
if (!m_hImpl)
return store_E_InvalidHandle;
......@@ -562,8 +562,8 @@ public:
@see store_rename()
*/
inline storeError rename (
OUString const & rSrcPath, OUString const & rSrcName,
OUString const & rDstPath, OUString const & rDstName) SAL_THROW(())
rtl::OUString const & rSrcPath, rtl::OUString const & rSrcName,
rtl::OUString const & rDstPath, rtl::OUString const & rDstName) SAL_THROW(())
{
if (!m_hImpl)
return store_E_InvalidHandle;
......@@ -575,7 +575,7 @@ public:
@see store_remove()
*/
inline storeError remove (
OUString const & rPath, OUString const & rName) SAL_THROW(())
rtl::OUString const & rPath, rtl::OUString const & rName) SAL_THROW(())
{
if (!m_hImpl)
return store_E_InvalidHandle;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment