remove more rtl::OUString and OString prefixes

which seem to have snuck back in since the great rounds of removals.

Change-Id: I85f7f5f4801c0b48dae8b50f51f83595b286d6a1
Reviewed-on: https://gerrit.libreoffice.org/62229
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 110 insertions, 110 deletions

diff --git a/include/unoidl/unoidl.hxx b/include/unoidl/unoidl.hxx
index 98674f6789e6..24fa7b27ef07 100644
--- a/include/unoidl/unoidl.hxx
+++ b/include/unoidl/unoidl.hxx
@@ -27,25 +27,25 @@ namespace unoidl {
 
 class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL NoSuchFileException final {
 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_) {}
 
     SAL_DLLPRIVATE ~NoSuchFileException() throw ();
 
-    const rtl::OUString& getUri() const { return uri_; }
+    const OUString& getUri() const { return uri_; }
 
 private:
     void operator =(NoSuchFileException) = delete;
 
-    rtl::OUString const uri_;
+    OUString const uri_;
 };
 
 class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL FileFormatException final {
 public:
     SAL_DLLPRIVATE FileFormatException(
-        rtl::OUString const & uri, rtl::OUString const & detail):
+        OUString const & uri, OUString const & detail):
         uri_(uri), detail_(detail)
     {}
 
@@ -55,27 +55,27 @@ public:
 
     SAL_DLLPRIVATE ~FileFormatException() throw ();
 
-    const rtl::OUString& getUri() const { return uri_; }
+    const OUString& getUri() const { return uri_; }
 
-    const rtl::OUString& getDetail() const { return detail_; }
+    const OUString& getDetail() const { return detail_; }
 
 private:
     void operator =(FileFormatException) = delete;
 
-    rtl::OUString const uri_;
-    rtl::OUString const detail_;
+    OUString const uri_;
+    OUString const detail_;
 };
 
 struct AnnotatedReference {
     AnnotatedReference(
-        rtl::OUString const & theName,
-        std::vector< rtl::OUString > const & theAnnotations):
+        OUString const & theName,
+        std::vector< OUString > const & theAnnotations):
         name(theName), annotations(theAnnotations)
     {}
 
-    rtl::OUString name;
+    OUString name;
 
-    std::vector< rtl::OUString > const annotations;
+    std::vector< OUString > const annotations;
 };
 
 class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL Entity: public salhelper::SimpleReferenceObject {
@@ -102,7 +102,7 @@ private:
 class SAL_WARN_UNUSED 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() {}
@@ -113,7 +113,7 @@ protected:
 class SAL_WARN_UNUSED 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,13 +128,13 @@ class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL PublishableEntity: public Entity {
 public:
     bool isPublished() const { return published_; }
 
-    std::vector< rtl::OUString > const & getAnnotations() const
+    std::vector< OUString > const & getAnnotations() const
     { return annotations_; }
 
 protected:
     SAL_DLLPRIVATE PublishableEntity(
         Sort sort, bool published,
-        std::vector< rtl::OUString > const & annotations):
+        std::vector< OUString > const & annotations):
         Entity(sort), published_(published), annotations_(annotations)
     {}
 
@@ -143,28 +143,28 @@ protected:
 private:
     bool const published_;
 
-    std::vector< rtl::OUString > const annotations_;
+    std::vector< OUString > const annotations_;
 };
 
 class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL EnumTypeEntity: public PublishableEntity {
 public:
     struct Member {
         Member(
-            rtl::OUString const & theName, sal_Int32 theValue,
-            std::vector< rtl::OUString > const & theAnnotations):
+            OUString const & theName, sal_Int32 theValue,
+            std::vector< OUString > const & theAnnotations):
             name(theName), value(theValue), annotations(theAnnotations)
         {}
 
-        rtl::OUString name;
+        OUString name;
 
         sal_Int32 value;
 
-        std::vector< rtl::OUString > const annotations;
+        std::vector< OUString > const annotations;
     };
 
     SAL_DLLPRIVATE EnumTypeEntity(
         bool published, std::vector< Member > const & members,
-        std::vector< rtl::OUString > const & annotations):
+        std::vector< OUString > const & annotations):
         PublishableEntity(SORT_ENUM_TYPE, published, annotations),
         members_(members)
     { assert(!members.empty()); }
