From f636ba5ba2df9d34d56b1c85f24c6598fa1cb645 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
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/ccInstHelper.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ccInstHelper.cpp')

diff --git a/src/ccInstHelper.cpp b/src/ccInstHelper.cpp
index 055e2d6..643f8f6 100644
--- a/src/ccInstHelper.cpp
+++ b/src/ccInstHelper.cpp
@@ -260,7 +260,7 @@ int integrateWithClearCase( const char* subCommand, const char* kdiff3CommandPat
          for( ; i!=lineItemList.end(); ++i )
          {
             LineItem& li = *i;
-            if ((int)toUpper(li.command).find("KDIFF3")>=0)
+            if ((int)toUpper(li.command).tqfind("KDIFF3")>=0)
             {
                std::list<LineItem>::const_iterator j = lineItemListBak.begin();
                for (;j!=lineItemListBak.end();++j)
-- 
cgit v1.2.3