BUG: [ 1222705 ] DiffFileInfo copy constructor broken (current CVS)

diff --git a/Src/DiffFileInfo.cpp b/Src/DiffFileInfo.cpp
index 68544ec..3f4a0c1 100644 (file)
--- a/Src/DiffFileInfo.cpp
+++ b/Src/DiffFileInfo.cpp
@@ -35,17 +35,6 @@ 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 7814cde..929aac3 100644 (file)
--- a/Src/DiffFileInfo.h
+++ b/Src/DiffFileInfo.h
@@ -84,7 +84,6 @@ 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/DiffItem.cpp b/Src/DiffItem.cpp
index 3b4e841..e1932f0 100644 (file)
--- a/Src/DiffItem.cpp
+++ b/Src/DiffItem.cpp
@@ -16,22 +16,6 @@ static char THIS_FILE[]=__FILE__;
 #define new DEBUG_NEW
 #endif
 
-/**
- * @brief Copy constructor.
- */
-DIFFITEM::DIFFITEM(const DIFFITEM &di)
-{
-       left = di.left;
-       right = di.right;
-       diffcode = di.diffcode;
-       if (di.sfilename.GetLength())
-               sfilename = di.sfilename;
-       if (di.sSubdir.GetLength())
-               sSubdir = di.sSubdir;
-       nsdiffs = di.nsdiffs;
-       ndiffs = di.ndiffs;
-}
-
 /** @brief Return path to left file, including all but file name */
 CString DIFFITEM::getLeftFilepath(CString sLeftRoot) const
 {

diff --git a/Src/DiffItem.h b/Src/DiffItem.h
index e082cfe..a27f2ca 100644 (file)
--- a/Src/DiffItem.h
+++ b/Src/DiffItem.h
@@ -36,7 +36,6 @@ struct DIFFCODE
 
        DIFFCODE() : diffcode(0) { }
        DIFFCODE(int diffcode) : diffcode(diffcode) { }
-       DIFFCODE(const DIFFCODE &code) : diffcode(code.diffcode) { }
 
        // file/directory
        bool isDirectory() const { return ((diffcode & DIFFCODE::DIRFLAG) == DIFFCODE::DIR); }
@@ -87,7 +86,6 @@ struct DIFFITEM : DIFFCODE
 
        DIFFITEM() : ndiffs(-1), nsdiffs(-1),
                sfilename(_T("")), sSubdir(_T("")) { }
-       DIFFITEM(const DIFFITEM &di);
 
        CString getLeftFilepath(CString sLeftRoot) const;
        CString getRightFilepath(CString sRightRoot) const;

diff --git a/Src/FileInfo.cpp b/Src/FileInfo.cpp
index 2524376..dec2fcc 100644 (file)
--- a/Src/FileInfo.cpp
+++ b/Src/FileInfo.cpp
@@ -34,18 +34,6 @@ 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 23abf80..8d6ee0f 100644 (file)
--- a/Src/FileInfo.h
+++ b/Src/FileInfo.h
@@ -48,7 +48,6 @@ 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();