From c560a8c11a6f8ee239e570db8c022ae0fd2a4db5 Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Thu, 4 Jan 2018 14:43:27 -0500 Subject: Convert usages of pdfium::Optional to Optional Change-Id: I29769f78eaad10c6a8b79e27524336c4f330377e Reviewed-on: https://pdfium-review.googlesource.com/22258 Reviewed-by: Tom Sepez Reviewed-by: dsinclair Commit-Queue: Ryan Harrison --- core/fpdftext/cpdf_textpagefind.cpp | 7 +++---- core/fpdftext/cpdf_textpagefind.h | 6 +++--- core/fxcrt/bytestring.cpp | 32 +++++++++++++--------------- core/fxcrt/bytestring.h | 7 +++---- core/fxcrt/bytestring_unittest.cpp | 6 +++--- core/fxcrt/string_view_template.h | 5 ++--- core/fxcrt/widestring.cpp | 42 ++++++++++++++++++------------------- core/fxcrt/widestring.h | 5 ++--- core/fxcrt/widestring_unittest.cpp | 4 ++-- 9 files changed, 53 insertions(+), 61 deletions(-) (limited to 'core') diff --git a/core/fpdftext/cpdf_textpagefind.cpp b/core/fpdftext/cpdf_textpagefind.cpp index 97aa34fafe..4950a8fae2 100644 --- a/core/fpdftext/cpdf_textpagefind.cpp +++ b/core/fpdftext/cpdf_textpagefind.cpp @@ -81,7 +81,7 @@ int CPDF_TextPageFind::GetCharIndex(int index) const { bool CPDF_TextPageFind::FindFirst(const WideString& findwhat, int flags, - pdfium::Optional startPos) { + Optional startPos) { if (!m_pTextPage) return false; if (m_strText.IsEmpty() || m_bMatchCase != (flags & FPDFTEXT_MATCHCASE)) @@ -142,7 +142,7 @@ bool CPDF_TextPageFind::FindNext() { return m_IsFind; } int nCount = pdfium::CollectionSize(m_csFindWhatArray); - pdfium::Optional nResultPos = 0; + Optional nResultPos = 0; size_t nStartPos = m_findNextStart.value(); bool bSpaceStart = false; for (int iWord = 0; iWord < nCount; iWord++) { @@ -236,8 +236,7 @@ bool CPDF_TextPageFind::FindPrev() { return m_IsFind; } CPDF_TextPageFind findEngine(m_pTextPage.Get()); - bool ret = - findEngine.FindFirst(m_findWhat, m_flags, pdfium::Optional(0)); + bool ret = findEngine.FindFirst(m_findWhat, m_flags, Optional(0)); if (!ret) { m_IsFind = false; return m_IsFind; diff --git a/core/fpdftext/cpdf_textpagefind.h b/core/fpdftext/cpdf_textpagefind.h index 574f05ed0d..dd7a31eba9 100644 --- a/core/fpdftext/cpdf_textpagefind.h +++ b/core/fpdftext/cpdf_textpagefind.h @@ -24,7 +24,7 @@ class CPDF_TextPageFind { bool FindFirst(const WideString& findwhat, int flags, - pdfium::Optional startPos); + Optional startPos); bool FindNext(); bool FindPrev(); int GetCurOrder() const; @@ -48,8 +48,8 @@ class CPDF_TextPageFind { WideString m_findWhat; int m_flags; std::vector m_csFindWhatArray; - pdfium::Optional m_findNextStart; - pdfium::Optional m_findPreStart; + Optional m_findNextStart; + Optional m_findPreStart; bool m_bMatchCase; bool m_bMatchWholeWord; int m_resStart; diff --git a/core/fxcrt/bytestring.cpp b/core/fxcrt/bytestring.cpp index 4c4bd57393..3e4861ae60 100644 --- a/core/fxcrt/bytestring.cpp +++ b/core/fxcrt/bytestring.cpp @@ -549,46 +549,44 @@ size_t ByteString::Insert(size_t location, char ch) { return new_length; } -pdfium::Optional ByteString::Find(char ch, size_t start) const { +Optional ByteString::Find(char ch, size_t start) const { if (!m_pData) - return pdfium::Optional(); + return Optional(); if (!IsValidIndex(start)) - return pdfium::Optional(); + return Optional(); const char* pStr = static_cast( memchr(m_pData->m_String + start, ch, m_pData->m_nDataLength - start)); - return pStr ? pdfium::Optional( - static_cast(pStr - m_pData->m_String)) - : pdfium::Optional(); + return pStr ? Optional(static_cast(pStr - m_pData->m_String)) + : Optional(); } -pdfium::Optional ByteString::Find(const ByteStringView& subStr, - size_t start) const { +Optional ByteString::Find(const ByteStringView& subStr, + size_t start) const { if (!m_pData) - return pdfium::Optional(); + return Optional(); if (!IsValidIndex(start)) - return pdfium::Optional(); + return Optional(); const char* pStr = FX_strstr(m_pData->m_String + start, m_pData->m_nDataLength - start, subStr.unterminated_c_str(), subStr.GetLength()); - return pStr ? pdfium::Optional( - static_cast(pStr - m_pData->m_String)) - : pdfium::Optional(); + return pStr ? Optional(static_cast(pStr - m_pData->m_String)) + : Optional(); } -pdfium::Optional ByteString::ReverseFind(char ch) const { +Optional ByteString::ReverseFind(char ch) const { if (!m_pData) - return pdfium::Optional(); + return Optional(); size_t nLength = m_pData->m_nDataLength; while (nLength--) { if (m_pData->m_String[nLength] == ch) - return pdfium::Optional(nLength); + return Optional(nLength); } - return pdfium::Optional(); + return Optional(); } void ByteString::MakeLower() { diff --git a/core/fxcrt/bytestring.h b/core/fxcrt/bytestring.h index 916820656d..70f10dcaba 100644 --- a/core/fxcrt/bytestring.h +++ b/core/fxcrt/bytestring.h @@ -152,10 +152,9 @@ class ByteString { ByteString Left(size_t count) const; ByteString Right(size_t count) const; - pdfium::Optional Find(const ByteStringView& lpszSub, - size_t start = 0) const; - pdfium::Optional Find(char ch, size_t start = 0) const; - pdfium::Optional ReverseFind(char ch) const; + Optional Find(const ByteStringView& lpszSub, size_t start = 0) const; + Optional Find(char ch, size_t start = 0) const; + Optional ReverseFind(char ch) const; bool Contains(const ByteStringView& lpszSub, size_t start = 0) const { return Find(lpszSub, start).has_value(); diff --git a/core/fxcrt/bytestring_unittest.cpp b/core/fxcrt/bytestring_unittest.cpp index b45ee0fd5e..ce1512b4cf 100644 --- a/core/fxcrt/bytestring_unittest.cpp +++ b/core/fxcrt/bytestring_unittest.cpp @@ -615,7 +615,7 @@ TEST(ByteString, Find) { EXPECT_FALSE(empty_string.Find('a').has_value()); EXPECT_FALSE(empty_string.Find('\0').has_value()); - pdfium::Optional result; + Optional result; ByteString single_string("a"); result = single_string.Find('a'); ASSERT_TRUE(result.has_value()); @@ -664,7 +664,7 @@ TEST(ByteString, ReverseFind) { EXPECT_FALSE(empty_string.ReverseFind('a').has_value()); EXPECT_FALSE(empty_string.ReverseFind('\0').has_value()); - pdfium::Optional result; + Optional result; ByteString single_string("a"); result = single_string.ReverseFind('a'); ASSERT_TRUE(result.has_value()); @@ -1111,7 +1111,7 @@ TEST(ByteStringView, Find) { EXPECT_FALSE(empty_string.Find('a').has_value()); EXPECT_FALSE(empty_string.Find('\0').has_value()); - pdfium::Optional result; + Optional result; ByteStringView single_string("a"); result = single_string.Find('a'); ASSERT_TRUE(result.has_value()); diff --git a/core/fxcrt/string_view_template.h b/core/fxcrt/string_view_template.h index fa33858a68..cd3614b34f 100644 --- a/core/fxcrt/string_view_template.h +++ b/core/fxcrt/string_view_template.h @@ -149,12 +149,11 @@ class StringViewTemplate { return static_cast(m_Ptr.Get()[index]); } - pdfium::Optional Find(CharType ch) const { + Optional Find(CharType ch) const { const auto* found = reinterpret_cast(FXSYS_chr( reinterpret_cast(m_Ptr.Get()), ch, m_Length)); - return found ? pdfium::Optional(found - m_Ptr.Get()) - : pdfium::Optional(); + return found ? Optional(found - m_Ptr.Get()) : Optional(); } bool Contains(CharType ch) const { return Find(ch).has_value(); } diff --git a/core/fxcrt/widestring.cpp b/core/fxcrt/widestring.cpp index 3b72c8fa94..158c67409b 100644 --- a/core/fxcrt/widestring.cpp +++ b/core/fxcrt/widestring.cpp @@ -57,8 +57,8 @@ const wchar_t* FX_wcsstr(const wchar_t* haystack, return nullptr; } -pdfium::Optional GuessSizeForVSWPrintf(const wchar_t* pFormat, - va_list argList) { +Optional GuessSizeForVSWPrintf(const wchar_t* pFormat, + va_list argList) { size_t nMaxLen = 0; for (const wchar_t* pStr = pFormat; *pStr != 0; pStr++) { if (*pStr != '%' || *(pStr = pStr + 1) == '%') { @@ -82,7 +82,7 @@ pdfium::Optional GuessSizeForVSWPrintf(const wchar_t* pFormat, ++pStr; } if (nWidth < 0 || nWidth > 128 * 1024) - return pdfium::Optional(); + return Optional(); int nPrecision = 0; if (*pStr == '.') { pStr++; @@ -96,7 +96,7 @@ pdfium::Optional GuessSizeForVSWPrintf(const wchar_t* pFormat, } } if (nPrecision < 0 || nPrecision > 128 * 1024) - return pdfium::Optional(); + return Optional(); int nModifier = 0; if (*pStr == L'I' && *(pStr + 1) == L'6' && *(pStr + 2) == L'4') { pStr += 3; @@ -245,13 +245,13 @@ pdfium::Optional GuessSizeForVSWPrintf(const wchar_t* pFormat, nMaxLen += nItemLen; } nMaxLen += 32; // Fudge factor. - return pdfium::Optional(nMaxLen); + return Optional(nMaxLen); } // Returns string unless we ran out of space. -pdfium::Optional TryVSWPrintf(size_t size, - const wchar_t* pFormat, - va_list argList) { +Optional TryVSWPrintf(size_t size, + const wchar_t* pFormat, + va_list argList) { WideString str; wchar_t* buffer = str.GetBuffer(size); @@ -330,7 +330,7 @@ WideString WideString::FormatV(const wchar_t* format, va_list argList) { while (maxLen < 32 * 1024) { va_copy(argListCopy, argList); - pdfium::Optional ret = + Optional ret = TryVSWPrintf(static_cast(maxLen), format, argListCopy); va_end(argListCopy); @@ -731,34 +731,32 @@ size_t WideString::Insert(size_t location, wchar_t ch) { return new_length; } -pdfium::Optional WideString::Find(wchar_t ch, size_t start) const { +Optional WideString::Find(wchar_t ch, size_t start) const { if (!m_pData) - return pdfium::Optional(); + return Optional(); if (!IsValidIndex(start)) - return pdfium::Optional(); + return Optional(); const wchar_t* pStr = wmemchr(m_pData->m_String + start, ch, m_pData->m_nDataLength - start); - return pStr ? pdfium::Optional( - static_cast(pStr - m_pData->m_String)) - : pdfium::Optional(); + return pStr ? Optional(static_cast(pStr - m_pData->m_String)) + : Optional(); } -pdfium::Optional WideString::Find(const WideStringView& subStr, - size_t start) const { +Optional WideString::Find(const WideStringView& subStr, + size_t start) const { if (!m_pData) - return pdfium::Optional(); + return Optional(); if (!IsValidIndex(start)) - return pdfium::Optional(); + return Optional(); const wchar_t* pStr = FX_wcsstr(m_pData->m_String + start, m_pData->m_nDataLength - start, subStr.unterminated_c_str(), subStr.GetLength()); - return pStr ? pdfium::Optional( - static_cast(pStr - m_pData->m_String)) - : pdfium::Optional(); + return pStr ? Optional(static_cast(pStr - m_pData->m_String)) + : Optional(); } void WideString::MakeLower() { diff --git a/core/fxcrt/widestring.h b/core/fxcrt/widestring.h index 728ab35090..30a423d9aa 100644 --- a/core/fxcrt/widestring.h +++ b/core/fxcrt/widestring.h @@ -169,9 +169,8 @@ class WideString { int GetInteger() const; float GetFloat() const; - pdfium::Optional Find(const WideStringView& pSub, - size_t start = 0) const; - pdfium::Optional Find(wchar_t ch, size_t start = 0) const; + Optional Find(const WideStringView& pSub, size_t start = 0) const; + Optional Find(wchar_t ch, size_t start = 0) const; bool Contains(const WideStringView& lpszSub, size_t start = 0) const { return Find(lpszSub, start).has_value(); diff --git a/core/fxcrt/widestring_unittest.cpp b/core/fxcrt/widestring_unittest.cpp index 1673c8f069..2fb9e8c8b4 100644 --- a/core/fxcrt/widestring_unittest.cpp +++ b/core/fxcrt/widestring_unittest.cpp @@ -575,7 +575,7 @@ TEST(WideString, Find) { EXPECT_FALSE(empty_string.Find(L'a').has_value()); EXPECT_FALSE(empty_string.Find(L'\0').has_value()); - pdfium::Optional result; + Optional result; WideString single_string(L"a"); result = single_string.Find(L'a'); ASSERT_TRUE(result.has_value()); @@ -1146,7 +1146,7 @@ TEST(WideStringView, Find) { EXPECT_FALSE(empty_string.Find(L'a').has_value()); EXPECT_FALSE(empty_string.Find(L'\0').has_value()); - pdfium::Optional result; + Optional result; WideStringView single_string(L"a"); result = single_string.Find(L'a'); ASSERT_TRUE(result.has_value()); -- cgit v1.2.3