diff options
author | dsinclair <dsinclair@chromium.org> | 2016-05-04 17:57:03 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-05-04 17:57:03 -0700 |
commit | c777f486f84611d2fdd2d03af661b14955f9efb6 (patch) | |
tree | 679012454d82e885f749d17f75fd12735efec29a /xfa/fwl/lightwidget/cfwl_checkbox.cpp | |
parent | 41aad19ba366540bd4efa20a9009ac1c70a81403 (diff) | |
download | pdfium-c777f486f84611d2fdd2d03af661b14955f9efb6.tar.xz |
Convert FWL_ERR into an enum class.
This Cl updates FWL_ERR to be an FWL_Error enum class. It removes FX_ERR and
replaces it with FWL_Error as well as the values were the same.
There were many places where we either returned other values for FWL_ERR
results.
This Cl is the same as: https://codereview.chromium.org/1943413002/ but I seem
to have messed up the base URL in that one.
TBR=tsepez@chromium.org
Review-Url: https://codereview.chromium.org/1952693003
Diffstat (limited to 'xfa/fwl/lightwidget/cfwl_checkbox.cpp')
-rw-r--r-- | xfa/fwl/lightwidget/cfwl_checkbox.cpp | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/xfa/fwl/lightwidget/cfwl_checkbox.cpp b/xfa/fwl/lightwidget/cfwl_checkbox.cpp index b5e2a87d67..a93bc4674a 100644 --- a/xfa/fwl/lightwidget/cfwl_checkbox.cpp +++ b/xfa/fwl/lightwidget/cfwl_checkbox.cpp @@ -14,38 +14,38 @@ CFWL_CheckBox* CFWL_CheckBox::Create() { return new CFWL_CheckBox; } -FWL_ERR CFWL_CheckBox::Initialize(const CFWL_WidgetProperties* pProperties) { +FWL_Error CFWL_CheckBox::Initialize(const CFWL_WidgetProperties* pProperties) { if (m_pIface) - return FWL_ERR_Indefinite; + return FWL_Error::Indefinite; if (pProperties) { *m_pProperties = *pProperties; } std::unique_ptr<IFWL_CheckBox> pCheckBox(IFWL_CheckBox::Create( m_pProperties->MakeWidgetImpProperties(&m_checkboxData), nullptr)); - FWL_ERR ret = pCheckBox->Initialize(); - if (ret != FWL_ERR_Succeeded) { + FWL_Error ret = pCheckBox->Initialize(); + if (ret != FWL_Error::Succeeded) { return ret; } m_pIface = pCheckBox.release(); CFWL_Widget::Initialize(); - return FWL_ERR_Succeeded; + return FWL_Error::Succeeded; } -FWL_ERR CFWL_CheckBox::SetCaption(const CFX_WideStringC& wsCaption) { +FWL_Error CFWL_CheckBox::SetCaption(const CFX_WideStringC& wsCaption) { m_checkboxData.m_wsCaption = wsCaption; - return FWL_ERR_Succeeded; + return FWL_Error::Succeeded; } -FWL_ERR CFWL_CheckBox::SetBoxSize(FX_FLOAT fHeight) { +FWL_Error CFWL_CheckBox::SetBoxSize(FX_FLOAT fHeight) { m_checkboxData.m_fBoxHeight = fHeight; - return FWL_ERR_Succeeded; + return FWL_Error::Succeeded; } int32_t CFWL_CheckBox::GetCheckState() { return static_cast<IFWL_CheckBox*>(m_pIface)->GetCheckState(); } -FWL_ERR CFWL_CheckBox::SetCheckState(int32_t iCheck) { +FWL_Error CFWL_CheckBox::SetCheckState(int32_t iCheck) { return static_cast<IFWL_CheckBox*>(m_pIface)->SetCheckState(iCheck); } @@ -56,10 +56,11 @@ CFWL_CheckBox::~CFWL_CheckBox() {} CFWL_CheckBox::CFWL_CheckBoxDP::CFWL_CheckBoxDP() : m_fBoxHeight(16.0f), m_wsCaption(L"Check box") {} -FWL_ERR CFWL_CheckBox::CFWL_CheckBoxDP::GetCaption(IFWL_Widget* pWidget, - CFX_WideString& wsCaption) { +FWL_Error CFWL_CheckBox::CFWL_CheckBoxDP::GetCaption( + IFWL_Widget* pWidget, + CFX_WideString& wsCaption) { wsCaption = m_wsCaption; - return FWL_ERR_Succeeded; + return FWL_Error::Succeeded; } FX_FLOAT CFWL_CheckBox::CFWL_CheckBoxDP::GetBoxSize(IFWL_Widget* pWidget) { |