diff options
Diffstat (limited to 'kommander/widget/functionlib.cpp')
| -rw-r--r-- | kommander/widget/functionlib.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/kommander/widget/functionlib.cpp b/kommander/widget/functionlib.cpp index c85303ae..47db3bd0 100644 --- a/kommander/widget/functionlib.cpp +++ b/kommander/widget/functionlib.cpp @@ -164,7 +164,7 @@ static ParseNode f_return(Parser* p, const ParameterList& params) static ParseNode f_stringRound(Parser*, const ParameterList& params) { TQString s; - s.sprintf("%."+params[1].toString()+"f", params[0].toDouble()); + s.sprintf("%.*f", params[1].toInt(), params[0].toDouble()); return s; } @@ -172,7 +172,7 @@ static ParseNode f_stringRound(Parser*, const ParameterList& params) static ParseNode f_debug(Parser*, const ParameterList& params) { for (uint i=0; i<params.count(); i++) - std::cerr << params[i].toString(); + std::cerr << params[i].toString().local8Bit(); std::cerr << "\n"; fflush(stderr); return ParseNode(); @@ -181,7 +181,7 @@ static ParseNode f_debug(Parser*, const ParameterList& params) static ParseNode f_echo(Parser*, const ParameterList& params) { for (uint i=0; i<params.count(); i++) - std::cout << params[i].toString(); + std::cout << params[i].toString().local8Bit(); fflush(stdout); return ParseNode(); } @@ -429,9 +429,9 @@ static ParseNode f_widgetExists(Parser* p, const ParameterList& params) static ParseNode f_connect(Parser* p, const ParameterList& params) { TQString sender = params[0].toString(); - TQString signal = TQString::number(TQSIGNAL_CODE) + params[1].toString(); + TQString signal = TQString::number(TQ_SIGNAL_CODE) + params[1].toString(); TQString receiver = params[2].toString(); - TQString slot = TQString::number(TQSLOT_CODE) + params[3].toString(); + TQString slot = TQString::number(TQ_SLOT_CODE) + params[3].toString(); KommanderWidget *senderW = p->currentWidget()->widgetByName(sender); if (!senderW) return ParseNode::error("unknown widget"); @@ -445,9 +445,9 @@ static ParseNode f_connect(Parser* p, const ParameterList& params) static ParseNode f_disconnect(Parser* p, const ParameterList& params) { TQString sender = params[0].toString(); - TQString signal = TQString::number(TQSIGNAL_CODE) + params[1].toString(); + TQString signal = TQString::number(TQ_SIGNAL_CODE) + params[1].toString(); TQString receiver = params[2].toString(); - TQString slot = TQString::number(TQSLOT_CODE) + params[3].toString(); + TQString slot = TQString::number(TQ_SLOT_CODE) + params[3].toString(); KommanderWidget *senderW = p->currentWidget()->widgetByName(sender); if (!senderW) return ParseNode::error("unknown widget"); @@ -510,7 +510,7 @@ static ParseNode f_dialog(Parser* P, const ParameterList& params) static ParseNode f_i18n(Parser*, const ParameterList& params) { - return TDEGlobal::locale()->translate(params[0].toString()); + return TDEGlobal::locale()->translate(params[0].toString().utf8()); } static ParseNode f_env(Parser*, const ParameterList& params) @@ -567,13 +567,11 @@ static ParseNode f_arrayToString(Parser* P, const ParameterList& params) TQStringList keys = P->array(name).keys(); TQValueList<ParseNode> values = P->array(name).values(); - TQStringList::Iterator it = keys.begin(); + TQStringList::Iterator it = keys.begin(); TQValueList<ParseNode>::Iterator itval = values.begin(); - while (*it) + for (; it != keys.end(); ++it, ++itval) { array += TQString("%1\t%2\n").arg(*it).arg((*itval).toString()); - ++it; - ++itval; } return array; } |