diff options
Diffstat (limited to 'kmplot/kmplot/xparser.cpp')
| -rw-r--r-- | kmplot/kmplot/xparser.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/kmplot/kmplot/xparser.cpp b/kmplot/kmplot/xparser.cpp index 6e1204fa..b5d03918 100644 --- a/kmplot/kmplot/xparser.cpp +++ b/kmplot/kmplot/xparser.cpp @@ -50,13 +50,13 @@ bool XParser::getext( Ufkt *item, const TQString fstr ) int p1, p2, p3, pe; TQString tstr; pe = fstr.length(); - if ( fstr.tqfind( 'N' ) != -1 ) + if ( fstr.find( 'N' ) != -1 ) item->f_mode = false; else { - if ( fstr.tqfind( "A1" ) != -1 ) + if ( fstr.find( "A1" ) != -1 ) item->f1_mode = true; - if ( fstr.tqfind( "A2" ) != -1 ) + if ( fstr.find( "A2" ) != -1 ) item->f2_mode = true; } switch ( fstr[0].latin1() ) @@ -67,13 +67,13 @@ bool XParser::getext( Ufkt *item, const TQString fstr ) item->f1_mode = item->f2_mode = false; } - p1 = fstr.tqfind( "D[" ); + p1 = fstr.find( "D[" ); if ( p1 != -1 ) { p1 += 2; const TQString str = fstr.mid( p1, pe - p1); - p2 = str.tqfind(','); - p3 = str.tqfind(']'); + p2 = str.find(','); + p3 = str.find(']'); if ( p2 > 0 && p2 < p3 ) { tstr = str.left( p2 ); @@ -90,16 +90,16 @@ bool XParser::getext( Ufkt *item, const TQString fstr ) else errflg = true; } - p1 = fstr.tqfind( "P[" ); + p1 = fstr.find( "P[" ); if ( p1 != -1 ) { int i = 0; p1 += 2; TQString str = fstr.mid( p1, 1000); - p3 = str.tqfind( ']' ); + p3 = str.find( ']' ); do { - p2 = str.tqfind( ',' ); + p2 = str.find( ',' ); if ( p2 == -1 || p2 > p3 ) p2 = p3; tstr = str.left( p2++ ); @@ -179,8 +179,8 @@ void XParser::fixFunctionName( TQString &str, int const type, int const id) str.prepend( function_name ); } - int p1=str.tqfind('('); - int p2=str.tqfind(')'); + int p1=str.find('('); + int p2=str.find(')'); if( p1>=0 && str.at(p2+1)=='=') { if ( type == XParser::Polar && str.at(0)!='r' ) @@ -641,14 +641,14 @@ bool XParser::functionRemoveParameter(const TQString &remove_parameter, uint id) int XParser::addFunction(const TQString &f_str) { TQString added_function(f_str); - int const pos = added_function.tqfind(';'); + int const pos = added_function.find(';'); if (pos!=-1) added_function = added_function.left(pos); fixFunctionName(added_function); if ( added_function.at(0)== 'x' || added_function.at(0)== 'y') //TODO: Make it possible to define parametric functions return -1; - if ( added_function.tqcontains('y') != 0) + if ( added_function.contains('y') != 0) return -1; int const id = addfkt( added_function ); if (id==-1) @@ -745,7 +745,7 @@ bool XParser::setFunctionExpression(const TQString &f_str, uint id) return false; Ufkt *tmp_ufkt = &ufkt[ix]; TQString const old_fstr = tmp_ufkt->fstr; - TQString const fstr_begin = tmp_ufkt->fstr.left(tmp_ufkt->fstr.tqfind('=')+1); + TQString const fstr_begin = tmp_ufkt->fstr.left(tmp_ufkt->fstr.find('=')+1); tmp_ufkt->fstr = fstr_begin+f_str; reparse(tmp_ufkt); if ( parserError(false) != 0) |