diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-28 18:03:09 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-28 18:03:09 +0000 |
commit | 98d15d90b6a83e2df32d678013847e18b8a8c7e8 (patch) | |
tree | 02a588c0979fe1a40ae6216d1f831bb24de91a9f /katapult/plugins/catalogs/calculatorcatalog/expression.cpp | |
parent | e0974f69b7603e3d8f2d936301e05535af25346e (diff) | |
download | katapult-98d15d90b6a83e2df32d678013847e18b8a8c7e8.tar.gz katapult-98d15d90b6a83e2df32d678013847e18b8a8c7e8.zip |
TQt4 port Katapult
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/katapult@1233929 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'katapult/plugins/catalogs/calculatorcatalog/expression.cpp')
-rw-r--r-- | katapult/plugins/catalogs/calculatorcatalog/expression.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/katapult/plugins/catalogs/calculatorcatalog/expression.cpp b/katapult/plugins/catalogs/calculatorcatalog/expression.cpp index 37e80bc..dfa4543 100644 --- a/katapult/plugins/catalogs/calculatorcatalog/expression.cpp +++ b/katapult/plugins/catalogs/calculatorcatalog/expression.cpp @@ -29,12 +29,12 @@ #include "expression.h" -Expression::Expression(CalculatorCatalog* catalog, const QString& text): KatapultItem(), _catalog(catalog), _text(text) +Expression::Expression(CalculatorCatalog* catalog, const TQString& text): KatapultItem(), _catalog(catalog), _text(text) { evaluate(); } -QPixmap Expression::icon(int size) const +TQPixmap Expression::icon(int size) const { const char* icon = "checkmark"; if (_parseError) { @@ -43,12 +43,12 @@ QPixmap Expression::icon(int size) const return KGlobal::iconLoader()->loadIcon(icon, KIcon::NoGroup, size); } -QString Expression::text() const +TQString Expression::text() const { return _text; } -void Expression::setText(const QString& text) +void Expression::setText(const TQString& text) { _text = text; evaluate(); @@ -72,9 +72,9 @@ CalculatorCatalog* Expression::catalog() const void Expression::evaluate(bool assignments) const { if (!_text.isEmpty()) { - QString t = _text; + TQString t = _text; CalculatorCatalog::ParserControl cntrl; - cntrl.expression = t.replace(',', '.').ascii(); + cntrl.expression = t.tqreplace(',', '.').ascii(); cntrl.catalog = _catalog; cntrl.assignments = assignments; if (yyparse(&cntrl) == 0) { |