commit 1cd352e0a4bc19f96df199b0acfa32a344240d5e
author thestig <thestig@chromium.org> Tue Jun 07 17:53:06 2016 -0700
committer Commit bot <commit-bot@chromium.org> Tue Jun 07 17:53:06 2016 -0700
tree be24d7a4bd135c2ab5568148ab318b7bf648edda
parent a4fdfc5ed0e8d2e6acc52cc34eac42c6072f0ccc

Get rid of NULLs in fpdfsdk/

Review-Url: https://codereview.chromium.org/2031653003

fpdfsdk/fpdfxfa/fpdfxfa_app.cpp

diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp
index fc15c3b..ffc4e53 100644
--- a/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp
+++ b/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp
@@ -14,7 +14,7 @@
 #include "xfa/fxfa/include/xfa_ffapp.h"
 #include "xfa/fxfa/include/xfa_fontmgr.h"
 
-CPDFXFA_App* CPDFXFA_App::g_pApp = NULL;
+CPDFXFA_App* CPDFXFA_App::g_pApp = nullptr;
 
 CPDFXFA_App* CPDFXFA_App::GetInstance() {
   if (!g_pApp) {
@@ -25,12 +25,12 @@
 
 void CPDFXFA_App::ReleaseInstance() {
   delete g_pApp;
-  g_pApp = NULL;
+  g_pApp = nullptr;
 }
 
 CPDFXFA_App::CPDFXFA_App()
     : m_bJavaScriptInitialized(FALSE),
-      m_pXFAApp(NULL),
+      m_pXFAApp(nullptr),
       m_pIsolate(nullptr),
       m_csAppType(JS_STR_VIEWERTYPE_STANDARD) {
   m_pEnvList.RemoveAll();
@@ -38,7 +38,7 @@
 
 CPDFXFA_App::~CPDFXFA_App() {
   delete m_pXFAApp;
-  m_pXFAApp = NULL;
+  m_pXFAApp = nullptr;
 
   FXJSE_Runtime_Release(m_pIsolate);
   m_pIsolate = nullptr;
@@ -190,8 +190,8 @@
     int nLength = 2048;
     char* pBuff = new char[nLength];
     nLength = pEnv->JS_appResponse(wsQuestion.c_str(), wsTitle.c_str(),
-                                   wsDefaultAnswer.c_str(), NULL, bMark, pBuff,
-                                   nLength);
+                                   wsDefaultAnswer.c_str(), nullptr, bMark,
+                                   pBuff, nLength);
     if (nLength > 0) {
       nLength = nLength > 2046 ? 2046 : nLength;
       pBuff[nLength] = 0;
@@ -350,7 +350,7 @@
 }
 
 IFWL_AdapterTimerMgr* CPDFXFA_App::GetTimerMgr() {
-  CXFA_FWLAdapterTimerMgr* pAdapter = NULL;
+  CXFA_FWLAdapterTimerMgr* pAdapter = nullptr;
   CPDFDoc_Environment* pEnv = m_pEnvList.GetAt(0);
   if (pEnv)
     pAdapter = new CXFA_FWLAdapterTimerMgr(pEnv);