[Winmerge-svn] SF.net SVN: winmerge:[6499] trunk/Src
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
Menu
▾
▴
[Winmerge-svn] SF.net SVN: winmerge:[6499] trunk/Src
|
From: <ki...@us...> - 2009-02-25 13:31:57
|
Revision: 6499
http://winmerge.svn.sourceforge.net/winmerge/?rev=6499&view=rev
Author: kimmov
Date: 2009-02-25 13:31:52 +0000 (Wed, 25 Feb 2009)
Log Message:
-----------
Remove unused variables.
Modified Paths:
--------------
trunk/Src/Common/LanguageSelect.cpp
trunk/Src/DiffWrapper.cpp
trunk/Src/DirColsDlg.cpp
trunk/Src/DirView.cpp
trunk/Src/FileTransform.cpp
trunk/Src/LocationView.cpp
trunk/Src/MergeDoc.cpp
trunk/Src/UniMarkdownFile.cpp
trunk/Src/editlib/ccrystaltextbuffer.cpp
trunk/Src/editlib/ccrystaltextview.cpp
trunk/Src/editlib/crystalparser.cpp
Modified: trunk/Src/Common/LanguageSelect.cpp
===================================================================
--- trunk/Src/Common/LanguageSelect.cpp 2009-02-25 13:25:32 UTC (rev 6498)
+++ trunk/Src/Common/LanguageSelect.cpp 2009-02-25 13:31:52 UTC (rev 6499)
@@ -978,7 +978,6 @@
while (i > 0)
{
--i;
- UINT id = 0;
MENUITEMINFO mii;
mii.cbSize = sizeof mii;
mii.fMask = MIIM_STATE|MIIM_ID|MIIM_SUBMENU|MIIM_DATA;
@@ -1088,10 +1087,6 @@
HMENU hNewDirMenu = pMainFrame->NewDirViewMenu();
if (hNewDefaultMenu && hNewMergeMenu && hNewDirMenu)
{
- CMenu* pOldDefaultMenu = CMenu::FromHandle(pMainFrame->m_hMenuDefault);
- CMenu* hOldMergeMenu = CMenu::FromHandle(pApp->m_pDiffTemplate->m_hMenuShared);
- CMenu* hOldDirMenu = CMenu::FromHandle(pApp->m_pDirTemplate->m_hMenuShared);
-
// Note : for Windows98 compatibility, use FromHandle and not Attach/Detach
CMenu * pNewDefaultMenu = CMenu::FromHandle(hNewDefaultMenu);
CMenu * pNewMergeMenu = CMenu::FromHandle(hNewMergeMenu);
Modified: trunk/Src/DiffWrapper.cpp
===================================================================
--- trunk/Src/DiffWrapper.cpp 2009-02-25 13:25:32 UTC (rev 6498)
+++ trunk/Src/DiffWrapper.cpp 2009-02-25 13:31:52 UTC (rev 6499)
@@ -356,7 +356,6 @@
LineData.erase(EolPos);
}
- int Len = LineData.size();
const char * StartOfComment = strstr(LineData.c_str(), filtercommentsset.StartMarker.c_str());
const char * EndOfComment = strstr(LineData.c_str(), filtercommentsset.EndMarker.c_str());
const char * InLineComment = strstr(LineData.c_str(), filtercommentsset.InlineMarker.c_str());
Modified: trunk/Src/DirColsDlg.cpp
===================================================================
--- trunk/Src/DirColsDlg.cpp 2009-02-25 13:25:32 UTC (rev 6498)
+++ trunk/Src/DirColsDlg.cpp 2009-02-25 13:31:52 UTC (rev 6499)
@@ -274,7 +274,6 @@
*/
void CDirColsDlg::OnLvnItemchangedColdlgList(NMHDR *pNMHDR, LRESULT *pResult)
{
- LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
POSITION pos = m_listColumns.GetFirstSelectedItemPosition();
if (pos)
Modified: trunk/Src/DirView.cpp
===================================================================
--- trunk/Src/DirView.cpp 2009-02-25 13:25:32 UTC (rev 6498)
+++ trunk/Src/DirView.cpp 2009-02-25 13:31:52 UTC (rev 6499)
@@ -534,7 +534,6 @@
}
int alldiffs = 0;
- int level = 0;
UINT_PTR diffpos = ctxt.GetFirstDiffPosition();
RedisplayChildren(diffpos, 0, cnt, alldiffs);
theApp.SetLastCompareResult(alldiffs);
Modified: trunk/Src/FileTransform.cpp
===================================================================
--- trunk/Src/FileTransform.cpp 2009-02-25 13:25:32 UTC (rev 6498)
+++ trunk/Src/FileTransform.cpp 2009-02-25 13:31:52 UTC (rev 6499)
@@ -662,8 +662,6 @@
*/
BOOL Transform2FilesToUTF8(String &strFile1Temp, String &strFile2Temp,BOOL m_bPathsAreTemp)
{
- BOOL bSuccess = false;
- int nFileChanged = 0;
//check first file for unicodeing
UniMemFile ufile;
if (!ufile.OpenReadOnly(strFile1Temp.c_str()))
Modified: trunk/Src/LocationView.cpp
===================================================================
--- trunk/Src/LocationView.cpp 2009-02-25 13:25:32 UTC (rev 6498)
+++ trunk/Src/LocationView.cpp 2009-02-25 13:31:52 UTC (rev 6499)
@@ -669,7 +669,6 @@
GetClientRect(rc);
int line = -1;
- int lineOther = -1;
int bar = IsInsideBar(rc, point);
if (bar == BAR_LEFT || bar == BAR_RIGHT)
{
@@ -895,16 +894,13 @@
CRect rc;
GetClientRect(rc);
- const double hTotal = rc.Height() - (2 * Y_OFFSET); // Height of draw area
const int nbLines = min(m_view[MERGE_VIEW_LEFT]->GetSubLineCount(),
m_view[MERGE_VIEW_RIGHT]->GetSubLineCount());
int nTopCoord = static_cast<int>(Y_OFFSET +
(static_cast<double>(nTopLine * m_lineInPix)));
- int nLeftCoord = INDICATOR_MARGIN;
int nBottomCoord = static_cast<int>(Y_OFFSET +
(static_cast<double>(nBottomLine * m_lineInPix)));
- int nRightCoord = rc.Width() - INDICATOR_MARGIN;
double xbarBottom = min(nbLines / m_pixInLines + Y_OFFSET, rc.Height() - Y_OFFSET);
int barBottom = (int)xbarBottom;
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2009-02-25 13:25:32 UTC (rev 6498)
+++ trunk/Src/MergeDoc.cpp 2009-02-25 13:31:52 UTC (rev 6499)
@@ -1352,7 +1352,6 @@
*/
static void UnescapeControlChars(CString &s)
{
- int n = s.GetLength();
LPTSTR p = s.LockBuffer();
LPTSTR q = p;
while ((*p = *q) != _T('\0'))
Modified: trunk/Src/UniMarkdownFile.cpp
===================================================================
--- trunk/Src/UniMarkdownFile.cpp 2009-02-25 13:25:32 UTC (rev 6498)
+++ trunk/Src/UniMarkdownFile.cpp 2009-02-25 13:31:52 UTC (rev 6499)
@@ -193,7 +193,6 @@
{
while (m_current < m_base + m_filesize && isspace(*m_current))
{
- LPBYTE current = m_current;
BYTE eol = *m_current++;
if (eol == '\r' || eol == '\n')
{
Modified: trunk/Src/editlib/ccrystaltextbuffer.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextbuffer.cpp 2009-02-25 13:25:32 UTC (rev 6498)
+++ trunk/Src/editlib/ccrystaltextbuffer.cpp 2009-02-25 13:31:52 UTC (rev 6499)
@@ -1831,8 +1831,6 @@
// You must call InitNew() or LoadFromFile() first!
#ifdef _UNICODE
- LPCTSTR string = (LPCTSTR) GetLineChars (nLine);
- LPCTSTR current = string + nCol;
return FALSE;
#else // _UNICODE
const unsigned char *string = (const unsigned char *) GetLineChars (nLine);
@@ -1850,8 +1848,6 @@
// You must call InitNew() or LoadFromFile() first!
#ifdef _UNICODE
- LPCTSTR string = (LPCTSTR) GetLineChars (nLine);
- LPCTSTR current = string + nCol;
return FALSE;
#else // _UNICODE
const unsigned char *string = (const unsigned char *) GetLineChars (nLine);
Modified: trunk/Src/editlib/ccrystaltextview.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextview.cpp 2009-02-25 13:25:32 UTC (rev 6498)
+++ trunk/Src/editlib/ccrystaltextview.cpp 2009-02-25 13:31:52 UTC (rev 6499)
@@ -984,7 +984,6 @@
const int nCharWidthNarrowed = nCharWidth / 2;
const int nCharWidthWidened = nCharWidth * 2 - nCharWidthNarrowed;
const int nLineHeight = GetLineHeight();
- int nSumWidth = 0;
// i the character index, from 0 to lineLen-1
int i = 0;
@@ -2103,7 +2102,6 @@
rcCacheLine.OffsetRect( 0, nSubLineOffset * nLineHeight );
}
- const int nMaxLineChars = GetScreenChars();
//END SW
int nCurrentLine = m_nTopLine;
@@ -2942,8 +2940,6 @@
int nCurrentLine;
for (nCurrentLine = nTopLine; nCurrentLine <= nEndLine; nCurrentLine++)
{
- int nSubLines = GetSubLines (nCurrentLine);
-
rcLine.bottom = rcLine.top + GetSubLines (nCurrentLine) * nLineHeight;
rcMargin.bottom = rcLine.bottom;
Modified: trunk/Src/editlib/crystalparser.cpp
===================================================================
--- trunk/Src/editlib/crystalparser.cpp 2009-02-25 13:25:32 UTC (rev 6498)
+++ trunk/Src/editlib/crystalparser.cpp 2009-02-25 13:31:52 UTC (rev 6499)
@@ -58,7 +58,6 @@
int nTabWidth = m_pTextView->GetTabSize();
int nLineCharCount = 0;
int nCharCount = 0;
- int nCharPos = 0;
LPCTSTR szLine = m_pTextView->GetLineChars( nLineIndex );
int nLastBreakPos = 0;
int nLastCharBreakPos = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|