Clean up XFA code which causes warnings

xfa/fwl/core/fwl_widgetmgrimp.cpp

Index: xfa/fwl/core/fwl_widgetmgrimp.cpp
diff --git a/xfa/fwl/core/fwl_widgetmgrimp.cpp b/xfa/fwl/core/fwl_widgetmgrimp.cpp
index f4ceb78c48ae1bfc93709f5dc2fbf8813b0468f5..759f2ed85ed1cb3242c54342bff05b4727a73c0d 100644
--- a/xfa/fwl/core/fwl_widgetmgrimp.cpp
+++ b/xfa/fwl/core/fwl_widgetmgrimp.cpp
@@ -471,21 +471,17 @@ IFWL_Widget* CFWL_WidgetMgr::GetSiblingRadioButton(IFWL_Widget* pWidget,
 }
 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);