@@ -180,27 +180,27 @@ private:
 class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL PlainStructTypeEntity: public PublishableEntity {
 public:
     struct Member {
-        Member(rtl::OUString const & theName, rtl::OUString const & theType,
-               std::vector< rtl::OUString > const & theAnnotations):
+        Member(OUString const & theName, OUString const & theType,
+               std::vector< OUString > const & theAnnotations):
             name(theName), type(theType), annotations(theAnnotations)
         {}
 
-        rtl::OUString name;
+        OUString name;
 
-        rtl::OUString type;
+        OUString type;
 
-        std::vector< rtl::OUString > const annotations;
+        std::vector< OUString > const annotations;
     };
 
     SAL_DLLPRIVATE PlainStructTypeEntity(
-        bool published, rtl::OUString const & directBase,
+        bool published, OUString const & directBase,
         std::vector< Member > const & directMembers,
-        std::vector< rtl::OUString > const & annotations):
+        std::vector< OUString > const & annotations):
         PublishableEntity(SORT_PLAIN_STRUCT_TYPE, published, annotations),
         directBase_(directBase), directMembers_(directMembers)
     {}
 
-    const rtl::OUString& getDirectBase() const { return directBase_; }
+    const OUString& getDirectBase() const { return directBase_; }
 
     std::vector< Member > const & getDirectMembers() const
     { return directMembers_; }
@@ -208,7 +208,7 @@ public:
 private:
     virtual SAL_DLLPRIVATE ~PlainStructTypeEntity() throw () override;
 
-    rtl::OUString const directBase_;
+    OUString const directBase_;
     std::vector< Member > const directMembers_;
 };
 
@@ -218,32 +218,32 @@ class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL PolymorphicStructTypeTemplateEntity:
 public:
     struct Member {
         Member(
-            rtl::OUString const & theName, rtl::OUString const & theType,
+            OUString const & theName, OUString const & theType,
             bool theParameterized,
-            std::vector< rtl::OUString > const & theAnnotations):
+            std::vector< OUString > const & theAnnotations):
             name(theName), type(theType), parameterized(theParameterized),
             annotations(theAnnotations)
         {}
 
-        rtl::OUString name;
+        OUString name;
 
-        rtl::OUString type;
+        OUString type;
 
         bool parameterized;
 
-        std::vector< rtl::OUString > const annotations;
+        std::vector< OUString > const annotations;
     };
 
     SAL_DLLPRIVATE PolymorphicStructTypeTemplateEntity(
-        bool published, std::vector< rtl::OUString > const & typeParameters,
+        bool published, std::vector< OUString > const & typeParameters,
         std::vector< Member > const & members,
-        std::vector< rtl::OUString > const & annotations):
+        std::vector< OUString > const & annotations):
         PublishableEntity(
             SORT_POLYMORPHIC_STRUCT_TYPE_TEMPLATE, published, annotations),
         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_; }
@@ -251,7 +251,7 @@ public:
 private:
     virtual SAL_DLLPRIVATE ~PolymorphicStructTypeTemplateEntity() throw () override;
 
-    std::vector< rtl::OUString > const typeParameters_;
+    std::vector< OUString > const typeParameters_;
     std::vector< Member > const members_;
 };
 
@@ -259,27 +259,27 @@ class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL ExceptionTypeEntity: public Publishabl
 public:
     struct Member {
         Member(
-            rtl::OUString const & theName, rtl::OUString const & theType,
-            std::vector< rtl::OUString > const & theAnnotations):
+            OUString const & theName, OUString const & theType,
+            std::vector< OUString > const & theAnnotations):
             name(theName), type(theType), annotations(theAnnotations)
         {}
 
-        rtl::OUString name;
+        OUString name;
 
-        rtl::OUString type;
+        OUString type;
 
-        std::vector< rtl::OUString > const annotations;
+        std::vector< OUString > const annotations;
     };
 
     SAL_DLLPRIVATE ExceptionTypeEntity(
-        bool published, rtl::OUString const & directBase,
+        bool published, OUString const & directBase,
         std::vector< Member > const & directMembers,
-        std::vector< rtl::OUString > const & annotations):
+        std::vector< OUString > const & annotations):
         PublishableEntity(SORT_EXCEPTION_TYPE, published, annotations),
         directBase_(directBase), directMembers_(directMembers)
     {}
 
-    const rtl::OUString& getDirectBase() const { return directBase_; }
+    const OUString& getDirectBase() const { return directBase_; }
 
     std::vector< Member > const & getDirectMembers() const
     { return directMembers_; }
@@ -287,7 +287,7 @@ public:
 private:
     virtual SAL_DLLPRIVATE ~ExceptionTypeEntity() throw () override;
 
-    rtl::OUString const directBase_;
+    OUString const directBase_;
     std::vector< Member > const directMembers_;
 };
 
@@ -295,29 +295,29 @@ class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL InterfaceTypeEntity: public Publishabl
 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< rtl::OUString > const & theAnnotations):
