[Winmerge-svn] SF.net SVN: winmerge:[7063] trunk/Src
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
Menu
▾
▴
[Winmerge-svn] SF.net SVN: winmerge:[7063] trunk/Src
|
From: <ki...@us...> - 2009-12-27 15:28:24
|
Revision: 7063
http://winmerge.svn.sourceforge.net/winmerge/?rev=7063&view=rev
Author: kimmov
Date: 2009-12-27 15:28:16 +0000 (Sun, 27 Dec 2009)
Log Message:
-----------
Unify DIFFITEM method naming and remove unused method.
Modified Paths:
--------------
trunk/Src/7zCommon.cpp
trunk/Src/DiffContext.cpp
trunk/Src/DiffItem.cpp
trunk/Src/DiffItem.h
trunk/Src/DirView.cpp
trunk/Src/DirViewColItems.cpp
trunk/Src/MainFrm.cpp
Modified: trunk/Src/7zCommon.cpp
===================================================================
--- trunk/Src/7zCommon.cpp 2009-12-27 14:43:51 UTC (rev 7062)
+++ trunk/Src/7zCommon.cpp 2009-12-27 15:28:16 UTC (rev 7063)
@@ -911,8 +911,8 @@
envelope->FullPath = sFilename;
envelope->FullPath.insert(0, _T("\\"));
envelope->FullPath.insert(0, m_bRight ?
- di.getRightFilepath(pDoc->GetRightBasePath()) :
- di.getLeftFilepath(pDoc->GetLeftBasePath()));
+ di.GetRightFilepath(pDoc->GetRightBasePath()) :
+ di.GetLeftFilepath(pDoc->GetLeftBasePath()));
UINT32 Recurse = item.Mask.Recurse;
@@ -930,7 +930,7 @@
// Folder is not implied by some other file, and has
// not been enumerated so far, so enumerate it now!
envelope->Name = di.left.path;
- envelope->FullPath = di.getLeftFilepath(pDoc->GetLeftBasePath());
+ envelope->FullPath = di.GetLeftFilepath(pDoc->GetLeftBasePath());
implied = PVOID(2); // Don't enumerate same folder twice!
isSideLeft = false;
Recurse = 0;
@@ -949,7 +949,7 @@
// Folder is not implied by some other file, and has
// not been enumerated so far, so enumerate it now!
envelope->Name = di.right.path;
- envelope->FullPath = di.getRightFilepath(pDoc->GetRightBasePath());
+ envelope->FullPath = di.GetRightFilepath(pDoc->GetRightBasePath());
implied = PVOID(2); // Don't enumerate same folder twice!
isSideRight = false;
Recurse = 0;
@@ -1105,7 +1105,7 @@
{
cchBuffer +=
(
- m_bRight ? di.getRightFilepath(sLeftRootPath) : di.getLeftFilepath(sRightRootPath)
+ m_bRight ? di.GetRightFilepath(sLeftRootPath) : di.GetLeftFilepath(sRightRootPath)
).length() + (m_bRight ? di.right.filename : di.left.filename).length() + 2;
}
}
@@ -1119,7 +1119,7 @@
(
pchBuffer,
_T("%s\\%s"),
- m_bRight ? di.getRightFilepath(sLeftRootPath).c_str() : di.getLeftFilepath(sRightRootPath).c_str(),
+ m_bRight ? di.GetRightFilepath(sLeftRootPath).c_str() : di.GetLeftFilepath(sRightRootPath).c_str(),
m_bRight ? di.right.filename.c_str() : di.left.filename.c_str()
) + 1;
}
Modified: trunk/Src/DiffContext.cpp
===================================================================
--- trunk/Src/DiffContext.cpp 2009-12-27 14:43:51 UTC (rev 7062)
+++ trunk/Src/DiffContext.cpp 2009-12-27 15:28:16 UTC (rev 7063)
@@ -130,9 +130,9 @@
String filepath;
if (bLeft == TRUE)
- filepath = paths_ConcatPath(di.getLeftFilepath(GetNormalizedLeft()), di.left.filename);
+ filepath = paths_ConcatPath(di.GetLeftFilepath(GetNormalizedLeft()), di.left.filename);
else
- filepath = paths_ConcatPath(di.getRightFilepath(GetNormalizedRight()), di.right.filename);
+ filepath = paths_ConcatPath(di.GetRightFilepath(GetNormalizedRight()), di.right.filename);
DiffFileInfo & dfi = bLeft ? di.left : di.right;
if (!dfi.Update(filepath.c_str()))
@@ -190,7 +190,7 @@
LPCTSTR ext = PathFindExtension(di.left.filename.c_str());
if (!CheckFileForVersion(ext))
return;
- spath = di.getLeftFilepath(GetNormalizedLeft());
+ spath = di.GetLeftFilepath(GetNormalizedLeft());
spath = paths_ConcatPath(spath, di.left.filename);
}
else
@@ -200,7 +200,7 @@
LPCTSTR ext = PathFindExtension(di.right.filename.c_str());
if (!CheckFileForVersion(ext))
return;
- spath = di.getRightFilepath(GetNormalizedRight());
+ spath = di.GetRightFilepath(GetNormalizedRight());
spath = paths_ConcatPath(spath, di.right.filename);
}
Modified: trunk/Src/DiffItem.cpp
===================================================================
--- trunk/Src/DiffItem.cpp 2009-12-27 14:43:51 UTC (rev 7062)
+++ trunk/Src/DiffItem.cpp 2009-12-27 15:28:16 UTC (rev 7063)
@@ -24,7 +24,7 @@
}
/** @brief Return path to left file, including all but file name */
-String DIFFITEM::getLeftFilepath(const String &sLeftRoot) const
+String DIFFITEM::GetLeftFilepath(const String &sLeftRoot) const
{
String sPath;
if (!diffcode.isSideRightOnly())
@@ -35,7 +35,7 @@
}
/** @brief Return path to right file, including all but file name */
-String DIFFITEM::getRightFilepath(const String &sRightRoot) const
+String DIFFITEM::GetRightFilepath(const String &sRightRoot) const
{
String sPath;
if (!diffcode.isSideLeftOnly())
Modified: trunk/Src/DiffItem.h
===================================================================
--- trunk/Src/DiffItem.h 2009-12-27 14:43:51 UTC (rev 7062)
+++ trunk/Src/DiffItem.h 2009-12-27 15:28:16 UTC (rev 7063)
@@ -144,9 +144,8 @@
DIFFITEM() : parent(NULL), nidiffs(-1), nsdiffs(-1), customFlags1(0) { }
~DIFFITEM();
- bool isEmpty() const { return this == &emptyitem; }
- String getLeftFilepath(const String &sLeftRoot) const;
- String getRightFilepath(const String &sRightRoot) const;
+ String GetLeftFilepath(const String &sLeftRoot) const;
+ String GetRightFilepath(const String &sRightRoot) const;
int GetDepth() const;
bool IsAncestor(const DIFFITEM *pdi) const;
bool HasChildren() const;
Modified: trunk/Src/DirView.cpp
===================================================================
--- trunk/Src/DirView.cpp 2009-12-27 14:43:51 UTC (rev 7062)
+++ trunk/Src/DirView.cpp 2009-12-27 15:28:16 UTC (rev 7063)
@@ -738,9 +738,9 @@
!di.diffcode.isSideLeftOnly() && !di.diffcode.isSideRightOnly() &&
!di.diffcode.isResultFiltered())
{
- String leftPath(di.getLeftFilepath(pDoc->GetLeftBasePath()));
+ String leftPath(di.GetLeftFilepath(pDoc->GetLeftBasePath()));
leftPath = paths_ConcatPath(leftPath, di.left.filename);
- String rightPath(di.getRightFilepath(pDoc->GetRightBasePath()));
+ 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());
@@ -827,8 +827,8 @@
continue;
String currentDir = (side == SIDE_LEFT) ?
- di.getLeftFilepath(pDoc->GetLeftBasePath()) :
- di.getRightFilepath(pDoc->GetRightBasePath());
+ di.GetLeftFilepath(pDoc->GetLeftBasePath()) :
+ di.GetRightFilepath(pDoc->GetRightBasePath());
String filename = ((side == SIDE_LEFT) ? di.left.filename : di.right.filename);
@@ -1289,7 +1289,7 @@
// right side base path (where to create)
subdir = di.left.filename;
basedir = GetDocument()->GetRightBasePath();
- basedir = di.getLeftFilepath(basedir);
+ basedir = di.GetLeftFilepath(basedir);
}
else
{
@@ -1297,7 +1297,7 @@
// left side base path (where to create)
subdir = di.right.filename;
basedir = GetDocument()->GetLeftBasePath();
- basedir = di.getRightFilepath(basedir);
+ basedir = di.GetRightFilepath(basedir);
}
String createpath = paths_ConcatPath(basedir, subdir);
newFolder = createpath;
@@ -3105,7 +3105,7 @@
const DIFFITEM& di = GetDiffItem(sel);
if (!di.diffcode.isSideRightOnly())
{
- strPaths += di.getLeftFilepath(GetDocument()->GetLeftBasePath());
+ strPaths += di.GetLeftFilepath(GetDocument()->GetLeftBasePath());
// If item is a folder then subfolder (relative to base folder)
// is in filename member.
strPaths = paths_ConcatPath(strPaths, di.left.filename);
@@ -3132,7 +3132,7 @@
const DIFFITEM& di = GetDiffItem(sel);
if (!di.diffcode.isSideLeftOnly())
{
- strPaths += di.getRightFilepath(pDoc->GetRightBasePath());
+ strPaths += di.GetRightFilepath(pDoc->GetRightBasePath());
// If item is a folder then subfolder (relative to base folder)
// is in filename member.
strPaths = paths_ConcatPath(strPaths, di.right.filename);
@@ -3159,7 +3159,7 @@
const DIFFITEM& di = GetDiffItem(sel);
if (!di.diffcode.isSideRightOnly())
{
- strPaths += di.getLeftFilepath(pDoc->GetLeftBasePath());
+ strPaths += di.GetLeftFilepath(pDoc->GetLeftBasePath());
// If item is a folder then subfolder (relative to base folder)
// is in filename member.
strPaths = paths_ConcatPath(strPaths, di.left.filename);
@@ -3170,7 +3170,7 @@
if (!di.diffcode.isSideLeftOnly())
{
- strPaths += di. getRightFilepath(pDoc->GetRightBasePath());
+ strPaths += di. GetRightFilepath(pDoc->GetRightBasePath());
// If item is a folder then subfolder (relative to base folder)
// is in filename member.
strPaths = paths_ConcatPath(strPaths, di.right.filename);
Modified: trunk/Src/DirViewColItems.cpp
===================================================================
--- trunk/Src/DirViewColItems.cpp 2009-12-27 14:43:51 UTC (rev 7062)
+++ trunk/Src/DirViewColItems.cpp 2009-12-27 15:28:16 UTC (rev 7063)
@@ -277,12 +277,12 @@
else if (di.diffcode.isSideLeftOnly())
{
s = theApp.LoadString(IDS_LEFT_ONLY_IN_FMT);
- string_replace(s, _T("%1"), di.getLeftFilepath(pCtxt->GetNormalizedLeft()).c_str());
+ string_replace(s, _T("%1"), di.GetLeftFilepath(pCtxt->GetNormalizedLeft()).c_str());
}
else if (di.diffcode.isSideRightOnly())
{
s = theApp.LoadString(IDS_RIGHT_ONLY_IN_FMT);
- string_replace(s, _T("%1"), di.getRightFilepath(pCtxt->GetNormalizedRight()).c_str());
+ string_replace(s, _T("%1"), di.GetRightFilepath(pCtxt->GetNormalizedRight()).c_str());
}
else if (di.diffcode.isResultSame())
{
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2009-12-27 14:43:51 UTC (rev 7062)
+++ trunk/Src/MainFrm.cpp 2009-12-27 15:28:16 UTC (rev 7063)
@@ -2087,10 +2087,10 @@
if (bValidFiles)
{
// Format full paths to files (leftFile/rightFile)
- String leftFile = item.getLeftFilepath(pDoc->GetLeftBasePath());
+ String leftFile = item.GetLeftFilepath(pDoc->GetLeftBasePath());
if (!leftFile.empty())
leftFile = paths_ConcatPath(leftFile, item.left.filename);
- String rightFile = item.getRightFilepath(pDoc->GetRightBasePath());
+ String rightFile = item.GetRightFilepath(pDoc->GetRightBasePath());
if (!rightFile.empty())
rightFile = paths_ConcatPath(rightFile, item.right.filename);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|