Browse Source

Remove additional unneeded tq method conversions

tags/r14.0.0
Timothy Pearson 8 years ago
parent
commit
c9113d74fb
9 changed files with 40 additions and 40 deletions
  1. +1
    -1
      src/abakuslistview.cpp
  2. +2
    -2
      src/editor.cpp
  3. +7
    -7
      src/mainwindow.cpp
  4. +7
    -7
      src/node.cpp
  5. +2
    -2
      src/node.h
  6. +2
    -2
      src/numerictypes.cpp
  7. +15
    -15
      src/parser.yy
  8. +2
    -2
      src/resultlistviewtext.cpp
  9. +2
    -2
      src/rpnmuncher.cpp

+ 1
- 1
src/abakuslistview.cpp View File

@@ -132,7 +132,7 @@ ValueListViewItem::ValueListViewItem(TQListView *listView, const TQString &name,
void ValueListViewItem::valueChanged()
{
setText(1, m_value.toString());
tqrepaint();
repaint();
}

void ValueListViewItem::valueChanged(const Abakus::number_t &newValue)


+ 2
- 2
src/editor.cpp View File

@@ -527,7 +527,7 @@ void Editor::triggerAutoComplete()
if(choice.isEmpty())
choice = ValueManager::instance()->value(*it).toString();

vchoices.append( TQString("%1:%2").tqarg( *it, choice ) );
vchoices.append( TQString("%1:%2").arg( *it, choice ) );
}

vchoices.sort();
@@ -627,7 +627,7 @@ void Editor::autoCalc()
Abakus::number_t result = parseString(str.latin1());
if( Result::lastResult()->type() == Result::Value )
{
TQString ss = TQString("Result: <b>%2</b>").tqarg(result.toString());
TQString ss = TQString("Result: <b>%2</b>").arg(result.toString());
d->autoCalcLabel->setText( ss );
d->autoCalcLabel->adjustSize();



+ 7
- 7
src/mainwindow.cpp View File

@@ -222,7 +222,7 @@ void MainWindow::slotReturnPressed()
}
else {
m_insert = false;
resultVal = i18n("Error: %1").tqarg(RPNParser::errorString());
resultVal = i18n("Error: %1").arg(RPNParser::errorString());
}

// Skip creating list view items if in compact mode.
@@ -454,8 +454,8 @@ void MainWindow::saveConfig()
continue;

list += TQString("%1=%2")
.tqarg(*it)
.tqarg(ValueManager::instance()->value(*it).toString());
.arg(*it)
.arg(ValueManager::instance()->value(*it).toString());
}

config.writeEntry("Saved Variables", list);
@@ -492,7 +492,7 @@ void MainWindow::saveConfig()
TQString var = manager->function(*it)->userFn->varName;
TQString expr = fn->operand()->infixString();

saveList += TQString("set %1(%2) = %3").tqarg(*it).tqarg(var).tqarg(expr);
saveList += TQString("set %1(%2) = %3").arg(*it).arg(var).arg(expr);
}

