FX_BOOL considered harmful, part 2.

fpdfsdk/src/formfiller/FFL_Utils.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 <algorithm>
 
 #include "../../include/formfiller/FormFiller.h"
 #include "../../include/formfiller/FFL_Utils.h"
@@ skipping 23 matching lines @@
 CPDF_Rect CFFL_Utils::DeflateRect(const CPDF_Rect & crRect,const FX_FLOAT & fSize)
 {
         CPDF_Rect crNew(crRect.left + fSize,
                                         crRect.bottom + fSize,
                                         crRect.right - fSize,
                                         crRect.top - fSize);
         crNew.Normalize();
         return crNew;
 }
 
-FX_BOOL CFFL_Utils::TraceObject(CPDF_Object* pObj)
+bool CFFL_Utils::TraceObject(CPDF_Object* pObj)
 {
-        if (!pObj) return FALSE;
+        if (!pObj) return false;
 
         FX_DWORD        dwObjNum = pObj->GetObjNum();
         switch (pObj->GetType())
         {
         case PDFOBJ_ARRAY:
                 {
                         CPDF_Array* pArray = (CPDF_Array*)pObj;
                         for (FX_DWORD i = 0; i < pArray->GetCount(); i ++)
                         {
                                 CPDF_Object* pElement = pArray->GetElementValue(i);
                                 TraceObject(pElement);
                         }
                 }
                 break;
 
         case PDFOBJ_DICTIONARY:
                 {
                         CPDF_Dictionary* pDict = (CPDF_Dictionary*)pObj;
 
                         FX_POSITION fPos = pDict->GetStartPos();
                         CFX_ByteString csKey;
                         do
                         {
                                 CPDF_Object* pElement = pDict->GetNextElement(fPos, csKey);
                                 //TRACE(csKey + "\n");
                                 if (!pElement) break;
                                 TraceObject(pElement);
-                        }while (TRUE);
+                        }while (true);
                 }
                 break;
 
         case PDFOBJ_STREAM:
                 {
                         CPDF_Stream* pStream = (CPDF_Stream*)pObj;
                         CPDF_Dictionary* pDict = pStream->GetDict();
                         TraceObject(pDict);
                 }
                 break;
@@ skipping 15 matching lines @@
                 break;
         case PDFOBJ_NAME:
                 //TRACE(((CPDF_Name*)pObj)->GetString() + "\n");
                 break;
         case PDFOBJ_NULL:
 //      case PDFOBJ_KEYWORD:
 //      case PDFOBJ_EOF:
         default:
                 break;
         }
-        if (dwObjNum == 0) return FALSE;
+        if (dwObjNum == 0) return false;
 
-        return TRUE;
+        return true;
 }