summaryrefslogtreecommitdiff
path: root/unoidl
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 /unoidl
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 'unoidl')
-rw-r--r--unoidl/inc/unoidl/legacyprovider.hxx4
-rw-r--r--unoidl/inc/unoidl/unoidl.hxx180
-rw-r--r--unoidl/inc/unoidl/unoidlprovider.hxx6
-rw-r--r--unoidl/source/legacyprovider.cxx2
-rw-r--r--unoidl/source/unoidl.cxx2
5 files changed, 97 insertions, 97 deletions
diff --git a/unoidl/inc/unoidl/legacyprovider.hxx b/unoidl/inc/unoidl/legacyprovider.hxx
index 68db79c933c2..6f89f18d2d47 100644
--- a/unoidl/inc/unoidl/legacyprovider.hxx
+++ b/unoidl/inc/unoidl/legacyprovider.hxx
@@ -26,13 +26,13 @@ class LO_DLLPUBLIC_UNOIDL LegacyProvider: public Provider {
public:
// throws FileFormatException, NoSuchFileException:
LegacyProvider(
- rtl::Reference< Manager > const & manager, rtl::OUString const & uri);
+ rtl::Reference< Manager > const & manager, OUString const & uri);
// throws FileFormatException:
virtual rtl::Reference< MapCursor > createRootCursor() const;
// throws FileFormatException:
- virtual rtl::Reference< Entity > findEntity(rtl::OUString const & name)
+ virtual rtl::Reference< Entity > findEntity(OUString const & name)
const;
private:
diff --git a/unoidl/inc/unoidl/unoidl.hxx b/unoidl/inc/unoidl/unoidl.hxx
index 5597227c16e0..ad4702d50ca5 100644
--- a/unoidl/inc/unoidl/unoidl.hxx
+++ b/unoidl/inc/unoidl/unoidl.hxx
@@ -25,25 +25,25 @@ namespace unoidl {
class LO_DLLPUBLIC_UNOIDL NoSuchFileException {
public:
- SAL_DLLPRIVATE NoSuchFileException(rtl::OUString const & uri): uri_(uri) {}
+ SAL_DLLPRIVATE NoSuchFileException(OUString const & uri): uri_(uri) {}
SAL_DLLPRIVATE NoSuchFileException(NoSuchFileException const & other):
uri_(other.uri_) {}
virtual SAL_DLLPRIVATE ~NoSuchFileException() throw ();
- rtl::OUString getUri() const { return uri_; }
+ OUString getUri() const { return uri_; }
private:
void operator =(NoSuchFileException) SAL_DELETED_FUNCTION;
- rtl::OUString uri_;
+ OUString uri_;
};
class LO_DLLPUBLIC_UNOIDL FileFormatException {
public:
SAL_DLLPRIVATE FileFormatException(
- rtl::OUString const & uri, rtl::OUString const & detail):
+ OUString const & uri, OUString const & detail):
uri_(uri), detail_(detail)
{}
@@ -53,15 +53,15 @@ public:
virtual SAL_DLLPRIVATE ~FileFormatException() throw ();
- rtl::OUString getUri() const { return uri_; }
+ OUString getUri() const { return uri_; }
- rtl::OUString getDetail() const { return detail_; }
+ OUString getDetail() const { return detail_; }
private:
void operator =(FileFormatException) SAL_DELETED_FUNCTION;
- rtl::OUString uri_;
- rtl::OUString detail_;
+ OUString uri_;
+ OUString detail_;
};
class LO_DLLPUBLIC_UNOIDL Entity: public salhelper::SimpleReferenceObject {
@@ -88,7 +88,7 @@ private:
class LO_DLLPUBLIC_UNOIDL MapCursor: public salhelper::SimpleReferenceObject {
public:
// throws FileFormatException:
- virtual rtl::Reference< Entity > getNext(rtl::OUString * name) = 0;
+ virtual rtl::Reference< Entity > getNext(OUString * name) = 0;
protected:
SAL_DLLPRIVATE MapCursor() {}
@@ -99,7 +99,7 @@ protected:
class LO_DLLPUBLIC_UNOIDL ModuleEntity: public Entity {
public:
// throws FileFormatException:
- virtual std::vector< rtl::OUString > getMemberNames() const = 0;
+ virtual std::vector< OUString > getMemberNames() const = 0;
// throws FileFormatException:
virtual rtl::Reference< MapCursor > createCursor() const = 0;
@@ -128,11 +128,11 @@ private:
class LO_DLLPUBLIC_UNOIDL EnumTypeEntity: public PublishableEntity {
public:
struct Member {
- Member(rtl::OUString const & theName, sal_Int32 theValue):
+ Member(OUString const & theName, sal_Int32 theValue):
name(theName), value(theValue)
{}
- rtl::OUString name;
+ OUString name;
sal_Int32 value;
};
@@ -153,23 +153,23 @@ private:
class LO_DLLPUBLIC_UNOIDL PlainStructTypeEntity: public PublishableEntity {
public:
struct Member {
- Member(rtl::OUString const & theName, rtl::OUString const & theType):
+ Member(OUString const & theName, OUString const & theType):
name(theName), type(theType)
{}
- rtl::OUString name;
+ OUString name;
- rtl::OUString type;
+ OUString type;
};
SAL_DLLPRIVATE PlainStructTypeEntity(
- bool published, rtl::OUString const & directBase,
+ bool published, OUString const & directBase,
std::vector< Member > const & directMembers):
PublishableEntity(SORT_PLAIN_STRUCT_TYPE, published),
directBase_(directBase), directMembers_(directMembers)
{}
- rtl::OUString getDirectBase() const { return directBase_; }
+ OUString getDirectBase() const { return directBase_; }
std::vector< Member > const & getDirectMembers() const
{ return directMembers_; }
@@ -177,7 +177,7 @@ public:
private:
virtual SAL_DLLPRIVATE ~PlainStructTypeEntity() throw ();
- rtl::OUString directBase_;
+ OUString directBase_;
std::vector< Member > directMembers_;
};
@@ -187,26 +187,26 @@ class LO_DLLPUBLIC_UNOIDL PolymorphicStructTypeTemplateEntity:
public:
struct Member {
Member(
- rtl::OUString const & theName, rtl::OUString const & theType,
+ OUString const & theName, OUString const & theType,
bool theParameterized):
name(theName), type(theType), parameterized(theParameterized)
{}
- rtl::OUString name;
+ OUString name;
- rtl::OUString type;
+ OUString type;
bool parameterized;
};
SAL_DLLPRIVATE PolymorphicStructTypeTemplateEntity(
- bool published, std::vector< rtl::OUString > const & typeParameters,
+ bool published, std::vector< OUString > const & typeParameters,
std::vector< Member > const & members):
PublishableEntity(SORT_POLYMORPHIC_STRUCT_TYPE_TEMPLATE, published),
typeParameters_(typeParameters), members_(members)
{}
- std::vector< rtl::OUString > const & getTypeParameters() const
+ std::vector< OUString > const & getTypeParameters() const
{ return typeParameters_; }
std::vector< Member > const & getMembers() const { return members_; }
@@ -214,30 +214,30 @@ public:
private:
virtual SAL_DLLPRIVATE ~PolymorphicStructTypeTemplateEntity() throw ();
- std::vector< rtl::OUString > typeParameters_;
+ std::vector< OUString > typeParameters_;
std::vector< Member > members_;
};
class LO_DLLPUBLIC_UNOIDL ExceptionTypeEntity: public PublishableEntity {
public:
struct Member {
- Member(rtl::OUString const & theName, rtl::OUString const & theType):
+ Member(OUString const & theName, OUString const & theType):
name(theName), type(theType)
{}
- rtl::OUString name;
+ OUString name;
- rtl::OUString type;
+ OUString type;
};
SAL_DLLPRIVATE ExceptionTypeEntity(
- bool published, rtl::OUString const & directBase,
+ bool published, OUString const & directBase,
std::vector< Member > const & directMembers):
PublishableEntity(SORT_EXCEPTION_TYPE, published),
directBase_(directBase), directMembers_(directMembers)
{}
- rtl::OUString getDirectBase() const { return directBase_; }
+ OUString getDirectBase() const { return directBase_; }
std::vector< Member > const & getDirectMembers() const
{ return directMembers_; }
@@ -245,7 +245,7 @@ public:
private:
virtual SAL_DLLPRIVATE ~ExceptionTypeEntity() throw ();
- rtl::OUString directBase_;
+ OUString directBase_;
std::vector< Member > directMembers_;
};
@@ -253,26 +253,26 @@ class LO_DLLPUBLIC_UNOIDL InterfaceTypeEntity: public PublishableEntity {
public:
struct Attribute {
Attribute(
- rtl::OUString const & theName, rtl::OUString const & theType,
+ OUString const & theName, OUString const & theType,
bool theBound, bool theReadOnly,
- std::vector< rtl::OUString > const & theGetExceptions,
- std::vector< rtl::OUString > const & theSetExceptions):
+ std::vector< OUString > const & theGetExceptions,
+ std::vector< OUString > const & theSetExceptions):
name(theName), type(theType), bound(theBound),
readOnly(theReadOnly), getExceptions(theGetExceptions),
setExceptions(theSetExceptions)
{ assert(!theReadOnly || theSetExceptions.empty()); }
- rtl::OUString name;
+ OUString name;
- rtl::OUString type;
+ OUString type;
bool bound;
bool readOnly;
- std::vector< rtl::OUString > getExceptions;
+ std::vector< OUString > getExceptions;
- std::vector< rtl::OUString > setExceptions;
+ std::vector< OUString > setExceptions;
};
struct Method {
@@ -280,39 +280,39 @@ public:
enum Direction { DIRECTION_IN, DIRECTION_OUT, DIRECTION_IN_OUT };
Parameter(
- rtl::OUString const & theName, rtl::OUString const & theType,
+ OUString const & theName, OUString const & theType,
Direction theDirection):
name(theName), type(theType), direction(theDirection)
{}
- rtl::OUString name;
+ OUString name;
- rtl::OUString type;
+ OUString type;
Direction direction;
};
Method(
- rtl::OUString const & theName, rtl::OUString const & theReturnType,
+ OUString const & theName, OUString const & theReturnType,
std::vector< Parameter > const & theParameters,
- std::vector< rtl::OUString > const & theExceptions):
+ std::vector< OUString > const & theExceptions):
name(theName), returnType(theReturnType), parameters(theParameters),
exceptions(theExceptions)
{}
- rtl::OUString name;
+ OUString name;
- rtl::OUString returnType;
+ OUString returnType;
std::vector< Parameter > parameters;
- std::vector< rtl::OUString > exceptions;
+ std::vector< OUString > exceptions;
};
SAL_DLLPRIVATE InterfaceTypeEntity(
bool published,
- std::vector< rtl::OUString > const & directMandatoryBases,
- std::vector< rtl::OUString > const & directOptionalBases,
+ std::vector< OUString > const & directMandatoryBases,
+ std::vector< OUString > const & directOptionalBases,
std::vector< Attribute > const & directAttributes,
std::vector< Method > const & directMethods):
PublishableEntity(SORT_INTERFACE_TYPE, published),
@@ -321,10 +321,10 @@ public:
directAttributes_(directAttributes), directMethods_(directMethods)
{}
- std::vector< rtl::OUString > const & getDirectMandatoryBases() const
+ std::vector< OUString > const & getDirectMandatoryBases() const
{ return directMandatoryBases_; }
- std::vector< rtl::OUString > const & getDirectOptionalBases() const
+ std::vector< OUString > const & getDirectOptionalBases() const
{ return directOptionalBases_; }
std::vector< Attribute > const & getDirectAttributes() const
@@ -336,24 +336,24 @@ public:
private:
virtual SAL_DLLPRIVATE ~InterfaceTypeEntity() throw ();
- std::vector< rtl::OUString > directMandatoryBases_;
- std::vector< rtl::OUString > directOptionalBases_;
+ std::vector< OUString > directMandatoryBases_;
+ std::vector< OUString > directOptionalBases_;
std::vector< Attribute > directAttributes_;
std::vector< Method > directMethods_;
};
class LO_DLLPUBLIC_UNOIDL TypedefEntity: public PublishableEntity {
public:
- SAL_DLLPRIVATE TypedefEntity(bool published, rtl::OUString const & type):
+ SAL_DLLPRIVATE TypedefEntity(bool published, OUString const & type):
PublishableEntity(SORT_TYPEDEF, published), type_(type)
{}
- rtl::OUString getType() const { return type_; }
+ OUString getType() const { return type_; }
private:
virtual SAL_DLLPRIVATE ~TypedefEntity() throw ();
- rtl::OUString type_;
+ OUString type_;
};
struct LO_DLLPUBLIC_UNOIDL ConstantValue {
@@ -412,11 +412,11 @@ struct LO_DLLPUBLIC_UNOIDL ConstantValue {
class LO_DLLPUBLIC_UNOIDL ConstantGroupEntity: public PublishableEntity {
public:
struct Member {
- Member(rtl::OUString const & theName, ConstantValue const & theValue):
+ Member(OUString const & theName, ConstantValue const & theValue):
name(theName), value(theValue)
{}
- rtl::OUString name;
+ OUString name;
ConstantValue value;
};
@@ -441,14 +441,14 @@ public:
struct Constructor {
struct Parameter {
Parameter(
- rtl::OUString const & theName, rtl::OUString const & theType,
+ OUString const & theName, OUString const & theType,
bool theRest):
name(theName), type(theType), rest(theRest)
{}
- rtl::OUString name;
+ OUString name;
- rtl::OUString type;
+ OUString type;
bool rest;
};
@@ -456,30 +456,30 @@ public:
Constructor(): defaultConstructor(true) {}
Constructor(
- rtl::OUString const & theName,
+ OUString const & theName,
std::vector< Parameter > const & theParameters,
- std::vector< rtl::OUString > const & theExceptions):
+ std::vector< OUString > const & theExceptions):
name(theName), parameters(theParameters), exceptions(theExceptions),
defaultConstructor(false)
{}
- rtl::OUString name;
+ OUString name;
std::vector< Parameter > parameters;
- std::vector< rtl::OUString > exceptions;
+ std::vector< OUString > exceptions;
bool defaultConstructor;
};
SAL_DLLPRIVATE SingleInterfaceBasedServiceEntity(
- bool published, rtl::OUString const & base,
+ bool published, OUString const & base,
std::vector< Constructor > const & constructors):
PublishableEntity(SORT_SINGLE_INTERFACE_BASED_SERVICE, published),
base_(base), constructors_(constructors)
{}
- rtl::OUString getBase() const { return base_; }
+ OUString getBase() const { return base_; }
std::vector< Constructor > const & getConstructors() const
{ return constructors_; }
@@ -487,7 +487,7 @@ public:
private:
virtual SAL_DLLPRIVATE ~SingleInterfaceBasedServiceEntity() throw ();
- rtl::OUString base_;
+ OUString base_;
std::vector< Constructor > constructors_;
};
@@ -509,24 +509,24 @@ public:
};
Property(
- rtl::OUString const & theName, rtl::OUString const & theType,
+ OUString const & theName, OUString const & theType,
Attributes theAttributes):
name(theName), type(theType), attributes(theAttributes)
{}
- rtl::OUString name;
+ OUString name;
- rtl::OUString type;
+ OUString type;
Attributes attributes;
};
SAL_DLLPRIVATE AccumulationBasedServiceEntity(
bool published,
- std::vector< rtl::OUString > const & directMandatoryBaseServices,
- std::vector< rtl::OUString > const & directOptionalBaseServices,
- std::vector< rtl::OUString > const & directMandatoryBaseInterfaces,
- std::vector< rtl::OUString > const & directOptionalBaseInterfaces,
+ std::vector< OUString > const & directMandatoryBaseServices,
+ std::vector< OUString > const & directOptionalBaseServices,
+ std::vector< OUString > const & directMandatoryBaseInterfaces,
+ std::vector< OUString > const & directOptionalBaseInterfaces,
std::vector< Property > const & directProperties):
PublishableEntity(SORT_ACCUMULATION_BASED_SERVICE, published),
directMandatoryBaseServices_(directMandatoryBaseServices),
@@ -536,17 +536,17 @@ public:
directProperties_(directProperties)
{}
- std::vector< rtl::OUString > const & getDirectMandatoryBaseServices() const
+ std::vector< OUString > const & getDirectMandatoryBaseServices() const
{ return directMandatoryBaseServices_; }
- std::vector< rtl::OUString > const & getDirectOptionalBaseServices() const
+ std::vector< OUString > const & getDirectOptionalBaseServices() const
{ return directOptionalBaseServices_; }
- std::vector< rtl::OUString > const & getDirectMandatoryBaseInterfaces()
+ std::vector< OUString > const & getDirectMandatoryBaseInterfaces()
const
{ return directMandatoryBaseInterfaces_; }
- std::vector< rtl::OUString > const & getDirectOptionalBaseInterfaces() const
+ std::vector< OUString > const & getDirectOptionalBaseInterfaces() const
{ return directOptionalBaseInterfaces_; }
std::vector< Property > const & getDirectProperties() const
@@ -555,10 +555,10 @@ public:
private:
virtual SAL_DLLPRIVATE ~AccumulationBasedServiceEntity() throw ();
- std::vector< rtl::OUString > directMandatoryBaseServices_;
- std::vector< rtl::OUString > directOptionalBaseServices_;
- std::vector< rtl::OUString > directMandatoryBaseInterfaces_;
- std::vector< rtl::OUString > directOptionalBaseInterfaces_;
+ std::vector< OUString > directMandatoryBaseServices_;
+ std::vector< OUString > directOptionalBaseServices_;
+ std::vector< OUString > directMandatoryBaseInterfaces_;
+ std::vector< OUString > directOptionalBaseInterfaces_;
std::vector< Property > directProperties_;
};
@@ -567,33 +567,33 @@ class LO_DLLPUBLIC_UNOIDL InterfaceBasedSingletonEntity:
{
public:
SAL_DLLPRIVATE InterfaceBasedSingletonEntity(
- bool published, rtl::OUString const & base):
+ bool published, OUString const & base):
PublishableEntity(SORT_INTERFACE_BASED_SINGLETON, published),
base_(base)
{}
- rtl::OUString getBase() const { return base_; }
+ OUString getBase() const { return base_; }
private:
virtual SAL_DLLPRIVATE ~InterfaceBasedSingletonEntity() throw ();
- rtl::OUString base_;
+ OUString base_;
};
class LO_DLLPUBLIC_UNOIDL ServiceBasedSingletonEntity: public PublishableEntity
{
public:
SAL_DLLPRIVATE ServiceBasedSingletonEntity(
- bool published, rtl::OUString const & base):
+ bool published, OUString const & base):
PublishableEntity(SORT_SERVICE_BASED_SINGLETON, published), base_(base)
{}
- rtl::OUString getBase() const { return base_; }
+ OUString getBase() const { return base_; }
private:
virtual SAL_DLLPRIVATE ~ServiceBasedSingletonEntity() throw ();
- rtl::OUString base_;
+ OUString base_;
};
class LO_DLLPUBLIC_UNOIDL Provider: public salhelper::SimpleReferenceObject {
@@ -602,7 +602,7 @@ public:
virtual rtl::Reference< MapCursor > createRootCursor() const = 0;
// throws FileFormatException:
- virtual rtl::Reference< Entity > findEntity(rtl::OUString const & name)
+ virtual rtl::Reference< Entity > findEntity(OUString const & name)
const = 0;
protected:
@@ -618,7 +618,7 @@ public:
void addProvider(rtl::Reference< Provider > const & provider);
// throws FileFormatException:
- rtl::Reference< Entity > findEntity(rtl::OUString const & name) const;
+ rtl::Reference< Entity > findEntity(OUString const & name) const;
private:
virtual SAL_DLLPRIVATE ~Manager() throw ();
@@ -628,7 +628,7 @@ private:
// throws FileFormatException, NoSuchFileException:
LO_DLLPUBLIC_UNOIDL rtl::Reference< Provider > loadProvider(
- rtl::Reference< Manager > const & manager, rtl::OUString const & uri);
+ rtl::Reference< Manager > const & manager, OUString const & uri);
}
diff --git a/unoidl/inc/unoidl/unoidlprovider.hxx b/unoidl/inc/unoidl/unoidlprovider.hxx
index b72a629990ef..03739a1acc65 100644
--- a/unoidl/inc/unoidl/unoidlprovider.hxx
+++ b/unoidl/inc/unoidl/unoidlprovider.hxx
@@ -28,17 +28,17 @@ namespace unoidl {
class LO_DLLPUBLIC_UNOIDL UnoidlProvider: public Provider {
public:
// throws FileFormatException, NoSuchFileException:
- explicit UnoidlProvider(rtl::OUString const & uri);
+ explicit UnoidlProvider(OUString const & uri);
// throws FileFormatException:
virtual rtl::Reference< MapCursor > createRootCursor() const;
// throws FileFormatException:
- virtual rtl::Reference< Entity > findEntity(rtl::OUString const & name)
+ virtual rtl::Reference< Entity > findEntity(OUString const & name)
const;
// throws FileFormatException:
- sal_uInt32 find(rtl::OUString const & name, bool * constant = 0) const;
+ sal_uInt32 find(OUString const & name, bool * constant = 0) const;
// throws FileFormatException:
rtl::Reference< Entity > getEntity(sal_uInt32 offset) const;
diff --git a/unoidl/source/legacyprovider.cxx b/unoidl/source/legacyprovider.cxx
index 0aa6ec5b01fd..485b43d48055 100644
--- a/unoidl/source/legacyprovider.cxx
+++ b/unoidl/source/legacyprovider.cxx
@@ -762,7 +762,7 @@ rtl::Reference< MapCursor > LegacyProvider::createRootCursor() const {
return new Cursor(manager_, ucr_, ucr_);
}
-rtl::Reference< Entity > LegacyProvider::findEntity(rtl::OUString const & name)
+rtl::Reference< Entity > LegacyProvider::findEntity(OUString const & name)
const
{
return readEntity(manager_, ucr_, ucr_, name.replace('.', '/'), true);
diff --git a/unoidl/source/unoidl.cxx b/unoidl/source/unoidl.cxx
index 0ffeb6bdd014..19f2f41070e0 100644
--- a/unoidl/source/unoidl.cxx
+++ b/unoidl/source/unoidl.cxx
@@ -77,7 +77,7 @@ void Manager::addProvider(rtl::Reference< Provider > const & provider) {
providers_.push_back(provider);
}
-rtl::Reference< Entity > Manager::findEntity(rtl::OUString const & name) const {
+rtl::Reference< Entity > Manager::findEntity(OUString const & name) const {
//TODO: add caching
for (std::vector< rtl::Reference< Provider > >::const_iterator i(
providers_.begin());