|
From: <ki...@us...> - 2009-05-10 21:13:46
|
Revision: 6728
http://winmerge.svn.sourceforge.net/winmerge/?rev=6728&view=rev
Author: kimmov
Date: 2009-05-10 21:13:36 +0000 (Sun, 10 May 2009)
Log Message:
-----------
Add OptionsMgr::Set*() for setting new value for the option without saving to storage. Convert reading config log file to use these methods.
Modified Paths:
--------------
trunk/Src/Common/OptionsMgr.cpp
trunk/Src/Common/OptionsMgr.h
trunk/Src/MainFrm.cpp
Modified: trunk/Src/Common/OptionsMgr.cpp
===================================================================
--- trunk/Src/Common/OptionsMgr.cpp 2009-05-10 08:25:18 UTC (rev 6727)
+++ trunk/Src/Common/OptionsMgr.cpp 2009-05-10 21:13:36 UTC (rev 6728)
@@ -9,7 +9,7 @@
/* The MIT License
-Copyright (c) 2004-2008 Kimmo Varis
+Copyright (c) 2004-2009 Kimmo Varis
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files
(the "Software"), to deal in the Software without restriction, including
@@ -40,7 +40,7 @@
#include "varprop.h"
#include "OptionsMgr.h"
-static bool GetInt(LPCTSTR str, int & val);
+static bool GetAsInt(LPCTSTR str, int & val);
/**
* @brief Default constructor.
@@ -151,7 +151,7 @@
* @param [out] val Converted integer.
* @return true if conversion succeeded, false otherwise.
*/
-static bool GetInt(LPCTSTR str, int & val)
+static bool GetAsInt(LPCTSTR str, int & val)
{
if (str == NULL)
return false;
@@ -217,7 +217,7 @@
// Convert string to integer
{
int val=0;
- if (!::GetInt(svalue.c_str(), val))
+ if (!GetAsInt(svalue.c_str(), val))
return false;
value.SetInt(val);
return true;
@@ -487,6 +487,42 @@
}
/**
+ * @brief Set new value for boolean option.
+ * @param [in] name Option's name.
+ * @param [in] value Option's new value.
+ */
+int COptionsMgr::Set(LPCTSTR name, bool value)
+{
+ varprop::VariantValue valx;
+ valx.SetBool(value);
+ return Set(name, valx);
+}
+
+/**
+ * @brief Set new value for integer option.
+ * @param [in] name Option's name.
+ * @param [in] value Option's new value.
+ */
+int COptionsMgr::Set(LPCTSTR name, int value)
+{
+ varprop::VariantValue valx;
+ valx.SetInt(value);
+ return Set(name, valx);
+}
+
+/**
+ * @brief Set new value for string option.
+ * @param [in] name Option's name.
+ * @param [in] value Option's new value.
+ */
+int COptionsMgr::Set(LPCTSTR name, LPCTSTR value)
+{
+ varprop::VariantValue valx;
+ valx.SetString(value);
+ return Set(name, valx);
+}
+
+/**
* @brief Type-convert and forward to SaveOption(String, int)
* @param [in] name Option's name.
* @param [in] value Option's new value.
Modified: trunk/Src/Common/OptionsMgr.h
===================================================================
--- trunk/Src/Common/OptionsMgr.h 2009-05-10 08:25:18 UTC (rev 6727)
+++ trunk/Src/Common/OptionsMgr.h 2009-05-10 21:13:36 UTC (rev 6728)
@@ -8,7 +8,7 @@
// $Id$
/* The MIT License
-Copyright (c) 2004-2007 Kimmo Varis
+Copyright (c) 2004-2009 Kimmo Varis
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files
(the "Software"), to deal in the Software without restriction, including
@@ -93,10 +93,11 @@
varprop::VariantValue Get(LPCTSTR name) const;
String GetString(LPCTSTR name) const;
int GetInt(LPCTSTR name) const;
- void SetInt(LPCTSTR name, int value) { SaveOption(name, value); }
bool GetBool(LPCTSTR name) const;
- void SetBool(LPCTSTR name, bool value) { SaveOption(name, value); }
int Set(LPCTSTR name, varprop::VariantValue value);
+ int Set(LPCTSTR name, LPCTSTR value);
+ int Set(LPCTSTR name, bool value);
+ int Set(LPCTSTR name, int value);
int Reset(LPCTSTR name);
int GetDefault(LPCTSTR name, String & value) const;
int GetDefault(LPCTSTR name, DWORD & value) const;
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2009-05-10 08:25:18 UTC (rev 6727)
+++ trunk/Src/MainFrm.cpp 2009-05-10 21:13:36 UTC (rev 6728)
@@ -2397,7 +2397,7 @@
}
else
{
- options->SaveOption(name, *cfgval);
+ options->Set(name, *cfgval);
}
}
@@ -2416,7 +2416,7 @@
}
else
{
- options->SetBool(name, !!(*cfgval));
+ options->Set(name, !!(*cfgval));
}
}
@@ -2435,7 +2435,7 @@
}
else
{
- options->SetBool(name, !!(*cfgval));
+ options->Set(name, !!(*cfgval));
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-05-15 07:09:52
|
Revision: 6751
http://winmerge.svn.sourceforge.net/winmerge/?rev=6751&view=rev
Author: kimmov
Date: 2009-05-15 07:09:35 +0000 (Fri, 15 May 2009)
Log Message:
-----------
PATCH: [ 2785201 ] Stringdiffs
Submitted by Matthias Mayer
Modified Paths:
--------------
trunk/Src/MergeDocLineDiffs.cpp
trunk/Src/stringdiffs.cpp
trunk/Src/stringdiffsi.h
Modified: trunk/Src/MergeDocLineDiffs.cpp
===================================================================
--- trunk/Src/MergeDocLineDiffs.cpp 2009-05-14 14:34:10 UTC (rev 6750)
+++ trunk/Src/MergeDocLineDiffs.cpp 2009-05-15 07:09:35 UTC (rev 6751)
@@ -180,6 +180,7 @@
static int lastLine = -1;
static CRect lastRc1, lastRc2;
static int whichdiff=-2; // last diff highlighted (-2==none, -1=whole line)
+ int i1 = 0, i2 = 0;
// Only remember place in cycle if same line and same view
if (lastView != pView1 || lastLine != line)
@@ -195,26 +196,23 @@
CString str1(pView1->GetLineChars(line), pView1->GetFullLineLength(line));
CString str2(pView2->GetLineChars(line), pView2->GetFullLineLength(line));
- if (diffOptions.bIgnoreEol)
- {
- /* Commented out code because GetLineActualLength is buggy
- // Chop of eol (end of line) characters
- int len1 = pView1->GetLineActualLength(line);
- str1 = str1.Left(len1);
- int len2 = pView2->GetLineActualLength(line);
- str2 = str2.Left(len2);
- */
- int i = str1.GetLength()-1;
- while (i>=0 && (str1[i]=='\r' || str1[i]=='\n'))
- --i;
- if (i+1 < str1.GetLength())
- str1 = str1.Left(i+1);
- i = str2.GetLength()-1;
- while (i>=0 && (str2[i]=='\r' || str2[i]=='\n'))
- --i;
- if (i+1 < str2.GetLength())
- str2 = str2.Left(i+1);
- }
+ /* Commented out code because GetLineActualLength is buggy
+ // Chop of eol (end of line) characters
+ int len1 = pView1->GetLineActualLength(line);
+ str1 = str1.Left(len1);
+ int len2 = pView2->GetLineActualLength(line);
+ str2 = str2.Left(len2);
+ */
+ i1 = str1.GetLength() - 1;
+ while (i1 >= 0 && (str1[i1] == '\r' || str1[i1] == '\n'))
+ --i1;
+ if (i1 + 1 < str1.GetLength())
+ str1 = str1.Left(i1 + 1);
+ i2 = str2.GetLength() - 1;
+ while (i2 >= 0 && (str2[i2] == '\r' || str2[i2] == '\n'))
+ --i2;
+ if (i2+1 < str2.GetLength())
+ str2 = str2.Left(i2 + 1);
// We truncate diffs to remain inside line (ie, to not flag eol characters)
int width1 = pView1->GetLineLength(line);
@@ -228,7 +226,15 @@
vector<wdiff*> worddiffs;
bool breakType = GetBreakType();
sd_ComputeWordDiffs((LPCTSTR)str1, (LPCTSTR)str2, casitive, xwhite, breakType, difflvl == BYTEDIFF, &worddiffs);
-
+ //Add a diff in case of EOL difference
+ if (!diffOptions.bIgnoreEol)
+ {
+ if (pView1->GetTextBufferEol(line) != pView1->GetTextBufferEol(line))
+ {
+ wdiff *wdf = new wdiff(++i1, i1, ++i2, i2);
+ worddiffs.push_back(wdf);
+ }
+ }
if (worddiffs.empty())
{
// signal to caller that there was no diff
@@ -322,6 +328,7 @@
*/
void CMergeDoc::GetWordDiffArray(int nLineIndex, vector<wdiff*> *pworddiffs)
{
+ int i1 = 0, i2 = 0;
if (nLineIndex >= m_pView[0]->GetLineCount()) return;
if (nLineIndex >= m_pView[1]->GetLineCount()) return;
@@ -331,26 +338,23 @@
CString str1(m_pView[0]->GetLineChars(nLineIndex), m_pView[0]->GetFullLineLength(nLineIndex));
CString str2(m_pView[1]->GetLineChars(nLineIndex), m_pView[1]->GetFullLineLength(nLineIndex));
- if (diffOptions.bIgnoreEol)
- {
- /* Commented out code because GetLineActualLength is buggy
- // Chop of eol (end of line) characters
- int len1 = pView1->GetLineActualLength(line);
- str1 = str1.Left(len1);
- int len2 = pView2->GetLineActualLength(line);
- str2 = str2.Left(len2);
- */
- int i = str1.GetLength()-1;
- while (i>=0 && (str1[i]=='\r' || str1[i]=='\n'))
- --i;
- if (i+1 < str1.GetLength())
- str1 = str1.Left(i+1);
- i = str2.GetLength()-1;
- while (i>=0 && (str2[i]=='\r' || str2[i]=='\n'))
- --i;
- if (i+1 < str2.GetLength())
- str2 = str2.Left(i+1);
- }
+ /* Commented out code because GetLineActualLength is buggy
+ // Chop of eol (end of line) characters
+ int len1 = pView1->GetLineActualLength(line);
+ str1 = str1.Left(len1);
+ int len2 = pView2->GetLineActualLength(line);
+ str2 = str2.Left(len2);
+ */
+ i1 = str1.GetLength() - 1;
+ while (i1 >= 0 && (str1[i1] == '\r' || str1[i1] == '\n'))
+ --i1;
+ if (i1 + 1 < str1.GetLength())
+ str1 = str1.Left(i1 + 1);
+ i2 = str2.GetLength() - 1;
+ while (i2 >= 0 && (str2[i2]=='\r' || str2[i2]=='\n'))
+ --i2;
+ if (i2+1 < str2.GetLength())
+ str2 = str2.Left(i2 + 1);
// Options that affect comparison
bool casitive = !diffOptions.bIgnoreCase;
@@ -358,9 +362,17 @@
int breakType = GetBreakType(); // whitespace only or include punctuation
bool byteColoring = GetByteColoringOption();
- // Make the call to stringdiffs, which does all the hard & tedious computations
+ // Make the call to stringdiffs, which does all the hard & tedious computations
sd_ComputeWordDiffs((LPCTSTR)str1, (LPCTSTR)str2, casitive, xwhite, breakType, byteColoring, pworddiffs);
-
+ //Add a diff in case of EOL difference
+ if (!diffOptions.bIgnoreEol)
+ {
+ if (m_pView[0]->GetTextBufferEol(nLineIndex) != m_pView[1]->GetTextBufferEol(nLineIndex))
+ {
+ wdiff *wdf = new wdiff(++i1, i1, ++i2, i2);
+ pworddiffs->push_back(wdf);
+ }
+ }
return;
}
Modified: trunk/Src/stringdiffs.cpp
===================================================================
--- trunk/Src/stringdiffs.cpp 2009-05-14 14:34:10 UTC (rev 6750)
+++ trunk/Src/stringdiffs.cpp 2009-05-15 07:09:35 UTC (rev 6751)
@@ -142,34 +142,34 @@
if (m_whitespace == 2 && m_matchblock)
{
// Remove a leading whitespace
- if ((m_words1.size() > 0) && (IsSpace(*m_words1[0])))
+ if (((int) m_words1.size() > 0) && (IsSpace(*m_words1[0])))
{
RemoveItem1(0);
}
- if (m_words1.size() > 0)
+ if ((int)m_words1.size() > 0)
{
// Remove a ending whitespace
if (IsSpace(*m_words1[m_words1.size() - 1]))
RemoveItem1(m_words1.size() - 1);
}
// Remove a leading whitespace
- if ((m_words2.size() > 0) && (IsSpace(*m_words2[0])))
+ if (((int)m_words2.size() > 0) && (IsSpace(*m_words2[0])))
{
RemoveItem2(0);
- if (m_words2.size() > 0)
- {
- // Remove a ending whitespace
- if (IsSpace(*m_words2[ m_words2.size() - 1]))
- RemoveItem2(m_words2.size() - 1);
- }
}
+ if ((int)m_words2.size() > 0)
+ {
+ // Remove a ending whitespace
+ if (IsSpace(*m_words2[m_words2.size() - 1]))
+ RemoveItem2(m_words2.size() - 1);
+ }
// Now lets remove all space inbetween and put the words to
// one s\xEDngle word as it was break by space
// doit for word1
i = 0;
- while (m_words1.size() > i + 2)
+ while ((int)m_words1.size() > i + 1)
{
- if (IsSpace(*m_words1[i + 1]) && m_words1[i + 2]->bBreak == 0)
+ if (IsSpace(*m_words1[i + 1]) && IsWord(*m_words1[i + 2]))
{
m_words1[i]->hash =
Hash(m_str1, m_words1[i + 2]->start, m_words1[i+2]->end, m_words1[i]->hash);
@@ -182,9 +182,9 @@
}
// Doit for word2
i = 0;
- while (m_words2.size() > i + 2)
+ while ((int)m_words2.size() > i + 1)
{
- if (IsSpace(*m_words2[i + 1]) && m_words2[i + 2]->bBreak == 0)
+ if (IsSpace(*m_words2[i + 1]) && IsWord(*m_words2[i + 2]))
{
m_words2[i]->hash =
Hash(m_str2, m_words2[i + 2]->start, m_words2[i + 2]->end, m_words2[i]->hash);
@@ -201,54 +201,56 @@
// if distance to far, crosscheck match word1 in word2
// whatever is shorter, it's result.
int w1 = 0, w2 = 0; // position found in array
- int bw1 = 0; // start position in array
+ int bw1 = 0; // start position in m_words1
+ int bw2 = 0; // start position in m_words2
- if (m_matchblock && m_words1.size() > 0 && m_words2.size() > 0)
+ if (m_matchblock && (int)m_words1.size() > 0 && (int)m_words2.size() > 0)
{
- i = 0;
bw1 = 0;
- while (i < m_words2.size())
+ bw2 = 0;
+ while (bw2 < (int)m_words2.size())
{
w2 = 0;
- if (bw1 >= m_words1.size())
+ if (bw1 >= (int)m_words1.size())
break;
+
// Are we looking for a spacebreak, so just look for word->bBreak
- if (IsSpace(*m_words2[i]))
+ if (IsSpace(*m_words2[bw2]))
w1 = FindNextSpaceInWords1(bw1);
else
- w1 = FindNextMatchInWords1(*m_words2[i], bw1);
- // Found at same position, so go on wuth next word
+ w1 = FindNextMatchInWords1(*m_words2[bw2], bw1);
+ // Found at same position, so go on with next word
if (w1 == bw1)
{
bw1++;
- i++;
+ bw2++;
continue;
}
w2 = w1;
// Not found, not same, check whitch distance is shorter
if (w1 == -1 || (w1 - bw1) > 0)
{
- w2 = FindNextMatchInWords2(*m_words1[i], bw1);
+ w2 = FindNextMatchInWords2(*m_words1[bw2], bw1);
// Execption both are not found in other string
// so all between keep as a differ
if (w1 == -1 && w2 == -1)
{
bw1++;
- i++;
+ bw2++;
continue;
}
// Check if in distance 2 and 3 is equal again
- if (w2 == -1)
+ if ((w1 == -1) || (w2 == -1))
{
- if (i + 2 < m_words1.size() && (i + 2 < m_words2.size()))
+ if (bw2 + 2 < (int)m_words1.size() && (bw2 + 2 < (int)m_words2.size()))
{
- if (AreWordsSame(*m_words1[i + 1], *m_words2[i + 1]))
+ if (AreWordsSame(*m_words1[bw2 + 1], *m_words2[bw2 + 1]))
{
- if (AreWordsSame(*m_words1[i + 2], *m_words2[i + 2]))
+ if (AreWordsSame(*m_words1[bw2 + 2], *m_words2[bw2 + 2]))
{
// Ok than keep it as a differ
bw1 = bw1 + 2;
- i = i + 2;
+ bw2 = bw2 + 2;
continue;
}
}
@@ -258,7 +260,7 @@
// Not found in word1, or distance from word1 to word2 is shorter
// or too far away from both
- if ((w1 == -1) || (w1 < w2) || (w2 - bw1 > 4))
+ if (((w1 == -1) && (w2 == 0)) || ((w1 < w2)&& (w1 >= 0)) || (w2 - bw1 > 4))
{
// Not found in word1 or to far away
// so insert an empty record in word1
@@ -267,7 +269,7 @@
if (bw1)
{
// Last word is a insert? So use same positions
- if (m_words1[bw1 - 1]->bBreak == -2)
+ if (IsInsert(*m_words1[bw1 - 1]))
{
end = m_words1[bw1 - 1]->end;
start = m_words1[bw1 - 1]->start;
@@ -285,104 +287,147 @@
end = -1;
start = 0;
}
-
vector<word*>::iterator iter = m_words1.begin() + bw1;
- word *wd = new word(start, end, -2, 0);
+ word *wd = new word(start, end, dlinsert, 0);
m_words1.insert(iter, wd);
- i = i + 1; // Next record
+ // check if a space is following
+ if ((bw2 + 1) < (int)m_words2.size() && IsSpace(*m_words2[bw2 + 1]))
+ {
+ // Add a second insert
+ iter = m_words1.begin() + bw1;
+ word *wd = new word(start, end, dlinsert, 0);
+ m_words1.insert(iter, wd);
+ bw1 = bw1 + 1;
+ bw2 = bw2 + 1; // Next record
+ }
bw1 = bw1 + 1;
+ bw2 = bw2 + 1; // Next record
continue;
}
- else if (w1 < i)
+ else if (w2 > bw2)
{
- int k = i- w1;
+ int k = w2 - bw2;
for (int l = 0; l < k; l++)
{
// Remember last start end
- if (w1)
+ if (bw1)
{
- end = m_words1[w1 - 1]->end;
+ end = m_words1[bw1 - 1]->end;
}
else
{
end = -1;
}
start = end + 1;
- vector<word*>::iterator iter = m_words1.begin() + w1;
- word *wd = new word(start, end, -2, 0);
+ vector<word*>::iterator iter = m_words1.begin() + bw1;
+ word *wd = new word(start, end, dlinsert, 0);
m_words1.insert(iter, wd);
}
- i =i + k; // Next record
- bw1 = w1 + k;
+ bw1 = bw1 + k + 1;
+ bw2 = bw2 + k + 1; // Next record
continue;
}
- else if (w1 > i)
+ else if (w1 > bw2)
{
- int k = w1 - i;
+ int k = w1 - bw2;
for (int l = 0; l < k; l++)
{
// Remember last start end
- if (i)
+ if (bw2)
{
- end = m_words2[i - 1]->end;
+ end = m_words2[bw2 - 1]->end;
}
else
{
end = -1;
}
start = end + 1;
- vector<word*>::iterator iter = m_words2.begin() + i;
- word *wd = new word(start, end, -2, 0);
+ vector<word*>::iterator iter = m_words2.begin() + bw2;
+ word *wd = new word(start, end, dlinsert, 0);
m_words2.insert(iter, wd);
}
bw1 = w1 + 1;
- i = i + k + 1; // Next record
+ bw2 = bw2 + k + 1; // Next record
continue;
}
- else if (w1 == i)
+ else if (w1 == bw2)
{
bw1++;
- i++;
+ bw2++;
}
}
}
-
// If needed, this is the place to merge from back again
// to get more acurated matches
- if (m_words1.size() > 0 || m_words2.size() > 0)
+
+ // Make both array to same length
+ if ((int) m_words1.size() > 0 || (int) m_words2.size() > 0)
{
- // Make both array to same length
- i = 0;
- int length1 = m_words1.size();
- int length2 = m_words2.size();
+ if ((int)m_words1.size() != (int)m_words2.size())
+ {
+ i = 0;
+ int length1 = (int)m_words1.size() - 1;
+ int length2 = (int)m_words2.size() - 1;
- if (length1 == 0 || length2 == 0)
- i = i;
- if (length1 < length2)
- {
- end = m_str1.length() - 1;
- start = end + 1;
- word *wd = new word(start, end, -2, 0);
- m_words1.push_back(wd);
- m_words2[length1]->end = m_words2[length2 - 1]->end;
- while ((length1 + 1) < m_words2.size())
+ if (length1 < length2)
{
- delete m_words2.back();
- m_words2.pop_back();
+ // Mark char on side2 as inserted
+ if (length1 == -1)
+ {
+ end = - 1;
+ start = end + 1;
+ word *wd = new word(start, end, dlinsert, 0);
+ m_words1.push_back(wd);
+ // connect inserted char to one diff
+ m_words2[0]->start = 0;
+ m_words2[0]->end = m_words2[(int)m_words2.size() - 1]->end;
+ length1++;
+ }
+ else
+ {
+ start = m_words1[length1]->end + 1;
+ end = start - 1;
+ word *wd = new word(start, end, dlinsert, 0);
+ m_words1.push_back(wd);
+ length1++;
+ // connect inserted char to on diff
+ m_words2[length1]->end = m_words2[length2]->end;
+ }
+ while ((length1 + 2) < (int)m_words2.size())
+ {
+ RemoveItem2(length1 + 1);
+ }
}
- }
- if (length1 > length2)
- {
- end = m_str2.length() - 1;
- start = end + 1;
- word *wd = new word(start, end, -2, 0);
- m_words2.push_back(wd);
- m_words1[length2]->end = m_words1[length1 - 1]->end;
- while ((length2 + 1) < m_words1.size())
+ else if (length1 > length2)
{
- delete m_words1.back();
- m_words1.pop_back();
+ // Mark char on side1 as inserted
+ if (length2 == -1)
+ {
+ end = - 1;
+ start = 0;
+ word *wd = new word(start, end, dlinsert, 0);
+ m_words2.push_back(wd);
+ // connect inserted char to one diff
+ m_words1[0]->start = 0;
+ m_words1[0]->end = m_words1[(int)m_words1.size() - 1]->end;
+ length2++;
+ }
+ else
+ {
+ start = m_words2[length2]->end + 1;
+ end = start - 1;
+ word *wd = new word(start, end, dlinsert, 0);
+ m_words2.push_back(wd);
+ length2++;
+ // connect inserted char to one diff
+ m_words1[length2]->end = m_words1[length1]->end;
+ }
+
+ while ((length2 + 2) < (int)m_words1.size())
+ {
+ RemoveItem1(length2 + 1);
+ }
}
}
// Remove empty records on both side
@@ -390,7 +435,7 @@
OutputDebugString(_T("remove empty records on both side \n"));
#endif
i = 0;
- while ((i < m_words1.size()) && (i < m_words2.size()))
+ while ((i < (int)m_words1.size()) && (i < (int)m_words2.size()))
{
#ifdef STRINGDIFF_LOGGING
wsprintf(buf, _T("left=%d, op=%d, right=%d, op=%d\n"),
@@ -410,7 +455,7 @@
// Remove empty records on both side
// in case on the otherside +1 is also an empty one
i = 0;
- while ((i < m_words1.size() - 1) && (i < m_words2.size() - 1))
+ while ((i < ((int)m_words1.size() - 2)) && (i < ((int)m_words2.size() - 2)))
{
if (IsInsert(*m_words1[i]) && IsInsert(*m_words2[i + 1]))
{
@@ -430,7 +475,7 @@
// remove equal records on both side
// even diff is close together
i = 0;
- while ((i < m_words1.size() - 1) && (i < m_words2.size() - 1))
+ while ((i < (int) m_words1.size() - 1) && (i < (int) m_words2.size() - 1))
{
if (AreWordsSame(*m_words1[i], *m_words2[i]))
{
@@ -446,7 +491,7 @@
if (m_whitespace != 0)
{
i = 0;
- while ((i < m_words1.size()) && (i < m_words2.size()))
+ while ((i < (int)m_words1.size()) && (i < (int)m_words2.size()))
{
if (IsSpace(*m_words1[i]) && IsSpace(*m_words2[i]) )
{
@@ -462,7 +507,7 @@
// are also words at a block
// doit for word1
i = 0;
- while (m_words1.size() > i + 2 )
+ while ((int)m_words1.size() > i + 2)
{
if (IsInsert(*m_words1[i]) && IsInsert(*m_words1[i+1]))
{
@@ -478,7 +523,7 @@
}
// Doit for word2
i = 0;
- while (m_words2.size() > i + 2 )
+ while ((int)m_words2.size() > i + 2)
{
if (IsInsert(*m_words2[i]) && IsInsert(*m_words2[i+1]))
{
@@ -497,13 +542,13 @@
#ifdef STRINGDIFF_LOGGING
OutputDebugString(_T("final run create diff \n"));
wsprintf(buf, _T("left= %d, right= %d \n"),
- m_str1.length(), m_str2.length());
+ m_str1.length(), m_str2.length());
OutputDebugString(buf);
#endif
// Be aware, do not create more wdiffs as shortest line has chars!
int imaxcount = min(m_str1.length(), m_str2.length());
i = 0;
- while ((i < m_words1.size()) && (i < m_words2.size()) && (m_wdiffs.size() <= imaxcount))
+ while ((i < (int)m_words1.size()) && (i < (int)m_words2.size()) && (m_wdiffs.size() <= imaxcount))
{
if (!AreWordsSame(*m_words1[i], *m_words2[i]))
{
@@ -551,35 +596,37 @@
}
}
}
+
/**
- * @brief Find next word in m_words2 (starting at bw2) that matches needword1 (in m_words1)
+ * @brief Find next word in m_words1 (starting at bw1) that matches needword2 (in m_words2)
*/
int
-stringdiffs::FindNextMatchInWords2(const word & needword1, int bw2) const
+stringdiffs::FindNextMatchInWords1(const word & needword2, int bw1) const
{
- while (bw2 < m_words2.size())
+ while (bw1 < (int) m_words1.size())
{
- if (AreWordsSame(needword1, *m_words2[bw2]))
- return bw2;
- ++bw2;
+ if (AreWordsSame(*m_words1[bw1], needword2))
+ return bw1;
+ ++bw1;
}
return -1;
}
/**
- * @brief Find next word in m_words1 (starting at bw1) that matches needword2 (in m_words2)
+ * @brief Find next word in m_words2 (starting at bw2) that matches needword1 (in m_words1)
*/
int
-stringdiffs::FindNextMatchInWords1(const word & needword2, int bw1) const
+stringdiffs::FindNextMatchInWords2(const word & needword1, int bw2) const
{
- while (bw1 < m_words1.size())
+ while (bw2 < (int)m_words2.size())
{
- if (AreWordsSame(*m_words1[bw1], needword2))
- return bw1;
- ++bw1;
+ if (AreWordsSame(needword1, *m_words2[bw2]))
+ return bw2;
+ ++bw2;
}
return -1;
}
+
/**
* @brief Find next space in m_words1 (starting at bw1)
*/
@@ -600,7 +647,7 @@
bool
stringdiffs::RemoveItem1(int bw1)
{
- if (m_words1.size()== bw1 + 1)
+ if ((int)m_words1.size()== bw1 + 1)
{
delete m_words1.back();
m_words1.pop_back();
@@ -619,7 +666,7 @@
bool
stringdiffs::RemoveItem2(int bw1)
{
- if (m_words2.size()== bw1 + 1)
+ if ((int)m_words2.size()== bw1 + 1)
{
delete m_words2.back();
m_words2.pop_back();
@@ -653,9 +700,9 @@
// e is first word character (space or at end)
int e = i - 1;
- word *wd = new word(begin, e, -1, Hash(str, begin, e, 0));
- words->push_back(wd);
- }
+ word *wd = new word(begin, e, dlspace, Hash(str, begin, e, 0));
+ words->push_back(wd);
+ }
if (i == str.length())
return;
begin = i;
@@ -672,7 +719,7 @@
// e is first non-word character (space or at end)
int e = i-1;
- word *wd = new word(begin, e, 0, Hash(str, begin, e, 0));
+ word *wd = new word(begin, e, dlword, Hash(str, begin, e, 0));
words->push_back(wd);
}
if (i == str.length())
@@ -688,7 +735,7 @@
{
// start a new word because we hit a non-whitespace word break (eg, a comma)
// but, we have to put each word break character into its own word
- word *wd = new word(i, i, 1, Hash(str, i, i, 0));
+ word *wd = new word(i, i, dlbreak, Hash(str, i, i, 0));
words->push_back(wd);
++i;
begin = i;
@@ -783,21 +830,32 @@
}
return true;
}
+
/**
- * @brief Is this block an space or whitespace one
+ * @brief Is this block a word one?
*/
bool
+stringdiffs::IsWord(const word & word1) const
+{
+ return (word1.bBreak == dlword);
+}
+
+/**
+ * @brief Is this block an space or whitespace one?
+ */
+bool
stringdiffs::IsSpace(const word & word1) const
{
- return (word1.bBreak == -1);
+ return (word1.bBreak == dlspace);
}
+
/**
- * @brief Is this block an empty (insert) one
+ * @brief Is this block an empty (insert) one?
*/
bool
stringdiffs::IsInsert(const word & word1) const
{
- return (word1.bBreak == -2);
+ return (word1.bBreak == dlinsert);
}
/**
Modified: trunk/Src/stringdiffsi.h
===================================================================
--- trunk/Src/stringdiffsi.h 2009-05-14 14:34:10 UTC (rev 6750)
+++ trunk/Src/stringdiffsi.h 2009-05-15 07:09:35 UTC (rev 6751)
@@ -11,6 +11,16 @@
#define stringdiffsi_h_included
#include <vector>
+/**
+ * @brief kind of diff blocks.
+ */
+enum
+{
+ dlword = 0,
+ dlspace,
+ dlbreak,
+ dlinsert,
+};
struct wdiff;
@@ -44,11 +54,12 @@
private:
void BuildWordsArray(const String & str, std::vector<word*> * words);
+ int FindNextMatchInWords1(const word & needword2, int bw1) const;
int FindNextMatchInWords2(const word & needword1, int bw2) const;
- int FindNextMatchInWords1(const word & needword2, int bw1) const;
int FindNextSpaceInWords1(int bw1) const;
UINT Hash(const String & str, int begin, int end, UINT h ) const;
bool AreWordsSame(const word & word1, const word & word2) const;
+ bool IsWord(const word & word1) const;
bool IsSpace(const word & word1) const;
bool IsInsert(const word & word1) const;
bool caseMatch(TCHAR ch1, TCHAR ch2) const;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-05-26 10:52:50
|
Revision: 6784
http://winmerge.svn.sourceforge.net/winmerge/?rev=6784&view=rev
Author: kimmov
Date: 2009-05-26 10:52:39 +0000 (Tue, 26 May 2009)
Log Message:
-----------
Add "Match Similar Lines"-option to config log.
Modified Paths:
--------------
trunk/Src/ConfigLog.cpp
trunk/Src/ConfigLog.h
trunk/Src/MainFrm.cpp
Modified: trunk/Src/ConfigLog.cpp
===================================================================
--- trunk/Src/ConfigLog.cpp 2009-05-25 06:47:22 UTC (rev 6783)
+++ trunk/Src/ConfigLog.cpp 2009-05-26 10:52:39 UTC (rev 6784)
@@ -494,6 +494,7 @@
FileWriteString(_T("\n File compare:\n"));
WriteItemYesNo(2, _T("Preserve filetimes"), &m_miscSettings.bPreserveFiletimes);
+ WriteItemYesNo(2, _T("Match similar lines"), &m_miscSettings.bMatchSimilarLines);
FileWriteString(_T("\n Editor settings:\n"));
WriteItemYesNo(2, _T("View Whitespace"), &m_miscSettings.bViewWhitespace);
Modified: trunk/Src/ConfigLog.h
===================================================================
--- trunk/Src/ConfigLog.h 2009-05-25 06:47:22 UTC (rev 6783)
+++ trunk/Src/ConfigLog.h 2009-05-26 10:52:39 UTC (rev 6784)
@@ -70,6 +70,7 @@
int nTabSize;
bool bPluginsEnabled;
bool bPreserveFiletimes;
+ bool bMatchSimilarLines;
};
/**
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2009-05-25 06:47:22 UTC (rev 6783)
+++ trunk/Src/MainFrm.cpp 2009-05-26 10:52:39 UTC (rev 6784)
@@ -2484,6 +2484,7 @@
LoadConfigIntSetting(&configLog.m_miscSettings.nInsertTabs, options, OPT_TAB_TYPE, cfgdir);
LoadConfigIntSetting(&configLog.m_miscSettings.nTabSize, options, OPT_TAB_SIZE, cfgdir);
LoadConfigBoolSetting(&configLog.m_miscSettings.bPluginsEnabled, options, OPT_PLUGINS_ENABLED, cfgdir);
+ LoadConfigBoolSetting(&configLog.m_miscSettings.bMatchSimilarLines, options, OPT_CMP_MATCH_SIMILAR_LINES, cfgdir);
LoadConfigIntSetting(&configLog.m_cpSettings.nDefaultMode, options, OPT_CP_DEFAULT_MODE, cfgdir);
LoadConfigIntSetting(&configLog.m_cpSettings.nDefaultCustomValue, options, OPT_CP_DEFAULT_CUSTOM, cfgdir);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-05-28 20:45:23
|
Revision: 6799
http://winmerge.svn.sourceforge.net/winmerge/?rev=6799&view=rev
Author: kimmov
Date: 2009-05-28 20:45:15 +0000 (Thu, 28 May 2009)
Log Message:
-----------
Fix pre/postbuild batch files to work when VS2005/VS2008 devenv is called from command line.
Modified Paths:
--------------
trunk/Src/PostBuild.bat
trunk/Src/PreLink.bat
Modified: trunk/Src/PostBuild.bat
===================================================================
--- trunk/Src/PostBuild.bat 2009-05-28 18:29:52 UTC (rev 6798)
+++ trunk/Src/PostBuild.bat 2009-05-28 20:45:15 UTC (rev 6799)
@@ -1,6 +1,17 @@
@echo off
-if "%_ACP_ATLPROV%" == "" goto _MSDEV_BLD_ENV_(%_MSDEV_BLD_ENV_%)
+REM $Id$
+
+REM _ACP_ATLPROV is set by VS2005/VS2008 when compiling in IDE. But it is NOT
+REM set when calling devenv from command line.
+
+REM This detects if the script is called from VS2003 or from IDE
+if NOT "%_ACP_ATLPROV%" == "" goto IDEBuild
+
+REM This detects if the script is called from VS2005/VS2008 cmd line env
+if "%VCBuildHelper_Command%" == "" goto _MSDEV_BLD_ENV_(%_MSDEV_BLD_ENV_%)
+
+:IDEBuild
:_MSDEV_BLD_ENV_(1)
cd
REM Enable echo lines below if you need to debug this script
Modified: trunk/Src/PreLink.bat
===================================================================
--- trunk/Src/PreLink.bat 2009-05-28 18:29:52 UTC (rev 6798)
+++ trunk/Src/PreLink.bat 2009-05-28 20:45:15 UTC (rev 6799)
@@ -6,8 +6,17 @@
REM _ACP_ATLPROV was introduced in VC7. If not set, assume VC6.
REM _MSDEV_BLD_ENV_ was removed in VC8. Don't care about it if _ACP_ATLPROV is set.
+REM _ACP_ATLPROV is set by VS2005/VS2008 when compiling in IDE. But it is NOT
+REM set when calling devenv from command line.
-if "%_ACP_ATLPROV%" == "" goto _MSDEV_BLD_ENV_(%_MSDEV_BLD_ENV_%)
+REM This detects if the script is called from VS2003 or from IDE
+if NOT "%_ACP_ATLPROV%" == "" goto IDEBuild
+
+REM This detects if the script is called from VS2005/VS2008 cmd line env
+if "%VCBuildHelper_Command%" == "" goto _MSDEV_BLD_ENV_(%_MSDEV_BLD_ENV_%)
+
+:IDEBuild
+
set msdev=rem
set devenv=devenv
goto Configure
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-06-13 12:55:40
|
Revision: 6844
http://winmerge.svn.sourceforge.net/winmerge/?rev=6844&view=rev
Author: kimmov
Date: 2009-06-13 12:55:37 +0000 (Sat, 13 Jun 2009)
Log Message:
-----------
PATCH: [ 2805717 ] Refactor Date/Size compare to own compare engine
Modified Paths:
--------------
trunk/Src/FolderCmp.cpp
trunk/Src/FolderCmp.h
trunk/Src/Merge.vcproj
Added Paths:
-----------
trunk/Src/CompareEngines/TimeSizeCompare.cpp
trunk/Src/CompareEngines/TimeSizeCompare.h
Added: trunk/Src/CompareEngines/TimeSizeCompare.cpp
===================================================================
--- trunk/Src/CompareEngines/TimeSizeCompare.cpp (rev 0)
+++ trunk/Src/CompareEngines/TimeSizeCompare.cpp 2009-06-13 12:55:37 UTC (rev 6844)
@@ -0,0 +1,89 @@
+/**
+ * @file TimeSizeCompare.cpp
+ *
+ * @brief Implementation file for TimeSizeCompare
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
+
+#include "stdafx.h"
+#include "DiffContext.h"
+#include "DIFF.H"
+#include "DiffItem.h"
+#include "TimeSizeCompare.h"
+#include "DiffWrapper.h"
+
+namespace CompareEngines
+{
+
+TimeSizeCompare::TimeSizeCompare()
+: m_ignoreSmallDiff(false)
+{
+}
+
+TimeSizeCompare::~TimeSizeCompare()
+{
+}
+
+/**
+ * @brief Set compare-type specific options.
+ * @param [in] ignoreSmallDiff Ignore small time differences?
+ */
+void TimeSizeCompare::SetAdditionalOptions(bool ignoreSmallDiff)
+{
+ m_ignoreSmallDiff = ignoreSmallDiff;
+}
+
+/**
+ * @brief Compare two specified files, byte-by-byte
+ * @param [in] compMethod Compare method used.
+ * @param [in] di Diffitem info.
+ * @return DIFFCODE
+ */
+int TimeSizeCompare::CompareFiles(int compMethod, const DIFFITEM &di)
+{
+ UINT code = 0;
+
+ // Compare by modified date
+ // Check that we have both filetimes
+ if (di.left.mtime != 0 && di.right.mtime != 0)
+ {
+ INT64 nTimeDiff = di.left.mtime - di.right.mtime;
+ // Remove sign
+ nTimeDiff = (nTimeDiff > 0 ? nTimeDiff : -nTimeDiff);
+ if (m_ignoreSmallDiff)
+ {
+ // If option to ignore small timediffs (couple of seconds)
+ // is set, decrease absolute difference by allowed diff
+ nTimeDiff -= SmallTimeDiff;
+ }
+ if (nTimeDiff <= 0)
+ code = DIFFCODE::SAME;
+ else
+ code = DIFFCODE::DIFF;
+ }
+ else
+ {
+ // Filetimes for item(s) could not be read. So we have to
+ // set error status, unless we have DATE_SIZE -compare
+ // when we have still hope for size compare..
+ if (compMethod == CMP_DATE_SIZE)
+ code = DIFFCODE::SAME;
+ else
+ code = DIFFCODE::CMPERR;
+ }
+
+ // This is actual CMP_DATE_SIZE method..
+ // If file sizes differ mark them different
+ if (compMethod == CMP_DATE_SIZE)
+ {
+ if (di.left.size != di.right.size)
+ {
+ code &= ~DIFFCODE::SAME;
+ code = DIFFCODE::DIFF;
+ }
+ }
+ return code;
+}
+
+} // namespace CompareEngines
Property changes on: trunk/Src/CompareEngines/TimeSizeCompare.cpp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/Src/CompareEngines/TimeSizeCompare.h
===================================================================
--- trunk/Src/CompareEngines/TimeSizeCompare.h (rev 0)
+++ trunk/Src/CompareEngines/TimeSizeCompare.h 2009-06-13 12:55:37 UTC (rev 6844)
@@ -0,0 +1,33 @@
+/**
+ * @file TimeSizeCompare.h
+ *
+ * @brief Declaration file for TimeSizeCompare compare engine.
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
+
+#ifndef _TIMESIZE_COMPARE_H_
+#define _TIMESIZE_COMPARE_H_
+
+namespace CompareEngines
+{
+
+/**
+ * @brief A time/size compare class.
+ * This compare method compares files by their times and sizes.
+ */
+class TimeSizeCompare
+{
+public:
+ TimeSizeCompare();
+ ~TimeSizeCompare();
+ void SetAdditionalOptions(bool ignoreSmallDiff);
+ int CompareFiles(int compMethod, const DIFFITEM &di);
+
+private:
+ bool m_ignoreSmallDiff;
+};
+
+} // namespace CompareEngines
+
+#endif // _TIMESIZE_COMPARE_H_
Property changes on: trunk/Src/CompareEngines/TimeSizeCompare.h
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/Src/FolderCmp.cpp
===================================================================
--- trunk/Src/FolderCmp.cpp 2009-06-11 18:11:17 UTC (rev 6843)
+++ trunk/Src/FolderCmp.cpp 2009-06-13 12:55:37 UTC (rev 6844)
@@ -21,8 +21,10 @@
#include "FolderCmp.h"
#include "ByteComparator.h"
#include "codepage_detect.h"
+#include "TimeSizeCompare.h"
using CompareEngines::ByteCompare;
+using CompareEngines::TimeSizeCompare;
static void GetComparePaths(CDiffContext * pCtxt, const DIFFITEM &di, String & left, String & right);
static bool Unpack(String & filepathTransformed,
@@ -31,6 +33,7 @@
FolderCmp::FolderCmp()
: m_pDiffUtilsEngine(NULL)
, m_pByteCompare(NULL)
+, m_pTimeSizeCompare(NULL)
, m_ndiffs(CDiffContext::DIFFS_UNKNOWN)
, m_ntrivialdiffs(CDiffContext::DIFFS_UNKNOWN)
, m_pCtx(NULL)
@@ -41,6 +44,7 @@
{
delete m_pDiffUtilsEngine;
delete m_pByteCompare;
+ delete m_pTimeSizeCompare;
}
bool FolderCmp::RunPlugins(CDiffContext * pCtxt, PluginsContext * plugCtxt, CString &errStr)
@@ -275,56 +279,15 @@
di.left.m_textStats = m_diffFileData.m_textStats0;
di.right.m_textStats = m_diffFileData.m_textStats1;
}
- else if (nCompMethod == CMP_DATE || nCompMethod == CMP_DATE_SIZE)
+ else if (nCompMethod == CMP_DATE || nCompMethod == CMP_DATE_SIZE || nCompMethod == CMP_SIZE)
{
- // Compare by modified date
- // Check that we have both filetimes
- if (di.left.mtime != 0 && di.right.mtime != 0)
- {
- __int64 nTimeDiff = di.left.mtime - di.right.mtime;
- // Remove sign
- nTimeDiff = (nTimeDiff > 0 ? nTimeDiff : -nTimeDiff);
- if (pCtxt->m_bIgnoreSmallTimeDiff)
- {
- // If option to ignore small timediffs (couple of seconds)
- // is set, decrease absolute difference by allowed diff
- nTimeDiff -= SmallTimeDiff;
- }
- if (nTimeDiff <= 0)
- code = DIFFCODE::SAME;
- else
- code = DIFFCODE::DIFF;
- }
- else
- {
- // Filetimes for item(s) could not be read. So we have to
- // set error status, unless we have DATE_SIZE -compare
- // when we have still hope for size compare..
- if (nCompMethod == CMP_DATE_SIZE)
- code = DIFFCODE::SAME;
- else
- code = DIFFCODE::CMPERR;
- }
-
- // This is actual CMP_DATE_SIZE method..
- // If file sizes differ mark them different
- if (nCompMethod == CMP_DATE_SIZE)
- {
- if (di.left.size != di.right.size)
- {
- code &= ~DIFFCODE::SAME;
- code = DIFFCODE::DIFF;
- }
- }
+ if (m_pTimeSizeCompare == NULL)
+ m_pTimeSizeCompare = new TimeSizeCompare();
+
+ m_pTimeSizeCompare->SetAdditionalOptions(!!pCtxt->m_bIgnoreSmallTimeDiff);
+ code = m_pTimeSizeCompare->CompareFiles(nCompMethod, di);
+
}
- else if (nCompMethod == CMP_SIZE)
- {
- // Compare by size
- if (di.left.size == di.right.size)
- code = DIFFCODE::SAME;
- else
- code = DIFFCODE::DIFF;
- }
else
{
// Print error since we should have handled by date compare earlier
Modified: trunk/Src/FolderCmp.h
===================================================================
--- trunk/Src/FolderCmp.h 2009-06-11 18:11:17 UTC (rev 6843)
+++ trunk/Src/FolderCmp.h 2009-06-13 12:55:37 UTC (rev 6844)
@@ -12,6 +12,7 @@
#include "DiffFileData.h"
#include "DiffUtils.h"
#include "ByteCompare.h"
+#include "TimeSizeCompare.h"
class CDiffContext;
class PackingInfo;
@@ -56,6 +57,7 @@
private:
CompareEngines::DiffUtils *m_pDiffUtilsEngine;
CompareEngines::ByteCompare *m_pByteCompare;
+ CompareEngines::TimeSizeCompare *m_pTimeSizeCompare;
};
Modified: trunk/Src/Merge.vcproj
===================================================================
--- trunk/Src/Merge.vcproj 2009-06-11 18:11:17 UTC (rev 6843)
+++ trunk/Src/Merge.vcproj 2009-06-13 12:55:37 UTC (rev 6844)
@@ -5573,6 +5573,43 @@
</FileConfiguration>
</File>
<File
+ RelativePath="CompareEngines\TimeSizeCompare.cpp">
+ <FileConfiguration
+ Name="UnicodeRelease|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="UnicodeDebug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="Common\ToolBarXPThemes.cpp">
<FileConfiguration
Name="UnicodeRelease|Win32">
@@ -6623,6 +6660,9 @@
RelativePath="TestFilterDlg.h">
</File>
<File
+ RelativePath="CompareEngines\TimeSizeCompare.h">
+ </File>
+ <File
RelativePath="Common\ToolbarXPThemes.h">
</File>
<File
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-06-25 06:34:43
|
Revision: 6856
http://winmerge.svn.sourceforge.net/winmerge/?rev=6856&view=rev
Author: kimmov
Date: 2009-06-25 06:34:42 +0000 (Thu, 25 Jun 2009)
Log Message:
-----------
Remove some MFC code.
Modified Paths:
--------------
trunk/Src/FolderCmp.cpp
trunk/Src/FolderCmp.h
Modified: trunk/Src/FolderCmp.cpp
===================================================================
--- trunk/Src/FolderCmp.cpp 2009-06-25 06:33:15 UTC (rev 6855)
+++ trunk/Src/FolderCmp.cpp 2009-06-25 06:34:42 UTC (rev 6856)
@@ -7,10 +7,10 @@
// $Id$
#include "StdAfx.h"
+#include <assert.h>
#include "DiffUtils.h"
#include "ByteCompare.h"
#include "LogFile.h"
-#include "Merge.h"
#include "paths.h"
#include "FilterList.h"
#include "DiffContext.h"
@@ -47,7 +47,7 @@
delete m_pTimeSizeCompare;
}
-bool FolderCmp::RunPlugins(CDiffContext * pCtxt, PluginsContext * plugCtxt, CString &errStr)
+bool FolderCmp::RunPlugins(CDiffContext * pCtxt, PluginsContext * plugCtxt, String &errStr)
{
// For user chosen plugins, define bAutomaticUnpacker as false and use the chosen infoHandler
// but how can we receive the infoHandler ? DirScan actually only
@@ -71,16 +71,16 @@
// Invoke unpacking plugins
if (!Unpack(plugCtxt->filepathUnpacked1, filteredFilenames.c_str(), plugCtxt->infoUnpacker))
{
- errStr = _T("Unpack Error Side 1");
+ errStr = L"Unpack Error Side 1";
return false;
}
// we use the same plugins for both files, so they must be defined before second file
- ASSERT(plugCtxt->infoUnpacker->bToBeScanned == FALSE);
+ assert(plugCtxt->infoUnpacker->bToBeScanned == FALSE);
if (!Unpack(plugCtxt->filepathUnpacked2, filteredFilenames.c_str(), plugCtxt->infoUnpacker))
{
- errStr = _T("Unpack Error Side 2");
+ errStr = L"Unpack Error Side 2";
return false;
}
@@ -91,7 +91,7 @@
if (!m_diffFileData.OpenFiles(plugCtxt->filepathTransformed1.c_str(),
plugCtxt->filepathTransformed2.c_str()))
{
- errStr = _T("OpenFiles Error (before tranform)");
+ errStr = L"OpenFiles Error (before tranform)";
return false;
}
@@ -100,18 +100,18 @@
plugCtxt->filepathUnpacked1, plugCtxt->filepathTransformed1,
filteredFilenames.c_str(), plugCtxt->infoPrediffer))
{
- errStr = _T("Transform Error Side 1");
+ errStr = L"Transform Error Side 1";
return false;
}
// we use the same plugins for both files, so they must be defined before second file
- ASSERT(plugCtxt->infoPrediffer->bToBeScanned == FALSE);
+ assert(plugCtxt->infoPrediffer->bToBeScanned == FALSE);
if (!m_diffFileData.Filepath_Transform(m_diffFileData.m_FileLocation[1],
plugCtxt->filepathUnpacked2, plugCtxt->filepathTransformed2,
filteredFilenames.c_str(), plugCtxt->infoPrediffer))
{
- errStr = _T("Transform Error Side 2");
+ errStr = L"Transform Error Side 2";
return false;
}
@@ -128,7 +128,7 @@
if (!m_diffFileData.OpenFiles(plugCtxt->filepathTransformed1.c_str(),
plugCtxt->filepathTransformed2.c_str()))
{
- errStr = _T("OpenFiles Error (after tranform)");
+ errStr = L"OpenFiles Error (after tranform)";
return false;
}
}
@@ -139,17 +139,13 @@
{
// delete the temp files after comparison
if (plugCtxt->filepathTransformed1 != plugCtxt->filepathUnpacked1)
- VERIFY(::DeleteFile(plugCtxt->filepathTransformed1.c_str()) ||
- GetLog()->DeleteFileFailed(plugCtxt->filepathTransformed1.c_str()));
+ ::DeleteFile(plugCtxt->filepathTransformed1.c_str());
if (plugCtxt->filepathTransformed2 != plugCtxt->filepathUnpacked2)
- VERIFY(::DeleteFile(plugCtxt->filepathTransformed2.c_str()) ||
- GetLog()->DeleteFileFailed(plugCtxt->filepathTransformed2.c_str()));
+ ::DeleteFile(plugCtxt->filepathTransformed2.c_str());
if (plugCtxt->filepathUnpacked1 != plugCtxt->origFileName1)
- VERIFY(::DeleteFile(plugCtxt->filepathUnpacked1.c_str()) ||
- GetLog()->DeleteFileFailed(plugCtxt->filepathUnpacked1.c_str()));
+ ::DeleteFile(plugCtxt->filepathUnpacked1.c_str());
if (plugCtxt->filepathUnpacked2 != plugCtxt->origFileName2)
- VERIFY(::DeleteFile(plugCtxt->filepathUnpacked2.c_str()) ||
- GetLog()->DeleteFileFailed(plugCtxt->filepathUnpacked2.c_str()));
+ ::DeleteFile(plugCtxt->filepathUnpacked2.c_str());
}
/**
@@ -181,7 +177,7 @@
// Run plugins
if (pCtxt->m_bPluginsEnabled)
{
- CString errStr;
+ String errStr;
bool pluginsOk = RunPlugins(pCtxt, &plugCtxt, errStr);
if (!pluginsOk)
{
@@ -195,7 +191,7 @@
if (!m_diffFileData.OpenFiles(plugCtxt.origFileName1.c_str(),
plugCtxt.origFileName2.c_str()))
{
- di.errorDesc = _T("Error opening compared files");
+ di.errorDesc = L"Error opening compared files";
return false;
}
}
@@ -248,7 +244,7 @@
m_ntrivialdiffs = CDiffContext::DIFFS_UNKNOWN;
}
if (DIFFCODE::isResultError(code))
- di.errorDesc = _T("DiffUtils Error");
+ di.errorDesc = L"DiffUtils Error";
}
else if (nCompMethod == CMP_QUICK_CONTENT)
{
@@ -292,7 +288,7 @@
{
// Print error since we should have handled by date compare earlier
_RPTF0(_CRT_ERROR, "Invalid compare type, DiffFileData can't handle it");
- di.errorDesc = _T("Bad compare type");
+ di.errorDesc = L"Bad compare type";
}
m_diffFileData.Reset();
Modified: trunk/Src/FolderCmp.h
===================================================================
--- trunk/Src/FolderCmp.h 2009-06-25 06:33:15 UTC (rev 6855)
+++ trunk/Src/FolderCmp.h 2009-06-25 06:34:42 UTC (rev 6856)
@@ -44,7 +44,7 @@
public:
FolderCmp();
~FolderCmp();
- bool RunPlugins(CDiffContext * pCtxt, PluginsContext * plugCtxt, CString &errStr);
+ bool RunPlugins(CDiffContext * pCtxt, PluginsContext * plugCtxt, String &errStr);
void CleanupAfterPlugins(PluginsContext *plugCtxt);
UINT prepAndCompareTwoFiles(CDiffContext * pCtxt, DIFFITEM &di);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-06-25 07:48:34
|
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.
|
|
From: <ki...@us...> - 2009-06-25 09:54:34
|
Revision: 6860
http://winmerge.svn.sourceforge.net/winmerge/?rev=6860&view=rev
Author: kimmov
Date: 2009-06-25 09:54:27 +0000 (Thu, 25 Jun 2009)
Log Message:
-----------
Move FileFilter and FileFilterElement definitions to own file.
Modified Paths:
--------------
trunk/Src/FileFilterMgr.cpp
trunk/Src/FileFilterMgr.h
trunk/Src/Merge.vcproj
trunk/Src/Plugins.cpp
Added Paths:
-----------
trunk/Src/FileFilter.cpp
trunk/Src/FileFilter.h
Added: trunk/Src/FileFilter.cpp
===================================================================
--- trunk/Src/FileFilter.cpp (rev 0)
+++ trunk/Src/FileFilter.cpp 2009-06-25 09:54:27 UTC (rev 6860)
@@ -0,0 +1,54 @@
+/////////////////////////////////////////////////////////////////////////////
+// License (GPLv2+):
+// This program is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2 of the License, or (at your
+// option) any later version.
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+/////////////////////////////////////////////////////////////////////////////
+/**
+ * @file FileFilter.cpp
+ *
+ * @brief Implementation of FileFilter.
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
+
+#include "stdafx.h"
+#include <vector>
+#include "pcre.h"
+#include "FileFilter.h"
+
+using std::vector;
+
+/**
+ * @brief Destructor, frees created filter lists.
+ */
+FileFilter::~FileFilter()
+{
+ EmptyFilterList(&filefilters);
+ EmptyFilterList(&dirfilters);
+}
+
+/**
+ * @brief Deletes items from filter list.
+ *
+ * @param [in] filterList List to empty.
+ */
+void FileFilter::EmptyFilterList(vector<FileFilterElement*> *filterList)
+{
+ while (!filterList->empty())
+ {
+ FileFilterElement *elem = filterList->back();
+ pcre_free(elem->pRegExp);
+ pcre_free(elem->pRegExpExtra);
+ delete elem;
+ filterList->pop_back();
+ }
+}
\ No newline at end of file
Property changes on: trunk/Src/FileFilter.cpp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/Src/FileFilter.h
===================================================================
--- trunk/Src/FileFilter.h (rev 0)
+++ trunk/Src/FileFilter.h 2009-06-25 09:54:27 UTC (rev 6860)
@@ -0,0 +1,68 @@
+/////////////////////////////////////////////////////////////////////////////
+// License (GPLv2+):
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+/////////////////////////////////////////////////////////////////////////////
+/**
+ * @file FileFilter.h
+ *
+ * @brief Declaration file for FileFilter
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
+
+#include <vector>
+#include "pcre.h"
+
+/**
+ * @brief FileFilter rule.
+ *
+ * Contains one filtering element definition (rule). In addition to
+ * regular expression there is boolean value for defining if rule
+ * is inclusive or exclusive. File filters have global inclusive/exclusive
+ * selection but this per-rule setting overwrites it.
+ *
+ * We are using PCRE for regular expressions and pRegExp points to compiled
+ * regular expression. pRegExpExtra contains additional information about
+ * the expression used to optimize matching.
+ */
+struct FileFilterElement
+{
+ pcre *pRegExp; /**< Compiled regular expression */
+ pcre_extra *pRegExpExtra; /**< Additional information got from regex study */
+ FileFilterElement() : pRegExp(NULL), pRegExpExtra(NULL) { };
+};
+
+/**
+ * @brief One actual filter.
+ *
+ * For example, this might be a GNU C filter, excluding *.o files and CVS
+ * directories. That is to say, a filter is a set of file masks and
+ * directory masks. Usually FileFilter contains rules from one filter
+ * definition file. So it can be thought as filter file contents.
+ * @sa FileFilterList
+ */
+struct FileFilter
+{
+ bool default_include; /**< If true, filter rules are inclusive by default */
+ CString name; /**< Filter name (shown in UI) */
+ CString description; /**< Filter description text */
+ CString fullpath; /**< Full path to filter file */
+ std::vector<FileFilterElement*> filefilters; /**< List of rules for files */
+ std::vector<FileFilterElement*> dirfilters; /**< List of rules for directories */
+ FileFilter() : default_include(true) { }
+ ~FileFilter();
+
+ static void EmptyFilterList(std::vector<FileFilterElement*> *filterList);
+};
Property changes on: trunk/Src/FileFilter.h
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/Src/FileFilterMgr.cpp
===================================================================
--- trunk/Src/FileFilterMgr.cpp 2009-06-25 08:28:21 UTC (rev 6859)
+++ trunk/Src/FileFilterMgr.cpp 2009-06-25 09:54:27 UTC (rev 6860)
@@ -1,7 +1,4 @@
/////////////////////////////////////////////////////////////////////////////
-// FileFilterMgr.cpp : implementation file
-// see FileFilterMgr.h for description
-/////////////////////////////////////////////////////////////////////////////
// License (GPLv2+):
// This program is free software; you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by the
@@ -27,6 +24,7 @@
#include <string.h>
#include <vector>
#include "UnicodeString.h"
+#include "FileFilter.h"
#include "pcre.h"
#include "FileFilterMgr.h"
#include "UniFile.h"
@@ -42,53 +40,6 @@
using std::vector;
/**
- * @brief Deletes items from filter list.
- *
- * @param [in] filterList List to empty.
- */
-void EmptyFilterList(vector<FileFilterElement*> *filterList)
-{
- while (!filterList->empty())
- {
- FileFilterElement *elem = filterList->back();
- pcre_free(elem->pRegExp);
- pcre_free(elem->pRegExpExtra);
- delete elem;
- filterList->pop_back();
- }
-}
-
-/**
- * @brief One actual filter.
- *
- * For example, this might be a GNU C filter, excluding *.o files and CVS
- * directories. That is to say, a filter is a set of file masks and
- * directory masks. Usually FileFilter contains rules from one filter
- * definition file. So it can be thought as filter file contents.
- * @sa FileFilterList
- */
-struct FileFilter
-{
- bool default_include; /**< If true, filter rules are inclusive by default */
- CString name; /**< Filter name (shown in UI) */
- CString description; /**< Filter description text */
- CString fullpath; /**< Full path to filter file */
- vector<FileFilterElement*> filefilters; /**< List of rules for files */
- vector<FileFilterElement*> dirfilters; /**< List of rules for directories */
- FileFilter() : default_include(true) { }
- ~FileFilter();
-};
-
-/**
- * @brief Destructor, frees created filter lists.
- */
-FileFilter::~FileFilter()
-{
- EmptyFilterList(&filefilters);
- EmptyFilterList(&dirfilters);
-}
-
-/**
* @brief Destructor, frees all filters.
*/
FileFilterMgr::~FileFilterMgr()
Modified: trunk/Src/FileFilterMgr.h
===================================================================
--- trunk/Src/FileFilterMgr.h 2009-06-25 08:28:21 UTC (rev 6859)
+++ trunk/Src/FileFilterMgr.h 2009-06-25 09:54:27 UTC (rev 6860)
@@ -29,6 +29,7 @@
#include "pcre.h"
struct FileFilterElement;
+struct FileFilter;
/**
* @brief Return values for many filter functions.
@@ -41,27 +42,6 @@
};
/**
- * @brief FileFilter rule.
- *
- * Contains one filtering element definition (rule). In addition to
- * regular expression there is boolean value for defining if rule
- * is inclusive or exclusive. File filters have global inclusive/exclusive
- * selection but this per-rule setting overwrites it.
- *
- * We are using PCRE for regular expressions and pRegExp points to compiled
- * regular expression. pRegExpExtra contains additional information about
- * the expression used to optimize matching.
- */
-struct FileFilterElement
-{
- pcre *pRegExp; /**< Compiled regular expression */
- pcre_extra *pRegExpExtra; /**< Additional information got from regex study */
- FileFilterElement() : pRegExp(NULL), pRegExpExtra(NULL) { };
-};
-
-struct FileFilter;
-
-/**
* @brief File filter manager for handling filefilters.
*
* The FileFilterMgr loads a collection of named file filters from disk,
Modified: trunk/Src/Merge.vcproj
===================================================================
--- trunk/Src/Merge.vcproj 2009-06-25 08:28:21 UTC (rev 6859)
+++ trunk/Src/Merge.vcproj 2009-06-25 09:54:27 UTC (rev 6860)
@@ -2206,6 +2206,43 @@
</FileConfiguration>
</File>
<File
+ RelativePath="FileFilter.cpp">
+ <FileConfiguration
+ Name="UnicodeRelease|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="UnicodeDebug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="FileFilterHelper.cpp">
<FileConfiguration
Name="UnicodeRelease|Win32">
@@ -6323,6 +6360,9 @@
RelativePath="FileActionScript.h">
</File>
<File
+ RelativePath="FileFilter.h">
+ </File>
+ <File
RelativePath="FileFilterHelper.h">
</File>
<File
Modified: trunk/Src/Plugins.cpp
===================================================================
--- trunk/Src/Plugins.cpp 2009-06-25 08:28:21 UTC (rev 6859)
+++ trunk/Src/Plugins.cpp 2009-06-25 09:54:27 UTC (rev 6860)
@@ -43,6 +43,7 @@
#include "Exceptions.h"
#include "RegKey.h"
#include "paths.h"
+#include "FileFilter.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -697,7 +698,7 @@
{
pArray->GetAt(i).m_lpDispatch->Release();
if (pArray->GetAt(i).m_filters)
- EmptyFilterList(pArray->GetAt(i).m_filters);
+ FileFilter::EmptyFilterList(pArray->GetAt(i).m_filters);
delete pArray->GetAt(i).m_filters;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-06-25 12:11:11
|
Revision: 6861
http://winmerge.svn.sourceforge.net/winmerge/?rev=6861&view=rev
Author: kimmov
Date: 2009-06-25 12:11:07 +0000 (Thu, 25 Jun 2009)
Log Message:
-----------
Refactor file filtering code to use String instead of CString.
Modified Paths:
--------------
trunk/Src/DirDoc.cpp
trunk/Src/FileFilter.h
trunk/Src/FileFilterHelper.cpp
trunk/Src/FileFilterHelper.h
trunk/Src/FileFilterMgr.cpp
trunk/Src/FileFilterMgr.h
trunk/Src/FileFiltersDlg.cpp
trunk/Src/MainFrm.cpp
trunk/Src/Merge.cpp
trunk/Src/OpenDlg.cpp
trunk/Src/ProjectFilePathsDlg.cpp
trunk/Src/TestFilterDlg.cpp
Modified: trunk/Src/DirDoc.cpp
===================================================================
--- trunk/Src/DirDoc.cpp 2009-06-25 09:54:27 UTC (rev 6860)
+++ trunk/Src/DirDoc.cpp 2009-06-25 12:11:07 UTC (rev 6861)
@@ -370,7 +370,7 @@
m_pCtxt->m_piFilterGlobal = &theApp.m_globalFileFilter;
// Show active filter name in statusbar
- pf->SetFilterStatusDisplay(theApp.m_globalFileFilter.GetFilterNameOrMask());
+ pf->SetFilterStatusDisplay(theApp.m_globalFileFilter.GetFilterNameOrMask().c_str());
// Folder names to compare are in the compare context
m_diffThread.SetContext(m_pCtxt);
Modified: trunk/Src/FileFilter.h
===================================================================
--- trunk/Src/FileFilter.h 2009-06-25 09:54:27 UTC (rev 6860)
+++ trunk/Src/FileFilter.h 2009-06-25 12:11:07 UTC (rev 6861)
@@ -24,6 +24,7 @@
#include <vector>
#include "pcre.h"
+#include "UnicodeString.h"
/**
* @brief FileFilter rule.
@@ -56,9 +57,9 @@
struct FileFilter
{
bool default_include; /**< If true, filter rules are inclusive by default */
- CString name; /**< Filter name (shown in UI) */
- CString description; /**< Filter description text */
- CString fullpath; /**< Full path to filter file */
+ String name; /**< Filter name (shown in UI) */
+ String description; /**< Filter description text */
+ String fullpath; /**< Full path to filter file */
std::vector<FileFilterElement*> filefilters; /**< List of rules for files */
std::vector<FileFilterElement*> dirfilters; /**< List of rules for directories */
FileFilter() : default_include(true) { }
Modified: trunk/Src/FileFilterHelper.cpp
===================================================================
--- trunk/Src/FileFilterHelper.cpp 2009-06-25 09:54:27 UTC (rev 6860)
+++ trunk/Src/FileFilterHelper.cpp 2009-06-25 12:11:07 UTC (rev 6861)
@@ -76,7 +76,7 @@
void FileFilterHelper::SetFileFilterPath(LPCTSTR szFileFilterPath)
{
// Use none as default path
- m_sFileFilterPath.Empty();
+ m_sFileFilterPath.clear();
if (!m_fileFilterMgr)
return;
@@ -96,7 +96,7 @@
* @param [out] filters Filter list to receive found filters.
* @param [out] selected Filepath of currently selected filter.
*/
-void FileFilterHelper::GetFileFilters(FILEFILTER_INFOLIST * filters, CString & selected) const
+void FileFilterHelper::GetFileFilters(FILEFILTER_INFOLIST * filters, String & selected) const
{
if (m_fileFilterMgr)
{
@@ -120,11 +120,11 @@
* @param [in] filterPath Path to filterfile.
* @sa FileFilterHelper::GetFileFilterPath()
*/
-CString FileFilterHelper::GetFileFilterName(LPCTSTR filterPath) const
+String FileFilterHelper::GetFileFilterName(LPCTSTR filterPath) const
{
FILEFILTER_INFOLIST filters;
- CString selected;
- CString name;
+ String selected;
+ String name;
GetFileFilters(&filters, selected);
for (int i = 0; i < filters.GetSize(); i++)
@@ -143,11 +143,11 @@
* @param [in] filterName Name of filter.
* @sa FileFilterHelper::GetFileFilterName()
*/
-CString FileFilterHelper::GetFileFilterPath(LPCTSTR filterName) const
+String FileFilterHelper::GetFileFilterPath(LPCTSTR filterName) const
{
FILEFILTER_INFOLIST filters;
- CString selected;
- CString path;
+ String selected;
+ String path;
GetFileFilters(&filters, selected);
for (int i = 0; i < filters.GetSize(); i++)
@@ -380,12 +380,12 @@
* @brief Returns active filter (or mask string)
* @return The active filter.
*/
-CString FileFilterHelper::GetFilterNameOrMask() const
+String FileFilterHelper::GetFilterNameOrMask() const
{
- CString sFilter;
+ String sFilter;
if (!IsUsingMask())
- sFilter = GetFileFilterName(m_sFileFilterPath);
+ sFilter = GetFileFilterName(m_sFileFilterPath.c_str());
else
sFilter = m_sMask;
@@ -426,11 +426,11 @@
}
else
{
- CString path = GetFileFilterPath(flt.c_str());
- if (!path.IsEmpty())
+ String path = GetFileFilterPath(flt.c_str());
+ if (!path.empty())
{
UseMask(FALSE);
- SetFileFilterPath(path);
+ SetFileFilterPath(path.c_str());
}
// If filter not found with given name, use default filter
else
@@ -457,27 +457,27 @@
DirItem fileInfo;
DirItem *fileInfoStored = NULL;
FileFilterInfo filter;
- CString selected;
+ String selected;
GetFileFilters(&filters, selected);
for (int i = 0; i < filters.GetSize(); i++)
{
filter = filters.GetAt(i);
- CString path = filter.fullpath;
+ String path = filter.fullpath;
fileInfoStored = &filter.fileinfo;
- fileInfo.Update((LPCTSTR)path);
+ fileInfo.Update(path);
if (fileInfo.mtime != fileInfoStored->mtime ||
fileInfo.size != fileInfoStored->size)
{
// Reload filter after changing it
- int retval = m_fileFilterMgr->ReloadFilterFromDisk(path);
+ int retval = m_fileFilterMgr->ReloadFilterFromDisk(path.c_str());
if (retval == FILTER_OK)
{
// If it was active filter we have to re-set it
if (path == selected)
- SetFileFilterPath(path);
+ SetFileFilterPath(path.c_str());
}
}
}
Modified: trunk/Src/FileFilterHelper.h
===================================================================
--- trunk/Src/FileFilterHelper.h 2009-06-25 09:54:27 UTC (rev 6860)
+++ trunk/Src/FileFilterHelper.h 2009-06-25 12:11:07 UTC (rev 6861)
@@ -25,6 +25,8 @@
#ifndef _FILEFILTERHELPER_H_
#define _FILEFILTERHELPER_H_
+#include "UnicodeString.h"
+
class FileFilterMgr;
class FilterList;
struct FileFilter;
@@ -44,9 +46,9 @@
*/
struct FileFilterInfo
{
- CString name; /**< Name of filter */
- CString description; /**< Description of filter (shown in UI) */
- CString fullpath; /**< Full path to filter file */
+ String name; /**< Name of filter */
+ String description; /**< Description of filter (shown in UI) */
+ String fullpath; /**< Full path to filter file */
DirItem fileinfo; /**< For tracking if file has been modified */
};
@@ -105,9 +107,9 @@
FileFilterMgr * GetManager() const;
void SetFileFilterPath(LPCTSTR szFileFilterPath);
void EditFileFilter(LPCTSTR szFileFilterPath);
- void GetFileFilters(FILEFILTER_INFOLIST * filters, CString & selected) const;
- CString GetFileFilterName(LPCTSTR filterPath) const;
- CString GetFileFilterPath(LPCTSTR filterName) const;
+ void GetFileFilters(FILEFILTER_INFOLIST * filters, String & selected) const;
+ String GetFileFilterName(LPCTSTR filterPath) const;
+ String GetFileFilterPath(LPCTSTR filterName) const;
void SetUserFilterPath(const String & filterPath);
void ReloadUpdatedFilters();
@@ -120,7 +122,7 @@
void SetMask(LPCTSTR strMask);
BOOL IsUsingMask() const;
- CString GetFilterNameOrMask() const;
+ String GetFilterNameOrMask() const;
BOOL SetFilter(const String &filter);
BOOL includeFile(LPCTSTR szFileName);
@@ -133,8 +135,8 @@
FilterList * m_pMaskFilter; /*< Filter for filemasks (*.cpp) */
FileFilter * m_currentFilter; /*< Currently selected filefilter */
FileFilterMgr * m_fileFilterMgr; /*< Associated FileFilterMgr */
- CString m_sFileFilterPath; /*< Path to current filter */
- CString m_sMask; /*< File mask (if defined) "*.cpp *.h" etc */
+ String m_sFileFilterPath; /*< Path to current filter */
+ String m_sMask; /*< File mask (if defined) "*.cpp *.h" etc */
BOOL m_bUseMask; /*< If TRUE file mask is used, filter otherwise */
String m_sGlobalFilterPath; /*< Path for shared filters */
String m_sUserSelFilterPath; /*< Path for user's private filters */
Modified: trunk/Src/FileFilterMgr.cpp
===================================================================
--- trunk/Src/FileFilterMgr.cpp 2009-06-25 09:54:27 UTC (rev 6860)
+++ trunk/Src/FileFilterMgr.cpp 2009-06-25 12:11:07 UTC (rev 6861)
@@ -101,7 +101,7 @@
vector<FileFilter*>::iterator iter = m_filters.begin();
while (iter != m_filters.end())
{
- if ((*iter)->fullpath.CompareNoCase(szFilterFile) == 0)
+ if (string_compare_nocase((*iter)->fullpath, szFilterFile) == 0)
{
delete (*iter);
m_filters.erase(iter);
@@ -277,7 +277,7 @@
vector<FileFilter*>::const_iterator iter = m_filters.begin();
while (iter != m_filters.end())
{
- if ((*iter)->fullpath.CompareNoCase(szFilterPath) == 0)
+ if (string_compare_nocase((*iter)->fullpath, szFilterPath) == 0)
return (*iter);
++iter;
}
@@ -375,7 +375,7 @@
* @param [in] i Index of filter.
* @return Name of filter in given index.
*/
-CString FileFilterMgr::GetFilterName(int i) const
+String FileFilterMgr::GetFilterName(int i) const
{
return m_filters[i]->name;
}
@@ -385,7 +385,7 @@
* @param [in] pFilter Filter to get name for.
* @return Given filter's name.
*/
-CString FileFilterMgr::GetFilterName(const FileFilter *pFilter) const
+String FileFilterMgr::GetFilterName(const FileFilter *pFilter) const
{
return pFilter->name;
}
@@ -396,7 +396,7 @@
* @param [in] i Index of filter.
* @return Description of filter in given index.
*/
-CString FileFilterMgr::GetFilterDesc(int i) const
+String FileFilterMgr::GetFilterDesc(int i) const
{
return m_filters[i]->description;
}
@@ -406,7 +406,7 @@
* @param [in] pFilter Filter to get description for.
* @return Given filter's description.
*/
-CString FileFilterMgr::GetFilterDesc(const FileFilter *pFilter) const
+String FileFilterMgr::GetFilterDesc(const FileFilter *pFilter) const
{
return pFilter->description;
}
@@ -417,7 +417,7 @@
* @param [in] i Index of filter.
* @return Full path of filter in given index.
*/
-CString FileFilterMgr::GetFilterPath(int i) const
+String FileFilterMgr::GetFilterPath(int i) const
{
return m_filters[i]->fullpath;
}
@@ -428,7 +428,7 @@
* @param [in] pFilter Pointer to filter.
* @return Full path of filter.
*/
-CString FileFilterMgr::GetFullpath(FileFilter * pfilter) const
+String FileFilterMgr::GetFullpath(FileFilter * pfilter) const
{
return pfilter->fullpath;
}
@@ -446,7 +446,7 @@
int FileFilterMgr::ReloadFilterFromDisk(FileFilter * pfilter)
{
int errorcode = FILTER_OK;
- FileFilter * newfilter = LoadFilterFile(pfilter->fullpath, errorcode);
+ FileFilter * newfilter = LoadFilterFile(pfilter->fullpath.c_str(), errorcode);
if (newfilter == NULL)
{
Modified: trunk/Src/FileFilterMgr.h
===================================================================
--- trunk/Src/FileFilterMgr.h 2009-06-25 09:54:27 UTC (rev 6860)
+++ trunk/Src/FileFilterMgr.h 2009-06-25 12:11:07 UTC (rev 6861)
@@ -26,6 +26,7 @@
// Uses MFC C++ template containers
#include <afxtempl.h>
#include <vector>
+#include "UnicodeString.h"
#include "pcre.h"
struct FileFilterElement;
@@ -71,13 +72,13 @@
// access to array of filters
int GetFilterCount() const { return m_filters.size(); }
- CString GetFilterName(int i) const;
- CString GetFilterName(const FileFilter *pFilter) const;
- CString GetFilterPath(int i) const;
- CString GetFilterDesc(int i) const;
- CString GetFilterDesc(const FileFilter *pFilter) const;
+ String GetFilterName(int i) const;
+ String GetFilterName(const FileFilter *pFilter) const;
+ String GetFilterPath(int i) const;
+ String GetFilterDesc(int i) const;
+ String GetFilterDesc(const FileFilter *pFilter) const;
FileFilter * GetFilterByPath(LPCTSTR szFilterName);
- CString GetFullpath(FileFilter * pfilter) const;
+ String GetFullpath(FileFilter * pfilter) const;
// methods to actually use filter
BOOL TestFileNameAgainstFilter(const FileFilter * pFilter, LPCTSTR szFileName) const;
Modified: trunk/Src/FileFiltersDlg.cpp
===================================================================
--- trunk/Src/FileFiltersDlg.cpp 2009-06-25 09:54:27 UTC (rev 6860)
+++ trunk/Src/FileFiltersDlg.cpp 2009-06-25 12:11:07 UTC (rev 6861)
@@ -204,9 +204,9 @@
const FileFilterInfo & filterinfo = m_Filters->GetAt(filterIndex);
const int item = filterIndex + 1;
- m_listFilters.InsertItem(item, filterinfo.name);
- m_listFilters.SetItemText(item, 1, filterinfo.description);
- m_listFilters.SetItemText(item, 2, filterinfo.fullpath);
+ m_listFilters.InsertItem(item, filterinfo.name.c_str());
+ m_listFilters.SetItemText(item, 1, filterinfo.description.c_str());
+ m_listFilters.SetItemText(item, 2, filterinfo.fullpath.c_str());
}
/**
@@ -468,7 +468,7 @@
if (retval == FILTER_OK)
{
// Remove all from filterslist and re-add so we can update UI
- CString selected;
+ String selected;
m_Filters->RemoveAll();
theApp.m_globalFileFilter.LoadAllFileFilters();
theApp.m_globalFileFilter.GetFileFilters(m_Filters, selected);
@@ -505,7 +505,7 @@
pMgr->RemoveFilter(path);
// Remove all from filterslist and re-add so we can update UI
- CString selected;
+ String selected;
m_Filters->RemoveAll();
theApp.m_globalFileFilter.GetFileFilters(m_Filters, selected);
@@ -597,7 +597,7 @@
pMgr->AddFilter(userPath.c_str());
// Remove all from filterslist and re-add so we can update UI
- CString selected;
+ String selected;
m_Filters->RemoveAll();
theApp.m_globalFileFilter.GetFileFilters(m_Filters, selected);
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2009-06-25 09:54:27 UTC (rev 6860)
+++ trunk/Src/MainFrm.cpp 2009-06-25 12:11:07 UTC (rev 6861)
@@ -1802,8 +1802,8 @@
}
// Save last selected filter
- CString filter = theApp.m_globalFileFilter.GetFilterNameOrMask();
- GetOptionsMgr()->SaveOption(OPT_FILEFILTER_CURRENT, filter);
+ String filter = theApp.m_globalFileFilter.GetFilterNameOrMask();
+ GetOptionsMgr()->SaveOption(OPT_FILEFILTER_CURRENT, filter.c_str());
// save main window position
WINDOWPLACEMENT wp;
@@ -2593,8 +2593,8 @@
FileFiltersDlg fileFiltersDlg;
FILEFILTER_INFOLIST fileFilters;
LineFiltersList * lineFilters = new LineFiltersList();
- CString selectedFilter;
- const CString origFilter = theApp.m_globalFileFilter.GetFilterNameOrMask();
+ String selectedFilter;
+ const String origFilter = theApp.m_globalFileFilter.GetFilterNameOrMask();
sht.AddPage(&fileFiltersDlg);
sht.AddPage(&lineFiltersDlg);
sht.m_psh.dwFlags |= PSH_NOAPPLYNOW; // Hide 'Apply' button since we don't need it
@@ -2604,7 +2604,7 @@
theApp.m_globalFileFilter.GetFileFilters(&fileFilters, selectedFilter);
fileFiltersDlg.SetFilterArray(&fileFilters);
- fileFiltersDlg.SetSelected(selectedFilter);
+ fileFiltersDlg.SetSelected(selectedFilter.c_str());
const BOOL lineFiltersEnabledOrig = GetOptionsMgr()->GetBool(OPT_LINEFILTER_ENABLED);
lineFiltersDlg.m_bIgnoreRegExp = lineFiltersEnabledOrig;
@@ -2629,8 +2629,8 @@
{
theApp.m_globalFileFilter.SetFileFilterPath(path);
theApp.m_globalFileFilter.UseMask(FALSE);
- CString sFilter = theApp.m_globalFileFilter.GetFilterNameOrMask();
- GetOptionsMgr()->SaveOption(OPT_FILEFILTER_CURRENT, sFilter);
+ String sFilter = theApp.m_globalFileFilter.GetFilterNameOrMask();
+ GetOptionsMgr()->SaveOption(OPT_FILEFILTER_CURRENT, sFilter.c_str());
}
BOOL linefiltersEnabled = lineFiltersDlg.m_bIgnoreRegExp;
GetOptionsMgr()->SaveOption(OPT_LINEFILTER_ENABLED, linefiltersEnabled == TRUE);
@@ -2650,7 +2650,7 @@
}
else if (frame == FRAME_FOLDER)
{
- const CString newFilter = theApp.m_globalFileFilter.GetFilterNameOrMask();
+ const String newFilter = theApp.m_globalFileFilter.GetFilterNameOrMask();
if (lineFiltersEnabledOrig != linefiltersEnabled ||
!m_pLineFilters->Compare(lineFilters) || origFilter != newFilter)
{
@@ -3201,8 +3201,8 @@
pathsDlg.m_bRightPathReadOnly = pDoc->GetReadOnly(FALSE);
}
- CString filterNameOrMask = theApp.m_globalFileFilter.GetFilterNameOrMask();
- pathsDlg.m_sFilter = filterNameOrMask;
+ String filterNameOrMask = theApp.m_globalFileFilter.GetFilterNameOrMask();
+ pathsDlg.m_sFilter = filterNameOrMask.c_str();
sht.DoModal();
}
Modified: trunk/Src/Merge.cpp
===================================================================
--- trunk/Src/Merge.cpp 2009-06-25 09:54:27 UTC (rev 6860)
+++ trunk/Src/Merge.cpp 2009-06-25 12:11:07 UTC (rev 6861)
@@ -299,8 +299,8 @@
BOOL bFilterSet = theApp.m_globalFileFilter.SetFilter(filterString.c_str());
if (!bFilterSet)
{
- CString filter = theApp.m_globalFileFilter.GetFilterNameOrMask();
- m_pOptions->SaveOption(OPT_FILEFILTER_CURRENT, filter);
+ String filter = theApp.m_globalFileFilter.GetFilterNameOrMask();
+ m_pOptions->SaveOption(OPT_FILEFILTER_CURRENT, filter.c_str());
}
CSplashWnd::EnableSplashScreen(!bDisableSplash && !bCommandLineInvoke);
Modified: trunk/Src/OpenDlg.cpp
===================================================================
--- trunk/Src/OpenDlg.cpp 2009-06-25 09:54:27 UTC (rev 6860)
+++ trunk/Src/OpenDlg.cpp 2009-06-25 12:11:07 UTC (rev 6861)
@@ -168,21 +168,21 @@
m_ctlRight.SetAutoComplete(nSource);
}
- CString FilterNameOrMask = theApp.m_globalFileFilter.GetFilterNameOrMask();
+ String filterNameOrMask = theApp.m_globalFileFilter.GetFilterNameOrMask();
BOOL bMask = theApp.m_globalFileFilter.IsUsingMask();
if (!bMask)
{
String filterPrefix = theApp.LoadString(IDS_FILTER_PREFIX);
- FilterNameOrMask.Insert(0, filterPrefix.c_str());
+ filterNameOrMask = filterPrefix + filterNameOrMask;
}
- int ind = m_ctlExt.FindStringExact(0, FilterNameOrMask);
+ int ind = m_ctlExt.FindStringExact(0, filterNameOrMask.c_str());
if (ind != CB_ERR)
m_ctlExt.SetCurSel(ind);
else
{
- ind = m_ctlExt.InsertString(0, FilterNameOrMask);
+ ind = m_ctlExt.InsertString(0, filterNameOrMask.c_str());
if (ind != CB_ERR)
m_ctlExt.SetCurSel(ind);
else
@@ -348,7 +348,7 @@
{
BOOL bFilterSet = theApp.m_globalFileFilter.SetFilter(filter);
if (!bFilterSet)
- m_strExt = theApp.m_globalFileFilter.GetFilterNameOrMask();
+ m_strExt = theApp.m_globalFileFilter.GetFilterNameOrMask().c_str();
GetOptionsMgr()->SaveOption(OPT_FILEFILTER_CURRENT, filter.c_str());
}
@@ -563,19 +563,19 @@
GetMainFrame()->SelectFilter();
- CString FilterNameOrMask = theApp.m_globalFileFilter.GetFilterNameOrMask();
+ String filterNameOrMask = theApp.m_globalFileFilter.GetFilterNameOrMask();
if (theApp.m_globalFileFilter.IsUsingMask())
{
// If we had filter chosen and now has mask we can overwrite filter
if (!bUseMask || curFilter[0] != '*')
{
- SetDlgItemText(IDC_EXT_COMBO, FilterNameOrMask);
+ SetDlgItemText(IDC_EXT_COMBO, filterNameOrMask.c_str());
}
}
else
{
- FilterNameOrMask.Insert(0, filterPrefix.c_str());
- SetDlgItemText(IDC_EXT_COMBO, FilterNameOrMask);
+ filterNameOrMask = filterPrefix + filterNameOrMask;
+ SetDlgItemText(IDC_EXT_COMBO, filterNameOrMask.c_str());
}
}
Modified: trunk/Src/ProjectFilePathsDlg.cpp
===================================================================
--- trunk/Src/ProjectFilePathsDlg.cpp 2009-06-25 09:54:27 UTC (rev 6860)
+++ trunk/Src/ProjectFilePathsDlg.cpp 2009-06-25 12:11:07 UTC (rev 6861)
@@ -108,19 +108,19 @@
GetMainFrame()->SelectFilter();
- CString filterNameOrMask = theApp.m_globalFileFilter.GetFilterNameOrMask();
+ String filterNameOrMask = theApp.m_globalFileFilter.GetFilterNameOrMask();
if (theApp.m_globalFileFilter.IsUsingMask())
{
// If we had filter chosen and now has mask we can overwrite filter
if (!bUseMask || curFilter[0] != '*')
{
- SetDlgItemText(IDC_PROJ_FILTER_EDIT, filterNameOrMask);
+ SetDlgItemText(IDC_PROJ_FILTER_EDIT, filterNameOrMask.c_str());
}
}
else
{
- filterNameOrMask.Insert(0, filterPrefix.c_str());
- SetDlgItemText(IDC_PROJ_FILTER_EDIT, filterNameOrMask);
+ filterNameOrMask = filterPrefix + filterNameOrMask;
+ SetDlgItemText(IDC_PROJ_FILTER_EDIT, filterNameOrMask.c_str());
}
}
Modified: trunk/Src/TestFilterDlg.cpp
===================================================================
--- trunk/Src/TestFilterDlg.cpp 2009-06-25 09:54:27 UTC (rev 6860)
+++ trunk/Src/TestFilterDlg.cpp 2009-06-25 12:11:07 UTC (rev 6861)
@@ -9,6 +9,7 @@
#include "stdafx.h"
#include "Merge.h"
#include "resource.h"
+#include "UnicodeString.h"
#include "TestFilterDlg.h"
#include "FileFilterMgr.h"
@@ -60,8 +61,8 @@
GetDlgItem(IDC_TEST_TEXT)->SetFocus();
- CString name = m_pFileFilterMgr->GetFilterName(m_pFileFilter);
- SetDlgItemText(IDC_HEADER_FILTER_NAME, name);
+ String name = m_pFileFilterMgr->GetFilterName(m_pFileFilter);
+ SetDlgItemText(IDC_HEADER_FILTER_NAME, name.c_str());
return FALSE; // return TRUE unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-06-25 13:24:08
|
Revision: 6865
http://winmerge.svn.sourceforge.net/winmerge/?rev=6865&view=rev
Author: kimmov
Date: 2009-06-25 13:24:06 +0000 (Thu, 25 Jun 2009)
Log Message:
-----------
More conversion from MFC CString to String in file filter code.
Modified Paths:
--------------
trunk/Src/Common/UnicodeString.cpp
trunk/Src/Common/UnicodeString.h
trunk/Src/FileFilterHelper.cpp
trunk/Src/FileFilterHelper.h
trunk/Src/FileFilterMgr.cpp
trunk/Src/FileFilterMgr.h
Modified: trunk/Src/Common/UnicodeString.cpp
===================================================================
--- trunk/Src/Common/UnicodeString.cpp 2009-06-25 13:13:04 UTC (rev 6864)
+++ trunk/Src/Common/UnicodeString.cpp 2009-06-25 13:24:06 UTC (rev 6865)
@@ -27,6 +27,20 @@
#include "UnicodeString.h"
/**
+ * @brief Convert a string to lower case string.
+ * @param [in] str String to convert to lower case.
+ * @return Lower case string.
+ */
+String string_makelower(const String &str)
+{
+ String ret(str);
+ String::size_type i = 0;
+ for (i = 0; i < ret.length(); i++)
+ ret[i] = _totlower(ret[i]);
+ return ret;
+}
+
+/**
* @brief Replace a string inside a string with another string.
* This function searches for a string inside another string an if found,
* replaces it with another string. Function can replace several instances
@@ -88,3 +102,37 @@
result.erase(it + 1, result.end());
return result;
}
+
+/**
+ * @brief Trims whitespace chars from begin of the string.
+ * @param [in] str the original string.
+ * @return Trimmed string.
+ */
+String string_trim_ws_begin(const String & str)
+{
+ String result(str);
+ String::iterator it = result.begin();
+ while (_istspace(*it))
+ ++it;
+
+ if (it != result.begin())
+ result.erase(result.begin(), it);
+ return result;
+}
+
+/**
+ * @brief Trims whitespace chars from end of the string.
+ * @param [in] str the original string.
+ * @return Trimmed string.
+ */
+String string_trim_ws_end(const String & str)
+{
+ String result(str);
+ String::iterator it = result.end() - 1;
+ while (_istspace(*it))
+ --it;
+
+ if (it != result.end() - 1)
+ result.erase(it + 1, result.end());
+ return result;
+}
Modified: trunk/Src/Common/UnicodeString.h
===================================================================
--- trunk/Src/Common/UnicodeString.h 2009-06-25 13:13:04 UTC (rev 6864)
+++ trunk/Src/Common/UnicodeString.h 2009-06-25 13:24:06 UTC (rev 6865)
@@ -37,6 +37,8 @@
typedef std_tchar(string) String;
+String string_makelower(const String &str);
+
void string_replace(String &target, const String &find, const String &replace);
// Comparing
@@ -44,5 +46,7 @@
// Trimming
String string_trim_ws(const String & str);
+String string_trim_ws_begin(const String & str);
+String string_trim_ws_end(const String & str);
#endif // _UNICODE_STRING_
Modified: trunk/Src/FileFilterHelper.cpp
===================================================================
--- trunk/Src/FileFilterHelper.cpp 2009-06-25 13:13:04 UTC (rev 6864)
+++ trunk/Src/FileFilterHelper.cpp 2009-06-25 13:24:06 UTC (rev 6865)
@@ -205,16 +205,16 @@
return;
}
m_sMask = strMask;
- CString regExp = ParseExtensions(strMask);
+ String regExp = ParseExtensions(strMask);
char * regexp_str;
FilterList::EncodingType type;
#ifdef UNICODE
- regexp_str = UCS2UTF8_ConvertToUtf8(regExp);
+ regexp_str = UCS2UTF8_ConvertToUtf8(regExp.c_str());
type = FilterList::ENC_UTF8;
#else
- regexp_str = regExp.LockBuffer();
+ regexp_str = &*regExp.begin();
type = FilterList::ENC_ANSI;
#endif
@@ -223,8 +223,6 @@
#ifdef UNICODE
UCS2UTF8_Dealloc(regexp_str);
-#else
- regExp.UnlockBuffer();
#endif
}
@@ -245,15 +243,15 @@
}
// preprend a backslash if there is none
- CString strFileName = szFileName;
- strFileName.MakeLower();
+ String strFileName = szFileName;
+ strFileName = string_makelower(strFileName);
if (strFileName[0] != _T('\\'))
strFileName = _T('\\') + strFileName;
// append a point if there is no extension
- if (strFileName.Find(_T('.')) == -1)
+ if (strFileName.find(_T('.')) == -1)
strFileName = strFileName + _T('.');
- char * name_utf = UCS2UTF8_ConvertToUtf8(strFileName);
+ char * name_utf = UCS2UTF8_ConvertToUtf8(strFileName.c_str());
bool match = m_pMaskFilter->Match(name_utf);
UCS2UTF8_Dealloc(name_utf);
return match;
@@ -285,10 +283,10 @@
return TRUE;
// Add a backslash
- CString strDirName(_T("\\"));
+ String strDirName(_T("\\"));
strDirName += szDirName;
- return m_fileFilterMgr->TestDirNameAgainstFilter(m_currentFilter, strDirName);
+ return m_fileFilterMgr->TestDirNameAgainstFilter(m_currentFilter, strDirName.c_str());
}
}
@@ -326,43 +324,45 @@
* @param [in] Extension list/mask to convert to regular expression.
* @return Regular expression that matches extension list.
*/
-CString FileFilterHelper::ParseExtensions(CString extensions) const
+String FileFilterHelper::ParseExtensions(const String &extensions) const
{
- CString strParsed;
- CString strPattern;
+ String strParsed;
+ String strPattern;
+ String ext(extensions);
BOOL bFilterAdded = FALSE;
static const TCHAR pszSeps[] = _T(" ;|,:");
- extensions += _T(";"); // Add one separator char to end
- int pos = extensions.FindOneOf(pszSeps);
+ ext += _T(";"); // Add one separator char to end
+ size_t pos = ext.find_first_of(pszSeps);
while (pos >= 0)
{
- CString token = extensions.Left(pos); // Get first extension
- extensions.Delete(0, pos + 1); // Remove extension + separator
+ String token = ext.substr(0, pos); // Get first extension
+ ext = ext.substr(pos + 2); // Remove extension + separator
// Only "*." or "*.something" allowed, other ignored
- if (token.GetLength() >= 2 && token[0] == '*' && token[1] == '.')
+ if (token.length() >= 2 && token[0] == '*' && token[1] == '.')
{
bFilterAdded = TRUE;
strPattern += _T(".*\\.");
- strPattern += token.Mid(2);
+ strPattern += token.substr(2);
strPattern += _T("$");
}
else
bFilterAdded = FALSE;
- pos = extensions.FindOneOf(pszSeps);
+ pos = ext.find_first_of(pszSeps);
if (bFilterAdded && pos >= 0)
strPattern += _T("|");
}
- if (strPattern.IsEmpty())
+ if (strPattern.empty())
strParsed = _T(".*"); // Match everything
else
{
strParsed = _T("^");
- strPattern.MakeLower();
+
+ strPattern = string_makelower(strPattern);
strParsed = strPattern; //+ _T("$");
}
return strParsed;
Modified: trunk/Src/FileFilterHelper.h
===================================================================
--- trunk/Src/FileFilterHelper.h 2009-06-25 13:13:04 UTC (rev 6864)
+++ trunk/Src/FileFilterHelper.h 2009-06-25 13:24:06 UTC (rev 6865)
@@ -129,7 +129,7 @@
BOOL includeDir(LPCTSTR szDirName);
protected:
- CString ParseExtensions(CString extensions) const;
+ String ParseExtensions(const String &extensions) const;
private:
FilterList * m_pMaskFilter; /*< Filter for filemasks (*.cpp) */
Modified: trunk/Src/FileFilterMgr.cpp
===================================================================
--- trunk/Src/FileFilterMgr.cpp 2009-06-25 13:13:04 UTC (rev 6864)
+++ trunk/Src/FileFilterMgr.cpp 2009-06-25 13:24:06 UTC (rev 6865)
@@ -39,6 +39,8 @@
using std::vector;
+static void AddFilterPattern(vector<FileFilterElement*> *filterList, String & str);
+
/**
* @brief Destructor, frees all filters.
*/
@@ -130,25 +132,25 @@
* @param [in] filterList List where pattern is added.
* @param [in] str Temporary variable (ie, it may be altered)
*/
-static void AddFilterPattern(vector<FileFilterElement*> *filterList, CString & str)
+static void AddFilterPattern(vector<FileFilterElement*> *filterList, String & str)
{
LPCTSTR commentLeader = _T("##"); // Starts comment
- str.TrimLeft();
+ str = string_trim_ws_begin(str);
// Ignore lines beginning with '##'
- int pos = str.Find(commentLeader);
+ size_t pos = str.find(commentLeader);
if (pos == 0)
return;
// Find possible comment-separator '<whitespace>##'
while (pos > 0 && !_istspace(str[pos - 1]))
- pos = str.Find(commentLeader, pos + 1);
+ pos = str.find(commentLeader, pos + 1);
// Remove comment and whitespaces before it
if (pos > 0)
- str = str.Left(pos);
- str.TrimRight();
- if (str.IsEmpty())
+ str = str.substr(0, pos);
+ str = string_trim_ws_end(str);
+ if (str.empty())
return;
const char * errormsg = NULL;
@@ -160,7 +162,7 @@
#ifdef UNICODE
// For unicode builds, use UTF-8.
// Convert pattern to UTF-8 and set option for PCRE to specify UTF-8.
- regexLen = TransformUcs2ToUtf8((LPCTSTR)str, _tcslen(str),
+ regexLen = TransformUcs2ToUtf8(str.c_str(), str.length(),
regexString, sizeof(regexString));
pcre_opts |= PCRE_UTF8;
#else
@@ -210,7 +212,7 @@
pfilter->fullpath = szFilepath;
pfilter->name = fileName.c_str(); // Filename is the default name
- CString sLine;
+ String sLine;
bool lossy = false;
bool bLinesLeft = true;
do
@@ -218,46 +220,45 @@
// Returns false when last line is read
String tmpLine;
bLinesLeft = file.ReadString(tmpLine, &lossy);
- sLine = tmpLine.c_str();
- sLine.TrimLeft();
- sLine.TrimRight();
+ sLine = tmpLine;
+ sLine = string_trim_ws(sLine);
- if (0 == _tcsncmp(sLine, _T("name:"), 5))
+ if (0 == _tcsncmp(sLine.c_str(), _T("name:"), 5))
{
// specifies display name
- CString str = sLine.Mid(5);
- str.TrimLeft();
- if (!str.IsEmpty())
+ String str = sLine.substr(5);
+ str = string_trim_ws_begin(str);
+ if (!str.empty())
pfilter->name = str;
}
- else if (0 == _tcsncmp(sLine, _T("desc:"), 5))
+ else if (0 == _tcsncmp(sLine.c_str(), _T("desc:"), 5))
{
// specifies display name
- CString str = sLine.Mid(5);
- str.TrimLeft();
- if (!str.IsEmpty())
+ String str = sLine.substr(5);
+ str = string_trim_ws_begin(str);
+ if (!str.empty())
pfilter->description = str;
}
- else if (0 == _tcsncmp(sLine, _T("def:"), 4))
+ else if (0 == _tcsncmp(sLine.c_str(), _T("def:"), 4))
{
// specifies default
- CString str = sLine.Mid(4);
- str.TrimLeft();
+ String str = sLine.substr(4);
+ str = string_trim_ws_begin(str);
if (str == _T("0") || str == _T("no") || str == _T("exclude"))
pfilter->default_include = false;
else if (str == _T("1") || str == _T("yes") || str == _T("include"))
pfilter->default_include = true;
}
- else if (0 == _tcsncmp(sLine, _T("f:"), 2))
+ else if (0 == _tcsncmp(sLine.c_str(), _T("f:"), 2))
{
// file filter
- CString str = sLine.Mid(2);
+ String str = sLine.substr(2);
AddFilterPattern(&pfilter->filefilters, str);
}
- else if (0 == _tcsncmp(sLine, _T("d:"), 2))
+ else if (0 == _tcsncmp(sLine.c_str(), _T("d:"), 2))
{
// directory filter
- CString str = sLine.Mid(2);
+ String str = sLine.substr(2);
AddFilterPattern(&pfilter->dirfilters, str);
}
} while (bLinesLeft);
Modified: trunk/Src/FileFilterMgr.h
===================================================================
--- trunk/Src/FileFilterMgr.h 2009-06-25 13:13:04 UTC (rev 6864)
+++ trunk/Src/FileFilterMgr.h 2009-06-25 13:24:06 UTC (rev 6865)
@@ -23,8 +23,6 @@
#ifndef FileFilterMgr_h_included
#define FileFilterMgr_h_included
-// Uses MFC C++ template containers
-#include <afxtempl.h>
#include <vector>
#include "UnicodeString.h"
#include "pcre.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-06-26 13:22:29
|
Revision: 6871
http://winmerge.svn.sourceforge.net/winmerge/?rev=6871&view=rev
Author: kimmov
Date: 2009-06-26 13:22:16 +0000 (Fri, 26 Jun 2009)
Log Message:
-----------
Continue removing MFC code from file filter code.
Modified Paths:
--------------
trunk/Src/FileFilterHelper.cpp
trunk/Src/FileFilterHelper.h
trunk/Src/FileFilterMgr.cpp
trunk/Src/FileFiltersDlg.cpp
trunk/Src/FileFiltersDlg.h
trunk/Src/MainFrm.cpp
Modified: trunk/Src/FileFilterHelper.cpp
===================================================================
--- trunk/Src/FileFilterHelper.cpp 2009-06-26 10:30:06 UTC (rev 6870)
+++ trunk/Src/FileFilterHelper.cpp 2009-06-26 13:22:16 UTC (rev 6871)
@@ -33,6 +33,8 @@
#include "Coretools.h"
#include "paths.h"
+using std::vector;
+
#ifdef _DEBUG
#define new DEBUG_NEW
#undef THIS_FILE
@@ -96,19 +98,19 @@
* @param [out] filters Filter list to receive found filters.
* @param [out] selected Filepath of currently selected filter.
*/
-void FileFilterHelper::GetFileFilters(FILEFILTER_INFOLIST * filters, String & selected) const
+void FileFilterHelper::GetFileFilters(std::vector<FileFilterInfo> * filters, String & selected) const
{
if (m_fileFilterMgr)
{
- int count = m_fileFilterMgr->GetFilterCount();
- filters->SetSize(count);
- for (int i=0; i<count; ++i)
+ const int count = m_fileFilterMgr->GetFilterCount();
+ filters->reserve(count);
+ for (int i = 0; i < count; ++i)
{
FileFilterInfo filter;
filter.fullpath = m_fileFilterMgr->GetFilterPath(i);
filter.name = m_fileFilterMgr->GetFilterName(i);
filter.description = m_fileFilterMgr->GetFilterDesc(i);
- filters->SetAt(i, filter);
+ filters->push_back(filter);
}
}
selected = m_sFileFilterPath;
@@ -122,18 +124,20 @@
*/
String FileFilterHelper::GetFileFilterName(LPCTSTR filterPath) const
{
- FILEFILTER_INFOLIST filters;
+ vector<FileFilterInfo> filters;
String selected;
String name;
GetFileFilters(&filters, selected);
- for (int i = 0; i < filters.GetSize(); i++)
+ vector<FileFilterInfo>::const_iterator iter = filters.begin();
+ while (iter != filters.end())
{
- if (filters.GetAt(i).fullpath == filterPath)
+ if ((*iter).fullpath == filterPath)
{
- name = filters.GetAt(i).name;
+ name = (*iter).name;
break;
}
+ iter++;
}
return name;
}
@@ -145,18 +149,20 @@
*/
String FileFilterHelper::GetFileFilterPath(LPCTSTR filterName) const
{
- FILEFILTER_INFOLIST filters;
+ vector<FileFilterInfo> filters;
String selected;
String path;
GetFileFilters(&filters, selected);
- for (int i = 0; i < filters.GetSize(); i++)
+ vector<FileFilterInfo>::const_iterator iter = filters.begin();
+ while (iter != filters.end())
{
- if (filters.GetAt(i).name == filterName)
+ if ((*iter).name == filterName)
{
- path = filters.GetAt(i).fullpath;
+ path = (*iter).fullpath;
break;
}
+ iter++;
}
return path;
}
@@ -335,7 +341,7 @@
ext += _T(";"); // Add one separator char to end
size_t pos = ext.find_first_of(pszSeps);
- while (pos >= 0)
+ while (pos != String::npos)
{
String token = ext.substr(0, pos); // Get first extension
ext = ext.substr(pos + 2); // Remove extension + separator
@@ -453,22 +459,19 @@
*/
void FileFilterHelper::ReloadUpdatedFilters()
{
- FILEFILTER_INFOLIST filters;
+ vector<FileFilterInfo> filters;
DirItem fileInfo;
- DirItem *fileInfoStored = NULL;
- FileFilterInfo filter;
String selected;
GetFileFilters(&filters, selected);
- for (int i = 0; i < filters.GetSize(); i++)
+ vector<FileFilterInfo>::const_iterator iter = filters.begin();
+ while (iter != filters.end())
{
- filter = filters.GetAt(i);
- String path = filter.fullpath;
- fileInfoStored = &filter.fileinfo;
+ String path = (*iter).fullpath;
fileInfo.Update(path);
- if (fileInfo.mtime != fileInfoStored->mtime ||
- fileInfo.size != fileInfoStored->size)
+ if (fileInfo.mtime != (*iter).fileinfo.mtime ||
+ fileInfo.size != (*iter).fileinfo.size)
{
// Reload filter after changing it
int retval = m_fileFilterMgr->ReloadFilterFromDisk(path.c_str());
@@ -480,6 +483,7 @@
SetFileFilterPath(path.c_str());
}
}
+ iter++;
}
}
Modified: trunk/Src/FileFilterHelper.h
===================================================================
--- trunk/Src/FileFilterHelper.h 2009-06-26 10:30:06 UTC (rev 6870)
+++ trunk/Src/FileFilterHelper.h 2009-06-26 13:22:16 UTC (rev 6871)
@@ -25,6 +25,7 @@
#ifndef _FILEFILTERHELPER_H_
#define _FILEFILTERHELPER_H_
+#include <vector>
#include "UnicodeString.h"
class FileFilterMgr;
@@ -52,7 +53,6 @@
DirItem fileinfo; /**< For tracking if file has been modified */
};
-typedef CArray<FileFilterInfo, FileFilterInfo&> FILEFILTER_INFOLIST;
typedef CMap<CString, LPCTSTR, int, int> FILEFILTER_FILEMAP;
/// Interface for testing files & directories for exclusion, as diff traverses file tree
@@ -107,7 +107,7 @@
FileFilterMgr * GetManager() const;
void SetFileFilterPath(LPCTSTR szFileFilterPath);
void EditFileFilter(LPCTSTR szFileFilterPath);
- void GetFileFilters(FILEFILTER_INFOLIST * filters, String & selected) const;
+ void GetFileFilters(std::vector<FileFilterInfo> * filters, String & selected) const;
String GetFileFilterName(LPCTSTR filterPath) const;
String GetFileFilterPath(LPCTSTR filterName) const;
void SetUserFilterPath(const String & filterPath);
Modified: trunk/Src/FileFilterMgr.cpp
===================================================================
--- trunk/Src/FileFilterMgr.cpp 2009-06-26 10:30:06 UTC (rev 6870)
+++ trunk/Src/FileFilterMgr.cpp 2009-06-26 13:22:16 UTC (rev 6871)
@@ -143,11 +143,11 @@
return;
// Find possible comment-separator '<whitespace>##'
- while (pos > 0 && !_istspace(str[pos - 1]))
+ while (pos != std::string::npos && !_istspace(str[pos - 1]))
pos = str.find(commentLeader, pos + 1);
// Remove comment and whitespaces before it
- if (pos > 0)
+ if (pos != std::string::npos)
str = str.substr(0, pos);
str = string_trim_ws_end(str);
if (str.empty())
Modified: trunk/Src/FileFiltersDlg.cpp
===================================================================
--- trunk/Src/FileFiltersDlg.cpp 2009-06-26 10:30:06 UTC (rev 6870)
+++ trunk/Src/FileFiltersDlg.cpp 2009-06-26 13:22:16 UTC (rev 6871)
@@ -23,6 +23,7 @@
// $Id$
#include "stdafx.h"
+#include <vector>
#include "UnicodeString.h"
#include "merge.h"
#include "MainFrm.h"
@@ -35,6 +36,8 @@
#include "TestFilterDlg.h"
#include "FileOrFolderSelect.h"
+using std::vector;
+
#ifdef _DEBUG
#define new DEBUG_NEW
#undef THIS_FILE
@@ -95,7 +98,7 @@
* @param [in] fileFilters Array of filters to show in the dialog.
* @note Call this before actually showing the dialog.
*/
-void FileFiltersDlg::SetFilterArray(FILEFILTER_INFOLIST * fileFilters)
+void FileFiltersDlg::SetFilterArray(vector<FileFilterInfo> * fileFilters)
{
m_Filters = fileFilters;
}
@@ -145,7 +148,7 @@
m_listFilters.SetItemText(0, 1, title.c_str());
m_listFilters.SetItemText(0, 2, title.c_str());
- int count = m_Filters->GetSize();
+ const int count = m_Filters->size();
for (int i = 0; i < count; i++)
{
@@ -201,7 +204,7 @@
*/
void FileFiltersDlg::AddToGrid(int filterIndex)
{
- const FileFilterInfo & filterinfo = m_Filters->GetAt(filterIndex);
+ const FileFilterInfo & filterinfo = m_Filters->at(filterIndex);
const int item = filterIndex + 1;
m_listFilters.InsertItem(item, filterinfo.name.c_str());
@@ -469,7 +472,7 @@
{
// Remove all from filterslist and re-add so we can update UI
String selected;
- m_Filters->RemoveAll();
+ m_Filters->clear();
theApp.m_globalFileFilter.LoadAllFileFilters();
theApp.m_globalFileFilter.GetFileFilters(m_Filters, selected);
@@ -506,7 +509,7 @@
// Remove all from filterslist and re-add so we can update UI
String selected;
- m_Filters->RemoveAll();
+ m_Filters->clear();
theApp.m_globalFileFilter.GetFileFilters(m_Filters, selected);
UpdateFiltersList();
@@ -524,7 +527,7 @@
*/
void FileFiltersDlg::UpdateFiltersList()
{
- int count = m_Filters->GetSize();
+ int count = m_Filters->size();
m_listFilters.DeleteAllItems();
@@ -598,7 +601,7 @@
// Remove all from filterslist and re-add so we can update UI
String selected;
- m_Filters->RemoveAll();
+ m_Filters->clear();
theApp.m_globalFileFilter.GetFileFilters(m_Filters, selected);
UpdateFiltersList();
Modified: trunk/Src/FileFiltersDlg.h
===================================================================
--- trunk/Src/FileFiltersDlg.h 2009-06-26 10:30:06 UTC (rev 6870)
+++ trunk/Src/FileFiltersDlg.h 2009-06-26 13:22:16 UTC (rev 6871)
@@ -19,7 +19,7 @@
*
* @brief Declaration file for File Filters dialog
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#if !defined(AFX_FILTERSDLG_H__6180CBC3_99BB_4C85_B0EA_BA85D219285E__INCLUDED_)
@@ -29,6 +29,8 @@
#pragma once
#endif // _MSC_VER > 1000
+#include <vector>
+
/**
* @brief Class for dialog allowing user to select
* and edit used file filters
@@ -40,7 +42,7 @@
// Construction
public:
FileFiltersDlg(); // standard constructor
- void SetFilterArray(FILEFILTER_INFOLIST * fileFilters);
+ void SetFilterArray(std::vector<FileFilterInfo> * fileFilters);
CString GetSelected();
void SetSelected(const CString & selected);
@@ -48,7 +50,7 @@
private:
CString m_sFileFilterPath;
CPoint m_ptLastMousePos;
- FILEFILTER_INFOLIST * m_Filters;
+ std::vector<FileFilterInfo> * m_Filters;
// Dialog Data
//{{AFX_DATA(FileFiltersDlg)
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2009-06-26 10:30:06 UTC (rev 6870)
+++ trunk/Src/MainFrm.cpp 2009-06-26 13:22:16 UTC (rev 6871)
@@ -76,6 +76,8 @@
#include "PluginsListDlg.h"
#include "stringdiffs.h"
+using std::vector;
+
/*
One source file must compile the stubs for multimonitor
by defining the symbol COMPILE_MULTIMON_STUBS & including <multimon.h>
@@ -2591,7 +2593,7 @@
CPropertySheet sht(title.c_str());
LineFiltersDlg lineFiltersDlg;
FileFiltersDlg fileFiltersDlg;
- FILEFILTER_INFOLIST fileFilters;
+ vector<FileFilterInfo> fileFilters;
LineFiltersList * lineFilters = new LineFiltersList();
String selectedFilter;
const String origFilter = theApp.m_globalFileFilter.GetFilterNameOrMask();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-06-27 10:14:41
|
Revision: 6872
http://winmerge.svn.sourceforge.net/winmerge/?rev=6872&view=rev
Author: kimmov
Date: 2009-06-27 10:14:39 +0000 (Sat, 27 Jun 2009)
Log Message:
-----------
Remove unneeded CMap from file filter loading.
Modified Paths:
--------------
trunk/Src/FileFilterHelper.cpp
trunk/Src/FileFilterHelper.h
Modified: trunk/Src/FileFilterHelper.cpp
===================================================================
--- trunk/Src/FileFilterHelper.cpp 2009-06-26 13:22:16 UTC (rev 6871)
+++ trunk/Src/FileFilterHelper.cpp 2009-06-27 10:14:39 UTC (rev 6872)
@@ -307,22 +307,15 @@
/**
* @brief Load in all filter patterns in a directory (unless already in map).
- * @param [in,out] patternsLoaded Map where found filterfiles are added.
* @param [in] sPattern Directory wildcard defining files to add to map as filter files.
* It is directoryname + filemask, for example, for a filter for all users:
* "C:\Program Files\WinMerge\Filters\*.flt"
* Examples of user-specific filters:
* "C:\Documents and Settings\User\My Documents\WinMergeFilters\*.flt"
*/
-void FileFilterHelper::LoadFileFilterDirPattern(FILEFILTER_FILEMAP & patternsLoaded,
- LPCTSTR szPattern)
+void FileFilterHelper::LoadFileFilterDirPattern(LPCTSTR szPattern)
{
- int n=0;
- if (!patternsLoaded.Lookup(szPattern, n))
- {
- m_fileFilterMgr->LoadFromDirectory(szPattern, FileFilterExt);
- }
- patternsLoaded[szPattern] = ++n;
+ m_fileFilterMgr->LoadFromDirectory(szPattern, FileFilterExt);
}
/**
@@ -493,16 +486,13 @@
*/
void FileFilterHelper::LoadAllFileFilters()
{
- // Load filters from all possible subdirectories
- FILEFILTER_FILEMAP patternsLoaded;
-
// First delete existing filters
m_fileFilterMgr->DeleteAllFilters();
// Program application directory
m_sGlobalFilterPath = GetModulePath() + _T("\\Filters");
- LoadFileFilterDirPattern(patternsLoaded, (m_sGlobalFilterPath + _T("\\*") + FileFilterExt).c_str());
- LoadFileFilterDirPattern(patternsLoaded, (m_sUserSelFilterPath + _T("\\*") + FileFilterExt).c_str());
+ LoadFileFilterDirPattern((m_sGlobalFilterPath + _T("\\*") + FileFilterExt).c_str());
+ LoadFileFilterDirPattern((m_sUserSelFilterPath + _T("\\*") + FileFilterExt).c_str());
}
/**
Modified: trunk/Src/FileFilterHelper.h
===================================================================
--- trunk/Src/FileFilterHelper.h 2009-06-26 13:22:16 UTC (rev 6871)
+++ trunk/Src/FileFilterHelper.h 2009-06-27 10:14:39 UTC (rev 6872)
@@ -53,8 +53,6 @@
DirItem fileinfo; /**< For tracking if file has been modified */
};
-typedef CMap<CString, LPCTSTR, int, int> FILEFILTER_FILEMAP;
-
/// Interface for testing files & directories for exclusion, as diff traverses file tree
class IDiffFilter
{
@@ -115,8 +113,7 @@
void ReloadUpdatedFilters();
void LoadAllFileFilters();
- void LoadFileFilterDirPattern(FILEFILTER_FILEMAP & patternsLoaded,
- LPCTSTR szPattern);
+ void LoadFileFilterDirPattern(LPCTSTR szPattern);
void UseMask(BOOL bUseMask);
void SetMask(LPCTSTR strMask);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-06-27 10:54:22
|
Revision: 6873
http://winmerge.svn.sourceforge.net/winmerge/?rev=6873&view=rev
Author: kimmov
Date: 2009-06-27 10:54:21 +0000 (Sat, 27 Jun 2009)
Log Message:
-----------
Don't edit file filters through FileFilterHelper. Removes CMainFrame dependency from FileFilterHelper.
Modified Paths:
--------------
trunk/Src/FileFilterHelper.cpp
trunk/Src/FileFilterHelper.h
trunk/Src/FileFiltersDlg.cpp
trunk/Src/FileFiltersDlg.h
Modified: trunk/Src/FileFilterHelper.cpp
===================================================================
--- trunk/Src/FileFilterHelper.cpp 2009-06-27 10:14:39 UTC (rev 6872)
+++ trunk/Src/FileFilterHelper.cpp 2009-06-27 10:54:21 UTC (rev 6873)
@@ -25,7 +25,6 @@
#include "stdafx.h"
#include "Ucs2Utf8.h"
#include "UnicodeString.h"
-#include "MainFrm.h"
#include "FilterList.h"
#include "DirItem.h"
#include "FileFilterMgr.h"
@@ -297,15 +296,6 @@
}
/**
- * @brief Open filter file to external editor for modifying.
- * @param [in] szFileFilterterPath Path of filter file to edit.
- */
-void FileFilterHelper::EditFileFilter(LPCTSTR szFileFilterPath)
-{
- CMainFrame::OpenFileToExternalEditor(szFileFilterPath);
-}
-
-/**
* @brief Load in all filter patterns in a directory (unless already in map).
* @param [in] sPattern Directory wildcard defining files to add to map as filter files.
* It is directoryname + filemask, for example, for a filter for all users:
Modified: trunk/Src/FileFilterHelper.h
===================================================================
--- trunk/Src/FileFilterHelper.h 2009-06-27 10:14:39 UTC (rev 6872)
+++ trunk/Src/FileFilterHelper.h 2009-06-27 10:54:21 UTC (rev 6873)
@@ -104,7 +104,6 @@
FileFilterMgr * GetManager() const;
void SetFileFilterPath(LPCTSTR szFileFilterPath);
- void EditFileFilter(LPCTSTR szFileFilterPath);
void GetFileFilters(std::vector<FileFilterInfo> * filters, String & selected) const;
String GetFileFilterName(LPCTSTR filterPath) const;
String GetFileFilterPath(LPCTSTR filterName) const;
Modified: trunk/Src/FileFiltersDlg.cpp
===================================================================
--- trunk/Src/FileFiltersDlg.cpp 2009-06-27 10:14:39 UTC (rev 6872)
+++ trunk/Src/FileFiltersDlg.cpp 2009-06-27 10:54:21 UTC (rev 6873)
@@ -245,11 +245,20 @@
if (sel > 0)
{
CString path = m_listFilters.GetItemText(sel, 2);
- theApp.m_globalFileFilter.EditFileFilter(path);
+ EditFileFilter(path);
}
}
/**
+ * @brief Edit file filter in external editor.
+ * @param [in] path Full path to file filter to edit.
+ */
+void FileFiltersDlg::EditFileFilter(LPCTSTR path)
+{
+ CMainFrame::OpenFileToExternalEditor(path);
+}
+
+/**
* @brief Edit selected filter when its double-clicked.
* @param [in] pNMHDR List control item data.
* @param [out] pResult Result of the action is returned in here.
@@ -465,7 +474,7 @@
ResMsgBox1(IDS_FILEFILTER_TMPL_COPY, templatePath.c_str(), MB_ICONERROR);
return;
}
- theApp.m_globalFileFilter.EditFileFilter(s);
+ EditFileFilter(s);
FileFilterMgr *pMgr = theApp.m_globalFileFilter.GetManager();
int retval = pMgr->AddFilter(s);
if (retval == FILTER_OK)
Modified: trunk/Src/FileFiltersDlg.h
===================================================================
--- trunk/Src/FileFiltersDlg.h 2009-06-27 10:14:39 UTC (rev 6872)
+++ trunk/Src/FileFiltersDlg.h 2009-06-27 10:54:21 UTC (rev 6873)
@@ -59,12 +59,13 @@
//}}AFX_DATA
// Implementation methods
-private:
+protected:
void InitList();
void SelectFilterByIndex(int index);
void AddToGrid(int filterIndex);
bool IsFilterItemNone(int item) const;
void UpdateFiltersList();
+ void EditFileFilter(LPCTSTR path);
// Overrides
// ClassWizard generated virtual function overrides
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-06-27 11:46:13
|
Revision: 6874
http://winmerge.svn.sourceforge.net/winmerge/?rev=6874&view=rev
Author: kimmov
Date: 2009-06-27 11:46:11 +0000 (Sat, 27 Jun 2009)
Log Message:
-----------
Remove rest of MFC dependencies from file filtering code.
Modified Paths:
--------------
trunk/Src/FileFilterHelper.cpp
trunk/Src/FileFilterHelper.h
trunk/Src/FileFilterMgr.cpp
trunk/Src/Merge.vcproj
Modified: trunk/Src/FileFilterHelper.cpp
===================================================================
--- trunk/Src/FileFilterHelper.cpp 2009-06-27 10:54:21 UTC (rev 6873)
+++ trunk/Src/FileFilterHelper.cpp 2009-06-27 11:46:11 UTC (rev 6874)
@@ -22,7 +22,8 @@
// ID line follows -- this is updated by SVN
// $Id$
-#include "stdafx.h"
+#include <windows.h>
+#include <tchar.h>
#include "Ucs2Utf8.h"
#include "UnicodeString.h"
#include "FilterList.h"
@@ -34,12 +35,6 @@
using std::vector;
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
/**
* @brief Constructor, creates new filtermanager.
*/
@@ -174,7 +169,7 @@
{
m_sUserSelFilterPath = filterPath;
if (filterPath[filterPath.length() - 1] != '\\')
- m_sUserSelFilterPath += _T("\\");
+ m_sUserSelFilterPath += L"\\";
}
/**
@@ -250,11 +245,11 @@
// preprend a backslash if there is none
String strFileName = szFileName;
strFileName = string_makelower(strFileName);
- if (strFileName[0] != _T('\\'))
- strFileName = _T('\\') + strFileName;
+ if (strFileName[0] != '\\')
+ strFileName = L"\\" + strFileName;
// append a point if there is no extension
- if (strFileName.find(_T('.')) == -1)
- strFileName = strFileName + _T('.');
+ if (strFileName.find('.') == -1)
+ strFileName = strFileName + L".";
char * name_utf = UCS2UTF8_ConvertToUtf8(strFileName.c_str());
bool match = m_pMaskFilter->Match(name_utf);
@@ -480,9 +475,9 @@
m_fileFilterMgr->DeleteAllFilters();
// Program application directory
- m_sGlobalFilterPath = GetModulePath() + _T("\\Filters");
- LoadFileFilterDirPattern((m_sGlobalFilterPath + _T("\\*") + FileFilterExt).c_str());
- LoadFileFilterDirPattern((m_sUserSelFilterPath + _T("\\*") + FileFilterExt).c_str());
+ m_sGlobalFilterPath = GetModulePath() + L"\\Filters";
+ LoadFileFilterDirPattern((m_sGlobalFilterPath + L"\\*" + FileFilterExt).c_str());
+ LoadFileFilterDirPattern((m_sUserSelFilterPath + L"\\*" + FileFilterExt).c_str());
}
/**
Modified: trunk/Src/FileFilterHelper.h
===================================================================
--- trunk/Src/FileFilterHelper.h 2009-06-27 10:54:21 UTC (rev 6873)
+++ trunk/Src/FileFilterHelper.h 2009-06-27 11:46:11 UTC (rev 6874)
@@ -35,7 +35,7 @@
/**
* @brief File extension of file filter files.
*/
-const TCHAR FileFilterExt[] = _T(".flt");
+const TCHAR FileFilterExt[] = L".flt";
/**
* @brief Helper structure for UI and management of filters.
Modified: trunk/Src/FileFilterMgr.cpp
===================================================================
--- trunk/Src/FileFilterMgr.cpp 2009-06-27 10:54:21 UTC (rev 6873)
+++ trunk/Src/FileFilterMgr.cpp 2009-06-27 11:46:11 UTC (rev 6874)
@@ -20,9 +20,10 @@
// ID line follows -- this is updated by SVN
// $Id$
-#include "StdAfx.h"
+#include <windows.h>
#include <string.h>
#include <vector>
+#include <tchar.h>
#include "UnicodeString.h"
#include "FileFilter.h"
#include "pcre.h"
@@ -31,12 +32,6 @@
#include "coretools.h"
#include "Ucs2Utf8.h"
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
using std::vector;
static void AddFilterPattern(vector<FileFilterElement*> *filterList, String & str);
@@ -71,24 +66,28 @@
*/
void FileFilterMgr::LoadFromDirectory(LPCTSTR szPattern, LPCTSTR szExt)
{
- CFileFind finder;
- BOOL bWorking = finder.FindFile(szPattern);
int extlen = szExt ? _tcslen(szExt) : 0;
- while (bWorking)
+ WIN32_FIND_DATA ff;
+ HANDLE h = FindFirstFile(szPattern, &ff);
+ if (h != INVALID_HANDLE_VALUE)
{
- bWorking = finder.FindNextFile();
- if (finder.IsDots() || finder.IsDirectory())
- continue;
- CString sFilename = finder.GetFileName();
- if (szExt)
+ do
{
- // caller specified a specific extension
- // (This is really a workaround for brokenness in windows, which
- // doesn't screen correctly on extension in pattern)
- if (sFilename.Right(extlen).CompareNoCase(szExt))
- return;
- }
- AddFilter(finder.GetFilePath());
+ if (ff.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+ continue;
+ String filename = ff.cFileName;
+ if (szExt)
+ {
+ // caller specified a specific extension
+ // (This is really a workaround for brokenness in windows, which
+ // doesn't screen correctly on extension in pattern)
+ String ext = filename.substr(filename.length() - extlen);
+ if (string_compare_nocase(szExt, ext) == 0)
+ return;
+ }
+ AddFilter(ff.cFileName);
+ } while (FindNextFile(h, &ff));
+ FindClose(h);
}
}
Modified: trunk/Src/Merge.vcproj
===================================================================
--- trunk/Src/Merge.vcproj 2009-06-27 10:54:21 UTC (rev 6873)
+++ trunk/Src/Merge.vcproj 2009-06-27 11:46:11 UTC (rev 6874)
@@ -2213,7 +2213,10 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""/>
</FileConfiguration>
<FileConfiguration
Name="UnicodeDebug|Win32">
@@ -2222,6 +2225,9 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
@@ -2231,6 +2237,9 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
@@ -2239,7 +2248,10 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""/>
</FileConfiguration>
</File>
<File
@@ -2250,7 +2262,10 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""/>
</FileConfiguration>
<FileConfiguration
Name="UnicodeDebug|Win32">
@@ -2259,6 +2274,9 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
@@ -2268,6 +2286,9 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
@@ -2276,7 +2297,10 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""/>
</FileConfiguration>
</File>
<File
@@ -2287,7 +2311,10 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""/>
</FileConfiguration>
<FileConfiguration
Name="UnicodeDebug|Win32">
@@ -2296,6 +2323,9 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
@@ -2305,6 +2335,9 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
@@ -2313,7 +2346,10 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""/>
</FileConfiguration>
</File>
<File
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-06-27 12:59:40
|
Revision: 6875
http://winmerge.svn.sourceforge.net/winmerge/?rev=6875&view=rev
Author: kimmov
Date: 2009-06-27 12:57:11 +0000 (Sat, 27 Jun 2009)
Log Message:
-----------
Improve file filter loading logic. Fix bug in loading file filters due to earlier refactoring patches.
Modified Paths:
--------------
trunk/Src/FileFilterHelper.cpp
trunk/Src/FileFilterHelper.h
trunk/Src/FileFilterMgr.cpp
trunk/Src/FileFilterMgr.h
Modified: trunk/Src/FileFilterHelper.cpp
===================================================================
--- trunk/Src/FileFilterHelper.cpp 2009-06-27 11:46:11 UTC (rev 6874)
+++ trunk/Src/FileFilterHelper.cpp 2009-06-27 12:57:11 UTC (rev 6875)
@@ -291,16 +291,14 @@
}
/**
- * @brief Load in all filter patterns in a directory (unless already in map).
- * @param [in] sPattern Directory wildcard defining files to add to map as filter files.
- * It is directoryname + filemask, for example, for a filter for all users:
- * "C:\Program Files\WinMerge\Filters\*.flt"
- * Examples of user-specific filters:
- * "C:\Documents and Settings\User\My Documents\WinMergeFilters\*.flt"
+ * @brief Load in all filters in a folder.
+ * @param [in] dir Folder from where to load filters.
+ * @param [in] sPattern Wildcard defining files to add to map as filter files.
+ * It is filemask, for example, "*.flt"
*/
-void FileFilterHelper::LoadFileFilterDirPattern(LPCTSTR szPattern)
+void FileFilterHelper::LoadFileFilterDirPattern(LPCTSTR dir, LPCTSTR szPattern)
{
- m_fileFilterMgr->LoadFromDirectory(szPattern, FileFilterExt);
+ m_fileFilterMgr->LoadFromDirectory(dir, szPattern, FileFilterExt);
}
/**
@@ -322,7 +320,7 @@
while (pos != String::npos)
{
String token = ext.substr(0, pos); // Get first extension
- ext = ext.substr(pos + 2); // Remove extension + separator
+ ext = ext.substr(pos + 1); // Remove extension + separator
// Only "*." or "*.something" allowed, other ignored
if (token.length() >= 2 && token[0] == '*' && token[1] == '.')
@@ -476,8 +474,10 @@
// Program application directory
m_sGlobalFilterPath = GetModulePath() + L"\\Filters";
- LoadFileFilterDirPattern((m_sGlobalFilterPath + L"\\*" + FileFilterExt).c_str());
- LoadFileFilterDirPattern((m_sUserSelFilterPath + L"\\*" + FileFilterExt).c_str());
+ String pattern(L"*");
+ pattern += FileFilterExt;
+ LoadFileFilterDirPattern(m_sGlobalFilterPath.c_str(), pattern.c_str());
+ LoadFileFilterDirPattern(m_sUserSelFilterPath.c_str(), pattern.c_str());
}
/**
Modified: trunk/Src/FileFilterHelper.h
===================================================================
--- trunk/Src/FileFilterHelper.h 2009-06-27 11:46:11 UTC (rev 6874)
+++ trunk/Src/FileFilterHelper.h 2009-06-27 12:57:11 UTC (rev 6875)
@@ -112,7 +112,7 @@
void ReloadUpdatedFilters();
void LoadAllFileFilters();
- void LoadFileFilterDirPattern(LPCTSTR szPattern);
+ void LoadFileFilterDirPattern(LPCTSTR dir, LPCTSTR szPattern);
void UseMask(BOOL bUseMask);
void SetMask(LPCTSTR strMask);
Modified: trunk/Src/FileFilterMgr.cpp
===================================================================
--- trunk/Src/FileFilterMgr.cpp 2009-06-27 11:46:11 UTC (rev 6874)
+++ trunk/Src/FileFilterMgr.cpp 2009-06-27 12:57:11 UTC (rev 6875)
@@ -31,6 +31,7 @@
#include "UniFile.h"
#include "coretools.h"
#include "Ucs2Utf8.h"
+#include "paths.h"
using std::vector;
@@ -60,15 +61,16 @@
/**
* @brief Load all filter files matching pattern from disk into internal filter set.
- *
- * @param [in] szPattern Pattern from where to load filters, for example "\\Filters\\*.flt"
- * @param [in] szExt File-extension of filter files
+ * @param [in] dir Directory from where filters are loaded.
+ * @param [in] szPattern Pattern for filters to load filters, for example "*.flt".
+ * @param [in] szExt File-extension of filter files.
*/
-void FileFilterMgr::LoadFromDirectory(LPCTSTR szPattern, LPCTSTR szExt)
+void FileFilterMgr::LoadFromDirectory(LPCTSTR dir, LPCTSTR szPattern, LPCTSTR szExt)
{
- int extlen = szExt ? _tcslen(szExt) : 0;
+ const int extlen = szExt ? _tcslen(szExt) : 0;
+ const String pattern = paths_ConcatPath(dir, szPattern);
WIN32_FIND_DATA ff;
- HANDLE h = FindFirstFile(szPattern, &ff);
+ HANDLE h = FindFirstFile(pattern.c_str(), &ff);
if (h != INVALID_HANDLE_VALUE)
{
do
@@ -82,10 +84,12 @@
// (This is really a workaround for brokenness in windows, which
// doesn't screen correctly on extension in pattern)
String ext = filename.substr(filename.length() - extlen);
- if (string_compare_nocase(szExt, ext) == 0)
+ if (string_compare_nocase(szExt, ext) != 0)
return;
}
- AddFilter(ff.cFileName);
+
+ String filterpath = paths_ConcatPath(dir, ff.cFileName);
+ AddFilter(filterpath.c_str());
} while (FindNextFile(h, &ff));
FindClose(h);
}
Modified: trunk/Src/FileFilterMgr.h
===================================================================
--- trunk/Src/FileFilterMgr.h 2009-06-27 11:46:11 UTC (rev 6874)
+++ trunk/Src/FileFilterMgr.h 2009-06-27 12:57:11 UTC (rev 6875)
@@ -59,7 +59,7 @@
public:
~FileFilterMgr();
// Reload filter array from specified directory (passed to CFileFind)
- void LoadFromDirectory(LPCTSTR szPattern, LPCTSTR szExt);
+ void LoadFromDirectory(LPCTSTR dir, LPCTSTR szPattern, LPCTSTR szExt);
// Reload an edited filter
int ReloadFilterFromDisk(FileFilter * pfilter);
int ReloadFilterFromDisk(LPCTSTR szFullPath);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-06-27 20:56:56
|
Revision: 6876
http://winmerge.svn.sourceforge.net/winmerge/?rev=6876&view=rev
Author: kimmov
Date: 2009-06-27 20:56:08 +0000 (Sat, 27 Jun 2009)
Log Message:
-----------
Use std::vector instead of CList in FileActionScript.
Modified Paths:
--------------
trunk/Src/FileActionScript.cpp
trunk/Src/FileActionScript.h
Modified: trunk/Src/FileActionScript.cpp
===================================================================
--- trunk/Src/FileActionScript.cpp 2009-06-27 12:57:11 UTC (rev 6875)
+++ trunk/Src/FileActionScript.cpp 2009-06-27 20:56:08 UTC (rev 6876)
@@ -23,6 +23,7 @@
// $Id$
#include "stdafx.h"
+#include <vector>
#include "UnicodeString.h"
#include "Merge.h"
#include "OptionsDef.h"
@@ -31,6 +32,8 @@
#include "ShellFileOperations.h"
#include "paths.h"
+using std::vector;
+
/**
* @brief Standard constructor.
*/
@@ -55,6 +58,16 @@
delete m_pMoveOperations;
delete m_pDelOperations;
}
+/**
+ * @brief Remove last action item from the list.
+ * @return Item removed from the list.
+ */
+FileActionItem FileActionScript::RemoveTailActionItem()
+{
+ FileActionItem item = m_actions.back();
+ m_actions.pop_back();
+ return item;
+}
/**
* @brief Set parent window used for showing MessageBoxes.
@@ -80,7 +93,7 @@
*/
int FileActionScript::GetActionItemCount() const
{
- return m_actions.GetCount();
+ return m_actions.size();
}
/**
@@ -138,12 +151,11 @@
if (m_bUseRecycleBin)
operFlags |= FOF_ALLOWUNDO;
- POSITION pos = m_actions.GetHeadPosition();
- while (pos != NULL && bContinue == TRUE)
+ vector<FileActionItem>::const_iterator iter = m_actions.begin();
+ while (iter != m_actions.end() && bContinue == TRUE)
{
BOOL bSkip = FALSE;
- const FileActionItem act = m_actions.GetNext(pos);
- if (act.atype == FileAction::ACT_COPY && !act.dirflag)
+ if ((*iter).atype == FileAction::ACT_COPY && !(*iter).dirflag)
{
// Handle VCS checkout
// Before we can write over destination file, we must unlock
@@ -151,7 +163,7 @@
// has been modified.
if (GetOptionsMgr()->GetInt(OPT_VCS_SYSTEM) != VCS_NONE)
{
- int retVal = VCSCheckOut(act.dest, bApplyToAll);
+ int retVal = VCSCheckOut((*iter).dest, bApplyToAll);
if (retVal == SCRIPT_USERCANCEL)
bContinue = FALSE;
else if (retVal == SCRIPT_USERSKIP)
@@ -162,7 +174,7 @@
if (bContinue)
{
- if (!GetMainFrame()->CreateBackup(TRUE, act.dest.c_str()))
+ if (!GetMainFrame()->CreateBackup(TRUE, (*iter).dest.c_str()))
{
String strErr = theApp.LoadString(IDS_ERROR_BACKUP);
AfxMessageBox(strErr.c_str(), MB_OK | MB_ICONERROR);
@@ -171,12 +183,13 @@
}
}
- if (act.atype == FileAction::ACT_COPY &&
+ if ((*iter).atype == FileAction::ACT_COPY &&
bSkip == FALSE && bContinue == TRUE)
{
- m_pCopyOperations->AddSourceAndDestination(act.src, act.dest);
+ m_pCopyOperations->AddSourceAndDestination((*iter).src, (*iter).dest);
m_bHasCopyOperations = TRUE;
}
+ iter++;
}
if (bContinue == FALSE)
{
@@ -194,15 +207,15 @@
if (m_bUseRecycleBin)
operFlags |= FOF_ALLOWUNDO;
- pos = m_actions.GetHeadPosition();
- while (pos != NULL)
+ iter = m_actions.begin();
+ while (iter != m_actions.end())
{
- const FileActionItem act = m_actions.GetNext(pos);
- if (act.atype == FileAction::ACT_MOVE)
+ if ((*iter).atype == FileAction::ACT_MOVE)
{
- m_pMoveOperations->AddSourceAndDestination(act.src, act.dest);
+ m_pMoveOperations->AddSourceAndDestination((*iter).src, (*iter).dest);
m_bHasMoveOperations = TRUE;
}
+ iter++;
}
if (m_bHasMoveOperations)
m_pMoveOperations->SetOperation(operation, operFlags, m_hParentWindow);
@@ -213,17 +226,17 @@
if (m_bUseRecycleBin)
operFlags |= FOF_ALLOWUNDO;
- pos = m_actions.GetHeadPosition();
- while (pos != NULL)
+ iter = m_actions.begin();
+ while (iter != m_actions.end())
{
- const FileActionItem act = m_actions.GetNext(pos);
- if (act.atype == FileAction::ACT_DEL)
+ if ((*iter).atype == FileAction::ACT_DEL)
{
- m_pDelOperations->AddSource(act.src);
- if (!act.dest.empty())
- m_pDelOperations->AddSource(act.dest);
+ m_pDelOperations->AddSource((*iter).src);
+ if (!(*iter).dest.empty())
+ m_pDelOperations->AddSource((*iter).dest);
m_bHasDelOperations = TRUE;
}
+ iter++;
}
if (m_bHasDelOperations)
m_pDelOperations->SetOperation(operation, operFlags, m_hParentWindow);
@@ -231,6 +244,27 @@
}
/**
+ * @brief Run one operation set.
+ * @param [in] oplist List of operations to run.
+ * @param [out] userCancelled Did user cancel the operation?
+ * @return true if the operation succeeded and finished.
+ */
+bool FileActionScript::RunOp(ShellFileOperations *oplist, bool & userCancelled)
+{
+ bool fileOpSucceed = false;
+ __try
+ {
+ fileOpSucceed = oplist->Run();
+ userCancelled = oplist->IsCanceled();
+ }
+ __except (EXCEPTION_EXECUTE_HANDLER)
+ {
+ fileOpSucceed = false;
+ }
+ return fileOpSucceed;
+}
+
+/**
* @brief Execute fileoperations.
* @return TRUE if all actions were done successfully, FALSE otherwise.
*/
@@ -244,49 +278,37 @@
CreateOperationsScripts();
- __try
+ if (m_bHasCopyOperations)
{
- if (m_bHasCopyOperations)
+ vector<FileActionItem>::const_iterator iter = m_actions.begin();
+ while (iter != m_actions.end())
{
- POSITION pos = m_actions.GetHeadPosition();
- while (pos != NULL)
- {
- const FileActionItem &act = m_actions.GetNext(pos);
- if (act.dirflag)
- paths_CreateIfNeeded(act.dest.c_str());
- }
-
- bFileOpSucceed = m_pCopyOperations->Run();
- bUserCancelled = m_pCopyOperations->IsCanceled();
+ if ((*iter).dirflag)
+ paths_CreateIfNeeded((*iter).dest.c_str());
+ iter++;
}
+ bFileOpSucceed = RunOp(m_pCopyOperations, bUserCancelled);
+ }
- if (m_bHasMoveOperations)
+ if (m_bHasMoveOperations)
+ {
+ if (bFileOpSucceed && !bUserCancelled)
{
- if (bFileOpSucceed && !bUserCancelled)
- {
- bFileOpSucceed = m_pMoveOperations->Run();
- bUserCancelled = m_pCopyOperations->IsCanceled();
- }
- else
- bRetVal = FALSE;
+ bFileOpSucceed = RunOp(m_pMoveOperations, bUserCancelled);
}
+ else
+ bRetVal = FALSE;
+ }
- if (m_bHasDelOperations)
+ if (m_bHasDelOperations)
+ {
+ if (bFileOpSucceed && !bUserCancelled)
{
- if (bFileOpSucceed && !bUserCancelled)
- {
- bFileOpSucceed = m_pDelOperations->Run();
- bUserCancelled = m_pCopyOperations->IsCanceled();
- }
- else
- bRetVal = FALSE;
+ bFileOpSucceed = RunOp(m_pDelOperations, bUserCancelled);
}
+ else
+ bRetVal = FALSE;
}
- __except (EXCEPTION_EXECUTE_HANDLER)
- {
- bFileOpSucceed = FALSE;
- bRetVal = FALSE;
- }
if (!bFileOpSucceed || bUserCancelled)
bRetVal = FALSE;
Modified: trunk/Src/FileActionScript.h
===================================================================
--- trunk/Src/FileActionScript.h 2009-06-27 12:57:11 UTC (rev 6875)
+++ trunk/Src/FileActionScript.h 2009-06-27 20:56:08 UTC (rev 6876)
@@ -25,6 +25,8 @@
#ifndef _FILEACTIONSCRIPT_H_
#define _FILEACTIONSCRIPT_H_
+#include <vector>
+
class ShellFileOperations;
/**
@@ -107,8 +109,6 @@
UI_SIDE UIDestination; /**< Destination UI-side */
};
-typedef CList<FileActionItem, FileActionItem&> FileActionList;
-
/**
* @brief FileActionScript holds list of fileactions and runs those actions.
*
@@ -133,26 +133,25 @@
* Add new item to the action list.
* @param [in] item Item to add to the list.
*/
- void AddActionItem(FileActionItem & item) { m_actions.AddTail(item); }
+ void AddActionItem(FileActionItem & item) { m_actions.push_back(item); }
+
+ FileActionItem RemoveTailActionItem();
+
/**
- * Remove last action item from the list.
- * @return Item removed from the list.
- */
- FileActionItem RemoveTailActionItem() { return m_actions.RemoveTail(); }
- /**
* Get first action item in the list.
* @return First item in the list.
*/
- FileActionItem GetHeadActionItem() const { return m_actions.GetHead(); }
+ FileActionItem GetHeadActionItem() const { return m_actions[0]; }
String m_destBase; /**< Base destination path for some operations */
protected:
int VCSCheckOut(const String &path, BOOL &bApplyToAll);
int CreateOperationsScripts();
+ bool RunOp(ShellFileOperations *oplist, bool & userCancelled);
private:
- FileActionList m_actions; /**< List of all actions for this script. */
+ std::vector<FileActionItem> m_actions; /**< List of all actions for this script. */
ShellFileOperations * m_pCopyOperations; /**< Copy operations. */
BOOL m_bHasCopyOperations; /**< flag if we've put anything into m_pCopyOperations */
ShellFileOperations * m_pMoveOperations; /**< Move operations. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-06-29 07:39:11
|
Revision: 6877
http://winmerge.svn.sourceforge.net/winmerge/?rev=6877&view=rev
Author: kimmov
Date: 2009-06-29 07:39:10 +0000 (Mon, 29 Jun 2009)
Log Message:
-----------
Use std::vector instead of CArray for storing linedata in editor.
Modified Paths:
--------------
trunk/Src/DiffTextBuffer.cpp
trunk/Src/GhostTextBuffer.cpp
trunk/Src/MergeDoc.cpp
trunk/Src/editlib/ccrystaltextbuffer.cpp
trunk/Src/editlib/ccrystaltextbuffer.h
Modified: trunk/Src/DiffTextBuffer.cpp
===================================================================
--- trunk/Src/DiffTextBuffer.cpp 2009-06-27 20:56:08 UTC (rev 6876)
+++ trunk/Src/DiffTextBuffer.cpp 2009-06-29 07:39:10 UTC (rev 6877)
@@ -320,7 +320,7 @@
CRLFSTYLE nCrlfStyle, const FileTextEncoding & encoding, CString &sError)
{
ASSERT(!m_bInit);
- ASSERT(m_aLines.GetSize() == 0);
+ ASSERT(m_aLines.size() == 0);
// Unpacking the file here, save the result in a temporary file
String sFileName(pszFileNameInit);
@@ -391,7 +391,7 @@
// Manually grow line array exponentially
UINT arraysize = 500;
- m_aLines.SetSize(arraysize);
+ m_aLines.resize(arraysize);
// preveol must be initialized for empty files
preveol = _T("\n");
@@ -415,7 +415,7 @@
arraysize *= 2;
else
arraysize += 100 * 1024;
- m_aLines.SetSize(arraysize);
+ m_aLines.resize(arraysize);
}
sline += eol; // TODO: opportunity for optimization, as CString append is terrible
@@ -458,7 +458,7 @@
#endif // _DEBUG
// fix array size (due to our manual exponential growth
- m_aLines.SetSize(lineno);
+ m_aLines.resize(lineno);
//Try to determine current CRLF mode (most frequent)
@@ -471,7 +471,7 @@
// At least one empty line must present
// (view does not work for empty buffers)
- ASSERT(m_aLines.GetSize() > 0);
+ ASSERT(m_aLines.size() > 0);
m_bInit = TRUE;
m_bModified = FALSE;
@@ -592,7 +592,7 @@
// line loop : get each real line and write it in the file
CString sLine;
CString sEol = GetStringEol(nCrlfStyle);
- int nLineCount = m_aLines.GetSize();
+ int nLineCount = m_aLines.size();
for (int line = 0; line < nLineCount; ++line)
{
if (GetLineFlags(line) & LF_GHOST)
Modified: trunk/Src/GhostTextBuffer.cpp
===================================================================
--- trunk/Src/GhostTextBuffer.cpp 2009-06-27 20:56:08 UTC (rev 6876)
+++ trunk/Src/GhostTextBuffer.cpp 2009-06-29 07:39:10 UTC (rev 6877)
@@ -86,7 +86,7 @@
ASSERT (m_bInit); // Text buffer not yet initialized.
// You must call InitNew() or LoadFromFile() first!
- ASSERT (nLine >= 0 && nLine <= m_aLines.GetSize ());
+ ASSERT (nLine >= 0 && nLine <= m_aLines.size ());
if (m_bReadOnly)
return FALSE;
@@ -120,7 +120,7 @@
{
ASSERT (m_bInit); // Text buffer not yet initialized.
// You must call InitNew() or LoadFromFile() first!
- ASSERT (nLine >= 0 && nLine <= m_aLines.GetSize ());
+ ASSERT (nLine >= 0 && nLine <= m_aLines.size ());
if (m_bReadOnly)
return FALSE;
@@ -138,8 +138,11 @@
ASSERT (GetLineFlags(i) & LF_GHOST);
m_aLines[i].Clear();
}
- m_aLines.RemoveAt (nLine, nCount);
+ vector<LineInfo>::iterator iterBegin = m_aLines.begin() + nLine;
+ vector<LineInfo>::iterator iterEnd = iterBegin + nCount;
+ m_aLines.erase(iterBegin, iterEnd);
+
if (pSource != NULL)
{
// The last parameter is optimization - don't recompute lines preceeding
@@ -178,7 +181,7 @@
int nEndLine, int nEndChar,
CString &text, CRLFSTYLE nCrlfStyle /* CRLF_STYLE_AUTOMATIC */)
{
- int lines = (int) m_aLines.GetSize();
+ int lines = (int) m_aLines.size();
ASSERT(nStartLine >= 0 && nStartLine < lines);
ASSERT(nStartChar >= 0 && nStartChar <= GetLineLength(nStartLine));
ASSERT(nEndLine >= 0 && nEndLine < lines);
@@ -278,7 +281,7 @@
if (ur.m_ptStartPos_nGhost > 0)
// if we need a ghost line at position apparent_ptStartPos.y
- if (apparent_ptStartPos.y >= m_aLines.GetSize() || (GetLineFlags(apparent_ptStartPos.y) & LF_GHOST) == 0)
+ if (apparent_ptStartPos.y >= m_aLines.size() || (GetLineFlags(apparent_ptStartPos.y) & LF_GHOST) == 0)
{
// if we don't find it, we insert it
InsertGhostLine (pSource, apparent_ptStartPos.y);
@@ -289,7 +292,7 @@
// EndPos defined only for UNDO_INSERT (when we delete)
if (ur.m_dwFlags & UNDO_INSERT && ur.m_ptEndPos_nGhost > 0)
// if we need a ghost line at position apparent_ptStartPos.y
- if (apparent_ptEndPos.y >= m_aLines.GetSize() || (GetLineFlags(apparent_ptEndPos.y) & LF_GHOST) == 0)
+ if (apparent_ptEndPos.y >= m_aLines.size() || (GetLineFlags(apparent_ptEndPos.y) & LF_GHOST) == 0)
{
// if we don't find it, we insert it
InsertGhostLine (pSource, apparent_ptEndPos.y);
@@ -309,9 +312,9 @@
// flags are going to be deleted so we store them now
int bLastLineGhost = ((GetLineFlags(apparent_ptEndPos.y) & LF_GHOST) != 0);
- if ((apparent_ptStartPos.y < m_aLines.GetSize ()) &&
+ if ((apparent_ptStartPos.y < m_aLines.size ()) &&
(apparent_ptStartPos.x <= m_aLines[apparent_ptStartPos.y].Length()) &&
- (apparent_ptEndPos.y < m_aLines.GetSize ()) &&
+ (apparent_ptEndPos.y < m_aLines.size ()) &&
(apparent_ptEndPos.x <= m_aLines[apparent_ptEndPos.y].Length()))
{
GetTextWithoutEmptys (apparent_ptStartPos.y, apparent_ptStartPos.x, apparent_ptEndPos.y, apparent_ptEndPos.x, text);
@@ -454,7 +457,7 @@
if (ur.m_redo_ptStartPos_nGhost > 0)
// we need a ghost line at position apparent_ptStartPos.y
- if (apparent_ptStartPos.y >= m_aLines.GetSize() || (GetLineFlags(apparent_ptStartPos.y) & LF_GHOST) == 0)
+ if (apparent_ptStartPos.y >= m_aLines.size() || (GetLineFlags(apparent_ptStartPos.y) & LF_GHOST) == 0)
{
// if we don't find it, we insert it
InsertGhostLine (pSource, apparent_ptStartPos.y);
@@ -465,7 +468,7 @@
// EndPos defined only for UNDO_DELETE (when we delete)
if ((ur.m_dwFlags & UNDO_INSERT) == 0 && ur.m_redo_ptEndPos_nGhost > 0)
// we need a ghost line at position apparent_ptStartPos.y
- if (apparent_ptEndPos.y >= m_aLines.GetSize() || (GetLineFlags(apparent_ptEndPos.y) & LF_GHOST) == 0)
+ if (apparent_ptEndPos.y >= m_aLines.size() || (GetLineFlags(apparent_ptEndPos.y) & LF_GHOST) == 0)
{
// if we don't find it, we insert it
InsertGhostLine (pSource, apparent_ptEndPos.y);
@@ -865,7 +868,7 @@
}
// Discard unused entries in one shot
- m_aLines.SetSize(newnl);
+ m_aLines.resize(newnl);
RecomputeRealityMapping();
}
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2009-06-27 20:56:08 UTC (rev 6876)
+++ trunk/Src/MergeDoc.cpp 2009-06-29 07:39:10 UTC (rev 6877)
@@ -1635,8 +1635,8 @@
UINT lcount1new = lcount1 + RightExtras;
// this ASSERT may be false because of empty last line (see function's note)
// ASSERT(lcount0new == lcount1new);
- m_ptBuf[0]->m_aLines.SetSize(lcount0new);
- m_ptBuf[1]->m_aLines.SetSize(lcount1new);
+ m_ptBuf[0]->m_aLines.resize(lcount0new);
+ m_ptBuf[1]->m_aLines.resize(lcount1new);
// walk the diff list backward, move existing lines to proper place,
// add ghost lines, and set flags
Modified: trunk/Src/editlib/ccrystaltextbuffer.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextbuffer.cpp 2009-06-27 20:56:08 UTC (rev 6876)
+++ trunk/Src/editlib/ccrystaltextbuffer.cpp 2009-06-29 07:39:10 UTC (rev 6877)
@@ -198,10 +198,11 @@
// nPosition not defined ? Insert at end of array
if (nPosition == -1)
- nPosition = (int) m_aLines.GetSize();
+ nPosition = (int) m_aLines.size();
// insert all lines in one pass
- m_aLines.InsertAt (nPosition, li, nCount);
+ vector<LineInfo>::iterator iter = m_aLines.begin() + nPosition;
+ m_aLines.insert(iter, nCount, li);
// duplicate the text data for lines after the first one
for (int ic = 1; ic < nCount; ic++)
@@ -212,7 +213,7 @@
#ifdef _DEBUG
// Warning : this function is also used during rescan
// and this trace will appear even after the initial load
- int nLines = (int) m_aLines.GetSize ();
+ int nLines = (int) m_aLines.size();
if (nLines / 5000 != (nLines-nCount) / 5000)
TRACE1 ("%d lines loaded!\n", nLines);
#endif
@@ -284,12 +285,13 @@
FreeAll ()
{
// Free text
- const int nCount = (int) m_aLines.GetSize ();
- for (int I = 0; I < nCount; I++)
+ vector<LineInfo>::iterator iter = m_aLines.begin();
+ while (iter != m_aLines.end())
{
- m_aLines[I].Clear();
+ (*iter).Clear();
+ iter++;
}
- m_aLines.RemoveAll ();
+ m_aLines.clear();
// Undo buffer will be cleared by its destructor
@@ -303,7 +305,7 @@
InitNew (CRLFSTYLE nCrlfStyle /*= CRLF_STYLE_DOS*/ )
{
ASSERT (!m_bInit);
- ASSERT (m_aLines.GetSize () == 0);
+ ASSERT (m_aLines.size() == 0);
ASSERT (nCrlfStyle >= 0 && nCrlfStyle <= 2);
InsertLine (_T (""), 0);
m_bInit = TRUE;
@@ -355,7 +357,7 @@
LoadFromFile (LPCTSTR pszFileName, int nCrlfStyle /*= CRLF_STYLE_AUTOMATIC*/ )
{
ASSERT (!m_bInit);
- ASSERT (m_aLines.GetSize () == 0);
+ ASSERT (m_aLines.size() == 0);
HANDLE hFile = NULL;
int nCurrentMax = 256;
@@ -422,7 +424,7 @@
ASSERT (nCrlfStyle >= 0 && nCrlfStyle <= 2);
m_nCRLFMode = nCrlfStyle;
- m_aLines.SetSize (0, 4096);
+ m_aLines.setsize(4096);
DWORD dwBufPtr = 0;
while (dwBufPtr < dwCurSize)
@@ -474,7 +476,7 @@
pcLineBuf[nCurrentLength] = 0;
InsertLine (pcLineBuf);
- ASSERT (m_aLines.GetSize () > 0); // At least one empty line must present
+ ASSERT (m_aLines.size() > 0); // At least one empty line must present
m_bInit = TRUE;
m_bReadOnly = (dwFileAttributes & FILE_ATTRIBUTE_READONLY) != 0;
@@ -545,7 +547,7 @@
LPCTSTR pszCRLF = crlfs[nCrlfStyle];
int nCRLFLength = _tcslen (pszCRLF);
- int nLineCount = m_aLines.GetSize ();
+ int nLineCount = m_aLines.size();
for (int nLine = 0; nLine < nLineCount; nLine++)
{
int nLength = m_aLines[nLine].m_nLength;
@@ -654,7 +656,7 @@
LPCTSTR lpEOLtoApply = GetDefaultEol();
BOOL bChanged = FALSE;
int i;
- for (i = 0 ; i < m_aLines.GetSize () ; i++)
+ for (i = 0 ; i < m_aLines.size () ; i++)
{
// the last real line has no EOL
if (!m_aLines[i].HasEol())
@@ -674,7 +676,7 @@
ASSERT (m_bInit); // Text buffer not yet initialized.
// You must call InitNew() or LoadFromFile() first!
- return (int) m_aLines.GetSize ();
+ return (int) m_aLines.size ();
}
// number of characters in line (excluding any trailing eol characters)
@@ -768,7 +770,7 @@
int CCrystalTextBuffer::
FindLineWithFlag (DWORD dwFlag)
{
- int nSize = (int) m_aLines.GetSize ();
+ int nSize = (int) m_aLines.size ();
for (int L = 0; L < nSize; L++)
{
if ((m_aLines[L].m_dwFlags & dwFlag) != 0)
@@ -870,9 +872,9 @@
ASSERT (m_bInit); // Text buffer not yet initialized.
// You must call InitNew() or LoadFromFile() first!
- ASSERT (nStartLine >= 0 && nStartLine < m_aLines.GetSize ());
+ ASSERT (nStartLine >= 0 && nStartLine < m_aLines.size ());
ASSERT (nStartChar >= 0 && nStartChar <= m_aLines[nStartLine].Length());
- ASSERT (nEndLine >= 0 && nEndLine < m_aLines.GetSize ());
+ ASSERT (nEndLine >= 0 && nEndLine < m_aLines.size ());
ASSERT (nEndChar >= 0 && nEndChar <= m_aLines[nEndLine].Length());
ASSERT (nStartLine < nEndLine || nStartLine == nEndLine && nStartChar <= nEndChar);
// some edit functions (copy...) should do nothing when there is no selection.
@@ -996,9 +998,9 @@
ASSERT (m_bInit); // Text buffer not yet initialized.
// You must call InitNew() or LoadFromFile() first!
- ASSERT (nStartLine >= 0 && nStartLine < m_aLines.GetSize ());
+ ASSERT (nStartLine >= 0 && nStartLine < m_aLines.size ());
ASSERT (nStartChar >= 0 && nStartChar <= m_aLines[nStartLine].Length());
- ASSERT (nEndLine >= 0 && nEndLine < m_aLines.GetSize ());
+ ASSERT (nEndLine >= 0 && nEndLine < m_aLines.size ());
ASSERT (nEndChar >= 0 && nEndChar <= m_aLines[nEndLine].Length());
ASSERT (nStartLine < nEndLine || nStartLine == nEndLine && nStartChar <= nEndChar);
// some edit functions (delete...) should do nothing when there is no selection.
@@ -1030,7 +1032,9 @@
int nDelCount = nEndLine - nStartLine;
for (int L = nStartLine + 1; L <= nEndLine; L++)
m_aLines[L].Clear();
- m_aLines.RemoveAt (nStartLine + 1, nDelCount);
+ vector<LineInfo>::iterator iterBegin = m_aLines.begin() + nStartLine + 1;
+ vector<LineInfo>::iterator iterEnd = iterBegin + nDelCount;
+ m_aLines.erase(iterBegin, iterEnd);
// nEndLine is no more valid
m_aLines[nStartLine].DeleteEnd(nStartChar);
@@ -1095,7 +1099,7 @@
ASSERT (m_bInit); // Text buffer not yet initialized.
// You must call InitNew() or LoadFromFile() first!
- ASSERT (nLine >= 0 && nLine < m_aLines.GetSize ());
+ ASSERT (nLine >= 0 && nLine < m_aLines.size ());
ASSERT (nPos >= 0 && nPos <= m_aLines[nLine].Length());
if (m_bReadOnly)
return FALSE;
@@ -1366,9 +1370,9 @@
// we need to put the cursor before the deleted section
CString text;
- if ((apparent_ptStartPos.y < m_aLines.GetSize ()) &&
+ if ((apparent_ptStartPos.y < m_aLines.size()) &&
(apparent_ptStartPos.x <= m_aLines[apparent_ptStartPos.y].Length()) &&
- (apparent_ptEndPos.y < m_aLines.GetSize ()) &&
+ (apparent_ptEndPos.y < m_aLines.size()) &&
(apparent_ptEndPos.x <= m_aLines[apparent_ptEndPos.y].Length()))
{
GetTextWithoutEmptys (apparent_ptStartPos.y, apparent_ptStartPos.x, apparent_ptEndPos.y, apparent_ptEndPos.x, text);
@@ -1774,7 +1778,7 @@
if ((dwFlags & LF_BOOKMARKS) != 0)
nCurrentLine++;
- int nSize = (int) m_aLines.GetSize ();
+ int nSize = (int) m_aLines.size ();
for (;;)
{
while (nCurrentLine < nSize)
@@ -1803,7 +1807,7 @@
if ((dwFlags & LF_BOOKMARKS) != 0)
nCurrentLine--;
- int nSize = (int) m_aLines.GetSize ();
+ int nSize = (int) m_aLines.size ();
for (;;)
{
while (nCurrentLine >= 0)
@@ -1877,7 +1881,9 @@
{
for (int ic = 0; ic < nCount; ic++)
m_aLines[line + ic].Clear();
- m_aLines.RemoveAt(line, nCount);
+ vector<LineInfo>::iterator iterBegin = m_aLines.begin() + line;
+ vector<LineInfo>::iterator iterEnd = iterBegin + nCount;
+ m_aLines.erase(iterBegin, iterEnd);
}
int CCrystalTextBuffer::GetTabSize()
Modified: trunk/Src/editlib/ccrystaltextbuffer.h
===================================================================
--- trunk/Src/editlib/ccrystaltextbuffer.h 2009-06-27 20:56:08 UTC (rev 6876)
+++ trunk/Src/editlib/ccrystaltextbuffer.h 2009-06-29 07:39:10 UTC (rev 6877)
@@ -151,7 +151,7 @@
};
// Lines of text
- CArray < LineInfo, LineInfo & >m_aLines;
+ std::vector<LineInfo> m_aLines; /**< Text lines. */
// Undo
std::vector<UndoRecord> m_aUndoBuf; /**< Undo records. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-06-29 09:28:14
|
Revision: 6878
http://winmerge.svn.sourceforge.net/winmerge/?rev=6878&view=rev
Author: kimmov
Date: 2009-06-29 09:28:13 +0000 (Mon, 29 Jun 2009)
Log Message:
-----------
Few trivial optimizations and cleanups for editor buffer.
Modified Paths:
--------------
trunk/Src/DiffTextBuffer.cpp
trunk/Src/GhostTextBuffer.cpp
trunk/Src/editlib/ccrystaltextbuffer.cpp
Modified: trunk/Src/DiffTextBuffer.cpp
===================================================================
--- trunk/Src/DiffTextBuffer.cpp 2009-06-29 07:39:10 UTC (rev 6877)
+++ trunk/Src/DiffTextBuffer.cpp 2009-06-29 09:28:13 UTC (rev 6878)
@@ -592,7 +592,7 @@
// line loop : get each real line and write it in the file
CString sLine;
CString sEol = GetStringEol(nCrlfStyle);
- int nLineCount = m_aLines.size();
+ const size_t nLineCount = m_aLines.size();
for (int line = 0; line < nLineCount; ++line)
{
if (GetLineFlags(line) & LF_GHOST)
Modified: trunk/Src/GhostTextBuffer.cpp
===================================================================
--- trunk/Src/GhostTextBuffer.cpp 2009-06-29 07:39:10 UTC (rev 6877)
+++ trunk/Src/GhostTextBuffer.cpp 2009-06-29 09:28:13 UTC (rev 6878)
@@ -181,7 +181,7 @@
int nEndLine, int nEndChar,
CString &text, CRLFSTYLE nCrlfStyle /* CRLF_STYLE_AUTOMATIC */)
{
- int lines = (int) m_aLines.size();
+ const size_t lines = m_aLines.size();
ASSERT(nStartLine >= 0 && nStartLine < lines);
ASSERT(nStartChar >= 0 && nStartChar <= GetLineLength(nStartLine));
ASSERT(nEndLine >= 0 && nEndLine < lines);
@@ -312,9 +312,10 @@
// flags are going to be deleted so we store them now
int bLastLineGhost = ((GetLineFlags(apparent_ptEndPos.y) & LF_GHOST) != 0);
- if ((apparent_ptStartPos.y < m_aLines.size ()) &&
+ const size_t size = m_aLines.size();
+ if ((apparent_ptStartPos.y < size) &&
(apparent_ptStartPos.x <= m_aLines[apparent_ptStartPos.y].Length()) &&
- (apparent_ptEndPos.y < m_aLines.size ()) &&
+ (apparent_ptEndPos.y < size) &&
(apparent_ptEndPos.x <= m_aLines[apparent_ptEndPos.y].Length()))
{
GetTextWithoutEmptys (apparent_ptStartPos.y, apparent_ptStartPos.x, apparent_ptEndPos.y, apparent_ptEndPos.x, text);
@@ -412,8 +413,8 @@
}
// restore line revision numbers
- int i, naSavedRevisonNumbersSize = (int) ur.m_paSavedRevisonNumbers->GetSize();
- for (i = 0; i < naSavedRevisonNumbersSize; i++)
+ int naSavedRevisonNumbersSize = (int) ur.m_paSavedRevisonNumbers->GetSize();
+ for (int i = 0; i < naSavedRevisonNumbersSize; i++)
m_aLines[apparent_ptStartPos.y + i].m_dwRevisionNumber = (*ur.m_paSavedRevisonNumbers)[i];
m_aUndoBuf[tmpPos] = ur;
@@ -1168,8 +1169,7 @@
nStartLine = nRealBeforeStart;
}
int bLastRealLine = (ApparentLastRealLine() <= nEndLine);
- int i;
- for (i = nEndLine ; i >= nStartLine ; i --)
+ for (int i = nEndLine ; i >= nStartLine ; i --)
{
if ((GetLineFlags(i) & LF_GHOST) == 0)
{
Modified: trunk/Src/editlib/ccrystaltextbuffer.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextbuffer.cpp 2009-06-29 07:39:10 UTC (rev 6877)
+++ trunk/Src/editlib/ccrystaltextbuffer.cpp 2009-06-29 09:28:13 UTC (rev 6878)
@@ -286,10 +286,11 @@
{
// Free text
vector<LineInfo>::iterator iter = m_aLines.begin();
- while (iter != m_aLines.end())
+ vector<LineInfo>::iterator end = m_aLines.end();
+ while (iter != end)
{
(*iter).Clear();
- iter++;
+ ++iter;
}
m_aLines.clear();
@@ -655,8 +656,8 @@
{
LPCTSTR lpEOLtoApply = GetDefaultEol();
BOOL bChanged = FALSE;
- int i;
- for (i = 0 ; i < m_aLines.size () ; i++)
+ const int size = m_aLines.size();
+ for (int i = 0 ; i < size; i++)
{
// the last real line has no EOL
if (!m_aLines[i].HasEol())
@@ -770,11 +771,11 @@
int CCrystalTextBuffer::
FindLineWithFlag (DWORD dwFlag)
{
- int nSize = (int) m_aLines.size ();
- for (int L = 0; L < nSize; L++)
+ const size_t nSize = m_aLines.size();
+ for (size_t L = 0; L < nSize; L++)
{
if ((m_aLines[L].m_dwFlags & dwFlag) != 0)
- return L;
+ return (int) L;
}
return -1;
}
@@ -895,22 +896,24 @@
LPTSTR pszBuf = text.GetBuffer (nBufSize);
+ const LineInfo &startLine = m_aLines[nStartLine];
if (nStartLine < nEndLine)
{
- int nCount = m_aLines[nStartLine].Length() - nStartChar;
+ int nCount = startLine.Length() - nStartChar;
if (nCount > 0)
{
- memcpy (pszBuf, m_aLines[nStartLine].GetLine(nStartChar), sizeof (TCHAR) * nCount);
+ memcpy (pszBuf, startLine.GetLine(nStartChar), sizeof (TCHAR) * nCount);
pszBuf += nCount;
}
memcpy (pszBuf, pszCRLF, sizeof (TCHAR) * nCRLFLength);
pszBuf += nCRLFLength;
for (int I = nStartLine + 1; I < nEndLine; I++)
{
- nCount = m_aLines[I].Length();
+ const LineInfo &li = m_aLines[I];
+ nCount = li.Length();
if (nCount > 0)
{
- memcpy (pszBuf, m_aLines[I].GetLine(), sizeof (TCHAR) * nCount);
+ memcpy (pszBuf, li.GetLine(), sizeof (TCHAR) * nCount);
pszBuf += nCount;
}
memcpy (pszBuf, pszCRLF, sizeof (TCHAR) * nCRLFLength);
@@ -925,7 +928,7 @@
else
{
int nCount = nEndChar - nStartChar;
- memcpy (pszBuf, m_aLines[nStartLine].GetLine(nStartChar), sizeof (TCHAR) * nCount);
+ memcpy (pszBuf, startLine.GetLine(nStartChar), sizeof (TCHAR) * nCount);
pszBuf += nCount;
}
text.ReleaseBuffer (pszBuf - text);
@@ -1017,8 +1020,7 @@
if (nStartLine == nEndLine)
{
// delete part of one line
- LineInfo & li = m_aLines[nStartLine];
- li.Delete(nStartChar, nEndChar);
+ m_aLines[nStartLine].Delete(nStartChar, nEndChar);
if (pSource!=NULL)
UpdateViews (pSource, &context, UPDATE_SINGLELINE | UPDATE_HORZRANGE, nStartLine);
@@ -1026,10 +1028,10 @@
else
{
// delete multiple lines
- int nRestCount = m_aLines[nEndLine].FullLength() - nEndChar;
+ const int nRestCount = m_aLines[nEndLine].FullLength() - nEndChar;
CString sTail(m_aLines[nEndLine].GetLine(nEndChar), nRestCount);
- int nDelCount = nEndLine - nStartLine;
+ const int nDelCount = nEndLine - nStartLine;
for (int L = nStartLine + 1; L <= nEndLine; L++)
m_aLines[L].Clear();
vector<LineInfo>::iterator iterBegin = m_aLines.begin() + nStartLine + 1;
@@ -1066,7 +1068,7 @@
// Must at least take off the EOL characters
ASSERT(bytes >= li.FullLength() - li.Length());
- int offset = li.FullLength()-bytes;
+ const int offset = li.FullLength() - bytes;
// Must not take off more than exist
ASSERT(offset >= 0);
@@ -1370,9 +1372,10 @@
// we need to put the cursor before the deleted section
CString text;
- if ((apparent_ptStartPos.y < m_aLines.size()) &&
+ const size_t size = m_aLines.size();
+ if ((apparent_ptStartPos.y < size) &&
(apparent_ptStartPos.x <= m_aLines[apparent_ptStartPos.y].Length()) &&
- (apparent_ptEndPos.y < m_aLines.size()) &&
+ (apparent_ptEndPos.y < size) &&
(apparent_ptEndPos.x <= m_aLines[apparent_ptEndPos.y].Length()))
{
GetTextWithoutEmptys (apparent_ptStartPos.y, apparent_ptStartPos.x, apparent_ptEndPos.y, apparent_ptEndPos.x, text);
@@ -1576,8 +1579,7 @@
// update line revision numbers of modified lines
m_dwCurrentRevisionNumber++;
- int i;
- for (i = nLine ; i < nEndLine; i++)
+ for (int i = nLine ; i < nEndLine; i++)
m_aLines[i].m_dwRevisionNumber = m_dwCurrentRevisionNumber;
if (nPos != 0 || nEndChar != 0)
m_aLines[nEndLine].m_dwRevisionNumber = m_dwCurrentRevisionNumber;
@@ -1778,7 +1780,7 @@
if ((dwFlags & LF_BOOKMARKS) != 0)
nCurrentLine++;
- int nSize = (int) m_aLines.size ();
+ const size_t nSize = m_aLines.size ();
for (;;)
{
while (nCurrentLine < nSize)
@@ -1807,7 +1809,7 @@
if ((dwFlags & LF_BOOKMARKS) != 0)
nCurrentLine--;
- int nSize = (int) m_aLines.size ();
+ const size_t nSize = m_aLines.size ();
for (;;)
{
while (nCurrentLine >= 0)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-06-29 10:00:45
|
Revision: 6879
http://winmerge.svn.sourceforge.net/winmerge/?rev=6879&view=rev
Author: kimmov
Date: 2009-06-29 10:00:33 +0000 (Mon, 29 Jun 2009)
Log Message:
-----------
Make bunch of editor functions const functions.
Modified Paths:
--------------
trunk/Src/DiffTextBuffer.cpp
trunk/Src/DiffTextBuffer.h
trunk/Src/editlib/ccrystaltextbuffer.cpp
trunk/Src/editlib/ccrystaltextbuffer.h
Modified: trunk/Src/DiffTextBuffer.cpp
===================================================================
--- trunk/Src/DiffTextBuffer.cpp 2009-06-29 09:28:13 UTC (rev 6878)
+++ trunk/Src/DiffTextBuffer.cpp 2009-06-29 10:00:33 UTC (rev 6879)
@@ -173,7 +173,7 @@
* @param [in] nLineIndex Index of the line to get.
* @param [out] strLine Returns line text in the index.
*/
-BOOL CDiffTextBuffer::GetLine(int nLineIndex, CString &strLine)
+BOOL CDiffTextBuffer::GetLine(int nLineIndex, CString &strLine) const
{
int nLineLength = CCrystalTextBuffer::GetLineLength(nLineIndex);
if (nLineLength < 0)
@@ -208,7 +208,7 @@
* @param [out] strLine Returns line text in the index. Existing content
* of this string is overwritten.
*/
-BOOL CDiffTextBuffer::GetFullLine(int nLineIndex, CString &strLine)
+BOOL CDiffTextBuffer::GetFullLine(int nLineIndex, CString &strLine) const
{
int cchText = GetFullLineLength(nLineIndex);
if (cchText == 0)
@@ -241,7 +241,7 @@
* @param [in] flag Flag to check.
* @return TRUE if flag is set, FALSE otherwise.
*/
-BOOL CDiffTextBuffer::FlagIsSet(UINT line, DWORD flag)
+BOOL CDiffTextBuffer::FlagIsSet(UINT line, DWORD flag) const
{
return ((m_aLines[line].m_dwFlags & flag) == flag);
}
Modified: trunk/Src/DiffTextBuffer.h
===================================================================
--- trunk/Src/DiffTextBuffer.h 2009-06-29 09:28:13 UTC (rev 6878)
+++ trunk/Src/DiffTextBuffer.h 2009-06-29 10:00:33 UTC (rev 6879)
@@ -40,7 +40,7 @@
*/
FileTextEncoding m_encoding;
- BOOL FlagIsSet(UINT line, DWORD flag);
+ BOOL FlagIsSet(UINT line, DWORD flag) const;
public :
CDiffTextBuffer(CMergeDoc * pDoc, int pane);
@@ -71,10 +71,10 @@
void SetMixedEOL(bool bMixed) { m_bMixedEOL = bMixed; }
// If line has text (excluding eol), set strLine to text (excluding eol)
- BOOL GetLine(int nLineIndex, CString &strLine);
+ BOOL GetLine(int nLineIndex, CString &strLine) const;
// if line has any text (including eol), set strLine to text (including eol)
- BOOL GetFullLine(int nLineIndex, CString &strLine);
+ BOOL GetFullLine(int nLineIndex, CString &strLine) const;
virtual void SetModified (BOOL bModified = TRUE);
void prepareForRescan();
Modified: trunk/Src/editlib/ccrystaltextbuffer.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextbuffer.cpp 2009-06-29 09:28:13 UTC (rev 6878)
+++ trunk/Src/editlib/ccrystaltextbuffer.cpp 2009-06-29 10:00:33 UTC (rev 6879)
@@ -634,7 +634,7 @@
#endif // #if 0 savetofile
CRLFSTYLE CCrystalTextBuffer::
-GetCRLFMode ()
+GetCRLFMode () const
{
return m_nCRLFMode;
}
@@ -769,7 +769,7 @@
}
int CCrystalTextBuffer::
-FindLineWithFlag (DWORD dwFlag)
+FindLineWithFlag (DWORD dwFlag) const
{
const size_t nSize = m_aLines.size();
for (size_t L = 0; L < nSize; L++)
@@ -781,7 +781,7 @@
}
int CCrystalTextBuffer::
-GetLineWithFlag (DWORD dwFlag)
+GetLineWithFlag (DWORD dwFlag) const
{
int nFlagIndex =::FlagToIndex (dwFlag);
if (nFlagIndex < 0)
@@ -860,7 +860,7 @@
*/
void CCrystalTextBuffer::GetTextWithoutEmptys(int nStartLine, int nStartChar,
int nEndLine, int nEndChar,
- CString &text, CRLFSTYLE nCrlfStyle /* CRLF_STYLE_AUTOMATIC */)
+ CString &text, CRLFSTYLE nCrlfStyle /* CRLF_STYLE_AUTOMATIC */) const
{
LPCTSTR sEol = GetStringEol (nCrlfStyle);
GetText(nStartLine, nStartChar, nEndLine, nEndChar, text, sEol);
@@ -868,7 +868,8 @@
void CCrystalTextBuffer::
-GetText (int nStartLine, int nStartChar, int nEndLine, int nEndChar, CString & text, LPCTSTR pszCRLF /*= NULL*/ )
+GetText (int nStartLine, int nStartChar, int nEndLine, int nEndChar,
+ CString & text, LPCTSTR pszCRLF /*= NULL*/ ) const
{
ASSERT (m_bInit); // Text buffer not yet initialized.
// You must call InitNew() or LoadFromFile() first!
@@ -1229,21 +1230,21 @@
}
BOOL CCrystalTextBuffer::
-CanUndo ()
+CanUndo () const
{
ASSERT (m_nUndoPosition >= 0 && m_nUndoPosition <= m_aUndoBuf.size ());
return m_nUndoPosition > 0;
}
BOOL CCrystalTextBuffer::
-CanRedo ()
+CanRedo () const
{
ASSERT (m_nUndoPosition >= 0 && m_nUndoPosition <= m_aUndoBuf.size ());
return m_nUndoPosition < m_aUndoBuf.size ();
}
POSITION CCrystalTextBuffer::
-GetUndoActionCode (int & nAction, POSITION pos /*= NULL*/ )
+GetUndoActionCode (int & nAction, POSITION pos /*= NULL*/ ) const
{
ASSERT (CanUndo ()); // Please call CanUndo() first
@@ -1280,7 +1281,7 @@
}
POSITION CCrystalTextBuffer::
-GetRedoActionCode (int & nAction, POSITION pos /*= NULL*/ )
+GetRedoActionCode (int & nAction, POSITION pos /*= NULL*/ ) const
{
ASSERT (CanRedo ()); // Please call CanRedo() before!
@@ -1321,7 +1322,7 @@
}
POSITION CCrystalTextBuffer::
-GetUndoDescription (CString & desc, POSITION pos /*= NULL*/ )
+GetUndoDescription (CString & desc, POSITION pos /*= NULL*/ ) const
{
int nAction;
POSITION retValue = GetUndoActionCode(nAction, pos);
@@ -1334,7 +1335,7 @@
}
POSITION CCrystalTextBuffer::
-GetRedoDescription (CString & desc, POSITION pos /*= NULL*/ )
+GetRedoDescription (CString & desc, POSITION pos /*= NULL*/ ) const
{
int nAction;
POSITION retValue = GetRedoActionCode(nAction, pos);
@@ -1667,7 +1668,7 @@
BOOL CCrystalTextBuffer::
-GetActionDescription (int nAction, CString & desc)
+GetActionDescription (int nAction, CString & desc) const
{
HINSTANCE hOldResHandle = AfxGetResourceHandle ();
#ifdef CRYSEDIT_RES_HANDLE
@@ -1773,7 +1774,7 @@
}
int CCrystalTextBuffer::
-FindNextBookmarkLine (int nCurrentLine)
+FindNextBookmarkLine (int nCurrentLine) const
{
BOOL bWrapIt = TRUE;
DWORD dwFlags = GetLineFlags (nCurrentLine);
@@ -1802,7 +1803,7 @@
}
int CCrystalTextBuffer::
-FindPrevBookmarkLine (int nCurrentLine)
+FindPrevBookmarkLine (int nCurrentLine) const
{
BOOL bWrapIt = TRUE;
DWORD dwFlags = GetLineFlags (nCurrentLine);
@@ -1831,7 +1832,7 @@
}
BOOL CCrystalTextBuffer::
-IsMBSLead (int nLine, int nCol)
+IsMBSLead (int nLine, int nCol) const
{
ASSERT (m_bInit); // Text buffer not yet initialized.
// You must call InitNew() or LoadFromFile() first!
@@ -1848,7 +1849,7 @@
}
BOOL CCrystalTextBuffer::
-IsMBSTrail (int nLine, int nCol)
+IsMBSTrail (int nLine, int nCol) const
{
ASSERT (m_bInit); // Text buffer not yet initialized.
// You must call InitNew() or LoadFromFile() first!
@@ -1888,7 +1889,7 @@
m_aLines.erase(iterBegin, iterEnd);
}
-int CCrystalTextBuffer::GetTabSize()
+int CCrystalTextBuffer::GetTabSize() const
{
ASSERT( m_nTabSize >= 0 && m_nTabSize <= 64 );
return m_nTabSize;
Modified: trunk/Src/editlib/ccrystaltextbuffer.h
===================================================================
--- trunk/Src/editlib/ccrystaltextbuffer.h 2009-06-29 09:28:13 UTC (rev 6878)
+++ trunk/Src/editlib/ccrystaltextbuffer.h 2009-06-29 10:00:33 UTC (rev 6879)
@@ -127,7 +127,7 @@
BOOL m_bCreateBackupFile;
BOOL m_bInsertTabs;
int m_nTabSize;
- int FindLineWithFlag (DWORD dwFlag);
+ int FindLineWithFlag (DWORD dwFlag) const;
protected :
enum
@@ -183,7 +183,7 @@
LPCTSTR pszText, int cchText, int nActionType = CE_ACTION_UNKNOWN, CDWordArray *paSavedRevisonNumbers = NULL);
// Overridable: provide action description
- virtual BOOL GetActionDescription (int nAction, CString & desc);
+ virtual BOOL GetActionDescription (int nAction, CString & desc) const;
// Operations
public :
@@ -224,13 +224,17 @@
LPCTSTR GetLineChars (int nLine) const;
DWORD GetLineFlags (int nLine) const;
DWORD GetLineRevisionNumber (int nLine) const;
- int GetLineWithFlag (DWORD dwFlag);
- void SetLineFlag (int nLine, DWORD dwFlag, BOOL bSet, BOOL bRemoveFromPreviousLine = TRUE, BOOL bUpdate=TRUE);
- void GetText (int nStartLine, int nStartChar, int nEndLine, int nEndChar, CString & text, LPCTSTR pszCRLF = NULL);
- virtual void GetTextWithoutEmptys (int nStartLine, int nStartChar, int nEndLine, int nEndChar, CString &text, CRLFSTYLE nCrlfStyle =CRLF_STYLE_AUTOMATIC );
+ int GetLineWithFlag (DWORD dwFlag) const;
+ void SetLineFlag (int nLine, DWORD dwFlag, BOOL bSet,
+ BOOL bRemoveFromPreviousLine = TRUE, BOOL bUpdate = TRUE);
+ void GetText (int nStartLine, int nStartChar, int nEndLine, int nEndChar,
+ CString & text, LPCTSTR pszCRLF = NULL) const;
+ virtual void GetTextWithoutEmptys (int nStartLine, int nStartChar,
+ int nEndLine, int nEndChar, CString &text,
+ CRLFSTYLE nCrlfStyle = CRLF_STYLE_AUTOMATIC) const;
// Attributes
- CRLFSTYLE GetCRLFMode ();
+ CRLFSTYLE GetCRLFMode () const;
void SetCRLFMode (CRLFSTYLE nCRLFMode);
/// Adjust all the lines in the buffer to the buffer default EOL Mode
virtual BOOL applyEOLMode();
@@ -246,8 +250,8 @@
virtual BOOL DeleteText (CCrystalTextView * pSource, int nStartLine, int nStartPos, int nEndLine, int nEndPos, int nAction = CE_ACTION_UNKNOWN, BOOL bHistory =TRUE);
// Undo/Redo
- BOOL CanUndo ();
- BOOL CanRedo ();
+ BOOL CanUndo () const;
+ BOOL CanRedo () const;
virtual BOOL Undo (CCrystalTextView * pSource, CPoint & ptCursorPos);
virtual BOOL Redo (CCrystalTextView * pSource, CPoint & ptCursorPos);
@@ -266,10 +270,10 @@
// Browse undo sequence
- POSITION GetUndoActionCode (int & nAction, POSITION pos = NULL);
- POSITION GetRedoActionCode (int & nAction, POSITION pos = NULL);
- POSITION GetUndoDescription (CString & desc, POSITION pos = NULL);
- POSITION GetRedoDescription (CString & desc, POSITION pos = NULL);
+ POSITION GetUndoActionCode (int & nAction, POSITION pos = NULL) const;
+ POSITION GetRedoActionCode (int & nAction, POSITION pos = NULL) const;
+ POSITION GetUndoDescription (CString & desc, POSITION pos = NULL) const;
+ POSITION GetRedoDescription (CString & desc, POSITION pos = NULL) const;
// Notify all connected views about changes in name of file
CCrystalTextView::TextDefinition *RetypeViews (LPCTSTR lpszFileName);
@@ -282,15 +286,15 @@
void SetInsertTabs(BOOL bInsertTabs);
// Tabbing
- int GetTabSize();
+ int GetTabSize() const;
void SetTabSize(int nTabSize);
// More bookmarks
- int FindNextBookmarkLine (int nCurrentLine = 0);
- int FindPrevBookmarkLine (int nCurrentLine = 0);
+ int FindNextBookmarkLine (int nCurrentLine = 0) const;
+ int FindPrevBookmarkLine (int nCurrentLine = 0) const;
- BOOL IsMBSLead (int nLine, int nCol);
- BOOL IsMBSTrail (int nLine, int nCol);
+ BOOL IsMBSLead (int nLine, int nCol) const;
+ BOOL IsMBSTrail (int nLine, int nCol) const;
// Overrides
// ClassWizard generated virtual function overrides
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-07-11 08:29:55
|
Revision: 6908
http://winmerge.svn.sourceforge.net/winmerge/?rev=6908&view=rev
Author: kimmov
Date: 2009-07-11 08:29:49 +0000 (Sat, 11 Jul 2009)
Log Message:
-----------
Rename CProp* classes to Prop* to keep them named in same way.
Modified Paths:
--------------
trunk/Src/Common/PreferencesDlg.h
trunk/Src/MainFrm.cpp
trunk/Src/PropArchive.cpp
trunk/Src/PropArchive.h
trunk/Src/PropBackups.cpp
trunk/Src/PropBackups.h
trunk/Src/PropCodepage.cpp
trunk/Src/PropCodepage.h
trunk/Src/PropColors.cpp
trunk/Src/PropColors.h
trunk/Src/PropCompare.cpp
trunk/Src/PropCompare.h
trunk/Src/PropEditor.cpp
trunk/Src/PropEditor.h
trunk/Src/PropGeneral.cpp
trunk/Src/PropGeneral.h
trunk/Src/PropRegistry.cpp
trunk/Src/PropRegistry.h
trunk/Src/PropSyntaxColors.cpp
trunk/Src/PropSyntaxColors.h
trunk/Src/PropTextColors.cpp
trunk/Src/PropTextColors.h
trunk/Src/PropVss.cpp
trunk/Src/PropVss.h
Modified: trunk/Src/Common/PreferencesDlg.h
===================================================================
--- trunk/Src/Common/PreferencesDlg.h 2009-07-11 07:47:04 UTC (rev 6907)
+++ trunk/Src/Common/PreferencesDlg.h 2009-07-11 08:29:49 UTC (rev 6908)
@@ -59,17 +59,17 @@
CPropertyPageHost m_pphost;
- CPropGeneral m_pageGeneral;
- CPropCompare m_pageCompare;
- CPropEditor m_pageEditor;
- CPropVss m_pageVss;
- CPropRegistry m_pageSystem;
- CPropCodepage m_pageCodepage;
- CPropMergeColors m_pageMergeColors;
- CPropTextColors m_pageTextColors;
- CPropSyntaxColors m_pageSyntaxColors;
- CPropArchive m_pageArchive;
- CPropBackups m_pageBackups;
+ PropGeneral m_pageGeneral;
+ PropCompare m_pageCompare;
+ PropEditor m_pageEditor;
+ PropVss m_pageVss;
+ PropRegistry m_pageSystem;
+ PropCodepage m_pageCodepage;
+ PropMergeColors m_pageMergeColors;
+ PropTextColors m_pageTextColors;
+ PropSyntaxColors m_pageSyntaxColors;
+ PropArchive m_pageArchive;
+ PropBackups m_pageBackups;
PropShell m_pageShell;
PropCompareFolder m_pageCompareFolder;
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2009-07-11 07:47:04 UTC (rev 6907)
+++ trunk/Src/MainFrm.cpp 2009-07-11 08:29:49 UTC (rev 6908)
@@ -1346,13 +1346,13 @@
// Determine backup folder
if (GetOptionsMgr()->GetInt(OPT_BACKUP_LOCATION) ==
- CPropBackups::FOLDER_ORIGINAL)
+ PropBackups::FOLDER_ORIGINAL)
{
// Put backups to same folder than original file
bakPath = path;
}
else if (GetOptionsMgr()->GetInt(OPT_BACKUP_LOCATION) ==
- CPropBackups::FOLDER_GLOBAL)
+ PropBackups::FOLDER_GLOBAL)
{
// Put backups to global folder defined in options
bakPath = GetOptionsMgr()->GetString(OPT_BACKUP_GLOBALFOLDER);
Modified: trunk/Src/PropArchive.cpp
===================================================================
--- trunk/Src/PropArchive.cpp 2009-07-11 07:47:04 UTC (rev 6907)
+++ trunk/Src/PropArchive.cpp 2009-07-11 08:29:49 UTC (rev 6908)
@@ -1,7 +1,7 @@
/**
* @file PropArchive.cpp
*
- * @brief Implementation of CPropArchive propertysheet
+ * @brief Implementation of PropArchive propertysheet
*/
// ID line follows -- this is updated by SVN
// $Id$
@@ -20,10 +20,10 @@
static char THIS_FILE[] = __FILE__;
#endif
-// CPropArchive dialog
+// PropArchive dialog
-CPropArchive::CPropArchive(COptionsMgr *optionsMgr)
-: OptionsPanel(optionsMgr, CPropArchive::IDD)
+PropArchive::PropArchive(COptionsMgr *optionsMgr)
+: OptionsPanel(optionsMgr, PropArchive::IDD)
, m_bEnableSupport(false)
, m_nInstallType(0)
, m_bProbeType(false)
@@ -33,7 +33,7 @@
/**
* @brief Sets update handlers for dialog controls.
*/
-void CPropArchive::DoDataExchange(CDataExchange* pDX)
+void PropArchive::DoDataExchange(CDataExchange* pDX)
{
CPropertyPage::DoDataExchange(pDX);
DDX_Control(pDX, IDC_ARCHIVE_WWW, m_wwwLink);
@@ -43,14 +43,14 @@
}
-BEGIN_MESSAGE_MAP(CPropArchive, CPropertyPage)
+BEGIN_MESSAGE_MAP(PropArchive, CPropertyPage)
ON_BN_CLICKED(IDC_ARCHIVE_ENABLE, OnEnableClicked)
END_MESSAGE_MAP()
/**
* @brief Reads options values from storage to UI.
*/
-void CPropArchive::ReadOptions()
+void PropArchive::ReadOptions()
{
int enable = GetOptionsMgr()->GetInt(OPT_ARCHIVE_ENABLE);
m_bEnableSupport = enable > 0;
@@ -61,7 +61,7 @@
/**
* @brief Writes options values from UI to storage.
*/
-void CPropArchive::WriteOptions()
+void PropArchive::WriteOptions()
{
if (m_bEnableSupport)
GetOptionsMgr()->SaveOption(OPT_ARCHIVE_ENABLE, m_nInstallType + 1);
@@ -73,7 +73,7 @@
/**
* @brief Called before propertysheet is drawn.
*/
-BOOL CPropArchive::OnInitDialog()
+BOOL PropArchive::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
m_wwwLink.m_link = DownloadUrl;
@@ -88,7 +88,7 @@
/**
* @brief Called when archive support is enabled or disabled.
*/
-void CPropArchive::OnEnableClicked()
+void PropArchive::OnEnableClicked()
{
UpdateControls();
}
@@ -96,7 +96,7 @@
/**
* @brief Called Updates controls enabled/disables state.
*/
-void CPropArchive::UpdateControls()
+void PropArchive::UpdateControls()
{
CButton *chkEnabled = (CButton *) GetDlgItem(IDC_ARCHIVE_ENABLE);
CButton *btnLocal = (CButton *) GetDlgItem(IDC_ARCHIVE_INSTALLOCAL);
Modified: trunk/Src/PropArchive.h
===================================================================
--- trunk/Src/PropArchive.h 2009-07-11 07:47:04 UTC (rev 6907)
+++ trunk/Src/PropArchive.h 2009-07-11 08:29:49 UTC (rev 6908)
@@ -1,7 +1,7 @@
/**
* @file PropArchive.h
*
- * @brief Declaration file for CPropArchive propertyheet
+ * @brief Declaration file for PropArchive propertyheet
*
*/
// ID line follows -- this is updated by SVN
@@ -18,10 +18,10 @@
/**
* @brief Class for Archive Support options page.
*/
-class CPropArchive : public OptionsPanel
+class PropArchive : public OptionsPanel
{
public:
- CPropArchive(COptionsMgr *optionsMgr);
+ PropArchive(COptionsMgr *optionsMgr);
// Implement IOptionsPanel
virtual void ReadOptions();
Modified: trunk/Src/PropBackups.cpp
===================================================================
--- trunk/Src/PropBackups.cpp 2009-07-11 07:47:04 UTC (rev 6907)
+++ trunk/Src/PropBackups.cpp 2009-07-11 08:29:49 UTC (rev 6908)
@@ -1,7 +1,7 @@
/**
* @file PropBackups.cpp
*
- * @brief Implementation of CPropBackups propertysheet
+ * @brief Implementation of PropBackups propertysheet
*/
// ID line follows -- this is updated by SVN
// $Id$
@@ -24,8 +24,8 @@
* @brief Constructor taking OptionsManager parameter.
* @param [in] optionsMgr Pointer to OptionsManager.
*/
-CPropBackups::CPropBackups(COptionsMgr *optionsMgr)
- : OptionsPanel(optionsMgr, CPropBackups::IDD)
+PropBackups::PropBackups(COptionsMgr *optionsMgr)
+ : OptionsPanel(optionsMgr, PropBackups::IDD)
, m_bCreateForFolderCmp(FALSE)
, m_bCreateForFileCmp(FALSE)
, m_bAppendBak(FALSE)
@@ -34,7 +34,7 @@
{
}
-void CPropBackups::DoDataExchange(CDataExchange* pDX)
+void PropBackups::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
DDX_Check(pDX, IDC_BACKUP_FOLDERCMP, m_bCreateForFolderCmp);
@@ -46,7 +46,7 @@
}
-BEGIN_MESSAGE_MAP(CPropBackups, CPropertyPage)
+BEGIN_MESSAGE_MAP(PropBackups, CPropertyPage)
ON_BN_CLICKED(IDC_BACKUP_BROWSE, OnBnClickedBackupBrowse)
END_MESSAGE_MAP()
@@ -54,7 +54,7 @@
/**
* @brief Reads options values from storage to UI.
*/
-void CPropBackups::ReadOptions()
+void PropBackups::ReadOptions()
{
m_bCreateForFolderCmp = GetOptionsMgr()->GetBool(OPT_BACKUP_FOLDERCMP);
m_bCreateForFileCmp = GetOptionsMgr()->GetBool(OPT_BACKUP_FILECMP);
@@ -67,7 +67,7 @@
/**
* @brief Writes options values from UI to storage.
*/
-void CPropBackups::WriteOptions()
+void PropBackups::WriteOptions()
{
m_sGlobalFolder.TrimLeft();
m_sGlobalFolder.TrimRight();
@@ -88,7 +88,7 @@
/**
* @brief Called before propertysheet is drawn.
*/
-BOOL CPropBackups::OnInitDialog()
+BOOL PropBackups::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
CPropertyPage::OnInitDialog();
@@ -100,7 +100,7 @@
/**
* @brief Called when user selects Browse-button.
*/
-void CPropBackups::OnBnClickedBackupBrowse()
+void PropBackups::OnBnClickedBackupBrowse()
{
CString path;
if (SelectFolder(path, m_sGlobalFolder, 0, GetSafeHwnd()))
Modified: trunk/Src/PropBackups.h
===================================================================
--- trunk/Src/PropBackups.h 2009-07-11 07:47:04 UTC (rev 6907)
+++ trunk/Src/PropBackups.h 2009-07-11 08:29:49 UTC (rev 6908)
@@ -1,7 +1,7 @@
/**
* @file PropBackups.h
*
- * @brief Declaration file for CPropBackups propertyheet
+ * @brief Declaration file for PropBackups propertyheet
*
*/
// ID line follows -- this is updated by SVN
@@ -17,10 +17,10 @@
/**
* @brief A class for Backup file options page.
*/
-class CPropBackups : public OptionsPanel
+class PropBackups : public OptionsPanel
{
public:
- CPropBackups(COptionsMgr *optionsMgr);
+ PropBackups(COptionsMgr *optionsMgr);
// Implement IOptionsPanel
virtual void ReadOptions();
Modified: trunk/Src/PropCodepage.cpp
===================================================================
--- trunk/Src/PropCodepage.cpp 2009-07-11 07:47:04 UTC (rev 6907)
+++ trunk/Src/PropCodepage.cpp 2009-07-11 08:29:49 UTC (rev 6908)
@@ -21,7 +21,7 @@
/**
* @file PropCodepage.h
*
- * @brief Implementation file for CPropCodepage propertyheet
+ * @brief Implementation file for PropCodepage propertyheet
*
*/
// ID line follows -- this is updated by SVN
@@ -40,21 +40,18 @@
static char THIS_FILE[] = __FILE__;
#endif
-/////////////////////////////////////////////////////////////////////////////
-// CPropCodepage property page
-
-CPropCodepage::CPropCodepage(COptionsMgr *optionsMgr)
- : OptionsPanel(optionsMgr, CPropCodepage::IDD)
+PropCodepage::PropCodepage(COptionsMgr *optionsMgr)
+ : OptionsPanel(optionsMgr, PropCodepage::IDD)
, m_nCodepageSystem(-1)
, m_nCustomCodepageValue(0)
, m_bDetectCodepage(FALSE)
{
}
-void CPropCodepage::DoDataExchange(CDataExchange* pDX)
+void PropCodepage::DoDataExchange(CDataExchange* pDX)
{
CPropertyPage::DoDataExchange(pDX);
- //{{AFX_DATA_MAP(CPropCodepage)
+ //{{AFX_DATA_MAP(PropCodepage)
DDX_Radio(pDX, IDC_CP_SYSTEM, m_nCodepageSystem);
DDX_Text(pDX, IDC_CUSTOM_CP_NUMBER, m_nCustomCodepageValue);
DDX_Check(pDX, IDC_DETECT_CODEPAGE, m_bDetectCodepage);
@@ -62,8 +59,8 @@
}
-BEGIN_MESSAGE_MAP(CPropCodepage, CPropertyPage)
- //{{AFX_MSG_MAP(CPropCodepage)
+BEGIN_MESSAGE_MAP(PropCodepage, CPropertyPage)
+ //{{AFX_MSG_MAP(PropCodepage)
ON_BN_CLICKED(IDC_CP_SYSTEM, OnCpSystem)
ON_BN_CLICKED(IDC_CP_CUSTOM, OnCpCustom)
ON_BN_CLICKED(IDC_CP_UI, OnCpUi)
@@ -73,7 +70,7 @@
/**
* @brief Reads options values from storage to UI.
*/
-void CPropCodepage::ReadOptions()
+void PropCodepage::ReadOptions()
{
m_nCodepageSystem = GetOptionsMgr()->GetInt(OPT_CP_DEFAULT_MODE);
m_nCustomCodepageValue = GetOptionsMgr()->GetInt(OPT_CP_DEFAULT_CUSTOM);
@@ -83,17 +80,14 @@
/**
* @brief Writes options values from UI to storage.
*/
-void CPropCodepage::WriteOptions()
+void PropCodepage::WriteOptions()
{
GetOptionsMgr()->SaveOption(OPT_CP_DEFAULT_MODE, (int)m_nCodepageSystem);
GetOptionsMgr()->SaveOption(OPT_CP_DEFAULT_CUSTOM, (int)m_nCustomCodepageValue);
GetOptionsMgr()->SaveOption(OPT_CP_DETECT, m_bDetectCodepage == TRUE);
}
-/////////////////////////////////////////////////////////////////////////////
-// CPropCodepage message handlers
-
-BOOL CPropCodepage::OnInitDialog()
+BOOL PropCodepage::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
CPropertyPage::OnInitDialog();
@@ -110,17 +104,17 @@
// EXCEPTION: OCX Property Pages should return FALSE
}
-void CPropCodepage::OnCpSystem()
+void PropCodepage::OnCpSystem()
{
GetDlgItem(IDC_CUSTOM_CP_NUMBER)->EnableWindow(FALSE);
}
-void CPropCodepage::OnCpCustom()
+void PropCodepage::OnCpCustom()
{
GetDlgItem(IDC_CUSTOM_CP_NUMBER)->EnableWindow(TRUE);
}
-void CPropCodepage::OnCpUi()
+void PropCodepage::OnCpUi()
{
GetDlgItem(IDC_CUSTOM_CP_NUMBER)->EnableWindow(FALSE);
}
Modified: trunk/Src/PropCodepage.h
===================================================================
--- trunk/Src/PropCodepage.h 2009-07-11 07:47:04 UTC (rev 6907)
+++ trunk/Src/PropCodepage.h 2009-07-11 08:29:49 UTC (rev 6908)
@@ -1,7 +1,7 @@
/**
* @file PropCodepage.h
*
- * @brief Declaration of CPropCodepage class
+ * @brief Declaration of PropCodepage class
*/
// ID line follows -- this is updated by SVN
// $Id$
@@ -13,21 +13,18 @@
class COptionsMgr;
-/////////////////////////////////////////////////////////////////////////////
-// CPropCodepage dialog
-
-class CPropCodepage : public OptionsPanel
+class PropCodepage : public OptionsPanel
{
// Construction
public:
- CPropCodepage(COptionsMgr *optionsMgr);
+ PropCodepage(COptionsMgr *optionsMgr);
// Implement IOptionsPanel
virtual void ReadOptions();
virtual void WriteOptions();
// Dialog Data
- //{{AFX_DATA(CPropCodepage)
+ //{{AFX_DATA(PropCodepage)
enum { IDD = IDD_PROPPAGE_CODEPAGE };
int m_nCodepageSystem;
int m_nCustomCodepageValue;
@@ -37,7 +34,7 @@
// Overrides
// ClassWizard generate virtual function overrides
- //{{AFX_VIRTUAL(CPropCodepage)
+ //{{AFX_VIRTUAL(PropCodepage)
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
@@ -45,7 +42,7 @@
// Implementation
protected:
// Generated message map functions
- //{{AFX_MSG(CPropCodepage)
+ //{{AFX_MSG(PropCodepage)
virtual BOOL OnInitDialog();
afx_msg void OnCpSystem();
afx_msg void OnCpCustom();
Modified: trunk/Src/PropColors.cpp
===================================================================
--- trunk/Src/PropColors.cpp 2009-07-11 07:47:04 UTC (rev 6907)
+++ trunk/Src/PropColors.cpp 2009-07-11 08:29:49 UTC (rev 6908)
@@ -1,9 +1,9 @@
/**
* @file PropColors.cpp
*
- * @brief Implementation of CPropMergeColors propertysheet
+ * @brief Implementation of PropMergeColors propertysheet
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
@@ -24,15 +24,15 @@
/**
* @brief Default constructor.
*/
-CPropMergeColors::CPropMergeColors(COptionsMgr *optionsMgr)
- : OptionsPanel(optionsMgr, CPropMergeColors::IDD)
+PropMergeColors::PropMergeColors(COptionsMgr *optionsMgr)
+ : OptionsPanel(optionsMgr, PropMergeColors::IDD)
{
}
-void CPropMergeColors::DoDataExchange(CDataExchange* pDX)
+void PropMergeColors::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
- //{{AFX_DATA_MAP(CPropMergeColors)
+ //{{AFX_DATA_MAP(PropMergeColors)
DDX_Control(pDX, IDC_TRIVIAL_DIFF_DELETED_COLOR, m_cTrivialDeleted);
DDX_Control(pDX, IDC_TRIVIAL_DIFF_COLOR, m_cTrivial);
DDX_Control(pDX, IDC_SEL_DIFFERENCE_TEXT_COLOR, m_cSelDiffText);
@@ -58,8 +58,8 @@
}
-BEGIN_MESSAGE_MAP(CPropMergeColors, CDialog)
- //{{AFX_MSG_MAP(CPropMergeColors)
+BEGIN_MESSAGE_MAP(PropMergeColors, CDialog)
+ //{{AFX_MSG_MAP(PropMergeColors)
ON_BN_CLICKED(IDC_DIFFERENCE_COLOR, OnDifferenceColor)
ON_BN_CLICKED(IDC_DIFFERENCE_DELETED_COLOR, OnDifferenceDeletedColor)
ON_BN_CLICKED(IDC_SEL_DIFFERENCE_DELETED_COLOR, OnSelDifferenceDeletedColor)
@@ -88,7 +88,7 @@
/**
* @brief Called before propertysheet is drawn.
*/
-BOOL CPropMergeColors::OnInitDialog()
+BOOL PropMergeColors::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
return CPropertyPage::OnInitDialog();
@@ -98,7 +98,7 @@
* @brief Reads options values from storage to UI.
* (Property sheet calls this before displaying all property pages)
*/
-void CPropMergeColors::ReadOptions()
+void PropMergeColors::ReadOptions()
{
SerializeColors(READ_OPTIONS);
}
@@ -107,7 +107,7 @@
* @brief Writes options values from UI to storage.
* (Property sheet calls this after displaying all property pages)
*/
-void CPropMergeColors::WriteOptions()
+void PropMergeColors::WriteOptions()
{
SerializeColors(WRITE_OPTIONS);
}
@@ -115,7 +115,7 @@
/**
* @brief Let user browse common color dialog, and select a color
*/
-void CPropMergeColors::BrowseColor(CColorButton & colorButton, COLORREF & currentColor)
+void PropMergeColors::BrowseColor(CColorButton & colorButton, COLORREF & currentColor)
{
CColorDialog dialog(currentColor);
LoadCustomColors();
@@ -132,7 +132,7 @@
/**
* @brief User wants to change difference color
*/
-void CPropMergeColors::OnDifferenceColor()
+void PropMergeColors::OnDifferenceColor()
{
BrowseColor(m_cDiff, m_clrDiff);
}
@@ -140,7 +140,7 @@
/**
* @brief User wants to change selected difference color
*/
-void CPropMergeColors::OnSelDifferenceColor()
+void PropMergeColors::OnSelDifferenceColor()
{
BrowseColor(m_cSelDiff, m_clrSelDiff);
}
@@ -148,7 +148,7 @@
/**
* @brief User wants to change deleted difference color
*/
-void CPropMergeColors::OnDifferenceDeletedColor()
+void PropMergeColors::OnDifferenceDeletedColor()
{
BrowseColor(m_cDiffDeleted, m_clrDiffDeleted);
}
@@ -156,7 +156,7 @@
/**
* @brief User wants to change selected & deleted difference color
*/
-void CPropMergeColors::OnSelDifferenceDeletedColor()
+void PropMergeColors::OnSelDifferenceDeletedColor()
{
BrowseColor(m_cSelDiffDeleted, m_clrSelDiffDeleted);
}
@@ -164,7 +164,7 @@
/**
* @brief User wants to change difference text color
*/
-void CPropMergeColors::OnDifferenceTextColor()
+void PropMergeColors::OnDifferenceTextColor()
{
BrowseColor(m_cDiffText, m_clrDiffText);
}
@@ -172,7 +172,7 @@
/**
* @brief User wants to change selected difference text color
*/
-void CPropMergeColors::OnSelDifferenceTextColor()
+void PropMergeColors::OnSelDifferenceTextColor()
{
BrowseColor(m_cSelDiffText, m_clrSelDiffText);
}
@@ -180,7 +180,7 @@
/**
* @brief User wants to change trivial difference color
*/
-void CPropMergeColors::OnTrivialDiffColor()
+void PropMergeColors::OnTrivialDiffColor()
{
BrowseColor(m_cTrivial, m_clrTrivial);
}
@@ -188,42 +188,42 @@
/**
* @brief User wants to change deleted trivial difference color
*/
-void CPropMergeColors::OnTrivialDiffDeletedColor()
+void PropMergeColors::OnTrivialDiffDeletedColor()
{
BrowseColor(m_cTrivialDeleted, m_clrTrivialDeleted);
}
-void CPropMergeColors::OnTrivialDiffTextColor()
+void PropMergeColors::OnTrivialDiffTextColor()
{
BrowseColor(m_cTrivialText, m_clrTrivialText);
}
-void CPropMergeColors::OnMovedColor()
+void PropMergeColors::OnMovedColor()
{
BrowseColor(m_cMoved, m_clrMoved);
}
-void CPropMergeColors::OnMovedDeletedColor()
+void PropMergeColors::OnMovedDeletedColor()
{
BrowseColor(m_cMovedDeleted, m_clrMovedDeleted);
}
-void CPropMergeColors::OnMovedTextColor()
+void PropMergeColors::OnMovedTextColor()
{
BrowseColor(m_cMovedText, m_clrMovedText);
}
-void CPropMergeColors::OnSelMovedColor()
+void PropMergeColors::OnSelMovedColor()
{
BrowseColor(m_cSelMoved, m_clrSelMoved);
}
-void CPropMergeColors::OnSelMovedDeletedColor()
+void PropMergeColors::OnSelMovedDeletedColor()
{
BrowseColor(m_cSelMovedDeleted, m_clrSelMovedDeleted);
}
-void CPropMergeColors::OnSelMovedTextColor()
+void PropMergeColors::OnSelMovedTextColor()
{
BrowseColor(m_cSelMovedText, m_clrSelMovedText);
}
@@ -231,14 +231,14 @@
/**
* @brief User wants to change word difference color
*/
-void CPropMergeColors::OnWordDiffColor()
+void PropMergeColors::OnWordDiffColor()
{
BrowseColor(m_cWordDiff, m_clrWordDiff);
}
/**
* @brief User wants to change word difference deleted color
*/
-void CPropMergeColors::OnWordDiffDeletedColor()
+void PropMergeColors::OnWordDiffDeletedColor()
{
BrowseColor(m_cWordDiffDeleted, m_clrWordDiffDeleted);
}
@@ -246,7 +246,7 @@
/**
* @brief User wants to change selected word difference color
*/
-void CPropMergeColors::OnSelWordDiffColor()
+void PropMergeColors::OnSelWordDiffColor()
{
BrowseColor(m_cSelWordDiff, m_clrSelWordDiff);
}
@@ -254,7 +254,7 @@
/**
* @brief User wants to change word difference deleted color
*/
-void CPropMergeColors::OnSelWordDiffDeletedColor()
+void PropMergeColors::OnSelWordDiffDeletedColor()
{
BrowseColor(m_cSelWordDiffDeleted, m_clrSelWordDiffDeleted);
}
@@ -262,7 +262,7 @@
/**
* @brief User wants to change word difference text color
*/
-void CPropMergeColors::OnWordDiffTextColor()
+void PropMergeColors::OnWordDiffTextColor()
{
BrowseColor(m_cWordDiffText, m_clrWordDiffText);
}
@@ -270,12 +270,12 @@
/**
* @brief User wants to change selected word difference text color
*/
-void CPropMergeColors::OnSelWordDiffTextColor()
+void PropMergeColors::OnSelWordDiffTextColor()
{
BrowseColor(m_cSelWordDiffText, m_clrSelWordDiffText);
}
-void CPropMergeColors::SerializeColors(OPERATION op)
+void PropMergeColors::SerializeColors(OPERATION op)
{
SerializeColor(op, m_cDiff, OPT_CLR_DIFF, m_clrDiff);
SerializeColor(op, m_cDiffDeleted, OPT_CLR_DIFF_DELETED, m_clrDiffDeleted);
@@ -306,7 +306,7 @@
SerializeColor(op, m_cSelWordDiffText, OPT_CLR_SELECTED_WORDDIFF_TEXT, m_clrSelWordDiffText);
}
-void CPropMergeColors::SerializeColor(OPERATION op, CColorButton & btn, LPCTSTR optionName, COLORREF & color)
+void PropMergeColors::SerializeColor(OPERATION op, CColorButton & btn, LPCTSTR optionName, COLORREF & color)
{
switch (op)
{
@@ -330,7 +330,7 @@
/**
* @brief Resets colors to defaults
*/
-void CPropMergeColors::OnDefaults()
+void PropMergeColors::OnDefaults()
{
SerializeColors(SET_DEFAULTS);
}
@@ -338,7 +338,7 @@
/**
* @brief Loads color selection dialog's custom colors from registry
*/
-void CPropMergeColors::LoadCustomColors()
+void PropMergeColors::LoadCustomColors()
{
for (int i = 0; i < CustomColorsAmount; i++)
{
@@ -352,7 +352,7 @@
/**
* @brief Saves color selection dialog's custom colors to registry
*/
-void CPropMergeColors::SaveCustomColors()
+void PropMergeColors::SaveCustomColors()
{
for (int i = 0; i < CustomColorsAmount; i++)
{
Modified: trunk/Src/PropColors.h
===================================================================
--- trunk/Src/PropColors.h 2009-07-11 07:47:04 UTC (rev 6907)
+++ trunk/Src/PropColors.h 2009-07-11 08:29:49 UTC (rev 6908)
@@ -1,7 +1,7 @@
/**
* @file PropColors.h
*
- * @brief Declaration file for CPropMergeColors propertyheet
+ * @brief Declaration file for PropMergeColors propertyheet
*
*/
// ID line follows -- this is updated by SVN
@@ -19,11 +19,11 @@
const int CustomColorsAmount = 16;
/** @brief Property page for colors options; used in options property sheet */
-class CPropMergeColors : public OptionsPanel
+class PropMergeColors : public OptionsPanel
{
// Construction
public:
- CPropMergeColors(COptionsMgr *optionsMgr);
+ PropMergeColors(COptionsMgr *optionsMgr);
// Implement IOptionsPanel
virtual void ReadOptions();
@@ -31,7 +31,7 @@
// Dialog Data
private:
- //{{AFX_DATA(CPropMergeColors)
+ //{{AFX_DATA(PropMergeColors)
enum { IDD = IDD_PROPPAGE_COLORS_WINMERGE };
CColorButton m_cTrivialDeleted;
CColorButton m_cTrivial;
@@ -81,7 +81,7 @@
// Overrides
// ClassWizard generated virtual function overrides
- //{{AFX_VIRTUAL(CPropMergeColors)
+ //{{AFX_VIRTUAL(PropMergeColors)
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
virtual BOOL OnInitDialog();
@@ -101,7 +101,7 @@
COLORREF m_cCustColors[CustomColorsAmount];
// Generated message map functions
- //{{AFX_MSG(CPropMergeColors)
+ //{{AFX_MSG(PropMergeColors)
afx_msg void OnDifferenceColor();
afx_msg void OnDifferenceDeletedColor();
afx_msg void OnSelDifferenceDeletedColor();
Modified: trunk/Src/PropCompare.cpp
===================================================================
--- trunk/Src/PropCompare.cpp 2009-07-11 07:47:04 UTC (rev 6907)
+++ trunk/Src/PropCompare.cpp 2009-07-11 08:29:49 UTC (rev 6908)
@@ -1,7 +1,7 @@
/**
* @file PropCompare.cpp
*
- * @brief Implementation of CPropCompare propertysheet
+ * @brief Implementation of PropCompare propertysheet
*/
// ID line follows -- this is updated by SVN
// $Id$
@@ -19,15 +19,12 @@
static char THIS_FILE[] = __FILE__;
#endif
-/////////////////////////////////////////////////////////////////////////////
-// CPropCompare property page
-
/**
* @brief Constructor.
* @param [in] optionsMgr Pointer to COptionsMgr.
*/
-CPropCompare::CPropCompare(COptionsMgr *optionsMgr)
- : OptionsPanel(optionsMgr, CPropCompare::IDD)
+PropCompare::PropCompare(COptionsMgr *optionsMgr)
+ : OptionsPanel(optionsMgr, PropCompare::IDD)
, m_bIgnoreCase(FALSE)
, m_bIgnoreBlankLines(FALSE)
, m_bIgnoreEol(TRUE)
@@ -38,10 +35,10 @@
{
}
-void CPropCompare::DoDataExchange(CDataExchange* pDX)
+void PropCompare::DoDataExchange(CDataExchange* pDX)
{
CPropertyPage::DoDataExchange(pDX);
- //{{AFX_DATA_MAP(CPropCompare)
+ //{{AFX_DATA_MAP(PropCompare)
DDX_Check(pDX, IDC_IGNCASE_CHECK, m_bIgnoreCase);
DDX_Check(pDX, IDC_IGNBLANKS_CHECK, m_bIgnoreBlankLines);
DDX_Check(pDX, IDC_FILTERCOMMENTS_CHECK, m_bFilterCommentsLines);
@@ -53,8 +50,8 @@
}
-BEGIN_MESSAGE_MAP(CPropCompare, CPropertyPage)
- //{{AFX_MSG_MAP(CPropCompare)
+BEGIN_MESSAGE_MAP(PropCompare, CPropertyPage)
+ //{{AFX_MSG_MAP(PropCompare)
ON_BN_CLICKED(IDC_COMPARE_DEFAULTS, OnDefaults)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
@@ -64,7 +61,7 @@
* Property sheet calls this before displaying GUI to load values
* into members.
*/
-void CPropCompare::ReadOptions()
+void PropCompare::ReadOptions()
{
m_nIgnoreWhite = GetOptionsMgr()->GetInt(OPT_CMP_IGNORE_WHITESPACE);
m_bIgnoreBlankLines = GetOptionsMgr()->GetBool(OPT_CMP_IGNORE_BLANKLINES);
@@ -80,7 +77,7 @@
* Property sheet calls this after dialog is closed with OK button to
* store values in member variables.
*/
-void CPropCompare::WriteOptions()
+void PropCompare::WriteOptions()
{
GetOptionsMgr()->SaveOption(OPT_CMP_IGNORE_WHITESPACE, m_nIgnoreWhite);
GetOptionsMgr()->SaveOption(OPT_CMP_IGNORE_BLANKLINES, m_bIgnoreBlankLines == TRUE);
@@ -91,13 +88,10 @@
GetOptionsMgr()->SaveOption(OPT_CMP_MATCH_SIMILAR_LINES, m_bMatchSimilarLines == TRUE);
}
-/////////////////////////////////////////////////////////////////////////////
-// CPropCompare message handlers
-
/**
* @brief Called before propertysheet is drawn.
*/
-BOOL CPropCompare::OnInitDialog()
+BOOL PropCompare::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
CPropertyPage::OnInitDialog();
@@ -109,7 +103,7 @@
/**
* @brief Sets options to defaults
*/
-void CPropCompare::OnDefaults()
+void PropCompare::OnDefaults()
{
DWORD tmp;
GetOptionsMgr()->GetDefault(OPT_CMP_IGNORE_WHITESPACE, tmp);
Modified: trunk/Src/PropCompare.h
===================================================================
--- trunk/Src/PropCompare.h 2009-07-11 07:47:04 UTC (rev 6907)
+++ trunk/Src/PropCompare.h 2009-07-11 08:29:49 UTC (rev 6908)
@@ -1,7 +1,7 @@
/**
* @file PropCompare.h
*
- * @brief Declaration of CPropCompare propertysheet
+ * @brief Declaration of PropCompare propertysheet
*/
// ID line follows -- this is updated by SVN
// $Id$
@@ -13,9 +13,6 @@
class COptionsMgr;
-/////////////////////////////////////////////////////////////////////////////
-// CPropCompare dialog
-
/**
* @brief Property page to set compare options for WinMerge.
*
@@ -24,18 +21,18 @@
* - Ignore changes in whitespaces (amount of spaces etc)
* - Ignore all whitespace characters
*/
-class CPropCompare : public OptionsPanel
+class PropCompare : public OptionsPanel
{
// Construction
public:
- CPropCompare(COptionsMgr *optionsMgr);
+ PropCompare(COptionsMgr *optionsMgr);
// Implement IOptionsPanel
virtual void ReadOptions();
virtual void WriteOptions();
// Dialog Data
- //{{AFX_DATA(CPropCompare)
+ //{{AFX_DATA(PropCompare)
enum { IDD = IDD_PROPPAGE_COMPARE };
BOOL m_bIgnoreEol;
BOOL m_bIgnoreCase;
@@ -49,7 +46,7 @@
// Overrides
// ClassWizard generated virtual function overrides
- //{{AFX_VIRTUAL(CPropCompare)
+ //{{AFX_VIRTUAL(PropCompare)
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
@@ -57,7 +54,7 @@
// Implementation
protected:
// Generated message map functions
- //{{AFX_MSG(CPropCompare)
+ //{{AFX_MSG(PropCompare)
afx_msg BOOL OnInitDialog();
afx_msg void OnDefaults();
//}}AFX_MSG
Modified: trunk/Src/PropEditor.cpp
===================================================================
--- trunk/Src/PropEditor.cpp 2009-07-11 07:47:04 UTC (rev 6907)
+++ trunk/Src/PropEditor.cpp 2009-07-11 08:29:49 UTC (rev 6908)
@@ -1,7 +1,7 @@
/**
* @file PropEditor.cpp
*
- * @brief Implementation of CPropEditor propertysheet
+ * @brief Implementation of PropEditor propertysheet
*/
// ID line follows -- this is updated by SVN
// $Id$
@@ -22,15 +22,12 @@
/** @brief Maximum size for tabs in spaces. */
static const int MAX_TABSIZE = 64;
-/////////////////////////////////////////////////////////////////////////////
-// CPropEditor dialog
-
/**
* @brief Constructor.
* @param [in] optionsMgr Pointer to options manager for handling options.
*/
-CPropEditor::CPropEditor(COptionsMgr *optionsMgr)
-: OptionsPanel(optionsMgr, CPropEditor::IDD)
+PropEditor::PropEditor(COptionsMgr *optionsMgr)
+: OptionsPanel(optionsMgr, PropEditor::IDD)
, m_bHiliteSyntax(FALSE)
, m_nTabType(-1)
, m_nTabSize(0)
@@ -45,10 +42,10 @@
/**
* @brief Function handling dialog data exchange between GUI and variables.
*/
-void CPropEditor::DoDataExchange(CDataExchange* pDX)
+void PropEditor::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
- //{{AFX_DATA_MAP(CPropEditor)
+ //{{AFX_DATA_MAP(PropEditor)
DDX_Check(pDX, IDC_HILITE_CHECK, m_bHiliteSyntax);
DDX_Radio(pDX, IDC_PROP_INSERT_TABS, m_nTabType);
DDX_Text(pDX, IDC_TAB_EDIT, m_nTabSize);
@@ -62,8 +59,8 @@
}
-BEGIN_MESSAGE_MAP(CPropEditor, CDialog)
- //{{AFX_MSG_MAP(CPropEditor)
+BEGIN_MESSAGE_MAP(PropEditor, CDialog)
+ //{{AFX_MSG_MAP(PropEditor)
ON_BN_CLICKED(IDC_VIEW_LINE_DIFFERENCES, OnLineDiffControlClicked)
ON_BN_CLICKED(IDC_EDITOR_CHARLEVEL, OnLineDiffControlClicked)
ON_BN_CLICKED(IDC_EDITOR_WORDLEVEL, OnLineDiffControlClicked)
@@ -74,7 +71,7 @@
/**
* @brief Reads options values from storage to UI.
*/
-void CPropEditor::ReadOptions()
+void PropEditor::ReadOptions()
{
m_nTabSize = GetOptionsMgr()->GetInt(OPT_TAB_SIZE);
m_nTabType = GetOptionsMgr()->GetInt(OPT_TAB_TYPE);
@@ -90,7 +87,7 @@
/**
* @brief Writes options values from UI to storage.
*/
-void CPropEditor::WriteOptions()
+void PropEditor::WriteOptions()
{
// Sanity check tabsize
if (m_nTabSize < 1)
@@ -108,13 +105,10 @@
GetOptionsMgr()->SaveOption(OPT_BREAK_SEPARATORS, m_breakChars);
}
-/////////////////////////////////////////////////////////////////////////////
-// CPropEditor message handlers
-
/**
* @brief Called before propertysheet is drawn.
*/
-BOOL CPropEditor::OnInitDialog()
+BOOL PropEditor::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
CPropertyPage::OnInitDialog();
@@ -136,7 +130,7 @@
/**
* @brief Load strings (from resource) into combobox for break type
*/
-void CPropEditor::LoadBreakTypeStrings()
+void PropEditor::LoadBreakTypeStrings()
{
CComboBox * cbo = (CComboBox *)GetDlgItem(IDC_BREAK_TYPE);
cbo->AddString(theApp.LoadString(IDS_BREAK_ON_WHITESPACE).c_str());
@@ -146,7 +140,7 @@
/**
* @brief Handlers any clicks in any of the line differencing controls
*/
-void CPropEditor::OnLineDiffControlClicked()
+void PropEditor::OnLineDiffControlClicked()
{
UpdateLineDiffControls();
}
@@ -156,7 +150,7 @@
* @param [in] item ID of dialog control to enable/disable.
* @param [in] enable if true control is enabled, else disabled.
*/
-void CPropEditor::EnableDlgItem(int item, bool enable)
+void PropEditor::EnableDlgItem(int item, bool enable)
{
GetDlgItem(item)->EnableWindow(!!enable);
}
@@ -164,7 +158,7 @@
/**
* @brief Update availability of line difference controls
*/
-void CPropEditor::UpdateLineDiffControls()
+void PropEditor::UpdateLineDiffControls()
{
UpdateDataFromWindow();
// Can only choose char/word level if line differences are enabled
@@ -177,7 +171,7 @@
/**
* @brief Check tabsize value when control loses focus.
*/
-void CPropEditor::OnEnKillfocusTabEdit()
+void PropEditor::OnEnKillfocusTabEdit()
{
CEdit * pEdit = (CEdit *)GetDlgItem(IDC_TAB_EDIT);
CString valueAsText;
Modified: trunk/Src/PropEditor.h
===================================================================
--- trunk/Src/PropEditor.h 2009-07-11 07:47:04 UTC (rev 6907)
+++ trunk/Src/PropEditor.h 2009-07-11 08:29:49 UTC (rev 6908)
@@ -1,7 +1,7 @@
/**
* @file PropEditor.h
*
- * @brief Declaration file for CPropEditor propertyheet
+ * @brief Declaration file for PropEditor propertyheet
*
*/
// ID line follows -- this is updated by SVN
@@ -14,27 +14,24 @@
class COptionsMgr;
-/////////////////////////////////////////////////////////////////////////////
-// CPropEditor dialog
-
/**
* @brief Property page for editor options.
*
* Editor options affect to editor behavior. For example syntax highlighting
* and tabs.
*/
-class CPropEditor : public OptionsPanel
+class PropEditor : public OptionsPanel
{
// Construction
public:
- CPropEditor(COptionsMgr *optionsMgr);
+ PropEditor(COptionsMgr *optionsMgr);
// Implement IOptionsPanel
virtual void ReadOptions();
virtual void WriteOptions();
// Dialog Data
- //{{AFX_DATA(CPropEditor)
+ //{{AFX_DATA(PropEditor)
enum { IDD = IDD_PROPPAGE_EDITOR };
BOOL m_bHiliteSyntax;
int m_nTabType;
@@ -57,7 +54,7 @@
// Overrides
// ClassWizard generated virtual function overrides
- //{{AFX_VIRTUAL(CPropEditor)
+ //{{AFX_VIRTUAL(PropEditor)
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
@@ -66,7 +63,7 @@
protected:
// Generated message map functions
- //{{AFX_MSG(CPropEditor)
+ //{{AFX_MSG(PropEditor)
afx_msg BOOL OnInitDialog();
afx_msg void OnLineDiffControlClicked();
afx_msg void OnEnKillfocusTabEdit();
Modified: trunk/Src/PropGeneral.cpp
===================================================================
--- trunk/Src/PropGeneral.cpp 2009-07-11 07:47:04 UTC (rev 6907)
+++ trunk/Src/PropGeneral.cpp 2009-07-11 08:29:49 UTC (rev 6908)
@@ -21,7 +21,7 @@
/**
* @file PropGeneral.h
*
- * @brief Implementation file for CPropGeneral propertyheet
+ * @brief Implementation file for PropGeneral propertyheet
*
*/
// ID line follows -- this is updated by SVN
@@ -40,14 +40,11 @@
static char THIS_FILE[] = __FILE__;
#endif
-/////////////////////////////////////////////////////////////////////////////
-// CPropGeneral property page
-
/**
* @brief Constructor initialising members.
*/
-CPropGeneral::CPropGeneral(COptionsMgr *optionsMgr)
-: OptionsPanel(optionsMgr, CPropGeneral::IDD)
+PropGeneral::PropGeneral(COptionsMgr *optionsMgr)
+: OptionsPanel(optionsMgr, PropGeneral::IDD)
, m_bScroll(FALSE)
, m_bDisableSplash(FALSE)
, m_bSingleInstance(FALSE)
@@ -62,11 +59,11 @@
{
}
-CPropGeneral::~CPropGeneral()
+PropGeneral::~PropGeneral()
{
}
-BOOL CPropGeneral::OnInitDialog()
+BOOL PropGeneral::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
CPropertyPage::OnInitDialog();
@@ -83,10 +80,10 @@
return TRUE; // return TRUE unless you set the focus to a control
}
-void CPropGeneral::DoDataExchange(CDataExchange* pDX)
+void PropGeneral::DoDataExchange(CDataExchange* pDX)
{
CPropertyPage::DoDataExchange(pDX);
- //{{AFX_DATA_MAP(CPropGeneral)
+ //{{AFX_DATA_MAP(PropGeneral)
DDX_Check(pDX, IDC_SCROLL_CHECK, m_bScroll);
DDX_Check(pDX, IDC_DISABLE_SPLASH, m_bDisableSplash);
DDX_Check(pDX, IDC_SINGLE_INSTANCE, m_bSingleInstance);
@@ -102,8 +99,8 @@
}
-BEGIN_MESSAGE_MAP(CPropGeneral, CPropertyPage)
- //{{AFX_MSG_MAP(CPropGeneral)
+BEGIN_MESSAGE_MAP(PropGeneral, CPropertyPage)
+ //{{AFX_MSG_MAP(PropGeneral)
ON_BN_CLICKED(IDC_RESET_ALL_MESSAGE_BOXES, OnResetAllMessageBoxes)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
@@ -111,7 +108,7 @@
/**
* @brief Reads options values from storage to UI.
*/
-void CPropGeneral::ReadOptions()
+void PropGeneral::ReadOptions()
{
m_bScroll = GetOptionsMgr()->GetBool(OPT_SCROLL_TO_FIRST);
m_bDisableSplash = GetOptionsMgr()->GetBool(OPT_DISABLE_SPLASH);
@@ -129,7 +126,7 @@
/**
* @brief Writes options values from UI to storage.
*/
-void CPropGeneral::WriteOptions()
+void PropGeneral::WriteOptions()
{
GetOptionsMgr()->SaveOption(OPT_SCROLL_TO_FIRST, m_bScroll == TRUE);
GetOptionsMgr()->SaveOption(OPT_DISABLE_SPLASH, m_bDisableSplash == TRUE);
@@ -144,13 +141,10 @@
GetOptionsMgr()->SaveOption(OPT_SHOW_SELECT_FILES_AT_STARTUP, m_bShowSelectFolderOnStartup);
}
-/////////////////////////////////////////////////////////////////////////////
-// CPropGeneral message handlers
-
/**
* @brief Called when user wants to see all messageboxes again.
*/
-void CPropGeneral::OnResetAllMessageBoxes()
+void PropGeneral::OnResetAllMessageBoxes()
{
CMessageBoxDialog::ResetMessageBoxes();
LangMessageBox(IDS_MESSAGE_BOX_ARE_RESET, MB_ICONINFORMATION);
Modified: trunk/Src/PropGeneral.h
===================================================================
--- trunk/Src/PropGeneral.h 2009-07-11 07:47:04 UTC (rev 6907)
+++ trunk/Src/PropGeneral.h 2009-07-11 08:29:49 UTC (rev 6908)
@@ -1,7 +1,7 @@
/**
* @file PropGeneral.h
*
- * @brief Declaration of CPropGeneral class
+ * @brief Declaration of PropGeneral class
*/
// ID line follows -- this is updated by SVN
// $Id$
@@ -13,25 +13,22 @@
class COptionsMgr;
-/////////////////////////////////////////////////////////////////////////////
-// CPropGeneral dialog
-
/**
* @brief Class for General options -propertypage.
*/
-class CPropGeneral : public OptionsPanel
+class PropGeneral : public OptionsPanel
{
// Construction
public:
- CPropGeneral(COptionsMgr *optionsMgr);
- ~CPropGeneral();
+ PropGeneral(COptionsMgr *optionsMgr);
+ ~PropGeneral();
// Implement IOptionsPanel
virtual void ReadOptions();
virtual void WriteOptions();
// Dialog Data
- //{{AFX_DATA(CPropGeneral)
+ //{{AFX_DATA(PropGeneral)
enum { IDD = IDD_PROPPAGE_GENERAL };
BOOL m_bScroll;
BOOL m_bDisableSplash;
@@ -49,7 +46,7 @@
// Overrides
// ClassWizard generate virtual function overrides
- //{{AFX_VIRTUAL(CPropGeneral)
+ //{{AFX_VIRTUAL(PropGeneral)
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
@@ -59,7 +56,7 @@
virtual BOOL OnInitDialog();
// Generated message map functions
- //{{AFX_MSG(CPropGeneral)
+ //{{AFX_MSG(PropGeneral)
afx_msg void OnResetAllMessageBoxes();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
Modified: trunk/Src/PropRegistry.cpp
===================================================================
--- trunk/Src/PropRegistry.cpp 2009-07-11 07:47:04 UTC (rev 6907)
+++ trunk/Src/PropRegistry.cpp 2009-07-11 08:29:49 UTC (rev 6908)
@@ -17,7 +17,7 @@
/**
* @file PropRegistry.cpp
*
- * @brief CPropRegistry implementation file
+ * @brief PropRegistry implementation file
*/
// ID line follows -- this is updated by SVN
// $Id$
@@ -46,21 +46,17 @@
static LPCTSTR f_RegValueEnabled = _T("ContextMenuEnabled");
static LPCTSTR f_RegValuePath = _T("Executable");
-/////////////////////////////////////////////////////////////////////////////
-// CPropRegistry dialog
-
-
-CPropRegistry::CPropRegistry(COptionsMgr *optionsMgr)
-: OptionsPanel(optionsMgr, CPropRegistry::IDD)
+PropRegistry::PropRegistry(COptionsMgr *optionsMgr)
+: OptionsPanel(optionsMgr, PropRegistry::IDD)
, m_bUseRecycleBin(TRUE)
, m_tempFolderType(0)
{
}
-void CPropRegistry::DoDataExchange(CDataExchange* pDX)
+void PropRegistry::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
- //{{AFX_DATA_MAP(CPropRegistry)
+ //{{AFX_DATA_MAP(PropRegistry)
DDX_Text(pDX, IDC_EXT_EDITOR_PATH, m_strEditorPath);
DDX_Check(pDX, IDC_USE_RECYCLE_BIN, m_bUseRecycleBin);
DDX_Text(pDX, IDC_FILTER_USER_PATH, m_strUserFilterPath);
@@ -69,8 +65,8 @@
//}}AFX_DATA_MAP
}
-BEGIN_MESSAGE_MAP(CPropRegistry, CDialog)
- //{{AFX_MSG_MAP(CPropRegistry)
+BEGIN_MESSAGE_MAP(PropRegistry, CDialog)
+ //{{AFX_MSG_MAP(PropRegistry)
ON_BN_CLICKED(IDC_EXT_EDITOR_BROWSE, OnBrowseEditor)
ON_BN_CLICKED(IDC_FILTER_USER_BROWSE, OnBrowseFilterPath)
ON_BN_CLICKED(IDC_TMPFOLDER_BROWSE, OnBrowseTmpFolder)
@@ -80,7 +76,7 @@
/**
* @brief Reads options values from storage to UI.
*/
-void CPropRegistry::ReadOptions()
+void PropRegistry::ReadOptions()
{
m_strEditorPath = GetOptionsMgr()->GetString(OPT_EXT_EDITOR_CMD).c_str();
m_bUseRecycleBin = GetOptionsMgr()->GetBool(OPT_USE_RECYCLE_BIN);
@@ -92,7 +88,7 @@
/**
* @brief Writes options values from UI to storage.
*/
-void CPropRegistry::WriteOptions()
+void PropRegistry::WriteOptions()
{
CMergeApp *app = static_cast<CMergeApp*>(AfxGetApp());
CString sDefaultEditor = app->GetDefaultEditor();
@@ -120,10 +116,7 @@
GetOptionsMgr()->SaveOption(OPT_CUSTOM_TEMP_PATH, tempFolder);
}
-/////////////////////////////////////////////////////////////////////////////
-// CPropRegistry message handlers
-
-BOOL CPropRegistry::OnInitDialog()
+BOOL PropRegistry::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
CPropertyPage::OnInitDialog();
@@ -135,7 +128,7 @@
}
/// Open file browse dialog to locate editor
-void CPropRegistry::OnBrowseEditor()
+void PropRegistry::OnBrowseEditor()
{
CString path;
if (SelectFile(GetSafeHwnd(), path, NULL, IDS_OPEN_TITLE, IDS_PROGRAMFILES, TRUE))
@@ -145,7 +138,7 @@
}
/// Open Folder selection dialog for user to select filter folder.
-void CPropRegistry::OnBrowseFilterPath()
+void PropRegistry::OnBrowseFilterPath()
{
CString path;
if (SelectFolder(path, m_strUserFilterPath, IDS_OPEN_TITLE, GetSafeHwnd()))
@@ -155,7 +148,7 @@
}
/// Select temporary files folder.
-void CPropRegistry::OnBrowseTmpFolder()
+void PropRegistry::OnBrowseTmpFolder()
{
CString path;
if (SelectFolder(path, m_tempFolder, NULL, GetSafeHwnd()))
Modified: trunk/Src/PropRegistry.h
===================================================================
--- trunk/Src/PropRegistry.h 2009-07-11 07:47:04 UTC (rev 6907)
+++ trunk/Src/PropRegistry.h 2009-07-11 08:29:49 UTC (rev 6908)
@@ -17,7 +17,7 @@
/**
* @file PropRegistry.h
*
- * @brief Declaration file CPropRegistry
+ * @brief Declaration file PropRegistry
*/
// ID line follows -- this is updated by SVN
// $Id$
@@ -29,9 +29,6 @@
class COptionsMgr;
-/////////////////////////////////////////////////////////////////////////////
-// CPropRegistry dialog
-
/**
* @brief Property page for system options; used in options property sheet.
*
@@ -39,18 +36,18 @@
* It allows user to select options like whether to use Recycle Bin for
* deleted files and External text editor.
*/
-class CPropRegistry : public OptionsPanel
+class PropRegistry : public OptionsPanel
{
// Construction
public:
- CPropRegistry(COptionsMgr *optionsMgr);
+ PropRegistry(COptionsMgr *optionsMgr);
// Implement IOptionsPanel
virtual void ReadOptions();
virtual void WriteOptions();
// Dialog Data
- //{{AFX_DATA(CPropRegistry)
+ //{{AFX_DATA(PropRegistry)
enum { IDD = IDD_PROPPAGE_SYSTEM };
CString m_strEditorPath;
BOOL m_bUseRecycleBin;
@@ -61,7 +58,7 @@
// Overrides
// ClassWizard generated virtual function overrides
- //{{AFX_VIRTUAL(CPropRegistry)
+ //{{AFX_VIRTUAL(PropRegistry)
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
@@ -69,7 +66,7 @@
// Implementation methods
protected:
// Generated message map functions
- //{{AFX_MSG(CPropRegistry)
+ //{{AFX_MSG(PropRegistry)
virtual BOOL OnInitDialog();
afx_msg void OnBrowseEditor();
afx_msg void OnBrowseFilterPath();
Modified: trunk/Src/PropSyntaxColors.cpp
===================================================================
--- trunk/Src/PropSyntaxColors.cpp 2009-07-11 07:47:04 UTC (rev 6907)
+++ trunk/Src/PropSyntaxColors.cpp 2009-07-11 08:29:49 UTC (rev 6908)
@@ -1,9 +1,9 @@
/**
* @file PropSyntaxColors.cpp
*
- * @brief Implementation of CPropSyntaxColors propertysheet
+ * @brief Implementation of PropSyntaxColors propertysheet
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
@@ -19,13 +19,10 @@
static char THIS_FILE[] = __FILE__;
#endif
+IMPLEMENT_DYNAMIC(PropSyntaxColors, CPropertyPage)
-// CPropEditorColor dialog
-
-IMPLEMENT_DYNAMIC(CPropSyntaxColors, CPropertyPage)
-
-CPropSyntaxColors::CPropSyntaxColors(COptionsMgr *optionsMgr, SyntaxColors *pColors)
-: OptionsPanel(optionsMgr, CPropSyntaxColors::IDD)
+PropSyntaxColors::PropSyntaxColors(COptionsMgr *optionsMgr, SyntaxColors *pColors)
+: OptionsPanel(optionsMgr, PropSyntaxColors::IDD)
, m_nKeywordsBold(0)
, m_nFunctionsBold(0)
, m_nCommentsBold(0)
@@ -60,7 +57,7 @@
m_nUser2Bold = GetCheckVal(COLORINDEX_USER2);
}
-void CPropSyntaxColors::DoDataExchange(CDataExchange* pDX)
+void PropSyntaxColors::DoDataExchange(CDataExchange* pDX)
{
CPropertyPage::DoDataExchange(pDX);
DDX_Control(pDX, IDC_SCOLOR_KEYWORDS, m_btnKeywordsText);
@@ -93,7 +90,7 @@
}
-BEGIN_MESSAGE_MAP(CPropSyntaxColors, CPropertyPage)
+BEGIN_MESSAGE_MAP(PropSyntaxColors, CPropertyPage)
ON_BN_CLICKED(IDC_SCOLOR_KEYWORDS, OnBnClickedEcolorKeywords)
ON_BN_CLICKED(IDC_SCOLOR_FUNCTIONS, OnBnClickedEcolorFunctions)
ON_BN_CLICKED(IDC_SCOLOR_COMMENTS, OnBnClickedEcolorComments)
@@ -115,12 +112,10 @@
ON_BN_CLICKED(IDC_SCOLOR_USER2_BOLD, OnBnClickedEcolorUser2Bold)
END_MESSAGE_MAP()
-// CPropSyntaxColor message handlers
-
/**
* @brief Called before propertysheet is drawn.
*/
-BOOL CPropSyntaxColors::OnInitDialog()
+BOOL PropSyntaxColors::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
return CPropertyPage::OnInitDialog();
@@ -130,7 +125,7 @@
* @brief Reads options values from storage to UI.
* (Property sheet calls this before displaying all property pages)
*/
-void CPropSyntaxColors::ReadOptions()
+void PropSyntaxColors::ReadOptions()
{
}
@@ -138,7 +133,7 @@
* @brief Writes options values from UI to storage.
* (Property sheet calls this after displaying all property pages)
*/
-void CPropSyntaxColors::WriteOptions()
+void PropSyntaxColors::WriteOptions()
{
// User can only change colors via BrowseColorAndSave,
// which writes to m_pTempColors
@@ -150,7 +145,7 @@
/**
* @brief Let user browse common color dialog, and select a color & save to registry
*/
-void CPropSyntaxColors::BrowseColorAndSave(CColorButton & colorButton, int colorIndex)
+void PropSyntaxColors::BrowseColorAndSave(CColorButton & colorButton, int colorIndex)
{
COLORREF currentColor = m_pTempColors->GetColor(colorIndex);
CColorDialog dialog(currentColor);
@@ -166,52 +161,52 @@
SaveCustomColors();
}
-void CPropSyntaxColors::OnBnClickedEcolorKeywords()
+void PropSyntaxColors::OnBnClickedEcolorKeywords()
{
BrowseColorAndSave(m_btnKeywordsText, COLORINDEX_KEYWORD);
}
-void CPropSyntaxColors::OnBnClickedEcolorFunctions()
+void PropSyntaxColors::OnBnClickedEcolorFunctions()
{
BrowseColorAndSave(m_btnFunctionsText, COLORINDEX_FUNCNAME);
}
-void CPropSyntaxColors::OnBnClickedEcolorComments()
+void PropSyntaxColors::OnBnClickedEcolorComments()
{
BrowseColorAndSave(m_btnCommentsText, COLORINDEX_COMMENT);
}
-void CPropSyntaxColors::OnBnClickedEcolorNumbers()
+void PropSyntaxColors::OnBnClickedEcolorNumbers()
{
BrowseColorAndSave(m_btnNumbersText, COLORINDEX_NUMBER);
}
-void CPropSyntaxColors::OnBnClickedEcolorOperators()
+void PropSyntaxColors::OnBnClickedEcolorOperators()
{
BrowseColorAndSave(m_btnOperatorsText, COLORINDEX_OPERATOR);
}
-void CPropSyntaxColors::OnBnClickedEcolorStrings()
+void PropSyntaxColors::OnBnClickedEcolorStrings()
{
BrowseColorAndSave(m_btnStringsText, COLORINDEX_STRING);
}
-void CPropSyntaxColors::OnBnClickedEcolorPreprocessor()
+void PropSyntaxColors::OnBnClickedEcolorPreprocessor()
{
BrowseColorAndSave(m_btnPreprocessorText, COLORINDEX_PREPROCESSOR);
}
-void CPropSyntaxColors::OnBnClickedEcolorUser1()
+void PropSyntaxColors::OnBnClickedEcolorUser1()
{
BrowseColorAndSave(m_btnUser1Text, COLORINDEX_USER1);
}
-void CPropSyntaxColors::OnBnClickedEcolorUser2()
+void PropSyntaxColors::OnBnClickedEcolorUser2()
{
BrowseColorAndSave(m_btnUser2Text, COLORINDEX_USER2);
}
-void CPropSyntaxColors::OnBnClickedEcolorsBdefaults()
+void PropSyntaxColors::OnBnClickedEcolorsBdefaults()
{
m_pTempColors->SetDefaults();
m_btnKeywordsText.SetColor(m_pTempColors->GetColor(COLORINDEX_KEYWORD));
@@ -240,7 +235,7 @@
/**
* @brief Loads color selection dialog's custom colors from registry
*/
-void CPropSyntaxColors::LoadCustomColors()
+void PropSyntaxColors::LoadCustomColors()
{
SyntaxColors_Load(m_cCustColors, sizeof(m_cCustColors)/sizeof(m_cCustColors[0]));
}
@@ -248,57 +243,57 @@
/**
* @brief Saves color selection dialog's custom colors to registry
*/
-void CPropSyntaxColors::SaveCustomColors()
+void PropSyntaxColors::SaveCustomColors()
{
SyntaxColors_Save(m_cCustColors, sizeof(m_cCustColors)/sizeof(m_cCustColors[0]));
}
-void CPropSyntaxColors::OnBnClickedEcolorKeywordsBold()
+void PropSyntaxColors::OnBnClickedEcolorKeywordsBold()
{
UpdateBoldStatus(m_btnKeywordsBold, COLORINDEX_KEYWORD);
}
-void CPropSyntaxColors::OnBnClickedEcolorFunctionsBold()
+void PropSyntaxColors::OnBnClickedEcolorFunctionsBold()
{
UpdateBoldStatus(m_btnFunctionsBold, COLORINDEX_FUNCNAME);
}
-void CPropSyntaxColors::OnBnClickedEcolorCommentsBold()
+void PropSyntaxColors::OnBnClickedEcolorCommentsBold()
{
UpdateBoldStatus(m_btnCommentsBold, COLORINDEX_COMMENT);
}
-void CPropSyntaxColors::OnBnClickedEcolorNumbersBold()
+void PropSyntaxColors::OnBnClickedEcolorNumbersBold()
{
UpdateBoldStatus(m_btnNumbersBold, COLORINDEX_NUMBER);
}
-void CPropSyntaxColors::OnBnClickedEcolorOperatorsBold()
+void PropSyntaxColors::OnBnClickedEcolorOperatorsBold()
{
UpdateBoldStatus(m_btnOperatorsBold, COLORINDEX_OPERATOR);
}
-void CPropSyntaxColors::OnBnClickedEcolorStringsBold()
+void PropSyntaxColors::OnBnClickedEcolorStringsBold()
{
UpdateBoldStatus(m_btnStringsBold, COLORINDEX_STRING);
}
-void CPropSyntaxColors::OnBnClickedEcolorPreprocessorBold()
+void PropSyntaxColors::OnBnClickedEcolorPreprocessorBold()
{
UpdateBoldStatus(m_btnPreProcessorBold, COLORINDEX_PREPROCESSOR);
}
-void CPropSyntaxColors::OnBnClickedEcolorUser1Bold()
+void PropSyntaxColors::OnBnClickedEcolorUser1Bold()
{
UpdateBoldStatus(m_btnUser1Bold, COLORINDEX_USER1);
}
-void CPropSyntaxColors::OnBnClickedEcolorUser2Bold()
+void PropSyntaxColors::OnBnClickedEcolorUser2Bold()
{
UpdateBoldStatus(m_btnUser2Bold, COLORINDEX_USER2);
}
-int CPropSyntaxColors::GetCheckVal(UINT nColorIndex)
+int PropSyntaxColors::GetCheckVal(UINT nColorIndex)
{
if (m_pTempColors->GetBold(nColorIndex))
return BST_CHECKED;
@@ -306,7 +301,7 @@
return BST_UNCHECKED;
}
-void CPropSyntaxColors::UpdateBoldStatus(CButton &btn, UINT colorIndex)
+void PropSyntaxColors::UpdateBoldStatus(CButton &btn, UINT colorIndex)
{
int state = btn.GetCheck();
if (state == BST_CHECKED)
Modified: trunk/Src/PropSyntaxColors.h
===================================================================
--- trunk/Src/PropSyntaxColors.h 2009-07-11 07:47:04 UTC (rev 6907)
+++ trunk/Src/PropSyntaxColors.h 2009-07-11 08:29:49 UTC (rev 6908)
@@ -1,7 +1,7 @@
/**
* @file PropSyntaxColors.h
*
- * @brief Declaration file for CPropSyntaxColors propertyheet
+ * @brief Declaration file for PropSyntaxColors propertyheet
*
*/
// ID line follows -- this is updated by SVN
@@ -17,13 +17,13 @@
const int NumCustomColors = 16;
-class CPropSyntaxColors : public OptionsPanel
+class PropSyntaxColors : public OptionsPanel
{
- DECLARE_DYNAMIC(CPropSyntaxColors)
+ DECLARE_DYNAMIC(PropSyntaxColors)
// Construction & Destruction
public:
- CPropSyntaxColors(COptionsMgr *optionsMgr, SyntaxColors *pColors);
+ PropSyntaxColors(COptionsMgr *optionsMgr, SyntaxColors *pColors);
// Implement IOptionsPanel
virtual void ReadOptions();
@@ -36,8 +36,6 @@
enum { IDD = IDD_PROPPAGE_COLORS_SYNTAX };
protected:
-
-
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
virtual BOOL OnInitDialog();
afx_msg void OnBnClickedEcolorKeywords();
Modified: trunk/Src/PropTextColors.cpp
===================================================================
--- trunk/Src/PropTextColors.cpp 2009-07-11 07:47:04 UTC (rev 6907)
+++ trunk/Src/PropTextColors.cpp 2009-07-11 08:29:49 UTC (rev 6908)
@@ -1,9 +1,9 @@
/**
* @file PropTextColors.cpp
*
- * @brief Implementation of CPropTextColors propertysheet
+ * @brief Implementation of PropTextColors propertysheet
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
@@ -24,23 +24,20 @@
/** @brief Section name for settings in registry. */
static const TCHAR Section[] = _T("Custom Colors");
-/////////////////////////////////////////////////////////////////////////////
-// CPropTextColors dialog
-
/**
* @brief Default constructor.
*/
-CPropTextColors::CPropTextColors(COptionsMgr *optionsMgr, SyntaxColors *pColors)
- : OptionsPanel(optionsMgr, CPropTextColors::IDD)
+PropTextColors::PropTextColors(COptionsMgr *optionsMgr, SyntaxColors *pColors)
+ : OptionsPanel(optionsMgr, PropTextColors::IDD)
, m_bCustomColors(FALSE)
, m_pTempColors(pColors)
{
}
-void CPropTextColors::DoDataExchange(CDataExchange* pDX)
+void PropTextColors::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
- //{{AFX_DATA_MAP(CPropTextColors)
+ //{{AFX_DATA_MAP(PropTextColors)
DDX_Control(pDX, IDC_DEFAULT_STANDARD_COLORS, m_btnDefaultStandardColors);
DDX_Check(pDX, IDC_DEFAULT_STANDARD_COLORS, m_bCustomColors);
DDX_Control(pDX, IDC_WHITESPACE_BKGD_COLOR, m_btnWhitespaceBackground);
@@ -52,8 +49,8 @@
}
-BEGIN_MESSAGE_MAP(CPropTextColors, CDialog)
- //{{AFX_MSG_MAP(CPropTextColors)
+BEGIN_MESSAGE_MAP(PropTextColors, CDialog)
+ //{{AFX_MSG_MAP(PropTextColors)
ON_BN_CLICKED(IDC_DEFAULT_STANDARD_COLORS, OnDefaultsStandardColors)
ON_BN_CLICKED(IDC_WHITESPACE_BKGD_COLOR, OnWhitespaceBackgroundColor)
ON_BN_CLICKED(IDC_REGULAR_BKGD_COLOR, OnRegularBackgroundColor)
@@ -66,7 +63,7 @@
/**
* @brief Enable/Disable controls when dialog is shown.
*/
-BOOL CPropTextColors::OnInitDialog()
+BOOL PropTextColors::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
CPropertyPage::OnInitDialog();
@@ -83,7 +80,7 @@
* @brief Reads options values from storage to UI.
* (Property sheet calls this before displaying all property pages)
*/
-void CPropTextColors::ReadOptions()
+void PropTextColors::ReadOptions()
{
m_bCustomColors = GetOptionsMgr()->GetBool(OPT_CLR_DEFAULT_TEXT_COLORING) ? FALSE : TRUE;
SerializeColorsToFromScreen(LOAD_COLORS);
@@ -93,7 +90,7 @@
* @brief Writes options values from UI to storage.
* (Property sheet calls this after displaying all property pages)
*/
-void CPropTextColors::WriteOptions()
+void PropTextColors::WriteOptions()
{
GetOptionsMgr()->SaveOption(OPT_CLR_DEFAULT_TEXT_COLORING, m_bCustomColors == FALSE);
// User can only change colors via BrowseColorAndSave,
@@ -110,7 +107,7 @@
* @param [in] colorButton Button for which to change color.
* @param [in] colorIndex Index to color table.
*/
-void CPropTextColors::BrowseColorAndSave(CColorButton & colorButton, int colorIndex)
+void PropTextColors::BrowseColorAndSave(CColorButton & colorButton, int colorIndex)
{
// Ignore user if colors are slaved to system
if (m_btnDefaultStandardColors.GetCheck() == BST_UNCHECKED)
@@ -133,7 +130,7 @@
/**
* @brief User wants to change whitespace color
*/
-void CPropTextColors::OnWhitespaceBackgroundColor()
+void PropTextColors::OnWhitespaceBackgroundColor()
{
BrowseColorAndSave(m_btnWhitespaceBackground, COLORINDEX_WHITESPACE);
}
@@ -141,7 +138,7 @@
/**
* @brief User wants to change regular background color
*/
-void CPropTextColors::OnRegularBackgroundColor()
+void PropTextColors::OnRegularBackgroundColor()
{
BrowseColorAndSave(m_btnRegularBackground, COLORINDEX_BKGND);
}
@@ -149,7 +146,7 @@
/**
* @brief User wants to change regular text color
*/
-void CPropTextColors::OnRegularTextColor()
+void PropTextColors::OnRegularTextColor()
{
BrowseColorAndSave(m_btnRegularText, COLORINDEX_NORMALTEXT);
}
@@ -157,7 +154,7 @@
/**
* @brief User wants to change regular selection background color
*/
-void CPropTextColors::OnSelectionBackgroundColor()
+void PropTextColors::OnSelectionBackgroundColor()
{
BrowseColorAndSave(m_btnSelectionBackground, COLORINDEX_SELBKGND);
}
@@ -165,7 +162,7 @@
/**
* @brief User wants to change regular selection text color
*/
-void CPropTextColors::OnSelectionTextColor()
+void PropTextColors::OnSelectionTextColor()
{
BrowseColorAndSave(m_btnSelectionText, COLORINDEX_SELTEXT);
}
@@ -177,7 +174,7 @@
* - LOAD_COLORS : Loads colors from registry
* (No save operation because BrowseColorAndSave saves immediately when user chooses)
*/
-void CPropTextColors::SerializeColorsToFromScreen(OPERATION op)
+void PropTextColors::SerializeColorsToFromScreen(OPERATION op)
{
if (op == SET_DEFAULTS)
m_pTempColors->SetDefaults();
@@ -198,7 +195,7 @@
* - LOAD_COLORS : Loads colors from registry
* (No save operation because BrowseColorAndSave saves immediately when user chooses)
*/
-void CPropTextColors::SerializeColorToFromScreen(OPERATION op, CColorButton & btn, int colorIndex)
+void PropTextColors::SerializeColorToFromScreen(OPERATION op, CColorButton & btn, int colorIndex)
{
switch (op)
@@ -223,7 +220,7 @@
/**
* @brief Set colors to track standard (theme) colors
*/
-void CPropTextColors::OnDefaultsStandardColors()
+void PropTextColors::OnDefaultsStandardColors()
{
// Reset all text colors to default every time user checks defaults button
SerializeColorsToFromScreen(SET_DEFAULTS);
@@ -242,7 +239,7 @@
/**
* @brief Loads color selection dialog's custom colors from registry
*/
-void CPropTextColors::LoadCustomColors()
+void PropTextColors::LoadCustomColors()
{
SyntaxColors_Load(m_cCustColors, sizeof(m_cCustColors)/sizeof(m_cCustColors[0]));
}
@@ -250,7 +247,7 @@
/**
* @brief Saves color selection dialog's custom colors to registry
*/
-void CPropTextColors::SaveCustomColors()
+void PropTextColors::SaveCustomColors()
{
SyntaxColors_Save(m_cCustColors, sizeof(m_cCustColors)/sizeof(m_cCustColors[0]));
}
@@ -259,7 +256,7 @@
* @brief Enable / disable color controls on dialog.
* @param [in] bEnable If TRUE color controls are enabled.
*/
-void CPropTextColors::EnableColorButtons(BOOL bEnable)
+void PropTextColors::EnableColorButtons(BOOL bEnable)
{
CStatic * stc = (CStatic *) GetDlgItem(IDC_CUSTOM_COLORS_GROUP);
stc->EnableWindow(bEnable);
Modified: trunk/Src/PropTextColors.h
===================================================================
--- trunk/Src/PropTextColors.h 2009-07-11 07:47:04 UTC (rev 6907)
+++ trunk/Src/PropTextColors.h 2009-07-11 08:29:49 UTC (rev 6908)
@@ -1,7 +1,7 @@
/**
* @file PropTextColors.h
*
- * @brief Declaration file for CPropTextColors propertyheet
+ * @brief Declaration file for PropTextColors propertyheet
*
*/
// ID line follows -- this is updated by SVN
@@ -16,18 +16,14 @@
class COptionsMgr;
class SyntaxColors;
-
-/////////////////////////////////////////////////////////////////////////////
-// CPropTextColors dialog
-
/** @brief Property page for colors options; used in options property sheet */
-class CPropTextColors : public OptionsPanel
+class PropTextColors : public OptionsPanel
{
// Construction
public:
- CPropTextColors(COptionsMgr *optionsMgr, SyntaxColors *pColors);
+ PropTextColors(COptionsMgr *optionsMgr, SyntaxColors *pColors);
// Implement IOptionsPanel
virtual void ReadOptions();
@@ -39,7 +35,7 @@
SyntaxColors *m_pTempColors;
COLORREF m_cCustColors[COLORINDEX_COUNT];
- //{{AFX_DATA(CPropTextColors)
+ //{{AFX_DATA(PropTextColors)
enum { IDD = IDD_PROPPAGE_COLORS_TEXT };
CColorButton m_btnDefaultStandardColors;
CColorButton m_btnWhitespaceBackground;
@@ -58,7 +54,7 @@
// Overrides
// ClassWizard generated virtual fun...
[truncated message content] |
|
From: <ki...@us...> - 2009-07-11 13:03:46
|
Revision: 6909
http://winmerge.svn.sourceforge.net/winmerge/?rev=6909&view=rev
Author: kimmov
Date: 2009-07-11 13:03:42 +0000 (Sat, 11 Jul 2009)
Log Message:
-----------
Move recursive-info from thread's struct to compare context.
Modified Paths:
--------------
trunk/Src/DiffContext.h
trunk/Src/DiffThread.cpp
trunk/Src/DiffThread.h
trunk/Src/DirDoc.cpp
trunk/Src/DirScan.cpp
Modified: trunk/Src/DiffContext.h
===================================================================
--- trunk/Src/DiffContext.h 2009-07-11 08:29:49 UTC (rev 6908)
+++ trunk/Src/DiffContext.h 2009-07-11 13:03:42 UTC (rev 6909)
@@ -159,6 +159,7 @@
* cannot compare large files. And large files are usually binary files.
*/
int m_nQuickCompareLimit;
+ bool m_bRecursive; /**< Do we include subfolders to compare? */
bool m_bPluginsEnabled; /**< Are plugins enabled? */
FilterList * m_pFilterList; /**< Filter list for line filters */
Modified: trunk/Src/DiffThread.cpp
===================================================================
--- trunk/Src/DiffThread.cpp 2009-07-11 08:29:49 UTC (rev 6908)
+++ trunk/Src/DiffThread.cpp 2009-07-11 13:03:42 UTC (rev 6909)
@@ -122,15 +122,13 @@
* @brief Start and run directory compare thread.
* @param [in] dir1 First directory to compare.
* @param [in] dir2 Second directory to compare.
- * @param [in] bRecursive Is the compare recursive (subfolders included)?
* @return Success (1) or error for thread. Currently always 1.
*/
UINT CDiffThread::CompareDirectories(const String & dir1,
- const String & dir2, BOOL bRecursive)
+ const String & dir2)
{
ASSERT(m_pDiffParm->nThreadState != THREAD_COMPARING);
- m_pDiffParm->bRecursive = bRecursive;
m_pDiffParm->context = m_pDiffContext;
m_pDiffParm->msgUIUpdate = m_msgUpdateUI;
m_pDiffParm->hWindow = m_hWnd;
@@ -218,7 +216,7 @@
CAssureScriptsForThread scriptsForRescan;
bool casesensitive = false;
- int depth = myStruct->bRecursive ? -1 : 0;
+ int depth = myStruct->context->m_bRecursive ? -1 : 0;
paths.SetLeft(myStruct->context->GetNormalizedLeft().c_str());
paths.SetRight(myStruct->context->GetNormalizedRight().c_str());
Modified: trunk/Src/DiffThread.h
===================================================================
--- trunk/Src/DiffThread.h 2009-07-11 08:29:49 UTC (rev 6908)
+++ trunk/Src/DiffThread.h 2009-07-11 13:03:42 UTC (rev 6909)
@@ -52,7 +52,7 @@
CDiffThread();
~CDiffThread();
void SetContext(CDiffContext * pCtx);
- UINT CompareDirectories(const String & dir1, const String & dir2, BOOL bRecursive);
+ UINT CompareDirectories(const String & dir1, const String & dir2);
void SetHwnd(HWND hWnd);
void SetMessageIDs(UINT updateMsg);
void SetCompareSelected(bool bSelected = false);
@@ -87,7 +87,6 @@
UINT msgUIUpdate; /**< Windows message for updating GUI. */
HWND hWindow; /**< Window getting status updates. */
CDiffThread::ThreadState nThreadState; /**< Thread state. */
- BOOL bRecursive; /**< Is compare recursive (subfolders included)? */
DiffThreadAbortable * m_pAbortgate; /**< Interface for aborting compare. */
bool bOnlyRequested; /**< Compare only requested items? */
HANDLE hSemaphore; /**< Semaphore for synchronizing threads. */
@@ -97,7 +96,6 @@
, msgUIUpdate(0)
, hWindow(0)
, nThreadState(CDiffThread::THREAD_NOTSTARTED)
- , bRecursive(FALSE)
, m_pAbortgate(NULL)
, bOnlyRequested(false)
, hSemaphore(NULL)
Modified: trunk/Src/DirDoc.cpp
===================================================================
--- trunk/Src/DirDoc.cpp 2009-07-11 08:29:49 UTC (rev 6908)
+++ trunk/Src/DirDoc.cpp 2009-07-11 13:03:42 UTC (rev 6909)
@@ -183,6 +183,7 @@
m_pCtxt = new CDiffContext(paths.GetLeft().c_str(), paths.GetRight().c_str(),
GetOptionsMgr()->GetInt(OPT_CMP_METHOD));
+ m_pCtxt->m_bRecursive = !!bRecursive;
if (pTempPathContext)
{
@@ -314,7 +315,8 @@
*/
void CDirDoc::Rescan()
{
- if (!m_pCtxt) return;
+ if (!m_pCtxt)
+ return;
CDirFrame *pf = m_pDirView->GetParentFrame();
@@ -354,6 +356,7 @@
m_pCtxt->m_nQuickCompareLimit = GetOptionsMgr()->GetInt(OPT_CMP_QUICK_LIMIT);
m_pCtxt->m_bPluginsEnabled = GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED);
m_pCtxt->m_pCompareStats = m_pCompareStats;
+ m_pCtxt->m_bRecursive = !!m_bRecursive;
// Set total items count since we don't collect items
if (m_bMarkedRescan)
@@ -378,7 +381,7 @@
m_diffThread.SetMessageIDs(MSG_UI_UPDATE);
m_diffThread.SetCompareSelected(!!m_bMarkedRescan);
m_diffThread.CompareDirectories(m_pCtxt->GetNormalizedLeft(),
- m_pCtxt->GetNormalizedRight(), m_bRecursive);
+ m_pCtxt->GetNormalizedRight());
m_bMarkedRescan = FALSE;
}
Modified: trunk/Src/DirScan.cpp
===================================================================
--- trunk/Src/DirScan.cpp 2009-07-11 08:29:49 UTC (rev 6908)
+++ trunk/Src/DirScan.cpp 2009-07-11 13:03:42 UTC (rev 6909)
@@ -331,7 +331,7 @@
WaitForSingleObject(myStruct->hSemaphore, INFINITE);
UINT_PTR curpos = pos;
DIFFITEM &di = pCtxt->GetNextSiblingDiffRefPosition(pos);
- if (di.diffcode.isDirectory() && myStruct->bRecursive)
+ if (di.diffcode.isDirectory() && pCtxt->m_bRecursive)
{
di.diffcode.diffcode &= ~(DIFFCODE::DIFF | DIFFCODE::SAME);
int ndiff = DirScan_CompareItems(myStruct, curpos);
@@ -383,7 +383,7 @@
UINT_PTR curpos = pos;
DIFFITEM &di = pCtxt->GetNextSiblingDiffRefPosition(pos);
- if (di.diffcode.isDirectory() && myStruct->bRecursive)
+ if (di.diffcode.isDirectory() && pCtxt->m_bRecursive)
{
di.diffcode.diffcode &= ~(DIFFCODE::DIFF | DIFFCODE::SAME);
int ndiff = DirScan_CompareRequestedItems(myStruct, curpos);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-07-12 09:06:58
|
Revision: 6910
http://winmerge.svn.sourceforge.net/winmerge/?rev=6910&view=rev
Author: kimmov
Date: 2009-07-12 09:06:54 +0000 (Sun, 12 Jul 2009)
Log Message:
-----------
PATCH: [ 2820067 ] Make walking into uniq folders optional
Modified Paths:
--------------
trunk/Src/DiffContext.cpp
trunk/Src/DiffContext.h
trunk/Src/DiffThread.cpp
trunk/Src/DirDoc.cpp
trunk/Src/Merge.rc
trunk/Src/OptionsDef.h
trunk/Src/OptionsInit.cpp
trunk/Src/PropCompareFolder.cpp
trunk/Src/PropCompareFolder.h
trunk/Src/resource.h
Modified: trunk/Src/DiffContext.cpp
===================================================================
--- trunk/Src/DiffContext.cpp 2009-07-11 13:03:42 UTC (rev 6909)
+++ trunk/Src/DiffContext.cpp 2009-07-12 09:06:54 UTC (rev 6910)
@@ -74,6 +74,8 @@
, m_pCompareOptions(NULL)
, m_pOptions(NULL)
, m_bPluginsEnabled(false)
+, m_bRecursive(false)
+, m_bWalkUniques(true)
{
m_paths.SetLeft(pszLeft);
m_paths.SetRight(pszRight);
Modified: trunk/Src/DiffContext.h
===================================================================
--- trunk/Src/DiffContext.h 2009-07-11 13:03:42 UTC (rev 6909)
+++ trunk/Src/DiffContext.h 2009-07-12 09:06:54 UTC (rev 6910)
@@ -159,6 +159,18 @@
* cannot compare large files. And large files are usually binary files.
*/
int m_nQuickCompareLimit;
+
+ /**
+ * Walk into unique folders and add contents.
+ * This enables/disables walking into unique folders. If we don't walk into
+ * unique folders, they are shown as such in folder compare results. If we
+ * walk into unique folders, we'll show all files in the unique folder and
+ * in possible subfolders.
+ *
+ * This value is true by default.
+ */
+ bool m_bWalkUniques;
+
bool m_bRecursive; /**< Do we include subfolders to compare? */
bool m_bPluginsEnabled; /**< Are plugins enabled? */
FilterList * m_pFilterList; /**< Filter list for line filters */
Modified: trunk/Src/DiffThread.cpp
===================================================================
--- trunk/Src/DiffThread.cpp 2009-07-11 13:03:42 UTC (rev 6909)
+++ trunk/Src/DiffThread.cpp 2009-07-12 09:06:54 UTC (rev 6910)
@@ -45,17 +45,6 @@
*/
static bool bSinglethreaded = false;
-/**
- * @brief Walk into unique folders and add contents.
- * This enables/disables walking into unique folders. If we don't walk into
- * unique folders, they are shown as such in folder compare results. If we
- * walk into unique folders, we'll show all files in the unique folder and
- * in possible subfolders.
- *
- * This value is true by default.
- */
-static bool bWalkUniques = true;
-
/** @brief abort handler for CDiffThread -- just a gateway to CDiffThread */
class DiffThreadAbortable : public IAbortable
{
@@ -230,7 +219,8 @@
#endif
// Build results list (except delaying file comparisons until below)
- DirScan_GetItems(paths, subdir, false, subdir, false, myStruct, casesensitive, depth, NULL, bWalkUniques);
+ DirScan_GetItems(paths, subdir, false, subdir, false, myStruct,
+ casesensitive, depth, NULL, myStruct->context->m_bWalkUniques);
#ifdef _DEBUG
_CrtMemCheckpoint(&memStateAfter);
Modified: trunk/Src/DirDoc.cpp
===================================================================
--- trunk/Src/DirDoc.cpp 2009-07-11 13:03:42 UTC (rev 6909)
+++ trunk/Src/DirDoc.cpp 2009-07-12 09:06:54 UTC (rev 6910)
@@ -355,6 +355,7 @@
m_pCtxt->m_bStopAfterFirstDiff = GetOptionsMgr()->GetBool(OPT_CMP_STOP_AFTER_FIRST);
m_pCtxt->m_nQuickCompareLimit = GetOptionsMgr()->GetInt(OPT_CMP_QUICK_LIMIT);
m_pCtxt->m_bPluginsEnabled = GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED);
+ m_pCtxt->m_bWalkUniques = GetOptionsMgr()->GetBool(OPT_CMP_WALK_UNIQUE_DIRS);
m_pCtxt->m_pCompareStats = m_pCompareStats;
m_pCtxt->m_bRecursive = !!m_bRecursive;
Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc 2009-07-11 13:03:42 UTC (rev 6909)
+++ trunk/Src/Merge.rc 2009-07-12 09:06:54 UTC (rev 6910)
@@ -1686,12 +1686,14 @@
CAPTION "Folder"
FONT 8, "MS Shell Dlg", 00, 0, 0x1
BEGIN
+ LTEXT "&Compare method:",IDC_STATIC,7,9,100,9
COMBOBOX IDC_COMPAREMETHODCOMBO,110,7,114,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "S&top after first difference",IDC_COMPARE_STOPFIRST,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,28,202,10
CONTROL "Ign&ore time differences less than 3 seconds",IDC_IGNORE_SMALLTIMEDIFF,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,41,222,10
- LTEXT "&Compare method:",IDC_STATIC,7,9,100,9
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,39,222,10
+ CONTROL "&Include unique subfolders contents",IDC_COMPARE_WALKSUBDIRS,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,50,222,10
PUSHBUTTON "Defaults",IDC_COMPAREFOLDER_DEFAULTS,7,184,70,14
END
Modified: trunk/Src/OptionsDef.h
===================================================================
--- trunk/Src/OptionsDef.h 2009-07-11 13:03:42 UTC (rev 6909)
+++ trunk/Src/OptionsDef.h 2009-07-12 09:06:54 UTC (rev 6910)
@@ -140,6 +140,7 @@
const TCHAR OPT_CMP_MATCH_SIMILAR_LINES[] = _T("Settings/MatchSimilarLines");
const TCHAR OPT_CMP_STOP_AFTER_FIRST[] = _T("Settings/StopAfterFirst");
const TCHAR OPT_CMP_QUICK_LIMIT[] = _T("Settings/QuickMethodLimit");
+const TCHAR OPT_CMP_WALK_UNIQUE_DIRS[] = _T("Settings/WalkUniqueDirs");
// Multidoc enable/disable per document type
const TCHAR OPT_MULTIDOC_DIRDOCS[] = _T("Settings/MultiDirDocs");
Modified: trunk/Src/OptionsInit.cpp
===================================================================
--- trunk/Src/OptionsInit.cpp 2009-07-11 13:03:42 UTC (rev 6909)
+++ trunk/Src/OptionsInit.cpp 2009-07-12 09:06:54 UTC (rev 6910)
@@ -108,6 +108,7 @@
m_pOptions->InitOption(OPT_CMP_MATCH_SIMILAR_LINES, false);
m_pOptions->InitOption(OPT_CMP_STOP_AFTER_FIRST, false);
m_pOptions->InitOption(OPT_CMP_QUICK_LIMIT, 4 * 1024 * 1024); // 4 Megs
+ m_pOptions->InitOption(OPT_CMP_WALK_UNIQUE_DIRS, true);
m_pOptions->InitOption(OPT_CLR_DIFF, (int)RGB(239,203,5));
m_pOptions->InitOption(OPT_CLR_DIFF_DELETED, (int)RGB(192, 192, 192));
Modified: trunk/Src/PropCompareFolder.cpp
===================================================================
--- trunk/Src/PropCompareFolder.cpp 2009-07-11 13:03:42 UTC (rev 6909)
+++ trunk/Src/PropCompareFolder.cpp 2009-07-12 09:06:54 UTC (rev 6910)
@@ -28,6 +28,7 @@
, m_compareMethod(-1)
, m_bStopAfterFirst(FALSE)
, m_bIgnoreSmallTimeDiff(FALSE)
+ , m_bIncludeUniqFolders(TRUE)
{
}
@@ -38,6 +39,7 @@
DDX_CBIndex(pDX, IDC_COMPAREMETHODCOMBO, m_compareMethod);
DDX_Check(pDX, IDC_COMPARE_STOPFIRST, m_bStopAfterFirst);
DDX_Check(pDX, IDC_IGNORE_SMALLTIMEDIFF, m_bIgnoreSmallTimeDiff);
+ DDX_Check(pDX, IDC_COMPARE_WALKSUBDIRS, m_bIncludeUniqFolders);
//}}AFX_DATA_MAP
}
@@ -59,6 +61,7 @@
m_compareMethod = GetOptionsMgr()->GetInt(OPT_CMP_METHOD);
m_bStopAfterFirst = GetOptionsMgr()->GetBool(OPT_CMP_STOP_AFTER_FIRST);
m_bIgnoreSmallTimeDiff = GetOptionsMgr()->GetBool(OPT_IGNORE_SMALL_FILETIME);
+ m_bIncludeUniqFolders = GetOptionsMgr()->GetBool(OPT_CMP_WALK_UNIQUE_DIRS);
}
/**
@@ -71,6 +74,7 @@
GetOptionsMgr()->SaveOption(OPT_CMP_METHOD, (int)m_compareMethod);
GetOptionsMgr()->SaveOption(OPT_CMP_STOP_AFTER_FIRST, m_bStopAfterFirst == TRUE);
GetOptionsMgr()->SaveOption(OPT_IGNORE_SMALL_FILETIME, m_bIgnoreSmallTimeDiff == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_CMP_WALK_UNIQUE_DIRS, m_bIncludeUniqFolders == TRUE);
}
/**
@@ -114,6 +118,8 @@
m_compareMethod = tmp;
GetOptionsMgr()->GetDefault(OPT_CMP_STOP_AFTER_FIRST, tmp);
m_bStopAfterFirst = tmp;
+ GetOptionsMgr()->GetDefault(OPT_CMP_WALK_UNIQUE_DIRS, tmp);
+ m_bIncludeUniqFolders = tmp;
UpdateData(FALSE);
}
Modified: trunk/Src/PropCompareFolder.h
===================================================================
--- trunk/Src/PropCompareFolder.h 2009-07-11 13:03:42 UTC (rev 6909)
+++ trunk/Src/PropCompareFolder.h 2009-07-12 09:06:54 UTC (rev 6910)
@@ -42,6 +42,7 @@
int m_compareMethod;
BOOL m_bStopAfterFirst;
BOOL m_bIgnoreSmallTimeDiff;
+ BOOL m_bIncludeUniqFolders;
//}}AFX_DATA
Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h 2009-07-11 13:03:42 UTC (rev 6909)
+++ trunk/Src/resource.h 2009-07-12 09:06:54 UTC (rev 6910)
@@ -450,6 +450,7 @@
#define IDC_WORDDIFF_DELETED_COLOR 1346
#define IDC_SEL_WORDDIFF_DELETED_COLOR 1347
#define IDC_COMPAREFOLDER_DEFAULTS 1348
+#define IDC_COMPARE_WALKSUBDIRS 1349
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
@@ -1091,7 +1092,7 @@
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 239
#define _APS_NEXT_COMMAND_VALUE 33178
-#define _APS_NEXT_CONTROL_VALUE 1349
+#define _APS_NEXT_CONTROL_VALUE 1350
#define _APS_NEXT_SYMED_VALUE 113
#endif
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-07-12 14:09:28
|
Revision: 6911
http://winmerge.svn.sourceforge.net/winmerge/?rev=6911&view=rev
Author: kimmov
Date: 2009-07-12 14:09:24 +0000 (Sun, 12 Jul 2009)
Log Message:
-----------
Remove MFC dependency from ByteComparator class.
Modified Paths:
--------------
trunk/Src/CompareEngines/ByteComparator.cpp
trunk/Src/Merge.vcproj
Modified: trunk/Src/CompareEngines/ByteComparator.cpp
===================================================================
--- trunk/Src/CompareEngines/ByteComparator.cpp 2009-07-12 09:06:54 UTC (rev 6910)
+++ trunk/Src/CompareEngines/ByteComparator.cpp 2009-07-12 14:09:24 UTC (rev 6911)
@@ -6,7 +6,10 @@
// ID line follows -- this is updated by SVN
// $Id$
-#include "StdAfx.h"
+//#include "StdAfx.h"
+#include <windows.h>
+#include <tchar.h>
+#include <assert.h>
#include "ByteComparator.h"
#include "FileTextStats.h"
#include "CompareOptions.h"
@@ -259,7 +262,7 @@
// "whitespace on both sides"
// should not come here, it should have been
// handled above
- ASSERT(!iswsch(*ptr0));
+ assert(!iswsch(*ptr0));
if (iseolch(*ptr0))
{
Modified: trunk/Src/Merge.vcproj
===================================================================
--- trunk/Src/Merge.vcproj 2009-07-12 09:06:54 UTC (rev 6910)
+++ trunk/Src/Merge.vcproj 2009-07-12 14:09:24 UTC (rev 6911)
@@ -9445,7 +9445,10 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""/>
</FileConfiguration>
<FileConfiguration
Name="UnicodeDebug|Win32">
@@ -9454,7 +9457,10 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
@@ -9463,7 +9469,10 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
@@ -9471,7 +9480,10 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""/>
</FileConfiguration>
</File>
<File
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-07-12 22:31:30
|
Revision: 6914
http://winmerge.svn.sourceforge.net/winmerge/?rev=6914&view=rev
Author: kimmov
Date: 2009-07-12 22:31:23 +0000 (Sun, 12 Jul 2009)
Log Message:
-----------
Remove MFC dependency from CompareStats class.
Modified Paths:
--------------
trunk/Src/CompareStats.cpp
trunk/Src/CompareStats.h
trunk/Src/Merge.vcproj
Modified: trunk/Src/CompareStats.cpp
===================================================================
--- trunk/Src/CompareStats.cpp 2009-07-12 19:23:00 UTC (rev 6913)
+++ trunk/Src/CompareStats.cpp 2009-07-12 22:31:23 UTC (rev 6914)
@@ -6,7 +6,8 @@
// ID line follows -- this is updated by SVN
// $Id$
-#include "stdafx.h"
+#include <windows.h>
+#include <assert.h>
#include "DiffItem.h"
#include "CompareStats.h"
@@ -53,7 +54,7 @@
int index = static_cast<int>(res);
m_counts[index] += 1;
++m_nComparedItems;
- ASSERT(m_nComparedItems <= m_nTotalItems);
+ assert(m_nComparedItems <= m_nTotalItems);
LeaveCriticalSection(&m_csProtect);
}
Modified: trunk/Src/CompareStats.h
===================================================================
--- trunk/Src/CompareStats.h 2009-07-12 19:23:00 UTC (rev 6913)
+++ trunk/Src/CompareStats.h 2009-07-12 22:31:23 UTC (rev 6914)
@@ -4,7 +4,7 @@
* @brief Declaration of class CompareStats
*/
//
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#ifndef _COMPARESTATS_H_
@@ -68,9 +68,9 @@
void SetCompareState(CompareStats::CMP_STATE state);
CompareStats::CMP_STATE GetCompareState() const;
BOOL IsCompareDone() const { return m_bCompareDone; }
-
- static CompareStats::RESULT CompareStats::GetResultFromCode(UINT diffcode);
+ static CompareStats::RESULT GetResultFromCode(UINT diffcode);
+
private:
int m_counts[RESULT_COUNT]; /**< Table storing result counts */
CRITICAL_SECTION m_csProtect; /**< For synchronizing read/write of counts */
Modified: trunk/Src/Merge.vcproj
===================================================================
--- trunk/Src/Merge.vcproj 2009-07-12 19:23:00 UTC (rev 6913)
+++ trunk/Src/Merge.vcproj 2009-07-12 22:31:23 UTC (rev 6914)
@@ -866,7 +866,10 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""/>
</FileConfiguration>
<FileConfiguration
Name="UnicodeDebug|Win32">
@@ -875,7 +878,10 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
@@ -884,7 +890,10 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
@@ -892,7 +901,10 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""/>
</FileConfiguration>
</File>
<File
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-07-25 08:43:43
|
Revision: 6924
http://winmerge.svn.sourceforge.net/winmerge/?rev=6924&view=rev
Author: kimmov
Date: 2009-07-25 08:43:31 +0000 (Sat, 25 Jul 2009)
Log Message:
-----------
Make SanityCheckDiff() a const method. Its task is to check diffs not modify anything.
Modified Paths:
--------------
trunk/Src/MergeDoc.cpp
trunk/Src/MergeDoc.h
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2009-07-23 16:07:15 UTC (rev 6923)
+++ trunk/Src/MergeDoc.cpp 2009-07-25 08:43:31 UTC (rev 6924)
@@ -805,7 +805,7 @@
* @param [in] dr Difference to check.
* @return TRUE if difference lines match, FALSE otherwise.
*/
-bool CMergeDoc::SanityCheckDiff(DIFFRANGE dr)
+bool CMergeDoc::SanityCheckDiff(DIFFRANGE dr) const
{
const int cd_dbegin = dr.dbegin0;
const int cd_dend = dr.dend0;
Modified: trunk/Src/MergeDoc.h
===================================================================
--- trunk/Src/MergeDoc.h 2009-07-23 16:07:15 UTC (rev 6923)
+++ trunk/Src/MergeDoc.h 2009-07-25 08:43:31 UTC (rev 6924)
@@ -162,7 +162,7 @@
bool Undo();
void CopyAllList(int srcPane, int dstPane);
void CopyMultipleList(int srcPane, int dstPane, int firstDiff, int lastDiff);
- bool SanityCheckDiff(DIFFRANGE dr);
+ bool SanityCheckDiff(DIFFRANGE dr) const;
bool ListCopy(int srcPane, int dstPane, int nDiff = -1, bool bGroupWithPrevious = false);
bool TrySaveAs(CString &strPath, int &nLastErrorCode, String & sError,
int nBuffer, PackingInfo * pInfoTempUnpacker);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
