[Winmerge-svn] SF.net SVN: winmerge:[6858] trunk/Src

[<ki...@us...>]

Revision: 6858
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6858&view=rev
Author:   kimmov
Date:     2009-06-25 07:48:26 +0000 (Thu, 25 Jun 2009)

Log Message:
-----------
Remove couple of CString uses.

Modified Paths:
--------------
    trunk/Src/DiffWrapper.cpp
    trunk/Src/DiffWrapper.h
    trunk/Src/PatchTool.cpp

Modified: trunk/Src/DiffWrapper.cpp
===================================================================
--- trunk/Src/DiffWrapper.cpp	2009-06-25 07:46:29 UTC (rev 6857)
+++ trunk/Src/DiffWrapper.cpp	2009-06-25 07:48:26 UTC (rev 6858)
@@ -127,18 +127,18 @@
  * @p filename is empty, patch files are disabled.
  * @param [in] filename Filename for patch file, or empty string.
  */
-void CDiffWrapper::SetCreatePatchFile(const CString &filename)
+void CDiffWrapper::SetCreatePatchFile(const String &filename)
 {
-	if (filename.IsEmpty())
+	if (filename.empty())
 	{
 		m_bCreatePatchFile = FALSE;
-		m_sPatchFile.Empty();
+		m_sPatchFile.clear();
 	}
 	else
 	{
 		m_bCreatePatchFile = TRUE;
 		m_sPatchFile = filename;
-		m_sPatchFile.Replace('/', '\\');
+		string_replace(m_sPatchFile, L"/", L"\\");
 	}
 }
 
@@ -1241,10 +1241,10 @@
 		inf_patch[1].stat.st_mtime = st.st_mtime;
 
 	outfile = NULL;
-	if (!m_sPatchFile.IsEmpty())
+	if (!m_sPatchFile.empty())
 	{
 		LPCTSTR mode = (m_bAppendFiles ? _T("a+") : _T("w+"));
-		outfile = _tfopen(m_sPatchFile, mode);
+		outfile = _tfopen(m_sPatchFile.c_str(), mode);
 	}
 
 	if (!outfile)

Modified: trunk/Src/DiffWrapper.h
===================================================================
--- trunk/Src/DiffWrapper.h	2009-06-25 07:46:29 UTC (rev 6857)
+++ trunk/Src/DiffWrapper.h	2009-06-25 07:48:26 UTC (rev 6858)
@@ -146,7 +146,7 @@
 public:
 	CDiffWrapper();
 	~CDiffWrapper();
-	void SetCreatePatchFile(const CString &filename);
+	void SetCreatePatchFile(const String &filename);
 	void SetCreateDiffList(DiffList *diffList);
 	void SetDiffList(DiffList *diffList);
 	void GetOptions(DIFFOPTIONS *options);
@@ -188,7 +188,7 @@
 	String m_s2AlternativePath; /**< Second file's alternative path (may be relative). */
 	String m_sOriginalFile1; /**< First file's original (NON-TEMP) path. */
 	String m_sOriginalFile2; /**< Second file's original (NON-TEMP) path. */
-	CString m_sPatchFile; /**< Full path to created patch file. */
+	String m_sPatchFile; /**< Full path to created patch file. */
 	BOOL m_bPathsAreTemp; /**< Are compared paths temporary? */
 	/// prediffer info are stored only for MergeDoc
 	PrediffingInfo * m_infoPrediffer;

Modified: trunk/Src/PatchTool.cpp
===================================================================
--- trunk/Src/PatchTool.cpp	2009-06-25 07:46:29 UTC (rev 6857)
+++ trunk/Src/PatchTool.cpp	2009-06-25 07:48:26 UTC (rev 6858)
@@ -123,7 +123,7 @@
 		}
 
 		// Select patch create -mode
-		m_diffWrapper.SetCreatePatchFile(m_pDlgPatch->m_fileResult);
+		m_diffWrapper.SetCreatePatchFile((LPCTSTR)m_pDlgPatch->m_fileResult);
 		m_diffWrapper.SetAppendFiles(m_pDlgPatch->m_appendFile);
 		m_diffWrapper.SetPrediffer(NULL);
 
@@ -169,7 +169,7 @@
 			LangMessageBox(IDS_DIFF_SUCCEEDED, MB_ICONINFORMATION|MB_DONT_DISPLAY_AGAIN,
 				            IDS_DIFF_SUCCEEDED);
 			
-			m_sPatchFile = m_pDlgPatch->m_fileResult;
+			m_sPatchFile = (LPCTSTR)m_pDlgPatch->m_fileResult;
 			m_bOpenToEditor = m_pDlgPatch->m_openToEditor;
 			retVal = 1;
 		}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.