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_scrollbar.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_scrollbar.cpp')
-rw-r--r-- | xfa/fwl/lightwidget/cfwl_scrollbar.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/xfa/fwl/lightwidget/cfwl_scrollbar.cpp b/xfa/fwl/lightwidget/cfwl_scrollbar.cpp index 0c02314733..eb4276c2d1 100644 --- a/xfa/fwl/lightwidget/cfwl_scrollbar.cpp +++ b/xfa/fwl/lightwidget/cfwl_scrollbar.cpp @@ -18,21 +18,21 @@ CFWL_ScrollBar::CFWL_ScrollBar() {} CFWL_ScrollBar::~CFWL_ScrollBar() {} -FWL_ERR CFWL_ScrollBar::Initialize(const CFWL_WidgetProperties* pProperties) { +FWL_Error CFWL_ScrollBar::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_ScrollBar> pScrollBar(IFWL_ScrollBar::Create( m_pProperties->MakeWidgetImpProperties(nullptr), nullptr)); - FWL_ERR ret = pScrollBar->Initialize(); - if (ret != FWL_ERR_Succeeded) { + FWL_Error ret = pScrollBar->Initialize(); + if (ret != FWL_Error::Succeeded) { return ret; } m_pIface = pScrollBar.release(); CFWL_Widget::Initialize(); - return FWL_ERR_Succeeded; + return FWL_Error::Succeeded; } FX_BOOL CFWL_ScrollBar::IsVertical() { @@ -41,15 +41,15 @@ FX_BOOL CFWL_ScrollBar::IsVertical() { return static_cast<IFWL_ScrollBar*>(m_pIface)->IsVertical(); } -FWL_ERR CFWL_ScrollBar::GetRange(FX_FLOAT& fMin, FX_FLOAT& fMax) { +FWL_Error CFWL_ScrollBar::GetRange(FX_FLOAT& fMin, FX_FLOAT& fMax) { if (!m_pIface) - return FWL_ERR_Indefinite; + return FWL_Error::Indefinite; return static_cast<IFWL_ScrollBar*>(m_pIface)->GetRange(fMin, fMax); } -FWL_ERR CFWL_ScrollBar::SetRange(FX_FLOAT fMin, FX_FLOAT fMax) { +FWL_Error CFWL_ScrollBar::SetRange(FX_FLOAT fMin, FX_FLOAT fMax) { if (!m_pIface) - return FWL_ERR_Indefinite; + return FWL_Error::Indefinite; return static_cast<IFWL_ScrollBar*>(m_pIface)->SetRange(fMin, fMax); } @@ -59,9 +59,9 @@ FX_FLOAT CFWL_ScrollBar::GetPageSize() { return static_cast<IFWL_ScrollBar*>(m_pIface)->GetPageSize(); } -FWL_ERR CFWL_ScrollBar::SetPageSize(FX_FLOAT fPageSize) { +FWL_Error CFWL_ScrollBar::SetPageSize(FX_FLOAT fPageSize) { if (!m_pIface) - return FWL_ERR_Indefinite; + return FWL_Error::Indefinite; return static_cast<IFWL_ScrollBar*>(m_pIface)->SetPageSize(fPageSize); } @@ -71,9 +71,9 @@ FX_FLOAT CFWL_ScrollBar::GetStepSize() { return static_cast<IFWL_ScrollBar*>(m_pIface)->GetStepSize(); } -FWL_ERR CFWL_ScrollBar::SetStepSize(FX_FLOAT fStepSize) { +FWL_Error CFWL_ScrollBar::SetStepSize(FX_FLOAT fStepSize) { if (!m_pIface) - return FWL_ERR_Indefinite; + return FWL_Error::Indefinite; return static_cast<IFWL_ScrollBar*>(m_pIface)->SetStepSize(fStepSize); } @@ -83,9 +83,9 @@ FX_FLOAT CFWL_ScrollBar::GetPos() { return static_cast<IFWL_ScrollBar*>(m_pIface)->GetPos(); } -FWL_ERR CFWL_ScrollBar::SetPos(FX_FLOAT fPos) { +FWL_Error CFWL_ScrollBar::SetPos(FX_FLOAT fPos) { if (!m_pIface) - return FWL_ERR_Indefinite; + return FWL_Error::Indefinite; return static_cast<IFWL_ScrollBar*>(m_pIface)->SetPos(fPos); } @@ -95,9 +95,9 @@ FX_FLOAT CFWL_ScrollBar::GetTrackPos() { return static_cast<IFWL_ScrollBar*>(m_pIface)->GetTrackPos(); } -FWL_ERR CFWL_ScrollBar::SetTrackPos(FX_FLOAT fTrackPos) { +FWL_Error CFWL_ScrollBar::SetTrackPos(FX_FLOAT fTrackPos) { if (!m_pIface) - return FWL_ERR_Indefinite; + return FWL_Error::Indefinite; return static_cast<IFWL_ScrollBar*>(m_pIface)->SetTrackPos(fTrackPos); } |