From c70e40bd3f54a2c4d9ef57a36f19c996f4e00ed6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:37:08 -0600 Subject: Remove additional unneeded tq method conversions --- kmymoney2/widgets/kaccounttemplateselector.cpp | 12 ++++++------ kmymoney2/widgets/kbudgetvalues.cpp | 6 +++--- kmymoney2/widgets/klistviewsearchline.cpp | 8 ++++---- kmymoney2/widgets/klistviewsearchline.h | 4 ++-- kmymoney2/widgets/kmymoneyaccountselector.cpp | 16 ++++++++-------- kmymoney2/widgets/kmymoneyaccounttree.cpp | 2 +- kmymoney2/widgets/kmymoneyaccounttreebase.cpp | 18 +++++++++--------- kmymoney2/widgets/kmymoneyaccounttreebase.h | 2 +- kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp | 12 ++++++------ kmymoney2/widgets/kmymoneybriefschedule.cpp | 22 +++++++++++----------- kmymoney2/widgets/kmymoneycalculator.cpp | 4 ++-- kmymoney2/widgets/kmymoneycalendar.cpp | 4 ++-- kmymoney2/widgets/kmymoneychecklistitem.cpp | 4 ++-- kmymoney2/widgets/kmymoneychecklistitem.h | 2 +- kmymoney2/widgets/kmymoneycombo.cpp | 2 +- kmymoney2/widgets/kmymoneycurrencyselector.cpp | 4 ++-- kmymoney2/widgets/kmymoneydateinput.cpp | 6 +++--- kmymoney2/widgets/kmymoneydateinput.h | 2 +- kmymoney2/widgets/kmymoneydatetbl.cpp | 4 ++-- kmymoney2/widgets/kmymoneyedit.cpp | 4 ++-- kmymoney2/widgets/kmymoneyforecastlistviewitem.cpp | 4 ++-- kmymoney2/widgets/kmymoneyforecastlistviewitem.h | 2 +- kmymoney2/widgets/kmymoneygpgconfigdecl.ui | 4 ++-- kmymoney2/widgets/kmymoneylineedit.cpp | 6 +++--- kmymoney2/widgets/kmymoneylineedit.h | 4 ++-- kmymoney2/widgets/kmymoneylistviewitem.cpp | 4 ++-- kmymoney2/widgets/kmymoneylistviewitem.h | 2 +- kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp | 6 +++--- kmymoney2/widgets/kmymoneyselector.cpp | 20 ++++++++++---------- kmymoney2/widgets/kmymoneytitlelabel.cpp | 2 +- kmymoney2/widgets/kmymoneywizard.cpp | 2 +- kmymoney2/widgets/register.cpp | 10 +++++----- kmymoney2/widgets/stdtransactionmatched.cpp | 4 ++-- kmymoney2/widgets/transaction.cpp | 14 +++++++------- 34 files changed, 111 insertions(+), 111 deletions(-) (limited to 'kmymoney2/widgets') diff --git a/kmymoney2/widgets/kaccounttemplateselector.cpp b/kmymoney2/widgets/kaccounttemplateselector.cpp index 6e96b78..9b26503 100644 --- a/kmymoney2/widgets/kaccounttemplateselector.cpp +++ b/kmymoney2/widgets/kaccounttemplateselector.cpp @@ -204,8 +204,8 @@ void KAccountTemplateSelector::slotLoadTemplateList(void) TQString oCountry = KGlobal::locale()->twoAlphaToCountryName(exp.cap(2)); TQString oLang = KGlobal::locale()->twoAlphaToLanguageName(exp.cap(1)); d->countries.remove(country); - d->countries[TQString("%1 (%2)").tqarg(oCountry).tqarg(oLang)] = oName; - d->countries[TQString("%1 (%2)").tqarg(country).tqarg(lang)] = *it_d; + d->countries[TQString("%1 (%2)").arg(oCountry).arg(oLang)] = oName; + d->countries[TQString("%1 (%2)").arg(country).arg(lang)] = *it_d; } } else { d->countries[country] = *it_d; @@ -238,13 +238,13 @@ void KAccountTemplateSelector::slotLoadCountry(void) TQStringList::iterator it; for(it = d->dirlist.begin(); it != d->dirlist.end(); ++it) { TQStringList::iterator it_f; - TQDir dir(TQString("%1%2").tqarg(*it).tqarg(*(d->it_m))); + TQDir dir(TQString("%1%2").arg(*it).arg(*(d->it_m))); if(dir.exists()) { TQStringList files = dir.entryList("*", TQDir::Files); for(it_f = files.begin(); it_f != files.end(); ++it_f) { - MyMoneyTemplate templ(TQString("%1/%2").tqarg(dir.canonicalPath()).tqarg(*it_f)); - d->m_templates[TQString("%1").tqarg(d->id)] = templ; - new KListViewItem(parent, templ.title(), templ.shortDescription(), TQString("%1").tqarg(d->id)); + MyMoneyTemplate templ(TQString("%1/%2").arg(dir.canonicalPath()).arg(*it_f)); + d->m_templates[TQString("%1").arg(d->id)] = templ; + new KListViewItem(parent, templ.title(), templ.shortDescription(), TQString("%1").arg(d->id)); ++d->id; } } diff --git a/kmymoney2/widgets/kbudgetvalues.cpp b/kmymoney2/widgets/kbudgetvalues.cpp index d635eba..df665a8 100644 --- a/kmymoney2/widgets/kbudgetvalues.cpp +++ b/kmymoney2/widgets/kbudgetvalues.cpp @@ -184,7 +184,7 @@ void KBudgetValues::slotChangePeriod(int id) newValue = (newValue / MyMoneyMoney(12, 1)).convert(); } if(!newValue.isZero()) { - if(KMessageBox::questionYesNo(this, TQString("")+i18n("You have entered budget values using a different base which would result in a monthly budget of %1. Should this value be used to fill the monthly budget?").tqarg(newValue.formatMoney("", 2))+TQString(""), i18n("Auto assignment (caption)", "Auto assignment"), KStdGuiItem::yes(), KStdGuiItem::no(), "use_previous_budget_values") == KMessageBox::Yes) { + if(KMessageBox::questionYesNo(this, TQString("")+i18n("You have entered budget values using a different base which would result in a monthly budget of %1. Should this value be used to fill the monthly budget?").arg(newValue.formatMoney("", 2))+TQString(""), i18n("Auto assignment (caption)", "Auto assignment"), KStdGuiItem::yes(), KStdGuiItem::no(), "use_previous_budget_values") == KMessageBox::Yes) { m_amountMonthly->setValue(newValue); } } @@ -203,7 +203,7 @@ void KBudgetValues::slotChangePeriod(int id) newValue += m_field[i]->value(); } if(!newValue.isZero()) { - if(KMessageBox::questionYesNo(this, TQString("")+i18n("You have entered budget values using a different base which would result in a yearly budget of %1. Should this value be used to fill the monthly budget?").tqarg(newValue.formatMoney("", 2))+TQString(""), i18n("Auto assignment (caption)", "Auto assignment"), KStdGuiItem::yes(), KStdGuiItem::no(), "use_previous_budget_values") == KMessageBox::Yes) { + if(KMessageBox::questionYesNo(this, TQString("")+i18n("You have entered budget values using a different base which would result in a yearly budget of %1. Should this value be used to fill the monthly budget?").arg(newValue.formatMoney("", 2))+TQString(""), i18n("Auto assignment (caption)", "Auto assignment"), KStdGuiItem::yes(), KStdGuiItem::no(), "use_previous_budget_values") == KMessageBox::Yes) { m_amountYearly->setValue(newValue); } } @@ -222,7 +222,7 @@ void KBudgetValues::slotChangePeriod(int id) } if(!newValue.isZero()) { - if(KMessageBox::questionYesNo(this, TQString("")+i18n("You have entered budget values using a different base which would result in an individual monthly budget of %1. Should this value be used to fill the monthly budgets?").tqarg(newValue.formatMoney("", 2))+TQString(""), i18n("Auto assignment (caption)", "Auto assignment"), KStdGuiItem::yes(), KStdGuiItem::no(), "use_previous_budget_values") == KMessageBox::Yes) { + if(KMessageBox::questionYesNo(this, TQString("")+i18n("You have entered budget values using a different base which would result in an individual monthly budget of %1. Should this value be used to fill the monthly budgets?").arg(newValue.formatMoney("", 2))+TQString(""), i18n("Auto assignment (caption)", "Auto assignment"), KStdGuiItem::yes(), KStdGuiItem::no(), "use_previous_budget_values") == KMessageBox::Yes) { for(int i=0; i < 12; ++i) m_field[i]->setValue(newValue); } diff --git a/kmymoney2/widgets/klistviewsearchline.cpp b/kmymoney2/widgets/klistviewsearchline.cpp index 97431b1..b2d554c 100644 --- a/kmymoney2/widgets/klistviewsearchline.cpp +++ b/kmymoney2/widgets/klistviewsearchline.cpp @@ -263,7 +263,7 @@ TQPopupMenu *KListViewSearchLine::createPopupMenu() for(int j = 0; j < header->mapToIndex(i); j++) if(d->listView->columnWidth(header->mapToSection(j))>0) visiblePosition++; - columnText = i18n("Column number %1","Column No. %1").tqarg(visiblePosition); + columnText = i18n("Column number %1","Column No. %1").arg(visiblePosition); } subMenu->insertItem(columnText, visibleColumns); if(d->searchColumns.isEmpty() || d->searchColumns.find(i) != d->searchColumns.end()) @@ -376,12 +376,12 @@ bool KListViewSearchLine::checkItemParentsVisible(TQListViewItem *item, TQListVi TQListViewItem * first = item; for(; item; item = item->nextSibling()) { - //What we pass to our tqchildren as highestHiddenParent: + //What we pass to our children as highestHiddenParent: TQListViewItem * hhp = highestHiddenParent ? highestHiddenParent : item->isVisible() ? 0L : item; bool childMatch = false; if(item->firstChild() && checkItemParentsVisible(item->firstChild(), hhp)) childMatch = true; - // Should this item be shown? It should if any tqchildren should be, or if it matches. + // Should this item be shown? It should if any children should be, or if it matches. if(childMatch || itemMatches(item, d->search)) { visible = true; @@ -393,7 +393,7 @@ bool KListViewSearchLine::checkItemParentsVisible(TQListViewItem *item, TQListVi for(TQListViewItem *hide = first; hide != item; hide = hide->nextSibling()) hide->setVisible(false); highestHiddenParent = 0; - // If we matched, than none of our tqchildren matched, yet the setVisible() call on our + // If we matched, than none of our children matched, yet the setVisible() call on our // ancestor unhid them, undo the damage: if(!childMatch) for(TQListViewItem *hide = item->firstChild(); hide; hide = hide->nextSibling()) diff --git a/kmymoney2/widgets/klistviewsearchline.h b/kmymoney2/widgets/klistviewsearchline.h index 1ecb94b..7655c2b 100644 --- a/kmymoney2/widgets/klistviewsearchline.h +++ b/kmymoney2/widgets/klistviewsearchline.h @@ -112,7 +112,7 @@ public slots: /** * When a search is active on a list that's organized into a tree view if * a parent or ancesestor of an item is does not match the search then it - * will be hidden and as such so too will any tqchildren that match. + * will be hidden and as such so too will any children that match. * * If this is set to true (the default) then the parents of matching items * will be shown. @@ -190,7 +190,7 @@ private: /** * This is used in case parent items of matching items should be visible. - * It makes a recursive call to all tqchildren. It returns true if at least + * It makes a recursive call to all children. It returns true if at least * one item in the subtree with the given root item is visible. */ bool checkItemParentsVisible(TQListViewItem *item, TQListViewItem *highestHiddenParent = 0); diff --git a/kmymoney2/widgets/kmymoneyaccountselector.cpp b/kmymoney2/widgets/kmymoneyaccountselector.cpp index e33a2e5..33bba13 100644 --- a/kmymoney2/widgets/kmymoneyaccountselector.cpp +++ b/kmymoney2/widgets/kmymoneyaccountselector.cpp @@ -182,7 +182,7 @@ bool kMyMoneyAccountSelector::contains(const TQString& txt) const i18n("Security"); while((it_v = it.current()) != 0) { - TQRegExp exp(TQString("^(?:%1):%2$").tqarg(baseName).tqarg(TQRegExp::escape(txt))); + TQRegExp exp(TQString("^(?:%1):%2$").arg(baseName).arg(TQRegExp::escape(txt))); if(it_v->rtti() == 1) { KMyMoneyCheckListItem* it_c = dynamic_cast(it_v); if(exp.search(it_c->key(1, true)) != -1) { @@ -346,28 +346,28 @@ int AccountSet::load(kMyMoneyAccountSelector* selector) TQListViewItem* after = 0; // create the favorite section first and sort it to the beginning - key = TQString("A%1").tqarg(i18n("Favorites")); + key = TQString("A%1").arg(i18n("Favorites")); m_favorites = selector->newItem(i18n("Favorites"), key); for(int mask = 0x01; mask != KMyMoneyUtils::last; mask <<= 1) { TQListViewItem* item = 0; if((typeMask & mask & KMyMoneyUtils::asset) != 0) { ++m_count; - key = TQString("B%1").tqarg(i18n("Asset")); + key = TQString("B%1").arg(i18n("Asset")); item = selector->newItem(i18n("Asset accounts"), key); list = m_file->asset().accountList(); } if((typeMask & mask & KMyMoneyUtils::liability) != 0) { ++m_count; - key = TQString("C%1").tqarg(i18n("Liability")); + key = TQString("C%1").arg(i18n("Liability")); item = selector->newItem(i18n("Liability accounts"), key); list = m_file->liability().accountList(); } if((typeMask & mask & KMyMoneyUtils::income) != 0) { ++m_count; - key = TQString("D%1").tqarg(i18n("Income")); + key = TQString("D%1").arg(i18n("Income")); item = selector->newItem(i18n("Income categories"), key); list = m_file->income().accountList(); if(selector->selectionMode() == TQListView::Multi) { @@ -377,7 +377,7 @@ int AccountSet::load(kMyMoneyAccountSelector* selector) if((typeMask & mask & KMyMoneyUtils::expense) != 0) { ++m_count; - key = TQString("E%1").tqarg(i18n("Expense")); + key = TQString("E%1").arg(i18n("Expense")); item = selector->newItem(i18n("Expense categories"), key); list = m_file->expense().accountList(); if(selector->selectionMode() == TQListView::Multi) { @@ -387,7 +387,7 @@ int AccountSet::load(kMyMoneyAccountSelector* selector) if((typeMask & mask & KMyMoneyUtils::equity) != 0) { ++m_count; - key = TQString("F%1").tqarg(i18n("Equity")); + key = TQString("F%1").arg(i18n("Equity")); item = selector->newItem(i18n("Equity accounts"), key); list = m_file->equity().accountList(); } @@ -470,7 +470,7 @@ int AccountSet::load(kMyMoneyAccountSelector* selector, const TQString& baseName continue; TQString tmpKey; // the first character must be preset. Since we don't know any sort order here, we just use A - tmpKey = TQString("A%1%2%3").tqarg(baseName, MyMoneyFile::AccountSeperator, acc.name()); + tmpKey = TQString("A%1%2%3").arg(baseName, MyMoneyFile::AccountSeperator, acc.name()); selector->newItem(item, acc.name(), tmpKey, acc.id()); ++m_count; ++count; diff --git a/kmymoney2/widgets/kmymoneyaccounttree.cpp b/kmymoney2/widgets/kmymoneyaccounttree.cpp index be2be0c..e89553b 100644 --- a/kmymoney2/widgets/kmymoneyaccounttree.cpp +++ b/kmymoney2/widgets/kmymoneyaccounttree.cpp @@ -104,7 +104,7 @@ void KMyMoneyAccountTreeItem::fillColumns() } if(!m_account.value("VatRate").isEmpty()) { vatRate = MyMoneyMoney(m_account.value("VatRate")) * MyMoneyMoney(100,1); - setText(lv->vatCategoryColumn(), TQString("%1 %").tqarg(vatRate.formatMoney("", 1))); + setText(lv->vatCategoryColumn(), TQString("%1 %").arg(vatRate.formatMoney("", 1))); } break; default: diff --git a/kmymoney2/widgets/kmymoneyaccounttreebase.cpp b/kmymoney2/widgets/kmymoneyaccounttreebase.cpp index c6c5d6d..03d5c41 100644 --- a/kmymoney2/widgets/kmymoneyaccounttreebase.cpp +++ b/kmymoney2/widgets/kmymoneyaccounttreebase.cpp @@ -129,8 +129,8 @@ void KMyMoneyAccountTreeBase::showValue(void) void KMyMoneyAccountTreeBase::connectNotify(const char * /* s */) { // update drag and drop settings - m_accountConnections = (tqreceivers(TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyAccount&))) != 0); - m_institutionConnections = (tqreceivers(TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyInstitution&))) != 0); + m_accountConnections = (receivers(TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyAccount&))) != 0); + m_institutionConnections = (receivers(TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyInstitution&))) != 0); setDragEnabled(m_accountConnections | m_institutionConnections); setAcceptDrops(m_accountConnections | m_institutionConnections); } @@ -138,8 +138,8 @@ void KMyMoneyAccountTreeBase::connectNotify(const char * /* s */) void KMyMoneyAccountTreeBase::disconnectNotify(const char * /* s */) { // update drag and drop settings - m_accountConnections = (tqreceivers(TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyAccount&))) != 0); - m_institutionConnections = (tqreceivers(TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyInstitution&))) != 0); + m_accountConnections = (receivers(TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyAccount&))) != 0); + m_institutionConnections = (receivers(TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyInstitution&))) != 0); setDragEnabled(m_accountConnections | m_institutionConnections); setAcceptDrops(m_accountConnections | m_institutionConnections); } @@ -380,7 +380,7 @@ void KMyMoneyAccountTreeBase::slotOpenFolder(void) m_autoopenTimer.stop(); if ( m_dropItem && !m_dropItem->isOpen() ) { m_dropItem->setOpen( TRUE ); - m_dropItem->tqrepaint(); + m_dropItem->repaint(); } } @@ -450,7 +450,7 @@ void KMyMoneyAccountTreeBase::contentsDragMoveEvent(TQDragMoveEvent* e) if (tmpRect != m_lastDropHighlighter) { cleanItemHighlighter(); m_lastDropHighlighter = tmpRect; - viewport()->tqrepaint(tmpRect); + viewport()->repaint(tmpRect); } } } @@ -497,12 +497,12 @@ void KMyMoneyAccountTreeBase::cleanItemHighlighter(void) if(m_lastDropHighlighter.isValid()) { TQRect rect=m_lastDropHighlighter; m_lastDropHighlighter = TQRect(); - // make sure, we tqrepaint a bit more. that's important during + // make sure, we repaint a bit more. that's important during // autoscroll. if we don't do that, parts of the highlighter // do not get removed rect.moveBy(-1, -1); rect.setSize(rect.size() + TQSize(2,2)); - viewport()->tqrepaint(rect, true); + viewport()->repaint(rect, true); } } @@ -684,7 +684,7 @@ void KMyMoneyAccountTreeBaseItem::adjustTotalValue(const MyMoneyMoney& diff) { m_totalValue += diff; - // if the entry has no tqchildren, + // if the entry has no children, // or it is the top entry // or it is currently not open // we need to display the value of it diff --git a/kmymoney2/widgets/kmymoneyaccounttreebase.h b/kmymoney2/widgets/kmymoneyaccounttreebase.h index 9843b9d..f44837b 100644 --- a/kmymoney2/widgets/kmymoneyaccounttreebase.h +++ b/kmymoney2/widgets/kmymoneyaccounttreebase.h @@ -353,7 +353,7 @@ public: /** * If o is TRUE all child items are shown initially. The user can * hide them by clicking the - icon to the left of the item. If - * o is FALSE, the tqchildren of this item are initially hidden. + * o is FALSE, the children of this item are initially hidden. * The user can show them by clicking the + icon to the left of the item. * * Overrides KListViewItem::setOpen() and exchanges the value field diff --git a/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp b/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp index 1d1717c..d7584c5 100644 --- a/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp +++ b/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp @@ -64,7 +64,7 @@ void KMyMoneyAccountTreeForecast::showSummary(MyMoneyForecast& forecast) } for(int i = 0; ((i*forecast.accountsCycle())+daysToBeginDay) <= forecast.forecastDays(); ++i) { int intervalDays = ((i*forecast.accountsCycle())+daysToBeginDay); - TQString columnName = i18n("%1 days").tqarg(intervalDays, 0, 10); + TQString columnName = i18n("%1 days").arg(intervalDays, 0, 10); addColumn(columnName, -1); } @@ -111,14 +111,14 @@ void KMyMoneyAccountTreeForecast::showAdvanced(MyMoneyForecast& forecast) //add columns for(int i = 1; ((i * forecast.accountsCycle()) + daysToBeginDay) <= forecast.forecastDays(); ++i) { - int col = addColumn(i18n("Min Bal %1").tqarg(i), -1); + int col = addColumn(i18n("Min Bal %1").arg(i), -1); setColumnAlignment(col, TQt::AlignRight); - addColumn(i18n("Min Date %1").tqarg(i), -1); + addColumn(i18n("Min Date %1").arg(i), -1); } for(int i = 1; ((i * forecast.accountsCycle()) + daysToBeginDay) <= forecast.forecastDays(); ++i) { - int col = addColumn(i18n("Max Bal %1").tqarg(i), -1); + int col = addColumn(i18n("Max Bal %1").arg(i), -1); setColumnAlignment(col, TQt::AlignRight); - addColumn(i18n("Max Date %1").tqarg(i), -1); + addColumn(i18n("Max Date %1").arg(i), -1); } int col = addColumn(i18n("Average"), -1); setColumnAlignment(col, TQt::AlignRight); @@ -329,7 +329,7 @@ void KMyMoneyAccountTreeForecastItem::adjustParentValue(int column, const MyMone m_values[column] += value; m_values[column] = m_values[column].convert(listView()->baseCurrency().smallestAccountFraction()); - // if the entry has no tqchildren, + // if the entry has no children, // or it is the top entry // or it is currently not open // we need to display the value of it diff --git a/kmymoney2/widgets/kmymoneybriefschedule.cpp b/kmymoney2/widgets/kmymoneybriefschedule.cpp index 5cb6348..5fa5917 100644 --- a/kmymoney2/widgets/kmymoneybriefschedule.cpp +++ b/kmymoney2/widgets/kmymoneybriefschedule.cpp @@ -94,8 +94,8 @@ void KMyMoneyBriefSchedule::loadSchedule() MyMoneySchedule sched = m_scheduleList[m_index]; m_indexLabel->setText(i18n("%1 of %2") - .tqarg(TQString::number(m_index+1)) - .tqarg(TQString::number(m_scheduleList.count()))); + .arg(TQString::number(m_index+1)) + .arg(TQString::number(m_scheduleList.count()))); m_name->setText(sched.name()); m_type->setText(KMyMoneyUtils::scheduleTypeToString(sched.type())); m_account->setText(sched.account().name()); @@ -107,15 +107,15 @@ void KMyMoneyBriefSchedule::loadSchedule() { int transactions = sched.paymentDates(m_date, sched.endDate()).count()-1; text = i18n("Payment on %1 for %2 with %3 transactions remaining occuring %4.") - .tqarg(KGlobal::locale()->formatDate(m_date, true)) - .tqarg(amount.formatMoney(sched.account().fraction())) - .tqarg(TQString::number(transactions)) - .tqarg(i18n(sched.occurenceToString())); + .arg(KGlobal::locale()->formatDate(m_date, true)) + .arg(amount.formatMoney(sched.account().fraction())) + .arg(TQString::number(transactions)) + .arg(i18n(sched.occurenceToString())); } else { text = i18n("Payment on %1 for %2 occuring %4.") - .tqarg(KGlobal::locale()->formatDate(m_date, true)) - .tqarg(amount.formatMoney(sched.account().fraction())) - .tqarg(i18n(sched.occurenceToString())); + .arg(KGlobal::locale()->formatDate(m_date, true)) + .arg(amount.formatMoney(sched.account().fraction())) + .arg(i18n(sched.occurenceToString())); } if (m_date < TQDate::currentDate()) @@ -134,8 +134,8 @@ void KMyMoneyBriefSchedule::loadSchedule() text += "
"; text += i18n("%1 days overdue (%2 occurences).") - .tqarg(TQString::number(days)) - .tqarg(TQString::number(transactions)); + .arg(TQString::number(days)) + .arg(TQString::number(transactions)); text += ""; } } diff --git a/kmymoney2/widgets/kmymoneycalculator.cpp b/kmymoney2/widgets/kmymoneycalculator.cpp index adc51d2..47d45ed 100644 --- a/kmymoney2/widgets/kmymoneycalculator.cpp +++ b/kmymoney2/widgets/kmymoneycalculator.cpp @@ -337,7 +337,7 @@ const TQString kMyMoneyCalculator::result(void) const mask = "-%1"; break; } - txt = TQString(mask).tqarg(txt); + txt = TQString(mask).arg(txt); } return txt; } @@ -433,7 +433,7 @@ void kMyMoneyCalculator::setInitialValues(const TQString& value, TQKeyEvent* ev) if(operand.isEmpty()) operand = "0"; else if(negative) - operand = TQString("-%1").tqarg(operand); + operand = TQString("-%1").arg(operand); changeDisplay(operand); diff --git a/kmymoney2/widgets/kmymoneycalendar.cpp b/kmymoney2/widgets/kmymoneycalendar.cpp index 4c824c8..61b91fd 100644 --- a/kmymoney2/widgets/kmymoneycalendar.cpp +++ b/kmymoney2/widgets/kmymoneycalendar.cpp @@ -261,7 +261,7 @@ kMyMoneyCalendar::dateChangedSlot(TQDate date) { kdDebug() << "kMyMoneyCalendar::dateChangedSlot: date changed (" << date.year() << "/" << date.month() << "/" << date.day() << ")." << endl; line->setText(KGlobal::locale()->formatDate(date, true)); - d->selectWeek->setText(i18n("Week %1").tqarg(weekOfYear(date))); + d->selectWeek->setText(i18n("Week %1").arg(weekOfYear(date))); selectMonth->setText(MONTH_NAME(date.month(), date.year(), false)); selectYear->setText(date.toString("yyyy")); emit(dateChanged(date)); @@ -297,7 +297,7 @@ kMyMoneyCalendar::setDate(const TQDate& date) TQString temp; // ----- table->setDate(date); - d->selectWeek->setText(i18n("Week %1").tqarg(weekOfYear(date))); + d->selectWeek->setText(i18n("Week %1").arg(weekOfYear(date))); selectMonth->setText(MONTH_NAME(date.month(), date.year(), false)); temp.setNum(date.year()); selectYear->setText(temp); diff --git a/kmymoney2/widgets/kmymoneychecklistitem.cpp b/kmymoney2/widgets/kmymoneychecklistitem.cpp index 039d2c8..49b96fa 100644 --- a/kmymoney2/widgets/kmymoneychecklistitem.cpp +++ b/kmymoney2/widgets/kmymoneychecklistitem.cpp @@ -85,7 +85,7 @@ void KMyMoneyCheckListItem::stateChange(bool state) emit stateChanged(state); } -void KMyMoneyCheckListItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) +void KMyMoneyCheckListItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) { TQColorGroup _cg = cg; _cg.setColor(TQColorGroup::Base, backgroundColor()); @@ -95,7 +95,7 @@ void KMyMoneyCheckListItem::paintCell(TQPainter *p, const TQColorGroup &cg, int f.setBold(!isSelectable()); p->setFont(f); - TQCheckListItem::paintCell(p, _cg, column, width, tqalignment); + TQCheckListItem::paintCell(p, _cg, column, width, alignment); } const TQColor KMyMoneyCheckListItem::backgroundColor() diff --git a/kmymoney2/widgets/kmymoneychecklistitem.h b/kmymoney2/widgets/kmymoneychecklistitem.h index 26624f4..cbfb30f 100644 --- a/kmymoney2/widgets/kmymoneychecklistitem.h +++ b/kmymoney2/widgets/kmymoneychecklistitem.h @@ -56,7 +56,7 @@ public: /** * use my own paint method */ - void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment); + void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment); /** * use my own backgroundColor method diff --git a/kmymoney2/widgets/kmymoneycombo.cpp b/kmymoney2/widgets/kmymoneycombo.cpp index 7146f68..37f4517 100644 --- a/kmymoney2/widgets/kmymoneycombo.cpp +++ b/kmymoney2/widgets/kmymoneycombo.cpp @@ -267,7 +267,7 @@ void KMyMoneyCombo::focusOutEvent(TQFocusEvent* e) m_id = TQString(); if(!id.isEmpty()) emit itemSelected(m_id); - tqrepaint(); + repaint(); } m_inFocusOutEvent = false; } diff --git a/kmymoney2/widgets/kmymoneycurrencyselector.cpp b/kmymoney2/widgets/kmymoneycurrencyselector.cpp index b2637a2..f99dd93 100644 --- a/kmymoney2/widgets/kmymoneycurrencyselector.cpp +++ b/kmymoney2/widgets/kmymoneycurrencyselector.cpp @@ -96,9 +96,9 @@ void KMyMoneySecuritySelector::update(const TQString& id) default: case FullName: if((*it).isCurrency()) { - display = TQString("%2 (%1)").tqarg((*it).id()).tqarg((*it).name()); + display = TQString("%2 (%1)").arg((*it).id()).arg((*it).name()); } else - display = TQString("%2 (%1)").tqarg((*it).tradingSymbol()).tqarg((*it).name()); + display = TQString("%2 (%1)").arg((*it).tradingSymbol()).arg((*it).name()); break; break; diff --git a/kmymoney2/widgets/kmymoneydateinput.cpp b/kmymoney2/widgets/kmymoneydateinput.cpp index 3362a15..9203a76 100644 --- a/kmymoney2/widgets/kmymoneydateinput.cpp +++ b/kmymoney2/widgets/kmymoneydateinput.cpp @@ -72,7 +72,7 @@ bool KMyMoneyDateEdit::event(TQEvent* e) kMyMoneyDateInput::kMyMoneyDateInput(TQWidget *parent, const char *name, TQt::AlignmentFlags flags) : TQHBox(parent,name) { - m_qttqalignment = flags; + m_qtalignment = flags; m_date = TQDate::currentDate(); dateEdit = new KMyMoneyDateEdit(m_date, this, "dateEdit"); @@ -191,7 +191,7 @@ void kMyMoneyDateInput::toggleDatePicker() } else { - TQPoint tmpPoint = mapToGlobal(m_dateButton->tqgeometry().bottomRight()); + TQPoint tmpPoint = mapToGlobal(m_dateButton->geometry().bottomRight()); // usually, the datepicker widget is shown underneath the dateEdit widget // if it does not fit on the screen, we show it above this widget @@ -200,7 +200,7 @@ void kMyMoneyDateInput::toggleDatePicker() tmpPoint.setY(tmpPoint.y() - h - m_dateButton->height()); } - if((m_qttqalignment == TQt::AlignRight && tmpPoint.x()+w <= TQApplication::desktop()->width()) + if((m_qtalignment == TQt::AlignRight && tmpPoint.x()+w <= TQApplication::desktop()->width()) || (tmpPoint.x()-w < 0) ) { m_dateFrame->setGeometry(tmpPoint.x()-width(), tmpPoint.y(), w, h); diff --git a/kmymoney2/widgets/kmymoneydateinput.h b/kmymoney2/widgets/kmymoneydateinput.h index c47abb6..d3c3f33 100644 --- a/kmymoney2/widgets/kmymoneydateinput.h +++ b/kmymoney2/widgets/kmymoneydateinput.h @@ -114,7 +114,7 @@ private: KDatePicker *m_datePicker; TQDate m_date; // The date ! TQDate m_prevDate; - TQt::AlignmentFlags m_qttqalignment; + TQt::AlignmentFlags m_qtalignment; TQVBox *m_dateFrame; KPushButton *m_dateButton; KPassivePopup *m_datePopup; diff --git a/kmymoney2/widgets/kmymoneydatetbl.cpp b/kmymoney2/widgets/kmymoneydatetbl.cpp index 4007345..37d1311 100644 --- a/kmymoney2/widgets/kmymoneydatetbl.cpp +++ b/kmymoney2/widgets/kmymoneydatetbl.cpp @@ -168,8 +168,8 @@ kMyMoneyDateTbl::paintCell(TQPainter *painter, int row, int col) TQString weekStr = TQString::number(date.weekNumber(&year)); TQString yearStr = TQString::number(year); headerText = i18n("Week %1 for year %2.") - .tqarg(weekStr) - .tqarg(yearStr); + .arg(weekStr) + .arg(yearStr); painter->drawText(0, 0, w, h-1, AlignCenter, headerText, -1, &rect); diff --git a/kmymoney2/widgets/kmymoneyedit.cpp b/kmymoney2/widgets/kmymoneyedit.cpp index 54affd2..c3ad220 100644 --- a/kmymoney2/widgets/kmymoneyedit.cpp +++ b/kmymoney2/widgets/kmymoneyedit.cpp @@ -118,7 +118,7 @@ TQValidator::State kMyMoneyMoneyValidator::validate( TQString & input, int & _p // check for minus sign trailing the number TQRegExp trailingMinus("^([^-]*)\\w*-$"); if(s.find(trailingMinus) != -1) { - s = TQString("-%1").tqarg(trailingMinus.cap(1)); + s = TQString("-%1").arg(trailingMinus.cap(1)); } // check for the maximum allowed number of decimal places @@ -477,7 +477,7 @@ void kMyMoneyEdit::calculatorOpen(TQKeyEvent* k) if(p.x() + w > TQApplication::desktop()->width()) p.setX(p.x() + width() - w); - TQRect r = m_calculator->tqgeometry(); + TQRect r = m_calculator->geometry(); r.moveTopLeft(p); m_calculatorFrame->setGeometry(r); m_calculatorFrame->show(); diff --git a/kmymoney2/widgets/kmymoneyforecastlistviewitem.cpp b/kmymoney2/widgets/kmymoneyforecastlistviewitem.cpp index 75f3491..9164d1a 100644 --- a/kmymoney2/widgets/kmymoneyforecastlistviewitem.cpp +++ b/kmymoney2/widgets/kmymoneyforecastlistviewitem.cpp @@ -43,7 +43,7 @@ KMyMoneyForecastListViewItem::~KMyMoneyForecastListViewItem() { } -void KMyMoneyForecastListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) +void KMyMoneyForecastListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) { TQColorGroup _cg = cg; TQColor textColour; @@ -54,7 +54,7 @@ void KMyMoneyForecastListViewItem::paintCell(TQPainter *p, const TQColorGroup &c } _cg.setColor(TQColorGroup::Text, textColour); - KListViewItem::paintCell(p, _cg, column, width, tqalignment); + KListViewItem::paintCell(p, _cg, column, width, alignment); } void KMyMoneyForecastListViewItem::setNegative(bool isNegative) diff --git a/kmymoney2/widgets/kmymoneyforecastlistviewitem.h b/kmymoney2/widgets/kmymoneyforecastlistviewitem.h index 6a08c61..fe5fd0a 100644 --- a/kmymoney2/widgets/kmymoneyforecastlistviewitem.h +++ b/kmymoney2/widgets/kmymoneyforecastlistviewitem.h @@ -52,7 +52,7 @@ public: /** * use my own paint method */ - void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment); + void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment); private: diff --git a/kmymoney2/widgets/kmymoneygpgconfigdecl.ui b/kmymoney2/widgets/kmymoneygpgconfigdecl.ui index ec3c34c..4e6e762 100644 --- a/kmymoney2/widgets/kmymoneygpgconfigdecl.ui +++ b/kmymoney2/widgets/kmymoneygpgconfigdecl.ui @@ -53,7 +53,7 @@ The <i>Recovery encryption</i> group is only accessible, if the nece RichText - + WordBreak|AlignTop @@ -168,7 +168,7 @@ This mechanism is provided for the case that you have lost your key and cannot a RichText - + WordBreak|AlignTop diff --git a/kmymoney2/widgets/kmymoneylineedit.cpp b/kmymoney2/widgets/kmymoneylineedit.cpp index 53cb3a5..5907782 100644 --- a/kmymoney2/widgets/kmymoneylineedit.cpp +++ b/kmymoney2/widgets/kmymoneylineedit.cpp @@ -35,11 +35,11 @@ #include "kmymoneylineedit.h" -kMyMoneyLineEdit::kMyMoneyLineEdit(TQWidget *w, const char* name, bool forceMonetaryDecimalSymbol, int tqalignment) : +kMyMoneyLineEdit::kMyMoneyLineEdit(TQWidget *w, const char* name, bool forceMonetaryDecimalSymbol, int alignment) : KLineEdit(w, name), m_forceMonetaryDecimalSymbol(forceMonetaryDecimalSymbol) { - setAlignment(tqalignment); + setAlignment(alignment); } kMyMoneyLineEdit::~kMyMoneyLineEdit() @@ -69,7 +69,7 @@ void kMyMoneyLineEdit::focusOutEvent(TQFocusEvent *ev) // force update of hint if(text().isEmpty()) - tqrepaint(); + repaint(); } void kMyMoneyLineEdit::keyReleaseEvent(TQKeyEvent* k) diff --git a/kmymoney2/widgets/kmymoneylineedit.h b/kmymoney2/widgets/kmymoneylineedit.h index e97205d..30d079e 100644 --- a/kmymoney2/widgets/kmymoneylineedit.h +++ b/kmymoney2/widgets/kmymoneylineedit.h @@ -52,10 +52,10 @@ public: * @param name pointer to name of object * @param forceMonetaryDecimalSymbol if @a true, the numeric keypad comma key will have a fixed * value and does not follow the keyboard tqlayout (default: @p false) - * @param tqalignment Controls the tqalignment of the text. Default is TQt::AlignLeft | TQt::AlignVCenter. + * @param alignment Controls the alignment of the text. Default is TQt::AlignLeft | TQt::AlignVCenter. * See TQt::AlignmentFlags for other possible values. */ - kMyMoneyLineEdit(TQWidget *w = 0, const char* name = 0, bool forceMonetaryDecimalSymbol = false, int tqalignment = (AlignLeft | AlignVCenter)); + kMyMoneyLineEdit(TQWidget *w = 0, const char* name = 0, bool forceMonetaryDecimalSymbol = false, int alignment = (AlignLeft | AlignVCenter)); ~kMyMoneyLineEdit(); /** diff --git a/kmymoney2/widgets/kmymoneylistviewitem.cpp b/kmymoney2/widgets/kmymoneylistviewitem.cpp index 2ed4377..09ff2f9 100644 --- a/kmymoney2/widgets/kmymoneylistviewitem.cpp +++ b/kmymoney2/widgets/kmymoneylistviewitem.cpp @@ -71,7 +71,7 @@ TQString KMyMoneyListViewItem::key(int column, bool ascending) const } -void KMyMoneyListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) +void KMyMoneyListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) { TQColorGroup _cg = cg; _cg.setColor(TQColorGroup::Base, backgroundColor()); @@ -79,7 +79,7 @@ void KMyMoneyListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int c // make sure to bypass KListViewItem::paintCell() as // we don't like it's logic - that's why we do this // here ;-) (ipwizard) - TQListViewItem::paintCell(p, _cg, column, width, tqalignment); + TQListViewItem::paintCell(p, _cg, column, width, alignment); } const TQColor KMyMoneyListViewItem::backgroundColor() diff --git a/kmymoney2/widgets/kmymoneylistviewitem.h b/kmymoney2/widgets/kmymoneylistviewitem.h index 72e41ea..015a002 100644 --- a/kmymoney2/widgets/kmymoneylistviewitem.h +++ b/kmymoney2/widgets/kmymoneylistviewitem.h @@ -55,7 +55,7 @@ public: /** * use my own paint method */ - void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment); + void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment); /** * use my own backgroundColor method diff --git a/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp b/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp index 7d203fa..f15773c 100644 --- a/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp +++ b/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp @@ -238,7 +238,7 @@ void kMyMoneyScheduledDateTbl::drawCellContents(TQPainter *painter, int /*row*/, if (billSchedules.count() >= 1) { - text += i18n("%1 Bills.").tqarg(TQString::number(billSchedules.count())); + text += i18n("%1 Bills.").arg(TQString::number(billSchedules.count())); } } @@ -254,7 +254,7 @@ void kMyMoneyScheduledDateTbl::drawCellContents(TQPainter *painter, int /*row*/, { if(!text.isEmpty()) text += " "; - text += i18n("%1 Deposits.").tqarg(TQString::number(depositSchedules.count())); + text += i18n("%1 Deposits.").arg(TQString::number(depositSchedules.count())); } } @@ -270,7 +270,7 @@ void kMyMoneyScheduledDateTbl::drawCellContents(TQPainter *painter, int /*row*/, { if(!text.isEmpty()) text += " "; - text += i18n("%1 Transfers.").tqarg(TQString::number(transferSchedules.count())); + text += i18n("%1 Transfers.").arg(TQString::number(transferSchedules.count())); } } } diff --git a/kmymoney2/widgets/kmymoneyselector.cpp b/kmymoney2/widgets/kmymoneyselector.cpp index daf7991..b32adcb 100644 --- a/kmymoney2/widgets/kmymoneyselector.cpp +++ b/kmymoney2/widgets/kmymoneyselector.cpp @@ -319,7 +319,7 @@ void KMyMoneySelector::removeItem(const TQString& id) it++; } - // get rid of top items that just lost the last tqchildren (e.g. Favorites) + // get rid of top items that just lost the last children (e.g. Favorites) it = TQListViewItemIterator(m_listView, TQListViewItemIterator::NotSelectable); while((it_v = it.current()) != 0) { if(it_v->rtti() == 1) { @@ -536,14 +536,14 @@ int KMyMoneySelector::slotMakeCompletion(const TQRegExp& exp) TQListViewItem* it_v; // The logic used here seems to be awkward. The problem is, that - // TQListViewItem::setVisible works recursively on all it's tqchildren - // and grand-tqchildren. + // TQListViewItem::setVisible works recursively on all it's children + // and grand-children. // // The way out of this is as follows: Make all items visible. // Then go through the list again and perform the checks. - // If an item does not have any tqchildren (last leaf in the tree view) + // If an item does not have any children (last leaf in the tree view) // perform the check. Then check recursively on the parent of this - // leaf that it has no visible tqchildren. If that is the case, make the + // leaf that it has no visible children. If that is the case, make the // parent invisible and continue this check with it's parent. while((it_v = it.current()) != 0) { it_v->setVisible(true); @@ -558,12 +558,12 @@ int KMyMoneySelector::slotMakeCompletion(const TQRegExp& exp) if(it_v->firstChild() == 0) { if(!match(exp, it_v)) { // this is a node which does not contain the - // text and does not have tqchildren. So we can + // text and does not have children. So we can // safely hide it. Then we check, if the parent - // has more tqchildren which are still visible. If + // has more children which are still visible. If // none are found, the parent node is hidden also. We // continue until the top of the tree or until we - // find a node that still has visible tqchildren. + // find a node that still has visible children. bool hide = true; while(hide) { it_v->setVisible(false); @@ -587,7 +587,7 @@ int KMyMoneySelector::slotMakeCompletion(const TQRegExp& exp) if(!firstMatch) { firstMatch = it_v; } - // a node with tqchildren contains the text. We want + // a node with children contains the text. We want // to display all child nodes in this case, so we need // to advance the iterator to the next sibling of the // current node. This could well be the sibling of a @@ -606,7 +606,7 @@ int KMyMoneySelector::slotMakeCompletion(const TQRegExp& exp) } while(it.current() && it.current() != item); } else { - // It's a node with tqchildren that does not match. We don't + // It's a node with children that does not match. We don't // change it's status here. ++it; } diff --git a/kmymoney2/widgets/kmymoneytitlelabel.cpp b/kmymoney2/widgets/kmymoneytitlelabel.cpp index 5cf561c..4abef85 100644 --- a/kmymoney2/widgets/kmymoneytitlelabel.cpp +++ b/kmymoney2/widgets/kmymoneytitlelabel.cpp @@ -91,7 +91,7 @@ void KMyMoneyTitleLabel::drawContents(TQPainter *p) TQLabel::drawContents(p); // then draw text on top - tqstyle().drawItem( p, contentsRect(), tqalignment(), colorGroup(), isEnabled(), + tqstyle().drawItem( p, contentsRect(), alignment(), colorGroup(), isEnabled(), 0, TQString(" ")+m_text, -1, &m_textColor ); } diff --git a/kmymoney2/widgets/kmymoneywizard.cpp b/kmymoney2/widgets/kmymoneywizard.cpp index aeef106..24f9fbc 100644 --- a/kmymoney2/widgets/kmymoneywizard.cpp +++ b/kmymoney2/widgets/kmymoneywizard.cpp @@ -271,7 +271,7 @@ void KMyMoneyWizard::updateStepCount(void) hiddenAdjust++; ++step; } - m_stepLabel->setText(i18n("Step %1 of %2").tqarg(m_step - hiddenAdjust).tqarg(stepCount)); + m_stepLabel->setText(i18n("Step %1 of %2").arg(m_step - hiddenAdjust).arg(stepCount)); } void KMyMoneyWizard::setFirstPage(KMyMoneyWizardPage* page) diff --git a/kmymoney2/widgets/register.cpp b/kmymoney2/widgets/register.cpp index 93277cf..ef1c956 100644 --- a/kmymoney2/widgets/register.cpp +++ b/kmymoney2/widgets/register.cpp @@ -665,7 +665,7 @@ void Register::slotAutoColumnSizing(int section) size += "0"; continue; } - size += TQString("%1").tqarg((columnWidth(i) * 100) / w); + size += TQString("%1").arg((columnWidth(i) * 100) / w); } qDebug("size = %s", size.data()); m_account.setValue("kmm-ledger-column-width", size); @@ -1354,7 +1354,7 @@ void Register::adjustColumn(int col) Q_UNUSED(col) #else TQString msg = "%1 adjusting column %2"; - ::timetrace((msg.tqarg("Start").tqarg(col)).ascii()); + ::timetrace((msg.arg("Start").arg(col)).ascii()); TQHeader *topHeader = horizontalHeader(); TQFontMetrics cellFontMetrics(KMyMoneyGlobalSettings::listCellFont()); @@ -1428,7 +1428,7 @@ void Register::repaintItems(RegisterItem* first, RegisterItem* last) TQRect tmp = m_lastRepaintRect | r; if(abs(tmp.height()) > 3000) { - // make sure that the previously triggered tqrepaint has been done before we + // make sure that the previously triggered repaint has been done before we // trigger the next. Not having this used to cause some trouble when changing // the focus within a 2000 item ledger from the last to the first item. TQApplication::eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 10); @@ -1616,7 +1616,7 @@ bool Register::setFocusItem(RegisterItem* focusItem) if(focusItem && focusItem->canHaveFocus()) { if(m_focusItem) { m_focusItem->setFocus(false); - // issue a tqrepaint here only if we move the focus + // issue a repaint here only if we move the focus if(m_focusItem != focusItem) repaintItems(m_focusItem); } @@ -2290,7 +2290,7 @@ void Register::addGroupMarkers(void) MyMoneyMoney balance(m_account.value("lastStatementBalance")); if(m_account.accountGroup() == MyMoneyAccount::Liability) balance = -balance; - TQString txt = i18n("Online Statement Balance: %1").tqarg(balance.formatMoney(m_account.fraction())); + TQString txt = i18n("Online Statement Balance: %1").arg(balance.formatMoney(m_account.fraction())); new KMyMoneyRegister::StatementGroupMarker(this, KMyMoneyRegister::Deposit, TQDate::fromString(m_account.value("lastImportedTransactionDate"), Qt::ISODate), txt); } diff --git a/kmymoney2/widgets/stdtransactionmatched.cpp b/kmymoney2/widgets/stdtransactionmatched.cpp index 352999e..833c88e 100644 --- a/kmymoney2/widgets/stdtransactionmatched.cpp +++ b/kmymoney2/widgets/stdtransactionmatched.cpp @@ -140,7 +140,7 @@ void StdTransactionMatched::registerCellText(TQString& txt, int& align, int row, case DetailColumn: align |= TQt::AlignLeft; - txt = TQString("%1 %2").tqarg(matchedTransaction.postDate().toString(Qt::ISODate)).tqarg(matchedTransaction.memo()); + txt = TQString("%1 %2").arg(matchedTransaction.postDate().toString(Qt::ISODate)).arg(matchedTransaction.memo()); break; case PaymentColumn: @@ -181,7 +181,7 @@ void StdTransactionMatched::registerCellText(TQString& txt, int& align, int row, memo = memo.left(pos-1); } } - txt = TQString("%1 %2").tqarg(postDate.toString(Qt::ISODate)).tqarg(memo); + txt = TQString("%1 %2").arg(postDate.toString(Qt::ISODate)).arg(memo); break; case PaymentColumn: diff --git a/kmymoney2/widgets/transaction.cpp b/kmymoney2/widgets/transaction.cpp index 8afc4e4..daf080f 100644 --- a/kmymoney2/widgets/transaction.cpp +++ b/kmymoney2/widgets/transaction.cpp @@ -664,10 +664,10 @@ bool Transaction::maybeTip(const TQPoint& cpos, int row, int col, TQRect& r, TQS // qDebug("p is in r = %d", r.contains(cpos)); if(r.contains(cpos) && m_erronous) { if(m_transaction.splits().count() < 2) { - msg = TQString("%1").tqarg(i18n("Transaction is missing a category assignment.")); + msg = TQString("%1").arg(i18n("Transaction is missing a category assignment.")); } else { const MyMoneySecurity& sec = MyMoneyFile::instance()->security(m_account.currencyId()); - msg = TQString("%1").tqarg(i18n("The transaction has a missing assignment of %1.").tqarg(m_transaction.splitSum().abs().formatMoney(m_account, sec))); + msg = TQString("%1").arg(i18n("The transaction has a missing assignment of %1.").arg(m_transaction.splitSum().abs().formatMoney(m_account, sec))); } return true; } @@ -690,9 +690,9 @@ bool Transaction::maybeTip(const TQPoint& cpos, int row, int col, TQRect& r, TQS TQString category = file->accountToCategory(acc.id()); TQString amount = ((*it_s).value() * factor).formatMoney(acc, sec); - txt += TQString("%1%2").tqarg(category, amount); + txt += TQString("%1%2").arg(category, amount); } - msg = TQString("%1
").tqarg(txt); + msg = TQString("%1
").arg(txt); return true; } @@ -880,7 +880,7 @@ StdTransaction::StdTransaction(Register *parent, const MyMoneyTransaction& trans addon = i18n("Yield"); } if(!addon.isEmpty()) { - m_payee += TQString(" (%1)").tqarg(addon); + m_payee += TQString(" (%1)").arg(addon); } m_payeeHeader = i18n("Activity"); m_category = i18n("Investment transaction"); @@ -1533,7 +1533,7 @@ bool InvestTransaction::formCellText(TQString& txt, int& align, int row, int col if((fieldEditable = haveShares()) == true) { txt = m_split.shares().abs().formatMoney("", MyMoneyMoney::denomToPrec(m_security.smallestAccountFraction())); } else if(haveSplitRatio()) { - txt = TQString("1 / %1").tqarg(m_split.shares().abs().formatMoney("", -1)); + txt = TQString("1 / %1").arg(m_split.shares().abs().formatMoney("", -1)); } break; } @@ -1712,7 +1712,7 @@ void InvestTransaction::registerCellText(TQString& txt, int& align, int row, int if(haveShares()) txt = m_split.shares().abs().formatMoney("", MyMoneyMoney::denomToPrec(m_security.smallestAccountFraction())); else if(haveSplitRatio()) { - txt = TQString("1 / %1").tqarg(m_split.shares().abs().formatMoney("", -1)); + txt = TQString("1 / %1").arg(m_split.shares().abs().formatMoney("", -1)); } break; -- cgit v1.2.1