From 5173e6fcb16310e130fba4143e334563b4f8460e Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 06:08:18 +0000 Subject: 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 --- src/common.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/common.cpp') diff --git a/src/common.cpp b/src/common.cpp index 4249daf..0a1952e 100644 --- a/src/common.cpp +++ b/src/common.cpp @@ -64,7 +64,7 @@ void ValueMap::load( TQTextStream& ts ) while ( !ts.eof() ) { // until end of file... TQString s = ts.readLine(); // line of text excluding '\n' - int pos = s.tqfind('='); + int pos = s.find('='); if( pos > 0 ) // seems not to have a tag { TQString key = s.left(pos); @@ -79,8 +79,8 @@ void ValueMap::load( const TQString& s ) int pos=0; while ( pos<(int)s.length() ) { // until end of file... - int pos2 = s.tqfind('=', pos); - int pos3 = s.tqfind('\n', pos2 ); + int pos2 = s.find('=', pos); + int pos3 = s.find('\n', pos2 ); if (pos3<0) pos3=s.length(); if( pos2 > 0 ) // seems not to have a tag @@ -115,8 +115,8 @@ TQString safeStringJoin(const TQStringList& sl, char sepChar, char metaChar ) for (i=sl.begin(); i!=sl.end(); ++i) { TQString s = *i; - s.tqreplace(meta, meta+meta); // "\" -> "\\" - s.tqreplace(sep, meta+sep); // "," -> "\," + s.replace(meta, meta+meta); // "\" -> "\\" + s.replace(sep, meta+sep); // "," -> "\," if ( i==sl.begin() ) safeString = s; else @@ -165,14 +165,14 @@ static TQString subSection( const TQString& s, int idx, char sep ) int pos=0; while( idx>0 ) { - pos = s.tqfind( sep, pos ); + pos = s.find( sep, pos ); --idx; if (pos<0) break; ++pos; } if ( pos>=0 ) { - int pos2 = s.tqfind( sep, pos ); + int pos2 = s.find( sep, pos ); if ( pos2>0 ) return s.mid(pos, pos2-pos); else -- cgit v1.2.3