diff options
author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2014-12-20 15:51:07 +0100 |
---|---|---|
committer | Andreas Stöckel <andreas@somweyr.de> | 2014-12-20 15:51:07 +0100 |
commit | 4294735304bb89fe603a9d5f73717a09959d3c8b (patch) | |
tree | b96f62f3e579b799cdfc0e76c755fc2a306590b3 /src/core/model/Document.cpp | |
parent | a7567d08e4d5869833069ec7211785af350aea88 (diff) | |
parent | f77ec7ae614810bc317c23138279e115f930aa06 (diff) |
Merge branch 'master' of somweyr.de:ousia
Diffstat (limited to 'src/core/model/Document.cpp')
-rw-r--r-- | src/core/model/Document.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/core/model/Document.cpp b/src/core/model/Document.cpp index 709981b..497bb43 100644 --- a/src/core/model/Document.cpp +++ b/src/core/model/Document.cpp @@ -25,7 +25,7 @@ namespace model { int DocumentEntity::getFieldDescriptorIndex(const std::string &fieldName) { - const ManagedVector<FieldDescriptor> &fds = + const NodeVector<FieldDescriptor> &fds = descriptor->getFieldDescriptors(); unsigned int f = 0; @@ -57,21 +57,21 @@ int DocumentEntity::getFieldDescriptorIndex(const std::string &fieldName) return -1; } -void DocumentEntity::getField(ManagedVector<StructuredEntity> &res, +void DocumentEntity::getField(NodeVector<StructuredEntity> &res, const std::string &fieldName) { int f = getFieldDescriptorIndex(fieldName); if (f < 0) { - ManagedVector<StructuredEntity> empty{this}; - res = ManagedVector<StructuredEntity>(this); + NodeVector<StructuredEntity> empty{this}; + res = NodeVector<StructuredEntity>(this); } res = fields[f]; } -ManagedVector<StructuredEntity> &DocumentEntity::getField( +NodeVector<StructuredEntity> &DocumentEntity::getField( Rooted<FieldDescriptor> fieldDescriptor) { - const ManagedVector<FieldDescriptor> &fds = + const NodeVector<FieldDescriptor> &fds = descriptor->getFieldDescriptors(); int f = 0; for (auto &fd : fds) { @@ -156,7 +156,7 @@ Rooted<StructuredEntity> StructuredEntity::buildEntity( return {nullptr}; } // append the new entity to the right field. - ManagedVector<StructuredEntity> field{parent}; + NodeVector<StructuredEntity> field{parent}; parent->getField(field, fieldName); field.push_back(entity); @@ -180,7 +180,7 @@ Rooted<DocumentPrimitive> DocumentPrimitive::buildEntity( return {nullptr}; } // append the new entity to the right field. - ManagedVector<StructuredEntity> field{parent}; + NodeVector<StructuredEntity> field{parent}; parent->getField(field, fieldName); field.push_back(entity); |