FX_BOOL considered harmful.

fpdfsdk/src/javascript/global.cpp

Index: fpdfsdk/src/javascript/global.cpp
diff --git a/fpdfsdk/src/javascript/global.cpp b/fpdfsdk/src/javascript/global.cpp
index 6eea290f6859fc1c4aeb5c1b2c064bfb3eecbcfd..9e650287c200aab45ad5b2bb60d11a42506df5c3 100644
--- a/fpdfsdk/src/javascript/global.cpp
+++ b/fpdfsdk/src/javascript/global.cpp
@@ -96,7 +96,7 @@ END_JS_STATIC_METHOD()
 
 IMPLEMENT_SPECIAL_JS_CLASS(CJS_Global, global_alternate, global);
 
-FX_BOOL	CJS_Global::InitInstance(IFXJS_Context* cc)
+bool	CJS_Global::InitInstance(IFXJS_Context* cc)
 {
 	CJS_Context* pContext = (CJS_Context*)cc;
 	ASSERT(pContext != NULL);
@@ -106,7 +106,7 @@ FX_BOOL	CJS_Global::InitInstance(IFXJS_Context* cc)
 
 	pGlobal->Initial(pContext->GetReaderApp());
 
-	return TRUE;
+	return true;
 };
 
 global_alternate::global_alternate(CJS_Object* pJSObject)
@@ -128,26 +128,26 @@ void global_alternate::Initial(CPDFDoc_Environment* pApp)
 	UpdateGlobalPersistentVariables();
 }
 
-FX_BOOL	global_alternate::QueryProperty(const FX_WCHAR* propname)
+bool	global_alternate::QueryProperty(const FX_WCHAR* propname)
 {
 	return CFX_WideString(propname) != L"setPersistent";
 }
 
-FX_BOOL	global_alternate::DelProperty(IFXJS_Context* cc, const FX_WCHAR* propname, CFX_WideString& sError)
+bool	global_alternate::DelProperty(IFXJS_Context* cc, const FX_WCHAR* propname, CFX_WideString& sError)
 {
 	js_global_data* pData = NULL;
 	CFX_ByteString sPropName = CFX_ByteString::FromUnicode(propname);
 
 	if (m_mapGlobal.Lookup(sPropName, (void*&)pData))
 	{
-		pData->bDeleted = TRUE;
-		return TRUE;
+		pData->bDeleted = true;
+		return true;
 	}
 
-	return FALSE;
+	return false;
 }
 
-FX_BOOL global_alternate::DoProperty(IFXJS_Context* cc, const FX_WCHAR* propname, CJS_PropValue& vp, CFX_WideString& sError)
+bool global_alternate::DoProperty(IFXJS_Context* cc, const FX_WCHAR* propname, CJS_PropValue& vp, CFX_WideString& sError)
 {
 	if (vp.IsSetting())
 	{
@@ -158,37 +158,37 @@ FX_BOOL global_alternate::DoProperty(IFXJS_Context* cc, const FX_WCHAR* propname
 			{
 				double dData;
 				vp >> dData;
-				return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_NUMBER, dData, false, "", v8::Local<v8::Object>(), FALSE);
+				return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_NUMBER, dData, false, "", v8::Local<v8::Object>(), false);
 			}
 		case VT_boolean:
 			{
 				bool bData;
 				vp >> bData;
-				return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_BOOLEAN, 0, bData, "", v8::Local<v8::Object>(), FALSE);
+				return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_BOOLEAN, 0, bData, "", v8::Local<v8::Object>(), false);
 			}
 		case VT_string:
 			{
 				CFX_ByteString sData;
 				vp >> sData;
-				return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_STRING, 0, false, sData, v8::Local<v8::Object>(), FALSE);
+				return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_STRING, 0, false, sData, v8::Local<v8::Object>(), false);
 			}
 		case VT_object:
 			{
 				JSObject pData;
 				vp >> pData;
-				return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_OBJECT, 0, false, "", pData, FALSE);
+				return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_OBJECT, 0, false, "", pData, false);
 			}
 		case VT_null:
 			{
-				return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_NULL, 0, false, "", v8::Local<v8::Object>(), FALSE);
+				return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_NULL, 0, false, "", v8::Local<v8::Object>(), false);
 			}
 		case VT_undefined:
 			{
 				DelProperty(cc, propname, sError);
-				return TRUE;
+				return true;
 			}
 		default:
