diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-27 05:58:16 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-27 05:58:16 +0000 |
commit | f636ba5ba2df9d34d56b1c85f24c6598fa1cb645 (patch) | |
tree | 5365045e6bce685a7cbaeb81b4797a719e86089f /src/gnudiff_analyze.cpp | |
parent | 63862fdfcb61f302ef69e86d40772bb1318d3763 (diff) | |
download | kdiff3-f636ba5b.tar.gz kdiff3-f636ba5b.zip |
TQt4 port kdiff3
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1238464 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/gnudiff_analyze.cpp')
-rw-r--r-- | src/gnudiff_analyze.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gnudiff_analyze.cpp b/src/gnudiff_analyze.cpp index ea49b4e..565cf32 100644 --- a/src/gnudiff_analyze.cpp +++ b/src/gnudiff_analyze.cpp @@ -535,7 +535,7 @@ void GnuDiff::discard_confusing_lines (struct file_data filevec[]) discards[i + j] = 0; /* Scan from beginning of run - until we find 3 or more nonprovisionals in a row + until we tqfind 3 or more nonprovisionals in a row or until the first nonprovisional at least 8 lines in. Until that point, cancel any provisionals. */ for (j = 0, consec = 0; j < length; j++) |