Fix a few comments in procedure declarations

- Fixed (just a few) comments where the definition specifies and
initial value for a parameter, but the declaration has an incorrect or
missing comment.

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 59f6c68..d190507 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -608,7 +608,7 @@ FileLocationGuessEncodings(FileLocation & fileloc, int iGuessEncoding)
 
 bool CMainFrame::ShowAutoMergeDoc(CDirDoc * pDirDoc,
        int nFiles, const FileLocation ifileloc[],
-       const DWORD dwFlags[] /*=0*/, const String strDesc[], const String& sReportFile,
+       const DWORD dwFlags[], const String strDesc[], const String& sReportFile /*=_T("")*/,
        const PackingInfo * infoUnpacker /*= NULL*/)
 {
        int pane;
@@ -661,7 +661,7 @@ int GetActivePaneFromFlags(int nFiles, const DWORD dwFlags[])
  */
 bool CMainFrame::ShowMergeDoc(CDirDoc * pDirDoc,
        int nFiles, const FileLocation ifileloc[],
-       const DWORD dwFlags[], const String strDesc[], const String& sReportFile,
+       const DWORD dwFlags[], const String strDesc[], const String& sReportFile /*=_T("")*/,
        const PackingInfo * infoUnpacker /*= NULL*/)
 {
        if (!m_pMenus[MENU_MERGEVIEW])
@@ -747,7 +747,7 @@ bool CMainFrame::ShowMergeDoc(CDirDoc * pDirDoc,
 }
 
 bool CMainFrame::ShowHexMergeDoc(CDirDoc * pDirDoc, int nFiles, const FileLocation fileloc[],
-       const DWORD dwFlags[] /*=0*/, const String strDesc[], const String& sReportFile,
+       const DWORD dwFlags[], const String strDesc[], const String& sReportFile /*=_T("")*/,
        const PackingInfo * infoUnpacker /*= NULL*/)
 {
        if (!m_pMenus[MENU_HEXMERGEVIEW])
@@ -766,7 +766,7 @@ bool CMainFrame::ShowHexMergeDoc(CDirDoc * pDirDoc, int nFiles, const FileLocati
 }
 
 bool CMainFrame::ShowImgMergeDoc(CDirDoc * pDirDoc, int nFiles, const FileLocation fileloc[],
-       const DWORD dwFlags[], const String strDesc[], const String& sReportFile,
+       const DWORD dwFlags[], const String strDesc[], const String& sReportFile /*=_T("")*/,
        const PackingInfo * infoUnpacker/* = NULL*/)
 {
        CImgMergeFrame *pImgMergeFrame = new CImgMergeFrame();
@@ -894,7 +894,7 @@ static bool AddToRecentDocs(const PathContext& paths, const unsigned flags[], bo
  * @return TRUE if opening files and compare succeeded, FALSE otherwise.
  */
 BOOL CMainFrame::DoFileOpen(const PathContext * pFiles /*=NULL*/,
-       const DWORD dwFlags[] /*=0*/, const String strDesc[], const String& sReportFile, bool bRecurse /*=FALSE*/, CDirDoc *pDirDoc/*=NULL*/,
+       const DWORD dwFlags[] /*=NULL*/, const String strDesc[] /*=NULL*/, const String& sReportFile /*=T("")*/, bool bRecurse /*=FALSE*/, CDirDoc *pDirDoc/*=NULL*/,
        String prediffer /*=_T("")*/, const PackingInfo *infoUnpacker/*=NULL*/)
 {
        if (pDirDoc && !pDirDoc->CloseMergeDocs())
@@ -974,8 +974,8 @@ BOOL CMainFrame::DoFileOpen(const PathContext * pFiles /*=NULL*/,
                }
        }
 
-       // Determine if we want new a dirview open now that we know if it was
-       // and archive. Don't open new dirview if we are comparing files.
+       // Determine if we want a new dirview open, now that we know if it was
+       // an archive. Don't open a new dirview if we are comparing files.
        if (!pDirDoc)
        {
                if (pathsType == paths::IS_EXISTING_DIR)