diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
| commit | 721c5c4ee3dcee163a2b0f7fd94cb3689154c1bd (patch) | |
| tree | d775ffe309859e438c3fcac0825c8f7c9d384c81 /src/pdiff.cpp | |
| parent | 5173e6fcb16310e130fba4143e334563b4f8460e (diff) | |
| download | kdiff3-721c5c4e.tar.gz kdiff3-721c5c4e.zip | |
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
Diffstat (limited to 'src/pdiff.cpp')
| -rw-r--r-- | src/pdiff.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 |