From 6259cdfd5365898a3be6e2967714e610b93acee2 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Thu, 28 Apr 2011 00:19:34 +0000
Subject: Update for new Sord API.

git-svn-id: http://svn.drobilla.net/lad/trunk/slv2@3202 a436a847-0d15-0410-975c-d299462d15a1
---
 src/slv2_internal.h |  8 ++++----
 src/value.c         |  4 ++--
 src/world.c         | 20 ++++++++++----------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/slv2_internal.h b/src/slv2_internal.h
index 539232a..2ca71fe 100644
--- a/src/slv2_internal.h
+++ b/src/slv2_internal.h
@@ -60,8 +60,8 @@ static inline char* dlerror(void) { return "Unknown error"; }
 #define SLV2_NS_XSD  (const uint8_t*)"http://www.w3.org/2001/XMLSchema#"
 #define SLV2_NS_RDF  (const uint8_t*)"http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 
-typedef SordIter SLV2Matches;
-typedef SordNode SLV2Node;
+typedef SordIter* SLV2Matches;
+typedef SordNode* SLV2Node;
 
 #define FOREACH_MATCH(iter) \
 	for (; !sord_iter_end(iter); sord_iter_next(iter))
@@ -224,8 +224,8 @@ typedef struct {
 /** Model of LV2 (RDF) data loaded from bundles.
  */
 struct _SLV2World {
-	SordWorld         world;
-	SordModel         model;
+	SordWorld*        world;
+	SordModel*        model;
 	SerdReader*       reader;
 	SerdEnv*          namespaces;
 	unsigned          n_read_files;
diff --git a/src/value.c b/src/value.c
index e39e860..477fc0d 100644
--- a/src/value.c
+++ b/src/value.c
@@ -92,10 +92,10 @@ slv2_value_new(SLV2World world, SLV2ValueType type, const char* str)
 
 /** Create a new SLV2Value from @a node, or return NULL if impossible */
 SLV2Value
-slv2_value_new_from_node(SLV2World world, SordNode node)
+slv2_value_new_from_node(SLV2World world, SordNode* node)
 {
 	SLV2Value     result       = NULL;
-	SordNode      datatype_uri = NULL;
+	SordNode*     datatype_uri = NULL;
 	SLV2ValueType type         = SLV2_VALUE_STRING;
 
 	switch (sord_node_get_type(node)) {
diff --git a/src/world.c b/src/world.c
index 26114e3..7503b0f 100644
--- a/src/world.c
+++ b/src/world.c
@@ -199,12 +199,12 @@ slv2_world_set_option(SLV2World       world,
 }
 
 static SLV2Matches
-slv2_world_find_statements(SLV2World world,
-                           SordModel model,
-                           SLV2Node  subject,
-                           SLV2Node  predicate,
-                           SLV2Node  object,
-                           SLV2Node  graph)
+slv2_world_find_statements(SLV2World  world,
+                           SordModel* model,
+                           SLV2Node   subject,
+                           SLV2Node   predicate,
+                           SLV2Node   object,
+                           SLV2Node   graph)
 {
 	SordQuad pat = { subject, predicate, object, graph };
 	return sord_find(model, pat);
@@ -350,9 +350,9 @@ slv2_world_add_plugin(SLV2World world,
 }
 
 static void
-slv2_world_load_dyn_manifest(SLV2World      world,
-                             const SordNode bundle_node,
-                             SerdNode       manifest_uri)
+slv2_world_load_dyn_manifest(SLV2World world,
+                             SordNode* bundle_node,
+                             SerdNode  manifest_uri)
 {
 #ifdef SLV2_DYN_MANIFEST
 	if (!world->opt.dyn_manifest) {
@@ -462,7 +462,7 @@ slv2_world_load_bundle(SLV2World world, SLV2Value bundle_uri)
 		return;
 	}
 
-	const SordNode bundle_node = bundle_uri->val.uri_val;
+	SordNode* bundle_node = bundle_uri->val.uri_val;
 
 	SerdNode manifest_uri = slv2_new_uri_relative_to_base(
 		(const uint8_t*)"manifest.ttl",
-- 
cgit v1.2.1