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/ccInstHelper.cpp | |
parent | 63862fdfcb61f302ef69e86d40772bb1318d3763 (diff) | |
download | kdiff3-f636ba5ba2df9d34d56b1c85f24c6598fa1cb645.tar.gz kdiff3-f636ba5ba2df9d34d56b1c85f24c6598fa1cb645.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/ccInstHelper.cpp')
-rw-r--r-- | src/ccInstHelper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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) |