From f636ba5ba2df9d34d56b1c85f24c6598fa1cb645 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 27 Jun 2011 05:58:16 +0000 Subject: 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 --- src/gnudiff_analyze.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gnudiff_analyze.cpp') 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++) -- cgit v1.2.1