From 34651a474d23a1dd56e6ae2ca48ad64e1b9f69d6 Mon Sep 17 00:00:00 2001 From: Perry Rapp Date: Sun, 27 Feb 2005 23:23:08 +0000 Subject: [PATCH] PATCH: [ 1112636 ] Suggest cosmetic change in DiffFileData::OpenFiles (new method DiffFileData::Filepath::AssignPath) --- Src/DiffWrapper.cpp | 4 ++-- Src/DiffWrapper.h | 1 + Src/readme.txt | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Src/DiffWrapper.cpp b/Src/DiffWrapper.cpp index 44ea83786..f3ec2237e 100644 --- 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 ccb274d7a..4575a8b79 100644 --- 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 9bec5c4a2..7e4c0028d 100644 --- 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 -- 2.11.0