PATCH: [ 1213649 ] Add copyconstructor to (Diff)FileInfo

diff --git a/Src/DiffFileInfo.cpp b/Src/DiffFileInfo.cpp
index 3f4a0c1..68544ec 100644 (file)
--- a/Src/DiffFileInfo.cpp
+++ b/Src/DiffFileInfo.cpp
@@ -35,6 +35,17 @@ static __int64 FileTimeToInt64(FILETIME & ft)
 }
 
 /**
+ * @brief Copy constructor.
+ */
+DiffFileInfo::DiffFileInfo(const DiffFileInfo &info)
+{
+       bVersionChecked = info.bVersionChecked;
+       flags = info.flags;
+       codepage = info.codepage;
+       unicoding = info.unicoding;
+}
+
+/**
  * @brief Update fileinfo from given file
  * @param [in] sFilePath Full path to file/directory to update
  */

diff --git a/Src/DiffFileInfo.h b/Src/DiffFileInfo.h
index 929aac3..7814cde 100644 (file)
--- a/Src/DiffFileInfo.h
+++ b/Src/DiffFileInfo.h
@@ -84,6 +84,7 @@ struct DiffFileInfo : public FileInfo
        int codepage; /**< 8bit codepage, if applicable, 0 is unknown or N/A */
        int unicoding; /**< Unicode encoding (ucr::CODESET) */
        DiffFileInfo() { Clear(); }
+       DiffFileInfo(const DiffFileInfo &info);
 
        CString getEncodingString() const;
        // We could stash a pointer here to the parent DIFFITEM

diff --git a/Src/FileInfo.cpp b/Src/FileInfo.cpp
index dec2fcc..2524376 100644 (file)
--- a/Src/FileInfo.cpp
+++ b/Src/FileInfo.cpp
@@ -34,6 +34,18 @@ static __int64 FileTimeToInt64(FILETIME & ft)
 }
 
 /**
+ * @brief Copy constructor.
+ */
+FileInfo::FileInfo(const FileInfo &fi)
+{
+       ctime = fi.ctime;
+       mtime = fi.mtime;
+       size = fi.size;
+       version = fi.version;
+       flags = fi.flags;
+}
+
+/**
  * @brief Update fileinfo from given file
  * @param [in] sFilePath Full path to file/directory to update
  */

diff --git a/Src/FileInfo.h b/Src/FileInfo.h
index 8d6ee0f..23abf80 100644 (file)
--- a/Src/FileInfo.h
+++ b/Src/FileInfo.h
@@ -48,6 +48,7 @@ struct FileInfo
        CString version; /**< string of fixed file version, eg, 1.2.3.4 */
        FileFlags flags; /**< file attributes */
        FileInfo() { Clear(); }
+       FileInfo(const FileInfo &fi);
 
        void Update(CString sFilePath);
        void Clear();

diff --git a/Src/readme.txt b/Src/readme.txt
index 63c7ebc..bb62457 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,7 @@
+2005-06-08 Kimmo
+ PATCH: [ 1213649 ] Add copyconstructor to (Diff)FileInfo
+  Src: DiffFileInfo.cpp DiffFileInfo.h FileInfo.cpp FileInfo.h
+
 2005-06-08 Perry
  PATCH: [ 1213238 ] noninteractive switch
   Src: MainFrm.cpp MainFrm.h Merge.cpp Merge.dsp Merge.h