Reduce source code size

--HG--
branch : stable

diff --git a/Src/DirView.cpp b/Src/DirView.cpp
index ec98b77..e38234f 100644 (file)
--- a/Src/DirView.cpp
+++ b/Src/DirView.cpp
@@ -2546,11 +2546,7 @@ void CDirView::OnFirstdiff()
 
 void CDirView::OnUpdateFirstdiff(CCmdUI* pCmdUI)
 {
-       int firstDiff = GetFirstDifferentItem();
-       if (firstDiff > -1)
-               pCmdUI->Enable(TRUE);
-       else
-               pCmdUI->Enable(FALSE);
+       pCmdUI->Enable(GetFirstDifferentItem() > -1);
 }
 
 // Go to last diff
@@ -2577,11 +2573,7 @@ void CDirView::OnLastdiff()
 
 void CDirView::OnUpdateLastdiff(CCmdUI* pCmdUI)
 {
-       int firstDiff = GetFirstDifferentItem();
-       if (firstDiff > -1)
-               pCmdUI->Enable(TRUE);
-       else
-               pCmdUI->Enable(FALSE);
+       pCmdUI->Enable(GetFirstDifferentItem() > -1);
 }
 
 // Go to next diff
@@ -2617,10 +2609,7 @@ void CDirView::OnUpdateNextdiff(CCmdUI* pCmdUI)
 
        // Check if different files were found and
        // there is different item after focused item
-       if ((lastDiff > -1) && (focused < lastDiff))
-               pCmdUI->Enable(TRUE);
-       else
-               pCmdUI->Enable(FALSE);
+       pCmdUI->Enable((lastDiff > -1) && (focused < lastDiff));
 }
 
 // Go to prev diff
@@ -2656,10 +2645,7 @@ void CDirView::OnUpdatePrevdiff(CCmdUI* pCmdUI)
 
        // Check if different files were found and
        // there is different item before focused item
-       if ((firstDiff > -1) && (firstDiff < focused))
-               pCmdUI->Enable(TRUE);
-       else
-               pCmdUI->Enable(FALSE);
+       pCmdUI->Enable((firstDiff > -1) && (firstDiff < focused));
 }
 
 void CDirView::OnCurdiff()
@@ -2690,11 +2676,7 @@ void CDirView::OnCurdiff()
 
 void CDirView::OnUpdateCurdiff(CCmdUI* pCmdUI)
 {
-       int selection = GetFirstSelectedInd();
-       if (selection > -1)
-               pCmdUI->Enable(TRUE);
-       else
-               pCmdUI->Enable(FALSE);
+       pCmdUI->Enable(GetFirstSelectedInd() > -1);
 }
 
 int CDirView::GetFocusedItem()
@@ -3289,10 +3271,7 @@ void CDirView::OnUpdateCtxtOpenWithUnpacker(CCmdUI* pCmdUI)
                int sel = -1;
                sel = m_pList->GetNextItem(sel, LVNI_SELECTED);
                const DIFFITEM& di = GetDiffItem(sel);
-               if (IsItemDeletableOnBoth(di))
-                       pCmdUI->Enable(TRUE);
-               else
-                       pCmdUI->Enable(FALSE);
+               pCmdUI->Enable(IsItemDeletableOnBoth(di));
        }
 }
 
@@ -3623,10 +3602,7 @@ void CDirView::OnUpdatePluginPredifferMode(CCmdUI* pCmdUI)
        // and they may not all have the same setting
        // so I'm not trying this right now
 
-       if (GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED))
-               pCmdUI->Enable(TRUE);
-       else
-               pCmdUI->Enable(FALSE);
+       pCmdUI->Enable(GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED));
 
        BCMenu *pPopup = (BCMenu*) pCmdUI->m_pSubMenu;
        if (pPopup == NULL)

