summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-02-04 18:34:29 +0000
committerDavid Robillard <d@drobilla.net>2011-02-04 18:34:29 +0000
commitf7226f4a05b34429911dd15082fbe8d6a96eccf8 (patch)
tree9c971bfc779955302c8881b6cfc6c2fdbaa4dc0d
parent4271de2ee1830bb73bcb96828a32303ee1f2ad18 (diff)
downloadlilv-f7226f4a05b34429911dd15082fbe8d6a96eccf8.tar.gz
lilv-f7226f4a05b34429911dd15082fbe8d6a96eccf8.tar.bz2
lilv-f7226f4a05b34429911dd15082fbe8d6a96eccf8.zip
SordTuple => SordQuad.
git-svn-id: http://svn.drobilla.net/lad/trunk/slv2@2910 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--src/query.c2
-rw-r--r--src/slv2_internal.h4
-rw-r--r--src/world.c6
3 files changed, 6 insertions, 6 deletions
diff --git a/src/query.c b/src/query.c
index 9154990..0acd0d0 100644
--- a/src/query.c
+++ b/src/query.c
@@ -34,7 +34,7 @@ slv2_plugin_find_statements(SLV2Plugin plugin,
SLV2Node object)
{
slv2_plugin_load_if_necessary(plugin);
- SordTuple pat = { subject, predicate, object, NULL };
+ SordQuad pat = { subject, predicate, object, NULL };
return sord_find(plugin->world->model, pat);
}
diff --git a/src/slv2_internal.h b/src/slv2_internal.h
index 2691c5d..45a38d2 100644
--- a/src/slv2_internal.h
+++ b/src/slv2_internal.h
@@ -54,14 +54,14 @@ typedef SordNode SLV2Node;
static inline SLV2Node
slv2_match_subject(SLV2Matches iter) {
- SordTuple tup;
+ SordQuad tup;
sord_iter_get(iter, tup);
return tup[SORD_SUBJECT];
}
static inline SLV2Node
slv2_match_object(SLV2Matches iter) {
- SordTuple tup;
+ SordQuad tup;
sord_iter_get(iter, tup);
return tup[SORD_OBJECT];
}
diff --git a/src/world.c b/src/world.c
index 6f66fc3..970cf9d 100644
--- a/src/world.c
+++ b/src/world.c
@@ -158,7 +158,7 @@ slv2_world_find_statements(SLV2World world,
SLV2Node object,
SLV2Node graph)
{
- SordTuple pat = { subject, predicate, object, graph };
+ SordQuad pat = { subject, predicate, object, graph };
return sord_find(model, pat);
}
@@ -381,7 +381,7 @@ slv2_world_load_bundle(SLV2World world, SLV2Value bundle_uri)
SLV2Node spec = slv2_match_subject(spec_results);
// Add ?specification rdfs:seeAlso <manifest.ttl>
- SordTuple see_also_tup = {
+ SordQuad see_also_tup = {
slv2_node_copy(spec),
world->rdfs_seealso_node,
sord_get_uri(world->model, true, manifest_uri.buf),
@@ -390,7 +390,7 @@ slv2_world_load_bundle(SLV2World world, SLV2Value bundle_uri)
sord_add(world->model, see_also_tup);
// Add ?specification slv2:bundleURI <file://some/path>
- SordTuple bundle_uri_tup = {
+ SordQuad bundle_uri_tup = {
slv2_node_copy(spec),
slv2_node_copy(world->slv2_bundleuri_node),
slv2_node_copy(bundle_uri->val.uri_val),