Merge branch 'master' of somweyr.de:ousia

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

1 files changed, 3 insertions, 12 deletions

diff --git a/src/core/parser/ParserState.cpp b/src/core/parser/ParserState.cpp
index 9d3aa7e..f635d86 100644
--- a/src/core/parser/ParserState.cpp
+++ b/src/core/parser/ParserState.cpp
@@ -22,17 +22,15 @@ namespace ousia {
 
 /* Class ParserState */
 
-ParserState::ParserState() : elementHandler(nullptr), childHandler(nullptr) {}
+ParserState::ParserState() : elementHandler(nullptr) {}
 
 ParserState::ParserState(ParserStateSet parents, Arguments arguments,
                          RttiSet createdNodeTypes,
-                         HandlerConstructor elementHandler,
-                         HandlerConstructor childHandler)
+                         HandlerConstructor elementHandler)
     : parents(parents),
       arguments(arguments),
       createdNodeTypes(createdNodeTypes),
-      elementHandler(elementHandler),
-      childHandler(childHandler)
+      elementHandler(elementHandler)
 {
 }
 
@@ -86,13 +84,6 @@ ParserStateBuilder &ParserStateBuilder::elementHandler(
 	return *this;
 }
 
-ParserStateBuilder &ParserStateBuilder::childHandler(
-    HandlerConstructor childHandler)
-{
-	state.childHandler = childHandler;
-	return *this;
-}
-
 const ParserState &ParserStateBuilder::build() const { return state; }
 
 /* Class ParserStateDeductor */