diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:39:40 -0600 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2012-08-01 04:34:45 +0200 |
commit | 91ef45e89ef1bb0994d49220556e514d608a664c (patch) | |
tree | 98e17373a0765a7610021cb90e8668a6eb8ab7fc /microbe/pic14.cpp | |
parent | e72829f3fa8d309ba0c3f64034c14ce5eecd8590 (diff) | |
download | ktechlab-91ef45e89ef1bb0994d49220556e514d608a664c.tar.gz ktechlab-91ef45e89ef1bb0994d49220556e514d608a664c.zip |
Remove additional unneeded tq method conversions
(cherry picked from commit 1fc61c6e1d0a2b34f7b1d0de181bb4e6f954a8c2)
Diffstat (limited to 'microbe/pic14.cpp')
-rw-r--r-- | microbe/pic14.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
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 |