LilvValue => LilvNode.

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

1 files changed, 23 insertions, 23 deletions

diff --git a/src/ui.c b/src/ui.c
index a2df5f2..36287e1 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -24,9 +24,9 @@
 
 LilvUI*
 lilv_ui_new(LilvWorld* world,
-            LilvValue* uri,
-            LilvValue* type_uri,
-            LilvValue* binary_uri)
+            LilvNode* uri,
+            LilvNode* type_uri,
+            LilvNode* binary_uri)
 {
 	assert(uri);
 	assert(type_uri);
@@ -38,13 +38,13 @@ lilv_ui_new(LilvWorld* world,
 	ui->binary_uri = binary_uri;
 
 	// FIXME: kludge
-	char* bundle     = lilv_strdup(lilv_value_as_string(ui->binary_uri));
+	char* bundle     = lilv_strdup(lilv_node_as_string(ui->binary_uri));
 	char* last_slash = strrchr(bundle, '/') + 1;
 	*last_slash = '\0';
 	ui->bundle_uri = lilv_new_uri(world, bundle);
 	free(bundle);
 
-	ui->classes = lilv_values_new();
+	ui->classes = lilv_nodes_new();
 	lilv_array_append(ui->classes, type_uri);
 
 	return ui;
@@ -53,22 +53,22 @@ lilv_ui_new(LilvWorld* world,
 void
 lilv_ui_free(LilvUI* ui)
 {
-	lilv_value_free(ui->uri);
+	lilv_node_free(ui->uri);
 	ui->uri = NULL;
 
-	lilv_value_free(ui->bundle_uri);
+	lilv_node_free(ui->bundle_uri);
 	ui->bundle_uri = NULL;
 
-	lilv_value_free(ui->binary_uri);
+	lilv_node_free(ui->binary_uri);
 	ui->binary_uri = NULL;
 
-	lilv_values_free(ui->classes);
+	lilv_nodes_free(ui->classes);
 
 	free(ui);
 }
 
 LILV_API
-const LilvValue*
+const LilvNode*
 lilv_ui_get_uri(const LilvUI* ui)
 {
 	assert(ui);
@@ -80,18 +80,18 @@ LILV_API
 unsigned
 lilv_ui_is_supported(const LilvUI*       ui,
                      LilvUISupportedFunc supported_func,
-                     const LilvValue*    container_type,
-                     const LilvValue**   ui_type)
+                     const LilvNode*    container_type,
+                     const LilvNode**   ui_type)
 {
 #ifdef HAVE_SUIL
-	const LilvValues* classes = lilv_ui_get_classes(ui);
-	LILV_FOREACH(values, c, classes) {
-		const LilvValue* type = lilv_values_get(classes, c);
-		const unsigned   q    = supported_func(lilv_value_as_uri(container_type),
-		                                       lilv_value_as_uri(type));
+	const LilvNodes* classes = lilv_ui_get_classes(ui);
+	LILV_FOREACH(nodes, c, classes) {
+		const LilvNode* type = lilv_nodes_get(classes, c);
+		const unsigned   q    = supported_func(lilv_node_as_uri(container_type),
+		                                       lilv_node_as_uri(type));
 		if (q) {
 			if (ui_type) {
-				*ui_type = lilv_value_duplicate(type);
+				*ui_type = lilv_node_duplicate(type);
 			}
 			return q;
 		}
@@ -101,7 +101,7 @@ lilv_ui_is_supported(const LilvUI*       ui,
 }
 
 LILV_API
-const LilvValues*
+const LilvNodes*
 lilv_ui_get_classes(const LilvUI* ui)
 {
 	return ui->classes;
@@ -109,13 +109,13 @@ lilv_ui_get_classes(const LilvUI* ui)
 
 LILV_API
 bool
-lilv_ui_is_a(const LilvUI* ui, const LilvValue* ui_class_uri)
+lilv_ui_is_a(const LilvUI* ui, const LilvNode* ui_class_uri)
 {
-	return lilv_values_contains(ui->classes, ui_class_uri);
+	return lilv_nodes_contains(ui->classes, ui_class_uri);
 }
 
 LILV_API
-const LilvValue*
+const LilvNode*
 lilv_ui_get_bundle_uri(const LilvUI* ui)
 {
 	assert(ui);
@@ -124,7 +124,7 @@ lilv_ui_get_bundle_uri(const LilvUI* ui)
 }
 
 LILV_API
-const LilvValue*
+const LilvNode*
 lilv_ui_get_binary_uri(const LilvUI* ui)
 {
 	assert(ui);