diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2017-04-19 16:07:21 -0400 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-04-19 21:23:25 +0000 |
commit | 3c66ea01f5239a7b1a0da75285e0c8048e5cf784 (patch) | |
tree | 691729ad6f8924f2fc70dc31f01fafbfdb7ce8a4 /core/fxcrt/cfx_wordbreak.cpp | |
parent | 4363c8ff37b6e6a98fffe53fff248e61d04f697a (diff) | |
download | pdfium-3c66ea01f5239a7b1a0da75285e0c8048e5cf784.tar.xz |
Update IFX_CharIter::Clone to return unique_ptr
This Cl converts the Clone method of IFX_CharIter to return a
unique_ptr. The usages were all converting to a unique_ptr already.
Change-Id: I1ca5ddd03eca8f21d616efb2b92fb27899c43c23
Reviewed-on: https://pdfium-review.googlesource.com/4351
Reviewed-by: Nicolás Peña <npm@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fxcrt/cfx_wordbreak.cpp')
-rw-r--r-- | core/fxcrt/cfx_wordbreak.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/fxcrt/cfx_wordbreak.cpp b/core/fxcrt/cfx_wordbreak.cpp index c236f599f2..2a31181403 100644 --- a/core/fxcrt/cfx_wordbreak.cpp +++ b/core/fxcrt/cfx_wordbreak.cpp @@ -2793,8 +2793,8 @@ void CFX_WordBreak::Attach(const CFX_WideString& wsText) { } bool CFX_WordBreak::Next(bool bPrev) { - std::unique_ptr<IFX_CharIter> pIter( - (bPrev ? m_pPreIter : m_pCurIter)->Clone()); + std::unique_ptr<IFX_CharIter> pIter = + (bPrev ? m_pPreIter : m_pCurIter)->Clone(); if (pIter->IsEOF(!bPrev)) return false; @@ -2819,7 +2819,7 @@ void CFX_WordBreak::SetAt(int32_t nIndex) { m_pCurIter->SetAt(nIndex); FindNextBreakPos(m_pCurIter.get(), true, false); m_pPreIter = std::move(m_pCurIter); - m_pCurIter.reset(m_pPreIter->Clone()); + m_pCurIter = m_pPreIter->Clone(); FindNextBreakPos(m_pCurIter.get(), false, false); } @@ -2837,7 +2837,7 @@ void CFX_WordBreak::GetWord(CFX_WideString& wsWord) const { return; } wchar_t* lpBuf = wsWord.GetBuffer(nWordLength); - std::unique_ptr<IFX_CharIter> pTempIter(m_pPreIter->Clone()); + std::unique_ptr<IFX_CharIter> pTempIter = m_pPreIter->Clone(); int32_t i = 0; while (pTempIter->GetAt() <= m_pCurIter->GetAt()) { lpBuf[i++] = pTempIter->GetChar(); |