Fix else-after-returns throughout pdfium.

fpdfsdk/src/pdfwindow/PWL_Wnd.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 <map>
 
 #include "../../include/pdfwindow/PDFWindow.h"
 #include "../../include/pdfwindow/PWL_Wnd.h"
@@ skipping 635 matching lines @@
 
 CPDF_Rect CPWL_Wnd::GetWindowRect() const
 {
         return m_rcWindow;
 }
 
 CPDF_Rect CPWL_Wnd::GetClientRect() const
 {
         CPDF_Rect rcWindow = GetWindowRect();
         CPDF_Rect rcClient = CPWL_Utils::DeflateRect(rcWindow,(FX_FLOAT)(GetBorderWidth()+GetInnerBorderWidth()));
-
-        if (CPWL_ScrollBar * pVSB = GetVScrollBar())
+        if (CPWL_ScrollBar* pVSB = GetVScrollBar())
                 rcClient.right -= pVSB->GetScrollBarWidth();
 
         rcClient.Normalize();
-
-        if (rcWindow.Contains(rcClient))
-                return rcClient;
-        else
-                return CPDF_Rect();
+        return rcWindow.Contains(rcClient) ? rcClient : CPDF_Rect();
 }
 
 CPDF_Point CPWL_Wnd::GetCenterPoint() const
 {
         CPDF_Rect rcClient = GetClientRect();
-
         return CPDF_Point((rcClient.left + rcClient.right) * 0.5f,
-                (rcClient.top + rcClient.bottom) * 0.5f);
+                      (rcClient.top + rcClient.bottom) * 0.5f);
 }
 
 CPDF_Rect CPWL_Wnd::GetClientCenterSquare() const
 {
         return CPWL_Utils::GetCenterSquare(GetClientRect());
 }
 
 CPDF_Rect CPWL_Wnd::GetWindowCenterSquare() const
 {
         return CPWL_Utils::GetCenterSquare(CPWL_Utils::DeflateRect(GetWindowRect(),0.1f));
@@ skipping 190 matching lines @@
 FX_BOOL CPWL_Wnd::WndHitTest(const CPDF_Point & point) const
 {
         return IsValid() && IsVisible() && GetWindowRect().Contains(point.x,point.y);
 }
 
 FX_BOOL CPWL_Wnd::ClientHitTest(const CPDF_Point & point) const
 {
         return IsValid() && IsVisible() && GetClientRect().Contains(point.x,point.y);
 }
 
-const CPWL_Wnd * CPWL_Wnd::GetRootWnd() const
+const CPWL_Wnd* CPWL_Wnd::GetRootWnd() const
 {
         if (m_sPrivateParam.pParentWnd)
                 return m_sPrivateParam.pParentWnd->GetRootWnd();
-        else
-                return this;
+
+    return this;
 }
 
 void CPWL_Wnd::SetVisible(FX_BOOL bVisible)
 {
         if (IsValid())
         {
                 for (int32_t i=0,sz=m_aChildren.GetSize(); i<sz; i++)
                 {
                         if (CPWL_Wnd* pChild = m_aChildren.GetAt(i))
                         {
@@ skipping 237 matching lines @@
 FX_HWND CPWL_Wnd::GetAttachedHWnd() const
 {
         return m_sPrivateParam.hAttachedWnd;
 }
 
 CPDF_Point CPWL_Wnd::ChildToParent(const CPDF_Point& point) const
 {
         CPDF_Matrix mt = GetChildMatrix();
         if (mt.IsIdentity())
                 return point;
-        else
-        {
-                CPDF_Point pt = point;
-                mt.Transform(pt.x,pt.y);
-                return pt;
-        }
+
+    CPDF_Point pt = point;
+    mt.Transform(pt.x,pt.y);
+    return pt;
 }
 
 CPDF_Rect CPWL_Wnd::ChildToParent(const CPDF_Rect& rect) const
 {
         CPDF_Matrix mt = GetChildMatrix();
         if (mt.IsIdentity())
                 return rect;
-        else
-        {
-                CPDF_Rect rc = rect;
-                mt.TransformRect(rc);
-                return rc;
-        }
+
+    CPDF_Rect rc = rect;
+    mt.TransformRect(rc);
+    return rc;
 }
 
 CPDF_Point CPWL_Wnd::ParentToChild(const CPDF_Point& point) const
 {
         CPDF_Matrix mt = GetChildMatrix();
         if (mt.IsIdentity())
                 return point;
-        else
-        {
-                mt.SetReverse(mt);
-                CPDF_Point pt = point;
-                mt.Transform(pt.x,pt.y);
-                return pt;
-        }
+
+    mt.SetReverse(mt);
+    CPDF_Point pt = point;
+    mt.Transform(pt.x,pt.y);
+    return pt;
 }
 
 CPDF_Rect CPWL_Wnd::ParentToChild(const CPDF_Rect& rect) const
 {
         CPDF_Matrix mt = GetChildMatrix();
         if (mt.IsIdentity())
                 return rect;
-        else
-        {
-                mt.SetReverse(mt);
-                CPDF_Rect rc = rect;
-                mt.TransformRect(rc);
-                return rc;
-        }
+
+    mt.SetReverse(mt);
+    CPDF_Rect rc = rect;
+    mt.TransformRect(rc);
+    return rc;
 }
 
 CPDF_Matrix CPWL_Wnd::GetChildToRoot() const
 {
-        CPDF_Matrix mt(1,0,0,1,0,0);
-
+        CPDF_Matrix mt(1, 0, 0, 1, 0, 0);
         if (HasFlag(PWS_CHILD))
         {
                 const CPWL_Wnd* pParent = this;
                 while (pParent)
                 {
                         mt.Concat(pParent->GetChildMatrix());
                         pParent = pParent->GetParentWindow();
                 }
         }
-
         return mt;
 }
 
 CPDF_Matrix CPWL_Wnd::GetChildMatrix() const
 {
         if (HasFlag(PWS_CHILD))
                 return m_sPrivateParam.mtChild;
 
         return CPDF_Matrix(1,0,0,1,0,0);
 }
@@ skipping 80 matching lines @@
 FX_BOOL CPWL_Wnd::IsINSERTpressed(FX_DWORD nFlag) const
 {
         if (IFX_SystemHandler* pSystemHandler = GetSystemHandler())
         {
                 return pSystemHandler->IsINSERTKeyDown(nFlag);
         }
 
         return FALSE;
 }