diff options
author | tsepez <tsepez@chromium.org> | 2016-04-01 10:23:04 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-04-01 10:23:05 -0700 |
commit | 9f2970caec897c40b91bd010c04dfe1f19d11108 (patch) | |
tree | d0a289939b3b6be3fe19a412b134eeb467672db2 /core/fxcrt/fx_basic_wstring.cpp | |
parent | df4bc596c64fb848647c670be66a29ea0861b4f4 (diff) | |
download | pdfium-9f2970caec897c40b91bd010c04dfe1f19d11108.tar.xz |
Remove CFX_{Byte,Wide}String::Equal in favor of "==".
Makes the code slightly cleaner.
Review URL: https://codereview.chromium.org/1846083002
Diffstat (limited to 'core/fxcrt/fx_basic_wstring.cpp')
-rw-r--r-- | core/fxcrt/fx_basic_wstring.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/core/fxcrt/fx_basic_wstring.cpp b/core/fxcrt/fx_basic_wstring.cpp index 642b75eafe..9c17948c34 100644 --- a/core/fxcrt/fx_basic_wstring.cpp +++ b/core/fxcrt/fx_basic_wstring.cpp @@ -198,30 +198,30 @@ const CFX_WideString& CFX_WideString::operator+=(const CFX_WideStringC& str) { ConcatInPlace(str.GetLength(), str.GetPtr()); return *this; } -bool CFX_WideString::Equal(const wchar_t* ptr) const { - if (!m_pData) { - return !ptr || ptr[0] == L'\0'; - } - if (!ptr) { +bool CFX_WideString::operator==(const wchar_t* ptr) const { + if (!m_pData) + return !ptr || !ptr[0]; + + if (!ptr) return m_pData->m_nDataLength == 0; - } + return wcslen(ptr) == static_cast<size_t>(m_pData->m_nDataLength) && wmemcmp(ptr, m_pData->m_String, m_pData->m_nDataLength) == 0; } -bool CFX_WideString::Equal(const CFX_WideStringC& str) const { - if (!m_pData) { +bool CFX_WideString::operator==(const CFX_WideStringC& str) const { + if (!m_pData) return str.IsEmpty(); - } + return str.GetLength() == m_pData->m_nDataLength && wmemcmp(str.GetPtr(), m_pData->m_String, m_pData->m_nDataLength) == 0; } -bool CFX_WideString::Equal(const CFX_WideString& other) const { - if (IsEmpty()) { +bool CFX_WideString::operator==(const CFX_WideString& other) const { + if (IsEmpty()) return other.IsEmpty(); - } - if (other.IsEmpty()) { + + if (other.IsEmpty()) return false; - } + return other.m_pData->m_nDataLength == m_pData->m_nDataLength && wmemcmp(other.m_pData->m_String, m_pData->m_String, m_pData->m_nDataLength) == 0; |