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

1 files changed, 15 insertions, 15 deletions

diff --git a/src/electronics/gpsimprocessor.cpp b/src/electronics/gpsimprocessor.cpp
index efa3d88..704aacf 100644
--- a/src/electronics/gpsimprocessor.cpp
+++ b/src/electronics/gpsimprocessor.cpp
@@ -62,7 +62,7 @@ function will remove the duplicated directory path (by searching for a "//").
 */
 TQString sanitizeGpsimFile( TQString file )
 {
-	int pos = file.tqfind("//");
+	int pos = file.find("//");
 	if ( pos != -1 )
 	{
 		file.remove( 0, pos + 1 );
@@ -304,7 +304,7 @@ GpsimProcessor::ProgramFileValidity GpsimProcessor::isValidProgramFile( const TQ
 	if ( !KStandardDirs::exists(programFile) )
 		return DoesntExist;
 	
-	TQString extension = programFile.right( programFile.length() - programFile.tqfindRev('.') - 1 ).lower();
+	TQString extension = programFile.right( programFile.length() - programFile.findRev('.') - 1 ).lower();
 	
 	if ( extension == "flowcode" ||
 			extension == "asm" ||
@@ -313,7 +313,7 @@ GpsimProcessor::ProgramFileValidity GpsimProcessor::isValidProgramFile( const TQ
 	   		extension == "c" )
 		return Valid;
 	
-	if ( extension == "hex" && TQFile::exists( TQString(programFile).tqreplace(".hex",".cod") ) )
+	if ( extension == "hex" && TQFile::exists( TQString(programFile).replace(".hex",".cod") ) )
 		return Valid;
 	
 	return IncorrectType;
@@ -325,7 +325,7 @@ TQString GpsimProcessor::generateSymbolFile( const TQString &fileName, TQObject
 	if ( !isValidProgramFile(fileName) )
 		return TQString();
 	
-	TQString extension = fileName.right( fileName.length() - fileName.tqfindRev('.') - 1 ).lower();
+	TQString extension = fileName.right( fileName.length() - fileName.findRev('.') - 1 ).lower();
 	
 	if ( extension == "cod" )
 	{
@@ -336,13 +336,13 @@ TQString GpsimProcessor::generateSymbolFile( const TQString &fileName, TQObject
 	{
 		TQTimer::singleShot( 0, receiver, successMember );
 		// We've already checked for the existance of the ".cod" file in GpsimProcessor::isValidProgramFile
-		return TQString(fileName).tqreplace(".hex",".cod");
+		return TQString(fileName).replace(".hex",".cod");
 	}
 	
 	else if ( extension == "basic" || extension == "microbe" )
 	{
 		compileMicrobe( fileName, receiver, successMember, failMember );
-		return TQString(fileName).tqreplace( "."+extension, ".cod" );
+		return TQString(fileName).replace( "."+extension, ".cod" );
 	}
 	else if ( extension == "flowcode" )
 	{
@@ -364,13 +364,13 @@ TQString GpsimProcessor::generateSymbolFile( const TQString &fileName, TQObject
 				connect( pc, TQT_SIGNAL(failed()), receiver, failMember );
 		}
 		
-		return TQString(hexFile).tqreplace( ".hex", ".cod" );
+		return TQString(hexFile).replace( ".hex", ".cod" );
 	}
 	else if ( extension == "asm" )
 	{
 		ProcessOptions o;
 		o.b_addToProject = false;
-		o.setTargetFile( TQString(fileName).tqreplace(".asm",".hex"));
+		o.setTargetFile( TQString(fileName).replace(".asm",".hex"));
 		o.setInputFiles(fileName);
 		o.setMethod( ProcessOptions::Method::Forget );
 		o.setProcessPath( ProcessOptions::ProcessPath::path( ProcessOptions::guessMediaType(fileName), ProcessOptions::ProcessPath::Program ) );
@@ -384,13 +384,13 @@ TQString GpsimProcessor::generateSymbolFile( const TQString &fileName, TQObject
 				connect( pc, TQT_SIGNAL(failed()), receiver, failMember );
 		}
 		
-		return TQString(fileName).tqreplace(".asm",".cod");
+		return TQString(fileName).replace(".asm",".cod");
 	}
 	else if ( extension == "c" )
 	{
 		ProcessOptions o;
 		o.b_addToProject = false;
-		o.setTargetFile( TQString(fileName).tqreplace(".c",".hex"));
+		o.setTargetFile( TQString(fileName).replace(".c",".hex"));
 		o.setInputFiles(fileName);
 		o.setMethod( ProcessOptions::Method::Forget );
 		o.setProcessPath( ProcessOptions::ProcessPath::C_Program );
@@ -404,7 +404,7 @@ TQString GpsimProcessor::generateSymbolFile( const TQString &fileName, TQObject
 				connect( pc, TQT_SIGNAL(failed()), receiver, failMember );
 		}
 		
-		return TQString(fileName).tqreplace(".c",".cod");
+		return TQString(fileName).replace(".c",".cod");
 	}
 	
 	if ( failMember )
@@ -417,7 +417,7 @@ void GpsimProcessor::compileMicrobe( const TQString &filename, TQObject *receive
 {
 	ProcessOptions o;
 	o.b_addToProject = false;
-	o.setTargetFile( TQString(filename).tqreplace(".microbe",".hex") );
+	o.setTargetFile( TQString(filename).replace(".microbe",".hex") );
 	o.setInputFiles(filename);
 	o.setMethod( ProcessOptions::Method::Forget );
 	o.setProcessPath( ProcessOptions::ProcessPath::Microbe_Program );
@@ -506,7 +506,7 @@ void GpsimDebugger::associateLine( const TQString & sourceFile, int sourceLine,
 	SourceLine hllSource = SourceLine( sourceFile, sourceLine );
 	SourceLine asmSource = SourceLine( assemblyFile, assemblyLine );
 	
-	if ( m_sourceLineMap.tqcontains(asmSource) )
+	if ( m_sourceLineMap.contains(asmSource) )
 	{
 		kdWarning() << k_funcinfo << "Already have an association for assembly (\""<<assemblyFile<<"\","<<assemblyLine<<")"<<endl;
 		return;
@@ -600,7 +600,7 @@ void GpsimDebugger::setBreakpoints( const TQString & path, const IntList & lines
 		if ( !dl || dl->fileName() != path )
 			continue;
 		
-		dl->setBreakpoint( lines.tqcontains( dl->line() ) );
+		dl->setBreakpoint( lines.contains( dl->line() ) );
 	}
 }
 
@@ -758,7 +758,7 @@ RegisterInfo * RegisterSet::fromAddress( unsigned address )
 RegisterInfo * RegisterSet::fromName( const TQString & name )
 {
 	// First try the name as case sensitive, then as case insensitive.
-	if ( m_nameToRegisterMap.tqcontains( name ) )
+	if ( m_nameToRegisterMap.contains( name ) )
 		return m_nameToRegisterMap[ name ];
 	
 	TQString nameLower = name.lower();