Remove unused parameter from CMainFrame::SyncFileToVCS()

diff --git a/Src/Changes.txt b/Src/Changes.txt
index 763e70a..c7914a0 100644 (file)
--- a/Src/Changes.txt
+++ b/Src/Changes.txt
@@ -2,6 +2,10 @@ Src\Changes.txt
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2007-02-01 Kimmo
+ Remove unused parameter from CMainFrame::SyncFileToVCS()
+  Src: FileActionScript.cpp MainFrm.cpp MainFrm.h
+
 2007-02-01 WinMerge experimental release 2.7.1.6 (SVN revision 4094)
 
 2007-02-01 Kimmo

diff --git a/Src/FileActionScript.cpp b/Src/FileActionScript.cpp
index 5cf51cd..81a56d0 100644 (file)
--- a/Src/FileActionScript.cpp
+++ b/Src/FileActionScript.cpp
@@ -96,7 +96,7 @@ int FileActionScript::VCSCheckOut(const CString &path, BOOL &bApplyToAll)
                return retVal;
 
        // TODO: First param is not used!
-       int nRetVal = GetMainFrame()->SyncFileToVCS(_T(""), path, bApplyToAll, &strErr);
+       int nRetVal = GetMainFrame()->SyncFileToVCS(path, bApplyToAll, &strErr);
        if (nRetVal == -1)
        {
                retVal = SCRIPT_FAIL; // So we exit without file operations done

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index d4fce07..9dfc6e6 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -1224,17 +1224,15 @@ BOOL CMainFrame::CreateBackup(LPCTSTR pszPath)
 
 /**
  * @brief Sync file to Version Control System
- * @param pszSrc [in] File to copy
  * @param pszDest [in] Where to copy (incl. filename)
  * @param bApplyToAll [in,out] Apply user selection to all items
  * @param psError [out] Error string that can be shown to user in caller func
  * @return User selection or -1 if error happened
  * @sa CMainFrame::HandleReadonlySave()
  * @sa CDirView::PerformActionList()
- * @todo Parameter @p pszSrc is ununsed.
  */
-int CMainFrame::SyncFileToVCS(LPCTSTR pszSrc, LPCTSTR pszDest,
-       BOOL &bApplyToAll, CString *psError)
+int CMainFrame::SyncFileToVCS(LPCTSTR pszDest, BOOL &bApplyToAll,
+       CString *psError)
 {
        CString sActionError;
        CString strSavePath(pszDest);

diff --git a/Src/MainFrm.h b/Src/MainFrm.h
index 7a986ed..b2576a7 100644 (file)
--- a/Src/MainFrm.h
+++ b/Src/MainFrm.h
@@ -104,8 +104,7 @@ public:
        HMENU GetPrediffersSubmenu(HMENU mainMenu);
        void UpdatePrediffersMenu();
 
-       BOOL SyncFileToVCS(LPCTSTR pszSrc, LPCTSTR pszDest,     BOOL &bApplyToAll,
-               CString *psError);
+       BOOL SyncFileToVCS(LPCTSTR pszDest,     BOOL &bApplyToAll, CString *psError);
        BOOL DoFileOpen(LPCTSTR pszLeft = NULL, LPCTSTR pszRight = NULL,
                DWORD dwLeftFlags = 0, DWORD dwRightFlags = 0, BOOL bRecurse = FALSE, CDirDoc *pDirDoc = NULL, CString prediffer = _T(""));
        int ShowMergeDoc(CDirDoc * pDirDoc, const FileLocation & filelocLeft,