PATCH: [ 1112636 ] Suggest cosmetic change in DiffFileData::OpenFiles

  (new method DiffFileData::Filepath::AssignPath)

diff --git a/Src/DiffWrapper.cpp b/Src/DiffWrapper.cpp
index 44ea837..f3ec223 100644 (file)
--- a/Src/DiffWrapper.cpp
+++ b/Src/DiffWrapper.cpp
@@ -824,8 +824,8 @@ DiffFileData::~DiffFileData()
 /** @brief Open file descriptors in the inf structure (return false if failure) */
 bool DiffFileData::OpenFiles(LPCTSTR szFilepath1, LPCTSTR szFilepath2)
 {
-       m_sFilepath[0].CString::operator=(szFilepath1);
-       m_sFilepath[1].CString::operator=(szFilepath2);
+       m_sFilepath[0].AssignPath(szFilepath1);
+       m_sFilepath[1].AssignPath(szFilepath2);
        bool b = DoOpenFiles();
        if (!b)
                Reset();

diff --git a/Src/DiffWrapper.h b/Src/DiffWrapper.h
index ccb274d..4575a8b 100644 (file)
--- a/Src/DiffWrapper.h
+++ b/Src/DiffWrapper.h
@@ -241,6 +241,7 @@ struct DiffFileData
                bool Transform(const CString & filepath, CString & filepathTransformed,
                        const CString & filteredFilenames, PrediffingInfo * infoPrediffer, int fd);
                void GuessEncoding(const char **data, int count);
+               void AssignPath(const CString & sFilePath) { CString::operator=(sFilePath); }
        } m_sFilepath[2];
        int m_ndiffs;
        int m_ntrivialdiffs;

diff --git a/Src/readme.txt b/Src/readme.txt
index 9bec5c4..7e4c002 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,8 @@
+2005-02-27 Perry
+ PATCH: [ 1112636 ] Suggest cosmetic change in DiffFileData::OpenFiles
+  (new method DiffFileData::Filepath::AssignPath)
+  Src: DiffWrapper.cpp DiffWrapper.h
+
 2005-02-27 Kimmo
  BUG: [ 1153017 ] FileFilterHelper::SetFilter ASSERTS on empty string
   Src: FileFilterHelper.cpp