Cleaning up nits in fwl/core files.

xfa/fwl/core/cfwl_listbox.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/core/cfwl_listbox.h"
 
 #include <memory>
 
@@ skipping 26 matching lines @@
   std::unique_ptr<CFWL_ListItem> pItem(new CFWL_ListItem);
   pItem->m_dwStates = 0;
   pItem->m_wsText = wsAdd;
   pItem->m_dwStates = bSelect ? FWL_ITEMSTATE_LTB_Selected : 0;
   m_ItemArray.push_back(std::move(pItem));
   return m_ItemArray.back().get();
 }
 
 bool CFWL_ListBox::DeleteString(CFWL_ListItem* pItem) {
   int32_t nIndex = GetItemIndex(GetWidget(), pItem);
-  if (nIndex < 0 || static_cast<size_t>(nIndex) >= m_ItemArray.size()) {
+  if (nIndex < 0 || static_cast<size_t>(nIndex) >= m_ItemArray.size())
     return false;
-  }
+
   int32_t iCount = CountItems(m_pIface.get());
   int32_t iSel = nIndex + 1;
   if (iSel >= iCount) {

[npm, 2016/11/15 21:38:30]

nit: remove iCount, directly call CountItems(m_pIface.get()) here.

[dsinclair, 2016/11/15 21:44:06]

Followup.

     iSel = nIndex - 1;
-    if (iSel < 0) {
+    if (iSel < 0)
       iSel = -1;
-    }
   }
   if (iSel >= 0) {
     CFWL_ListItem* pSel =
         static_cast<CFWL_ListItem*>(GetItem(m_pIface.get(), iSel));
     pSel->m_dwStates |= FWL_ITEMSTATE_LTB_Selected;
   }
   m_ItemArray.erase(m_ItemArray.begin() + nIndex);
   return true;
 }
 
 void CFWL_ListBox::DeleteAll() {
   m_ItemArray.clear();
 }
 
 int32_t CFWL_ListBox::CountSelItems() {
   return GetWidget() ? ToListBox(GetWidget())->CountSelItems() : 0;
 }
 
 CFWL_ListItem* CFWL_ListBox::GetSelItem(int32_t nIndexSel) {
   return GetWidget() ? ToListBox(GetWidget())->GetSelItem(nIndexSel) : nullptr;
 }
 
 int32_t CFWL_ListBox::GetSelIndex(int32_t nIndex) {
-  if (!GetWidget())
-    return 0;
-  return ToListBox(GetWidget())->GetSelIndex(nIndex);
+  return GetWidget() ? ToListBox(GetWidget())->GetSelIndex(nIndex) : 0;
 }
 
 void CFWL_ListBox::SetSelItem(CFWL_ListItem* pItem, bool bSelect) {
   if (GetWidget())
     ToListBox(GetWidget())->SetSelItem(pItem, bSelect);
 }
 
 void CFWL_ListBox::GetItemText(CFWL_ListItem* pItem, CFX_WideString& wsText) {
   if (GetWidget())
     ToListBox(GetWidget())->GetItemText(pItem, wsText);
 }
 
 CFWL_ListItem* CFWL_ListBox::GetItem(int32_t nIndex) {
   if (nIndex < 0 || nIndex >= CountItems(nullptr))
     return nullptr;
-
   return m_ItemArray[nIndex].get();
 }
 
 uint32_t CFWL_ListBox::GetItemStates(CFWL_ListItem* pItem) {
   if (!pItem)
     return 0;
-  CFWL_ListItem* pListItem = static_cast<CFWL_ListItem*>(pItem);
-  return pListItem->m_dwStates | pListItem->m_dwCheckState;
+  return pItem->m_dwStates | pItem->m_dwCheckState;
 }
 
 void CFWL_ListBox::GetCaption(IFWL_Widget* pWidget, CFX_WideString& wsCaption) {

[npm, 2016/11/15 21:38:30]

Similarly here, pWidget is not used in most of the methods.

[dsinclair, 2016/11/15 21:44:06]

Acknowledged.

   wsCaption = L"";
 }
 
 int32_t CFWL_ListBox::CountItems(const IFWL_Widget* pWidget) const {
   return pdfium::CollectionSize<int32_t>(m_ItemArray);
 }
 
 CFWL_ListItem* CFWL_ListBox::GetItem(const IFWL_Widget* pWidget,
                                      int32_t nIndex) const {
   if (nIndex < 0 || nIndex >= CountItems(pWidget))
@@ skipping 67 matching lines @@
 uint32_t CFWL_ListBox::GetItemCheckState(IFWL_Widget* pWidget,
                                          CFWL_ListItem* pItem) {
   return static_cast<CFWL_ListItem*>(pItem)->m_dwCheckState;
 }
 
 void CFWL_ListBox::SetItemCheckState(IFWL_Widget* pWidget,
                                      CFWL_ListItem* pItem,
                                      uint32_t dwCheckState) {
   static_cast<CFWL_ListItem*>(pItem)->m_dwCheckState = dwCheckState;
 }