From 87a89145c476713fa5716bf1a15b8b4d498d0a61 Mon Sep 17 00:00:00 2001
From: Andreas Stöckel <astoecke@techfak.uni-bielefeld.de>
Date: Wed, 28 Jan 2015 01:04:28 +0100
Subject: Renamed add* and include* methods for referencing another
 Typesystem/Domain description to "reference*" to have a consistent
 nomenclature

---
 src/core/model/Document.hpp   | 4 ++--
 src/core/model/Domain.hpp     | 8 +++-----
 src/core/model/Typesystem.cpp | 2 +-
 src/core/model/Typesystem.hpp | 4 ++--
 4 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/core/model/Document.hpp b/src/core/model/Document.hpp
index 1f2fb37..dcb8966 100644
--- a/src/core/model/Document.hpp
+++ b/src/core/model/Document.hpp
@@ -849,7 +849,7 @@ public:
 	/**
 	 * Adds a Domain reference to this Document.
 	 */
-	void addDomain(Handle<Domain> d)
+	void referenceDomain(Handle<Domain> d)
 	{
 		invalidate();
 		domains.push_back(d);
@@ -858,7 +858,7 @@ public:
 	/**
 	 * Adds multiple Domain references to this Document.
 	 */
-	void addDomains(const std::vector<Handle<Domain>> &d)
+	void referenceDomains(const std::vector<Handle<Domain>> &d)
 	{
 		invalidate();
 		domains.insert(domains.end(), d.begin(), d.end());
diff --git a/src/core/model/Domain.hpp b/src/core/model/Domain.hpp
index 541a428..cd649d5 100644
--- a/src/core/model/Domain.hpp
+++ b/src/core/model/Domain.hpp
@@ -899,8 +899,6 @@ class Domain : public Node {
 private:
 	NodeVector<StructuredClass> structuredClasses;
 	NodeVector<AnnotationClass> annotationClasses;
-	// TODO: Is it wise to attach the type systems here? If not: What would be
-	// a good alternative.
 	NodeVector<Typesystem> typesystems;
 
 protected:
@@ -937,7 +935,7 @@ public:
 	Domain(Manager &mgr, Handle<SystemTypesystem> sys, std::string name = "")
 	    : Domain(mgr, std::move(name))
 	{
-		includeTypesystem(sys);
+		referenceTypesystem(sys);
 	}
 
 	/**
@@ -1071,12 +1069,12 @@ public:
 	/**
 	 * Adds a Typesystem reference to this Domain.
 	 */
-	void includeTypesystem(Handle<Typesystem> t) { typesystems.push_back(t); }
+	void referenceTypesystem(Handle<Typesystem> t) { typesystems.push_back(t); }
 
 	/**
 	 * Adds multiple Typesystem references to this Domain.
 	 */
-	void includeTypesystems(const std::vector<Handle<Typesystem>> &ts)
+	void referenceTypesystems(const std::vector<Handle<Typesystem>> &ts)
 	{
 		typesystems.insert(typesystems.end(), ts.begin(), ts.end());
 	}
diff --git a/src/core/model/Typesystem.cpp b/src/core/model/Typesystem.cpp
index 5f8f613..7844227 100644
--- a/src/core/model/Typesystem.cpp
+++ b/src/core/model/Typesystem.cpp
@@ -542,7 +542,7 @@ Rooted<StructType> Typesystem::createStructType(const std::string &name)
 	return structType;
 }
 
-void Typesystem::includeTypesystem(Handle<Typesystem> typesystem)
+void Typesystem::referenceTypesystem(Handle<Typesystem> typesystem)
 {
 	typesystems.push_back(typesystem);
 }
diff --git a/src/core/model/Typesystem.hpp b/src/core/model/Typesystem.hpp
index 1405ed6..e06938e 100644
--- a/src/core/model/Typesystem.hpp
+++ b/src/core/model/Typesystem.hpp
@@ -989,7 +989,7 @@ public:
 	Typesystem(Manager &mgr, Handle<SystemTypesystem> sys, std::string name)
 	    : Typesystem(mgr, std::move(name))
 	{
-		includeTypesystem(sys);
+		referenceTypesystem(sys);
 	}
 
 	/**
@@ -1007,7 +1007,7 @@ public:
 	 * @param typesystem is the typesystem that should be added to the
 	 * referenced typesystems list.
 	 */
-	void includeTypesystem(Handle<Typesystem> typesystem);
+	void referenceTypesystem(Handle<Typesystem> typesystem);
 
 	/**
 	 * Adds the given type to the to the type list.
-- 
cgit v1.2.3