From e05894553004a47b1e2f276bedcf5963b57a3932 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
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/ktechlab@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 microbe/expression.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'microbe/expression.cpp')

diff --git a/microbe/expression.cpp b/microbe/expression.cpp
index 33a70f2..cfa2d95 100644
--- a/microbe/expression.cpp
+++ b/microbe/expression.cpp
@@ -493,12 +493,12 @@ void Expression::compileExpression( const TQString & expression )
 
 void Expression::compileConditional( const TQString & expression, Code * ifCode, Code * elseCode )
 {
-	if( expression.tqcontains(TQRegExp("=>|=<|=!")) )
+	if( expression.contains(TQRegExp("=>|=<|=!")) )
 	{
 		mistake( Microbe::InvalidComparison, expression );
 		return;
 	}
-	if( expression.tqcontains(TQRegExp("[^=><!][=][^=]")))
+	if( expression.contains(TQRegExp("[^=><!][=][^=]")))
 	{
 		mistake( Microbe::InvalidEquals );
 		return;
@@ -716,7 +716,7 @@ void Expression::expressionValue( TQString expr, BTreeBase */*tree*/, BTreeNode
 	}
 	
 	// Check for the most common mistake ever!
-	if(expr.tqcontains("="))
+	if(expr.contains("="))
 		mistake( Microbe::InvalidEquals );
 	// Check for reserved keywords
 	if(expr=="to"||expr=="step"||expr=="then")
@@ -726,7 +726,7 @@ void Expression::expressionValue( TQString expr, BTreeBase */*tree*/, BTreeNode
 	// both indicating a Mistake.
 	if(expr.isEmpty())
 		mistake( Microbe::ConsecutiveOperators );
-	else if(expr.tqcontains(TQRegExp("\\s")) && t!= extpin)
+	else if(expr.contains(TQRegExp("\\s")) && t!= extpin)
 		mistake( Microbe::MissingOperator );
 	
 	if( t == variable && !mb->isVariableKnown(expr) && !m_pic->isValidPort( expr ) && !m_pic->isValidTris( expr ) )
@@ -750,11 +750,11 @@ void Expression::expressionValue( TQString expr, BTreeBase */*tree*/, BTreeNode
 	if( t == extpin )
 	{
 		bool NOT;
-		int i = expr.tqfind("is");
+		int i = expr.find("is");
 		if(i > 0)
 		{
-			NOT = expr.tqcontains("low");
-			if(!expr.tqcontains("high") && !expr.tqcontains("low"))
+			NOT = expr.contains("low");
+			if(!expr.contains("high") && !expr.contains("low"))
 				mistake( Microbe::HighLowExpected, expr );
 			expr = expr.left(i-1);
 		}
@@ -796,7 +796,7 @@ ExprType Expression::expressionType( const TQString & expression )
 	if ( value != -1 )
 		return number;
 	
-	if( expression.tqcontains('.') )
+	if( expression.contains('.') )
 		return extpin;
 	
 	if ( mb->variable( expression ).type() == Variable::keypadType )
-- 
cgit v1.2.1