From 721c5c4ee3dcee163a2b0f7fd94cb3689154c1bd Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 10 Aug 2011 22:19:39 +0000
Subject: rename the following methods: tqparent parent tqmask mask

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 src/pdiff.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/pdiff.cpp')

diff --git a/src/pdiff.cpp b/src/pdiff.cpp
index b481cd6..033fd31 100644
--- a/src/pdiff.cpp
+++ b/src/pdiff.cpp
@@ -84,7 +84,7 @@ bool KDiff3App::runDiff( const LineData* p1, int size1, const LineData* p2, int
    {
       GnuDiff::comparison comparisonInput;
       memset( &comparisonInput, 0, sizeof(comparisonInput) );
-      comparisonInput.tqparent = 0;
+      comparisonInput.parent = 0;
       comparisonInput.file[0].buffer = p1[0].pLine;//ptr to buffer
       comparisonInput.file[0].buffered = (p1[size1-1].pLine-p1[0].pLine+p1[size1-1].size); // size of buffer
       comparisonInput.file[1].buffer = p2[0].pLine;//ptr to buffer
-- 
cgit v1.2.3