From d935bf07d15ddd117d07d83bb3818b6abc23cc0b Mon Sep 17 00:00:00 2001
From: Andreas Stöckel <astoecke@techfak.uni-bielefeld.de>
Date: Sun, 18 Jan 2015 00:39:21 +0100
Subject: Renamed continueResolve to doResolve for more consistency with other
 virtual protected methods

---
 src/core/model/Document.cpp | 2 +-
 src/core/model/Document.hpp | 2 +-
 src/core/model/Domain.cpp   | 4 ++--
 src/core/model/Domain.hpp   | 4 ++--
 src/core/model/Node.cpp     | 4 ++--
 src/core/model/Node.hpp     | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/core/model/Document.cpp b/src/core/model/Document.cpp
index 0de750f..ee15e31 100644
--- a/src/core/model/Document.cpp
+++ b/src/core/model/Document.cpp
@@ -292,7 +292,7 @@ bool AnnotationEntity::doValidate(Logger &logger) const
 
 /* Class Document */
 
-void Document::continueResolve(ResolutionState &state)
+void Document::doResolve(ResolutionState &state)
 {
 	continueResolveComposita(annotations, annotations.getIndex(), state);
 	if (root != nullptr) {
diff --git a/src/core/model/Document.hpp b/src/core/model/Document.hpp
index 5af3ce2..cb7f394 100644
--- a/src/core/model/Document.hpp
+++ b/src/core/model/Document.hpp
@@ -567,7 +567,7 @@ private:
 	NodeVector<AnnotationEntity> annotations;
 	NodeVector<Domain> domains;
 
-	void continueResolve(ResolutionState &state) override;
+	void doResolve(ResolutionState &state) override;
 
 public:
 	Document(Manager &mgr, std::string name)
diff --git a/src/core/model/Domain.cpp b/src/core/model/Domain.cpp
index 2ac2d8d..bae0f4f 100644
--- a/src/core/model/Domain.cpp
+++ b/src/core/model/Domain.cpp
@@ -70,7 +70,7 @@ FieldDescriptor::FieldDescriptor(Manager &mgr, Handle<Descriptor> parent,
 
 /* Class Descriptor */
 
-void Descriptor::continueResolve(ResolutionState &state)
+void Descriptor::doResolve(ResolutionState &state)
 {
 	if (attributesDescriptor != nullptr) {
 		const NodeVector<Attribute> &attributes =
@@ -244,7 +244,7 @@ AnnotationClass::AnnotationClass(
 
 /* Class Domain */
 
-void Domain::continueResolve(ResolutionState &state)
+void Domain::doResolve(ResolutionState &state)
 {
 	if (!continueResolveComposita(structuredClasses,
 	                              structuredClasses.getIndex(), state) |
diff --git a/src/core/model/Domain.hpp b/src/core/model/Domain.hpp
index ac02ec7..a8d4a9e 100644
--- a/src/core/model/Domain.hpp
+++ b/src/core/model/Domain.hpp
@@ -394,7 +394,7 @@ private:
 	                  bool exploreSubclasses = true) const;
 
 protected:
-	void continueResolve(ResolutionState &state) override;
+	void doResolve(ResolutionState &state) override;
 	
 	/**
 	 * Adds a FieldDescriptor and checks for name uniqueness.
@@ -682,7 +682,7 @@ private:
 	NodeVector<Typesystem> typesystems;
 
 protected:
-	void continueResolve(ResolutionState &state) override;
+	void doResolve(ResolutionState &state) override;
 
 	void addStructuredClass(Handle<StructuredClass> s);
 	void addAnnotationClass(Handle<AnnotationClass> a);
diff --git a/src/core/model/Node.cpp b/src/core/model/Node.cpp
index da83598..7565ba9 100644
--- a/src/core/model/Node.cpp
+++ b/src/core/model/Node.cpp
@@ -272,14 +272,14 @@ bool Node::resolve(ResolutionState &state)
 			}
 		} else {
 			size_t resCount = state.resultCount();
-			continueResolve(state);
+			doResolve(state);
 			return state.resultCount() > resCount;
 		}
 	}
 	return false;
 }
 
-void Node::continueResolve(ResolutionState &state)
+void Node::doResolve(ResolutionState &state)
 {
 	// Do nothing in the default implementation
 }
diff --git a/src/core/model/Node.hpp b/src/core/model/Node.hpp
index 0523c69..f8893a7 100644
--- a/src/core/model/Node.hpp
+++ b/src/core/model/Node.hpp
@@ -207,7 +207,7 @@ protected:
 	 *
 	 * @param state is used internally to manage the resolution process.
 	 */
-	virtual void continueResolve(ResolutionState &state);
+	virtual void doResolve(ResolutionState &state);
 
 	/**
 	 * Tries to advance the resolution process with the compositum pointed at
-- 
cgit v1.2.3