Changeset 42:6f97b6d207aa in rrlib_xml for tDocument.cpp

Timestamp:

16.06.2012 19:08:32 (11 years ago)

Author:

Tobias Föhst <foehst@…>

Branch:

default

Phase:

public

Message:

Renamed to rrlib_xml and stripped XML from class names

File:

• tDocument.cpp (moved) (moved from tXMLDocument.cpp) (11 diffs)

tDocument.cpp

@@ -20 +20 @@
 //
 //----------------------------------------------------------------------
-/*!\file    tXMLDocument.cpp
+/*!\file    tDocument.cpp
  *
  * \author  Tobias Foehst
@@ -28 +28 @@
  */
 //----------------------------------------------------------------------
-#include "rrlib/xml2_wrapper/tXMLDocument.h"
+#include "rrlib/xml/tDocument.h"
 
 //----------------------------------------------------------------------
@@ -38 +38 @@
 // Internal includes with ""
 //----------------------------------------------------------------------
-#include "rrlib/xml2_wrapper/tXML2WrapperException.h"
-#include "rrlib/xml2_wrapper/tCleanupHandler.h"
+#include "rrlib/xml/tException.h"
+#include "rrlib/xml/tCleanupHandler.h"
 
 //----------------------------------------------------------------------
@@ -55 +55 @@
 namespace rrlib
 {
-namespace xml2
+namespace xml
 {
 
@@ -71 +71 @@
 
 //----------------------------------------------------------------------
-// tXMLDocument constructors
+// tDocument constructors
 //----------------------------------------------------------------------
-tXMLDocument::tXMLDocument()
+tDocument::tDocument()
   : document(xmlNewDoc(reinterpret_cast<const xmlChar *>("1.0"))),
     root_node(0)
@@ -81 +81 @@
 }
 
-tXMLDocument::tXMLDocument(const std::string &file_name, bool validate)
+tDocument::tDocument(const std::string &file_name, bool validate)
   : document(xmlReadFile(file_name.c_str(), 0, validate ? XML_PARSE_DTDVALID : 0)),
-    root_node(reinterpret_cast<tXMLNode *>(xmlDocGetRootElement(this->document)))
+    root_node(reinterpret_cast<tNode *>(xmlDocGetRootElement(this->document)))
 {
   assert(this->document);
   if (!this->document)
   {
-    throw tXML2WrapperException("Could not parse XML file `" + file_name + "'!");
+    throw tException("Could not parse XML file `" + file_name + "'!");
   }
   tCleanupHandler::Instance();
 }
 
-tXMLDocument::tXMLDocument(const void *buffer, size_t size, bool validate)
+tDocument::tDocument(const void *buffer, size_t size, bool validate)
   : document(xmlReadMemory(reinterpret_cast<const char *>(buffer), size, "noname.xml", 0, validate ? XML_PARSE_DTDVALID : 0)),
-    root_node(reinterpret_cast<tXMLNode *>(xmlDocGetRootElement(this->document)))
+    root_node(reinterpret_cast<tNode *>(xmlDocGetRootElement(this->document)))
 {
   if (!this->document)
   {
-    throw tXML2WrapperException("Could not parse XML from memory buffer `" + std::string(reinterpret_cast<const char *>(buffer)) + "'!");
+    throw tException("Could not parse XML from memory buffer `" + std::string(reinterpret_cast<const char *>(buffer)) + "'!");
   }
   tCleanupHandler::Instance();
 }
 
-tXMLDocument::tXMLDocument(tXMLDocument && other)
+tDocument::tDocument(tDocument && other)
   : document(0),
     root_node(0)
@@ -113 +113 @@
 
 //----------------------------------------------------------------------
-// tXMLDocument destructor
+// tDocument destructor
 //----------------------------------------------------------------------
-tXMLDocument::~tXMLDocument()
+tDocument::~tDocument()
 {
   if (this->document)
@@ -124 +124 @@
 
 //----------------------------------------------------------------------
-// tXMLDocument operator =
+// tDocument operator =
 //----------------------------------------------------------------------
-tXMLDocument &tXMLDocument::operator = (const tXMLDocument & other)
+tDocument &tDocument::operator = (const tDocument & other)
 {
   if (this == &other)
@@ -134 +134 @@
   xmlFreeDoc(this->document);
   this->document = xmlCopyDoc(other.document, true);
-  this->root_node = reinterpret_cast<tXMLNode *>(xmlDocGetRootElement(this->document));
+  this->root_node = reinterpret_cast<tNode *>(xmlDocGetRootElement(this->document));
   return *this;
 }
 
 //----------------------------------------------------------------------
-// tXMLDocument RootNode
+// tDocument RootNode
 //----------------------------------------------------------------------
-tXMLNode &tXMLDocument::RootNode()
+tNode &tDocument::RootNode()
 {
   if (!this->root_node)
   {
-    throw tXML2WrapperException("No root node defined for this document!");
+    throw tException("No root node defined for this document!");
   }
   return *this->root_node;
@@ -151 +151 @@
 
 //----------------------------------------------------------------------
-// tXMLDocument AddRootNode
+// tDocument AddRootNode
 //----------------------------------------------------------------------
-tXMLNode &tXMLDocument::AddRootNode(const std::string &name)
+tNode &tDocument::AddRootNode(const std::string &name)
 {
   if (this->root_node)
   {
-    throw tXML2WrapperException("Root node already exists with name `" + name + "'!");
+    throw tException("Root node already exists with name `" + name + "'!");
   }
-  this->root_node = reinterpret_cast<tXMLNode *>(xmlNewNode(0, reinterpret_cast<const xmlChar *>(name.c_str())));
+  this->root_node = reinterpret_cast<tNode *>(xmlNewNode(0, reinterpret_cast<const xmlChar *>(name.c_str())));
   xmlDocSetRootElement(this->document, this->root_node);
   return *this->root_node;
@@ -165 +165 @@
 
 //----------------------------------------------------------------------
-// tXMLDocument WriteToFile
+// tDocument WriteToFile
 //----------------------------------------------------------------------
-void tXMLDocument::WriteToFile(const std::string &file_name, int compression) const
+void tDocument::WriteToFile(const std::string &file_name, int compression) const
 {
   if (compression)