FX_BOOL considered harmful, part 2.

fpdfsdk/src/fpdf_ext.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/fxcrt/fx_xml.h"
 #include "../../public/fpdf_ext.h"
 #include "../include/fsdk_define.h"
 
 #define  FPDFSDK_UNSUPPORT_CALL 100
 
 class CFSDK_UnsupportInfo_Adapter
 {
 public:
     CFSDK_UnsupportInfo_Adapter(UNSUPPORT_INFO* unsp_info){ m_unsp_info = unsp_info;}
-//  FX_BOOL NeedToPauseNow();
+//  bool NeedToPauseNow();
     void ReportError(int nErrorType);
 
 private:
     UNSUPPORT_INFO* m_unsp_info;
 };
 
 void CFSDK_UnsupportInfo_Adapter::ReportError(int nErrorType)
 {
     if(m_unsp_info && m_unsp_info->FSDK_UnSupport_Handler)
     {
         m_unsp_info->FSDK_UnSupport_Handler(m_unsp_info,nErrorType);
     }
 }
 
 void FreeUnsupportInfo(void* pData)
 {
     CFSDK_UnsupportInfo_Adapter * pAdapter = (CFSDK_UnsupportInfo_Adapter *)pData;
     delete pAdapter;
 }
 
-FX_BOOL FPDF_UnSupportError(int nError)
+bool FPDF_UnSupportError(int nError)
 {
     CFSDK_UnsupportInfo_Adapter * pAdapter = (CFSDK_UnsupportInfo_Adapter *)CPDF_ModuleMgr::Get()->GetPrivateData((void *)FPDFSDK_UNSUPPORT_CALL);
 
     if(!pAdapter)
-        return FALSE;
+        return false;
     pAdapter->ReportError(nError);
-    return TRUE;
+    return true;
 }
 
 DLLEXPORT FPDF_BOOL STDCALL FSDK_SetUnSpObjProcessHandler(UNSUPPORT_INFO* unsp_info)
 {
     if (!unsp_info || unsp_info->version!=1)
-        return FALSE;
+        return false;
     CFSDK_UnsupportInfo_Adapter * pAdapter = new CFSDK_UnsupportInfo_Adapter(unsp_info);
 
     CPDF_ModuleMgr::Get()->SetPrivateData((void *)FPDFSDK_UNSUPPORT_CALL,pAdapter, &FreeUnsupportInfo);
 
-    return TRUE;
+    return true;
 }
 
 void CheckUnSupportAnnot(CPDF_Document * pDoc, CPDF_Annot* pPDFAnnot)
 {
     CFX_ByteString cbSubType = pPDFAnnot->GetSubType();
     if(cbSubType.Compare("3D") == 0)
     {
         FPDF_UnSupportError(FPDF_UNSP_ANNOT_3DANNOT);
     }
     else if(cbSubType.Compare("Screen") ==0)
@@ skipping 30 matching lines @@
             cbString = pAnnotDict->GetString("FT");
         }
         if(cbString.Compare("Sig") == 0)
         {
             FPDF_UnSupportError(FPDF_UNSP_ANNOT_SIG);
         }
     }
 
 }
 
-FX_BOOL CheckSharedForm(CXML_Element * pElement, CFX_ByteString cbName)
+bool CheckSharedForm(CXML_Element * pElement, CFX_ByteString cbName)
 {
     int count = pElement->CountAttrs();
     int i=0;
     for (i = 0; i < count; i++)
     {
         CFX_ByteString space, name;
         CFX_WideString value;
         pElement->GetAttrByIndex(i, space, name, value);
         if (space == FX_BSTRC("xmlns") && name == FX_BSTRC("adhocwf") && value ==  L"http://ns.adobe.com/AcrobatAdhocWorkflow/1.0/")
         {
@@ skipping 18 matching lines @@
     }
 
     FX_DWORD nCount = pElement->CountChildren();
     for(i=0; i<(int)nCount; i++)
     {
         CXML_Element::ChildType childType = pElement->GetChildType(i);
         if(childType == CXML_Element::Element)
         {
             CXML_Element * pChild = pElement->GetElement(i);
             if(CheckSharedForm(pChild, cbName))
-                return TRUE;
+                return true;
         }
     }
-    return FALSE;
+    return false;
 }
 
 void CheckUnSupportError(CPDF_Document * pDoc, FX_DWORD err_code)
 {
     // Security
     if(err_code == FPDF_ERR_SECURITY)
     {
         FPDF_UnSupportError(FPDF_UNSP_DOC_SECURITY);
         return ;
     }
@@ skipping 39 matching lines @@
     }
 
     // SharedForm
     CPDF_Metadata metaData;
     metaData.LoadDoc(pDoc);
     CXML_Element * pElement = metaData.GetRoot();
     if(pElement)
         CheckSharedForm(pElement, "workflowType");
 
     // XFA Forms
-    CPDF_InterForm * pInterForm = new CPDF_InterForm(pDoc,FALSE);
+    CPDF_InterForm * pInterForm = new CPDF_InterForm(pDoc,false);
     if (pInterForm->HasXFAForm())
     {
         FPDF_UnSupportError(FPDF_UNSP_DOC_XFAFORM);
     }
     delete pInterForm;
 }
 
 DLLEXPORT int FPDFDoc_GetPageMode(FPDF_DOCUMENT document)
 {
     if (!document)
@@ skipping 16 matching lines @@
         return PAGEMODE_USETHUMBS;
     if (strPageMode.EqualNoCase("FullScreen"))
         return PAGEMODE_FULLSCREEN;
     if (strPageMode.EqualNoCase("UseOC"))
         return PAGEMODE_USEOC;
     if (strPageMode.EqualNoCase("UseAttachments"))
         return PAGEMODE_USEATTACHMENTS;
 
     return PAGEMODE_UNKNOWN;
 }