summaryrefslogtreecommitdiff
path: root/xfa/fee/fx_wordbreak/fx_wordbreak.h
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-05-17 13:42:51 -0700
committerCommit bot <commit-bot@chromium.org>2016-05-17 13:42:51 -0700
commit8bdb290b9301200aeafa8b89678e690166ba1ce6 (patch)
treed4f6e474169f0a3ce1e435ac5571883bacb10f57 /xfa/fee/fx_wordbreak/fx_wordbreak.h
parent992def065be348d6f8157fab75aee312f5f45558 (diff)
downloadpdfium-8bdb290b9301200aeafa8b89678e690166ba1ce6.tar.xz
Remove Release() from IFX_CharIter, use unique_ptrs.chromium/2742chromium/2741
Review-Url: https://codereview.chromium.org/1986373002
Diffstat (limited to 'xfa/fee/fx_wordbreak/fx_wordbreak.h')
-rw-r--r--xfa/fee/fx_wordbreak/fx_wordbreak.h28
1 files changed, 14 insertions, 14 deletions
diff --git a/xfa/fee/fx_wordbreak/fx_wordbreak.h b/xfa/fee/fx_wordbreak/fx_wordbreak.h
index 7192700b9a..e1b1787579 100644
--- a/xfa/fee/fx_wordbreak/fx_wordbreak.h
+++ b/xfa/fee/fx_wordbreak/fx_wordbreak.h
@@ -7,33 +7,34 @@
#ifndef XFA_FEE_FX_WORDBREAK_FX_WORDBREAK_H_
#define XFA_FEE_FX_WORDBREAK_FX_WORDBREAK_H_
+#include <memory>
+
#include "core/fxcrt/include/fx_string.h"
#include "core/fxcrt/include/fx_system.h"
#include "xfa/fee/ifde_txtedtengine.h"
class CFX_CharIter : public IFX_CharIter {
public:
- CFX_CharIter(const CFX_WideString& wsText);
- virtual void Release();
- virtual FX_BOOL Next(FX_BOOL bPrev = FALSE);
- virtual FX_WCHAR GetChar();
- virtual void SetAt(int32_t nIndex);
- virtual int32_t GetAt() const;
- virtual FX_BOOL IsEOF(FX_BOOL bTail = TRUE) const;
- virtual IFX_CharIter* Clone();
+ explicit CFX_CharIter(const CFX_WideString& wsText);
+ ~CFX_CharIter() override;
- protected:
- ~CFX_CharIter();
+ FX_BOOL Next(FX_BOOL bPrev = FALSE) override;
+ FX_WCHAR GetChar() override;
+ void SetAt(int32_t nIndex) override;
+ int32_t GetAt() const override;
+ FX_BOOL IsEOF(FX_BOOL bTail = TRUE) const override;
+ IFX_CharIter* Clone() override;
private:
const CFX_WideString& m_wsText;
int32_t m_nIndex;
};
+
class CFX_WordBreak {
public:
CFX_WordBreak();
+ ~CFX_WordBreak();
- void Release();
void Attach(IFX_CharIter* pIter);
void Attach(const CFX_WideString& wsText);
FX_BOOL Next(FX_BOOL bPrev);
@@ -44,14 +45,13 @@ class CFX_WordBreak {
FX_BOOL IsEOF(FX_BOOL bTail) const;
protected:
- ~CFX_WordBreak();
FX_BOOL FindNextBreakPos(IFX_CharIter* pIter,
FX_BOOL bPrev,
FX_BOOL bFromNext = TRUE);
private:
- IFX_CharIter* m_pPreIter;
- IFX_CharIter* m_pCurIter;
+ std::unique_ptr<IFX_CharIter> m_pPreIter;
+ std::unique_ptr<IFX_CharIter> m_pCurIter;
};
#endif // XFA_FEE_FX_WORDBREAK_FX_WORDBREAK_H_