FX_BOOL considered harmful, part 2.

fpdfsdk/src/pdfwindow/PWL_FontMap.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/pdfwindow/PDFWindow.h"
 #include "../../include/pdfwindow/PWL_Wnd.h"
 #include "../../include/pdfwindow/PWL_FontMap.h"
 
@@ skipping 54 matching lines @@
     {
         if (CPWL_FontMap_Data* pData = m_aData.GetAt(nFontIndex))
         {
             return pData->sFontName;
         }
     }
 
     return "";
 }
 
-FX_BOOL CPWL_FontMap::KnowWord(int32_t nFontIndex, FX_WORD word)
+bool CPWL_FontMap::KnowWord(int32_t nFontIndex, FX_WORD word)
 {
     if (nFontIndex >=0 && nFontIndex < m_aData.GetSize())
     {
         if (m_aData.GetAt(nFontIndex))
         {
             return CharCodeFromUnicode(nFontIndex, word) >= 0;
         }
     }
 
-    return FALSE;
+    return false;
 }
 
 int32_t CPWL_FontMap::GetWordFontIndex(FX_WORD word, int32_t nCharset, int32_t nFontIndex)
 {
     if (nFontIndex > 0)
     {
         if (KnowWord(nFontIndex, word))
             return nFontIndex;
     }
     else
     {
         if (const CPWL_FontMap_Data* pData = GetFontMapData(0))
         {
             if (nCharset == DEFAULT_CHARSET ||
                 pData->nCharset == SYMBOL_CHARSET ||
                 nCharset == pData->nCharset)
             {
                 if (KnowWord(0, word))
                     return 0;
             }
         }
     }
 
-    int32_t nNewFontIndex = GetFontIndex(GetNativeFontName(nCharset), nCharset, TRUE);
+    int32_t nNewFontIndex = GetFontIndex(GetNativeFontName(nCharset), nCharset, true);
     if (nNewFontIndex >= 0)
     {
         if (KnowWord(nNewFontIndex, word))
             return nNewFontIndex;
     }
-    nNewFontIndex = GetFontIndex("Arial Unicode MS", DEFAULT_CHARSET, FALSE);
+    nNewFontIndex = GetFontIndex("Arial Unicode MS", DEFAULT_CHARSET, false);
     if (nNewFontIndex >= 0)
     {
         if (KnowWord(nNewFontIndex, word))
             return nNewFontIndex;
     }
     return -1;
 }
 
 int32_t CPWL_FontMap::CharCodeFromUnicode(int32_t nFontIndex, FX_WORD word)
 {
@@ skipping 56 matching lines @@
     }
 }
 
 void CPWL_FontMap::Initial(const FX_CHAR* fontname)
 {
     CFX_ByteString sFontName = fontname;
 
     if (sFontName.IsEmpty())
         sFontName = DEFAULT_FONT_NAME;
 
-    GetFontIndex(sFontName, ANSI_CHARSET, FALSE);
+    GetFontIndex(sFontName, ANSI_CHARSET, false);
 }
 
 
 /*
 List of currently supported standard fonts:
 Courier, Courier-Bold, Courier-BoldOblique, Courier-Oblique
 Helvetica, Helvetica-Bold, Helvetica-BoldOblique, Helvetica-Oblique
 Times-Roman, Times-Bold, Times-Italic, Times-BoldItalic
 Symbol, ZapfDingbats
 */
 
 const char* g_sDEStandardFontName[] = {"Courier", "Courier-Bold", "Courier-BoldOblique", "Courier-Oblique",
     "Helvetica", "Helvetica-Bold", "Helvetica-BoldOblique", "Helvetica-Oblique",
     "Times-Roman", "Times-Bold", "Times-Italic", "Times-BoldItalic",
     "Symbol", "ZapfDingbats"};
 
-FX_BOOL CPWL_FontMap::IsStandardFont(const CFX_ByteString& sFontName)
+bool CPWL_FontMap::IsStandardFont(const CFX_ByteString& sFontName)
 {
     for (int32_t i=0; i<14; i++)
     {
         if (sFontName == g_sDEStandardFontName[i])
-            return TRUE;
+            return true;
     }
 
-    return FALSE;
+    return false;
 }
 
 int32_t CPWL_FontMap::FindFont(const CFX_ByteString& sFontName, int32_t nCharset)
 {
     for (int32_t i=0,sz=m_aData.GetSize(); i<sz; i++)
     {
         if (CPWL_FontMap_Data* pData = m_aData.GetAt(i))
         {
             if (nCharset == DEFAULT_CHARSET || nCharset == pData->nCharset)
             {
                 if (sFontName.IsEmpty() || pData->sFontName == sFontName)
                     return i;
             }
         }
     }
 
     return -1;
 }
 
-int32_t CPWL_FontMap::GetFontIndex(const CFX_ByteString& sFontName, int32_t nCharset, FX_BOOL bFind)
+int32_t CPWL_FontMap::GetFontIndex(const CFX_ByteString& sFontName, int32_t nCharset, bool bFind)
 {
     int32_t nFontIndex = FindFont(EncodeFontAlias(sFontName, nCharset), nCharset);
     if (nFontIndex >= 0)
         return nFontIndex;
 
     CFX_ByteString sAlias;
     CPDF_Font* pFont = NULL;
     if (bFind)
         pFont = FindFontSameCharset(sAlias, nCharset);
 
@@ skipping 311 matching lines @@
 }
 
 CPWL_DocFontMap::~CPWL_DocFontMap()
 {
 }
 
 CPDF_Document* CPWL_DocFontMap::GetDocument()
 {
     return m_pAttachedDoc;
 }