FX Bool considered harmful, part 3

fpdfsdk/src/pdfwindow/PWL_Signature.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_Icon.h"
 #include "../../include/pdfwindow/PWL_Signature.h"
@@ skipping 52 matching lines @@
         fHScale = rcClient.Width() / fImageW;
         fVScale = rcClient.Height() / fImageH;
 }
 
 /* --------------------------------- CPWL_Signature --------------------------------- */
 
 CPWL_Signature::CPWL_Signature() :
         m_pText(NULL),
         m_pDescription(NULL),
         m_pImage(NULL),
-        m_bTextExist(TRUE),
-        m_bImageExist(FALSE),
-        m_bFlagExist(TRUE)
+        m_bTextExist(true),
+        m_bImageExist(false),
+        m_bFlagExist(true)
 {
 }
 
 CPWL_Signature::~CPWL_Signature()
 {
 }
 
-void CPWL_Signature::SetTextFlag(FX_BOOL bTextExist)
+void CPWL_Signature::SetTextFlag(bool bTextExist)
 {
         m_bTextExist = bTextExist;
 
         RePosChildWnd();
 }
 
-void CPWL_Signature::SetImageFlag(FX_BOOL bImageExist)
+void CPWL_Signature::SetImageFlag(bool bImageExist)
 {
         m_bImageExist = bImageExist;
 
         RePosChildWnd();
 }
 
-void CPWL_Signature::SetFoxitFlag(FX_BOOL bFlagExist)
+void CPWL_Signature::SetFoxitFlag(bool bFlagExist)
 {
         m_bFlagExist = bFlagExist;
 }
 
 void CPWL_Signature::SetText(const FX_WCHAR* sText)
 {
         m_pText->SetText(sText);
 
         RePosChildWnd();
 }
@@ skipping 20 matching lines @@
         RePosChildWnd();
 }
 
 void CPWL_Signature::RePosChildWnd()
 {
         CPDF_Rect rcClient = GetClientRect();
 
         CPDF_Rect rcText = rcClient;
         CPDF_Rect rcDescription = rcClient;
 
-        FX_BOOL bTextVisible = m_bTextExist && m_pText->GetText().GetLength() > 0;
+        bool bTextVisible = m_bTextExist && m_pText->GetText().GetLength() > 0;
 
         if ((bTextVisible || m_bImageExist) &&
                 m_pDescription->GetText().GetLength() > 0)
         {
                 if (rcClient.Width() >= rcClient.Height())
                 {
                         rcText.right = rcText.left + rcClient.Width() / 2.0f;
                         rcDescription.left = rcDescription.right - rcClient.Width() / 2.0f;
                 }
                 else
                 {
                         rcText.bottom = rcText.top - rcClient.Height() / 2.0f;
                         rcDescription.top = rcDescription.bottom + rcClient.Height() / 2.0f;
                 }
         }
 
         m_pText->SetVisible(bTextVisible);
         m_pImage->SetVisible(m_bImageExist);
 
-        m_pText->Move(rcText, TRUE, FALSE);
-        m_pImage->Move(rcText, TRUE, FALSE);
-        m_pDescription->Move(rcDescription, TRUE, FALSE);
+        m_pText->Move(rcText, true, false);
+        m_pImage->Move(rcText, true, false);
+        m_pDescription->Move(rcDescription, true, false);
 }
 
 void CPWL_Signature::CreateChildWnd(const PWL_CREATEPARAM & cp)
 {
         m_pImage = new CPWL_Signature_Image;
         PWL_CREATEPARAM icp = cp;
         icp.pParentWnd = this;
         icp.dwFlags = PWS_CHILD | PWS_VISIBLE;
         icp.sTextColor = CPWL_Color(COLORTYPE_GRAY, 0);
         m_pImage->Create(icp);
@@ skipping 40 matching lines @@
         pDevice->DrawPath(&path, pUser2Device, &gsd, 0, ArgbEncode(255,255,0,0), FXFILL_ALTERNATE);
         */
 }
 
 void CPWL_Signature::GetThisAppearanceStream(CFX_ByteTextBuf & sAppStream)
 {
         CPWL_Wnd::GetThisAppearanceStream(sAppStream);
 }