Merge branch 'master' of somweyr.de:ousia

Conflicts:
	application/src/plugins/xml/XmlParser.cpp

1 files changed, 1 insertions, 26 deletions

diff --git a/src/core/parser/ParserState.hpp b/src/core/parser/ParserState.hpp
index 43b8035..6487fdd 100644
--- a/src/core/parser/ParserState.hpp
+++ b/src/core/parser/ParserState.hpp
@@ -79,13 +79,6 @@ struct ParserState {
 	HandlerConstructor elementHandler;
 
 	/**
-	 * Pointer at a function which creates a new concrete Handler instance for
-	 * all child elements for which no matching state is defined. May be nullptr
-	 * in which case no such elements are allowed.
-	 */
-	HandlerConstructor childHandler;
-
-	/**
 	 * Default constructor, initializes the handlers with nullptr.
 	 */
 	ParserState();
@@ -104,15 +97,10 @@ struct ParserState {
 	 * @param elementHandler is a pointer at a function which creates a new
 	 * concrete Handler instance for the elements described by this state. May
 	 * be nullptr in which case no handler instance is created.
-	 * @param childHandler is a pointer at a function which creates a new
-	 * concrete Handler instance for all child elements for which no matching
-	 * state is defined. May be nullptr in which case no such elements are
-	 * allowed.
 	 */
 	ParserState(ParserStateSet parents, Arguments arguments = Arguments{},
 	            RttiSet createdNodeTypes = RttiSet{},
-	            HandlerConstructor elementHandler = nullptr,
-	            HandlerConstructor childHandler = nullptr);
+	            HandlerConstructor elementHandler = nullptr);
 
 	/**
 	 * Creates this ParserState from the given ParserStateBuilder instance.
@@ -209,19 +197,6 @@ public:
 	ParserStateBuilder &elementHandler(HandlerConstructor elementHandler);
 
 	/**
-	 * Sets the constructor for the child handler. The constructor creates a new
-	 * concrete Handler instance for all child elements for which no matching
-	 * state is defined. May be nullptr in which case no such elements are
-	 * allowed.
-	 *
-	 * @param childHandler is the HandlerConstructor that should point at the
-	 * constructor of the Handler instance for child elements.
-	 * @return a reference at this ParserStateBuilder instance for method
-	 * chaining.
-	 */
-	ParserStateBuilder &childHandler(HandlerConstructor childHandler);
-
-	/**
 	 * Returns a reference at the internal ParserState instance that was built
 	 * using the ParserStateBuilder.
 	 *