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/microbe.cpp | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'microbe/microbe.cpp') diff --git a/microbe/microbe.cpp b/microbe/microbe.cpp index 8a01cc1..3c7dbef 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").arg(row+1).arg(col+1) ] = TQString::number( bv[row][col] ); + m_aliasList[ TQString("Keypad_%1_%2").tqarg(row+1).tqarg(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").arg(url); + m_errorReport += i18n("Could not open file '%1'\n").tqarg(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").arg(context); + message = i18n("Port '%1' is not supported by target PIC").tqarg(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 '='").arg(context); + message = i18n("Invalid token '%1'. Port identifier should be followed by '='").tqarg(context); break; case UnexpectedStatementBeforeBracket: message = i18n("Unexpected statement before '{'"); break; case MismatchedBrackets: - message = i18n("Mismatched brackets in expression '%1'").arg(context); + message = i18n("Mismatched brackets in expression '%1'").tqarg(context); break; case InvalidEquals: message = i18n("Invalid '=' found in expression"); break; case ReservedKeyword: - message = i18n("Reserved keyword '%1' cannot be a variable name.").arg(context); + message = i18n("Reserved keyword '%1' cannot be a variable name.").tqarg(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'").arg(context); + message = i18n("Unknown variable '%1'").tqarg(context); break; case UnopenableInclude: - message = i18n("Could not open include file '%1'").arg(context); + message = i18n("Could not open include file '%1'").tqarg(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'").arg(context); + message = i18n("'high' or 'low' expected after pin expression '%1'").tqarg(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'").arg(context); + message = i18n("Expected '%1'").tqarg(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").arg(context); + message = i18n("Variable '%1' is read only").tqarg(context); break; case WriteOnlyVariable: - message = i18n("Variable '%1' is write only").arg(context); + message = i18n("Variable '%1' is write only").tqarg(context); break; case InvalidPinMapSize: message = i18n("Invalid pin list size"); break; case VariableRedefined: - message = i18n("Variable '%1' is already defined").arg(context); + message = i18n("Variable '%1' is already defined").tqarg(context); break; case InvalidVariableName: - message = i18n("'%1' is not a valid variable name").arg(context); + message = i18n("'%1' is not a valid variable name").tqarg(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") - .arg( sourceLine.url() ) - .arg( sourceLine.line()+1 ) - .arg( type ) - .arg( message ); + .tqarg( sourceLine.url() ) + .tqarg( sourceLine.line()+1 ) + .tqarg( type ) + .tqarg( message ); } @@ -418,7 +418,7 @@ bool Microbe::isInterruptUsed( const TQString & interruptName ) TQString Microbe::dest() const { - return TQString("__op%1").arg(m_dest); + return TQString("__op%1").tqarg(m_dest); } -- cgit v1.2.1