diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
| commit | 61ca411b90b610b2e5438ec3b5b86a7e03939120 (patch) | |
| tree | 33846bc1f0bae7162b315d74d2c0688ba14d620c /katapult/plugins/catalogs/calculatorcatalog | |
| parent | 9e5a161735de07d1f5296ae7e633f4e31578936a (diff) | |
| download | katapult-61ca411b90b610b2e5438ec3b5b86a7e03939120.tar.gz katapult-61ca411b90b610b2e5438ec3b5b86a7e03939120.zip | |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/katapult@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'katapult/plugins/catalogs/calculatorcatalog')
3 files changed, 5 insertions, 5 deletions
diff --git a/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp b/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp index ff47f92..fdbbc60 100644 --- a/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp +++ b/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp @@ -72,7 +72,7 @@ static TQString formatNumber(const TQString &numStr) if (expString.length()==1) expString=TQString(); // Replace dot with locale decimal separator - mantString.tqreplace(TQChar('.'), KGlobal::locale()->decimalSymbol()); + mantString.replace(TQChar('.'), KGlobal::locale()->decimalSymbol()); // Insert the thousand separators _insertSeparator(mantString, KGlobal::locale()->thousandsSeparator(), KGlobal::locale()->decimalSymbol()); @@ -152,8 +152,8 @@ void ActionEvaluateExpression::execute(const KatapultItem* item) const if (!_expr->parseError()) { TQClipboard *cb = TQApplication::tqclipboard(); TQString s = _expr->catalog()->formatString(); - s.tqreplace("%1", _expr->text()); - s.tqreplace("%2", text()); + s.replace("%1", _expr->text()); + s.replace("%2", text()); cb->setText(s, TQClipboard::Clipboard); cb->setText(s, TQClipboard::Selection); } diff --git a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp index 12891d0..05a6c74 100644 --- a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp +++ b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp @@ -225,7 +225,7 @@ bool CalculatorCatalog::accepts(const TQString& str) const int CalculatorCatalog::getVarID(const char* name) { - VarNameToIdMap::iterator it = varNameToId.tqfind(TQString(name)); + VarNameToIdMap::iterator it = varNameToId.find(TQString(name)); if (it == varNameToId.end()) { _pendingVarName = TQString(name); return -1; diff --git a/katapult/plugins/catalogs/calculatorcatalog/expression.cpp b/katapult/plugins/catalogs/calculatorcatalog/expression.cpp index dfa4543..4f6fdcc 100644 --- a/katapult/plugins/catalogs/calculatorcatalog/expression.cpp +++ b/katapult/plugins/catalogs/calculatorcatalog/expression.cpp @@ -74,7 +74,7 @@ void Expression::evaluate(bool assignments) const if (!_text.isEmpty()) { TQString t = _text; CalculatorCatalog::ParserControl cntrl; - cntrl.expression = t.tqreplace(',', '.').ascii(); + cntrl.expression = t.replace(',', '.').ascii(); cntrl.catalog = _catalog; cntrl.assignments = assignments; if (yyparse(&cntrl) == 0) { |