config.writeEntry("FunctionList", saveList);
@@ -631,7 +631,7 @@ void MainWindow::slotNewFunction(const TQString &name)
{
UserFunction *userFn = FunctionManager::instance()->function(name)->userFn;
UnaryFunction *fn = dynamic_cast<UnaryFunction *>(userFn->fn);
TQString fnName = TQString("%1(%2)").tqarg(name, userFn->varName);
TQString fnName = TQString("%1(%2)").arg(name, userFn->varName);
TQString expr = fn->operand()->infixString();

new KListViewItem(m_fnList, fnName, expr);
@@ -640,7 +640,7 @@ void MainWindow::slotNewFunction(const TQString &name)
void MainWindow::slotRemoveFunction(const TQString &name)
{
UserFunction *userFn = FunctionManager::instance()->function(name)->userFn;
TQString fnName = TQString("%1(%2)").tqarg(name, userFn->varName);
TQString fnName = TQString("%1(%2)").arg(name, userFn->varName);

TQListViewItem *item = 0;
while((item = m_fnList->findItem(fnName, 0)) != 0)
@@ -714,7 +714,7 @@ TQString MainWindow::interpolateExpression(const TQString &text, ResultListViewT
unsigned numPos = stackStr.mid(1).toUInt();

if(!m_result->getStackValue(numPos, value)) {
new ResultListViewText(m_result, text, i18n("Marker %1 isn't set").tqarg(stackStr), after, true);
new ResultListViewText(m_result, text, i18n("Marker %1 isn't set").arg(stackStr), after, true);
return TQString();
}



+ 7
- 7
src/node.cpp View File

@@ -64,7 +64,7 @@ void UnaryFunction::applyMap(NodeFunctor &fn) const

TQString UnaryFunction::infixString() const
{
return TQString("%1(%2)").tqarg(name(), operand()->infixString());
return TQString("%1(%2)").arg(name(), operand()->infixString());
}

BuiltinFunction::BuiltinFunction(const char *name, Node *operand) :
@@ -210,7 +210,7 @@ void DerivativeFunction::applyMap(NodeFunctor &fn) const

TQString DerivativeFunction::infixString() const
{
return TQString("deriv(%1, %2)").tqarg(m_operand->infixString(), m_where->infixString());
return TQString("deriv(%1, %2)").arg(m_operand->infixString(), m_where->infixString());
}

UnaryOperator::UnaryOperator(Type type, Node *operand)
@@ -233,9 +233,9 @@ void UnaryOperator::applyMap(NodeFunctor &fn) const
TQString UnaryOperator::infixString() const
{
if(dynamic_cast<BinaryOperator *>(operand()))
return TQString("-(%1)").tqarg(operand()->infixString());
return TQString("-(%1)").arg(operand()->infixString());

return TQString("-%1").tqarg(operand()->infixString());
return TQString("-%1").arg(operand()->infixString());
}

Abakus::number_t UnaryOperator::derivative() const
@@ -312,10 +312,10 @@ TQString BinaryOperator::infixString() const
op = "Error";
}
TQString left = TQString(isSimpleNode(leftNode()) ? "%1" : "(%1)").tqarg(leftNode()->infixString());
TQString right = TQString(isSimpleNode(rightNode()) ? "%1" : "(%1)").tqarg(rightNode()->infixString());
TQString left = TQString(isSimpleNode(leftNode()) ? "%1" : "(%1)").arg(leftNode()->infixString());
TQString right = TQString(isSimpleNode(rightNode()) ? "%1" : "(%1)").arg(rightNode()->infixString());

return TQString("%1 %2 %3").tqarg(left, op, right);
return TQString("%1 %2 %3").arg(left, op, right);
}

Abakus::number_t BinaryOperator::derivative() const


+ 2
- 2
src/node.h View File

@@ -31,7 +31,7 @@ typedef SharedPtr<Node> NodePtr;

/**
* A class that operates on a Node. Called recursively on a node and all
* of its tqchildren.
* of its children.
*/
class NodeFunctor
{
@@ -50,7 +50,7 @@ class Node
// typically read-only.
virtual void deleteNode(Node *node);

// Calls functor() on all subtqchildren and this.
// Calls functor() on all subchildren and this.
virtual void applyMap(NodeFunctor &fn) const = 0;

// Returns an infix representation of the expression.


+ 2
- 2
src/numerictypes.cpp View File

@@ -78,7 +78,7 @@ TQString convertToString(const mpfr_ptr &number)
if(r.isEmpty())
r = "0";

r.append(TQString("e%1").tqarg(exp - 1));
r.append(TQString("e%1").arg(exp - 1));

return sign + l + decimalSymbol + r;
}
@@ -190,7 +190,7 @@ TQString convertToString(const HNumber &num)
str.truncate(str.length() - 1); // Remove trailing period.

if(parts.count() > 1 && parts[1] != "0")
str += TQString("e%1").tqarg(parts[1]);
str += TQString("e%1").arg(parts[1]);

return str;
}


+ 15
- 15
src/parser.yy View File

