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

1 files changed, 4 insertions, 4 deletions

diff --git a/src/gnudiff_io.cpp b/src/gnudiff_io.cpp
index 4241d36..f29fd31 100644
--- a/src/gnudiff_io.cpp
+++ b/src/gnudiff_io.cpp
@@ -419,7 +419,7 @@ void GnuDiff::find_identical_ends (struct file_data filevec[])
 
   const TQChar **linbuf0, **linbuf1;
   lin alloc_lines0, alloc_lines1;
-  lin buffered_prefix, prefix_count, prefix_tqmask;
+  lin buffered_prefix, prefix_count, prefix_mask;
   lin middle_guess, suffix_guess;
   if (no_diff_means_no_output
       && context < (lin)(LIN_MAX / 4) && context < (lin)(n0))
@@ -437,7 +437,7 @@ void GnuDiff::find_identical_ends (struct file_data filevec[])
       alloc_lines0 = guess_lines (0, 0, n0);
     }
 
-  prefix_tqmask = prefix_count - 1;
+  prefix_mask = prefix_count - 1;
   lin lines = 0;
   linbuf0 = (const TQChar**) xmalloc (alloc_lines0 * sizeof(*linbuf0));
   p0 = buffer0;
@@ -450,7 +450,7 @@ void GnuDiff::find_identical_ends (struct file_data filevec[])
       end0 = filevec[0].prefix_end;
       while (p0 != end0)
 	{
-	  lin l = lines++ & prefix_tqmask;
+	  lin l = lines++ & prefix_mask;
 	  if (l == alloc_lines0)
 	    {
 	      if ((lin)(PTRDIFF_MAX / (2 * sizeof *linbuf0)) <= alloc_lines0)
@@ -480,7 +480,7 @@ void GnuDiff::find_identical_ends (struct file_data filevec[])
   {
       /* Rotate prefix lines to proper location.  */
       for (i = 0;  i < buffered_prefix;  i++)
-	linbuf1[i] = linbuf0[(lines - context + i) & prefix_tqmask];
+	linbuf1[i] = linbuf0[(lines - context + i) & prefix_mask];
       for (i = 0;  i < buffered_prefix;  i++)
 	linbuf0[i] = linbuf1[i];
   }