Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1345)

Unified Diff: core/fxcrt/fx_basic_wstring.cpp

Issue 1846083002: Remove CFX_{Byte,Wide}String::Equal in favor of "==". (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Nits. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « core/fxcrt/fx_basic_bstring.cpp ('k') | core/fxcrt/include/fx_string.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/fxcrt/fx_basic_wstring.cpp
diff --git a/core/fxcrt/fx_basic_wstring.cpp b/core/fxcrt/fx_basic_wstring.cpp
index 642b75eafe35304badc2102201a184dd2576daa6..9c17948c345abc3a97dcc7f2fda8657b9f96aea5 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;
« no previous file with comments | « core/fxcrt/fx_basic_bstring.cpp ('k') | core/fxcrt/include/fx_string.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698