TQt4 port ktechlab

This enables compilation under both Qt3 and Qt4


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

1 files changed, 90 insertions, 90 deletions

diff --git a/microbe/pic14.cpp b/microbe/pic14.cpp
index 7785afb..548d4de 100644
--- a/microbe/pic14.cpp
+++ b/microbe/pic14.cpp
@@ -62,20 +62,20 @@ PIC14::~PIC14()
 {
 }
 
-PortPin PIC14::toPortPin( const QString & portPinString )
+PortPin PIC14::toPortPin( const TQString & portPinString )
 {
-	QString port;
+	TQString port;
 	int pin = -1;
 	
 	// In form e.g. RB3
 	if ( portPinString.length() == 3 )
 	{
-		port = QString("PORT%1").arg( portPinString[1].upper() );
-		pin = QString( portPinString[2] ).toInt();
+		port = TQString("PORT%1").tqarg( portPinString[1].upper() );
+		pin = TQString( portPinString[2] ).toInt();
 	}
 	else
 	{
-		int dotpos = portPinString.find(".");
+		int dotpos = portPinString.tqfind(".");
 		if ( dotpos == -1 )
 			return PortPin();
 		
@@ -119,9 +119,9 @@ uchar PIC14::gprStart() const
 }
 
 
-PIC14::Type PIC14::toType( const QString & _text )
+PIC14::Type PIC14::toType( const TQString & _text )
 {
-	QString text = _text.upper().simplifyWhiteSpace().remove('P');
+	TQString text = _text.upper().simplifyWhiteSpace().remove('P');
 	
 	if ( text == "16C84" )
 		return P16C84;
@@ -135,12 +135,12 @@ PIC14::Type PIC14::toType( const QString & _text )
 	if ( text == "16F628" )
 		return P16F628;
 	
-	cerr << QString("%1 is not a known PIC identifier\n").arg(_text);
+	cerr << TQString("%1 is not a known PIC identifier\n").tqarg(_text);
 	return unknown;
 }
 
 
-QString PIC14::minimalTypeString() const
+TQString PIC14::minimalTypeString() const
 {
 	switch ( m_type )
 	{
@@ -165,7 +165,7 @@ QString PIC14::minimalTypeString() const
 }
 
 
-void PIC14::postCompileConstruct( const QStringList &interrupts )
+void PIC14::postCompileConstruct( const TQStringList &interrupts )
 {
 	m_pCode->append( new Instr_raw("\n\tEND\n"), Code::Subroutine );
 	
@@ -203,11 +203,11 @@ void PIC14::postCompileConstruct( const QStringList &interrupts )
 	m_pCode->append(new Instr_swapf("STATUS",0), Code::InterruptHandler);
 	m_pCode->append(new Instr_movwf("STATUS_TEMP"), Code::InterruptHandler);
 	
-	QStringList::ConstIterator interruptsEnd = interrupts.end();
-	for( QStringList::ConstIterator it = interrupts.begin(); it != interruptsEnd; ++it )
+	TQStringList::ConstIterator interruptsEnd = interrupts.end();
+	for( TQStringList::ConstIterator it = interrupts.begin(); it != interruptsEnd; ++it )
 	{
 		// Is the interrupt's flag bit set?
-		m_pCode->append(new Instr_btfsc("INTCON",QString::number(interruptNameToBit((*it), true))), Code::InterruptHandler);
+		m_pCode->append(new Instr_btfsc("INTCON",TQString::number(interruptNameToBit((*it), true))), Code::InterruptHandler);
 		m_pCode->append(new Instr_goto("_interrupt_" + (*it)), Code::InterruptHandler); // Yes, do its handler routine
 		// Otherwise fall through to the next.
 	}
@@ -225,7 +225,7 @@ void PIC14::postCompileConstruct( const QStringList &interrupts )
 	m_pCode->queueLabel( "_start", Code::LookupTable );
 }
 
-int PIC14::interruptNameToBit(const QString &name, bool flag)
+int PIC14::interruptNameToBit(const TQString &name, bool flag)
 {
 	// 7 --- GIE EEIE T0IE INTE RBIE T0IF INTF RBIF --- 0
 
@@ -249,7 +249,7 @@ int PIC14::interruptNameToBit(const QString &name, bool flag)
 }
 
 
-bool PIC14::isValidPort( const QString & portName ) const
+bool PIC14::isValidPort( const TQString & portName ) const
 {
 	return ( portName == "PORTA" || portName == "porta" ||
 			 portName == "PORTB" || portName == "portb" );
@@ -268,14 +268,14 @@ bool PIC14::isValidPortPin( const PortPin & portPin ) const
 }
 
 
-bool PIC14::isValidTris( const QString & trisName ) const
+bool PIC14::isValidTris( const TQString & trisName ) const
 {
 	return ( trisName == "TRISA" || trisName == "trisa" ||
 			 trisName == "TRISB" || trisName == "trisb" );
 }
 
 
-bool PIC14::isValidInterrupt( const QString & interruptName ) const
+bool PIC14::isValidInterrupt( const TQString & interruptName ) const
 {
 	if(m_type == "P16F84" || m_type =="P16C84")
 	{
@@ -293,12 +293,12 @@ void PIC14::setConditionalCode( Code * ifCode, Code * elseCode )
 	m_elseCode = elseCode;
 }
 
-void PIC14::Sgoto(const QString &label)
+void PIC14::Sgoto(const TQString &label)
 {
 	m_pCode->append( new Instr_goto(label) );
 }
 
-void PIC14::Slabel(const QString &label)
+void PIC14::Slabel(const TQString &label)
 {
 // 	std::cout << k_funcinfo << "label="<<label<<'\n';
 	m_pCode->queueLabel( label, Code::Middle );
@@ -309,26 +309,26 @@ void PIC14::Send()
 	m_pCode->append( new Instr_sleep() );
 }
 
-void PIC14::Ssubroutine( const QString &procName, Code * subCode )
+void PIC14::Ssubroutine( const TQString &procName, Code * subCode )
 {
 	m_pCode->queueLabel( procName, Code::Subroutine );
 	m_pCode->merge( subCode, Code::Subroutine );
 	m_pCode->append( new Instr_return(), Code::Subroutine );
 }
 
-void PIC14::Sinterrupt( const QString &procName, Code * subCode )
+void PIC14::Sinterrupt( const TQString &procName, Code * subCode )
 {
 	m_pCode->queueLabel( "_interrupt_" + procName, Code::Subroutine );
 	
 	// Clear the interrupt flag for this particular interrupt source
-	m_pCode->append( new Instr_bcf("INTCON",QString::number(interruptNameToBit(procName,true))) );
+	m_pCode->append( new Instr_bcf("INTCON",TQString::number(interruptNameToBit(procName,true))) );
 	m_pCode->merge( subCode, Code::Subroutine );
 	
 	m_pCode->append( new Instr_goto("_interrupt_end"), Code::Subroutine );
 }
 
 
-void PIC14::Scall(const QString &name)
+void PIC14::Scall(const TQString &name)
 {
 	m_pCode->append( new Instr_call(name) );
 }
@@ -337,17 +337,17 @@ void PIC14::Scall(const QString &name)
 void PIC14::Ssetlh( const PortPin & portPin, bool high)
 {
 	if(high)
-		m_pCode->append( new Instr_bsf( portPin.port(),QString::number(portPin.pin()) ) );
+		m_pCode->append( new Instr_bsf( portPin.port(),TQString::number(portPin.pin()) ) );
 	else
-		m_pCode->append( new Instr_bcf( portPin.port(), QString::number(portPin.pin()) ) );
+		m_pCode->append( new Instr_bcf( portPin.port(), TQString::number(portPin.pin()) ) );
 }
 
-void PIC14::rearrangeOpArguments( QString * val1, QString * val2, LocationType * val1Type, LocationType * val2Type)
+void PIC14::rearrangeOpArguments( TQString * val1, TQString * val2, LocationType * val1Type, LocationType * val2Type)
 {
 	if( *val2Type == work && *val1Type != work )
 	{
 		LocationType tempType = *val2Type;
-		QString tempVal = *val2;
+		TQString tempVal = *val2;
 		
 		*val2Type = *val1Type;
 		*val2 = *val1;
@@ -357,7 +357,7 @@ void PIC14::rearrangeOpArguments( QString * val1, QString * val2, LocationType *
 	}
 }
 
-void PIC14::add( QString val1, QString val2, LocationType val1Type, LocationType val2Type )
+void PIC14::add( TQString val1, TQString val2, LocationType val1Type, LocationType val2Type )
 {
 	rearrangeOpArguments( &val1, &val2, &val1Type, &val2Type );
 
@@ -376,7 +376,7 @@ void PIC14::add( QString val1, QString val2, LocationType val1Type, LocationType
 	}
 }
 
-void PIC14::subtract( const QString & val1, const QString & val2, LocationType val1Type, LocationType val2Type )
+void PIC14::subtract( const TQString & val1, const TQString & val2, LocationType val1Type, LocationType val2Type )
 {
 	switch(val2Type)
 	{
@@ -392,27 +392,27 @@ void PIC14::subtract( const QString & val1, const QString & val2, LocationType v
 	}
 }
 
-void PIC14::assignNum(const QString & val)
+void PIC14::assignNum(const TQString & val)
 {
 	m_pCode->append(new Instr_movlw(val.toInt( 0, 0 )));
 }
 
-void PIC14::assignVar(const QString &val)
+void PIC14::assignVar(const TQString &val)
 {
 	m_pCode->append(new Instr_movf(val,0));
 }
 
-void PIC14::saveToReg(const QString &dest)
+void PIC14::saveToReg(const TQString &dest)
 {
 	m_pCode->append(new Instr_movwf(dest));
 }
 
-void PIC14::saveResultToVar( const QString & var )
+void PIC14::saveResultToVar( const TQString & var )
 {
 	m_pCode->append( new Instr_movwf( var ) );
 }
 
-void PIC14::mul(QString val1, QString val2, LocationType val1Type, LocationType val2Type)
+void PIC14::mul(TQString val1, TQString val2, LocationType val1Type, LocationType val2Type)
 {
 	multiply();
 	
@@ -465,7 +465,7 @@ void PIC14::multiply()
 }
 
 
-void PIC14::div( const QString & val1, const QString & val2, LocationType val1Type, LocationType val2Type)
+void PIC14::div( const TQString & val1, const TQString & val2, LocationType val1Type, LocationType val2Type)
 {
 	divide();
 	
@@ -549,7 +549,7 @@ Code * PIC14::elseCode()
 }
 
 
-void PIC14::ifInitCode( const QString &val1, const QString &val2, LocationType val1Type, LocationType val2Type )
+void PIC14::ifInitCode( const TQString &val1, const TQString &val2, LocationType val1Type, LocationType val2Type )
 {
 	// NOO - "x < 2" is NOT the same as "2 < x"
 // 	rearrangeOpArguments( val1, val2, val1Type, val2Type );
@@ -584,11 +584,11 @@ void PIC14::ifInitCode( const QString &val1, const QString &val2, LocationType v
 	}
 }
 
-void PIC14::equal( const QString &val1, const QString &val2, LocationType val1Type, LocationType val2Type )
+void PIC14::equal( const TQString &val1, const TQString &val2, LocationType val1Type, LocationType val2Type )
 {
 	ifInitCode( val1, val2, val1Type, val2Type );
-	const QString labelEnd = mb->uniqueLabel()+"_endif";
-	const QString labelFalse = mb->uniqueLabel()+"_case_false";
+	const TQString labelEnd = mb->uniqueLabel()+"_endif";
+	const TQString labelFalse = mb->uniqueLabel()+"_case_false";
 	
 	m_pCode->append(new Instr_btfss("STATUS","2"));
 	m_pCode->append(new Instr_goto(labelFalse));
@@ -602,11 +602,11 @@ void PIC14::equal( const QString &val1, const QString &val2, LocationType val1Ty
 	m_pCode->queueLabel( labelEnd );
 }
 
-void PIC14::notEqual( const QString &val1, const QString &val2, LocationType val1Type, LocationType val2Type )
+void PIC14::notEqual( const TQString &val1, const TQString &val2, LocationType val1Type, LocationType val2Type )
 {
 	ifInitCode( val1, val2, val1Type, val2Type );
-	const QString labelEnd = mb->uniqueLabel()+"_endif";
-	const QString labelFalse = mb->uniqueLabel()+"_case_false";
+	const TQString labelEnd = mb->uniqueLabel()+"_endif";
+	const TQString labelFalse = mb->uniqueLabel()+"_case_false";
 	
 	m_pCode->append(new Instr_btfsc("STATUS","2"));
 	m_pCode->append(new Instr_goto(labelFalse));
@@ -620,11 +620,11 @@ void PIC14::notEqual( const QString &val1, const QString &val2, LocationType val
 	m_pCode->queueLabel( labelEnd );
 }
 
-void PIC14::greaterThan( const QString &val1, const QString &val2, LocationType val1Type, LocationType val2Type )
+void PIC14::greaterThan( const TQString &val1, const TQString &val2, LocationType val1Type, LocationType val2Type )
 {
 	ifInitCode( val1, val2, val1Type, val2Type );
-	const QString labelEnd = mb->uniqueLabel()+"_endif";
-	const QString labelFalse = mb->uniqueLabel()+"_case_false";
+	const TQString labelEnd = mb->uniqueLabel()+"_endif";
+	const TQString labelFalse = mb->uniqueLabel()+"_case_false";
 	
 	m_pCode->append(new Instr_btfsc("STATUS","0"));
 	m_pCode->append(new Instr_goto(labelFalse));
@@ -637,12 +637,12 @@ void PIC14::greaterThan( const QString &val1, const QString &val2, LocationType
 	m_pCode->queueLabel( labelEnd );
 }
 
-void PIC14::lessThan( const QString &val1, const QString &val2, LocationType val1Type, LocationType val2Type )
+void PIC14::lessThan( const TQString &val1, const TQString &val2, LocationType val1Type, LocationType val2Type )
 {
 	cout << k_funcinfo << endl;
 	ifInitCode( val1, val2, val1Type, val2Type );
-	const QString labelEnd = mb->uniqueLabel()+"_endif";
-	const QString labelFalse = mb->uniqueLabel()+"_case_false";
+	const TQString labelEnd = mb->uniqueLabel()+"_endif";
+	const TQString labelFalse = mb->uniqueLabel()+"_case_false";
 	
 	m_pCode->append(new Instr_btfss("STATUS","0"));
 	m_pCode->append(new Instr_goto(labelFalse));
@@ -658,11 +658,11 @@ void PIC14::lessThan( const QString &val1, const QString &val2, LocationType val
 	m_pCode->queueLabel( labelEnd );
 }
 
-void PIC14::greaterOrEqual( const QString &val1, const QString &val2, LocationType val1Type, LocationType val2Type )
+void PIC14::greaterOrEqual( const TQString &val1, const TQString &val2, LocationType val1Type, LocationType val2Type )
 {
 	ifInitCode( val1, val2, val1Type, val2Type );
-	const QString labelEnd = mb->uniqueLabel()+"_endif";
-	const QString labelTrue = mb->uniqueLabel()+"_case_true"; // Note that unlike the others, this is labelTrue, not labelFalse
+	const TQString labelEnd = mb->uniqueLabel()+"_endif";
+	const TQString labelTrue = mb->uniqueLabel()+"_case_true"; // Note that unlike the others, this is labelTrue, not labelFalse
 	
 	m_pCode->append(new Instr_btfsc("STATUS","2"));
 	m_pCode->append(new Instr_goto(labelTrue));
@@ -678,11 +678,11 @@ void PIC14::greaterOrEqual( const QString &val1, const QString &val2, LocationTy
 	m_pCode->queueLabel( labelEnd );
 }
 
-void PIC14::lessOrEqual( const QString &val1, const QString &val2, LocationType val1Type, LocationType val2Type )
+void PIC14::lessOrEqual( const TQString &val1, const TQString &val2, LocationType val1Type, LocationType val2Type )
 {
 	ifInitCode( val1, val2, val1Type, val2Type );
-	const QString labelEnd = mb->uniqueLabel()+"_endif";
-	const QString labelFalse = mb->uniqueLabel()+"_case_false";
+	const TQString labelEnd = mb->uniqueLabel()+"_endif";
+	const TQString labelFalse = mb->uniqueLabel()+"_case_false";
 	
 	m_pCode->append(new Instr_btfss("STATUS","0"));
 	m_pCode->append(new Instr_goto(labelFalse));
@@ -696,10 +696,10 @@ void PIC14::lessOrEqual( const QString &val1, const QString &val2, LocationType
 }
 
 
-void PIC14::Swhile( Code * whileCode, const QString &expression)
+void PIC14::Swhile( Code * whileCode, const TQString &expression)
 {
-	QString result;
-	QString ul = mb->uniqueLabel();
+	TQString result;
+	TQString ul = mb->uniqueLabel();
 	
 	whileCode->append( new Instr_goto(ul) );
 	
@@ -710,10 +710,10 @@ void PIC14::Swhile( Code * whileCode, const QString &expression)
 }
 
 
-void PIC14::Srepeat( Code * repeatCode, const QString &expression)
+void PIC14::Srepeat( Code * repeatCode, const TQString &expression)
 {
-	QString result;
-	QString ul = mb->uniqueLabel();
+	TQString result;
+	TQString ul = mb->uniqueLabel();
 	
 	Code * elseCode = new Code;
 	elseCode->append( new Instr_goto(ul) );
@@ -725,15 +725,15 @@ void PIC14::Srepeat( Code * repeatCode, const QString &expression)
 	m_parser->compileConditionalExpression( expression, 0, elseCode );
 }
 
-void PIC14::Sif( Code * ifCode, Code * elseCode, const QString &expression)
+void PIC14::Sif( Code * ifCode, Code * elseCode, const TQString &expression)
 {
 	m_parser->compileConditionalExpression( expression, ifCode, elseCode );
 }
 
 
-void PIC14::Sfor( Code * forCode, Code * initCode, const QString &expression, const QString &variable, const QString &step, bool stepPositive)
+void PIC14::Sfor( Code * forCode, Code * initCode, const TQString &expression, const TQString &variable, const TQString &step, bool stepPositive)
 {
-	QString ul = mb->uniqueLabel();
+	TQString ul = mb->uniqueLabel();
 	
 	if ( step == "1" )
 	{
@@ -762,7 +762,7 @@ void PIC14::Sfor( Code * forCode, Code * initCode, const QString &expression, co
 
 void PIC14::Spin( const PortPin & portPin, bool NOT)
 {
-	QString lowLabel, highLabel, postLabel;
+	TQString lowLabel, highLabel, postLabel;
 	lowLabel = mb->uniqueLabel();
 	highLabel = mb->uniqueLabel();
 	postLabel = mb->uniqueLabel();
@@ -772,10 +772,10 @@ void PIC14::Spin( const PortPin & portPin, bool NOT)
 	result += postLabel + ;*/
 	
 	if(NOT)
-		m_pCode->append(new Instr_btfsc( portPin.port(), QString::number( portPin.pin() ) ));
-	//result +=instruction((QString)(NOT?"btfsc":"btfss")+"\t"+port+","+pin);
+		m_pCode->append(new Instr_btfsc( portPin.port(), TQString::number( portPin.pin() ) ));
+	//result +=instruction((TQString)(NOT?"btfsc":"btfss")+"\t"+port+","+pin);
 	else
-		m_pCode->append(new Instr_btfss( portPin.port(), QString::number( portPin.pin() ) ));
+		m_pCode->append(new Instr_btfss( portPin.port(), TQString::number( portPin.pin() ) ));
 	
 	m_pCode->append(new Instr_goto(lowLabel));//result += instruction("goto\t" + lowLabel); 
 	mergeCode( ifCode() );
@@ -863,7 +863,7 @@ void PIC14::addCommonFunctions( DelaySubroutine delay )
 {
 	if ( delay != Delay_None )
 	{
-		QString subName = "__delay_subroutine";
+		TQString subName = "__delay_subroutine";
 		m_pCode->queueLabel( subName, Code::Subroutine );
 		
 		m_pCode->append( new Instr_decfsz( "__i", 1 ), Code::Subroutine );
@@ -897,7 +897,7 @@ void PIC14::SsevenSegment( const Variable & pinMap )
 	assert( pinMap.type() == Variable::sevenSegmentType );
 	assert( pinMap.portPinList().size() == 7 );
 	
-	QString subName = QString("__output_seven_segment_%1").arg( pinMap.name() );
+	TQString subName = TQString("__output_seven_segment_%1").tqarg( pinMap.name() );
 	
 	m_pCode->append( new Instr_call( subName ) );
 	
@@ -967,7 +967,7 @@ void PIC14::SsevenSegment( const Variable & pinMap )
 		if ( !portOutput[port].used )
 			continue;
 		
-		QString portName = QString("PORT%1").arg( char('A'+port) );
+		TQString portName = TQString("PORT%1").tqarg( 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 + QString("_lookup_%1").arg(port) ), Code::Subroutine );
+		m_pCode->append( new Instr_call( subName + TQString("_lookup_%1").tqarg(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 + QString("_lookup_%1").arg(port), Code::LookupTable );
+		m_pCode->queueLabel( subName + TQString("_lookup_%1").tqarg(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
 	
-	QString subName = QString("__wait_read_keypad_%1").arg( pinMap.name() );
-	QString waitName = QString("__wait_keypad_%1").arg( pinMap.name() );
-	QString readName = QString("__read_keypad_%1").arg( pinMap.name() );
+	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() );
 	
 	m_pCode->append( new Instr_call( subName ) );
 	
@@ -1070,7 +1070,7 @@ void PIC14::Skeypad( const Variable & pinMap )
 	for ( unsigned row = 0; row < 4; ++ row )
 	{
 		PortPin rowPin = pinMap.portPinList()[row];
-		m_pCode->append( new Instr_bcf( rowPin.port(), QString::number( rowPin.pin() ) ), Code::Subroutine );
+		m_pCode->append( new Instr_bcf( rowPin.port(), TQString::number( rowPin.pin() ) ), Code::Subroutine );
 	}
 	
 	// Test each row in turn
@@ -1078,17 +1078,17 @@ void PIC14::Skeypad( const Variable & pinMap )
 	{
 		// Make the high low
 		PortPin rowPin = pinMap.portPinList()[row];
-		m_pCode->append( new Instr_bsf( rowPin.port(), QString::number( rowPin.pin() ) ), Code::Subroutine );
+		m_pCode->append( new Instr_bsf( rowPin.port(), TQString::number( rowPin.pin() ) ), Code::Subroutine );
 		
 		for ( unsigned col = 0; col < 3; ++ col )
 		{
 			PortPin colPin = pinMap.portPinList()[4+col];
-			m_pCode->append( new Instr_btfsc( colPin.port(), QString::number( colPin.pin() ) ), Code::Subroutine );
-			m_pCode->append( new Instr_retlw( mb->alias( QString("Keypad_%1_%2").arg(row+1).arg(col+1) ).toInt( 0, 0 ) ), Code::Subroutine );
+			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 );
 		}
 		
 		// Make the low again
-		m_pCode->append( new Instr_bcf( rowPin.port(), QString::number( rowPin.pin() ) ), Code::Subroutine );
+		m_pCode->append( new Instr_bcf( rowPin.port(), TQString::number( rowPin.pin() ) ), Code::Subroutine );
 	}
 	
 	// No key was pressed
@@ -1097,16 +1097,16 @@ void PIC14::Skeypad( const Variable & pinMap )
 }
 
 
-void PIC14::bitwise( Expression::Operation op, const QString &r_val1, const QString &val2, bool val1IsNum, bool val2IsNum )
+void PIC14::bitwise( Expression::Operation op, const TQString &r_val1, const TQString &val2, bool val1IsNum, bool val2IsNum )
 {
-	QString val1 = r_val1;
+	TQString val1 = r_val1;
 	// There is no instruction for notting a literal,
 	// so instead I am going to XOR with 0xFF
 	if( op == Expression::bwnot ) val1 = "0xFF";
 	if( val1IsNum ) m_pCode->append(new Instr_movlw(val1.toInt( 0, 0 )));// result += instruction("movlw\t"+val1);
 	else m_pCode->append(new Instr_movf(val1,0));//result += instruction("movf\t"+val1+",0");
 	
-	QString opString;
+	TQString opString;
 	if( val2IsNum )
 	{
 		switch(op)
@@ -1132,27 +1132,27 @@ void PIC14::bitwise( Expression::Operation op, const QString &r_val1, const QStr
 	}
 }
 
-void PIC14::SincVar( const QString &var )
+void PIC14::SincVar( const TQString &var )
 {
 	m_pCode->append(new Instr_incf(var,1) );
 }
 
-void PIC14::SdecVar( const QString &var )
+void PIC14::SdecVar( const TQString &var )
 {
 	m_pCode->append(new Instr_decf(var,1) );
 }
 
-void PIC14::SrotlVar( const QString &var )
+void PIC14::SrotlVar( const TQString &var )
 {
 	m_pCode->append(new Instr_rlf(var,1));
 }
 
-void PIC14::SrotrVar( const QString &var )
+void PIC14::SrotrVar( const TQString &var )
 {
 	m_pCode->append(new Instr_rrf(var,1));
 }
 
-void PIC14::Stristate(const QString &port)
+void PIC14::Stristate(const TQString &port)
 {
 	m_pCode->append( new Instr_bsf("STATUS","5") );
 	
@@ -1164,7 +1164,7 @@ void PIC14::Stristate(const QString &port)
 	m_pCode->append( new Instr_bcf(Register("STATUS"),"5") );
 }
 
-void PIC14::Sasm(const QString &raw)
+void PIC14::Sasm(const TQString &raw)
 {
 	m_pCode->append(new Instr_asm(raw));
 }
@@ -1173,7 +1173,7 @@ void PIC14::Sasm(const QString &raw)
 
 
 //BEGIN class PortPin
-PortPin::PortPin( const QString & port, int pin )
+PortPin::PortPin( const TQString & port, int pin )
 {
 	m_port = port.upper();
 	m_pin = pin;