rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

12 files changed, 73 insertions, 73 deletions

diff --git a/kmplot/TODO b/kmplot/TODO
index 10854f5c..1a9acc22 100644
--- a/kmplot/TODO
+++ b/kmplot/TODO
@@ -5,7 +5,7 @@ TODO
 * Find bugs
 * More functions?
 * In tool menu:
-	* tqfind "nollställen" ( en: where the function's value is 0) 
+	* find "nollställen" ( en: where the function's value is 0) 
 	* get slope for a x-point
 	* Value table
 * Fix the unpolished lines?
diff --git a/kmplot/kmplot/MainDlg.cpp b/kmplot/kmplot/MainDlg.cpp
index 50fdc6d8..f8b6aeb6 100644
--- a/kmplot/kmplot/MainDlg.cpp
+++ b/kmplot/kmplot/MainDlg.cpp
@@ -526,7 +526,7 @@ void MainDlg::slotQuickEdit(const TQString& f_str_const )
 {
 	//creates a valid name for the function if the user has forgotten that
   	TQString f_str( f_str_const );
-	int const pos = f_str_const.tqfind(';');
+	int const pos = f_str_const.find(';');
 	if (pos!=-1)
 	  f_str = f_str.left(pos);
 	if (f_str.at(0)=='r')
@@ -538,7 +538,7 @@ void MainDlg::slotQuickEdit(const TQString& f_str_const )
 		KMessageBox::error( m_parent, i18n("Parametric functions must be definied in the \"New Parametric Plot\"-dialog which you can find in the menubar"));
 		return;
 	}
-	if  ( f_str.tqcontains('y') != 0)
+	if  ( f_str.contains('y') != 0)
 	{
 		KMessageBox::error( m_parent, i18n( "Recursive function is not allowed"));
 		m_quickEdit->setFocus();
diff --git a/kmplot/kmplot/View.cpp b/kmplot/kmplot/View.cpp
index 288a9de6..08acba39 100644
--- a/kmplot/kmplot/View.cpp
+++ b/kmplot/kmplot/View.cpp
@@ -531,7 +531,7 @@ void View::setpi(TQString *s)
 	int i;
 	TQChar c(960);
 
-	while((i=s->tqfind('p')) != -1) s->tqreplace(i, 2, &c, 1);
+	while((i=s->find('p')) != -1) s->replace(i, 2, &c, 1);
 }
 
 
@@ -639,7 +639,7 @@ void View::mouseMoveEvent(TQMouseEvent *e)
 		csflg=0;
 	}
 	
-	if(area.tqcontains(e->pos()) || (e->button()==Qt::LeftButton && e->state()==Qt::LeftButton && csxpos>xmin && csxpos<xmax))
+	if(area.contains(e->pos()) || (e->button()==Qt::LeftButton && e->state()==Qt::LeftButton && csxpos>xmin && csxpos<xmax))
 	{
 		TQPoint ptd, ptl;
 		TQPainter DC;
@@ -887,10 +887,10 @@ void View::mousePressEvent(TQMouseEvent *e)
 						it->setParameter( sw->slider->value() );
 				}
 
-				if ( function_type=='x' &&  fabs(csxpos-m_parser->fkt(it, csxpos))< g && it->fstr.tqcontains('t')==1) //parametric plot
+				if ( function_type=='x' &&  fabs(csxpos-m_parser->fkt(it, csxpos))< g && it->fstr.contains('t')==1) //parametric plot
 				{
 					TQValueVector<Ufkt>::iterator ufkt_y = it+1;
-					if ( fabs(csypos-m_parser->fkt(ufkt_y, csxpos)<g)  && ufkt_y->fstr.tqcontains('t')==1)
+					if ( fabs(csypos-m_parser->fkt(ufkt_y, csxpos)<g)  && ufkt_y->fstr.contains('t')==1)
 					{
 						if ( csmode == -1)
 						{
@@ -942,7 +942,7 @@ void View::mousePressEvent(TQMouseEvent *e)
 					else
 						m_popupmenushown = 2;
 					TQString function = it->fstr;
-					function = function.left(function.tqfind('(')) + '\'';
+					function = function.left(function.find('(')) + '\'';
 					m_popupmenu->changeTitle(10, function);
 					m_popupmenu->exec(TQCursor::pos());
 					return;
@@ -959,7 +959,7 @@ void View::mousePressEvent(TQMouseEvent *e)
 					else
 						m_popupmenushown = 2;
 					TQString function = it->fstr;
-					function = function.left(function.tqfind('(')) + "\'\'";
+					function = function.left(function.find('(')) + "\'\'";
 					m_popupmenu->changeTitle(10, function);
 					m_popupmenu->exec(TQCursor::pos());
 					return;
@@ -1019,7 +1019,7 @@ void View::mousePressEvent(TQMouseEvent *e)
 				csparam = k;
 				m_minmax->selectItem();
 				TQString function = it->fstr;
-				function = function.left(function.tqfind('(')) + '\'';
+				function = function.left(function.find('(')) + '\'';
 				setStatusBar(function,4);
 				mouseMoveEvent(e);
 				return;
@@ -1031,7 +1031,7 @@ void View::mousePressEvent(TQMouseEvent *e)
 				csparam = k;
 				m_minmax->selectItem();
 				TQString function = it->fstr;
-				function = function.left(function.tqfind('(')) + "\'\'";
+				function = function.left(function.find('(')) + "\'\'";
 				setStatusBar(function,4);
 				mouseMoveEvent(e);
 				return;
@@ -1561,14 +1561,14 @@ void View::keyPressEvent( TQKeyEvent * e)
 		case 1:
 			{
 				TQString function = it->fstr;
-				function = function.left(function.tqfind('(')) + '\'';
+				function = function.left(function.find('(')) + '\'';
 				setStatusBar(function,4);
 				break;
 			}
 		case 2:
 			{
 				TQString function = it->fstr;
-				function = function.left(function.tqfind('(')) + "\'\'";
+				function = function.left(function.find('(')) + "\'\'";
 				setStatusBar(function,4);
 				break;
 			}
diff --git a/kmplot/kmplot/editfunction.cpp b/kmplot/kmplot/editfunction.cpp
index daf9fd86..90783191 100644
--- a/kmplot/kmplot/editfunction.cpp
+++ b/kmplot/kmplot/editfunction.cpp
@@ -296,7 +296,7 @@ void EditFunction::accept()
 	tmp_ufkt.f2_linewidth = editderivativespage->lineWidthDerivative2->value();
 	tmp_ufkt.f2_color = editderivativespage->colorDerivative2->color().rgb();
 	
-	if ( f_str.tqcontains('y') != 0 && ( tmp_ufkt.f_mode || tmp_ufkt.f1_mode || tmp_ufkt.f2_mode) )
+	if ( f_str.contains('y') != 0 && ( tmp_ufkt.f_mode || tmp_ufkt.f1_mode || tmp_ufkt.f2_mode) )
 	{
 		KMessageBox::error( this, i18n( "Recursive function is only allowed when drawing integral graphs") );
 		return;
@@ -391,9 +391,9 @@ void EditFunction::slotHelp()
 
 bool EditFunction::functionHas2Arguments()
 {
-	int const openBracket = editfunctionpage->equation->text().tqfind( "(" );
-	int const closeBracket = editfunctionpage->equation->text().tqfind( ")" );
-	return editfunctionpage->equation->text().mid( openBracket+1, closeBracket-openBracket-1 ).tqfind( "," ) != -1;
+	int const openBracket = editfunctionpage->equation->text().find( "(" );
+	int const closeBracket = editfunctionpage->equation->text().find( ")" );
+	return editfunctionpage->equation->text().mid( openBracket+1, closeBracket-openBracket-1 ).find( "," ) != -1;
 }
 void EditFunction::cmdParameter_clicked()
 {
@@ -428,8 +428,8 @@ void EditFunction::customMaxRange_toggled(bool status)
 
 void EditFunction::fixFunctionArguments(TQString &f_str)
 {
-	int const openBracket = f_str.tqfind( "(" );
-	int const closeBracket = f_str.tqfind( ")" );
+	int const openBracket = f_str.find( "(" );
+	int const closeBracket = f_str.find( ")" );
 	char parameter_name;
 	if ( closeBracket-openBracket == 2) //the function atribute is only one character
 	{
diff --git a/kmplot/kmplot/kconstanteditor.cpp b/kmplot/kmplot/kconstanteditor.cpp
index 7fbc4101..59101073 100644
--- a/kmplot/kmplot/kconstanteditor.cpp
+++ b/kmplot/kmplot/kconstanteditor.cpp
@@ -89,7 +89,7 @@ void KConstantEditor::cmdDelete_clicked()
         for( TQValueVector<Ufkt>::iterator it =  m_view->parser()->ufkt.begin(); it !=  m_view->parser()->ufkt.end(); ++it)
 	{
 		str =  it->fstr;
-		for (int i=str.tqfind(')'); (uint)i<str.length();i++)
+		for (int i=str.find(')'); (uint)i<str.length();i++)
 			if ( str.at(i) == constant )
                         {
 			     KMessageBox::error(this, i18n("A function uses this constant; therefore, it cannot be removed."));
@@ -113,7 +113,7 @@ void KConstantEditor::cmdDelete_clicked()
 		}
 	}
 	
-	delete varlist->tqfindItem(TQChar(constant), 0); //removes the item from the constant list
+	delete varlist->findItem(TQChar(constant), 0); //removes the item from the constant list
 }
 
 void KConstantEditor::varlist_clicked( TQListViewItem * item )
@@ -191,7 +191,7 @@ void KConstantEditor::editConstantSlot()
 		return;
 	}
 
-	TQListViewItem *item = varlist->tqfindItem(TQChar(constant), 0);
+	TQListViewItem *item = varlist->findItem(TQChar(constant), 0);
 	if (item!=0)
 		item->setText(1,value);
 	
@@ -199,7 +199,7 @@ void KConstantEditor::editConstantSlot()
         int index = 0;
         for( TQValueVector<Ufkt>::iterator it =  m_view->parser()->ufkt.begin(); it !=  m_view->parser()->ufkt.end(); ++it)
 	{
-		if( it->fstr.tqcontains(constant)!=0 )
+		if( it->fstr.contains(constant)!=0 )
 			m_view->parser()->reparse(index); //reparsing the function
                 ++index;
 	}
diff --git a/kmplot/kmplot/keditparametric.cpp b/kmplot/kmplot/keditparametric.cpp
index 332d93f9..4f133874 100644
--- a/kmplot/kmplot/keditparametric.cpp
+++ b/kmplot/kmplot/keditparametric.cpp
@@ -103,7 +103,7 @@ void KEditParametric::setWidgets()
 
 void KEditParametric::accept()
 {
-	if  ( kLineEditXFunction->text().tqcontains('y') != 0 ||  kLineEditYFunction->text().tqcontains('y') != 0)
+	if  ( kLineEditXFunction->text().contains('y') != 0 ||  kLineEditYFunction->text().contains('y') != 0)
 	{
 		KMessageBox::error( this, i18n( "Recursive function not allowed"));
 		kLineEditXFunction->setFocus();
@@ -116,7 +116,7 @@ void KEditParametric::accept()
 	{
 		TQString fname;
 		m_parser->fixFunctionName(fname, XParser::ParametricX, m_x_id);
-		int const pos = fname.tqfind('(');
+		int const pos = fname.find('(');
 		kLineEditName->setText(fname.mid(1,pos-1));
 	}
 		
@@ -308,7 +308,7 @@ void KEditParametric::splitEquation( const TQString equation, TQString &name, TQ
 {
 	int start = 0;
 	if( equation[ 0 ] == 'x' || equation[ 0 ] == 'y' ) start++;
-	int length = equation.tqfind( '(' ) - start;
+	int length = equation.find( '(' ) - start;
 	name = equation.mid( start, length );
 	
 	expression = equation.section( '=', 1, 1 );
diff --git a/kmplot/kmplot/kminmax.cpp b/kmplot/kmplot/kminmax.cpp
index a67d8f9b..cda39f54 100644
--- a/kmplot/kmplot/kminmax.cpp
+++ b/kmplot/kmplot/kminmax.cpp
@@ -148,7 +148,7 @@ void KMinMax::updateFunctions()
 			if ( it->f1_mode ) //1st derivative
 			{
 				TQString function (it->fstr);
-				int i= function.tqfind('(');
+				int i= function.find('(');
 				function.truncate(i);
 				function +="\'";
 				list->insertItem(function );
@@ -156,7 +156,7 @@ void KMinMax::updateFunctions()
 			if ( it->f2_mode )//2nd derivative
 			{
 				TQString function (it->fstr);
-				int i= function.tqfind('(');
+				int i= function.find('(');
 				function.truncate(i);
 				function +="\'\'";
 				list->insertItem(function );
@@ -164,7 +164,7 @@ void KMinMax::updateFunctions()
 			if ( it->integral_mode )//integral
 			{
 				TQString function (it->fstr);
-				int i= function.tqfind('(');
+				int i= function.find('(');
 				function.truncate(i);
 				function = function.upper();
 				list->insertItem(function );
@@ -177,7 +177,7 @@ void KMinMax::updateFunctions()
 	else
 		cmdFind->setEnabled(true);
 	selectItem();
-	TQListBoxItem *found_item = list->tqfindItem(selected_item,TQt::ExactMatch);
+	TQListBoxItem *found_item = list->findItem(selected_item,TQt::ExactMatch);
 	if ( found_item && m_view->csmode < 0)
 		list->setSelected(found_item,true);
 }
@@ -192,18 +192,18 @@ void KMinMax::selectItem()
 	TQString function = ufkt->fstr;
 	if ( m_view->cstype == 2)
 	{
-		int i= function.tqfind('(');
+		int i= function.find('(');
 		function.truncate(i);
 		function +="\'\'";
 	}
 	else if ( m_view->cstype == 1)
 	{
-		int i= function.tqfind('(');
+		int i= function.find('(');
 		function.truncate(i);
 		function +="\'";
 	}
 	//kdDebug() << "function: " << function << endl;
-	TQListBoxItem *item = list->tqfindItem(function,TQt::ExactMatch);
+	TQListBoxItem *item = list->findItem(function,TQt::ExactMatch);
 	list->setSelected(item,true);
 
 	if (  !ufkt->parameters.isEmpty() )
@@ -258,16 +258,16 @@ void KMinMax::cmdFind_clicked()
 
 	TQString function( list->currentText() );
 	char p_mode = 0;
-	if ( function.tqcontains('\'') == 1)
+	if ( function.contains('\'') == 1)
 	{
 		p_mode = 1;
-		int pos = function.tqfind('\'');
+		int pos = function.find('\'');
 		function.remove(pos,1);
 	}
-	else if ( function.tqcontains('\'') == 2)
+	else if ( function.contains('\'') == 2)
 	{
 		p_mode = 2;
-		int pos = function.tqfind('\'');
+		int pos = function.find('\'');
 		function.remove(pos,2);
 	}
 	else if ( function.at(0).category() == TQChar::Letter_Uppercase)
@@ -352,16 +352,16 @@ void KMinMax::list_highlighted(TQListBoxItem* item)
 	}
 	TQString function( list->currentText() );
 	char p_mode = 0;
-	if ( function.tqcontains('\'') == 1)
+	if ( function.contains('\'') == 1)
 	{
 		p_mode = 1;
-		int pos = function.tqfind('\'');
+		int pos = function.find('\'');
 		function.remove(pos,1);
 	}
-	else if ( function.tqcontains('\'') == 2)
+	else if ( function.contains('\'') == 2)
 	{
 		p_mode = 2;
-		int pos = function.tqfind('\'');
+		int pos = function.find('\'');
 		function.remove(pos,2);
 	}
 	else if ( function.at(0).category() == TQChar::Letter_Uppercase)
@@ -390,16 +390,16 @@ void KMinMax::cmdParameter_clicked()
 {
 	TQString function( list->currentText() );
 	char p_mode = 0;
-	if ( function.tqcontains('\'') == 1)
+	if ( function.contains('\'') == 1)
 	{
 		p_mode = 1;
-		int pos = function.tqfind('\'');
+		int pos = function.find('\'');
 		function.remove(pos,1);
 	}
-	else if ( function.tqcontains('\'') == 2)
+	else if ( function.contains('\'') == 2)
 	{
 		p_mode = 2;
-		int pos = function.tqfind('\'');
+		int pos = function.find('\'');
 		function.remove(pos,2);
 	}
 	else if ( function.at(0).category() == TQChar::Letter_Uppercase)
diff --git a/kmplot/kmplot/kminmax.h b/kmplot/kmplot/kminmax.h
index ac68dd49..718b072a 100644
--- a/kmplot/kmplot/kminmax.h
+++ b/kmplot/kmplot/kminmax.h
@@ -49,7 +49,7 @@ public:
     ~KMinMax();
    
 public slots:
-    /// the user has pressen the tqfind/caluclate/draw button
+    /// the user has pressen the find/caluclate/draw button
     void cmdFind_clicked();
     /// the selecting a function that uses parameter function from a list the user can choose which paramater value he/she wants to use
     void cmdParameter_clicked();
diff --git a/kmplot/kmplot/kmplotio.cpp b/kmplot/kmplot/kmplotio.cpp
index 5b364731..1b195a42 100644
--- a/kmplot/kmplot/kmplotio.cpp
+++ b/kmplot/kmplot/kmplotio.cpp
@@ -435,7 +435,7 @@ void KmPlotIO::parseFunction( XParser *m_parser, const TQDomElement & n )
 	TQString fstr = ufkt.fstr;
 	if ( !fstr.isEmpty() )
 	{
-		int const i = fstr.tqfind( ';' );
+		int const i = fstr.find( ';' );
 		TQString str;
 		if ( i == -1 )
 			str = fstr;
@@ -530,7 +530,7 @@ void KmPlotIO::oldParseFunction(  XParser *m_parser, const TQDomElement & n )
 	}
 	
 	const TQString tmp_fstr = n.namedItem( "equation" ).toElement().text();
-	const int pos = tmp_fstr.tqfind(';');
+	const int pos = tmp_fstr.find(';');
 	if ( pos == -1 )
 	  ufkt.fstr = tmp_fstr;
 	else
@@ -546,7 +546,7 @@ void KmPlotIO::oldParseFunction(  XParser *m_parser, const TQDomElement & n )
 	TQString fstr = ufkt.fstr;
 	if ( !fstr.isEmpty() )
 	{
-		int const i = fstr.tqfind( ';' );
+		int const i = fstr.find( ';' );
 		TQString str;
 		if ( i == -1 )
 			str = fstr;
diff --git a/kmplot/kmplot/kparametereditor.cpp b/kmplot/kmplot/kparametereditor.cpp
index 9e87dda4..719b08d7 100644
--- a/kmplot/kmplot/kparametereditor.cpp
+++ b/kmplot/kmplot/kparametereditor.cpp
@@ -289,7 +289,7 @@ void KParameterEditor::varlist_doubleClicked( TQListBoxItem * )
 
 bool KParameterEditor::checkTwoOfIt(const TQString & text)
 {
-	if ( list->tqfindItem(text,TQt::ExactMatch) == 0)
+	if ( list->findItem(text,TQt::ExactMatch) == 0)
 		return false;
 	else
 		return true;
diff --git a/kmplot/kmplot/parser.cpp b/kmplot/kmplot/parser.cpp
index 9ccf7b5a..e47feaa8 100644
--- a/kmplot/kmplot/parser.cpp
+++ b/kmplot/kmplot/parser.cpp
@@ -190,7 +190,7 @@ double Parser::eval(TQString str)
 	
 	fix_expression(str,0);
         
-	if ( str.tqcontains('y')!=0)
+	if ( str.contains('y')!=0)
 	{
 		err=9;
                 delete []stack;
@@ -347,9 +347,9 @@ int Parser::addfkt(TQString str)
 	stkptr=stack=0;
 	err=0;
 	errpos=1;
-	const int p1=str.tqfind('(');
-	int p2=str.tqfind(',');
-	const int p3=str.tqfind(")=");
+	const int p1=str.find('(');
+	int p2=str.find(',');
+	const int p3=str.find(")=");
         fix_expression(str,p1+4);
         
 	if(p1==-1 || p3==-1 || p1>p3)
@@ -435,9 +435,9 @@ void Parser::reparse(Ufkt *item)
 	err=0;
 	errpos=1;
 
-	const int p1=str.tqfind('(');
-	int p2=str.tqfind(',');
-	const int p3=str.tqfind(")=");
+	const int p1=str.find('(');
+	int p2=str.find(',');
+	const int p3=str.find(")=");
 	
         fix_expression(str,p1+4);
         
@@ -520,7 +520,7 @@ void Parser::fix_expression(TQString &str, int const pos)
                 }
         }
         TQString str_end = str.mid(pos);
-        str_end = str_end.tqreplace(m_decimalsymbol, "."); //replace the locale decimal symbol with a '.'
+        str_end = str_end.replace(m_decimalsymbol, "."); //replace the locale decimal symbol with a '.'
         str.truncate(pos);
         str.append(str_end);
         //kdDebug() << "str:" << str << endl;
@@ -1006,7 +1006,7 @@ int Parser::parserError(bool showMessageBox)
 TQString Parser::number( double value )
 {
        TQString str = TQString::number( value, 'g', 6 );
-       str.tqreplace( 'e', "*10^" );
+       str.replace( 'e', "*10^" );
 //     kDebug() << "returning str="<<str<<endl;
        return str;
 }
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)