Clean up URI and path handling in parser

2 files changed, 6 insertions, 2 deletions

diff --git a/ingen/Parser.hpp b/ingen/Parser.hpp
index 96e21c51..5a361cd3 100644
--- a/ingen/Parser.hpp
+++ b/ingen/Parser.hpp
@@ -36,7 +36,6 @@ namespace Ingen {
 
 class Interface;
 class World;
-class URI;
 
 /**
    Parser for reading graphs from Turtle files or strings.
diff --git a/ingen/URI.hpp b/ingen/URI.hpp
index 30aeb7cc..3c6d38d1 100644
--- a/ingen/URI.hpp
+++ b/ingen/URI.hpp
@@ -38,7 +38,8 @@ public:
 	explicit URI(const std::string& str);
 	explicit URI(const char* str);
 	URI(const std::string& str, const URI& base);
-	explicit URI(const Sord::Node& node);
+	URI(const Sord::Node& node);
+	URI(SerdNode node);
 	explicit URI(const FilePath& path);
 
 	URI(const URI& uri);
@@ -49,6 +50,8 @@ public:
 
 	~URI();
 
+	URI make_relative(const URI& base) const;
+
 	bool empty() const { return !_node.buf; }
 
 	std::string string() const { return std::string(c_str(), _node.n_bytes); }
@@ -80,6 +83,8 @@ public:
 	}
 
 private:
+	URI(SerdNode node, SerdURI uri);
+
 	static Chunk make_chunk(const SerdChunk& chunk) {
 		return Chunk((const char*)chunk.buf, chunk.len);
 	}