+            std::vector< OUString > const & theGetExceptions,
+            std::vector< OUString > const & theSetExceptions,
+            std::vector< OUString > const & theAnnotations):
             name(theName), type(theType), bound(theBound),
             readOnly(theReadOnly), getExceptions(theGetExceptions),
             setExceptions(theSetExceptions), annotations(theAnnotations)
         { 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;
 
-        std::vector< rtl::OUString > const annotations;
+        std::vector< OUString > const annotations;
     };
 
     struct Method {
@@ -325,36 +325,36 @@ 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< rtl::OUString > const & theAnnotations):
+            std::vector< OUString > const & theExceptions,
+            std::vector< OUString > const & theAnnotations):
             name(theName), returnType(theReturnType), parameters(theParameters),
             exceptions(theExceptions), annotations(theAnnotations)
         {}
 
-        rtl::OUString name;
+        OUString name;
 
-        rtl::OUString returnType;
+        OUString returnType;
 
         std::vector< Parameter > parameters;
 
-        std::vector< rtl::OUString > exceptions;
+        std::vector< OUString > exceptions;
 
-        std::vector< rtl::OUString > const annotations;
+        std::vector< OUString > const annotations;
     };
 
     SAL_DLLPRIVATE InterfaceTypeEntity(
@@ -363,7 +363,7 @@ public:
         std::vector< AnnotatedReference > const & directOptionalBases,
         std::vector< Attribute > const & directAttributes,
         std::vector< Method > const & directMethods,
-        std::vector< rtl::OUString > const & annotations):
+        std::vector< OUString > const & annotations):
         PublishableEntity(SORT_INTERFACE_TYPE, published, annotations),
         directMandatoryBases_(directMandatoryBases),
         directOptionalBases_(directOptionalBases),
@@ -394,17 +394,17 @@ private:
 class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL TypedefEntity: public PublishableEntity {
 public:
     SAL_DLLPRIVATE TypedefEntity(
-        bool published, rtl::OUString const & type,
-        std::vector< rtl::OUString > const & annotations):
+        bool published, OUString const & type,
+        std::vector< OUString > const & annotations):
         PublishableEntity(SORT_TYPEDEF, published, annotations), type_(type)
     {}
 
-    const rtl::OUString& getType() const { return type_; }
+    const OUString& getType() const { return type_; }
 
 private:
     virtual SAL_DLLPRIVATE ~TypedefEntity() throw () override;
 
-    rtl::OUString const type_;
+    OUString const type_;
 };
 
 struct SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL ConstantValue {
@@ -459,21 +459,21 @@ class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL ConstantGroupEntity: public Publishabl
 public:
     struct Member {
         Member(
-            rtl::OUString const & theName, ConstantValue const & theValue,
-            std::vector< rtl::OUString > const & theAnnotations):
+            OUString const & theName, ConstantValue const & theValue,
+            std::vector< OUString > const & theAnnotations):
             name(theName), value(theValue), annotations(theAnnotations)
         {}
 
-        rtl::OUString name;
+        OUString name;
 
         ConstantValue value;
 
-        std::vector< rtl::OUString > const annotations;
+        std::vector< OUString > const annotations;
     };
 
     SAL_DLLPRIVATE ConstantGroupEntity(
         bool published, std::vector< Member > const & members,
-        std::vector< rtl::OUString > const & annotations):
+        std::vector< OUString > const & annotations):
         PublishableEntity(SORT_CONSTANT_GROUP, published, annotations),
         members_(members)
     {}
@@ -493,14 +493,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 const type;
+            OUString const type;
 
             bool const rest;
         };
@@ -512,35 +512,35 @@ public:
             defaultConstructor(true) {}
 
         Constructor(
-            rtl::OUString const & theName,
+            OUString const & theName,
             std::vector< Parameter > const & theParameters,
-            std::vector< rtl::OUString > const & theExceptions,
-            std::vector< rtl::OUString > const & theAnnotations):
+            std::vector< OUString > const & theExceptions,
+            std::vector< OUString > const & theAnnotations):
             name(theName), parameters(theParameters), exceptions(theExceptions),
             annotations(theAnnotations), defaultConstructor(false)
         {}
 
-        rtl::OUString name;
+        OUString name;
 
         std::vector< Parameter > parameters;
 
-        std::vector< rtl::OUString > exceptions;
+        std::vector< OUString > exceptions;
 
-        std::vector< rtl::OUString > const annotations;
+        std::vector< OUString > const annotations;
 
         bool defaultConstructor;
     };
 
     SAL_DLLPRIVATE SingleInterfaceBasedServiceEntity(
-        bool published, rtl::OUString const & base,
+        bool published, OUString const & base,
         std::vector< Constructor > const & constructors,
-        std::vector< rtl::OUString > const & annotations):
+        std::vector< OUString > const & annotations):
         PublishableEntity(
             SORT_SINGLE_INTERFACE_BASED_SERVICE, published, annotations),
         base_(base), constructors_(constructors)
     {}
 
