Merge branch 'master' of newgeom:newgeom

[modules/shaper.git] / src / Config / Config_XMLReader.cpp

diff --git a/src/Config/Config_XMLReader.cpp b/src/Config/Config_XMLReader.cpp
index 0261f2551600b54fd7dec93cd03f81247c6763f6..002c9df493ab611ef9d22774d6147ce70e2800e3 100644 (file)
--- a/src/Config/Config_XMLReader.cpp
+++ b/src/Config/Config_XMLReader.cpp
@@ -8,8 +8,8 @@
 #include <Config_XMLReader.h>
 
 #include <Event_Loop.h>
-#include <libxml\parser.h>
-#include <libxml\tree.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
 
 /*
 #ifdef WIN32
@@ -141,48 +141,3 @@ std::string Config_XMLReader::getProperty(xmlNodePtr theNode, const char* name)
   return result;
 }
 
-/*
- * Returns true if theNode is XML node with a given name.
- */
-bool Config_XMLReader::isNode(xmlNodePtr theNode, const char* theNodeName, ...)
-{
-  bool result = false;
-  const xmlChar* aName = theNode->name;
-  if (!aName || theNode->type != XML_ELEMENT_NODE) {
-    return false;
-  }
-  if (!xmlStrcmp(aName, (const xmlChar *) theNodeName)) {
-    return true;
-  }
-  va_list args; // define argument list variable
-  va_start(args, theNodeName); // init list; point to last defined argument
-  while(true) {
-    char *anArg = va_arg (args, char*); // get next argument
-    if (anArg == NULL)
-      break;
-    if (!xmlStrcmp(aName, (const xmlChar *) anArg)) {
-      va_end(args); // cleanup the system stack
-      return true;
-    }
-  }
-  va_end(args); // cleanup the system stack
-  return false;
-}
-
-/*
- * Every xml node has child. Even if there is no explicit
- * child nodes libxml gives the "Text node" as child.
- *
- * This method checks if real child nodes exist in the
- * given node.
- */
-bool Config_XMLReader::hasChild(xmlNodePtr theNode)
-{
-  xmlNodePtr aNode = theNode->children;
-  for(; aNode; aNode = aNode->next) {
-    if (aNode->type != XML_ELEMENT_NODE) {
-      return true;
-    }
-  }
-  return false;
-}