apply the new astyle command; use 4 spaces for indentation and k&r style

Note: if you have any local patches just run astyle.bat

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

1 files changed, 101 insertions, 101 deletions

diff --git a/src/CmdUI/CmdUI.cpp b/src/CmdUI/CmdUI.cpp
index 50e3e5e71..e9e76ebc8 100644
--- a/src/CmdUI/CmdUI.cpp
+++ b/src/CmdUI/CmdUI.cpp
@@ -37,12 +37,12 @@ CCmdUIDialog::CCmdUIDialog()
 }

 

 CCmdUIDialog::CCmdUIDialog(UINT nIDTemplate, CWnd* pParent /*=NULL*/)

-	: CDialog(nIDTemplate, pParent)

+    : CDialog(nIDTemplate, pParent)

 {

 }

 

 CCmdUIDialog::CCmdUIDialog(LPCTSTR lpszTemplateName, CWnd* pParentWnd)

-	: CDialog(lpszTemplateName, pParentWnd)

+    : CDialog(lpszTemplateName, pParentWnd)

 {

 }

 

@@ -52,18 +52,18 @@ CCmdUIDialog::~CCmdUIDialog()
 

 LRESULT CCmdUIDialog::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam)

 {

-	LRESULT ret = __super::DefWindowProc(message, wParam, lParam);

+    LRESULT ret = __super::DefWindowProc(message, wParam, lParam);

 

-	if (message == WM_INITDIALOG) {

-		SendMessage(WM_KICKIDLE);

-	}

+    if (message == WM_INITDIALOG) {

+        SendMessage(WM_KICKIDLE);

+    }

 

-	return ret;

+    return ret;

 }

 

 BEGIN_MESSAGE_MAP(CCmdUIDialog, CDialog)

-	ON_MESSAGE_VOID(WM_KICKIDLE, OnKickIdle)

-	ON_WM_INITMENUPOPUP()

+    ON_MESSAGE_VOID(WM_KICKIDLE, OnKickIdle)

+    ON_WM_INITMENUPOPUP()

 END_MESSAGE_MAP()

 

 

@@ -71,89 +71,89 @@ END_MESSAGE_MAP()
 

 void CCmdUIDialog::OnKickIdle()

 {

-	UpdateDialogControls(this, false);

+    UpdateDialogControls(this, false);

 

-	// TODO: maybe we should send this call to modeless child cdialogs too

+    // TODO: maybe we should send this call to modeless child cdialogs too

 }

 

 // Q242577

 

-void CCmdUIDialog::OnInitMenuPopup(CMenu *pPopupMenu, UINT /*nIndex*/, BOOL /*bSysMenu*/)

