From 6f50961e69406a17d6ec998956a6b33208b1001b Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Tue, 23 Oct 2018 12:06:00 +0200
Subject: 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>
---
 unoidl/source/sourcefileprovider.cxx     |  6 +++---
 unoidl/source/sourceprovider-scanner.hxx | 14 +++++++-------
 unoidl/source/unoidl.cxx                 |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'unoidl')

diff --git a/unoidl/source/sourcefileprovider.cxx b/unoidl/source/sourcefileprovider.cxx
index 5845dbbc0115..c538f8553b90 100644
--- a/unoidl/source/sourcefileprovider.cxx
+++ b/unoidl/source/sourcefileprovider.cxx
@@ -55,14 +55,14 @@ public:
 private:
     virtual ~Module() throw () override {}
 
-    virtual std::vector<rtl::OUString> getMemberNames() const override;
+    virtual std::vector<OUString> getMemberNames() const override;
 
     virtual rtl::Reference<MapCursor> createCursor() const override
     { return new Cursor(map); }
 };
 
-std::vector<rtl::OUString> Module::getMemberNames() const {
-    std::vector<rtl::OUString> names;
+std::vector<OUString> Module::getMemberNames() const {
+    std::vector<OUString> names;
     for (auto & i: map) {
         names.push_back(i.first);
     }
diff --git a/unoidl/source/sourceprovider-scanner.hxx b/unoidl/source/sourceprovider-scanner.hxx
index 551a21c6843a..ad499ce7c5bb 100644
--- a/unoidl/source/sourceprovider-scanner.hxx
+++ b/unoidl/source/sourceprovider-scanner.hxx
@@ -197,12 +197,12 @@ public:
     struct Constructor {
         struct Parameter {
             Parameter(
-                rtl::OUString const & theName,
+                OUString const & theName,
                 SourceProviderType const & theType, bool theRest):
                 name(theName), type(theType), rest(theRest)
             {}
 
-            rtl::OUString name;
+            OUString name;
 
             SourceProviderType const type;
 
@@ -210,18 +210,18 @@ public:
         };
 
         Constructor(
-            rtl::OUString const & theName,
-            std::vector< rtl::OUString > const & theAnnotations):
+            OUString const & theName,
+            std::vector< OUString > const & theAnnotations):
             name(theName), annotations(theAnnotations)
         {}
 
-        rtl::OUString const name;
+        OUString const 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;
     };
 
     explicit SourceProviderSingleInterfaceBasedServiceEntityPad(
diff --git a/unoidl/source/unoidl.cxx b/unoidl/source/unoidl.cxx
index 7ab7562292bd..cabf575efd3d 100644
--- a/unoidl/source/unoidl.cxx
+++ b/unoidl/source/unoidl.cxx
@@ -174,7 +174,7 @@ rtl::Reference< Provider > Manager::addProvider(OUString const & uri) {
     return p;
 }
 
-rtl::Reference< Entity > Manager::findEntity(rtl::OUString const & name) const {
+rtl::Reference< Entity > Manager::findEntity(OUString const & name) const {
     //TODO: caching? (here or in cppuhelper::TypeManager?)
     osl::MutexGuard g(mutex_);
     for (auto & i: providers_) {
@@ -186,7 +186,7 @@ rtl::Reference< Entity > Manager::findEntity(rtl::OUString const & name) const {
     return rtl::Reference< Entity >();
 }
 
-rtl::Reference< MapCursor > Manager::createCursor(rtl::OUString const & name)
+rtl::Reference< MapCursor > Manager::createCursor(OUString const & name)
     const
 {
     return new AggregatingCursor(providers_, name);
-- 
cgit