Thread: [Winmerge-svn] SF.net SVN: winmerge:[6493] trunk/Src (Page 4)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 6493
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6493&view=rev
Author:   kimmov
Date:     2009-02-24 17:55:59 +0000 (Tue, 24 Feb 2009)

Log Message:
-----------
Use paths_ConcatPath() to combine paths.

Modified Paths:
--------------
    trunk/Src/DirView.cpp
    trunk/Src/FolderCmp.cpp
    trunk/Src/MainFrm.cpp
    trunk/Src/Merge.cpp

Modified: trunk/Src/DirView.cpp
===================================================================

--- trunk/Src/DirView.cpp	2009-02-24 16:05:10 UTC (rev 6492)
+++ trunk/Src/DirView.cpp	2009-02-24 17:55:59 UTC (rev 6493)
@@ -42,7 +42,7 @@
 #include "locality.h"
 #include "FileTransform.h"
 #include "SelectUnpackerDlg.h"
-#include "paths.h"	// GetPairComparability()
+#include "paths.h"
 #include "7zCommon.h"
 #include "OptionsDef.h"
 #include "BCMenu.h"
@@ -734,10 +734,10 @@
 			!di.diffcode.isSideLeftOnly() && !di.diffcode.isSideRightOnly() &&
 			!di.diffcode.isResultFiltered())
 		{
-			String leftPath = di.getLeftFilepath(pDoc->GetLeftBasePath()) +
-					_T("\\") + di.left.filename;
-			String rightPath = di.getRightFilepath(pDoc->GetRightBasePath()) +
-					_T("\\") + di.right.filename;
+			String leftPath(di.getLeftFilepath(pDoc->GetLeftBasePath()));
+			leftPath = paths_ConcatPath(leftPath, di.left.filename);
+			String rightPath(di.getRightFilepath(pDoc->GetRightBasePath()));
+			rightPath = paths_ConcatPath(rightPath, di.right.filename);
 			CString filteredFilenames;
 			filteredFilenames.Format(_T("%s|%s"), leftPath.c_str(), rightPath.c_str());
 			PackingInfo * unpacker;
@@ -3055,10 +3055,9 @@
 		if (!di.diffcode.isSideRightOnly())
 		{
 			strPaths += di.getLeftFilepath(GetDocument()->GetLeftBasePath());
-			strPaths += _T("\\");
 			// If item is a folder then subfolder (relative to base folder)
 			// is in filename member.
-			strPaths += di.left.filename;
+			strPaths = paths_ConcatPath(strPaths, di.left.filename);
 			strPaths += _T("\r\n");
 		}
 	}
@@ -3079,11 +3078,10 @@
 		const DIFFITEM& di = GetDiffItem(sel);
 		if (!di.diffcode.isSideLeftOnly())
 		{
-			strPaths += di. getRightFilepath(pDoc->GetRightBasePath());
-			strPaths += _T("\\");
+			strPaths += di.getRightFilepath(pDoc->GetRightBasePath());
 			// If item is a folder then subfolder (relative to base folder)
 			// is in filename member.
-			strPaths += di.right.filename;
+			strPaths = paths_ConcatPath(strPaths, di.right.filename);
 			strPaths += _T("\r\n");
 		}
 	}
@@ -3105,20 +3103,18 @@
 		if (!di.diffcode.isSideRightOnly())
 		{
 			strPaths += di.getLeftFilepath(pDoc->GetLeftBasePath());
-			strPaths += _T("\\");
 			// If item is a folder then subfolder (relative to base folder)
 			// is in filename member.
-			strPaths += di.left.filename;
+			strPaths = paths_ConcatPath(strPaths, di.left.filename);
 			strPaths += _T("\r\n");
 		}
 
 		if (!di.diffcode.isSideLeftOnly())
 		{
 			strPaths += di. getRightFilepath(pDoc->GetRightBasePath());
-			strPaths += _T("\\");
 			// If item is a folder then subfolder (relative to base folder)
 			// is in filename member.
-			strPaths += di.right.filename;
+			strPaths = paths_ConcatPath(strPaths, di.right.filename);
 			strPaths += _T("\r\n");
 		}
 	}

Modified: trunk/Src/FolderCmp.cpp
===================================================================
--- trunk/Src/FolderCmp.cpp	2009-02-24 16:05:10 UTC (rev 6492)
+++ trunk/Src/FolderCmp.cpp	2009-02-24 17:55:59 UTC (rev 6493)
@@ -344,24 +344,23 @@
 	return code;
 }
 