+void CCmdUIDialog::OnInitMenuPopup(CMenu* pPopupMenu, UINT /*nIndex*/, BOOL /*bSysMenu*/)

 {

-	ASSERT(pPopupMenu != NULL);

-	// Check the enabled state of various menu items.

-

-	CCmdUI state;

-	state.m_pMenu = pPopupMenu;

-	ASSERT(state.m_pOther == NULL);

-	ASSERT(state.m_pParentMenu == NULL);

-

-	// Determine if menu is popup in top-level menu and set m_pOther to

-	// it if so (m_pParentMenu == NULL indicates that it is secondary popup).

-	HMENU hParentMenu;

-	if (AfxGetThreadState()->m_hTrackingMenu == pPopupMenu->m_hMenu) {

-		state.m_pParentMenu = pPopupMenu;    // Parent == child for tracking popup.

-	} else if ((hParentMenu = ::GetMenu(m_hWnd)) != NULL) {

-		CWnd* pParent = this;

-		// Child windows don't have menus--need to go to the top!

-		if (pParent != NULL &&

-				(hParentMenu = ::GetMenu(pParent->m_hWnd)) != NULL) {

-			int nIndexMax = ::GetMenuItemCount(hParentMenu);

-			for (int nIndex = 0; nIndex < nIndexMax; nIndex++) {

-				if (::GetSubMenu(hParentMenu, nIndex) == pPopupMenu->m_hMenu) {

-					// When popup is found, m_pParentMenu is containing menu.

-					state.m_pParentMenu = CMenu::FromHandle(hParentMenu);

-					break;

-				}

-			}

-		}

-	}

-

-	state.m_nIndexMax = pPopupMenu->GetMenuItemCount();

-	for (state.m_nIndex = 0; state.m_nIndex < state.m_nIndexMax;

-			state.m_nIndex++) {

-		state.m_nID = pPopupMenu->GetMenuItemID(state.m_nIndex);

-		if (state.m_nID == 0) {

-			continue;    // Menu separator or invalid cmd - ignore it.

-		}

-

-		ASSERT(state.m_pOther == NULL);

-		ASSERT(state.m_pMenu != NULL);

-		if (state.m_nID == (UINT)-1) {

-			// Possibly a popup menu, route to first item of that popup.

-			state.m_pSubMenu = pPopupMenu->GetSubMenu(state.m_nIndex);

-			if (state.m_pSubMenu == NULL ||

-					(state.m_nID = state.m_pSubMenu->GetMenuItemID(0)) == 0 ||

-					state.m_nID == (UINT)-1) {

-				continue;		// First item of popup can't be routed to.

-			}

-			state.DoUpdate(this, TRUE);		// Popups are never auto disabled.

-		} else {

-			// Normal menu item.

-			// Auto enable/disable if frame window has m_bAutoMenuEnable

-			// set and command is _not_ a system command.

-			state.m_pSubMenu = NULL;

-			state.DoUpdate(this, FALSE);

-		}

-

-		// Adjust for menu deletions and additions.

-		UINT nCount = pPopupMenu->GetMenuItemCount();

-		if (nCount < state.m_nIndexMax) {

-			state.m_nIndex -= (state.m_nIndexMax - nCount);

-			while (state.m_nIndex < nCount &&

-					pPopupMenu->GetMenuItemID(state.m_nIndex) == state.m_nID) {

-				state.m_nIndex++;

-			}

-		}

-		state.m_nIndexMax = nCount;

-	}

+    ASSERT(pPopupMenu != NULL);

+    // Check the enabled state of various menu items.

+

+    CCmdUI state;

+    state.m_pMenu = pPopupMenu;

+    ASSERT(state.m_pOther == NULL);

+    ASSERT(state.m_pParentMenu == NULL);

+

+    // Determine if menu is popup in top-level menu and set m_pOther to

+    // it if so (m_pParentMenu == NULL indicates that it is secondary popup).

+    HMENU hParentMenu;

+    if (AfxGetThreadState()->m_hTrackingMenu == pPopupMenu->m_hMenu) {

+        state.m_pParentMenu = pPopupMenu;    // Parent == child for tracking popup.

+    } else if ((hParentMenu = ::GetMenu(m_hWnd)) != NULL) {

+        CWnd* pParent = this;

+        // Child windows don't have menus--need to go to the top!

+        if (pParent != NULL &&

+                (hParentMenu = ::GetMenu(pParent->m_hWnd)) != NULL) {

+            int nIndexMax = ::GetMenuItemCount(hParentMenu);

+            for (int nIndex = 0; nIndex < nIndexMax; nIndex++) {

+                if (::GetSubMenu(hParentMenu, nIndex) == pPopupMenu->m_hMenu) {

+                    // When popup is found, m_pParentMenu is containing menu.

+                    state.m_pParentMenu = CMenu::FromHandle(hParentMenu);

+                    break;

+                }

+            }

+        }

+    }

+

+    state.m_nIndexMax = pPopupMenu->GetMenuItemCount();

+    for (state.m_nIndex = 0; state.m_nIndex < state.m_nIndexMax;

+            state.m_nIndex++) {

+        state.m_nID = pPopupMenu->GetMenuItemID(state.m_nIndex);

+        if (state.m_nID == 0) {

+            continue;    // Menu separator or invalid cmd - ignore it.

+        }

+

+        ASSERT(state.m_pOther == NULL);

+        ASSERT(state.m_pMenu != NULL);

+        if (state.m_nID == (UINT) - 1) {

+            // Possibly a popup menu, route to first item of that popup.

+            state.m_pSubMenu = pPopupMenu->GetSubMenu(state.m_nIndex);

+            if (state.m_pSubMenu == NULL ||

+                    (state.m_nID = state.m_pSubMenu->GetMenuItemID(0)) == 0 ||

+                    state.m_nID == (UINT) - 1) {

+                continue;       // First item of popup can't be routed to.

+            }

+            state.DoUpdate(this, TRUE);     // Popups are never auto disabled.

+        } else {

+            // Normal menu item.

+            // Auto enable/disable if frame window has m_bAutoMenuEnable

+            // set and command is _not_ a system command.

+            state.m_pSubMenu = NULL;

+            state.DoUpdate(this, FALSE);

+        }

+

+        // Adjust for menu deletions and additions.

+        UINT nCount = pPopupMenu->GetMenuItemCount();

+        if (nCount < state.m_nIndexMax) {

+            state.m_nIndex -= (state.m_nIndexMax - nCount);

+            while (state.m_nIndex < nCount &&

+                    pPopupMenu->GetMenuItemID(state.m_nIndex) == state.m_nID) {

+                state.m_nIndex++;

+            }

+        }

+        state.m_nIndexMax = nCount;

+    }

 }

 

 // CCmdUIPropertyPage

 

 IMPLEMENT_DYNAMIC(CCmdUIPropertyPage, CPropertyPage)

 CCmdUIPropertyPage::CCmdUIPropertyPage(UINT nIDTemplate, UINT nIDCaption)

