Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

code cleanup: make OutputString[Ent]() simpler to call by providing defaults for conversion parameters and using flag instead of a bool

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-12-18 15:02:01 +00:00
parent 24c80a284c
commit 8dfd4fade8
1 changed files with 45 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/xml/xml.cpp
View File

@@ -594,33 +594,42 @@ bool wxXmlDocument::Load(wxInputStream& stream, const wxString& encoding)
// write string to output: // write string to output:
inline static void OutputString(wxOutputStream& stream, const wxString& str, inline static void OutputString(wxOutputStream& stream, const wxString& str,
#if wxUSE_UNICODE wxMBConv *convMem = NULL,
wxMBConv * WXUNUSED(convMem), wxMBConv *convFile = NULL)
#else
wxMBConv *convMem,
#endif
wxMBConv *convFile)
{ {
if (str.empty()) return; if (str.empty())
return;
#if wxUSE_UNICODE #if wxUSE_UNICODE
wxUnusedVar(convMem);
const wxWX2MBbuf buf(str.mb_str(*(convFile ? convFile : &wxConvUTF8))); const wxWX2MBbuf buf(str.mb_str(*(convFile ? convFile : &wxConvUTF8)));
stream.Write((const char*)buf, strlen((const char*)buf)); stream.Write((const char*)buf, strlen((const char*)buf));
#else #else // !wxUSE_UNICODE
if ( convFile == NULL ) if ( convFile && convMem )
stream.Write(str.mb_str(), str.Len());
else
{ {
wxString str2(str.wc_str(*convMem), *convFile); wxString str2(str.wc_str(*convMem), *convFile);
stream.Write(str2.mb_str(), str2.Len()); stream.Write(str2.mb_str(), str2.Len());
} }
#endif else // no conversions to do
{
stream.Write(str.mb_str(), str.Len());
}
#endif // wxUSE_UNICODE/!wxUSE_UNICODE
} }
// flags for OutputStringEnt()
enum
{
XML_ESCAPE_QUOTES = 1
};
// Same as above, but create entities first. // Same as above, but create entities first.
// Translates '<' to "&lt;", '>' to "&gt;" and '&' to "&amp;" // Translates '<' to "&lt;", '>' to "&gt;" and '&' to "&amp;"
static void OutputStringEnt(wxOutputStream& stream, const wxString& str, static void OutputStringEnt(wxOutputStream& stream, const wxString& str,
wxMBConv *convMem, wxMBConv *convFile, wxMBConv *convMem = NULL,
bool escapeQuotes = false) wxMBConv *convFile = NULL,
int flags = 0)
{ {
wxString buf; wxString buf;
size_t i, last, len; size_t i, last, len;
@@ -633,24 +642,25 @@ static void OutputStringEnt(wxOutputStream& stream, const wxString& str,
c = str.GetChar(i); c = str.GetChar(i);
if (c == wxT('<') || c == wxT('>') || if (c == wxT('<') || c == wxT('>') ||
(c == wxT('&') && str.Mid(i+1, 4) != wxT("amp;")) || (c == wxT('&') && str.Mid(i+1, 4) != wxT("amp;")) ||
(escapeQuotes && c == wxT('"'))) ((flags & XML_ESCAPE_QUOTES) && c == wxT('"')))
{ {
OutputString(stream, str.Mid(last, i - last), convMem, convFile); OutputString(stream, str.Mid(last, i - last), convMem, convFile);
switch (c) switch (c)
{ {
case wxT('<'): case wxT('<'):
OutputString(stream, wxT("&lt;"), NULL, NULL); OutputString(stream, wxT("&lt;"));
break; break;
case wxT('>'): case wxT('>'):
OutputString(stream, wxT("&gt;"), NULL, NULL); OutputString(stream, wxT("&gt;"));
break; break;
case wxT('&'): case wxT('&'):
OutputString(stream, wxT("&amp;"), NULL, NULL); OutputString(stream, wxT("&amp;"));
break; break;
case wxT('"'): case wxT('"'):
OutputString(stream, wxT("&quot;"), NULL, NULL); OutputString(stream, wxT("&quot;"));
break;
default:
break; break;
default: break;
} }
last = i + 1; last = i + 1;
} }
@@ -663,7 +673,7 @@ inline static void OutputIndentation(wxOutputStream& stream, int indent)
wxString str = wxT("\n"); wxString str = wxT("\n");
for (int i = 0; i < indent; i++) for (int i = 0; i < indent; i++)
str << wxT(' ') << wxT(' '); str << wxT(' ') << wxT(' ');
OutputString(stream, str, NULL, NULL); OutputString(stream, str);
} }
static void OutputNode(wxOutputStream& stream, wxXmlNode *node, int indent, static void OutputNode(wxOutputStream& stream, wxXmlNode *node, int indent,
@@ -679,23 +689,22 @@ static void OutputNode(wxOutputStream& stream, wxXmlNode *node, int indent,
break; break;
case wxXML_ELEMENT_NODE: case wxXML_ELEMENT_NODE:
OutputString(stream, wxT("<"), NULL, NULL); OutputString(stream, wxT("<"));
OutputString(stream, node->GetName(), NULL, NULL); OutputString(stream, node->GetName());
prop = node->GetProperties(); prop = node->GetProperties();
while (prop) while (prop)
{ {
OutputString(stream, wxT(" ") + prop->GetName() + wxT("=\""), OutputString(stream, wxT(" ") + prop->GetName() + wxT("=\""));
NULL, NULL);
OutputStringEnt(stream, prop->GetValue(), convMem, convFile, OutputStringEnt(stream, prop->GetValue(), convMem, convFile,
true/*escapeQuotes*/); XML_ESCAPE_QUOTES);
OutputString(stream, wxT("\""), NULL, NULL); OutputString(stream, wxT("\""));
prop = prop->GetNext(); prop = prop->GetNext();
} }
if (node->GetChildren()) if (node->GetChildren())
{ {
OutputString(stream, wxT(">"), NULL, NULL); OutputString(stream, wxT(">"));
prev = NULL; prev = NULL;
n = node->GetChildren(); n = node->GetChildren();
while (n) while (n)
@@ -708,18 +717,18 @@ static void OutputNode(wxOutputStream& stream, wxXmlNode *node, int indent,
} }
if (prev && prev->GetType() != wxXML_TEXT_NODE) if (prev && prev->GetType() != wxXML_TEXT_NODE)
OutputIndentation(stream, indent); OutputIndentation(stream, indent);
OutputString(stream, wxT("</"), NULL, NULL); OutputString(stream, wxT("</"));
OutputString(stream, node->GetName(), NULL, NULL); OutputString(stream, node->GetName());
OutputString(stream, wxT(">"), NULL, NULL); OutputString(stream, wxT(">"));
} }
else else
OutputString(stream, wxT("/>"), NULL, NULL); OutputString(stream, wxT("/>"));
break; break;
case wxXML_COMMENT_NODE: case wxXML_COMMENT_NODE:
OutputString(stream, wxT("<!--"), NULL, NULL); OutputString(stream, wxT("<!--"));
OutputString(stream, node->GetContent(), convMem, convFile); OutputString(stream, node->GetContent(), convMem, convFile);
OutputString(stream, wxT("-->"), NULL, NULL); OutputString(stream, wxT("-->"));
break; break;
default: default:
@@ -749,10 +758,10 @@ bool wxXmlDocument::Save(wxOutputStream& stream) const
s.Printf(wxT("<?xml version=\"%s\" encoding=\"%s\"?>\n"), s.Printf(wxT("<?xml version=\"%s\" encoding=\"%s\"?>\n"),
GetVersion().c_str(), GetFileEncoding().c_str()); GetVersion().c_str(), GetFileEncoding().c_str());
OutputString(stream, s, NULL, NULL); OutputString(stream, s);
OutputNode(stream, GetRoot(), 0, convMem, convFile); OutputNode(stream, GetRoot(), 0, convMem, convFile);
OutputString(stream, wxT("\n"), NULL, NULL); OutputString(stream, wxT("\n"));
if ( convFile ) if ( convFile )
delete convFile; delete convFile;