summaryrefslogtreecommitdiffstats
path: root/src/diff.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:09:35 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:09:35 -0600
commitc7e29c4606e72cf1d3d0052eec08805c8cf3fce7 (patch)
treea20841af6b5c7f361530b5318594de081adb2772 /src/diff.h
parent303e108109ce526c414e8770119134dcc2f2d7bd (diff)
downloadkdiff3-c7e29c4606e72cf1d3d0052eec08805c8cf3fce7.tar.gz
kdiff3-c7e29c4606e72cf1d3d0052eec08805c8cf3fce7.zip
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'src/diff.h')
-rw-r--r--src/diff.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/diff.h b/src/diff.h
index ee3076e..a4015d1 100644
--- a/src/diff.h
+++ b/src/diff.h
@@ -169,10 +169,10 @@ public:
typedef std::vector<Diff3WrapLine> Diff3WrapLineVector;
-class TotalDifftqStatus
+class TotalDiffStatus
{
public:
- TotalDifftqStatus(){ reset(); }
+ TotalDiffStatus(){ reset(); }
void reset() {bBinaryAEqC=false; bBinaryBEqC=false; bBinaryAEqB=false;
bTextAEqC=false; bTextBEqC=false; bTextAEqB=false;
nofUnsolvedConflicts=0; nofSolvedConflicts=0;