diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
| commit | 5173e6fcb16310e130fba4143e334563b4f8460e (patch) | |
| tree | 52333f9eb0c94f760d4dddc8714671fb50f7b625 /diff_ext_for_kdiff3 | |
| parent | 7b4db4f16d44d4e9aeee241211827558acd64f17 (diff) | |
| download | kdiff3-5173e6fcb16310e130fba4143e334563b4f8460e.tar.gz kdiff3-5173e6fcb16310e130fba4143e334563b4f8460e.zip | |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'diff_ext_for_kdiff3')
| -rwxr-xr-x | diff_ext_for_kdiff3/diff_ext.cpp | 14 | ||||
| -rw-r--r-- | diff_ext_for_kdiff3/diffextstring.h | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/diff_ext_for_kdiff3/diff_ext.cpp b/diff_ext_for_kdiff3/diff_ext.cpp index af877e7..f83f068 100755 --- a/diff_ext_for_kdiff3/diff_ext.cpp +++ b/diff_ext_for_kdiff3/diff_ext.cpp @@ -135,7 +135,7 @@ void readTranslationFile() static tstring getTranslation( const tstring& fallback ) { - std::map< std::wstring, std::wstring >::iterator i = s_translationMap.tqfind( fallback ); + std::map< std::wstring, std::wstring >::iterator i = s_translationMap.find( fallback ); if (i!=s_translationMap.end()) return i->second; return fallback; @@ -153,14 +153,14 @@ static tstring getTranslation( const tstring& fallback ) static void replaceArgs( tstring& s, const tstring& r1, const tstring& r2=TEXT(""), const tstring& r3=TEXT("") ) { tstring arg1 = TEXT("%1"); - size_t pos1 = s.tqfind( arg1 ); + size_t pos1 = s.find( arg1 ); tstring arg2 = TEXT("%2"); - size_t pos2 = s.tqfind( arg2 ); + size_t pos2 = s.find( arg2 ); tstring arg3 = TEXT("%3"); - size_t pos3 = s.tqfind( arg3 ); + size_t pos3 = s.find( arg3 ); if ( pos1 != size_t(-1) ) { - s.tqreplace( pos1, arg1.length(), r1 ); + s.replace( pos1, arg1.length(), r1 ); if ( pos2 != size_t(-1) && pos1<pos2 ) pos2 += r1.length() - arg1.length(); if ( pos3 != size_t(-1) && pos1<pos3 ) @@ -168,13 +168,13 @@ static void replaceArgs( tstring& s, const tstring& r1, const tstring& r2=TEXT(" } if ( pos2 != size_t(-1) ) { - s.tqreplace( pos2, arg2.length(), r2 ); + s.replace( pos2, arg2.length(), r2 ); if ( pos3 != size_t(-1) && pos2<pos3 ) pos3 += r2.length() - arg2.length(); } if ( pos3 != size_t(-1) ) { - s.tqreplace( pos3, arg3.length(), r3 ); + s.replace( pos3, arg3.length(), r3 ); } } diff --git a/diff_ext_for_kdiff3/diffextstring.h b/diff_ext_for_kdiff3/diffextstring.h index 0df947e..132512e 100644 --- a/diff_ext_for_kdiff3/diffextstring.h +++ b/diff_ext_for_kdiff3/diffextstring.h @@ -108,7 +108,7 @@ class STRING { return tmp; } - STRING& tqreplace( size_t pos, size_t num, const STRING& s ) + STRING& replace( 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 tqfind(const STRING& s) const + size_t find(const STRING& s) const { const TCHAR* p = _tcsstr( _str, s._str ); if (p) |