diff options
Diffstat (limited to 'kspread/formula.cc')
| -rw-r--r-- | kspread/formula.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/kspread/formula.cc b/kspread/formula.cc index 1e42867a..fbcf8c0e 100644 --- a/kspread/formula.cc +++ b/kspread/formula.cc @@ -134,7 +134,7 @@ Token::Op KSpread::matchOperator( const TQString& text ) if( text.length() == 1 ) { TQChar p = text[0]; - switch( p.tqunicode() ) + switch( p.unicode() ) { case '+': result = Token::Plus; break; case '-': result = Token::Minus; break; @@ -355,7 +355,7 @@ void TokenStack::ensureSpace() // helper function: return true for valid identifier character bool KSpread::isIdentifier( TQChar ch ) { - return ( ch.tqunicode() == '_' ) || (ch.tqunicode() == '$' ) || ( ch.isLetter() ); + return ( ch.unicode() == '_' ) || (ch.unicode() == '$' ) || ( ch.isLetter() ); } @@ -527,7 +527,7 @@ Tokens Formula::scan( const TQString& expr, KLocale* locale ) const } // aposthrophe (') marks sheet name for 3-d cell, e.g 'Sales Q3'!A4, or a named range - else if ( ch.tqunicode() == '\'' ) + else if ( ch.unicode() == '\'' ) { i++; state = InSheetOrAreaName; @@ -680,7 +680,7 @@ Tokens Formula::scan( const TQString& expr, KLocale* locale ) const case InSheetOrAreaName: // consume until ' - if ( ch.tqunicode() != '\'' ) + if ( ch.unicode() != '\'' ) tokenText.append( ex[i++] ); else @@ -1479,10 +1479,10 @@ TQString Formula::dump() const compile( tokens ); } - result = TQString("Expression: [%1]\n").tqarg( d->expression ); + result = TQString("Expression: [%1]\n").arg( d->expression ); #if 0 Value value = eval(); - result.append( TQString("Result: %1\n").tqarg( + result.append( TQString("Result: %1\n").arg( converter->asString(value).asString() ) ); #endif @@ -1491,12 +1491,12 @@ TQString Formula::dump() const { TQString vtext; Value val = d->constants[c]; - if( val.isString() ) vtext = TQString("[%1]").tqarg( val.asString() ); - else if( val.isNumber() ) vtext = TQString("%1").tqarg( val.asFloat() ); - else if( val.isBoolean() ) vtext = TQString("%1").tqarg( val.asBoolean() ? "True":"False"); + if( val.isString() ) vtext = TQString("[%1]").arg( val.asString() ); + else if( val.isNumber() ) vtext = TQString("%1").arg( val.asFloat() ); + else if( val.isBoolean() ) vtext = TQString("%1").arg( val.asBoolean() ? "True":"False"); else if( val.isError() ) vtext = "error"; else vtext = "???"; - result += TQString(" #%1 = %2\n").tqarg(c).tqarg( vtext ); + result += TQString(" #%1 = %2\n").arg(c).arg( vtext ); } result.append("\n"); @@ -1506,9 +1506,9 @@ TQString Formula::dump() const TQString ctext; switch( d->codes[i].type ) { - case Opcode::Load: ctext = TQString("Load #%1").tqarg( d->codes[i].index ); break; - case Opcode::Ref: ctext = TQString("Ref #%1").tqarg( d->codes[i].index ); break; - case Opcode::Function: ctext = TQString("Function (%1)").tqarg( d->codes[i].index ); break; + case Opcode::Load: ctext = TQString("Load #%1").arg( d->codes[i].index ); break; + case Opcode::Ref: ctext = TQString("Ref #%1").arg( d->codes[i].index ); break; + case Opcode::Function: ctext = TQString("Function (%1)").arg( d->codes[i].index ); break; case Opcode::Add: ctext = "Add"; break; case Opcode::Sub: ctext = "Sub"; break; case Opcode::Mul: ctext = "Mul"; break; |