diff options
| author | Ryan Harrison <rharrison@chromium.org> | 2017-09-18 14:23:18 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-18 18:40:16 +0000 |
| commit | 275e260a6cd4a8e506ba974feb85ebcd926c1739 (patch) | |
| tree | 2029b9158ec044764ceff122fe5fb5d0a3f123d1 /core/fpdftext/cpdf_textpagefind.h | |
| parent | 450fbeaaabf1ab340c1018de2e58f1950657517e (diff) | |
| download | pdfium-275e260a6cd4a8e506ba974feb85ebcd926c1739.tar.xz | |
Convert string class names
Automated using git grep & sed.
Replace StringC classes with StringView classes.
Remove the CFX_ prefix and put string classes in fxcrt namespace.
Change AsStringC() to AsStringView().
Rename tests from TEST(fxcrt, *String*Foo) to TEST(*String*,
Foo).
Couple of tests needed to have their names regularlized.
BUG=pdfium:894
Change-Id: I7ca038685c8d803795f3ed02545124f7a224c83d
Reviewed-on: https://pdfium-review.googlesource.com/14151
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'core/fpdftext/cpdf_textpagefind.h')
| -rw-r--r-- | core/fpdftext/cpdf_textpagefind.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/fpdftext/cpdf_textpagefind.h b/core/fpdftext/cpdf_textpagefind.h index cf8d3d1702..f9a28a0b0a 100644 --- a/core/fpdftext/cpdf_textpagefind.h +++ b/core/fpdftext/cpdf_textpagefind.h @@ -22,7 +22,7 @@ class CPDF_TextPageFind { explicit CPDF_TextPageFind(const CPDF_TextPage* pTextPage); ~CPDF_TextPageFind(); - bool FindFirst(const CFX_WideString& findwhat, + bool FindFirst(const WideString& findwhat, int flags, pdfium::Optional<FX_STRSIZE> startPos); bool FindNext(); @@ -31,11 +31,11 @@ class CPDF_TextPageFind { int GetMatchedCount() const; protected: - void ExtractFindWhat(const CFX_WideString& findwhat); - bool IsMatchWholeWord(const CFX_WideString& csPageText, + void ExtractFindWhat(const WideString& findwhat); + bool IsMatchWholeWord(const WideString& csPageText, FX_STRSIZE startPos, FX_STRSIZE endPos); - bool ExtractSubString(CFX_WideString& rString, + bool ExtractSubString(WideString& rString, const wchar_t* lpszFullString, int iSubString, wchar_t chSep); @@ -44,10 +44,10 @@ class CPDF_TextPageFind { private: std::vector<uint16_t> m_CharIndex; CFX_UnownedPtr<const CPDF_TextPage> m_pTextPage; - CFX_WideString m_strText; - CFX_WideString m_findWhat; + WideString m_strText; + WideString m_findWhat; int m_flags; - std::vector<CFX_WideString> m_csFindWhatArray; + std::vector<WideString> m_csFindWhatArray; pdfium::Optional<FX_STRSIZE> m_findNextStart; pdfium::Optional<FX_STRSIZE> m_findPreStart; bool m_bMatchCase; |