Remove Raul::Path::root, Raul::Path::prefix, and Raul:Path::scheme from public API.

Add ability to modify root path from application code (before any paths are created).


git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2514 a436a847-0d15-0410-975c-d299462d15a1

8 files changed, 8 insertions, 8 deletions

diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp
index 2b7bb7f7..fd73c4b5 100644
--- a/src/client/ClientStore.cpp
+++ b/src/client/ClientStore.cpp
@@ -177,7 +177,7 @@ ClientStore::object(const Path& path)
 SharedPtr<Resource>
 ClientStore::resource(const URI& uri)
 {
-	if (uri.scheme() == Path::scheme && Path::is_valid(uri.str()))
+	if (Path::is_path(uri))
 		return object(uri.str());
 	else
 		return plugin(uri);
diff --git a/src/client/ObjectModel.cpp b/src/client/ObjectModel.cpp
index ce511af6..a2423ab8 100644
--- a/src/client/ObjectModel.cpp
+++ b/src/client/ObjectModel.cpp
@@ -31,7 +31,7 @@ ObjectModel::ObjectModel(const Path& path)
 	: ResourceImpl(path)
 	, _meta(ResourceImpl::meta_uri(path))
 	, _path(path)
-	, _symbol((path == Path::root) ? "root" : path.symbol())
+	, _symbol((path == Path::root()) ? "root" : path.symbol())
 {
 }
 
diff --git a/src/engine/GraphObjectImpl.cpp b/src/engine/GraphObjectImpl.cpp
index b9c8100c..d67755b5 100644
--- a/src/engine/GraphObjectImpl.cpp
+++ b/src/engine/GraphObjectImpl.cpp
@@ -29,7 +29,7 @@ using namespace Shared;
 
 
 GraphObjectImpl::GraphObjectImpl(GraphObjectImpl* parent, const Symbol& symbol)
-	: ResourceImpl(parent ? parent->path().child(symbol) : Raul::Path::root.child(symbol))
+	: ResourceImpl(parent ? parent->path().child(symbol) : Raul::Path::root())
 	, _parent(parent)
 	, _path(parent ? parent->path().child(symbol) : "/")
 	, _symbol(symbol)
diff --git a/src/engine/HTTPEngineReceiver.cpp b/src/engine/HTTPEngineReceiver.cpp
index 0c9efcf2..662b23eb 100644
--- a/src/engine/HTTPEngineReceiver.cpp
+++ b/src/engine/HTTPEngineReceiver.cpp
@@ -117,7 +117,7 @@ HTTPEngineReceiver::message_callback(SoupServer* server, SoupMessage* msg, const
 
 	// Special GET paths
 	if (msg->method == SOUP_METHOD_GET) {
-		if (path == Path::root.str() || path.empty()) {
+		if (path == Path::root().str() || path.empty()) {
 			const string r = string("@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .\n")
 				.append("\n<> rdfs:seeAlso <plugins> ;")
 				.append("\n   rdfs:seeAlso <stream>  ;")
diff --git a/src/engine/events/RequestMetadata.cpp b/src/engine/events/RequestMetadata.cpp
index 4d879298..69c5b271 100644
--- a/src/engine/events/RequestMetadata.cpp
+++ b/src/engine/events/RequestMetadata.cpp
@@ -59,7 +59,7 @@ RequestMetadata::RequestMetadata(Engine&            engine,
 void
 RequestMetadata::pre_process()
 {
-	const bool is_object = (_uri.scheme() == Path::scheme && Path::is_valid(_uri.str()));
+	const bool is_object = Path::is_path(_uri);
 	if (_request->client()) {
 		if (is_object)
 			_resource = _engine.engine_store()->find_object(Path(_uri.str()));
diff --git a/src/engine/events/SetMetadata.cpp b/src/engine/events/SetMetadata.cpp
index a44261d4..6b0e5832 100644
--- a/src/engine/events/SetMetadata.cpp
+++ b/src/engine/events/SetMetadata.cpp
@@ -99,7 +99,7 @@ SetMetadata::pre_process()
 {
 	typedef Properties::const_iterator iterator;
 
-	bool is_graph_object = (_subject.scheme() == Path::scheme && Path::is_valid(_subject.str()));
+	const bool is_graph_object = Path::is_path(_subject);
 
 	_object = is_graph_object
 			? _engine.engine_store()->find_object(Path(_subject.str()))
diff --git a/src/serialisation/Parser.cpp b/src/serialisation/Parser.cpp
index fa399644..68ac46ce 100644
--- a/src/serialisation/Parser.cpp
+++ b/src/serialisation/Parser.cpp
@@ -299,7 +299,7 @@ Parser::parse(
 			string subject_str = subject.to_string();
 			if (URI::is_valid(subject_str)) {
 				if (subject == document_uri)
-					subject_str = Path::root.str();
+					subject_str = Path::root().str();
 				parse_properties(world, target, model, subject, subject_str);
 			}
 		}
diff --git a/src/shared/ClashAvoider.cpp b/src/shared/ClashAvoider.cpp
index f3344a5f..7e191a0e 100644
--- a/src/shared/ClashAvoider.cpp
+++ b/src/shared/ClashAvoider.cpp
@@ -31,7 +31,7 @@ namespace Shared {
 const URI
 ClashAvoider::map_uri(const Raul::URI& in)
 {
-	if (in.scheme() == Path::scheme && Path::is_valid(in.str()))
+	if (Path::is_path(in))
 		return map_path(in.str());
 	else
 		return in;