Rename KLocale to enhance compatibility with KDE4

r14.0.x
Timothy Pearson 11 years ago
parent 5c184dbff2
commit 0e69180430

@ -2715,7 +2715,7 @@
* Updated Argentinian translation * Updated Argentinian translation
2008-02-16 Thomas Baumgart <ipwizard@users.sourceforge.net> 2008-02-16 Thomas Baumgart <ipwizard@users.sourceforge.net>
* Fixed 'WARNING: KLocale: trying to look up "" in catalog.' at appl start * Fixed 'WARNING: TDELocale: trying to look up "" in catalog.' at appl start
2008-02-15 Alvaro Soliverez <asoliverez@gmail.com> 2008-02-15 Alvaro Soliverez <asoliverez@gmail.com>
* Fixed unit tests of querytable.cpp broken when adding foreign currency fixes * Fixed unit tests of querytable.cpp broken when adding foreign currency fixes

@ -252,11 +252,11 @@ bool KMyMoneyUtils::appendCorrectFileExt(TQString& str, const TQString& strExtTo
void KMyMoneyUtils::checkConstants(void) void KMyMoneyUtils::checkConstants(void)
{ {
Q_ASSERT(static_cast<int>(KLocale::ParensAround) == static_cast<int>(MyMoneyMoney::ParensAround)); Q_ASSERT(static_cast<int>(TDELocale::ParensAround) == static_cast<int>(MyMoneyMoney::ParensAround));
Q_ASSERT(static_cast<int>(KLocale::BeforeQuantityMoney) == static_cast<int>(MyMoneyMoney::BeforeQuantityMoney)); Q_ASSERT(static_cast<int>(TDELocale::BeforeQuantityMoney) == static_cast<int>(MyMoneyMoney::BeforeQuantityMoney));
Q_ASSERT(static_cast<int>(KLocale::AfterQuantityMoney) == static_cast<int>(MyMoneyMoney::AfterQuantityMoney)); Q_ASSERT(static_cast<int>(TDELocale::AfterQuantityMoney) == static_cast<int>(MyMoneyMoney::AfterQuantityMoney));
Q_ASSERT(static_cast<int>(KLocale::BeforeMoney) == static_cast<int>(MyMoneyMoney::BeforeMoney)); Q_ASSERT(static_cast<int>(TDELocale::BeforeMoney) == static_cast<int>(MyMoneyMoney::BeforeMoney));
Q_ASSERT(static_cast<int>(KLocale::AfterMoney) == static_cast<int>(MyMoneyMoney::AfterMoney)); Q_ASSERT(static_cast<int>(TDELocale::AfterMoney) == static_cast<int>(MyMoneyMoney::AfterMoney));
} }
TQString KMyMoneyUtils::variableCSS(void) TQString KMyMoneyUtils::variableCSS(void)

@ -323,17 +323,17 @@ const TQString kMyMoneyCalculator::result(void) const
txt = txt.mid(1); // get rid of the minus sign txt = txt.mid(1); // get rid of the minus sign
TQString mask; TQString mask;
switch(TDEGlobal::locale()->negativeMonetarySignPosition()) { switch(TDEGlobal::locale()->negativeMonetarySignPosition()) {
case KLocale::ParensAround: case TDELocale::ParensAround:
mask = "(%1)"; mask = "(%1)";
break; break;
case KLocale::AfterQuantityMoney: case TDELocale::AfterQuantityMoney:
mask = "%1-"; mask = "%1-";
break; break;
case KLocale::AfterMoney: case TDELocale::AfterMoney:
case KLocale::BeforeMoney: case TDELocale::BeforeMoney:
mask = "%1 -"; mask = "%1 -";
break; break;
case KLocale::BeforeQuantityMoney: case TDELocale::BeforeQuantityMoney:
mask = "-%1"; mask = "-%1";
break; break;
} }

@ -60,7 +60,7 @@ kMyMoneyMoneyValidator::kMyMoneyMoneyValidator( double bottom, double top, int d
TQValidator::State kMyMoneyMoneyValidator::validate( TQString & input, int & _p ) const TQValidator::State kMyMoneyMoneyValidator::validate( TQString & input, int & _p ) const
{ {
TQString s = input; TQString s = input;
KLocale * l = TDEGlobal::locale(); TDELocale * l = TDEGlobal::locale();
// ok, we have to re-format the number to have: // ok, we have to re-format the number to have:
// 1. decimalSymbol == '.' // 1. decimalSymbol == '.'
// 2. negativeSign == '-' // 2. negativeSign == '-'
@ -102,8 +102,8 @@ TQValidator::State kMyMoneyMoneyValidator::validate( TQString & input, int & _p
// the locale settings. // the locale settings.
// If the lead-in or lead-out paren is present, remove it // If the lead-in or lead-out paren is present, remove it
// before passing the string to the TQDoubleValidator // before passing the string to the TQDoubleValidator
if(l->negativeMonetarySignPosition() == KLocale::ParensAround if(l->negativeMonetarySignPosition() == TDELocale::ParensAround
|| l->positiveMonetarySignPosition() == KLocale::ParensAround) { || l->positiveMonetarySignPosition() == TDELocale::ParensAround) {
TQRegExp regExp("^(\\()?([\\d-\\.]*)(\\))?$"); TQRegExp regExp("^(\\()?([\\d-\\.]*)(\\))?$");
if(s.find(regExp) != -1) { if(s.find(regExp) != -1) {
s = regExp.cap(2); s = regExp.cap(2);
@ -142,8 +142,8 @@ TQValidator::State kMyMoneyMoneyValidator::validate( TQString & input, int & _p
// is intermediate, if only the lead-out is present then it // is intermediate, if only the lead-out is present then it
// definitely is invalid. Nevertheless, we check for parens // definitely is invalid. Nevertheless, we check for parens
// only, if the locale settings have it enabled. // only, if the locale settings have it enabled.
if(l->negativeMonetarySignPosition() == KLocale::ParensAround if(l->negativeMonetarySignPosition() == TDELocale::ParensAround
|| l->positiveMonetarySignPosition() == KLocale::ParensAround) { || l->positiveMonetarySignPosition() == TDELocale::ParensAround) {
int tmp = input.contains('(') - input.contains(')'); int tmp = input.contains('(') - input.contains(')');
if(tmp > 0) if(tmp > 0)
rc = Intermediate; rc = Intermediate;
@ -319,12 +319,12 @@ void kMyMoneyEdit::resetText(void)
void kMyMoneyEdit::theTextChanged(const TQString & theText) void kMyMoneyEdit::theTextChanged(const TQString & theText)
{ {
KLocale * l = TDEGlobal::locale(); TDELocale * l = TDEGlobal::locale();
TQString d = l->monetaryDecimalSymbol(); TQString d = l->monetaryDecimalSymbol();
TQString l_text = theText; TQString l_text = theText;
TQString nsign, psign; TQString nsign, psign;
if(l->negativeMonetarySignPosition() == KLocale::ParensAround if(l->negativeMonetarySignPosition() == TDELocale::ParensAround
|| l->positiveMonetarySignPosition() == KLocale::ParensAround) { || l->positiveMonetarySignPosition() == TDELocale::ParensAround) {
nsign = psign = "("; nsign = psign = "(";
} else { } else {
nsign = l->negativeSign(); nsign = l->negativeSign();
@ -360,7 +360,7 @@ void kMyMoneyEdit::ensureFractionalPart(void)
void kMyMoneyEdit::ensureFractionalPart(TQString& s) const void kMyMoneyEdit::ensureFractionalPart(TQString& s) const
{ {
KLocale* locale = TDEGlobal::locale(); TDELocale* locale = TDEGlobal::locale();
TQString decimalSymbol = locale->monetaryDecimalSymbol(); TQString decimalSymbol = locale->monetaryDecimalSymbol();
if(decimalSymbol.isEmpty()) if(decimalSymbol.isEmpty())
decimalSymbol = "."; decimalSymbol = ".";

@ -2270,7 +2270,7 @@ void Register::addGroupMarkers(void)
lastMonth = thisMonth.addMonths(-1); lastMonth = thisMonth.addMonths(-1);
yesterday = today.addDays(-1); yesterday = today.addDays(-1);
// a = TQDate::dayOfWeek() todays weekday (1 = Monday, 7 = Sunday) // a = TQDate::dayOfWeek() todays weekday (1 = Monday, 7 = Sunday)
// b = KLocale::weekStartDay() first day of week (1 = Monday, 7 = Sunday) // b = TDELocale::weekStartDay() first day of week (1 = Monday, 7 = Sunday)
weekStartOfs = today.dayOfWeek() - TDEGlobal::locale()->weekStartDay(); weekStartOfs = today.dayOfWeek() - TDEGlobal::locale()->weekStartDay();
if(weekStartOfs < 0) { if(weekStartOfs < 0) {
weekStartOfs = 7 + weekStartOfs; weekStartOfs = 7 + weekStartOfs;

Loading…
Cancel
Save