From c1ef065782051db96cdfd32cf55be6408c2a9d22 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:57:14 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit bab171b2a7d7f36e2d5dd510df80fc8cb4a6b06f. --- microbe/pic14.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'microbe/pic14.cpp') diff --git a/microbe/pic14.cpp b/microbe/pic14.cpp index fc92932..c9dcf24 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").arg( portPinString[1].upper() ); + port = TQString("PORT%1").tqarg( 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").arg(_text); + cerr << TQString("%1 is not a known PIC identifier\n").tqarg(_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").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; - TQString portName = TQString("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 + TQString("_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 + TQString("_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 - 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() ); + 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 ) ); @@ -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").arg(row+1).arg(col+1) ).toInt( 0, 0 ) ), 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 -- cgit v1.2.1