PATCH: [ 1153127 ] Rename Filepath to FilepathWithEncoding

  Src: DiffWrapper.cpp DiffWrapper.h

diff --git a/Src/DiffWrapper.cpp b/Src/DiffWrapper.cpp
index f3ec223..175c42a 100644 (file)
--- a/Src/DiffWrapper.cpp
+++ b/Src/DiffWrapper.cpp
@@ -956,7 +956,7 @@ static bool isValidCodepage(int cp)
 /**
  * @brief Try to deduce encoding for this file
  */
-void DiffFileData::Filepath::GuessEncoding(const char **data, int count)
+void DiffFileData::FilepathWithEncoding::GuessEncoding(const char **data, int count)
 {
        if (unicoding == 0)
        {
@@ -1441,7 +1441,7 @@ static bool Unpack(CString & filepathTransformed,
  * return false if anything fails
  * caller has to DeleteFile filepathTransformed, if it differs from filepath
  */
-bool DiffFileData::Filepath::Transform(const CString & filepath, CString & filepathTransformed,
+bool DiffFileData::FilepathWithEncoding::Transform(const CString & filepath, CString & filepathTransformed,
        const CString & filteredFilenames, PrediffingInfo * infoPrediffer, int fd)
 {
        BOOL bMayOverwrite = FALSE; // temp variable set each time it is used

diff --git a/Src/DiffWrapper.h b/Src/DiffWrapper.h
index 4575a8b..195c855 100644 (file)
--- a/Src/DiffWrapper.h
+++ b/Src/DiffWrapper.h
@@ -231,11 +231,11 @@ struct DiffFileData
 
        file_data * m_inf;
        bool m_used; // whether m_inf has real data
-       struct Filepath : CString
+       struct FilepathWithEncoding : CString
        {
                int unicoding;
                int codepage;
-               Filepath():unicoding(0),codepage(0)
+               FilepathWithEncoding():unicoding(0),codepage(0)
                {
                }
                bool Transform(const CString & filepath, CString & filepathTransformed,

diff --git a/Src/readme.txt b/Src/readme.txt
index a283d0e..a176338 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -2,6 +2,9 @@
  PATCH: [ 1154259 ] Non blurred 'error.bmp'
   New clearer error bitmap from Tim Gerundt
   Src/Res: error.bmp
+ PATCH: [ 1153127 ] Rename Filepath to FilepathWithEncoding
+  Src: DiffWrapper.cpp DiffWrapper.h
+
 
 2005-03-01 WinMerge experimental release 2.3.1.5 (cvs)