FX_BOOL considered harmful, part 2.

fpdfsdk/src/javascript/event.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 "../../include/javascript/JavaScript.h"
 #include "../../include/javascript/IJavaScript.h"
 #include "../../include/javascript/JS_Define.h"
 #include "../../include/javascript/JS_Object.h"
@@ skipping 38 matching lines @@
 IMPLEMENT_JS_CLASS(CJS_Event,event)
 
 event::event(CJS_Object * pJsObject) : CJS_EmbedObj(pJsObject)
 {
 }
 
 event::~event(void)
 {
 }
 
-FX_BOOL event::change(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool event::change(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         CJS_Context* pContext = (CJS_Context*)cc;
         ASSERT(pContext != NULL);
         CJS_EventHandler* pEvent = pContext->GetEventHandler();
         ASSERT(pEvent != NULL);
 
         CFX_WideString &wChange = pEvent->Change();
         if (vp.IsSetting())
         {
                 if (vp.GetType() == VT_string)
                         vp >> wChange;
         }
         else
         {
                 vp << wChange;
         }
-        return TRUE;
+        return true;
 }
 
-FX_BOOL event::changeEx(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool event::changeEx(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
-        if (!vp.IsGetting())return FALSE;
+        if (!vp.IsGetting())return false;
 
         CJS_Context* pContext = (CJS_Context*)cc;
         ASSERT(pContext != NULL);
         CJS_EventHandler* pEvent = pContext->GetEventHandler();
         ASSERT(pEvent != NULL);
 
         vp << pEvent->ChangeEx();
-        return TRUE;
+        return true;
 }
 
-FX_BOOL event::commitKey(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool event::commitKey(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
-        if (!vp.IsGetting())return FALSE;
+        if (!vp.IsGetting())return false;
 
         CJS_Context* pContext = (CJS_Context*)cc;
         ASSERT(pContext != NULL);
         CJS_EventHandler* pEvent = pContext->GetEventHandler();
         ASSERT(pEvent != NULL);
 
         vp << pEvent->CommitKey();
-        return TRUE;
+        return true;
 }
 
-FX_BOOL event::fieldFull(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool event::fieldFull(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         CJS_Context* pContext = (CJS_Context*)cc;
         ASSERT(pContext != NULL);
         CJS_EventHandler* pEvent = pContext->GetEventHandler();
         ASSERT(pEvent != NULL);
 
         if (!vp.IsGetting() && wcscmp((const wchar_t*)pEvent->Name(),L"Keystroke") != 0)
-                return FALSE;
+                return false;
 
         if (pEvent->FieldFull())
-                vp << TRUE;
+                vp << true;
         else
-                vp << FALSE;
-        return TRUE;
+                vp << false;
+        return true;
 }
 
-FX_BOOL event::keyDown(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool event::keyDown(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
-        if (!vp.IsGetting())return FALSE;
+        if (!vp.IsGetting())return false;
 
         CJS_Context* pContext = (CJS_Context*)cc;
         ASSERT(pContext != NULL);
         CJS_EventHandler* pEvent = pContext->GetEventHandler();
         ASSERT(pEvent != NULL);
 
         if (pEvent->KeyDown())
-                vp << TRUE;
+                vp << true;
         else
-                vp << FALSE;
-        return TRUE;
+                vp << false;
+        return true;
 }
 
-FX_BOOL event::modifier(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool event::modifier(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
-        if (!vp.IsGetting())return FALSE;
+        if (!vp.IsGetting())return false;
 
         CJS_Context* pContext = (CJS_Context*)cc;
         ASSERT(pContext != NULL);
         CJS_EventHandler* pEvent = pContext->GetEventHandler();
         ASSERT(pEvent != NULL);
 
         if (pEvent->Modifier())
-                vp << TRUE;
+                vp << true;
         else
-                vp << FALSE;
-        return TRUE;
+                vp << false;
+        return true;
 }
 
-FX_BOOL event::name(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool event::name(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
-        if (!vp.IsGetting())return FALSE;
+        if (!vp.IsGetting())return false;
 
         CJS_Context* pContext = (CJS_Context*)cc;
         ASSERT(pContext != NULL);
         CJS_EventHandler* pEvent = pContext->GetEventHandler();
         ASSERT(pEvent != NULL);
 
         vp << pEvent->Name();
-        return TRUE;
+        return true;
 }
 
-FX_BOOL event::rc(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool event::rc(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         CJS_Context* pContext = (CJS_Context*)cc;
         ASSERT(pContext != NULL);
         CJS_EventHandler* pEvent = pContext->GetEventHandler();
         ASSERT(pEvent != NULL);
 
-    FX_BOOL &bRc = pEvent->Rc();
+    bool &bRc = pEvent->Rc();
         if (vp.IsSetting())
         {
                 vp>>bRc;
         }
         else
         {
                 vp<<bRc;
         }
-        return TRUE;
+        return true;
 }
 
-FX_BOOL event::richChange(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool event::richChange(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
-        return TRUE;
+        return true;
         if (vp.IsSetting())
         {
         }
         else
         {
                 ;
         }
-        return TRUE;
+        return true;
 }
 
-FX_BOOL event::richChangeEx(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool event::richChangeEx(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
-        return TRUE;
+        return true;
         if (vp.IsSetting())
         {
         }
         else
         {
                 ;
         }
-        return TRUE;
+        return true;
 }
 
 
-FX_BOOL event::richValue(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool event::richValue(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
-        return TRUE;
+        return true;
         if (vp.IsSetting())
         {
         }
         else
         {
                 ;
         }
-        return TRUE;
+        return true;
 }
 
-FX_BOOL event::selEnd(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool event::selEnd(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         CJS_Context* pContext = (CJS_Context*)cc;
         ASSERT(pContext != NULL);
         CJS_EventHandler* pEvent = pContext->GetEventHandler();
         ASSERT(pEvent != NULL);
 
         if (wcscmp((const wchar_t*)pEvent->Name(),L"Keystroke") != 0)
         {
-                return TRUE;
+                return true;
         }
 
         int &iSelEnd = pEvent->SelEnd();
         if (vp.IsSetting())
         {
                 vp >> iSelEnd;
         }
         else
         {
                 vp << iSelEnd;
         }
-        return TRUE;
+        return true;
 }
 
-FX_BOOL event::selStart(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool event::selStart(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         CJS_Context* pContext = (CJS_Context*)cc;
         ASSERT(pContext != NULL);
         CJS_EventHandler* pEvent = pContext->GetEventHandler();
         ASSERT(pEvent != NULL);
 
         if (wcscmp((const wchar_t*)pEvent->Name(),L"Keystroke") != 0)
         {
-                return TRUE;
+                return true;
         }
         int &iSelStart = pEvent->SelStart();
         if (vp.IsSetting())
         {
                 vp >> iSelStart;
         }
         else
         {
                 vp << iSelStart;
         }
-        return TRUE;
+        return true;
 }
 
-FX_BOOL event::shift(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool event::shift(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
-        if (!vp.IsGetting())return FALSE;
+        if (!vp.IsGetting())return false;
 
         CJS_Context* pContext = (CJS_Context*)cc;
         ASSERT(pContext != NULL);
         CJS_EventHandler* pEvent = pContext->GetEventHandler();
         ASSERT(pEvent != NULL);
 
         if (pEvent->Shift())
-                vp << TRUE;
+                vp << true;
         else
-                vp << FALSE;
-        return TRUE;
+                vp << false;
+        return true;
 }
 
-FX_BOOL event::source(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool event::source(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
-        if (!vp.IsGetting())return FALSE;
+        if (!vp.IsGetting())return false;
 
         CJS_Context* pContext = (CJS_Context*)cc;
         ASSERT(pContext != NULL);
         CJS_EventHandler* pEvent = pContext->GetEventHandler();
         ASSERT(pEvent != NULL);
 
         vp << pEvent->Source()->GetJSObject();
-        return TRUE;
+        return true;
 }
 
-FX_BOOL event::target(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool event::target(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
-        if (!vp.IsGetting())return FALSE;
+        if (!vp.IsGetting())return false;
 
         CJS_Context* pContext = (CJS_Context*)cc;
         ASSERT(pContext != NULL);
         CJS_EventHandler* pEvent = pContext->GetEventHandler();
         ASSERT(pEvent != NULL);
 
         vp<<pEvent->Target_Field()->GetJSObject();
-        return TRUE;
+        return true;
 }
 
-FX_BOOL event::targetName(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool event::targetName(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
-        if (!vp.IsGetting())return FALSE;
+        if (!vp.IsGetting())return false;
 
         CJS_Context* pContext = (CJS_Context*)cc;
         ASSERT(pContext != NULL);
         CJS_EventHandler* pEvent = pContext->GetEventHandler();
         ASSERT(pEvent != NULL);
 
         vp << pEvent->TargetName();
-        return TRUE;
+        return true;
 }
 
-FX_BOOL event::type(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool event::type(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
-        if (!vp.IsGetting())return FALSE;
+        if (!vp.IsGetting())return false;
 
         CJS_Context* pContext = (CJS_Context*)cc;
         ASSERT(pContext != NULL);
         CJS_EventHandler* pEvent = pContext->GetEventHandler();
         ASSERT(pEvent != NULL);
 
         vp << pEvent->Type();
-        return TRUE;
+        return true;
 }
 
-FX_BOOL event::value(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool event::value(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         CJS_Context* pContext = (CJS_Context*)cc;
         ASSERT(pContext != NULL);
         CJS_EventHandler* pEvent = pContext->GetEventHandler();
         ASSERT(pEvent != NULL);
 
         if (wcscmp((const wchar_t*)pEvent->Type(),L"Field") != 0)
-                return FALSE;
+                return false;
         if(!pEvent->m_pValue)
-                return FALSE;
+                return false;
         CFX_WideString & val = pEvent->Value();
         if (vp.IsSetting())
         {
                 vp >> val;
         }
         else
         {
                 vp << val;
         }
-        return TRUE;
+        return true;
 }
 
-FX_BOOL event::willCommit(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool event::willCommit(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
-        if (!vp.IsGetting())return FALSE;
+        if (!vp.IsGetting())return false;
 
         CJS_Context* pContext = (CJS_Context*)cc;
         ASSERT(pContext != NULL);
         CJS_EventHandler* pEvent = pContext->GetEventHandler();
         ASSERT(pEvent != NULL);
 
         if (pEvent->WillCommit())
-                vp << TRUE;
+                vp << true;
         else
-                vp << FALSE;
-        return TRUE;
+                vp << false;
+        return true;
 }