diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:19:53 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:19:53 -0600 |
| commit | a935c1de6f952a489a96a27cb897144b5d225ebe (patch) | |
| tree | f18b873df3b93a00c8fc16844a30d1476434c03d /katapult/plugins/catalogs/calculatorcatalog | |
| parent | 155220cc57a9be0841398c81b35cd8b22b3156ba (diff) | |
| download | katapult-a935c1de6f952a489a96a27cb897144b5d225ebe.tar.gz katapult-a935c1de6f952a489a96a27cb897144b5d225ebe.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'katapult/plugins/catalogs/calculatorcatalog')
| -rw-r--r-- | katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp | 10 | ||||
| -rw-r--r-- | katapult/plugins/catalogs/calculatorcatalog/expression.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp b/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp index 219fabf..5fbac5b 100644 --- a/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp +++ b/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp @@ -72,13 +72,13 @@ static TQString formatNumber(const TQString &numStr) if (expString.length()==1) expString=TQString(); // Replace dot with locale decimal separator - mantString.replace(TQChar('.'), KGlobal::locale()->decimalSymbol()); + mantString.replace(TQChar('.'), TDEGlobal::locale()->decimalSymbol()); // Insert the thousand separators - _insertSeparator(mantString, KGlobal::locale()->thousandsSeparator(), KGlobal::locale()->decimalSymbol()); + _insertSeparator(mantString, TDEGlobal::locale()->thousandsSeparator(), TDEGlobal::locale()->decimalSymbol()); // How can we know where we should put the sign? - mantString.prepend(neg?KGlobal::locale()->negativeSign():KGlobal::locale()->positiveSign()); + mantString.prepend(neg?TDEGlobal::locale()->negativeSign():TDEGlobal::locale()->positiveSign()); return mantString + expString; } @@ -88,7 +88,7 @@ static TQString formatNumber(const TQString &numStr) static TQString formatNumber(const TQString& numStr) { - return KGlobal::locale()->formatNumber(numStr, false, 0); + return TDEGlobal::locale()->formatNumber(numStr, false, 0); } #endif @@ -128,7 +128,7 @@ TQString ActionEvaluateExpression::text() const TQPixmap ActionEvaluateExpression::icon(int size) const { - return KGlobal::iconLoader()->loadIcon("xcalc", KIcon::NoGroup, size); + return TDEGlobal::iconLoader()->loadIcon("xcalc", KIcon::NoGroup, size); } bool ActionEvaluateExpression::accepts(const KatapultItem* item) const diff --git a/katapult/plugins/catalogs/calculatorcatalog/expression.cpp b/katapult/plugins/catalogs/calculatorcatalog/expression.cpp index 4f6fdcc..b0bd103 100644 --- a/katapult/plugins/catalogs/calculatorcatalog/expression.cpp +++ b/katapult/plugins/catalogs/calculatorcatalog/expression.cpp @@ -40,7 +40,7 @@ TQPixmap Expression::icon(int size) const if (_parseError) { icon = "no"; } - return KGlobal::iconLoader()->loadIcon(icon, KIcon::NoGroup, size); + return TDEGlobal::iconLoader()->loadIcon(icon, KIcon::NoGroup, size); } TQString Expression::text() const |