diff --git a/Src/LocationView.cpp b/Src/LocationView.cpp
index 5cb3719..406ef78 100644 (file)
--- a/Src/LocationView.cpp
+++ b/Src/LocationView.cpp
@@ -1136,11 +1136,7 @@ void CLocationView::DrawDiffMarker(CDC* pDC, int yCoord)
 void CLocationView::OnUpdateFileSave(CCmdUI* pCmdUI)
 {
        CMergeDoc *pd = GetDocument();
-
-       if (pd->m_ptBuf[0]->IsModified() || pd->m_ptBuf[1]->IsModified())
-               pCmdUI->Enable(true);
-       else
-               pCmdUI->Enable(false);
+       pCmdUI->Enable(pd->m_ptBuf[0]->IsModified() || pd->m_ptBuf[1]->IsModified());
 }
 
 /**
@@ -1149,11 +1145,7 @@ void CLocationView::OnUpdateFileSave(CCmdUI* pCmdUI)
 void CLocationView::OnUpdateFileSaveLeft(CCmdUI* pCmdUI)
 {
        CMergeDoc *pd = GetDocument();
-
-       if (!pd->m_ptBuf[0]->GetReadOnly() && pd->m_ptBuf[0]->IsModified())
-               pCmdUI->Enable(true);
-       else
-               pCmdUI->Enable(false);
+       pCmdUI->Enable(!pd->m_ptBuf[0]->GetReadOnly() && pd->m_ptBuf[0]->IsModified());
 }
 
 /**
@@ -1162,11 +1154,7 @@ void CLocationView::OnUpdateFileSaveLeft(CCmdUI* pCmdUI)
 void CLocationView::OnUpdateFileSaveMiddle(CCmdUI* pCmdUI)
 {
        CMergeDoc *pd = GetDocument();
-
-       if (pd->m_nBuffers > 2 && !pd->m_ptBuf[1]->GetReadOnly() && pd->m_ptBuf[1]->IsModified())
-               pCmdUI->Enable(true);
-       else
-               pCmdUI->Enable(false);
+       pCmdUI->Enable(pd->m_nBuffers > 2 && !pd->m_ptBuf[1]->GetReadOnly() && pd->m_ptBuf[1]->IsModified());
 }
 
 /**
@@ -1175,9 +1163,5 @@ void CLocationView::OnUpdateFileSaveMiddle(CCmdUI* pCmdUI)
 void CLocationView::OnUpdateFileSaveRight(CCmdUI* pCmdUI)
 {
        CMergeDoc *pd = GetDocument();
-
-       if (!pd->m_ptBuf[pd->m_nBuffers - 1]->GetReadOnly() && pd->m_ptBuf[pd->m_nBuffers - 1]->IsModified())
-               pCmdUI->Enable(true);
-       else
-               pCmdUI->Enable(false);
+       pCmdUI->Enable(!pd->m_ptBuf[pd->m_nBuffers - 1]->GetReadOnly() && pd->m_ptBuf[pd->m_nBuffers - 1]->IsModified());
 }

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index b6e1df8..518e38a 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -1550,10 +1550,7 @@ void CMainFrame::OnPluginUnpackMode(UINT nID )
 
 void CMainFrame::OnUpdatePluginUnpackMode(CCmdUI* pCmdUI) 
 {
-       if (GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED))
-               pCmdUI->Enable(TRUE);
-       else
-               pCmdUI->Enable(FALSE);
+       pCmdUI->Enable(GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED));
 
        if (pCmdUI->m_nID == ID_UNPACK_MANUAL)
                pCmdUI->SetRadio(PLUGIN_MANUAL == g_bUnpackerMode);
@@ -1585,10 +1582,7 @@ void CMainFrame::OnPluginPrediffMode(UINT nID )
 
 void CMainFrame::OnUpdatePluginPrediffMode(CCmdUI* pCmdUI) 
 {
-       if (GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED))
-               pCmdUI->Enable(TRUE);
-       else
-               pCmdUI->Enable(FALSE);
+       pCmdUI->Enable(GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED));
 
        if (pCmdUI->m_nID == ID_PREDIFFER_MANUAL)
                pCmdUI->SetRadio(PLUGIN_MANUAL == g_bPredifferMode);
@@ -1600,10 +1594,7 @@ void CMainFrame::OnUpdatePluginPrediffMode(CCmdUI* pCmdUI)
  */
 void CMainFrame::OnUpdateReloadPlugins(CCmdUI* pCmdUI)
 {
-       if (GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED))
-               pCmdUI->Enable(TRUE);
-       else
-               pCmdUI->Enable(FALSE);
+       pCmdUI->Enable(GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED));
 }
 
 void CMainFrame::OnReloadPlugins()
@@ -2072,10 +2063,7 @@ void CMainFrame::OnUpdateWindowCloseAll(CCmdUI* pCmdUI)
        }
 
        const DirDocList &dirdocs = GetAllDirDocs();
