From 6f0a64a1bf18ab6636404cdfb883897459083a4d Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 10 Jun 2015 16:51:15 -0700 Subject: Remove FX_BSTR and FX_WSTR typedefs. These stand for const CFX_{Byte,Wide}StringC&, which is just monumentally confusing, since there are so many string types running around here. The following had manual changes: core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp core/src/fpdfdoc/doc_form.cpp fpdfsdk/src/fpdf_ext.cpp R=thestig@chromium.org Review URL: https://codereview.chromium.org/1180593004. --- core/src/fxcrt/fx_xml_composer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'core/src/fxcrt/fx_xml_composer.cpp') diff --git a/core/src/fxcrt/fx_xml_composer.cpp b/core/src/fxcrt/fx_xml_composer.cpp index 7858290f9a..97971aa841 100644 --- a/core/src/fxcrt/fx_xml_composer.cpp +++ b/core/src/fxcrt/fx_xml_composer.cpp @@ -6,7 +6,7 @@ #include "../../include/fxcrt/fx_xml.h" #include "xml_int.h" -void FX_XML_SplitQualifiedName(FX_BSTR bsFullName, CFX_ByteStringC &bsSpace, CFX_ByteStringC &bsName) +void FX_XML_SplitQualifiedName(const CFX_ByteStringC& bsFullName, CFX_ByteStringC &bsSpace, CFX_ByteStringC &bsName) { if (bsFullName.IsEmpty()) { return; @@ -25,12 +25,12 @@ void FX_XML_SplitQualifiedName(FX_BSTR bsFullName, CFX_ByteStringC &bsSpace, CFX bsName = CFX_ByteStringC(bsFullName.GetCStr() + iStart, bsFullName.GetLength() - iStart); } } -void CXML_Element::SetTag(FX_BSTR qSpace, FX_BSTR tagname) +void CXML_Element::SetTag(const CFX_ByteStringC& qSpace, const CFX_ByteStringC& tagname) { m_QSpaceName = qSpace; m_TagName = tagname; } -void CXML_Element::SetTag(FX_BSTR qTagName) +void CXML_Element::SetTag(const CFX_ByteStringC& qTagName) { ASSERT(!qTagName.IsEmpty()); CFX_ByteStringC bsSpace, bsName; -- cgit v1.2.3