From 3b1480e650f88f36d8b0b242ee16184bc7ede13a Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Sun, 22 May 2016 17:25:09 +0900
Subject: [PATCH] Change the IMergeDoc::GenerateReport() function interface

---
 Src/DirView.cpp     | 2 +-
 Src/DirView.h       | 1 -
 Src/HexMergeDoc.h   | 2 +-
 Src/IMergeDoc.h     | 2 +-
 Src/ImgMergeFrm.cpp | 8 ++++----
 Src/ImgMergeFrm.h   | 2 +-
 Src/MergeDoc.cpp    | 4 ++--
 Src/MergeDoc.h      | 2 +-
 8 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/Src/DirView.cpp b/Src/DirView.cpp
index bb9e6e39c..8ac9e6bf4 100644
--- a/Src/DirView.cpp
+++ b/Src/DirView.cpp
@@ -2419,7 +2419,7 @@ struct FileCmpReport: public IFileCmpReport
 
 		if (pMergeDoc)
 		{
-			pMergeDoc->GenerateReport(paths_ConcatPath(sDestDir, sLinkPath).c_str());
+			pMergeDoc->GenerateReport(paths_ConcatPath(sDestDir, sLinkPath));
 			pMergeDoc->CloseNow();
 		}
 
diff --git a/Src/DirView.h b/Src/DirView.h
index cfa510dc1..e055f80de 100644
--- a/Src/DirView.h
+++ b/Src/DirView.h
@@ -193,7 +193,6 @@ protected:
 
 // Implementation data
 protected:
-	CString GenerateReport();
 	CSortHeaderCtrl m_ctlSortHeader;
 	CImageList m_imageList;
 	CImageList m_imageState;
diff --git a/Src/HexMergeDoc.h b/Src/HexMergeDoc.h
index 56642dfcf..a5c3936b6 100644
--- a/Src/HexMergeDoc.h
+++ b/Src/HexMergeDoc.h
@@ -80,7 +80,7 @@ public:
 	void SetDirDoc(CDirDoc * pDirDoc);
 	void DirDocClosing(CDirDoc * pDirDoc);
 	bool CloseNow();
-	bool GenerateReport(LPCTSTR szFileName) { return true; }
+	bool GenerateReport(const String& sFileName) const { return true; }
 	CHexMergeFrame * GetParentFrame() const;
 	void UpdateHeaderPath(int pane);
 	void RefreshOptions();
diff --git a/Src/IMergeDoc.h b/Src/IMergeDoc.h
index 73765488b..11af8a1bd 100644
--- a/Src/IMergeDoc.h
+++ b/Src/IMergeDoc.h
@@ -8,7 +8,7 @@ struct IMergeDoc
 {
 	virtual void SetDirDoc(CDirDoc *pDirDoc) = 0;
 	virtual bool CloseNow(void) = 0;
-	virtual bool GenerateReport(const TCHAR *path) = 0;
+	virtual bool GenerateReport(const String &path) const = 0;
 	virtual void DirDocClosing(CDirDoc * pDirDoc) = 0;
 	virtual void CheckFileChanged() = 0;
 };
diff --git a/Src/ImgMergeFrm.cpp b/Src/ImgMergeFrm.cpp
index 36e8223a0..7fb194abc 100644
--- a/Src/ImgMergeFrm.cpp
+++ b/Src/ImgMergeFrm.cpp
@@ -1815,10 +1815,10 @@ void CImgMergeFrame::OnUpdateImgUseBackColor(CCmdUI* pCmdUI)
 /**
  * @brief Generate report from file compare results.
  */
-bool CImgMergeFrame::GenerateReport(LPCTSTR szFileName)
+bool CImgMergeFrame::GenerateReport(const String& sFileName) const
 {
 	String imgdir_full, imgdir, imgfilepath[3], diffimg_filename[3], path, name, ext;
-	paths_SplitFilename(szFileName, &path, &name, &ext);
+	paths_SplitFilename(sFileName, &path, &name, &ext);
 	imgdir_full = paths_ConcatPath(path, name) + _T(".files");
 	imgdir = paths_FindFileName(imgdir_full);
 	paths_CreateIfNeeded(imgdir_full);
@@ -1830,7 +1830,7 @@ bool CImgMergeFrame::GenerateReport(LPCTSTR szFileName)
 	}
 
 	UniStdioFile file;
-	if (!file.Open(szFileName, _T("wt")))
+	if (!file.Open(sFileName, _T("wt")))
 	{
 		String errMsg = GetSysError(GetLastError());
 		String msg = string_format_string1(
@@ -1888,7 +1888,7 @@ void CImgMergeFrame::OnToolsGenerateReport()
 	if (!SelectFile(AfxGetMainWnd()->GetSafeHwnd(), s, folder, _("Save As"), _("HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"), false, _T("htm")))
 		return;
 
-	GenerateReport(s.c_str());
+	GenerateReport(s);
 
 	LangMessageBox(IDS_REPORT_SUCCESS, MB_OK | MB_ICONINFORMATION);
 }
diff --git a/Src/ImgMergeFrm.h b/Src/ImgMergeFrm.h
index 61283980b..344a450d6 100644
--- a/Src/ImgMergeFrm.h
+++ b/Src/ImgMergeFrm.h
@@ -66,7 +66,7 @@ public:
 	void SetLastCompareResult(int nResult);
 	void UpdateAutoPaneResize();
 	void UpdateSplitter();
-	bool GenerateReport(LPCTSTR szFileName);
+	bool GenerateReport(const String& sFileName) const;
 	void DoAutoMerge(int dstPane);
 	bool IsModified() const;
 	bool IsFileChangedOnDisk(int pane) const;
diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index 287448357..6caf16b60 100644
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -3130,7 +3130,7 @@ String CMergeDoc::GetFileExt(LPCTSTR sFileName, LPCTSTR sDescription) const
 /**
  * @brief Generate report from file compare results.
  */
-bool CMergeDoc::GenerateReport(LPCTSTR szFileName)
+bool CMergeDoc::GenerateReport(const String& sFileName) const
 {
 	// calculate HTML font size
 	LOGFONT lf;
@@ -3141,7 +3141,7 @@ bool CMergeDoc::GenerateReport(LPCTSTR szFileName)
 
 	// create HTML report
 	UniStdioFile file;
-	if (!file.Open(szFileName, _T("wt")))
+	if (!file.Open(sFileName, _T("wt")))
 	{
 		String errMsg = GetSysError(GetLastError());
 		String msg = string_format_string1(
diff --git a/Src/MergeDoc.h b/Src/MergeDoc.h
index d3120bc20..5a9c2789a 100644
--- a/Src/MergeDoc.h
+++ b/Src/MergeDoc.h
@@ -278,7 +278,7 @@ public:
 	void SetDetectMovedBlocks(bool bDetectMovedBlocks);
 	bool IsMixedEOL(int nBuffer) const;
 	bool OpenWithUnpackerDialog();
-	bool GenerateReport(LPCTSTR szFileName);
+	bool GenerateReport(const String& sFileName) const;
 	void SetAutoMerged(bool bAutoMerged) { m_bAutoMerged = bAutoMerged; }
 	bool GetAutoMerged() const { return m_bAutoMerged; };
 	bool IsModified() const
-- 
2.11.0