From f2d1b5c2bd36751e6139f985277fe2551f83e35a Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Thu, 21 Oct 2010 19:57:13 +0000
Subject: Use "key" and "value" terminology over "predicate" and "object".

---
 ext/atom.lv2/atom-helpers.h | 10 +++++-----
 ext/atom.lv2/atom.h         |  4 ++--
 ext/atom.lv2/atom.ttl       |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'ext')

diff --git a/ext/atom.lv2/atom-helpers.h b/ext/atom.lv2/atom-helpers.h
index d0308ff..97f936c 100644
--- a/ext/atom.lv2/atom-helpers.h
+++ b/ext/atom.lv2/atom-helpers.h
@@ -68,7 +68,7 @@ static inline LV2_Atom_Object_Iter
 lv2_atom_object_iter_next(const LV2_Atom_Object_Iter iter)
 {
 	return (LV2_Atom_Object_Iter)(
-		(uint8_t*)iter + sizeof(LV2_Atom_Property) + lv2_atom_pad_size(iter->object.size));
+		(uint8_t*)iter + sizeof(LV2_Atom_Property) + lv2_atom_pad_size(iter->value.size));
 }
 
 static inline LV2_Atom_Property*
@@ -112,7 +112,7 @@ lv2_atom_append_property(LV2_Atom*   object,
 {
 	object->size = lv2_atom_pad_size(object->size);
 	LV2_Atom_Property* prop = (LV2_Atom_Property*)(object->body + object->size);
-	prop->predicate = key;
+	prop->key = key;
 	prop->object.type = value_type;
 	prop->object.size = value_size;
 	memcpy(prop->object.body, value_body, value_size);
@@ -146,7 +146,7 @@ lv2_atom_is_a(LV2_Atom* object,
 		     !lv2_atom_object_iter_is_end(object, i);
 		     i = lv2_atom_object_iter_next(i)) {
 			LV2_Atom_Property* prop = lv2_atom_object_iter_get(i);
-			if (prop->predicate == rdf_type) {
+			if (prop->key == rdf_type) {
 				if (prop->object.type == atom_URIInt) {
 					const uint32_t object_type = *(uint32_t*)prop->object.body;
 					if (object_type == type)
@@ -188,8 +188,8 @@ lv2_atom_object_query(LV2_Atom* object, LV2_Atom_Object_Query* query)
 	LV2_OBJECT_FOREACH(object, o) {
 		LV2_Atom_Property* prop = lv2_atom_object_iter_get(o);
 		for (LV2_Atom_Object_Query* q = query; q->key; ++q) {
-			if (q->key == prop->predicate && !q->value) {
-				q->value = &prop->object;
+			if (q->key == prop->key && !q->value) {
+				q->value = &prop->value;
 				if (++matches == n_queries)
 					return matches;
 				break;
diff --git a/ext/atom.lv2/atom.h b/ext/atom.lv2/atom.h
index e5990c9..df73504 100644
--- a/ext/atom.lv2/atom.h
+++ b/ext/atom.lv2/atom.h
@@ -86,8 +86,8 @@ typedef struct _LV2_Atom_Vector {
 
 /** The body of an LV2_Atom with type atom:Property */
 typedef struct _LV2_Atom_Property {
-	uint32_t predicate; /**< Predicate (key) of RDF triple (URI mapped int) */
-	LV2_Atom object;    /**< Object (value) of RDF triple */
+	uint32_t key;   /**< Key (predicate) of Object or RDF triple (URIInt) */
+	LV2_Atom value; /**< Value (object) of Object or RDF triple */
 } LV2_Atom_Property;
 
 /** The body of an LV2_Atom with type atom:Triple */
diff --git a/ext/atom.lv2/atom.ttl b/ext/atom.lv2/atom.ttl
index 6e08359..a7d663b 100644
--- a/ext/atom.lv2/atom.ttl
+++ b/ext/atom.lv2/atom.ttl
@@ -175,11 +175,11 @@ The body of a tuple is simply a series of complete atoms, aligned to
 atom:Property a atom:AtomType ;
 	rdfs:label "RDF property of some object" ;
 	rdfs:comment """
-A description in RDF of a single property for some object (i.e. an RDF
-statement with only predicate and object defined).
+A description of a single property for some object (i.e. an RDF
+statement with only predicate (key) and object (value) defined).
 <pre>
-uint32_t predicate;
-LV2_Atom object;
+uint32_t key;
+LV2_Atom value;
 </pre>
 """ .
 
-- 
cgit v1.2.1