-			return FALSE;
+			return false;
 		}
 	}
 	else
@@ -223,38 +223,38 @@ FX_BOOL global_alternate::DoProperty(IFXJS_Context* cc, const FX_WCHAR* propname
 						vp.SetNull();
 						break;
 					default:
-						return FALSE;
+						return false;
 					}
-					return TRUE;
+					return true;
 				}
 				else
 				{
-					return TRUE;
+					return true;
 				}
 			}
 			else
 			{
 				vp.SetNull();
-				return TRUE;
+				return true;
 			}
 		}
 		else
 		{
 			vp.SetNull();
-			return TRUE;
+			return true;
 		}
 	}
 
-	return FALSE;
+	return false;
 }
 
-FX_BOOL global_alternate::setPersistent(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool global_alternate::setPersistent(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
 	CJS_Context* pContext = static_cast<CJS_Context*>(cc);
 	if (params.size() != 2)
 	{
 		sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
-		return FALSE;
+		return false;
 	}
 
 	CFX_ByteString sName = params[0].ToCFXByteString();
@@ -265,12 +265,12 @@ FX_BOOL global_alternate::setPersistent(IFXJS_Context* cc, const CJS_Parameters&
 		if (pData && !pData->bDeleted)
 		{
 			pData->bPersistent = params[1].ToBool();
-			return TRUE;
+			return true;
 		}
 	}
 
 	sError = JSGetStringFromID(pContext, IDS_STRING_JSNOGLOBAL);
-	return FALSE;
+	return false;
 }
 
 void global_alternate::UpdateGlobalPersistentVariables()
@@ -493,10 +493,10 @@ void global_alternate::DestroyGlobalPersisitentVariables()
 }
 
 
-FX_BOOL global_alternate::SetGlobalVariables(const FX_CHAR* propname, int nType,
+bool global_alternate::SetGlobalVariables(const FX_CHAR* propname, int nType,
 				double dData, bool bData, const CFX_ByteString& sData, JSObject pData, bool bDefaultPersistent)
 {
-	if (propname == NULL) return FALSE;
+	if (propname == NULL) return false;
 
 	js_global_data* pTemp = NULL;
 	m_mapGlobal.Lookup(propname, (void*&)pTemp);
@@ -511,7 +511,7 @@ FX_BOOL global_alternate::SetGlobalVariables(const FX_CHAR* propname, int nType,
 			pTemp->nType = nType;
 		}
 
-		pTemp->bDeleted = FALSE;
+		pTemp->bDeleted = false;
 
 		switch (nType)
 		{
@@ -538,10 +538,10 @@ FX_BOOL global_alternate::SetGlobalVariables(const FX_CHAR* propname, int nType,
 		case JS_GLOBALDATA_TYPE_NULL:
 			break;
 		default:
-			return FALSE;
+			return false;
 		}
 
-		return TRUE;
+		return true;
 	}
 
 	js_global_data* pNewData = NULL;
@@ -588,12 +588,12 @@ FX_BOOL global_alternate::SetGlobalVariables(const FX_CHAR* propname, int nType,
 		}
 		break;
 	default:
-		return FALSE;
+		return false;
 	}
 
 	m_mapGlobal.SetAt(propname, (void*)pNewData);
 
-	return TRUE;
+	return true;
 }
 
 FXJSVALUETYPE GET_VALUE_TYPE(v8::Local<v8::Value> p)