PATCH: [ 1229867 ] RFE [ 1205516 ], RFE [ 887948 ], and other issues

  Submitted by Jochen, apply some parts now:
  DIFFITEM API cleanup, use const CString&

diff --git a/Src/DiffItem.cpp b/Src/DiffItem.cpp
index e1932f0..9090e0f 100644 (file)
--- a/Src/DiffItem.cpp
+++ b/Src/DiffItem.cpp
@@ -17,7 +17,7 @@ static char THIS_FILE[]=__FILE__;
 #endif
 
 /** @brief Return path to left file, including all but file name */
-CString DIFFITEM::getLeftFilepath(CString sLeftRoot) const
+CString DIFFITEM::getLeftFilepath(const CString &sLeftRoot) const
 {
        CString sPath;
        if (!isSideRight())
@@ -32,7 +32,7 @@ CString DIFFITEM::getLeftFilepath(CString sLeftRoot) const
 }
 
 /** @brief Return path to right file, including all but file name */
-CString DIFFITEM::getRightFilepath(CString sRightRoot) const
+CString DIFFITEM::getRightFilepath(const CString &sRightRoot) const
 {
        CString sPath;
        if (!isSideLeft())

diff --git a/Src/DiffItem.h b/Src/DiffItem.h
index a27f2ca..99dcbd5 100644 (file)
--- a/Src/DiffItem.h
+++ b/Src/DiffItem.h
@@ -84,11 +84,10 @@ struct DIFFITEM : DIFFCODE
        int     nsdiffs; /**< Amount of non-ignored differences */
        int ndiffs; /**< Total amount of differences */
 
-       DIFFITEM() : ndiffs(-1), nsdiffs(-1),
-               sfilename(_T("")), sSubdir(_T("")) { }
+       DIFFITEM() : ndiffs(-1), nsdiffs(-1) { }
 
-       CString getLeftFilepath(CString sLeftRoot) const;
-       CString getRightFilepath(CString sRightRoot) const;
+       CString getLeftFilepath(const CString &sLeftRoot) const;
+       CString getRightFilepath(const CString &sRightRoot) const;
 };
 
 #endif // _DIFF_ITEM_H_
\ No newline at end of file

diff --git a/Src/readme.txt b/Src/readme.txt
index c1fd917..7ecc20d 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -5,6 +5,10 @@
  PATCH: [ 1230344 ] MergeSwedish.rc for 2.3.4.0 beta
   Submitted by Hans Eriksson
   Src/Languages/Swedish: MergeSwedish.rc
+ PATCH: [ 1229867 ] RFE [ 1205516 ], RFE [ 887948 ], and other issues
+  Submitted by Jochen, apply some parts now:
+  DIFFITEM API cleanup, use const CString&
+   Src: DiffItem.cpp DiffItem.h
 
 2005-06-29 Perry
  PATCH: [ 1220421 ] warning in cvs trunk (probably a bool/BOOL mismatch)