|
|
@ -72,13 +72,13 @@ static TQString formatNumber(const TQString &numStr)
|
|
|
|
if (expString.length()==1) expString=TQString();
|
|
|
|
if (expString.length()==1) expString=TQString();
|
|
|
|
|
|
|
|
|
|
|
|
// Replace dot with locale decimal separator
|
|
|
|
// Replace dot with locale decimal separator
|
|
|
|
mantString.replace(TQChar('.'), KGlobal::locale()->decimalSymbol());
|
|
|
|
mantString.replace(TQChar('.'), TDEGlobal::locale()->decimalSymbol());
|
|
|
|
|
|
|
|
|
|
|
|
// Insert the thousand separators
|
|
|
|
// 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?
|
|
|
|
// 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;
|
|
|
|
return mantString + expString;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -88,7 +88,7 @@ static TQString formatNumber(const TQString &numStr)
|
|
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
#endif
|
|
|
@ -128,7 +128,7 @@ TQString ActionEvaluateExpression::text() const
|
|
|
|
|
|
|
|
|
|
|
|
TQPixmap ActionEvaluateExpression::icon(int size) 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
|
|
|
|
bool ActionEvaluateExpression::accepts(const KatapultItem* item) const
|
|
|
|