-
 /**
  * @brief Get actual compared paths from DIFFITEM.
+ * @param [in] pCtx Pointer to compare context.
+ * @param [in] di DiffItem from which the paths are created.
+ * @param [out] left Gets the left compare path.
+ * @param [out] right Gets the right compare path.
  * @note If item is unique, same path is returned for both.
  */
 void GetComparePaths(CDiffContext * pCtxt, const DIFFITEM &di, String & left, String & right)
 {
-	static const TCHAR backslash[] = _T("\\");
-
 	if (!di.diffcode.isSideRightOnly())
 	{
 		// Compare file to itself to detect encoding
 		left = pCtxt->GetNormalizedLeft();
-		if (!paths_EndsWithSlash(left.c_str()))
-			left += backslash;
 		if (!di.left.path.empty())
-			left += di.left.path + backslash;
-		left += di.left.filename;
+			left = paths_ConcatPath(left, di.left.path);
+		left = paths_ConcatPath(left, di.left.filename);
 		if (di.diffcode.isSideLeftOnly())
 			right = left;
 	}
@@ -369,11 +368,9 @@
 	{
 		// Compare file to itself to detect encoding
 		right = pCtxt->GetNormalizedRight();
-		if (!paths_EndsWithSlash(right.c_str()))
-			right += backslash;
 		if (!di.right.path.empty())
-			right += di.right.path + backslash;
-		right += di.right.filename;
+			right = paths_ConcatPath(right, di.right.path);
+		right = paths_ConcatPath(right, di.right.filename);
 		if (di.diffcode.isSideRightOnly())
 			left = right;
 	}

Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp	2009-02-24 16:05:10 UTC (rev 6492)
+++ trunk/Src/MainFrm.cpp	2009-02-24 17:55:59 UTC (rev 6493)
@@ -1350,9 +1350,6 @@
 			_RPTF0(_CRT_ERROR, "Unknown backup location!");
 		}
 
-		if (!paths_EndsWithSlash(bakPath.c_str()))
-			bakPath += _T("\\");
-
 		BOOL success = FALSE;
 		if (GetOptionsMgr()->GetBool(OPT_BACKUP_ADD_BAK))
 		{
@@ -1380,7 +1377,7 @@
 			< MAX_PATH)
 		{
 			success = TRUE;
-			bakPath += filename;
+			bakPath = paths_ConcatPath(bakPath, filename);
 			bakPath += _T(".");
 			bakPath += ext;
 		}
@@ -2071,10 +2068,10 @@
 				// Format full paths to files (leftFile/rightFile)
 				String leftFile = item.getLeftFilepath(pDoc->GetLeftBasePath());
 				if (!leftFile.empty())
-					leftFile += _T("\\") + item.left.filename;
+					leftFile = paths_ConcatPath(leftFile, item.left.filename);
 				String rightFile = item.getRightFilepath(pDoc->GetRightBasePath());
 				if (!rightFile.empty())
-					rightFile += _T("\\") + item.right.filename;
+					rightFile = paths_ConcatPath(rightFile, item.right.filename);
 
 				// Format relative paths to files in folder compare
 				String leftpatch = item.left.path;

Modified: trunk/Src/Merge.cpp
===================================================================
--- trunk/Src/Merge.cpp	2009-02-24 16:05:10 UTC (rev 6492)
+++ trunk/Src/Merge.cpp	2009-02-24 17:55:59 UTC (rev 6493)
@@ -797,13 +797,11 @@
  */
 CString CMergeApp::GetDefaultFilterUserPath(BOOL bCreate /*=FALSE*/)
 {
-	CString pathMyFolders = env_GetMyDocuments(NULL).c_str();
-	CString pathFilters(pathMyFolders);
-	if (pathFilters.Right(1) != _T("\\"))
-		pathFilters += _T("\\");
-	pathFilters += DefaultRelativeFilterPath;
+	String pathMyFolders = env_GetMyDocuments(NULL);
+	String pathFilters(pathMyFolders);
+	pathFilters = paths_ConcatPath(pathFilters, DefaultRelativeFilterPath);
 
-	if (bCreate && !paths_CreateIfNeeded(pathFilters))
+	if (bCreate && !paths_CreateIfNeeded(pathFilters.c_str()))
 	{
 		// Failed to create a folder, check it didn't already
 		// exist.
@@ -816,7 +814,7 @@
 			pathFilters = pathMyFolders;
 		}
 	}
-	return pathFilters;
+	return pathFilters.c_str();
 }
 
 


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




Thread: [Winmerge-svn] SF.net SVN: winmerge:[6493] trunk/Src (Page 4)

Windows visual diff and merge for files and directories

winmerge-svn