X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/538f3830191e25eaf0edb0a379e08d4f85ee49bc..50c8b82054d96a9cc846d09ed98eecad07907be0:/src/xml/xml.cpp?ds=sidebyside

diff --git a/src/xml/xml.cpp b/src/xml/xml.cpp
index 4a13a5e879..4c94c15431 100644
--- a/src/xml/xml.cpp
+++ b/src/xml/xml.cpp
@@ -414,7 +414,7 @@ bool wxXmlDocument::Save(const wxString& filename, int indentstep) const
 // converts Expat-produced string in UTF-8 into wxString using the specified
 // conv or keep in UTF-8 if conv is NULL
 static wxString CharToString(wxMBConv *conv,
-                                    const char *s, size_t len = wxSTRING_MAXLEN)
+                                    const char *s, size_t len = wxString::npos)
 {
 #if wxUSE_UNICODE
     wxUnusedVar(conv);
@@ -426,13 +426,13 @@ static wxString CharToString(wxMBConv *conv,
         // there can be no embedded NULs in this string so we don't need the
         // output length, it will be NUL-terminated
         const wxWCharBuffer wbuf(
-            wxConvUTF8.cMB2WC(s, len == wxSTRING_MAXLEN ? wxNO_LEN : len, NULL));
+            wxConvUTF8.cMB2WC(s, len == wxString::npos ? wxNO_LEN : len, NULL));
 
         return wxString(wbuf, *conv);
     }
     else // already in UTF-8, no conversion needed
     {
-        return wxString(s, len != wxSTRING_MAXLEN ? len : strlen(s));
+        return wxString(s, len != wxString::npos ? len : strlen(s));
     }
 #endif // wxUSE_UNICODE/!wxUSE_UNICODE
 }
@@ -455,7 +455,7 @@ struct wxXmlParsingContext
     wxXmlNode *lastAsText;
     wxString   encoding;
     wxString   version;
-	bool	bLastCdata;
+    bool       bLastCdata;
     bool       removeWhiteOnlyNodes;
 };
 
@@ -497,15 +497,15 @@ static void TextHnd(void *userData, const char *s, int len)
 
     if (ctx->lastAsText)
     {
-		if ( ctx->bLastCdata )
-		{
-			ctx->lastAsText->SetContent(ctx->lastAsText->GetContent() +
+        if ( ctx->bLastCdata )
+        {
+            ctx->lastAsText->SetContent(ctx->lastAsText->GetContent() +
                                         CharToString(NULL, s, len));
-		}
-		else
-		{
+        }
+        else
+        {
             ctx->lastAsText->SetContent(ctx->lastAsText->GetContent() + str);
-		}
+        }
     }
     else
     {
@@ -527,10 +527,10 @@ static void StartCdataHnd(void *userData)
 {
     wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;
 
-	ctx->bLastCdata = true;
-   
-	ctx->lastAsText = new wxXmlNode(wxXML_CDATA_SECTION_NODE, wxT("cdata"),wxT(""));
-    ctx->node->AddChild(ctx->lastAsText);         
+    ctx->bLastCdata = true;
+
+    ctx->lastAsText = new wxXmlNode(wxXML_CDATA_SECTION_NODE, wxT("cdata"),wxT(""));
+    ctx->node->AddChild(ctx->lastAsText);
 }
 }
 
@@ -539,7 +539,7 @@ static void EndCdataHnd(void *userData)
 {
     wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;
 
-	ctx->bLastCdata = false;      
+    ctx->bLastCdata = false;
 }
 }
 
@@ -636,12 +636,12 @@ 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.bLastCdata = false;
+    ctx.bLastCdata = false;
 
     XML_SetUserData(parser, (void*)&ctx);
     XML_SetElementHandler(parser, StartElementHnd, EndElementHnd);
     XML_SetCharacterDataHandler(parser, TextHnd);
-	XML_SetCdataSectionHandler(parser, StartCdataHnd, EndCdataHnd );
+    XML_SetCdataSectionHandler(parser, StartCdataHnd, EndCdataHnd );
     XML_SetCommentHandler(parser, CommentHnd);
     XML_SetDefaultHandler(parser, DefaultHnd);
     XML_SetUnknownEncodingHandler(parser, UnknownEncodingHnd, NULL);
@@ -784,11 +784,11 @@ static void OutputNode(wxOutputStream& stream, wxXmlNode *node, int indent,
 
     switch (node->GetType())
     {
-		case wxXML_CDATA_SECTION_NODE:
-			OutputString( stream, wxT("<![CDATA["));
-			OutputString( stream, node->GetContent() );
-			OutputString( stream, wxT("]]>") );
-			break;
+        case wxXML_CDATA_SECTION_NODE:
+            OutputString( stream, wxT("<![CDATA["));
+            OutputString( stream, node->GetContent() );
+            OutputString( stream, wxT("]]>") );
+            break;
 
         case wxXML_TEXT_NODE:
             OutputStringEnt(stream, node->GetContent(), convMem, convFile);