diff options
Diffstat (limited to 'katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp')
| -rw-r--r-- | katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp b/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp index 2a786f9..ff47f92 100644 --- a/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp +++ b/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp @@ -28,7 +28,7 @@ #include <kurl.h> #include <klocale.h> -#include <qclipboard.h> +#include <tqclipboard.h> #include "calculatorcatalog.h" #include "expression.h" @@ -45,34 +45,34 @@ // Copied some code from KDE 3.5 to make it compile on 3.4. // insert (thousands)-"separator"s into the non-fractional part of str -static void _insertSeparator(QString &str, const QString &separator, const QString &decimalSymbol) +static void _insertSeparator(TQString &str, const TQString &separator, const TQString &decimalSymbol) { // leave fractional part untouched - QString mainPart = str.section(decimalSymbol, 0, 0); - QString fracPart = str.section(decimalSymbol, 1, 1, QString::SectionIncludeLeadingSep); - if (fracPart==decimalSymbol) fracPart=QString(); + TQString mainPart = str.section(decimalSymbol, 0, 0); + TQString fracPart = str.section(decimalSymbol, 1, 1, TQString::SectionIncludeLeadingSep); + if (fracPart==decimalSymbol) fracPart=TQString(); for (int pos = mainPart.length() - 3; pos > 0; pos -= 3) mainPart.insert(pos, separator); str = mainPart + fracPart; } -// This was KLocale::formatNumber(const QString&, bool, int) +// This was KLocale::formatNumber(const TQString&, bool, int) -static QString formatNumber(const QString &numStr) +static TQString formatNumber(const TQString &numStr) { - QString tmpString = numStr; + TQString tmpString = numStr; // Skip the sign (for now) bool neg = (tmpString[0] == '-'); if (neg || tmpString[0] == '+') tmpString.remove(0, 1); // Split off exponential part (including 'e'-symbol) - QString mantString = tmpString.section('e', 0, 0, QString::SectionCaseInsensitiveSeps); - QString expString = tmpString.section('e', 1, 1, QString::SectionCaseInsensitiveSeps | QString::SectionIncludeLeadingSep); - if (expString.length()==1) expString=QString(); + TQString mantString = tmpString.section('e', 0, 0, TQString::SectionCaseInsensitiveSeps); + TQString expString = tmpString.section('e', 1, 1, TQString::SectionCaseInsensitiveSeps | TQString::SectionIncludeLeadingSep); + if (expString.length()==1) expString=TQString(); // Replace dot with locale decimal separator - mantString.replace(QChar('.'), KGlobal::locale()->decimalSymbol()); + mantString.tqreplace(TQChar('.'), KGlobal::locale()->decimalSymbol()); // Insert the thousand separators _insertSeparator(mantString, KGlobal::locale()->thousandsSeparator(), KGlobal::locale()->decimalSymbol()); @@ -86,7 +86,7 @@ static QString formatNumber(const QString &numStr) #else // KDE_VERSION >= 3.5.0 -static QString formatNumber(const QString& numStr) +static TQString formatNumber(const TQString& numStr) { return KGlobal::locale()->formatNumber(numStr, false, 0); } @@ -103,15 +103,15 @@ ActionEvaluateExpression::~ActionEvaluateExpression() { } -QString ActionEvaluateExpression::text() const +TQString ActionEvaluateExpression::text() const { if (_expr->parseError()) { return i18n("Evaluate Expression"); } else { // Format result. int digits = _expr->catalog()->fracDigits(); - QChar f = _expr->catalog()->scientific() ? 'g' : 'f'; - QString num = QString::number(_expr->result(), f, digits); + TQChar f = _expr->catalog()->scientific() ? 'g' : 'f'; + TQString num = TQString::number(_expr->result(), f, digits); // Strip trailing zeroes. if (f == 'f' && digits != 0) { while (num.endsWith("0")) { @@ -126,7 +126,7 @@ QString ActionEvaluateExpression::text() const } } -QPixmap ActionEvaluateExpression::icon(int size) const +TQPixmap ActionEvaluateExpression::icon(int size) const { return KGlobal::iconLoader()->loadIcon("xcalc", KIcon::NoGroup, size); } @@ -150,12 +150,12 @@ void ActionEvaluateExpression::execute(const KatapultItem* item) const // Copy calculation and result into clipboard (unless there's a parse error). if (!_expr->parseError()) { - QClipboard *cb = QApplication::clipboard(); - QString s = _expr->catalog()->formatString(); - s.replace("%1", _expr->text()); - s.replace("%2", text()); - cb->setText(s, QClipboard::Clipboard); - cb->setText(s, QClipboard::Selection); + TQClipboard *cb = TQApplication::tqclipboard(); + TQString s = _expr->catalog()->formatString(); + s.tqreplace("%1", _expr->text()); + s.tqreplace("%2", text()); + cb->setText(s, TQClipboard::Clipboard); + cb->setText(s, TQClipboard::Selection); } } } |