summaryrefslogtreecommitdiff
path: root/core/fxcrt/include
diff options
context:
space:
mode:
Diffstat (limited to 'core/fxcrt/include')
-rw-r--r--core/fxcrt/include/fx_basic.h9
-rw-r--r--core/fxcrt/include/fx_string.h3
-rw-r--r--core/fxcrt/include/fx_xml.h14
3 files changed, 15 insertions, 11 deletions
diff --git a/core/fxcrt/include/fx_basic.h b/core/fxcrt/include/fx_basic.h
index 48999c4f19..7121ffcd0b 100644
--- a/core/fxcrt/include/fx_basic.h
+++ b/core/fxcrt/include/fx_basic.h
@@ -56,10 +56,15 @@ class CFX_BinaryBuf {
class CFX_ByteTextBuf : public CFX_BinaryBuf {
public:
- void AppendChar(int ch) { AppendByte((uint8_t)ch); }
FX_STRSIZE GetLength() const { return m_DataSize; }
- CFX_ByteStringC AsStringC() const;
+ CFX_ByteString MakeString() const {
+ return CFX_ByteString(m_pBuffer.get(), m_DataSize);
+ }
+ CFX_ByteStringC AsStringC() const {
+ return CFX_ByteStringC(m_pBuffer.get(), m_DataSize);
+ }
+ void AppendChar(int ch) { AppendByte(static_cast<uint8_t>(ch)); }
CFX_ByteTextBuf& operator<<(int i);
CFX_ByteTextBuf& operator<<(uint32_t i);
CFX_ByteTextBuf& operator<<(double f);
diff --git a/core/fxcrt/include/fx_string.h b/core/fxcrt/include/fx_string.h
index df8afb386f..142f9372d0 100644
--- a/core/fxcrt/include/fx_string.h
+++ b/core/fxcrt/include/fx_string.h
@@ -46,8 +46,7 @@ class CFX_ByteString {
CFX_ByteString(const FX_CHAR* ptr, FX_STRSIZE len);
CFX_ByteString(const uint8_t* ptr, FX_STRSIZE len);
- // TODO(tsepez): mark constructor as explicit.
- CFX_ByteString(const CFX_ByteStringC& bstrc);
+ explicit CFX_ByteString(const CFX_ByteStringC& bstrc);
CFX_ByteString(const CFX_ByteStringC& bstrc1, const CFX_ByteStringC& bstrc2);
~CFX_ByteString();
diff --git a/core/fxcrt/include/fx_xml.h b/core/fxcrt/include/fx_xml.h
index 3e22883c7f..8816e2eae1 100644
--- a/core/fxcrt/include/fx_xml.h
+++ b/core/fxcrt/include/fx_xml.h
@@ -14,7 +14,7 @@
class CXML_AttrItem {
public:
- bool Matches(const CFX_ByteStringC& space, const CFX_ByteStringC& name) const;
+ bool Matches(const CFX_ByteString& space, const CFX_ByteString& name) const;
CFX_ByteString m_QSpaceName;
CFX_ByteString m_AttrName;
@@ -23,11 +23,11 @@ class CXML_AttrItem {
class CXML_AttrMap {
public:
- const CFX_WideString* Lookup(const CFX_ByteStringC& space,
- const CFX_ByteStringC& name) const;
- void SetAt(const CFX_ByteStringC& space,
- const CFX_ByteStringC& name,
- const CFX_WideStringC& value);
+ const CFX_WideString* Lookup(const CFX_ByteString& space,
+ const CFX_ByteString& name) const;
+ void SetAt(const CFX_ByteString& space,
+ const CFX_ByteString& name,
+ const CFX_WideString& value);
int GetSize() const;
CXML_AttrItem& GetAt(int index) const;
@@ -69,7 +69,7 @@ class CXML_Element {
void Empty();
CFX_ByteString GetTagName(FX_BOOL bQualified = FALSE) const;
CFX_ByteString GetNamespace(FX_BOOL bQualified = FALSE) const;
- CFX_ByteString GetNamespaceURI(const CFX_ByteStringC& qName) const;
+ CFX_ByteString GetNamespaceURI(const CFX_ByteString& qName) const;
CXML_Element* GetParent() const { return m_pParent; }
uint32_t CountAttrs() const { return m_AttrMap.GetSize(); }
void GetAttrByIndex(int index,