Merge to XFA: Get rid of most instance of 'foo != NULL'

core/src/fpdfdoc/doc_action.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 "core/include/fpdfdoc/fpdf_doc.h"
 
 CPDF_Dest CPDF_Action::GetDest(CPDF_Document* pDoc) const {
   if (!m_pDict) {
@@ skipping 16 matching lines @@
     return CPDF_Dest(pArray);
   return CPDF_Dest();
 }
 const FX_CHAR* g_sATypes[] = {
     "Unknown",     "GoTo",       "GoToR",     "GoToE",      "Launch",
     "Thread",      "URI",        "Sound",     "Movie",      "Hide",
     "Named",       "SubmitForm", "ResetForm", "ImportData", "JavaScript",
     "SetOCGState", "Rendition",  "Trans",     "GoTo3DView", ""};
 CPDF_Action::ActionType CPDF_Action::GetType() const {
   ActionType eType = Unknown;
-  if (m_pDict != NULL) {
+  if (m_pDict) {
     CFX_ByteString csType = m_pDict->GetString("S");
     if (!csType.IsEmpty()) {
       int i = 0;
       while (g_sATypes[i][0] != '\0') {
         if (csType == g_sATypes[i]) {
           return (ActionType)i;
         }
         i++;
       }
     }
@@ skipping 25 matching lines @@
   CFX_ByteString csURI;
   if (m_pDict == NULL) {
     return csURI;
   }
   if (m_pDict->GetString("S") != "URI") {
     return csURI;
   }
   csURI = m_pDict->GetString("URI");
   CPDF_Dictionary* pRoot = pDoc->GetRoot();
   CPDF_Dictionary* pURI = pRoot->GetDict("URI");
-  if (pURI != NULL) {
+  if (pURI) {
     if (csURI.Find(":", 0) < 1) {
       csURI = pURI->GetString("Base") + csURI;
     }
   }
   return csURI;
 }
 FX_DWORD CPDF_ActionFields::GetFieldsCount() const {
   if (m_pAction == NULL) {
     return 0;
   }
@@ skipping 78 matching lines @@
   }
   return pFindObj;
 }
 
 CFX_WideString CPDF_Action::GetJavaScript() const {
   CFX_WideString csJS;
   if (m_pDict == NULL) {
     return csJS;
   }
   CPDF_Object* pJS = m_pDict->GetElementValue("JS");
-  if (pJS != NULL) {
-    return pJS->GetUnicodeText();
-  }
-  return csJS;
+  return pJS ? pJS->GetUnicodeText() : csJS;
 }
 CPDF_Dictionary* CPDF_Action::GetAnnot() const {
   if (!m_pDict) {
     return nullptr;
   }
   CFX_ByteString csType = m_pDict->GetString("S");
   if (csType == "Rendition") {
     return m_pDict->GetDict("AN");
   }
   if (csType == "Movie") {
@@ skipping 95 matching lines @@
     }
     i++;
   }
   eType = (AActionType)i;
   return CPDF_Action(pDict);
 }
 
 CPDF_DocJSActions::CPDF_DocJSActions(CPDF_Document* pDoc) : m_pDocument(pDoc) {}
 
 int CPDF_DocJSActions::CountJSActions() const {
-  ASSERT(m_pDocument != NULL);
+  ASSERT(m_pDocument);
   CPDF_NameTree name_tree(m_pDocument, "JavaScript");
   return name_tree.GetCount();
 }
 CPDF_Action CPDF_DocJSActions::GetJSAction(int index,
                                            CFX_ByteString& csName) const {
-  ASSERT(m_pDocument != NULL);
+  ASSERT(m_pDocument);
   CPDF_NameTree name_tree(m_pDocument, "JavaScript");
   CPDF_Object* pAction = name_tree.LookupValue(index, csName);
   if (!ToDictionary(pAction)) {
     return CPDF_Action();
   }
   return CPDF_Action(pAction->GetDict());
 }
 CPDF_Action CPDF_DocJSActions::GetJSAction(const CFX_ByteString& csName) const {
-  ASSERT(m_pDocument != NULL);
+  ASSERT(m_pDocument);
   CPDF_NameTree name_tree(m_pDocument, "JavaScript");
   CPDF_Object* pAction = name_tree.LookupValue(csName);
   if (!ToDictionary(pAction)) {
     return CPDF_Action();
   }
   return CPDF_Action(pAction->GetDict());
 }
 int CPDF_DocJSActions::FindJSAction(const CFX_ByteString& csName) const {
-  ASSERT(m_pDocument != NULL);
+  ASSERT(m_pDocument);
   CPDF_NameTree name_tree(m_pDocument, "JavaScript");
   return name_tree.GetIndex(csName);
 }