From 1cd352e0a4bc19f96df199b0acfa32a344240d5e Mon Sep 17 00:00:00 2001 From: thestig Date: Tue, 7 Jun 2016 17:53:06 -0700 Subject: Get rid of NULLs in fpdfsdk/ Review-Url: https://codereview.chromium.org/2031653003 --- fpdfsdk/fxedit/include/fx_edit.h | 18 +++++++++--------- fpdfsdk/fxedit/include/fxet_edit.h | 22 +++++++++++----------- fpdfsdk/fxedit/include/fxet_list.h | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) (limited to 'fpdfsdk/fxedit/include') diff --git a/fpdfsdk/fxedit/include/fx_edit.h b/fpdfsdk/fxedit/include/fx_edit.h index 5f0283f06f..710c06f809 100644 --- a/fpdfsdk/fxedit/include/fx_edit.h +++ b/fpdfsdk/fxedit/include/fx_edit.h @@ -366,23 +366,23 @@ class IFX_Edit { // put text into edit. virtual void SetText(const FX_WCHAR* text, int32_t charset = DEFAULT_CHARSET, - const CPVT_SecProps* pSecProps = NULL, - const CPVT_WordProps* pWordProps = NULL) = 0; + const CPVT_SecProps* pSecProps = nullptr, + const CPVT_WordProps* pWordProps = nullptr) = 0; // insert a word into the edit. virtual FX_BOOL InsertWord(uint16_t word, int32_t charset = DEFAULT_CHARSET, - const CPVT_WordProps* pWordProps = NULL) = 0; + const CPVT_WordProps* pWordProps = nullptr) = 0; // insert a return into the edit. - virtual FX_BOOL InsertReturn(const CPVT_SecProps* pSecProps = NULL, - const CPVT_WordProps* pWordProps = NULL) = 0; + virtual FX_BOOL InsertReturn(const CPVT_SecProps* pSecProps = nullptr, + const CPVT_WordProps* pWordProps = nullptr) = 0; // insert text into the edit. virtual FX_BOOL InsertText(const FX_WCHAR* text, int32_t charset = DEFAULT_CHARSET, - const CPVT_SecProps* pSecProps = NULL, - const CPVT_WordProps* pWordProps = NULL) = 0; + const CPVT_SecProps* pSecProps = nullptr, + const CPVT_WordProps* pWordProps = nullptr) = 0; // do backspace operation. virtual FX_BOOL Backspace() = 0; @@ -476,13 +476,13 @@ class IFX_Edit { static CFX_ByteString GetEditAppearanceStream( IFX_Edit* pEdit, const CFX_FloatPoint& ptOffset, - const CPVT_WordRange* pRange = NULL, + const CPVT_WordRange* pRange = nullptr, FX_BOOL bContinuous = TRUE, uint16_t SubWord = 0); static CFX_ByteString GetSelectAppearanceStream( IFX_Edit* pEdit, const CFX_FloatPoint& ptOffset, - const CPVT_WordRange* pRange = NULL); + const CPVT_WordRange* pRange = nullptr); static void DrawEdit(CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device, IFX_Edit* pEdit, diff --git a/fpdfsdk/fxedit/include/fxet_edit.h b/fpdfsdk/fxedit/include/fxet_edit.h index c7500a05fb..71431de90a 100644 --- a/fpdfsdk/fxedit/include/fxet_edit.h +++ b/fpdfsdk/fxedit/include/fxet_edit.h @@ -102,7 +102,7 @@ class CFX_Edit_LineRectArray { CFX_Edit_LineRect* GetAt(int32_t nIndex) const { if (nIndex < 0 || nIndex >= m_LineRects.GetSize()) - return NULL; + return nullptr; return m_LineRects.GetAt(nIndex); } @@ -138,7 +138,7 @@ class CFX_Edit_RectArray { CFX_FloatRect* GetAt(int32_t nIndex) const { if (nIndex < 0 || nIndex >= m_Rects.GetSize()) - return NULL; + return nullptr; return m_Rects.GetAt(nIndex); } @@ -570,20 +570,20 @@ class CFX_Edit : public IFX_Edit { void OnVK_END(FX_BOOL bShift, FX_BOOL bCtrl) override; void SetText(const FX_WCHAR* text, int32_t charset = DEFAULT_CHARSET, - const CPVT_SecProps* pSecProps = NULL, - const CPVT_WordProps* pWordProps = NULL) override; + const CPVT_SecProps* pSecProps = nullptr, + const CPVT_WordProps* pWordProps = nullptr) override; FX_BOOL InsertWord(uint16_t word, int32_t charset = DEFAULT_CHARSET, - const CPVT_WordProps* pWordProps = NULL) override; - FX_BOOL InsertReturn(const CPVT_SecProps* pSecProps = NULL, - const CPVT_WordProps* pWordProps = NULL) override; + const CPVT_WordProps* pWordProps = nullptr) override; + FX_BOOL InsertReturn(const CPVT_SecProps* pSecProps = nullptr, + const CPVT_WordProps* pWordProps = nullptr) override; FX_BOOL Backspace() override; FX_BOOL Delete() override; FX_BOOL Clear() override; FX_BOOL InsertText(const FX_WCHAR* text, int32_t charset = DEFAULT_CHARSET, - const CPVT_SecProps* pSecProps = NULL, - const CPVT_WordProps* pWordProps = NULL) override; + const CPVT_SecProps* pSecProps = nullptr, + const CPVT_WordProps* pWordProps = nullptr) override; FX_BOOL Redo() override; FX_BOOL Undo() override; int32_t WordPlaceToWordIndex(const CPVT_WordPlace& place) const override; @@ -701,8 +701,8 @@ class CFX_Edit : public IFX_Edit { inline CFX_FloatRect EditToVT(const CFX_FloatRect& rect) const; void Refresh(REFRESH_PLAN_E ePlan, - const CPVT_WordRange* pRange1 = NULL, - const CPVT_WordRange* pRange2 = NULL); + const CPVT_WordRange* pRange1 = nullptr, + const CPVT_WordRange* pRange2 = nullptr); void RefreshPushLineRects(const CPVT_WordRange& wr); void RefreshPushRandomRects(const CPVT_WordRange& wr); diff --git a/fpdfsdk/fxedit/include/fxet_list.h b/fpdfsdk/fxedit/include/fxet_list.h index 58aa94c5b6..ab4605169b 100644 --- a/fpdfsdk/fxedit/include/fxet_list.h +++ b/fpdfsdk/fxedit/include/fxet_list.h @@ -193,7 +193,7 @@ class CLST_ArrayTemplate : public CFX_ArrayTemplate { TYPE GetAt(int32_t nIndex) const { if (nIndex >= 0 && nIndex < CFX_ArrayTemplate::GetSize()) return CFX_ArrayTemplate::GetAt(nIndex); - return NULL; + return nullptr; } void RemoveAt(int32_t nIndex) { if (nIndex >= 0 && nIndex < CFX_ArrayTemplate::GetSize()) -- cgit v1.2.3