From 3ebd121d45ceb08918a3dcb5b3b7ac29448c862f Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 9 Mar 2016 09:59:23 -0500 Subject: Review and cleanup lint warnings. This CL goes through the remaining list of list warnings and records why they are currently blacklisted, or fixes and enables them. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1773733002 . --- core/src/fxcrt/fx_basic_wstring.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'core/src/fxcrt/fx_basic_wstring.cpp') diff --git a/core/src/fxcrt/fx_basic_wstring.cpp b/core/src/fxcrt/fx_basic_wstring.cpp index 8df72466e8..11a840a806 100644 --- a/core/src/fxcrt/fx_basic_wstring.cpp +++ b/core/src/fxcrt/fx_basic_wstring.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include // For offsetof(). +#include #include #include @@ -184,19 +184,18 @@ const CFX_WideString& CFX_WideString::operator+=(const FX_WCHAR* lpsz) { } return *this; } -const CFX_WideString& CFX_WideString::operator+=(const CFX_WideString& string) { - if (!string.m_pData) { +const CFX_WideString& CFX_WideString::operator+=(const CFX_WideString& str) { + if (!str.m_pData) { return *this; } - ConcatInPlace(string.m_pData->m_nDataLength, string.m_pData->m_String); + ConcatInPlace(str.m_pData->m_nDataLength, str.m_pData->m_String); return *this; } -const CFX_WideString& CFX_WideString::operator+=( - const CFX_WideStringC& string) { - if (string.IsEmpty()) { +const CFX_WideString& CFX_WideString::operator+=(const CFX_WideStringC& str) { + if (str.IsEmpty()) { return *this; } - ConcatInPlace(string.GetLength(), string.GetPtr()); + ConcatInPlace(str.GetLength(), str.GetPtr()); return *this; } bool CFX_WideString::Equal(const wchar_t* ptr) const { -- cgit v1.2.3