diff options
Diffstat (limited to 'kmymoney2/widgets')
| -rw-r--r-- | kmymoney2/widgets/kmymoneycalculator.cpp | 10 | ||||
| -rw-r--r-- | kmymoney2/widgets/kmymoneyedit.cpp | 18 | ||||
| -rw-r--r-- | kmymoney2/widgets/register.cpp | 2 |
3 files changed, 15 insertions, 15 deletions
diff --git a/kmymoney2/widgets/kmymoneycalculator.cpp b/kmymoney2/widgets/kmymoneycalculator.cpp index ea6f035..cf3f7e6 100644 --- a/kmymoney2/widgets/kmymoneycalculator.cpp +++ b/kmymoney2/widgets/kmymoneycalculator.cpp @@ -323,17 +323,17 @@ const TQString kMyMoneyCalculator::result(void) const txt = txt.mid(1); // get rid of the minus sign TQString mask; switch(TDEGlobal::locale()->negativeMonetarySignPosition()) { - case KLocale::ParensAround: + case TDELocale::ParensAround: mask = "(%1)"; break; - case KLocale::AfterQuantityMoney: + case TDELocale::AfterQuantityMoney: mask = "%1-"; break; - case KLocale::AfterMoney: - case KLocale::BeforeMoney: + case TDELocale::AfterMoney: + case TDELocale::BeforeMoney: mask = "%1 -"; break; - case KLocale::BeforeQuantityMoney: + case TDELocale::BeforeQuantityMoney: mask = "-%1"; break; } diff --git a/kmymoney2/widgets/kmymoneyedit.cpp b/kmymoney2/widgets/kmymoneyedit.cpp index 032c3f5..549b772 100644 --- a/kmymoney2/widgets/kmymoneyedit.cpp +++ b/kmymoney2/widgets/kmymoneyedit.cpp @@ -60,7 +60,7 @@ kMyMoneyMoneyValidator::kMyMoneyMoneyValidator( double bottom, double top, int d TQValidator::State kMyMoneyMoneyValidator::validate( TQString & input, int & _p ) const { TQString s = input; - KLocale * l = TDEGlobal::locale(); + TDELocale * l = TDEGlobal::locale(); // ok, we have to re-format the number to have: // 1. decimalSymbol == '.' // 2. negativeSign == '-' @@ -102,8 +102,8 @@ TQValidator::State kMyMoneyMoneyValidator::validate( TQString & input, int & _p // the locale settings. // If the lead-in or lead-out paren is present, remove it // before passing the string to the TQDoubleValidator - if(l->negativeMonetarySignPosition() == KLocale::ParensAround - || l->positiveMonetarySignPosition() == KLocale::ParensAround) { + if(l->negativeMonetarySignPosition() == TDELocale::ParensAround + || l->positiveMonetarySignPosition() == TDELocale::ParensAround) { TQRegExp regExp("^(\\()?([\\d-\\.]*)(\\))?$"); if(s.find(regExp) != -1) { 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 // definitely is invalid. Nevertheless, we check for parens // only, if the locale settings have it enabled. - if(l->negativeMonetarySignPosition() == KLocale::ParensAround - || l->positiveMonetarySignPosition() == KLocale::ParensAround) { + if(l->negativeMonetarySignPosition() == TDELocale::ParensAround + || l->positiveMonetarySignPosition() == TDELocale::ParensAround) { int tmp = input.contains('(') - input.contains(')'); if(tmp > 0) rc = Intermediate; @@ -319,12 +319,12 @@ void kMyMoneyEdit::resetText(void) void kMyMoneyEdit::theTextChanged(const TQString & theText) { - KLocale * l = TDEGlobal::locale(); + TDELocale * l = TDEGlobal::locale(); TQString d = l->monetaryDecimalSymbol(); TQString l_text = theText; TQString nsign, psign; - if(l->negativeMonetarySignPosition() == KLocale::ParensAround - || l->positiveMonetarySignPosition() == KLocale::ParensAround) { + if(l->negativeMonetarySignPosition() == TDELocale::ParensAround + || l->positiveMonetarySignPosition() == TDELocale::ParensAround) { nsign = psign = "("; } else { nsign = l->negativeSign(); @@ -360,7 +360,7 @@ void kMyMoneyEdit::ensureFractionalPart(void) void kMyMoneyEdit::ensureFractionalPart(TQString& s) const { - KLocale* locale = TDEGlobal::locale(); + TDELocale* locale = TDEGlobal::locale(); TQString decimalSymbol = locale->monetaryDecimalSymbol(); if(decimalSymbol.isEmpty()) decimalSymbol = "."; diff --git a/kmymoney2/widgets/register.cpp b/kmymoney2/widgets/register.cpp index e07cd42..51bde1f 100644 --- a/kmymoney2/widgets/register.cpp +++ b/kmymoney2/widgets/register.cpp @@ -2270,7 +2270,7 @@ void Register::addGroupMarkers(void) lastMonth = thisMonth.addMonths(-1); yesterday = today.addDays(-1); // 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(); if(weekStartOfs < 0) { weekStartOfs = 7 + weekStartOfs; |