@@ -100,7 +100,7 @@ S: error '=' {

// Can't assign to a function.
S: FUNC '=' {
TQString s(i18n("You can't assign to function %1").tqarg($1->name()));
TQString s(i18n("You can't assign to function %1").arg($1->name()));
Result::setLastResult(s);

YYABORT;
@@ -116,14 +116,14 @@ ASSIGN: '(' { --gCheckIdents; } IDENT ')' '=' {
// since normally functions and variables with the same name can coexist, but
// I don't want to duplicate code all over the place.
S: SET DERIV {
TQString s(i18n("Function %1 is built-in and cannot be overridden.").tqarg("deriv"));
TQString s(i18n("Function %1 is built-in and cannot be overridden.").arg("deriv"));
Result::setLastResult(s);

YYABORT;
}

S: DERIV '=' {
TQString s(i18n("Function %1 is built-in and cannot be overridden.").tqarg("deriv"));
TQString s(i18n("Function %1 is built-in and cannot be overridden.").arg("deriv"));
Result::setLastResult(s);

YYABORT;
@@ -139,7 +139,7 @@ S: SET FUNC ASSIGN EXP {
FunctionManager *manager = FunctionManager::instance();

if(manager->isFunction(funcName) && !manager->isFunctionUserDefined(funcName)) {
TQString s(i18n("Function %1 is built-in and cannot be overridden.").tqarg(funcName));
TQString s(i18n("Function %1 is built-in and cannot be overridden.").arg(funcName));
Result::setLastResult(s);

YYABORT;
@@ -150,7 +150,7 @@ S: SET FUNC ASSIGN EXP {

BaseFunction *newFn = new UserDefinedFunction(funcName.ascii(), $4);
if(!manager->addFunction(newFn, ident)) {
TQString s(i18n("Unable to define function %1 because it is recursive.").tqarg(funcName));
TQString s(i18n("Unable to define function %1 because it is recursive.").arg(funcName));
Result::setLastResult(s);

YYABORT;
@@ -188,14 +188,14 @@ S: REMOVE FUNC '(' ')' {
// Can't remove an ident using remove-func syntax.
S: REMOVE IDENT '(' ')' {
// This is an error
Result::setLastResult(Result(i18n("Function %1 is not defined.").tqarg($2->name())));
Result::setLastResult(Result(i18n("Function %1 is not defined.").arg($2->name())));
YYABORT;
}

// This happens when the user tries to remove a function that's not defined.
S: REMOVE IDENT '(' IDENT ')' {
// This is an error
Result::setLastResult(Result(i18n("Function %1 is not defined.").tqarg($2->name())));
Result::setLastResult(Result(i18n("Function %1 is not defined.").arg($2->name())));
YYABORT;
}

@@ -211,9 +211,9 @@ S: REMOVE IDENT {
else {
TQString s;
if(manager->isValueSet($2->name()))
s = i18n("Can't remove predefined variable %1.").tqarg($2->name());
s = i18n("Can't remove predefined variable %1.").arg($2->name());
else
s = i18n("Can't remove undefined variable %1.").tqarg($2->name());
s = i18n("Can't remove undefined variable %1.").arg($2->name());

Result::setLastResult(s);

@@ -228,7 +228,7 @@ S: SET IDENT '=' EXP {
if($2->name() == "pi" && $4->value() == Abakus::number_t("3.0"))
Result::setLastResult(i18n("This isn't Indiana, you can't just change pi"));
else
Result::setLastResult(i18n("%1 is a constant").tqarg($2->name()));
Result::setLastResult(i18n("%1 is a constant").arg($2->name()));

YYABORT;
}
@@ -247,7 +247,7 @@ S: IDENT '=' EXP {
if($1->name() == "pi" && $3->value() == Abakus::number_t("3.0"))
Result::setLastResult(i18n("This isn't Indiana, you can't just change pi"));
else
Result::setLastResult(i18n("%1 is a constant").tqarg($1->name()));
Result::setLastResult(i18n("%1 is a constant").arg($1->name()));

YYABORT;
}
@@ -259,13 +259,13 @@ S: IDENT '=' EXP {
}

S: NUMBER '=' {
Result::setLastResult(i18n("Can't assign to %1").tqarg($1->value().toString()));
Result::setLastResult(i18n("Can't assign to %1").arg($1->value().toString()));
YYABORT;
}

// Can't call this as a function.
TERM: IDENT '(' {
Result::setLastResult(i18n("%1 isn't a function (or operator expected)").tqarg($1->name()));
Result::setLastResult(i18n("%1 isn't a function (or operator expected)").arg($1->name()));
YYABORT;
}

@@ -351,7 +351,7 @@ TERM: NUMBER '(' EXP ')' {

TERM: NUMBER IDENT {
if(gCheckIdents > 0 && !ValueManager::instance()->isValueSet($2->name())) {
Result::setLastResult(i18n("Unknown variable %1").tqarg($2->name()));
Result::setLastResult(i18n("Unknown variable %1").arg($2->name()));
YYABORT;
}

@@ -362,7 +362,7 @@ VALUE: IDENT {
if(gCheckIdents <= 0 || ValueManager::instance()->isValueSet($1->name()))
$$ = $1;
else {
Result::setLastResult(i18n("Unknown variable %1").tqarg($1->name()));
Result::setLastResult(i18n("Unknown variable %1").arg($1->name()));
YYABORT;
}
}


+ 2
- 2
src/resultlistviewtext.cpp View File

@@ -54,7 +54,7 @@ ResultListViewText::ResultListViewText(KListView *listView,
for (; item && item != this; item = static_cast<ResultListViewText *>(item->itemBelow())) {
if(!item->wasError()) {
item->setStackPosition(item->stackPosition() + 1);
item->tqrepaint();
item->repaint();
}
}
}
@@ -67,7 +67,7 @@ ResultListViewText::ResultListViewText(KListView *listView,

void ResultListViewText::setStackPosition(unsigned pos)
{
setText(ShortcutColumn, TQString("$%1").tqarg(pos));
setText(ShortcutColumn, TQString("$%1").arg(pos));
m_stackPosition = pos;
}



+ 2
- 2
src/rpnmuncher.cpp View File

@@ -115,7 +115,7 @@ Abakus::number_t RPNParser::rpnParseString(const TQString &text)
case Func:
if(m_stack.count() < 1) {
m_error = true;
m_errorStr = i18n("Insufficient operands for function %1").tqarg(*it);
m_errorStr = i18n("Insufficient operands for function %1").arg(*it);
return Abakus::number_t::nan();
}

@@ -150,7 +150,7 @@ Abakus::number_t RPNParser::rpnParseString(const TQString &text)

case Unknown:
m_error = true;
m_errorStr = i18n("Unknown token %1").tqarg(*it);
m_errorStr = i18n("Unknown token %1").arg(*it);
return Abakus::number_t::nan();
break;



Loading…
Cancel
Save