Browse Source

Clean up Controls::XmlNodeHandlers

Michael Ragazzon 6 years ago
parent
commit
c700fe2fac

+ 0 - 5
Source/Controls/XMLNodeHandlerDataGrid.cpp

@@ -112,10 +112,5 @@ bool XMLNodeHandlerDataGrid::ElementData(Core::XMLParser* parser, const Rml::Cor
 	return Core::Factory::InstanceElementText(parent, data);
 }
 
-void XMLNodeHandlerDataGrid::Release()
-{
-	delete this;
-}
-
 }
 }

+ 3 - 5
Source/Controls/XMLNodeHandlerDataGrid.h

@@ -48,13 +48,11 @@ public:
 	virtual ~XMLNodeHandlerDataGrid();
 
 	/// Called when a new element is opened.
-	virtual Core::Element* ElementStart(Core::XMLParser* parser, const Rml::Core::String& name, const Rml::Core::XMLAttributes& attributes);
+	Core::Element* ElementStart(Core::XMLParser* parser, const Rml::Core::String& name, const Rml::Core::XMLAttributes& attributes) override;
 	/// Called when an element is closed.
-	virtual bool ElementEnd(Core::XMLParser* parser, const Rml::Core::String& name);
+	bool ElementEnd(Core::XMLParser* parser, const Rml::Core::String& name) override;
 	/// Called for element data.
-	virtual bool ElementData(Core::XMLParser* parser, const Rml::Core::String& data);
-
-	virtual void Release();
+	bool ElementData(Core::XMLParser* parser, const Rml::Core::String& data) override;
 };
 
 }

+ 0 - 5
Source/Controls/XMLNodeHandlerTabSet.cpp

@@ -142,10 +142,5 @@ bool XMLNodeHandlerTabSet::ElementData(Core::XMLParser* parser, const Rml::Core:
 	return Core::Factory::InstanceElementText(parser->GetParseFrame()->element, data);
 }
 
-void XMLNodeHandlerTabSet::Release()
-{
-	delete this;
-}
-
 }
 }

+ 3 - 5
Source/Controls/XMLNodeHandlerTabSet.h

@@ -47,13 +47,11 @@ public:
 	virtual ~XMLNodeHandlerTabSet();
 
 	/// Called when a new element start is opened
-	virtual Core::Element* ElementStart(Core::XMLParser* parser, const Rml::Core::String& name, const Rml::Core::XMLAttributes& attributes);
+	Core::Element* ElementStart(Core::XMLParser* parser, const Rml::Core::String& name, const Rml::Core::XMLAttributes& attributes) override;
 	/// Called when an element is closed
-	virtual bool ElementEnd(Core::XMLParser* parser, const Rml::Core::String& name);
+	bool ElementEnd(Core::XMLParser* parser, const Rml::Core::String& name) override;
 	/// Called for element data
-	virtual bool ElementData(Core::XMLParser* parser, const Rml::Core::String& data);
-
-	virtual void Release();
+	bool ElementData(Core::XMLParser* parser, const Rml::Core::String& data) override;
 };
 
 }

+ 0 - 5
Source/Controls/XMLNodeHandlerTextArea.cpp

@@ -81,10 +81,5 @@ bool XMLNodeHandlerTextArea::ElementData(Core::XMLParser* parser, const Rml::Cor
 	return true;
 }
 
-void XMLNodeHandlerTextArea::Release()
-{
-	delete this;
-}
-
 }
 }

+ 3 - 5
Source/Controls/XMLNodeHandlerTextArea.h

@@ -47,13 +47,11 @@ public:
 	virtual ~XMLNodeHandlerTextArea();
 
 	/// Called when a new element is opened.
-	virtual Core::Element* ElementStart(Core::XMLParser* parser, const Rml::Core::String& name, const Rml::Core::XMLAttributes& attributes);
+	Core::Element* ElementStart(Core::XMLParser* parser, const Rml::Core::String& name, const Rml::Core::XMLAttributes& attributes) override;
 	/// Called when an element is closed.
-	virtual bool ElementEnd(Core::XMLParser* parser, const Rml::Core::String& name);
+	bool ElementEnd(Core::XMLParser* parser, const Rml::Core::String& name) override;
 	/// Called for element data.
-	virtual bool ElementData(Core::XMLParser* parser, const Rml::Core::String& data);
-
-	virtual void Release();
+	bool ElementData(Core::XMLParser* parser, const Rml::Core::String& data) override;
 };
 
 }