Get rid of most instance of 'foo != NULL'

fpdfsdk/src/fxedit/fxet_edit.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "fpdfsdk/include/fxedit/fxet_edit.h"
 #include "fpdfsdk/include/fxedit/fxet_stub.h"
 
 #define FX_EDIT_UNDO_MAXITEM 10000
@@ skipping 75 matching lines @@
 
 IFX_Edit* CFX_Edit_Iterator::GetEdit() const {
   return m_pEdit;
 }
 
 /* --------------------------- CFX_Edit_Provider -------------------------------
  */
 
 CFX_Edit_Provider::CFX_Edit_Provider(IFX_Edit_FontMap* pFontMap)
     : m_pFontMap(pFontMap) {
-  ASSERT(m_pFontMap != NULL);
+  ASSERT(m_pFontMap);
 }
 
 CFX_Edit_Provider::~CFX_Edit_Provider() {}
 
 IFX_Edit_FontMap* CFX_Edit_Provider::GetFontMap() {
   return m_pFontMap;
 }
 
 int32_t CFX_Edit_Provider::GetCharWidth(int32_t nFontIndex,
                                         FX_WORD word,
@@ skipping 172 matching lines @@
 
 FX_BOOL CFX_Edit_Undo::CanUndo() const {
   return m_nCurUndoPos > 0;
 }
 
 void CFX_Edit_Undo::Undo() {
   m_bWorking = TRUE;
 
   if (m_nCurUndoPos > 0) {
     IFX_Edit_UndoItem* pItem = m_UndoItemStack.GetAt(m_nCurUndoPos - 1);
-    ASSERT(pItem != NULL);
-
     pItem->Undo();
 
     m_nCurUndoPos--;
     m_bModified = (m_nCurUndoPos != 0);
   }
 
   m_bWorking = FALSE;
 }
 
 FX_BOOL CFX_Edit_Undo::CanRedo() const {
   return m_nCurUndoPos < m_UndoItemStack.GetSize();
 }
 
 void CFX_Edit_Undo::Redo() {
   m_bWorking = TRUE;
 
   int32_t nStackSize = m_UndoItemStack.GetSize();
 
   if (m_nCurUndoPos < nStackSize) {
     IFX_Edit_UndoItem* pItem = m_UndoItemStack.GetAt(m_nCurUndoPos);
-    ASSERT(pItem != NULL);
-
     pItem->Redo();
 
     m_nCurUndoPos++;
     m_bModified = (m_nCurUndoPos != 0);
   }
 
   m_bWorking = FALSE;
 }
 
 FX_BOOL CFX_Edit_Undo::IsWorking() const {
   return m_bWorking;
 }
 
 void CFX_Edit_Undo::AddItem(IFX_Edit_UndoItem* pItem) {
   ASSERT(!m_bWorking);
-  ASSERT(pItem != NULL);
+  ASSERT(pItem);
   ASSERT(m_nBufSize > 1);
 
   if (m_nCurUndoPos < m_UndoItemStack.GetSize())
     RemoveTails();
 
   if (m_UndoItemStack.GetSize() >= m_nBufSize) {
     RemoveHeads();
     m_bVirgin = FALSE;
   }
 
@@ skipping 44 matching lines @@
 
 CFX_Edit_GroupUndoItem::~CFX_Edit_GroupUndoItem() {
   for (int i = 0, sz = m_Items.GetSize(); i < sz; i++) {
     delete m_Items[i];
   }
 
   m_Items.RemoveAll();
 }
 
 void CFX_Edit_GroupUndoItem::AddUndoItem(CFX_Edit_UndoItem* pUndoItem) {
-  ASSERT(pUndoItem != NULL);
-
   pUndoItem->SetFirst(FALSE);
   pUndoItem->SetLast(FALSE);
 
   m_Items.Add(pUndoItem);
 
   if (m_sTitle.IsEmpty())
     m_sTitle = pUndoItem->GetUndoTitle();
 }
 
 void CFX_Edit_GroupUndoItem::UpdateItems() {
   if (m_Items.GetSize() > 0) {
     CFX_Edit_UndoItem* pFirstItem = m_Items[0];
-    ASSERT(pFirstItem != NULL);
     pFirstItem->SetFirst(TRUE);
 
     CFX_Edit_UndoItem* pLastItem = m_Items[m_Items.GetSize() - 1];
-    ASSERT(pLastItem != NULL);
     pLastItem->SetLast(TRUE);
   }
 }
 
 void CFX_Edit_GroupUndoItem::Undo() {
   for (int i = m_Items.GetSize() - 1; i >= 0; i--) {
     CFX_Edit_UndoItem* pUndoItem = m_Items[i];
-    ASSERT(pUndoItem != NULL);
-
     pUndoItem->Undo();
   }
 }
 
 void CFX_Edit_GroupUndoItem::Redo() {
   for (int i = 0, sz = m_Items.GetSize(); i < sz; i++) {
     CFX_Edit_UndoItem* pUndoItem = m_Items[i];
-    ASSERT(pUndoItem != NULL);
-
     pUndoItem->Redo();
   }
 }
 
 CFX_WideString CFX_Edit_GroupUndoItem::GetUndoTitle() {
   return m_sTitle;
 }
 
 /* ------------------------------------- CFX_Edit_UndoItem derived classes
  * ------------------------------------- */
@@ skipping 371 matching lines @@
       m_Undo(FX_EDIT_UNDO_MAXITEM),
       m_nAlignment(0),
       m_bNotifyFlag(FALSE),
       m_bEnableOverflow(FALSE),
       m_bEnableRefresh(TRUE),
       m_rcOldContent(0.0f, 0.0f, 0.0f, 0.0f),
       m_bEnableUndo(TRUE),
       m_bNotify(TRUE),
       m_bOprNotify(FALSE),
       m_pGroupUndoItem(NULL) {
-  ASSERT(pVT != NULL);
+  ASSERT(pVT);
 }
 
 CFX_Edit::~CFX_Edit() {
   delete m_pVTProvide;
   m_pVTProvide = NULL;
   delete m_pIterator;
   m_pIterator = NULL;
   ASSERT(m_pGroupUndoItem == NULL);
 }
 
@@ skipping 2268 matching lines @@
   return nOldCharset;
 }
 
 void CFX_Edit::BeginGroupUndo(const CFX_WideString& sTitle) {
   ASSERT(m_pGroupUndoItem == NULL);
 
   m_pGroupUndoItem = new CFX_Edit_GroupUndoItem(sTitle);
 }
 
 void CFX_Edit::EndGroupUndo() {
-  ASSERT(m_pGroupUndoItem != NULL);
-
   m_pGroupUndoItem->UpdateItems();
   m_Undo.AddItem(m_pGroupUndoItem);
   if (m_bOprNotify && m_pOprNotify)
     m_pOprNotify->OnAddUndo(m_pGroupUndoItem);
   m_pGroupUndoItem = NULL;
 }
 
 void CFX_Edit::AddEditUndoItem(CFX_Edit_UndoItem* pEditUndoItem) {
   if (m_pGroupUndoItem)
     m_pGroupUndoItem->AddUndoItem(pEditUndoItem);
   else {
     m_Undo.AddItem(pEditUndoItem);
     if (m_bOprNotify && m_pOprNotify)
       m_pOprNotify->OnAddUndo(pEditUndoItem);
   }
 }
 
 void CFX_Edit::AddUndoItem(IFX_Edit_UndoItem* pUndoItem) {
   m_Undo.AddItem(pUndoItem);
   if (m_bOprNotify && m_pOprNotify)
     m_pOprNotify->OnAddUndo(pUndoItem);
 }