wxChar -> char

[wxWidgets.git] / src / xml / xml.cpp

diff --git a/src/xml/xml.cpp b/src/xml/xml.cpp
index e9f3e92df74d0eb0dcdcfaf7b41d595b0f6f2325..d8fe265936e9e94e44891b8ac8795d764d7da58f 100644 (file)
--- a/src/xml/xml.cpp
+++ b/src/xml/xml.cpp
@@ -49,10 +49,11 @@ static bool wxIsWhiteOnly(const wxString& buf);
 
 wxXmlNode::wxXmlNode(wxXmlNode *parent,wxXmlNodeType type,
                      const wxString& name, const wxString& content,
 
 wxXmlNode::wxXmlNode(wxXmlNode *parent,wxXmlNodeType type,
                      const wxString& name, const wxString& content,

-                     wxXmlProperty *props, wxXmlNode *next)
+                     wxXmlAttribute *attrs, wxXmlNode *next, int lineNo)

     : m_type(type), m_name(name), m_content(content),
     : m_type(type), m_name(name), m_content(content),

-      m_properties(props), m_parent(parent),
-      m_children(NULL), m_next(next)
+      m_attrs(attrs), m_parent(parent),
+      m_children(NULL), m_next(next),
+      m_lineNo(lineNo)

 {
     if (m_parent)
     {
 {
     if (m_parent)
     {


@@ -67,10 +68,12 @@ wxXmlNode::wxXmlNode(wxXmlNode *parent,wxXmlNodeType type,
 }
 
 wxXmlNode::wxXmlNode(wxXmlNodeType type, const wxString& name,
 }
 
 wxXmlNode::wxXmlNode(wxXmlNodeType type, const wxString& name,

-                     const wxString& content)
+                     const wxString& content,
+                     int lineNo)

     : m_type(type), m_name(name), m_content(content),
     : m_type(type), m_name(name), m_content(content),

-      m_properties(NULL), m_parent(NULL),
-      m_children(NULL), m_next(NULL)
+      m_attrs(NULL), m_parent(NULL),
+      m_children(NULL), m_next(NULL),
+      m_lineNo(lineNo)

 {}
 
 wxXmlNode::wxXmlNode(const wxXmlNode& node)
 {}
 
 wxXmlNode::wxXmlNode(const wxXmlNode& node)


@@ -89,8 +92,8 @@ wxXmlNode::~wxXmlNode()
         delete c;
     }
 
         delete c;
     }
 

-    wxXmlProperty *p, *p2;
-    for (p = m_properties; p; p = p2)
+    wxXmlAttribute *p, *p2;
+    for (p = m_attrs; p; p = p2)

     {
         p2 = p->GetNext();
         delete p;
     {
         p2 = p->GetNext();
         delete p;


@@ -99,7 +102,7 @@ wxXmlNode::~wxXmlNode()
 
 wxXmlNode& wxXmlNode::operator=(const wxXmlNode& node)
 {
 
 wxXmlNode& wxXmlNode::operator=(const wxXmlNode& node)
 {

-    wxDELETE(m_properties);
+    wxDELETE(m_attrs);

     wxDELETE(m_children);
     DoCopy(node);
     return *this;
     wxDELETE(m_children);
     DoCopy(node);
     return *this;


@@ -110,6 +113,7 @@ void wxXmlNode::DoCopy(const wxXmlNode& node)
     m_type = node.m_type;
     m_name = node.m_name;
     m_content = node.m_content;
     m_type = node.m_type;
     m_name = node.m_name;
     m_content = node.m_content;

+    m_lineNo = node.m_lineNo;

     m_children = NULL;
 
     wxXmlNode *n = node.m_children;
     m_children = NULL;
 
     wxXmlNode *n = node.m_children;


@@ -119,49 +123,51 @@ void wxXmlNode::DoCopy(const wxXmlNode& node)
         n = n->GetNext();
     }
 
         n = n->GetNext();
     }
 

-    m_properties = NULL;
-    wxXmlProperty *p = node.m_properties;
+    m_attrs = NULL;
+    wxXmlAttribute *p = node.m_attrs;

     while (p)
     {
     while (p)
     {

-       AddProperty(p->GetName(), p->GetValue());
+       AddAttribute(p->GetName(), p->GetValue());

        p = p->GetNext();
     }
 }
 
        p = p->GetNext();
     }
 }
 

-bool wxXmlNode::HasProp(const wxString& propName) const
+bool wxXmlNode::HasAttribute(const wxString& attrName) const

 {
 {

-    wxXmlProperty *prop = GetProperties();
+    wxXmlAttribute *attr = GetAttributes();

 
 

-    while (prop)
+    while (attr)

     {
     {

-        if (prop->GetName() == propName) return true;
-        prop = prop->GetNext();
+        if (attr->GetName() == attrName) return true;
+        attr = attr->GetNext();

     }
 
     return false;
 }
 
     }
 
     return false;
 }
 

-bool wxXmlNode::GetPropVal(const wxString& propName, wxString *value) const
+bool wxXmlNode::GetAttribute(const wxString& attrName, wxString *value) const

 {
 {

-    wxXmlProperty *prop = GetProperties();
+    wxCHECK_MSG( value, false, "value argument must not be NULL" );

 
 

-    while (prop)
+    wxXmlAttribute *attr = GetAttributes();
+
+    while (attr)

     {
     {

-        if (prop->GetName() == propName)
+        if (attr->GetName() == attrName)

         {
         {

-            *value = prop->GetValue();
+            *value = attr->GetValue();

             return true;
         }
             return true;
         }

-        prop = prop->GetNext();
+        attr = attr->GetNext();

     }
 
     return false;
 }
 
     }
 
     return false;
 }
 

-wxString wxXmlNode::GetPropVal(const wxString& propName, const wxString& defaultVal) const
+wxString wxXmlNode::GetAttribute(const wxString& attrName, const wxString& defaultVal) const

 {
     wxString tmp;
 {
     wxString tmp;

-    if (GetPropVal(propName, &tmp))
+    if (GetAttribute(attrName, &tmp))

         return tmp;
 
     return defaultVal;
         return tmp;
 
     return defaultVal;


@@ -248,48 +254,48 @@ bool wxXmlNode::RemoveChild(wxXmlNode *child)
 
 void wxXmlNode::AddProperty(const wxString& name, const wxString& value)
 {
 
 void wxXmlNode::AddProperty(const wxString& name, const wxString& value)
 {

-    AddProperty(new wxXmlProperty(name, value, NULL));
+    AddProperty(new wxXmlAttribute(name, value, NULL));

 }
 
 }
 

-void wxXmlNode::AddProperty(wxXmlProperty *prop)
+void wxXmlNode::AddProperty(wxXmlAttribute *attr)

 {
 {

-    if (m_properties == NULL)
-        m_properties = prop;
+    if (m_attrs == NULL)
+        m_attrs = attr;

     else
     {
     else
     {

-        wxXmlProperty *p = m_properties;
+        wxXmlAttribute *p = m_attrs;

         while (p->GetNext()) p = p->GetNext();
         while (p->GetNext()) p = p->GetNext();

-        p->SetNext(prop);
+        p->SetNext(attr);

     }
 }
 
 bool wxXmlNode::DeleteProperty(const wxString& name)
 {
     }
 }
 
 bool wxXmlNode::DeleteProperty(const wxString& name)
 {

-    wxXmlProperty *prop;
+    wxXmlAttribute *attr;

 
 

-    if (m_properties == NULL)
+    if (m_attrs == NULL)

         return false;
 
         return false;
 

-    else if (m_properties->GetName() == name)
+    else if (m_attrs->GetName() == name)

     {
     {

-        prop = m_properties;
-        m_properties = prop->GetNext();
-        prop->SetNext(NULL);
-        delete prop;
+        attr = m_attrs;
+        m_attrs = attr->GetNext();
+        attr->SetNext(NULL);
+        delete attr;

         return true;
     }
 
     else
     {
         return true;
     }
 
     else
     {

-        wxXmlProperty *p = m_properties;
+        wxXmlAttribute *p = m_attrs;

         while (p->GetNext())
         {
             if (p->GetNext()->GetName() == name)
             {
         while (p->GetNext())
         {
             if (p->GetNext()->GetName() == name)
             {

-                prop = p->GetNext();
-                p->SetNext(prop->GetNext());
-                prop->SetNext(NULL);
-                delete prop;
+                attr = p->GetNext();
+                p->SetNext(attr->GetNext());
+                attr->SetNext(NULL);
+                delete attr;

                 return true;
             }
             p = p->GetNext();
                 return true;
             }
             p = p->GetNext();


@@ -452,6 +458,7 @@ bool wxIsWhiteOnly(const wxString& buf)
 
 struct wxXmlParsingContext
 {
 
 struct wxXmlParsingContext
 {

+    XML_Parser parser;

     wxMBConv  *conv;
     wxXmlNode *root;
     wxXmlNode *node;
     wxMBConv  *conv;
     wxXmlNode *root;
     wxXmlNode *node;


@@ -465,11 +472,15 @@ extern "C" {
 static void StartElementHnd(void *userData, const char *name, const char **atts)
 {
     wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;
 static void StartElementHnd(void *userData, const char *name, const char **atts)
 {
     wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;

-    wxXmlNode *node = new wxXmlNode(wxXML_ELEMENT_NODE, CharToString(ctx->conv, name));
+    wxXmlNode *node = new wxXmlNode(wxXML_ELEMENT_NODE,
+                                    CharToString(ctx->conv, name),
+                                    wxEmptyString,
+                                    XML_GetCurrentLineNumber(ctx->parser));

     const char **a = atts;
     const char **a = atts;

+

     while (*a)
     {
     while (*a)
     {

-        node->AddProperty(CharToString(ctx->conv, a[0]), CharToString(ctx->conv, a[1]));
+        node->AddAttribute(CharToString(ctx->conv, a[0]), CharToString(ctx->conv, a[1]));

         a += 2;
     }
     if (ctx->root == NULL)
         a += 2;
     }
     if (ctx->root == NULL)


@@ -505,7 +516,9 @@ static void TextHnd(void *userData, const char *s, int len)
 
         if (!whiteOnly)
         {
 
         if (!whiteOnly)
         {

-            ctx->lastAsText = new wxXmlNode(wxXML_TEXT_NODE, wxT("text"), str);
+            ctx->lastAsText =
+                new wxXmlNode(wxXML_TEXT_NODE, wxT("text"), str,
+                              XML_GetCurrentLineNumber(ctx->parser));

             ctx->node->AddChild(ctx->lastAsText);
         }
     }
             ctx->node->AddChild(ctx->lastAsText);
         }
     }


@@ -515,7 +528,9 @@ static void StartCdataHnd(void *userData)
 {
     wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;
 
 {
     wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;
 

-    ctx->lastAsText = new wxXmlNode(wxXML_CDATA_SECTION_NODE, wxT("cdata"),wxT(""));
+    ctx->lastAsText =
+        new wxXmlNode(wxXML_CDATA_SECTION_NODE, wxT("cdata"), wxT(""),
+                      XML_GetCurrentLineNumber(ctx->parser));

     ctx->node->AddChild(ctx->lastAsText);
 }
 
     ctx->node->AddChild(ctx->lastAsText);
 }
 


@@ -528,8 +543,10 @@ static void CommentHnd(void *userData, const char *data)
         // VS: ctx->node == NULL happens if there is a comment before
         //     the root element (e.g. wxDesigner's output). We ignore such
         //     comments, no big deal...
         // VS: ctx->node == NULL happens if there is a comment before
         //     the root element (e.g. wxDesigner's output). We ignore such
         //     comments, no big deal...

-        ctx->node->AddChild(new wxXmlNode(wxXML_COMMENT_NODE,
-                            wxT("comment"), CharToString(ctx->conv, data)));
+        ctx->node->AddChild(
+            new wxXmlNode(wxXML_COMMENT_NODE,
+                          wxT("comment"), CharToString(ctx->conv, data),
+                          XML_GetCurrentLineNumber(ctx->parser)));

     }
     ctx->lastAsText = NULL;
 }
     }
     ctx->lastAsText = NULL;
 }


@@ -558,8 +575,7 @@ static int UnknownEncodingHnd(void * WXUNUSED(encodingHandlerData),
     // We must build conversion table for expat. The easiest way to do so
     // is to let wxCSConv convert as string containing all characters to
     // wide character representation:
     // We must build conversion table for expat. The easiest way to do so
     // is to let wxCSConv convert as string containing all characters to
     // wide character representation:

-    wxString str(name, wxConvLibc);
-    wxCSConv conv(str.c_str());
+    wxCSConv conv(name);

     char mbBuf[2];
     wchar_t wcBuf[10];
     size_t i;
     char mbBuf[2];
     wchar_t wcBuf[10];
     size_t i;


@@ -608,6 +624,7 @@ bool wxXmlDocument::Load(wxInputStream& stream, const wxString& encoding, int fl
         ctx.conv = new wxCSConv(encoding);
 #endif
     ctx.removeWhiteOnlyNodes = (flags & wxXMLDOC_KEEP_WHITESPACE_NODES) == 0;
         ctx.conv = new wxCSConv(encoding);
 #endif
     ctx.removeWhiteOnlyNodes = (flags & wxXMLDOC_KEEP_WHITESPACE_NODES) == 0;

+    ctx.parser = parser;

 
     XML_SetUserData(parser, (void*)&ctx);
     XML_SetElementHandler(parser, StartElementHnd, EndElementHnd);
 
     XML_SetUserData(parser, (void*)&ctx);
     XML_SetElementHandler(parser, StartElementHnd, EndElementHnd);


@@ -751,7 +768,7 @@ static void OutputNode(wxOutputStream& stream, wxXmlNode *node, int indent,
                        wxMBConv *convMem, wxMBConv *convFile, int indentstep)
 {
     wxXmlNode *n, *prev;
                        wxMBConv *convMem, wxMBConv *convFile, int indentstep)
 {
     wxXmlNode *n, *prev;

-    wxXmlProperty *prop;
+    wxXmlAttribute *attr;

 
     switch (node->GetType())
     {
 
     switch (node->GetType())
     {


@@ -769,14 +786,14 @@ static void OutputNode(wxOutputStream& stream, wxXmlNode *node, int indent,
             OutputString(stream, wxT("<"));
             OutputString(stream, node->GetName());
 
             OutputString(stream, wxT("<"));
             OutputString(stream, node->GetName());
 

-            prop = node->GetProperties();
-            while (prop)
+            attr = node->GetAttributes();
+            while (attr)

             {
             {

-                OutputString(stream, wxT(" ") + prop->GetName() +  wxT("=\""));
-                OutputStringEnt(stream, prop->GetValue(), convMem, convFile,
+                OutputString(stream, wxT(" ") + attr->GetName() +  wxT("=\""));
+                OutputStringEnt(stream, attr->GetValue(), convMem, convFile,

                                 XML_ESCAPE_QUOTES);
                 OutputString(stream, wxT("\""));
                                 XML_ESCAPE_QUOTES);
                 OutputString(stream, wxT("\""));

-                prop = prop->GetNext();
+                attr = attr->GetNext();

             }
 
             if (node->GetChildren())
             }
 
             if (node->GetChildren())