From: Kimmo Varis <kimmov@gmail.com>
Date: Fri, 4 Mar 2005 08:58:21 +0000 (+0000)
Subject: PATCH: [ 1155436 ] Remove non-const GetDiffAt() from CDiffContext
X-Git-Tag: 2.16.5~6161
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=adf15ea95f8d2131731bc2d965331bf53bb7ee0d;p=winmerge-jp%2Fwinmerge-jp.git

PATCH: [ 1155436 ] Remove non-const GetDiffAt() from CDiffContext
---

diff --git a/Src/DiffContext.cpp b/Src/DiffContext.cpp
index 465633653..484a19e11 100644
--- a/Src/DiffContext.cpp
+++ b/Src/DiffContext.cpp
@@ -55,19 +55,18 @@ static char THIS_FILE[]=__FILE__;
  * @param [in] pszRight Initial right-side path.
  */
 CDiffContext::CDiffContext(LPCTSTR pszLeft /*=NULL*/, LPCTSTR pszRight /*=NULL*/)
+: m_bRecurse(FALSE)
+, pNamesLeft(NULL)
+, pNamesRight(NULL)
+, m_piFilterGlobal(NULL)
+, m_piPluginInfos(NULL)
+, m_msgUpdateStatus(0)
+, m_hDirFrame(NULL)
 {
-	m_bRecurse=FALSE;
 	m_strLeft = pszLeft;
 	m_strRight = pszRight;
 	m_pList = &m_dirlist;
 
-	pNamesLeft = NULL;
-	pNamesRight = NULL;
-	m_piFilterGlobal = 0;
-	m_piPluginInfos = 0;
-	m_msgUpdateStatus = 0;
-	m_hDirFrame = NULL;
-
 	m_strNormalizedLeft = pszLeft;
 	paths_normalize(m_strNormalizedLeft);
 	m_strNormalizedRight = pszRight;
@@ -82,6 +81,8 @@ CDiffContext::CDiffContext(LPCTSTR pszLeft /*=NULL*/, LPCTSTR pszRight /*=NULL*/
  * @param [in] src Existing CDiffContext whose data is copied.
  */
 CDiffContext::CDiffContext(LPCTSTR pszLeft, LPCTSTR pszRight, CDiffContext& src)
+: pNamesLeft(NULL)
+, pNamesRight(NULL)
 {
 	// This is used somehow in recursive comparisons
 	// I think that it is only used during rescan to copy into temporaries
@@ -97,9 +98,6 @@ CDiffContext::CDiffContext(LPCTSTR pszLeft, LPCTSTR pszRight, CDiffContext& src)
 	m_msgUpdateStatus = src.m_msgUpdateStatus;
 	m_hDirFrame = src.m_hDirFrame;
 
-	pNamesLeft = NULL;
-	pNamesRight = NULL;
-
 	m_strNormalizedLeft = pszLeft;
 	paths_normalize(m_strNormalizedLeft);
 	m_strNormalizedRight = pszRight;
@@ -177,11 +175,6 @@ const DIFFITEM & CDiffContext::GetDiffAt(POSITION diffpos) const
 {
 	return m_pList->GetAt(diffpos);
 }
-DIFFITEM & CDiffContext::GetDiffAt(POSITION diffpos)
-{
-	return m_pList->GetAt(diffpos);
-}
-
 
 /**
  * @brief Get number of items in CDiffContext array
diff --git a/Src/DiffContext.h b/Src/DiffContext.h
index b2f87b0da..7ef108a9f 100644
--- a/Src/DiffContext.h
+++ b/Src/DiffContext.h
@@ -141,7 +141,6 @@ public:
 	// to iterate over all differences on list
 	POSITION GetFirstDiffPosition();
 	DIFFITEM GetNextDiffPosition(POSITION & diffpos);
-	DIFFITEM & GetDiffAt(POSITION diffpos);
 	const DIFFITEM & GetDiffAt(POSITION diffpos) const;
 //	int GetDiffStatus(POSITION diffpos);
 	int GetDiffCount();
diff --git a/Src/DirDoc.cpp b/Src/DirDoc.cpp
index 64bd64b34..15526e675 100644
--- a/Src/DirDoc.cpp
+++ b/Src/DirDoc.cpp
@@ -355,7 +355,7 @@ void CDirDoc::ReloadItemStatus(UINT nIdx, BOOL bLeft, BOOL bRight)
 	m_pCtxt->UpdateStatusFromDisk(diffpos, bLeft, bRight);
 
 	// Update view
-	DIFFITEM & updated = m_pCtxt->GetDiffAt(diffpos);
+	const DIFFITEM & updated = m_pCtxt->GetDiffAt(diffpos);
 	m_pDirView->UpdateDiffItemStatus(nIdx, updated);
 }
 
diff --git a/Src/DirView.h b/Src/DirView.h
index 23b075903..2625b89b7 100644
--- a/Src/DirView.h
+++ b/Src/DirView.h
@@ -163,7 +163,7 @@ public:
 	void UpdateColumnNames();
 	static int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort);
 	int AddDiffItem(int index, const DIFFITEM & di, LPCTSTR szPath, POSITION curdiffpos);
-	void UpdateDiffItemStatus(UINT nIdx, DIFFITEM & di);
+	void UpdateDiffItemStatus(UINT nIdx, const DIFFITEM & di);
 	void ToDoDeleteThisValidateColumnOrdering() { ValidateColumnOrdering(); }
 private:
 	void InitiateSort();
diff --git a/Src/DirViewColHandler.cpp b/Src/DirViewColHandler.cpp
index 18cbce6a9..5425732fe 100644
--- a/Src/DirViewColHandler.cpp
+++ b/Src/DirViewColHandler.cpp
@@ -181,7 +181,7 @@ int CDirView::AddDiffItem(int index, const DIFFITEM & di, LPCTSTR szPath, POSITI
  * @brief Update listview display of details for specified row
  * @note Customising shownd data should be done here
  */
-void CDirView::UpdateDiffItemStatus(UINT nIdx, DIFFITEM & di)
+void CDirView::UpdateDiffItemStatus(UINT nIdx, const DIFFITEM & di)
 {
 	BOOL bLeftNewer = FALSE;
 	BOOL bRightNewer = FALSE;
diff --git a/Src/readme.txt b/Src/readme.txt
index 7b464ce1b..ac32a2393 100644
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -2,6 +2,8 @@
  PATCH: [ 1155319 ] Select font for dir compare view
   We must allow selecting file compare font even if no open views
   Src: Mainfrm.cpp
+ PATCH: [ 1155436 ] Remove non-const GetDiffAt() from CDiffContext
+  Src: DiffContext.cpp DiffContext.h DirDoc.cpp DirView.h DirViewColHandler.cpp
 
 2005-03-04 Perry
  PATCH: [ 1156253 ] Fix filter helper handling of new filters