FX Bool considered harmful, part 3

fpdfsdk/src/javascript/JS_GlobalData.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/fdrm/fx_crypt.h"
 #include "../../include/javascript/JavaScript.h"
 #include "../../include/javascript/IJavaScript.h"
 #include "../../include/javascript/JS_GlobalData.h"
@@ skipping 278 matching lines @@
     else
     {
         CJS_GlobalData_Element* pNewData = new CJS_GlobalData_Element;
         pNewData->data.sKey = sPropName;
         pNewData->data.nType = JS_GLOBALDATA_TYPE_NULL;
 
         m_arrayGlobalData.Add(pNewData);
     }
 }
 
-FX_BOOL CJS_GlobalData::SetGlobalVariablePersistent(const FX_CHAR* propname, FX_BOOL bPersistent)
+bool CJS_GlobalData::SetGlobalVariablePersistent(const FX_CHAR* propname, bool bPersistent)
 {
     ASSERT(propname != NULL);
     CFX_ByteString sPropName = propname;
 
     sPropName.TrimLeft();
     sPropName.TrimRight();
 
-    if (sPropName.GetLength() == 0) return FALSE;
+    if (sPropName.GetLength() == 0) return false;
 
     if (CJS_GlobalData_Element* pData = GetGlobalVariable(sPropName))
     {
         pData->bPersistent = bPersistent;
-        return TRUE;
+        return true;
     }
 
-    return FALSE;
+    return false;
 }
 
-FX_BOOL CJS_GlobalData::DeleteGlobalVariable(const FX_CHAR* propname)
+bool CJS_GlobalData::DeleteGlobalVariable(const FX_CHAR* propname)
 {
     ASSERT(propname != NULL);
     CFX_ByteString sPropName = propname;
 
     sPropName.TrimLeft();
     sPropName.TrimRight();
 
-    if (sPropName.GetLength() == 0) return FALSE;
+    if (sPropName.GetLength() == 0) return false;
 
     int nFind = FindGlobalVariable(sPropName);
 
     if (nFind >= 0)
     {
         delete m_arrayGlobalData.GetAt(nFind);
         m_arrayGlobalData.RemoveAt(nFind);
-        return TRUE;
+        return true;
     }
 
-    return FALSE;
+    return false;
 }
 
 int32_t CJS_GlobalData::GetSize() const
 {
     return m_arrayGlobalData.GetSize();
 }
 
 CJS_GlobalData_Element* CJS_GlobalData::GetAt(int index) const
 {
     return m_arrayGlobalData.GetAt(index);
@@ skipping 62 matching lines @@
                                 }
                                 break;
                             case 2:
                                 {
                                     dData = *((double*)p);
                                     p += sizeof(double);
                                 }
                                 break;
                             }
                             SetGlobalVariableNumber(sEntry, dData);
-                            SetGlobalVariablePersistent(sEntry, TRUE);
+                            SetGlobalVariablePersistent(sEntry, true);
                         }
                         break;
                     case JS_GLOBALDATA_TYPE_BOOLEAN:
                         {
                             FX_WORD wData = *((FX_WORD*)p);
                             p += sizeof(FX_WORD);
                             SetGlobalVariableBoolean(sEntry, (bool)(wData == 1));
-                            SetGlobalVariablePersistent(sEntry, TRUE);
+                            SetGlobalVariablePersistent(sEntry, true);
                         }
                         break;
                     case JS_GLOBALDATA_TYPE_STRING:
                         {
                             FX_DWORD dwLength = *((FX_DWORD*)p);
                             p += sizeof(FX_DWORD);
 
                             if (p + dwLength > pBuffer + nLength)
                                 break;
 
                             SetGlobalVariableString(sEntry, CFX_ByteString(p, dwLength));
-                            SetGlobalVariablePersistent(sEntry, TRUE);
+                            SetGlobalVariablePersistent(sEntry, true);
                             p += sizeof(char) * dwLength;
                         }
                         break;
                     case JS_GLOBALDATA_TYPE_NULL:
                         {
                             SetGlobalVariableNull(sEntry);
-                            SetGlobalVariablePersistent(sEntry, TRUE);
+                            SetGlobalVariablePersistent(sEntry, true);
                         }
                     }
                 }
             }
         }
         FX_Free(pBuffer);
     }
 }
 
 /*
@@ skipping 107 matching lines @@
             sData.AppendBlock(&dwNameLen, sizeof(FX_DWORD));
             sData.AppendString(name);
             sData.AppendBlock(&wType, sizeof(FX_DWORD));
         }
         break;
     default:
         break;
     }
 }