Fixed parameters

[SXSI/XMLTree.git] / XMLTreeBuilder.h

diff --git a/XMLTreeBuilder.h b/XMLTreeBuilder.h
index 336ca2d..055eeda 100644 (file)
--- a/XMLTreeBuilder.h
+++ b/XMLTreeBuilder.h
@@ -21,23 +21,15 @@
 \r
 #ifndef XMLTREEBUILDER_H_\r
 #define XMLTREEBUILDER_H_\r
-#include <unordered_map>\r
-#include "TextCollection/TextCollectionBuilder.h"\r
-#include <stdio.h>\r
-#include <stdlib.h>\r
-#include <cstring>\r
-\r
 \r
+#include "TextCollection/TextCollectionBuilder.h"\r
 #undef W\r
 #undef WW\r
 #undef Wminusone\r
 \r
 \r
 #include "XMLTree.h"\r
-#include "bp.h"\r
-#include <static_bitsequence.h>\r
-#include <alphabet_mapper.h>\r
-#include <static_sequence.h>\r
+\r
 using SXSI::TextCollection;\r
 using SXSI::TextCollectionBuilder;\r
 \r
@@ -58,7 +50,7 @@ class XMLTreeBuilder {
    int npar;\r
 \r
    /** Mapping from tag identifer to tag name */  \r
-   vector<string> *TagName;\r
+   std::vector<std::string> *TagName;\r
    TagIdMap * tIdMap;\r
    /** Array containing the sequence of tags */\r
    TagType *tags_aux;\r
@@ -69,7 +61,7 @@ class XMLTreeBuilder {
    \r
    /** The texts in the XML document (cached for faster display) */\r
 \r
-   vector<string> *CachedText;\r
+   std::vector<std::string> *CachedText;\r
 \r
    unsigned int *empty_texts_aux;\r
    int eta_size;\r
@@ -101,12 +93,12 @@ public:
    /** NewOpenTag(tagname): indicates the event of finding a new opening tag \r
     * in the document. Tag name is given. Returns a non-zero value upon \r
     * success, and returns NULLT in case of error. */\r
-   int NewOpenTag(string tagname);\r
+   int NewOpenTag(std::string tagname);\r
    \r
    /** NewClosingTag(tagname): indicates the event of finding a new closing tag\r
     *  in the document. Tag name is given. Returns a non-zero value upon \r
     *  success, and returns NULLT in case of error. */\r
-   int NewClosingTag(string tagname);\r
+   int NewClosingTag(std::string tagname);\r
  \r
    /** NewText(s): indicates the event of finding a new text s in \r
     * the document. The new text is inserted within the text collection. \r
@@ -115,7 +107,7 @@ public:
     * the string the sequence '\0x01\0x00' is inserted in the TextCollection\r
     * It is ok to do so since a non printable character cannot occur in an XML document\r
     */\r
-   int NewText(string text);\r
+   int NewText(std::string text);\r
 \r
 \r
 };\r