From 320b2313d19869333ed453af546e61a9fc2b81c9 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 23 Jul 2015 13:26:26 -0700 Subject: FX_BOOL considered harmful, part 2. Fully automatic change, execpt for cleanup in fx_system.h R=thestig@chromium.org Review URL: https://codereview.chromium.org/1254703002 . --- fpdfsdk/src/fpdf_sysfontinfo.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'fpdfsdk/src/fpdf_sysfontinfo.cpp') diff --git a/fpdfsdk/src/fpdf_sysfontinfo.cpp b/fpdfsdk/src/fpdf_sysfontinfo.cpp index cf0cdd915b..691710798c 100644 --- a/fpdfsdk/src/fpdf_sysfontinfo.cpp +++ b/fpdfsdk/src/fpdf_sysfontinfo.cpp @@ -20,16 +20,16 @@ public: delete this; } - virtual FX_BOOL EnumFontList(CFX_FontMapper* pMapper) override + virtual bool EnumFontList(CFX_FontMapper* pMapper) override { if (m_pInfo->EnumFonts) { m_pInfo->EnumFonts(m_pInfo, pMapper); - return TRUE; + return true; } - return FALSE; + return false; } - virtual void* MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* family, int& iExact) override + virtual void* MapFont(int weight, bool bItalic, int charset, int pitch_family, const FX_CHAR* family, int& iExact) override { if (m_pInfo->MapFont) return m_pInfo->MapFont(m_pInfo, weight, bItalic, charset, pitch_family, family, &iExact); @@ -50,25 +50,25 @@ public: return 0; } - virtual FX_BOOL GetFaceName(void* hFont, CFX_ByteString& name) override + virtual bool GetFaceName(void* hFont, CFX_ByteString& name) override { - if (m_pInfo->GetFaceName == NULL) return FALSE; + if (m_pInfo->GetFaceName == NULL) return false; FX_DWORD size = m_pInfo->GetFaceName(m_pInfo, hFont, NULL, 0); - if (size == 0) return FALSE; + if (size == 0) return false; char* buffer = FX_Alloc(char, size); size = m_pInfo->GetFaceName(m_pInfo, hFont, buffer, size); name = CFX_ByteString(buffer, size); FX_Free(buffer); - return TRUE; + return true; } - virtual FX_BOOL GetFontCharset(void* hFont, int& charset) override + virtual bool GetFontCharset(void* hFont, int& charset) override { if (m_pInfo->GetFontCharset) { charset = m_pInfo->GetFontCharset(m_pInfo, hFont); - return TRUE; + return true; } - return FALSE; + return false; } virtual void DeleteFont(void* hFont) override -- cgit v1.2.3