summaryrefslogtreecommitdiff
path: root/unoidl
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-09-16 22:30:31 +0200
committerStephan Bergmann <sbergman@redhat.com>2013-09-17 06:55:42 +0200
commit6292bba6debaeb5c1bbbabfb77606296c894ec28 (patch)
tree3af665e0b9827e3462fc57caa6747e1d389caa54 /unoidl
parentd11592ad8e21970e80f6a87a9ae43d380f1c3eef (diff)
Rename SourceProvider -> SourceTreeProvider
Change-Id: Ic864f9c6f3dbbe9f75bdae76818c00f62825182d
Diffstat (limited to 'unoidl')
-rw-r--r--unoidl/Library_unoidl.mk2
-rwxr-xr-xunoidl/source/sourcetreeprovider.cxx (renamed from unoidl/source/sourceprovider.cxx)12
-rw-r--r--unoidl/source/sourcetreeprovider.hxx (renamed from unoidl/source/sourceprovider.hxx)10
-rw-r--r--unoidl/source/unoidl.cxx4
4 files changed, 15 insertions, 13 deletions
diff --git a/unoidl/Library_unoidl.mk b/unoidl/Library_unoidl.mk
index 5cffa49c3fe0..411e0a9a7ab3 100644
--- a/unoidl/Library_unoidl.mk
+++ b/unoidl/Library_unoidl.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_Library_add_defs,unoidl,-DLO_DLLIMPLEMENTATION_UNOIDL))
$(eval $(call gb_Library_add_exception_objects,unoidl, \
unoidl/source/legacyprovider \
- unoidl/source/sourceprovider \
+ unoidl/source/sourcetreeprovider \
unoidl/source/unoidl \
unoidl/source/unoidlprovider \
))
diff --git a/unoidl/source/sourceprovider.cxx b/unoidl/source/sourcetreeprovider.cxx
index 64428eb72839..d389f0cdff0f 100755
--- a/unoidl/source/sourceprovider.cxx
+++ b/unoidl/source/sourcetreeprovider.cxx
@@ -23,7 +23,7 @@
#include "sourceprovider-parser-requires.hxx"
#include "sourceprovider-parser.hxx"
#include "sourceprovider-scanner.hxx"
-#include "sourceprovider.hxx"
+#include "sourcetreeprovider.hxx"
namespace unoidl { namespace detail {
@@ -56,16 +56,18 @@ private:
}
-SourceProvider::SourceProvider(
+SourceTreeProvider::SourceTreeProvider(
rtl::Reference<Manager> const & manager, OUString const & uri):
manager_(manager), uri_(uri.endsWith("/") ? uri : uri + "/")
{}
-rtl::Reference<MapCursor> SourceProvider::createRootCursor() const {
+rtl::Reference<MapCursor> SourceTreeProvider::createRootCursor() const {
return new Cursor;
}
-rtl::Reference<Entity> SourceProvider::findEntity(OUString const & name) const {
+rtl::Reference<Entity> SourceTreeProvider::findEntity(OUString const & name)
+ const
+{
std::map< OUString, rtl::Reference<Entity> >::iterator ci(
cache_.find(name));
if (ci != cache_.end()) {
@@ -143,7 +145,7 @@ rtl::Reference<Entity> SourceProvider::findEntity(OUString const & name) const {
return ent;
}
-SourceProvider::~SourceProvider() throw () {}
+SourceTreeProvider::~SourceTreeProvider() throw () {}
} }
diff --git a/unoidl/source/sourceprovider.hxx b/unoidl/source/sourcetreeprovider.hxx
index e7ee92f64a0f..1bacad8a739d 100644
--- a/unoidl/source/sourceprovider.hxx
+++ b/unoidl/source/sourcetreeprovider.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_UNOIDL_SOURCEPROVIDER_HXX
-#define INCLUDED_UNOIDL_SOURCEPROVIDER_HXX
+#ifndef INCLUDED_UNOIDL_SOURCETREEPROVIDER_HXX
+#define INCLUDED_UNOIDL_SOURCETREEPROVIDER_HXX
#include "sal/config.h"
@@ -19,10 +19,10 @@
namespace unoidl { namespace detail {
-class SourceProvider: public Provider {
+class SourceTreeProvider: public Provider {
public:
// throws FileFormatException, NoSuchFileException:
- SourceProvider(
+ SourceTreeProvider(
rtl::Reference<Manager> const & manager, OUString const & uri);
// throws FileFormatException:
@@ -32,7 +32,7 @@ public:
virtual rtl::Reference<Entity> findEntity(OUString const & name) const;
private:
- virtual ~SourceProvider() throw ();
+ virtual ~SourceTreeProvider() throw ();
rtl::Reference<Manager> manager_;
OUString uri_;
diff --git a/unoidl/source/unoidl.cxx b/unoidl/source/unoidl.cxx
index e5c3c434a357..19b8a9cab646 100644
--- a/unoidl/source/unoidl.cxx
+++ b/unoidl/source/unoidl.cxx
@@ -20,7 +20,7 @@
#include "unoidl/unoidl.hxx"
#include "legacyprovider.hxx"
-#include "sourceprovider.hxx"
+#include "sourcetreeprovider.hxx"
#include "unoidlprovider.hxx"
namespace unoidl {
@@ -114,7 +114,7 @@ rtl::Reference< Provider > loadProvider(
if (item.getFileStatus(status) == osl::FileBase::E_None
&& status.getFileType() == osl::FileStatus::Directory)
{
- return new detail::SourceProvider(manager, uri);
+ return new detail::SourceTreeProvider(manager, uri);
}
}
try {