-	: CPropertyPage(nIDTemplate, nIDCaption)

+    : CPropertyPage(nIDTemplate, nIDCaption)

 {

 }

 

@@ -163,28 +163,28 @@ CCmdUIPropertyPage::~CCmdUIPropertyPage()
 

 LRESULT CCmdUIPropertyPage::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam)

 {

-	if (message == WM_COMMAND) {

-		switch (HIWORD(wParam)) {

-			case BN_CLICKED:

-			case CBN_SELCHANGE:

-			case EN_CHANGE:

-				SetModified();

-			default:

-				;

-		}

-	}

-

-	LRESULT ret = __super::DefWindowProc(message, wParam, lParam);

-

-	if (message == WM_INITDIALOG) {

-		SendMessage(WM_KICKIDLE);

-	}

-

-	return ret;

+    if (message == WM_COMMAND) {

+        switch (HIWORD(wParam)) {

+            case BN_CLICKED:

+            case CBN_SELCHANGE:

+            case EN_CHANGE:

+                SetModified();

+            default:

+                ;

+        }

+    }

+

+    LRESULT ret = __super::DefWindowProc(message, wParam, lParam);

+

+    if (message == WM_INITDIALOG) {

+        SendMessage(WM_KICKIDLE);

+    }

+

+    return ret;

 }

 

 BEGIN_MESSAGE_MAP(CCmdUIPropertyPage, CPropertyPage)

-	ON_MESSAGE_VOID(WM_KICKIDLE, OnKickIdle)

+    ON_MESSAGE_VOID(WM_KICKIDLE, OnKickIdle)

 END_MESSAGE_MAP()

 

 

@@ -192,7 +192,7 @@ END_MESSAGE_MAP()
 

 void CCmdUIPropertyPage::OnKickIdle()

 {

-	UpdateDialogControls(this, false);

+    UpdateDialogControls(this, false);

 

-	// TODO: maybe we should send this call to modeless child cPropertyPages too

+    // TODO: maybe we should send this call to modeless child cPropertyPages too

 }