From f93c95dbd4aab6ebbccc647da5d1d2da437417ce Mon Sep 17 00:00:00 2001
From: Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de>
Date: Sat, 20 Dec 2014 14:48:03 +0100
Subject: replaces ManagedVector by NodeVector in Model classes.

---
 src/core/model/Document.hpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/core/model/Document.hpp')

diff --git a/src/core/model/Document.hpp b/src/core/model/Document.hpp
index 15a4599..a660da7 100644
--- a/src/core/model/Document.hpp
+++ b/src/core/model/Document.hpp
@@ -97,7 +97,7 @@ class DocumentEntity : public Node {
 private:
 	Owned<Descriptor> descriptor;
 	const Variant attributes;
-	std::vector<ManagedVector<StructuredEntity>> fields;
+	std::vector<NodeVector<StructuredEntity>> fields;
 
 	int getFieldDescriptorIndex(const std::string &fieldName);
 
@@ -114,7 +114,7 @@ public:
 		if (!descriptor.isNull()) {
 			for (size_t f = 0; f < descriptor->getFieldDescriptors().size();
 			     f++) {
-				fields.push_back(ManagedVector<StructuredEntity>(this));
+				fields.push_back(NodeVector<StructuredEntity>(this));
 			}
 		}
 	}
@@ -127,7 +127,7 @@ public:
 	 * This allows a direct manipulation of the internal data structure of a
 	 * DocumentEntity and is not recommended. TODO: Delete this?
 	 */
-	std::vector<ManagedVector<StructuredEntity>> &getFields() { return fields; }
+	std::vector<NodeVector<StructuredEntity>> &getFields() { return fields; }
 
 	/**
 	 * This returns true if there is a FieldDescriptor in the Descriptor for
@@ -155,7 +155,7 @@ public:
 	 * 2.) the only FieldDescriptor (if only one is specified).
 	 *
 	 * Note that the output of this method might well be ambigous: If no
-	 * FieldDescriptor matches the given name an empty ManagedVector is
+	 * FieldDescriptor matches the given name an empty NodeVector is
 	 * returned. This is also the case, however, if there are no members for an
 	 * existing field. Therefore it is recommended to additionally check the
 	 * output of "hasField" or use the version of this method with
@@ -163,13 +163,13 @@ public:
 	 *
 	 * @param fieldName is the name of the field as specified in the
 	 *                  FieldDescriptor in the Domain description.
-	 * @param res       is a ManagedVector reference where the result will be
+	 * @param res       is a NodeVector reference where the result will be
 	 *                  stored. After using this method the reference will
 	 *                  either refer to all StructuredEntities in that field. If
 	 *                  the field is unknown or if no members exist in that
-	 *                  field yet, the ManagedVector will be empty.
+	 *                  field yet, the NodeVector will be empty.
 	 */
-	void getField(ManagedVector<StructuredEntity> &res,
+	void getField(NodeVector<StructuredEntity> &res,
 	              const std::string &fieldName = "");
 
 	/**
@@ -181,9 +181,9 @@ public:
 	 *
 	 * @param fieldDescriptor is a FieldDescriptor defined in the Descriptor for
 	 *                        this DocumentEntity.
-	 * @return a ManagedVector of all StructuredEntities in that field.
+	 * @return a NodeVector of all StructuredEntities in that field.
 	 */
-	ManagedVector<StructuredEntity> &getField(
+	NodeVector<StructuredEntity> &getField(
 	    Rooted<FieldDescriptor> fieldDescriptor);
 };
 
@@ -193,7 +193,7 @@ public:
  */
 class StructuredEntity : public DocumentEntity {
 private:
-	ManagedVector<AnnotationEntity> annotations;
+	NodeVector<AnnotationEntity> annotations;
 
 public:
 	StructuredEntity(Manager &mgr, Handle<Node> parent,
@@ -205,7 +205,7 @@ public:
 	{
 	}
 
-	ManagedVector<AnnotationEntity> &getAnnotations() { return annotations; }
+	NodeVector<AnnotationEntity> &getAnnotations() { return annotations; }
 
 	/**
 	 * This builds the root StructuredEntity for the given document. It
-- 
cgit v1.2.3