From 99f2f1e278fcd258e14c9288e2a210739b69d399 Mon Sep 17 00:00:00 2001
From: Kimmo Varis <kimmov@gmail.com>
Date: Fri, 17 Jun 2005 19:21:17 +0000
Subject: [PATCH] BUG: [ 1222705 ] DiffFileInfo copy constructor broken
 (current CVS)

---
 Src/DiffFileInfo.cpp | 11 -----------
 Src/DiffFileInfo.h   |  1 -
 Src/DiffItem.cpp     | 16 ----------------
 Src/DiffItem.h       |  2 --
 Src/FileInfo.cpp     | 12 ------------
 Src/FileInfo.h       |  1 -
 6 files changed, 43 deletions(-)

diff --git a/Src/DiffFileInfo.cpp b/Src/DiffFileInfo.cpp
index 68544ec26..3f4a0c139 100644
--- 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 7814cde4e..929aac330 100644
--- 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 3b4e84173..e1932f0d7 100644
--- 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 e082cfe37..a27f2cac9 100644
--- 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 2524376ae..dec2fcc72 100644
--- 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 23abf80b3..8d6ee0fd0 100644
--- 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();
-- 
2.11.0