Changed C casts to C++ casts and some code formatting corrections

Patch by XhmikosR

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1676 10f7b99b-c216-0410-bff0-8a66a9350fd8

1 files changed, 7 insertions, 11 deletions

diff --git a/src/ui/sizecbar/sizecbar.cpp b/src/ui/sizecbar/sizecbar.cpp
index e5c79c15d..7f459adca 100644
--- a/src/ui/sizecbar/sizecbar.cpp
+++ b/src/ui/sizecbar/sizecbar.cpp
@@ -239,7 +239,7 @@ CSize CSizingControlBar::CalcFixedLayout(BOOL bStretch, BOOL bHorz)
             return CSize(m_szVert.cx, 32767);

 

     // dirty cast - we need access to protected CDockBar members

-    CSCBDockBar* pDockBar = (CSCBDockBar*) m_pDockBar;

+    CSCBDockBar* pDockBar = static_cast<CSCBDockBar*> (m_pDockBar);

 

     // force imediate RecalcDelayShow() for all sizing bars on the row

     // with delayShow/delayHide flags set to avoid IsVisible() problems

@@ -900,8 +900,7 @@ void CSizingControlBar::GetRowSizingBars(CSCBArray& arrSCBars, int& nThis)
     nThis = -1;

     for (int i = nFirstT; i <= nLastT; i++)

     {

-        CSizingControlBar* pBar =

-            (CSizingControlBar*) m_pDockBar->m_arrBars[i];

+        CSizingControlBar* pBar = static_cast<CSizingControlBar*> (m_pDockBar->m_arrBars[i]);

         if (HIWORD(pBar) == 0) continue; // placeholder

         if (!pBar->IsVisible()) continue;

         if (pBar->IsKindOf(RUNTIME_CLASS(CSizingControlBar)))

@@ -929,7 +928,7 @@ BOOL CSizingControlBar::NegotiateSpace(int nLengthTotal, BOOL bHorz)
 

     for (int i = nFirst; i <= nLast; i++)

     {

-        pBar = (CSizingControlBar*) m_pDockBar->m_arrBars[i];

+        pBar = static_cast<CSizingControlBar*> (m_pDockBar->m_arrBars[i]);

         if (HIWORD(pBar) == 0) continue; // placeholder

         if (!pBar->IsVisible()) continue;

         BOOL bIsSizingBar = 

@@ -1057,8 +1056,7 @@ void CSizingControlBar::AlignControlBars()
 

     for (int i = nFirst; i <= nLast; i++)

     {

-        CSizingControlBar* pBar =

-            (CSizingControlBar*) m_pDockBar->m_arrBars[i];

+        CSizingControlBar* pBar = static_cast<CSizingControlBar*>(m_pDockBar->m_arrBars[i]);

         if (HIWORD(pBar) == 0) continue; // placeholder

         if (!pBar->IsVisible()) continue;

 

@@ -1176,8 +1174,7 @@ void CSizingControlBar::GlobalLoadState(CFrameWnd* pFrame,
     POSITION pos = pFrame->m_listControlBars.GetHeadPosition();

     while (pos != NULL)

     {

-        CSizingControlBar* pBar = 

-            (CSizingControlBar*) pFrame->m_listControlBars.GetNext(pos);

+        CSizingControlBar* pBar = static_cast<CSizingControlBar*> (pFrame->m_listControlBars.GetNext(pos));

         ASSERT(pBar != NULL);

         if (pBar->IsKindOf(RUNTIME_CLASS(CSizingControlBar)))

             pBar->LoadState(lpszProfileName);

@@ -1190,8 +1187,7 @@ void CSizingControlBar::GlobalSaveState(CFrameWnd* pFrame,
     POSITION pos = pFrame->m_listControlBars.GetHeadPosition();

     while (pos != NULL)

     {

-        CSizingControlBar* pBar =

-            (CSizingControlBar*) pFrame->m_listControlBars.GetNext(pos);

+        CSizingControlBar* pBar = static_cast<CSizingControlBar*> (pFrame->m_listControlBars.GetNext(pos));

         ASSERT(pBar != NULL);

         if (pBar->IsKindOf(RUNTIME_CLASS(CSizingControlBar)))

             pBar->SaveState(lpszProfileName);

@@ -1352,7 +1348,7 @@ CSizingControlBar* CSCBMiniDockFrameWnd::GetSizingControlBar()
     if (!pWnd->IsKindOf(RUNTIME_CLASS(CSizingControlBar)))

         return NULL;

 

-    return (CSizingControlBar*) pWnd;

+    return static_cast<CSizingControlBar*> (pWnd);

 }

 

 void CSCBMiniDockFrameWnd::OnSize(UINT nType, int cx, int cy)