Convert FWL_ERR into an enum class.

xfa/fwl/basewidget/fwl_listboximp.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 "xfa/fwl/basewidget/fwl_listboximp.h"
 
 #include "xfa/fde/tto/fde_textout.h"
 #include "xfa/fwl/basewidget/fwl_comboboximp.h"
@@ skipping 34 matching lines @@
 IFWL_ListBox::IFWL_ListBox() {}
 int32_t IFWL_ListBox::CountSelItems() {
   return static_cast<CFWL_ListBoxImp*>(GetImpl())->CountSelItems();
 }
 FWL_HLISTITEM IFWL_ListBox::GetSelItem(int32_t nIndexSel) {
   return static_cast<CFWL_ListBoxImp*>(GetImpl())->GetSelItem(nIndexSel);
 }
 int32_t IFWL_ListBox::GetSelIndex(int32_t nIndex) {
   return static_cast<CFWL_ListBoxImp*>(GetImpl())->GetSelIndex(nIndex);
 }
-FWL_ERR IFWL_ListBox::SetSelItem(FWL_HLISTITEM hItem, FX_BOOL bSelect) {
+FWL_Error IFWL_ListBox::SetSelItem(FWL_HLISTITEM hItem, FX_BOOL bSelect) {
   return static_cast<CFWL_ListBoxImp*>(GetImpl())->SetSelItem(hItem, bSelect);
 }
-FWL_ERR IFWL_ListBox::GetItemText(FWL_HLISTITEM hItem, CFX_WideString& wsText) {
+FWL_Error IFWL_ListBox::GetItemText(FWL_HLISTITEM hItem,
+                                    CFX_WideString& wsText) {
   return static_cast<CFWL_ListBoxImp*>(GetImpl())->GetItemText(hItem, wsText);
 }
-FWL_ERR IFWL_ListBox::GetScrollPos(FX_FLOAT& fPos, FX_BOOL bVert) {
+FWL_Error IFWL_ListBox::GetScrollPos(FX_FLOAT& fPos, FX_BOOL bVert) {
   return static_cast<CFWL_ListBoxImp*>(GetImpl())->GetScrollPos(fPos, bVert);
 }
-FWL_ERR* IFWL_ListBox::Sort(IFWL_ListBoxCompare* pCom) {
+
+FWL_Error IFWL_ListBox::Sort(IFWL_ListBoxCompare* pCom) {
   return static_cast<CFWL_ListBoxImp*>(GetImpl())->Sort(pCom);
 }
 
 CFWL_ListBoxImp::CFWL_ListBoxImp(const CFWL_WidgetImpProperties& properties,
                                  IFWL_Widget* pOuter)
     : CFWL_WidgetImp(properties, pOuter),
       m_dwTTOStyles(0),
       m_iTTOAligns(0),
       m_hAnchor(NULL),
       m_fScorllBarWidth(0),
       m_bLButtonDown(FALSE),
       m_pScrollBarTP(NULL) {
   m_rtClient.Reset();
   m_rtConent.Reset();
   m_rtStatic.Reset();
 }
 CFWL_ListBoxImp::~CFWL_ListBoxImp() {}
-FWL_ERR CFWL_ListBoxImp::GetClassName(CFX_WideString& wsClass) const {
+FWL_Error CFWL_ListBoxImp::GetClassName(CFX_WideString& wsClass) const {
   wsClass = FWL_CLASS_ListBox;
-  return FWL_ERR_Succeeded;
+  return FWL_Error::Succeeded;
 }
 uint32_t CFWL_ListBoxImp::GetClassID() const {
   return FWL_CLASSHASH_ListBox;
 }
-FWL_ERR CFWL_ListBoxImp::Initialize() {
-  if (CFWL_WidgetImp::Initialize() != FWL_ERR_Succeeded)
-    return FWL_ERR_Indefinite;
+FWL_Error CFWL_ListBoxImp::Initialize() {
+  if (CFWL_WidgetImp::Initialize() != FWL_Error::Succeeded)
+    return FWL_Error::Indefinite;
   m_pDelegate = new CFWL_ListBoxImpDelegate(this);
-  return FWL_ERR_Succeeded;
+  return FWL_Error::Succeeded;
 }
-FWL_ERR CFWL_ListBoxImp::Finalize() {
+FWL_Error CFWL_ListBoxImp::Finalize() {
   if (m_pVertScrollBar) {
     m_pVertScrollBar->Finalize();
   }
   if (m_pHorzScrollBar) {
     m_pHorzScrollBar->Finalize();
   }
   delete m_pDelegate;
   m_pDelegate = nullptr;
   return CFWL_WidgetImp::Finalize();
 }
-FWL_ERR CFWL_ListBoxImp::GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize) {
+FWL_Error CFWL_ListBoxImp::GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize) {
   if (bAutoSize) {
     rect.Set(0, 0, 0, 0);
     if (!m_pProperties->m_pThemeProvider) {
       m_pProperties->m_pThemeProvider = GetAvailableTheme();
     }
     CFX_SizeF fs = CalcSize(TRUE);
     rect.Set(0, 0, fs.x, fs.y);
     CFWL_WidgetImp::GetWidgetRect(rect, TRUE);
   } else {
     rect = m_pProperties->m_rtWidget;
   }
-  return FWL_ERR_Succeeded;
+  return FWL_Error::Succeeded;
 }
-FWL_ERR CFWL_ListBoxImp::Update() {
+FWL_Error CFWL_ListBoxImp::Update() {
   if (IsLocked()) {
-    return FWL_ERR_Indefinite;
+    return FWL_Error::Indefinite;
   }
   if (!m_pProperties->m_pThemeProvider) {
     m_pProperties->m_pThemeProvider = GetAvailableTheme();
   }
   m_iTTOAligns = FDE_TTOALIGNMENT_Center;
   switch (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_LTB_AlignMask) {
     case FWL_STYLEEXT_LTB_LeftAlign: {
       m_iTTOAligns = FDE_TTOALIGNMENT_CenterLeft;
       break;
     }
     case FWL_STYLEEXT_LTB_RightAlign: {
       m_iTTOAligns = FDE_TTOALIGNMENT_CenterRight;
       break;
     }
     case FWL_STYLEEXT_LTB_CenterAlign:
     default: { m_iTTOAligns = FDE_TTOALIGNMENT_Center; }
   }
   if (m_pProperties->m_dwStyleExes & FWL_WGTSTYLE_RTLReading) {
     m_dwTTOStyles |= FDE_TTOSTYLE_RTL;
   }
   m_dwTTOStyles |= FDE_TTOSTYLE_SingleLine;
   m_fScorllBarWidth = GetScrollWidth();
   SortItem();
   CalcSize();
-  return FWL_ERR_Succeeded;
+  return FWL_Error::Succeeded;
 }
 uint32_t CFWL_ListBoxImp::HitTest(FX_FLOAT fx, FX_FLOAT fy) {
   if (IsShowScrollBar(FALSE)) {
     CFX_RectF rect;
     m_pHorzScrollBar->GetWidgetRect(rect);
     if (rect.Contains(fx, fy)) {
       return FWL_WGTHITTEST_HScrollBar;
     }
   }
   if (IsShowScrollBar(TRUE)) {
     CFX_RectF rect;
     m_pVertScrollBar->GetWidgetRect(rect);
     if (rect.Contains(fx, fy)) {
       return FWL_WGTHITTEST_VScrollBar;
     }
   }
   if (m_rtClient.Contains(fx, fy)) {
     return FWL_WGTHITTEST_Client;
   }
   return FWL_WGTHITTEST_Unknown;
 }
-FWL_ERR CFWL_ListBoxImp::DrawWidget(CFX_Graphics* pGraphics,
-                                    const CFX_Matrix* pMatrix) {
+FWL_Error CFWL_ListBoxImp::DrawWidget(CFX_Graphics* pGraphics,
+                                      const CFX_Matrix* pMatrix) {
   if (!pGraphics)
-    return FWL_ERR_Indefinite;
+    return FWL_Error::Indefinite;
   if (!m_pProperties->m_pThemeProvider)
-    return FWL_ERR_Indefinite;
+    return FWL_Error::Indefinite;
   IFWL_ThemeProvider* pTheme = m_pProperties->m_pThemeProvider;
   pGraphics->SaveGraphState();
   if (HasBorder()) {
     DrawBorder(pGraphics, CFWL_Part::Border, pTheme, pMatrix);
   }
   if (HasEdge()) {
     DrawEdge(pGraphics, CFWL_Part::Edge, pTheme, pMatrix);
   }
   CFX_RectF rtClip(m_rtConent);
   if (IsShowScrollBar(FALSE)) {
     rtClip.height -= m_fScorllBarWidth;
   }
   if (IsShowScrollBar(TRUE)) {
     rtClip.width -= m_fScorllBarWidth;
   }
   if (pMatrix) {
     pMatrix->TransformRect(rtClip);
   }
   pGraphics->SetClipRect(rtClip);
   if ((m_pProperties->m_dwStyles & FWL_WGTSTYLE_NoBackground) == 0) {
     DrawBkground(pGraphics, pTheme, pMatrix);
   }
   DrawItems(pGraphics, pTheme, pMatrix);
   pGraphics->RestoreGraphState();
-  return FWL_ERR_Succeeded;
+  return FWL_Error::Succeeded;
 }
-FWL_ERR CFWL_ListBoxImp::SetThemeProvider(IFWL_ThemeProvider* pThemeProvider) {
+FWL_Error CFWL_ListBoxImp::SetThemeProvider(
+    IFWL_ThemeProvider* pThemeProvider) {
   if (!pThemeProvider)
-    return FWL_ERR_Indefinite;
+    return FWL_Error::Indefinite;
   if (!pThemeProvider->IsValidWidget(m_pInterface)) {
     m_pScrollBarTP = pThemeProvider;
-    return FWL_ERR_Succeeded;
+    return FWL_Error::Succeeded;
   }
   m_pProperties->m_pThemeProvider = pThemeProvider;
-  return FWL_ERR_Succeeded;
+  return FWL_Error::Succeeded;
 }
 int32_t CFWL_ListBoxImp::CountSelItems() {
   if (!m_pProperties->m_pDataProvider)
     return 0;
   int32_t iRet = 0;
   IFWL_ListBoxDP* pData =
       static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider);
   int32_t iCount = pData->CountItems(m_pInterface);
   for (int32_t i = 0; i < iCount; i++) {
     FWL_HLISTITEM hItem = pData->GetItem(m_pInterface, i);
@@ skipping 46 matching lines @@
     if (dwStyle & FWL_ITEMSTATE_LTB_Selected) {
       if (index == nIndex) {
         return i;
       } else {
         index++;
       }
     }
   }
   return -1;
 }
-FWL_ERR CFWL_ListBoxImp::SetSelItem(FWL_HLISTITEM hItem, FX_BOOL bSelect) {
+FWL_Error CFWL_ListBoxImp::SetSelItem(FWL_HLISTITEM hItem, FX_BOOL bSelect) {
   if (!m_pProperties->m_pDataProvider)
-    return FWL_ERR_Indefinite;
+    return FWL_Error::Indefinite;
   if (!hItem) {
     if (bSelect) {
       SelectAll();
     } else {
       ClearSelection();
       SetFocusItem(NULL);
     }
-    return FWL_ERR_Indefinite;
+    return FWL_Error::Indefinite;
   }
   if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_LTB_MultiSelection) {
     SetSelectionDirect(hItem, bSelect);
   } else {
     SetSelection(hItem, hItem, bSelect);
   }
-  return FWL_ERR_Succeeded;
+  return FWL_Error::Succeeded;
 }
-FWL_ERR CFWL_ListBoxImp::GetItemText(FWL_HLISTITEM hItem,
-                                     CFX_WideString& wsText) {
+FWL_Error CFWL_ListBoxImp::GetItemText(FWL_HLISTITEM hItem,
+                                       CFX_WideString& wsText) {
   if (!m_pProperties->m_pDataProvider)
-    return FWL_ERR_Indefinite;
+    return FWL_Error::Indefinite;
   IFWL_ListBoxDP* pData =
       static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider);
   if (!hItem)
-    return FWL_ERR_Indefinite;
+    return FWL_Error::Indefinite;
   pData->GetItemText(m_pInterface, hItem, wsText);
-  return FWL_ERR_Succeeded;
+  return FWL_Error::Succeeded;
 }
-FWL_ERR CFWL_ListBoxImp::GetScrollPos(FX_FLOAT& fPos, FX_BOOL bVert) {
+
+FWL_Error CFWL_ListBoxImp::GetScrollPos(FX_FLOAT& fPos, FX_BOOL bVert) {
   if ((bVert && IsShowScrollBar(TRUE)) || (!bVert && IsShowScrollBar(FALSE))) {
     IFWL_ScrollBar* pScrollBar =
         bVert ? m_pVertScrollBar.get() : m_pHorzScrollBar.get();
     fPos = pScrollBar->GetPos();
-    return FWL_ERR_Succeeded;
+    return FWL_Error::Succeeded;
   }
-  return FWL_ERR_Indefinite;
+  return FWL_Error::Indefinite;
 }
-FWL_ERR* CFWL_ListBoxImp::Sort(IFWL_ListBoxCompare* pCom) {

[Tom Sepez, 2016/05/03 18:19:41]

nice. presumably success == 0, and 0 is a valid value for all pointers.
nit: Can this be void?

[dsinclair, 2016/05/03 19:29:51]

Looks like it can actually just be deleted.

+
+FWL_Error CFWL_ListBoxImp::Sort(IFWL_ListBoxCompare* pCom) {
   FWL_HLISTITEM hTemp;
   IFWL_ListBoxDP* pData =
       static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider);
   int32_t sz = pData->CountItems(m_pInterface);
   for (int32_t i = 0; i < sz - 1; i++) {
     for (int32_t j = i + 1; j < sz; j++) {
       if (pCom->Compare(pData->GetItem(m_pInterface, i),
                         pData->GetItem(m_pInterface, j)) > 0) {
         hTemp = pData->GetItem(m_pInterface, i);
         pData->SetItemIndex(m_pInterface, pData->GetItem(m_pInterface, j), i);
         pData->SetItemIndex(m_pInterface, hTemp, j);
       }
     }
   }
-  return FWL_ERR_Succeeded;
+  return FWL_Error::Succeeded;
 }
+
 FWL_HLISTITEM CFWL_ListBoxImp::GetItem(FWL_HLISTITEM hItem,
                                        uint32_t dwKeyCode) {
   FWL_HLISTITEM hRet = NULL;
   switch (dwKeyCode) {
     case FWL_VKEY_Up:
     case FWL_VKEY_Down:
     case FWL_VKEY_Home:
     case FWL_VKEY_End: {
       const bool bUp = dwKeyCode == FWL_VKEY_Up;
       const bool bDown = dwKeyCode == FWL_VKEY_Down;
@@ skipping 692 matching lines @@
     }
     default: {
       iRet = 0;
       break;
     }
   }
   CFWL_WidgetImpDelegate::OnProcessMessage(pMessage);
   return iRet;
 }
 
-FWL_ERR CFWL_ListBoxImpDelegate::OnProcessEvent(CFWL_Event* pEvent) {
+FWL_Error CFWL_ListBoxImpDelegate::OnProcessEvent(CFWL_Event* pEvent) {
   if (!pEvent)
-    return FWL_ERR_Indefinite;
+    return FWL_Error::Indefinite;
   if (pEvent->GetClassID() != CFWL_EventType::Scroll)
-    return FWL_ERR_Succeeded;
+    return FWL_Error::Succeeded;
 
   IFWL_Widget* pSrcTarget = pEvent->m_pSrcTarget;
   if ((pSrcTarget == m_pOwner->m_pVertScrollBar.get() &&
        m_pOwner->m_pVertScrollBar) ||
       (pSrcTarget == m_pOwner->m_pHorzScrollBar.get() &&
        m_pOwner->m_pHorzScrollBar)) {
     CFWL_EvtScroll* pScrollEvent = static_cast<CFWL_EvtScroll*>(pEvent);
     OnScroll(static_cast<IFWL_ScrollBar*>(pSrcTarget),
              pScrollEvent->m_iScrollCode, pScrollEvent->m_fPos);
   }
-  return FWL_ERR_Succeeded;
+  return FWL_Error::Succeeded;
 }
 
-FWL_ERR CFWL_ListBoxImpDelegate::OnDrawWidget(CFX_Graphics* pGraphics,
-                                              const CFX_Matrix* pMatrix) {
+FWL_Error CFWL_ListBoxImpDelegate::OnDrawWidget(CFX_Graphics* pGraphics,
+                                                const CFX_Matrix* pMatrix) {
   return m_pOwner->DrawWidget(pGraphics, pMatrix);
 }
 void CFWL_ListBoxImpDelegate::OnFocusChanged(CFWL_Message* pMsg, FX_BOOL bSet) {
   if (m_pOwner->GetStylesEx() & FWL_STYLEEXT_LTB_ShowScrollBarFocus) {
     if (m_pOwner->m_pVertScrollBar) {
       m_pOwner->m_pVertScrollBar->SetStates(FWL_WGTSTATE_Invisible, !bSet);
     }
     if (m_pOwner->m_pHorzScrollBar) {
       m_pOwner->m_pHorzScrollBar->SetStates(FWL_WGTSTATE_Invisible, !bSet);
     }
@@ skipping 175 matching lines @@
     pScrollBar->SetTrackPos(fPos);
     m_pOwner->Repaint(&m_pOwner->m_rtClient);
   }
   return TRUE;
 }
 void CFWL_ListBoxImpDelegate::DispatchSelChangedEv() {
   CFWL_EvtLtbSelChanged ev;
   ev.m_pSrcTarget = m_pOwner->m_pInterface;
   m_pOwner->DispatchEvent(&ev);
 }