-       if (!dirdocs.IsEmpty())
-               pCmdUI->Enable(TRUE);
-       else
-               pCmdUI->Enable(FALSE);
+       pCmdUI->Enable(!dirdocs.IsEmpty());
 }
 
 /**

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index e919b2c..79ba59e 100644 (file)
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -1755,14 +1755,7 @@ void CMergeDoc::OnFileSaveAsLeft()
  */
 void CMergeDoc::OnUpdateFileSaveAsMiddle(CCmdUI* pCmdUI)
 {
-       if (m_nBuffers == 3)
-       {
-               pCmdUI->Enable(true);
-       }
-       else
-       {
-               pCmdUI->Enable(false);
-       }
+       pCmdUI->Enable(m_nBuffers == 3);
 }
 
 /**

diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp
index 9ed7152..2af8489 100644 (file)
--- a/Src/MergeEditView.cpp
+++ b/Src/MergeEditView.cpp
@@ -869,10 +869,7 @@ void CMergeEditView::OnUpdateCurdiff(CCmdUI* pCmdUI)
        if (nCurrentDiff == -1)
        {
                int nNewDiff = pd->m_diffList.LineToDiff(pos.y);
-               if (nNewDiff != -1 && pd->m_diffList.IsDiffSignificant(nNewDiff))
-                       pCmdUI->Enable(true);
-               else
-                       pCmdUI->Enable(false);
+               pCmdUI->Enable(nNewDiff != -1 && pd->m_diffList.IsDiffSignificant(nNewDiff));
        }
        else
                pCmdUI->Enable(true);
@@ -2163,11 +2160,7 @@ bool CMergeEditView::IsReadOnly(int pane) const
 void CMergeEditView::OnUpdateFileSaveLeft(CCmdUI* pCmdUI)
 {
        CMergeDoc *pd = GetDocument();
-
-       if (!IsReadOnly(0) && pd->m_ptBuf[0]->IsModified())
-               pCmdUI->Enable(true);
-       else
-               pCmdUI->Enable(false);
+       pCmdUI->Enable(!IsReadOnly(0) && pd->m_ptBuf[0]->IsModified());
 }
 
 /**
@@ -2176,11 +2169,7 @@ void CMergeEditView::OnUpdateFileSaveLeft(CCmdUI* pCmdUI)
 void CMergeEditView::OnUpdateFileSaveMiddle(CCmdUI* pCmdUI)
 {
        CMergeDoc *pd = GetDocument();
-
-       if (pd->m_nBuffers == 3 && !IsReadOnly(1) && pd->m_ptBuf[1]->IsModified())
-               pCmdUI->Enable(true);
-       else
-               pCmdUI->Enable(false);
+       pCmdUI->Enable(pd->m_nBuffers == 3 && !IsReadOnly(1) && pd->m_ptBuf[1]->IsModified());
 }
 
 /**
@@ -2189,11 +2178,7 @@ void CMergeEditView::OnUpdateFileSaveMiddle(CCmdUI* pCmdUI)
 void CMergeEditView::OnUpdateFileSaveRight(CCmdUI* pCmdUI)
 {
        CMergeDoc *pd = GetDocument();
-
-       if (!IsReadOnly(pd->m_nBuffers - 1) && pd->m_ptBuf[pd->m_nBuffers - 1]->IsModified())
-               pCmdUI->Enable(true);
-       else
-               pCmdUI->Enable(false);
+       pCmdUI->Enable(!IsReadOnly(pd->m_nBuffers - 1) && pd->m_ptBuf[pd->m_nBuffers - 1]->IsModified());
 }
 
 /**
@@ -2307,10 +2292,7 @@ void CMergeEditView::OnUpdateFileSave(CCmdUI* pCmdUI)
                if (pd->m_ptBuf[nPane]->IsModified())
                        bModified = true;
        }
-       if (bModified)
-               pCmdUI->Enable(true);
-       else
-               pCmdUI->Enable(false);
+       pCmdUI->Enable(bModified);
 }
 
 /**
@@ -3796,9 +3778,8 @@ void CMergeEditView::OnViewMargin()
  */
 void CMergeEditView::OnUpdateViewMargin(CCmdUI* pCmdUI)
 {
-       bool bViewMargin = GetOptionsMgr()->GetBool(OPT_VIEW_FILEMARGIN);
        pCmdUI->Enable(true);
-       pCmdUI->SetCheck(bViewMargin);
+       pCmdUI->SetCheck(GetOptionsMgr()->GetBool(OPT_VIEW_FILEMARGIN));
 }
 
 /**
@@ -3857,12 +3838,7 @@ void CMergeEditView::OnUpdateChangeScheme(CCmdUI* pCmdUI)
 {
        const bool bIsCurrentScheme = (m_CurSourceDef->type == (pCmdUI->m_nID - ID_COLORSCHEME_FIRST));
        pCmdUI->SetRadio(bIsCurrentScheme);
-
-       bool syntaxHLEnabled = GetOptionsMgr()->GetBool(OPT_SYNTAX_HIGHLIGHT);
-       if (syntaxHLEnabled)
-               pCmdUI->Enable(true);
-       else
-               pCmdUI->Enable(false);
+       pCmdUI->Enable(GetOptionsMgr()->GetBool(OPT_SYNTAX_HIGHLIGHT));
 }
 
 /**