summaryrefslogtreecommitdiffstats
path: root/kformula/fsparser.cc
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2011-12-19 11:38:41 -0600
committerTimothy Pearson <[email protected]>2011-12-19 11:38:41 -0600
commitf0de9e167e289ab7dc33e57f077c1f04ec7c68c8 (patch)
tree1fc538e179833e62caec21956bfe47a252be5a72 /kformula/fsparser.cc
parent11191ef0b9908604d1d7aaca382b011ef22c454c (diff)
downloadkoffice-f0de9e167e289ab7dc33e57f077c1f04ec7c68c8.tar.gz
koffice-f0de9e167e289ab7dc33e57f077c1f04ec7c68c8.zip
Remove additional unneeded tq method conversions
Diffstat (limited to 'kformula/fsparser.cc')
-rw-r--r--kformula/fsparser.cc22
1 files changed, 11 insertions, 11 deletions
diff --git a/kformula/fsparser.cc b/kformula/fsparser.cc
index 3d425a16..77a11819 100644
--- a/kformula/fsparser.cc
+++ b/kformula/fsparser.cc
@@ -447,7 +447,7 @@ TQDomDocument FormulaStringParser::parse()
head = parseAssign();
//head->output( cout );
if ( !eol() ) {
- error( TQString( i18n( "Aborted parsing at %1:%2" ) ).tqarg( line ).tqarg( column ) );
+ error( TQString( i18n( "Aborted parsing at %1:%2" ) ).arg( line ).arg( column ) );
}
TQDomDocument doc = KFormula::Document::createDomDocument();
@@ -556,7 +556,7 @@ ParserNode* FormulaStringParser::parsePrimary()
nextToken();
}
}
- expect( RP, TQString( i18n( "'%3' expected at %1:%2" ) ).tqarg( line ).tqarg( column ).tqarg( ")" ) );
+ expect( RP, TQString( i18n( "'%3' expected at %1:%2" ) ).arg( line ).arg( column ).arg( ")" ) );
node->setFunctionName( true );
return new FunctionNode( node, args );
}
@@ -571,7 +571,7 @@ ParserNode* FormulaStringParser::parsePrimary()
case LP: {
nextToken();
ParserNode* node = parseExpr();
- expect( RP, TQString( i18n( "'%3' expected at %1:%2" ) ).tqarg( line ).tqarg( column ).tqarg( ")" ) );
+ expect( RP, TQString( i18n( "'%3' expected at %1:%2" ) ).arg( line ).arg( column ).arg( ")" ) );
return node;
}
case LB: {
@@ -582,7 +582,7 @@ ParserNode* FormulaStringParser::parsePrimary()
m_newlineIsSpace = innerBrackets;
while ( ( currentType != EOL ) && ( currentType != RB ) ) {
if ( innerBrackets ) {
- expect( LB, TQString( i18n( "'%3' expected at %1:%2" ) ).tqarg( line ).tqarg( column ).tqarg( "[" ) );
+ expect( LB, TQString( i18n( "'%3' expected at %1:%2" ) ).arg( line ).arg( column ).arg( "[" ) );
}
TQPtrList<ParserNode> row;
row.setAutoDelete( false );
@@ -594,7 +594,7 @@ ParserNode* FormulaStringParser::parsePrimary()
}
}
if ( innerBrackets ) {
- expect( RB, TQString( i18n( "'%3' expected at %1:%2" ) ).tqarg( line ).tqarg( column ).tqarg( "]" ) );
+ expect( RB, TQString( i18n( "'%3' expected at %1:%2" ) ).arg( line ).arg( column ).arg( "]" ) );
if ( currentType == COMMA ) {
nextToken();
}
@@ -605,20 +605,20 @@ ParserNode* FormulaStringParser::parsePrimary()
nextToken();
}
else {
- expect( SEMIC, TQString( i18n( "'%3' expected at %1:%2" ) ).tqarg( line ).tqarg( column ).tqarg( ";" ) );
+ expect( SEMIC, TQString( i18n( "'%3' expected at %1:%2" ) ).arg( line ).arg( column ).arg( ";" ) );
}
}
}
rows.append( new RowNode( row ) );
}
m_newlineIsSpace = true;
- expect( RB, TQString( i18n( "'%3' expected at %1:%2" ) ).tqarg( line ).tqarg( column ).tqarg( "]" ) );
+ expect( RB, TQString( i18n( "'%3' expected at %1:%2" ) ).arg( line ).arg( column ).arg( "]" ) );
MatrixNode* node = new MatrixNode( rows );
if ( node->columns() == 0 ) {
- error( TQString( i18n( "Null columns in Matrix at %1:%2" ) ).tqarg( line ).tqarg( column ) );
+ error( TQString( i18n( "Null columns in Matrix at %1:%2" ) ).arg( line ).arg( column ) );
}
if ( node->rows() == 0 ) {
- error( TQString( i18n( "Null rows in Matrix at %1:%2" ) ).tqarg( line ).tqarg( column ) );
+ error( TQString( i18n( "Null rows in Matrix at %1:%2" ) ).arg( line ).arg( column ) );
}
return node;
}
@@ -628,7 +628,7 @@ ParserNode* FormulaStringParser::parsePrimary()
return node;
}
default:
- error( TQString( i18n( "Unexpected token at %1:%2" ) ).tqarg( line ).tqarg( column ) );
+ error( TQString( i18n( "Unexpected token at %1:%2" ) ).arg( line ).arg( column ) );
return new PrimaryNode( "?" );
}
}
@@ -773,7 +773,7 @@ void FormulaStringParser::readNumber()
readDigits();
}
else if ( !digitsBeforeDot ) {
- error( TQString( i18n( "A single '.' is not a number at %1:%2" ) ).tqarg( line ).tqarg( column ) );
+ error( TQString( i18n( "A single '.' is not a number at %1:%2" ) ).arg( line ).arg( column ) );
return;
}
}