Clean up XFA code which causes warnings

xfa/fwl/core/fwl_widgetmgrimp.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/fwl_widgetmgrimp.h"
 
 #include "xfa/fwl/core/cfwl_message.h"
 #include "xfa/fwl/core/fwl_appimp.h"
@@ skipping 453 matching lines @@
   while (pChild)
     pChild = GetWidget(pChild, FWL_WGTRELATION_NextSibling);
   return iRet;
 }
 IFWL_Widget* CFWL_WidgetMgr::GetSiblingRadioButton(IFWL_Widget* pWidget,
                                                    FX_BOOL bNext) {
   return nullptr;
 }
 IFWL_Widget* CFWL_WidgetMgr::GetRadioButtonGroupHeader(
     IFWL_Widget* pRadioButton) {
-  if (pRadioButton->GetStyles() & FWL_WGTSTYLE_Group) {
-    return pRadioButton;
-  }
   IFWL_Widget* pNext = pRadioButton;
-  while ((pNext = GetSiblingRadioButton(pNext, FALSE)) != NULL) {
-    if (pNext->GetStyles() & FWL_WGTSTYLE_Group) {
+  while (pNext) {

[Lei Zhang, 2016/05/20 03:48:01]

I think this is missing the initial call to GetSiblingRadioButton() ?

[Wei Li, 2016/05/20 16:33:14]

I merge the condition in line 474 into the loop, So the first loop will just
check for pRadioButton before calling on the sibling button.

+    if (pNext->GetStyles() & FWL_WGTSTYLE_Group)
       return pNext;
-    }
+    pNext = GetSiblingRadioButton(pNext, FALSE);
   }
   pNext = GetWidget(pRadioButton, FWL_WGTRELATION_LastSibling);
-  while ((pNext = GetSiblingRadioButton(pNext, FALSE)) && pNext &&
+  while ((pNext = GetSiblingRadioButton(pNext, FALSE)) != nullptr &&
          pNext != pRadioButton) {
-    if (pNext->GetStyles() & FWL_WGTSTYLE_Group) {
+    if (pNext->GetStyles() & FWL_WGTSTYLE_Group)
       return pNext;
-    }
   }
   pNext = GetWidget(pRadioButton, FWL_WGTRELATION_FirstSibling);
   return GetSiblingRadioButton(pNext, TRUE);
 }
 void CFWL_WidgetMgr::GetSameGroupRadioButton(
     IFWL_Widget* pRadioButton,
     CFX_ArrayTemplate<IFWL_Widget*>& group) {
   IFWL_Widget* pFirst = GetWidget(pRadioButton, FWL_WGTRELATION_FirstSibling);
   if (!pFirst) {
     pFirst = pRadioButton;
@@ skipping 397 matching lines @@
     temp.Deflate(50, 50);
     if (!temp.Contains(r))
       return FALSE;
 
     pItem->bOutsideChanged = FALSE;
   }
 #endif
 
   return pItem->iRedrawCounter == 0;
 }