-    const rtl::OUString& getBase() const { return base_; }
+    const OUString& getBase() const { return base_; }
 
     std::vector< Constructor > const & getConstructors() const
     { return constructors_; }
@@ -548,7 +548,7 @@ public:
 private:
     virtual SAL_DLLPRIVATE ~SingleInterfaceBasedServiceEntity() throw () override;
 
-    rtl::OUString const base_;
+    OUString const base_;
     std::vector< Constructor > const constructors_;
 };
 
@@ -570,20 +570,20 @@ public:
         };
 
         Property(
-            rtl::OUString const & theName, rtl::OUString const & theType,
+            OUString const & theName, OUString const & theType,
             Attributes theAttributes,
-            std::vector< rtl::OUString > const & theAnnotations):
+            std::vector< OUString > const & theAnnotations):
             name(theName), type(theType), attributes(theAttributes),
             annotations(theAnnotations)
         {}
 
-        rtl::OUString name;
+        OUString name;
 
-        rtl::OUString type;
+        OUString type;
 
         Attributes const attributes;
 
-        std::vector< rtl::OUString > const annotations;
+        std::vector< OUString > const annotations;
     };
 
     SAL_DLLPRIVATE AccumulationBasedServiceEntity(
@@ -593,7 +593,7 @@ public:
         std::vector< AnnotatedReference > const & directMandatoryBaseInterfaces,
         std::vector< AnnotatedReference > const & directOptionalBaseInterfaces,
         std::vector< Property > const & directProperties,
-        std::vector< rtl::OUString > const & annotations):
+        std::vector< OUString > const & annotations):
         PublishableEntity(
             SORT_ACCUMULATION_BASED_SERVICE, published, annotations),
         directMandatoryBaseServices_(directMandatoryBaseServices),
@@ -637,37 +637,37 @@ class LO_DLLPUBLIC_UNOIDL InterfaceBasedSingletonEntity:
 {
 public:
     SAL_DLLPRIVATE InterfaceBasedSingletonEntity(
-        bool published, rtl::OUString const & base,
-        std::vector< rtl::OUString > const & annotations):
+        bool published, OUString const & base,
+        std::vector< OUString > const & annotations):
         PublishableEntity(
             SORT_INTERFACE_BASED_SINGLETON, published, annotations),
         base_(base)
     {}
 
-    const rtl::OUString& getBase() const { return base_; }
+    const OUString& getBase() const { return base_; }
 
 private:
     virtual SAL_DLLPRIVATE ~InterfaceBasedSingletonEntity() throw () override;
 
-    rtl::OUString const base_;
+    OUString const base_;
 };
 
 class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL ServiceBasedSingletonEntity: public PublishableEntity
 {
 public:
     SAL_DLLPRIVATE ServiceBasedSingletonEntity(
-        bool published, rtl::OUString const & base,
-        std::vector< rtl::OUString > const & annotations):
+        bool published, OUString const & base,
+        std::vector< OUString > const & annotations):
         PublishableEntity(SORT_SERVICE_BASED_SINGLETON, published, annotations),
         base_(base)
     {}
 
-    const rtl::OUString& getBase() const { return base_; }
+    const OUString& getBase() const { return base_; }
 
 private:
     virtual SAL_DLLPRIVATE ~ServiceBasedSingletonEntity() throw () override;
 
-    rtl::OUString const base_;
+    OUString const base_;
 };
 
 class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL Provider: public salhelper::SimpleReferenceObject {
@@ -676,7 +676,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:
@@ -690,19 +690,19 @@ public:
     Manager() {}
 
     // throws FileFormatException, NoSuchFileException:
-    rtl::Reference< Provider > addProvider(rtl::OUString const & uri);
+    rtl::Reference< Provider > addProvider(OUString const & uri);
 
     // throws FileFormatException:
-    rtl::Reference< Entity > findEntity(rtl::OUString const & name) const;
+    rtl::Reference< Entity > findEntity(OUString const & name) const;
 
     // throws FileFormatException:
-    rtl::Reference< MapCursor > createCursor(rtl::OUString const & name) const;
+    rtl::Reference< MapCursor > createCursor(OUString const & name) const;
 
 private:
     virtual SAL_DLLPRIVATE ~Manager() throw () override;
 
     SAL_DLLPRIVATE rtl::Reference< Provider > loadProvider(
-        rtl::OUString const & uri);
+        OUString const & uri);
 
     mutable osl::Mutex mutex_;
     std::vector< rtl::Reference< Provider > > providers_;