Rename a number of old tq methods that are no longer tq specific

10 files changed, 67 insertions, 67 deletions

diff --git a/microbe/btreebase.cpp b/microbe/btreebase.cpp
index b45f983..02d6b6d 100644
--- a/microbe/btreebase.cpp
+++ b/microbe/btreebase.cpp
@@ -155,7 +155,7 @@ void BTreeBase::pruneTree(BTreeNode *root, bool /*conditionalRoot*/)
 	{
 		
 		// since we can't call compileError from in this class, we have a special way of handling it:
-		// Leave the tqchildren as they are, and set childOp to divbyzero
+		// Leave the children as they are, and set childOp to divbyzero
 		if( t.current()->childOp() == Expression::division )
 		{
 			t.current()->setChildOp(Expression::divbyzero);
diff --git a/microbe/btreenode.cpp b/microbe/btreenode.cpp
index 063dce2..27d49cc 100644
--- a/microbe/btreenode.cpp
+++ b/microbe/btreenode.cpp
@@ -38,7 +38,7 @@ BTreeNode::BTreeNode(BTreeNode *p, BTreeNode *l, BTreeNode *r)
 
 BTreeNode::~BTreeNode()
 {
-	// Must not delete tqchildren as might be unlinking!!! deleteChildren();
+	// Must not delete children as might be unlinking!!! deleteChildren();
 }
 
 void BTreeNode::deleteChildren()
diff --git a/microbe/btreenode.h b/microbe/btreenode.h
index ceed185..ea39050 100644
--- a/microbe/btreenode.h
+++ b/microbe/btreenode.h
@@ -46,7 +46,7 @@ class BTreeNode
 		 */
 // 		void printTree();
 		/**
-		 * Recursively delete all tqchildren of a node.
+		 * Recursively delete all children of a node.
 		 */
 		void deleteChildren();
 		/**
diff --git a/microbe/expression.cpp b/microbe/expression.cpp
index cfa2d95..629a4f2 100644
--- a/microbe/expression.cpp
+++ b/microbe/expression.cpp
@@ -462,7 +462,7 @@ void Expression::buildTree( const TQString & unstrippedExpression, BTreeBase *tr
 void Expression::doUnaryOp(Operation op, BTreeNode *node)
 {
 	/* Note that this isn't for unary operations as such,
-	 rather for things that are operations that have no direct tqchildren,
+	 rather for things that are operations that have no direct children,
 	 e.g. portx.n is high, and functionname(args)*/
 	
 	if ( op == pin || op == notpin )
diff --git a/microbe/instruction.cpp b/microbe/instruction.cpp
index 80a63cc..26332c0 100644
--- a/microbe/instruction.cpp
+++ b/microbe/instruction.cpp
@@ -971,14 +971,14 @@ TQString Code::generateCode( PIC14 * pic ) const
 		uchar reg = pic->gprStart();
 		TQStringList::const_iterator end = variables.end();
 		for ( TQStringList::const_iterator it = variables.begin(); it != end; ++it )
-			code += TQString("%1\tequ\t0x%2\n").tqarg( *it ).tqarg( TQString::number( reg++, 16 ) );
+			code += TQString("%1\tequ\t0x%2\n").arg( *it ).arg( TQString::number( reg++, 16 ) );
 		
 		code += "\n";
 	}
 	
 	TQString picString = pic->minimalTypeString();
-	code += TQString("list p=%1\n").tqarg( picString );
-	code += TQString("include \"p%2.inc\"\n\n").tqarg( picString.lower() );
+	code += TQString("list p=%1\n").arg( picString );
+	code += TQString("include \"p%2.inc\"\n\n").arg( picString.lower() );
 	
 	code += "; Config options\n";
 	code += "  __config _WDT_OFF\n\n";
@@ -1347,7 +1347,7 @@ void Instruction::clearLinks()
 //BEGIN Byte-Oriented File Register Operations
 TQString Instr_addwf::code() const
 {
-	return TQString("addwf\t%1,%2").tqarg( m_file.name() ).tqarg( m_dest );
+	return TQString("addwf\t%1,%2").arg( m_file.name() ).arg( m_dest );
 }
 
 void Instr_addwf::generateLinksAndStates( Code::iterator current )
@@ -1400,7 +1400,7 @@ ProcessorBehaviour Instr_addwf::behaviour() const
 
 TQString Instr_andwf::code() const
 {
-	return TQString("andwf\t%1,%2").tqarg( m_file.name() ).tqarg( m_dest );
+	return TQString("andwf\t%1,%2").arg( m_file.name() ).arg( m_dest );
 }
 
 void Instr_andwf::generateLinksAndStates( Code::iterator current )
@@ -1434,7 +1434,7 @@ ProcessorBehaviour Instr_andwf::behaviour() const
 
 TQString Instr_clrf::code() const
 {
-	return TQString("clrf\t%1").tqarg( m_file.name() );
+	return TQString("clrf\t%1").arg( m_file.name() );
 }
 
 void Instr_clrf::generateLinksAndStates( Code::iterator current )
@@ -1468,7 +1468,7 @@ ProcessorBehaviour Instr_clrf::behaviour() const
 
 TQString Instr_decf::code() const
 {
-	return TQString("decf\t%1,%2").tqarg( m_file.name() ).tqarg( m_dest );
+	return TQString("decf\t%1,%2").arg( m_file.name() ).arg( m_dest );
 }
 
 void Instr_decf::generateLinksAndStates( Code::iterator current )
@@ -1496,7 +1496,7 @@ ProcessorBehaviour Instr_decf::behaviour() const
 
 TQString Instr_decfsz::code() const
 {
-	return TQString("decfsz\t%1,%2").tqarg( m_file.name() ).tqarg( m_dest );
+	return TQString("decfsz\t%1,%2").arg( m_file.name() ).arg( m_dest );
 }
 
 void Instr_decfsz::generateLinksAndStates( Code::iterator current )
@@ -1520,7 +1520,7 @@ ProcessorBehaviour Instr_decfsz::behaviour() const
 
 TQString Instr_incf::code() const
 {
-	return TQString("incf\t%1,%2").tqarg( m_file.name() ).tqarg( m_dest );
+	return TQString("incf\t%1,%2").arg( m_file.name() ).arg( m_dest );
 }
 
 void Instr_incf::generateLinksAndStates( Code::iterator current )
@@ -1550,7 +1550,7 @@ ProcessorBehaviour Instr_incf::behaviour() const
 
 TQString Instr_iorwf::code() const
 {
-	return TQString("iorwf\t%1,%2").tqarg( m_file.name() ).tqarg( m_dest );
+	return TQString("iorwf\t%1,%2").arg( m_file.name() ).arg( m_dest );
 }
 
 void Instr_iorwf::generateLinksAndStates( Code::iterator current )
@@ -1579,7 +1579,7 @@ ProcessorBehaviour Instr_iorwf::behaviour() const
 
 TQString Instr_movf::code() const
 {
-	return TQString("movf\t%1,%2").tqarg( m_file.name() ).tqarg( m_dest );
+	return TQString("movf\t%1,%2").arg( m_file.name() ).arg( m_dest );
 }
 
 void Instr_movf::generateLinksAndStates( Code::iterator current )
@@ -1625,7 +1625,7 @@ ProcessorBehaviour Instr_movf::behaviour() const
 
 TQString Instr_movwf::code() const
 {
-	return TQString("movwf\t%1").tqarg( m_file.name() );
+	return TQString("movwf\t%1").arg( m_file.name() );
 }
 
 void Instr_movwf::generateLinksAndStates( Code::iterator current )
@@ -1655,7 +1655,7 @@ ProcessorBehaviour Instr_movwf::behaviour() const
 
 TQString Instr_rlf::code() const
 {
-	return TQString("rlf\t%1,%2").tqarg( m_file.name() ).tqarg( m_dest );
+	return TQString("rlf\t%1,%2").arg( m_file.name() ).arg( m_dest );
 }
 
 void Instr_rlf::generateLinksAndStates( Code::iterator current )
@@ -1686,7 +1686,7 @@ ProcessorBehaviour Instr_rlf::behaviour() const
 
 TQString Instr_rrf::code() const
 {
-	return TQString("rrf\t%1,%2").tqarg( m_file.name() ).tqarg( m_dest );
+	return TQString("rrf\t%1,%2").arg( m_file.name() ).arg( m_dest );
 }
 
 void Instr_rrf::generateLinksAndStates( Code::iterator current )
@@ -1716,7 +1716,7 @@ ProcessorBehaviour Instr_rrf::behaviour() const
 
 TQString Instr_subwf::code() const
 {
-	return TQString("subwf\t%1,%2").tqarg( m_file.name() ).tqarg( m_dest );
+	return TQString("subwf\t%1,%2").arg( m_file.name() ).arg( m_dest );
 }
 
 void Instr_subwf::generateLinksAndStates( Code::iterator current )
@@ -1774,7 +1774,7 @@ ProcessorBehaviour Instr_subwf::behaviour() const
 
 TQString Instr_swapf::code() const
 {
-	return TQString("swapf\t%1,%2").tqarg( m_file.name() ).tqarg( m_dest );
+	return TQString("swapf\t%1,%2").arg( m_file.name() ).arg( m_dest );
 }
 
 void Instr_swapf::generateLinksAndStates( Code::iterator current )
@@ -1801,7 +1801,7 @@ ProcessorBehaviour Instr_swapf::behaviour() const
 
 TQString Instr_xorwf::code() const
 {
-	return TQString("xorwf\t%1,%2").tqarg( m_file.name() ).tqarg( m_dest );
+	return TQString("xorwf\t%1,%2").arg( m_file.name() ).arg( m_dest );
 }
 
 void Instr_xorwf::generateLinksAndStates( Code::iterator current )
@@ -1833,7 +1833,7 @@ ProcessorBehaviour Instr_xorwf::behaviour() const
 //BEGIN Bit-Oriented File Register Operations
 TQString Instr_bcf::code() const
 {
-	return TQString("bcf\t\t%1,%2").tqarg( m_file.name() ).tqarg( m_bit.name() );
+	return TQString("bcf\t\t%1,%2").arg( m_file.name() ).arg( m_bit.name() );
 }
 
 void Instr_bcf::generateLinksAndStates( Code::iterator current )
@@ -1857,7 +1857,7 @@ ProcessorBehaviour Instr_bcf::behaviour() const
 
 TQString Instr_bsf::code() const
 {
-	return TQString("bsf\t\t%1,%2").tqarg( m_file.name() ).tqarg( m_bit.name() );
+	return TQString("bsf\t\t%1,%2").arg( m_file.name() ).arg( m_bit.name() );
 }
 
 void Instr_bsf::generateLinksAndStates( Code::iterator current )
@@ -1880,7 +1880,7 @@ ProcessorBehaviour Instr_bsf::behaviour() const
 
 TQString Instr_btfsc::code() const
 {
-	return TQString("btfsc\t%1,%2").tqarg( m_file.name() ).tqarg( m_bit.name() );
+	return TQString("btfsc\t%1,%2").arg( m_file.name() ).arg( m_bit.name() );
 }
 
 void Instr_btfsc::generateLinksAndStates( Code::iterator current )
@@ -1907,7 +1907,7 @@ ProcessorBehaviour Instr_btfsc::behaviour() const
 
 TQString Instr_btfss::code() const
 {
-	return TQString("btfss\t%1,%2").tqarg( m_file.name() ).tqarg( m_bit.name() );
+	return TQString("btfss\t%1,%2").arg( m_file.name() ).arg( m_bit.name() );
 }
 
 void Instr_btfss::generateLinksAndStates( Code::iterator current )
@@ -1937,7 +1937,7 @@ ProcessorBehaviour Instr_btfss::behaviour() const
 //BEGIN Literal and Control Operations
 TQString Instr_addlw::code() const
 {
-	return TQString("addlw\t%1").tqarg( m_literal );
+	return TQString("addlw\t%1").arg( m_literal );
 }
 
 void Instr_addlw::generateLinksAndStates( Code::iterator current )
@@ -1964,7 +1964,7 @@ ProcessorBehaviour Instr_addlw::behaviour() const
 
 TQString Instr_andlw::code() const
 {
-	return TQString("andlw\t%1").tqarg( m_literal );
+	return TQString("andlw\t%1").arg( m_literal );
 }
 
 void Instr_andlw::generateLinksAndStates( Code::iterator current )
@@ -1991,7 +1991,7 @@ ProcessorBehaviour Instr_andlw::behaviour() const
 
 TQString Instr_call::code() const
 {
-	return TQString("call\t%1").tqarg( m_label );
+	return TQString("call\t%1").arg( m_label );
 }
 
 void Instr_call::generateLinksAndStates( Code::iterator current )
@@ -2064,7 +2064,7 @@ void Instr_call::linkReturns( Instruction * current, Instruction * returnPoint )
 
 TQString Instr_goto::code() const
 {
-	return TQString("goto\t%1").tqarg( m_label );
+	return TQString("goto\t%1").arg( m_label );
 }
 
 void Instr_goto::generateLinksAndStates( Code::iterator current )
@@ -2085,7 +2085,7 @@ ProcessorBehaviour Instr_goto::behaviour() const
 
 TQString Instr_iorlw::code() const
 {
-	return TQString("iorlw\t%1").tqarg( m_literal );
+	return TQString("iorlw\t%1").arg( m_literal );
 }
 
 void Instr_iorlw::generateLinksAndStates( Code::iterator current )
@@ -2112,7 +2112,7 @@ ProcessorBehaviour Instr_iorlw::behaviour() const
 
 TQString Instr_movlw::code() const
 {	
-	return TQString("movlw\t%1").tqarg( m_literal );
+	return TQString("movlw\t%1").arg( m_literal );
 }
 
 void Instr_movlw::generateLinksAndStates( Code::iterator current )
@@ -2153,7 +2153,7 @@ ProcessorBehaviour Instr_retfie::behaviour() const
 
 TQString Instr_retlw::code() const
 {
-	return TQString("retlw\t%1").tqarg( m_literal );
+	return TQString("retlw\t%1").arg( m_literal );
 }
 
 void Instr_retlw::generateLinksAndStates( Code::iterator current )
@@ -2219,7 +2219,7 @@ ProcessorBehaviour Instr_sleep::behaviour() const
 
 TQString Instr_sublw::code() const
 {
-	return TQString("sublw\t%1").tqarg( m_literal );
+	return TQString("sublw\t%1").arg( m_literal );
 }
 
 void Instr_sublw::generateLinksAndStates( Code::iterator current )
@@ -2264,7 +2264,7 @@ ProcessorBehaviour Instr_sublw::behaviour() const
 
 TQString Instr_xorlw::code() const
 {
-	return TQString("xorlw\t%1").tqarg( m_literal );
+	return TQString("xorlw\t%1").arg( m_literal );
 }
 
 void Instr_xorlw::generateLinksAndStates( Code::iterator current )
diff --git a/microbe/microbe.cpp b/microbe/microbe.cpp
index 3c7dbef..8a01cc1 100644
--- a/microbe/microbe.cpp
+++ b/microbe/microbe.cpp
@@ -56,7 +56,7 @@ Microbe::Microbe()
 	{
 		for ( unsigned col = 0; col < 6; ++col )
 		{
-			m_aliasList[ TQString("Keypad_%1_%2").tqarg(row+1).tqarg(col+1) ] = TQString::number( bv[row][col] );
+			m_aliasList[ TQString("Keypad_%1_%2").arg(row+1).arg(col+1) ] = TQString::number( bv[row][col] );
 		}
 	}
 	
@@ -84,7 +84,7 @@ TQString Microbe::compile( const TQString & url, bool showSource, bool optimize
 	}
 	else
 	{
-		m_errorReport += i18n("Could not open file '%1'\n").tqarg(url);
+		m_errorReport += i18n("Could not open file '%1'\n").arg(url);
 		return 0;
 	}
 	
@@ -216,7 +216,7 @@ void Microbe::compileError( MistakeType type, const TQString & context, const So
 			message = i18n("Unknown statement");
 			break;
 		case InvalidPort:
-			message = i18n("Port '%1' is not supported by target PIC").tqarg(context);
+			message = i18n("Port '%1' is not supported by target PIC").arg(context);
 			break;
 		case UnassignedPin:
 			message = i18n("Pin identifier was not followed by '='");
@@ -225,19 +225,19 @@ void Microbe::compileError( MistakeType type, const TQString & context, const So
 			message = i18n("Pin state can only be 'high' or 'low'");
 			break;
 		case UnassignedPort:
-			message = i18n("Invalid token '%1'. Port identifier should be followed by '='").tqarg(context);
+			message = i18n("Invalid token '%1'. Port identifier should be followed by '='").arg(context);
 			break;
 		case UnexpectedStatementBeforeBracket:
 			message = i18n("Unexpected statement before '{'");
 			break;
 		case MismatchedBrackets:
-			message = i18n("Mismatched brackets in expression '%1'").tqarg(context);
+			message = i18n("Mismatched brackets in expression '%1'").arg(context);
 			break;
 		case InvalidEquals:
 			message = i18n("Invalid '=' found in expression");
 			break;
 		case ReservedKeyword:
-			message = i18n("Reserved keyword '%1' cannot be a variable name.").tqarg(context);
+			message = i18n("Reserved keyword '%1' cannot be a variable name.").arg(context);
 			break;
 		case ConsecutiveOperators:
 			message = i18n("Nothing between operators");
@@ -249,10 +249,10 @@ void Microbe::compileError( MistakeType type, const TQString & context, const So
 			if ( context.isEmpty() )
 				message = i18n("Unknown variable");
 			else
-				message = i18n("Unknown variable '%1'").tqarg(context);
+				message = i18n("Unknown variable '%1'").arg(context);
 			break;
 		case UnopenableInclude:
-			message = i18n("Could not open include file '%1'").tqarg(context);
+			message = i18n("Could not open include file '%1'").arg(context);
 			break;
 		case DivisionByZero:
 			message = i18n("Division by zero");
@@ -267,7 +267,7 @@ void Microbe::compileError( MistakeType type, const TQString & context, const So
 			message = i18n("Delay must be a positive constant value");
 			break;
 		case HighLowExpected:
-			message = i18n("'high' or 'low' expected after pin expression '%1'").tqarg(context);
+			message = i18n("'high' or 'low' expected after pin expression '%1'").arg(context);
 			break;
 		case InvalidComparison:
 			message = i18n("Comparison operator in '%1' is not recognized");
@@ -285,7 +285,7 @@ void Microbe::compileError( MistakeType type, const TQString & context, const So
 			message = i18n("Extra tokens at end of line");
 			break;
 		case FixedStringExpected:
-			message = i18n("Expected '%1'").tqarg(context);
+			message = i18n("Expected '%1'").arg(context);
 			break;
 		case PinListExpected:
 			message = i18n("Pin list expected");
@@ -300,19 +300,19 @@ void Microbe::compileError( MistakeType type, const TQString & context, const So
 			message = i18n("Interrupt already definied");
 			break;
 		case ReadOnlyVariable:
-			message = i18n("Variable '%1' is read only").tqarg(context);
+			message = i18n("Variable '%1' is read only").arg(context);
 			break;
 		case WriteOnlyVariable:
-			message = i18n("Variable '%1' is write only").tqarg(context);
+			message = i18n("Variable '%1' is write only").arg(context);
 			break;
 		case InvalidPinMapSize:
 			message = i18n("Invalid pin list size");
 			break;
 		case VariableRedefined:
-			message = i18n("Variable '%1' is already defined").tqarg(context);
+			message = i18n("Variable '%1' is already defined").arg(context);
 			break;
 		case InvalidVariableName:
-			message = i18n("'%1' is not a valid variable name").tqarg(context);
+			message = i18n("'%1' is not a valid variable name").arg(context);
 			break;
 		case VariableExpected:
 			message = i18n("Variable expected");
@@ -324,10 +324,10 @@ void Microbe::compileError( MistakeType type, const TQString & context, const So
 	
 	
 	m_errorReport += TQString("%1:%2:Error [%3] %4\n")
-			.tqarg( sourceLine.url() )
-			.tqarg( sourceLine.line()+1 )
-			.tqarg( type )
-			.tqarg( message );
+			.arg( sourceLine.url() )
+			.arg( sourceLine.line()+1 )
+			.arg( type )
+			.arg( message );
 }
 
 
@@ -418,7 +418,7 @@ bool Microbe::isInterruptUsed( const TQString & interruptName )
 
 TQString Microbe::dest() const
 {
-	return TQString("__op%1").tqarg(m_dest);
+	return TQString("__op%1").arg(m_dest);
 }
 
 
diff --git a/microbe/microbe.h b/microbe/microbe.h
index c97417a..59d0bb9 100644
--- a/microbe/microbe.h
+++ b/microbe/microbe.h
@@ -156,7 +156,7 @@ class Microbe
 		/**
 		 * This is for generating unique numbers for computer generated labels.
 		 */
-		TQString uniqueLabel() { return TQString("__%1").tqarg(m_uniqueLabel++); }
+		TQString uniqueLabel() { return TQString("__%1").arg(m_uniqueLabel++); }
 		/**
 		 * If alias is an alias for something then it returns that something,
 		 * otherwise it just returns alias (which in that case is not an alias!)
diff --git a/microbe/parser.cpp b/microbe/parser.cpp
index 0e5545d..9505f58 100644
--- a/microbe/parser.cpp
+++ b/microbe/parser.cpp
@@ -212,7 +212,7 @@ Code * Parser::parse( const SourceLineList & lines )
 		OutputFieldMap fieldMap;
 		
 		if ( (*sit).content.line() >= 0 )
-			m_code->append( new Instr_sourceCode( TQString("#MSRC\t%1; %2\t%3").tqarg( (*sit).content.line() + 1 ).tqarg( (*sit).content.url() ).tqarg( (*sit).content.text() ) ));
+			m_code->append( new Instr_sourceCode( TQString("#MSRC\t%1; %2\t%3").arg( (*sit).content.line() + 1 ).arg( (*sit).content.url() ).arg( (*sit).content.text() ) ));
 		bool showBracesInSource = (*sit).hasBracedCode();
 		if ( showBracesInSource )
 			m_code->append(new Instr_sourceCode("{"));
diff --git a/microbe/pic14.cpp b/microbe/pic14.cpp
index c9dcf24..fc92932 100644
--- a/microbe/pic14.cpp
+++ b/microbe/pic14.cpp
@@ -70,7 +70,7 @@ PortPin PIC14::toPortPin( const TQString & portPinString )
 	// In form e.g. RB3
 	if ( portPinString.length() == 3 )
 	{
-		port = TQString("PORT%1").tqarg( portPinString[1].upper() );
+		port = TQString("PORT%1").arg( portPinString[1].upper() );
 		pin = TQString( portPinString[2] ).toInt();
 	}
 	else
@@ -135,7 +135,7 @@ PIC14::Type PIC14::toType( const TQString & _text )
 	if ( text == "16F628" )
 		return P16F628;
 	
-	cerr << TQString("%1 is not a known PIC identifier\n").tqarg(_text);
+	cerr << TQString("%1 is not a known PIC identifier\n").arg(_text);
 	return unknown;
 }
 
@@ -897,7 +897,7 @@ void PIC14::SsevenSegment( const Variable & pinMap )
 	assert( pinMap.type() == Variable::sevenSegmentType );
 	assert( pinMap.portPinList().size() == 7 );
 	
-	TQString subName = TQString("__output_seven_segment_%1").tqarg( pinMap.name() );
+	TQString subName = TQString("__output_seven_segment_%1").arg( pinMap.name() );
 	
 	m_pCode->append( new Instr_call( subName ) );
 	
@@ -967,7 +967,7 @@ void PIC14::SsevenSegment( const Variable & pinMap )
 		if ( !portOutput[port].used )
 			continue;
 		
-		TQString portName = TQString("PORT%1").tqarg( char('A'+port) );
+		TQString portName = TQString("PORT%1").arg( char('A'+port) );
 		
 		// Save the current value of the port pins that we should not be writing to
 		m_pCode->append( new Instr_movf( portName, 0 ), Code::Subroutine );
@@ -977,7 +977,7 @@ void PIC14::SsevenSegment( const Variable & pinMap )
 		if ( overwrittenW )
 			m_pCode->append( new Instr_movf("__i",0), Code::Subroutine );
 		
-		m_pCode->append( new Instr_call( subName + TQString("_lookup_%1").tqarg(port) ), Code::Subroutine );
+		m_pCode->append( new Instr_call( subName + TQString("_lookup_%1").arg(port) ), Code::Subroutine );
 		overwrittenW = true;
 		
 		// Restore the state of the pins which aren't used
@@ -996,7 +996,7 @@ void PIC14::SsevenSegment( const Variable & pinMap )
 		if ( !portOutput[port].used )
 			continue;
 		
-		m_pCode->queueLabel( subName + TQString("_lookup_%1").tqarg(port), Code::LookupTable );
+		m_pCode->queueLabel( subName + TQString("_lookup_%1").arg(port), Code::LookupTable );
 		m_pCode->append( new Instr_andlw(15), Code::LookupTable );
 	
 		// Generate the lookup table
@@ -1020,9 +1020,9 @@ void PIC14::Skeypad( const Variable & pinMap )
 	assert( pinMap.type() == Variable::keypadType );
 	assert( pinMap.portPinList().size() >= 7 ); // 4 rows, at least 3 columns
 	
-	TQString subName = TQString("__wait_read_keypad_%1").tqarg( pinMap.name() );
-	TQString waitName = TQString("__wait_keypad_%1").tqarg( pinMap.name() );
-	TQString readName = TQString("__read_keypad_%1").tqarg( pinMap.name() );
+	TQString subName = TQString("__wait_read_keypad_%1").arg( pinMap.name() );
+	TQString waitName = TQString("__wait_keypad_%1").arg( pinMap.name() );
+	TQString readName = TQString("__read_keypad_%1").arg( pinMap.name() );
 	
 	m_pCode->append( new Instr_call( subName ) );
 	
@@ -1084,7 +1084,7 @@ void PIC14::Skeypad( const Variable & pinMap )
 		{
 			PortPin colPin = pinMap.portPinList()[4+col];
 			m_pCode->append( new Instr_btfsc( colPin.port(), TQString::number( colPin.pin() ) ), Code::Subroutine );
-			m_pCode->append( new Instr_retlw( mb->alias( TQString("Keypad_%1_%2").tqarg(row+1).tqarg(col+1) ).toInt( 0, 0 ) ), Code::Subroutine );
+			m_pCode->append( new Instr_retlw( mb->alias( TQString("Keypad_%1_%2").arg(row+1).arg(col+1) ).toInt( 0, 0 ) ), Code::Subroutine );
 		}
 		
 		// Make the low again
diff --git a/microbe/traverser.cpp b/microbe/traverser.cpp
index eb6a924..e066381 100644
--- a/microbe/traverser.cpp
+++ b/microbe/traverser.cpp
@@ -34,8 +34,8 @@ Traverser::~Traverser()
 BTreeNode * Traverser::start()
 {
 	/* To find the start we will iterate, or possibly recurse
-	down the tree, each time turning down the node that has tqchildren,
-	if they both have no tqchildren we have reached the end and it shouldn't
+	down the tree, each time turning down the node that has children,
+	if they both have no children we have reached the end and it shouldn't
 	really matter which we pick (check this algorithm) */
 	
 	BTreeNode *n = m_root;