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 --- diff_ext_for_kdiff3/diffextstring.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'diff_ext_for_kdiff3/diffextstring.h') diff --git a/diff_ext_for_kdiff3/diffextstring.h b/diff_ext_for_kdiff3/diffextstring.h index 132512e..0df947e 100644 --- a/diff_ext_for_kdiff3/diffextstring.h +++ b/diff_ext_for_kdiff3/diffextstring.h @@ -108,7 +108,7 @@ class STRING { return tmp; } - STRING& replace( size_t pos, size_t num, const STRING& s ) + STRING& tqreplace( size_t pos, size_t num, const STRING& s ) { *this = substr( 0, pos ) + s + substr( pos+num ); return *this; @@ -118,7 +118,7 @@ class STRING { return (lstrcmp(_str, s) == 0); } - size_t find(const STRING& s) const + size_t tqfind(const STRING& s) const { const TCHAR* p = _tcsstr( _str, s._str ); if (p) -- cgit v1.2.1