From 28723595822268551d3e050c3a83bf6ca5e17dd5 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:10:39 -0600 Subject: Rename old tq methods that no longer need a unique name --- kmymoney2/dialogs/investtransactioneditor.cpp | 22 +-- kmymoney2/dialogs/kaccountselectdlgdecl.ui | 6 +- kmymoney2/dialogs/kbackupdlgdecl.ui | 4 +- kmymoney2/dialogs/kbalancechartdlg.cpp | 4 +- kmymoney2/dialogs/kcategoryreassigndlgdecl.ui | 8 +- kmymoney2/dialogs/kchooseimportexportdlgdecl.ui | 8 +- kmymoney2/dialogs/kconfirmmanualenterdlgdecl.ui | 2 +- kmymoney2/dialogs/kcsvprogressdlgdecl.ui | 8 +- kmymoney2/dialogs/kcurrencycalculator.cpp | 2 +- kmymoney2/dialogs/kcurrencycalculatordecl.ui | 8 +- kmymoney2/dialogs/kcurrencyeditdlgdecl.ui | 6 +- kmymoney2/dialogs/keditequityentrydecl.ui | 6 +- kmymoney2/dialogs/keditloanwizard.cpp | 8 +- kmymoney2/dialogs/keditscheduledlg.cpp | 4 +- kmymoney2/dialogs/keditscheduledlgdecl.ui | 10 +- kmymoney2/dialogs/kendingbalancedlg.cpp | 4 +- kmymoney2/dialogs/kendingbalancedlgdecl.ui | 32 ++-- kmymoney2/dialogs/kenterscheduledlg.cpp | 12 +- kmymoney2/dialogs/kenterscheduledlgdecl.ui | 6 +- kmymoney2/dialogs/kequitypriceupdatedlg.cpp | 8 +- kmymoney2/dialogs/kequitypriceupdatedlgdecl.ui | 10 +- kmymoney2/dialogs/kexportdlgdecl.ui | 10 +- kmymoney2/dialogs/kfindtransactiondlgdecl.ui | 30 ++-- kmymoney2/dialogs/kgncimportoptionsdlgdecl.ui | 6 +- kmymoney2/dialogs/kgncpricesourcedlgdecl.ui | 8 +- kmymoney2/dialogs/kimportdlgdecl.ui | 4 +- kmymoney2/dialogs/kloadtemplatedlgdecl.ui | 2 +- kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui | 4 +- kmymoney2/dialogs/kmymoneypricedlgdecl.ui | 4 +- kmymoney2/dialogs/kmymoneysplittable.cpp | 10 +- kmymoney2/dialogs/knewaccountdlg.cpp | 2 +- kmymoney2/dialogs/knewaccountdlg.h | 2 +- kmymoney2/dialogs/knewaccountdlgdecl.ui | 34 ++--- kmymoney2/dialogs/knewbankdlgdecl.ui | 16 +- kmymoney2/dialogs/knewbudgetdlg.cpp | 2 +- kmymoney2/dialogs/knewequityentrydecl.ui | 4 +- kmymoney2/dialogs/knewfiledlgdecl.ui | 18 +-- kmymoney2/dialogs/knewinvestmentwizarddecl.ui | 18 +-- kmymoney2/dialogs/knewloanwizard.cpp | 4 +- kmymoney2/dialogs/knewloanwizarddecl.ui | 170 ++++++++++----------- kmymoney2/dialogs/konlinequoteconfigurationdecl.ui | 2 +- kmymoney2/dialogs/kpayeereassigndlgdecl.ui | 8 +- kmymoney2/dialogs/kplugindlg.ui | 4 +- kmymoney2/dialogs/kreconciledlg.cpp | 20 +-- kmymoney2/dialogs/kreconciledlgdecl.ui | 32 ++-- .../dialogs/kreportconfigurationfilterdlg.cpp | 2 +- kmymoney2/dialogs/ksecuritylisteditordecl.ui | 6 +- kmymoney2/dialogs/kselectdatabasedlgdecl.ui | 4 +- kmymoney2/dialogs/kselecttransactionsdlgdecl.ui | 2 +- kmymoney2/dialogs/ksortoptiondlg.ui | 2 +- kmymoney2/dialogs/ksplitcorrectiondlg.ui | 10 +- kmymoney2/dialogs/ksplittransactiondlg.cpp | 2 +- kmymoney2/dialogs/ksplittransactiondlgdecl.ui | 18 +-- kmymoney2/dialogs/kupdatestockpricedlg.cpp | 2 +- kmymoney2/dialogs/kupdatestockpricedlgdecl.ui | 10 +- kmymoney2/dialogs/mymoneyqifprofileeditordecl.ui | 38 ++--- kmymoney2/dialogs/settings/ksettingscolorsdecl.ui | 4 +- kmymoney2/dialogs/settings/ksettingsfontsdecl.ui | 6 +- .../dialogs/settings/ksettingsforecastdecl.ui | 6 +- kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui | 14 +- kmymoney2/dialogs/settings/ksettingsgpgdecl.ui | 6 +- kmymoney2/dialogs/settings/ksettingshomedecl.ui | 8 +- .../dialogs/settings/ksettingsonlinequotesdecl.ui | 4 +- .../dialogs/settings/ksettingsregisterdecl.ui | 10 +- .../dialogs/settings/ksettingsschedulesdecl.ui | 4 +- kmymoney2/dialogs/transactioneditor.cpp | 16 +- 66 files changed, 383 insertions(+), 383 deletions(-) (limited to 'kmymoney2/dialogs') diff --git a/kmymoney2/dialogs/investtransactioneditor.cpp b/kmymoney2/dialogs/investtransactioneditor.cpp index 92ea338..1f6f6da 100644 --- a/kmymoney2/dialogs/investtransactioneditor.cpp +++ b/kmymoney2/dialogs/investtransactioneditor.cpp @@ -279,39 +279,39 @@ void InvestTransactionEditor::createEditWidgets(void) } TQLabel* label = new TQLabel("", 0); - label->tqsetAlignment(TQt::AlignVCenter | TQt::AlignRight | TQt::DontClip); + label->setAlignment(TQt::AlignVCenter | TQt::AlignRight | TQt::DontClip); m_editWidgets["total"] = label; label = new TQLabel("", 0); - label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); + label->setAlignment(TQt::AlignVCenter | TQt::DontClip); m_editWidgets["total-label"] = label; label = new TQLabel("", 0); - label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); + label->setAlignment(TQt::AlignVCenter | TQt::DontClip); m_editWidgets["asset-label"] = label; label = new TQLabel("", 0); - label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); + label->setAlignment(TQt::AlignVCenter | TQt::DontClip); m_editWidgets["fee-label"] = label; label = new TQLabel("", 0); - label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); + label->setAlignment(TQt::AlignVCenter | TQt::DontClip); m_editWidgets["fee-amount-label"] = label; label = new TQLabel("", 0); - label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); + label->setAlignment(TQt::AlignVCenter | TQt::DontClip); m_editWidgets["interest-label"] = label; label = new TQLabel("", 0); - label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); + label->setAlignment(TQt::AlignVCenter | TQt::DontClip); m_editWidgets["interest-amount-label"] = label; label = new TQLabel("", 0); - label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); + label->setAlignment(TQt::AlignVCenter | TQt::DontClip); m_editWidgets["price-label"] = label; label = new TQLabel("", 0); - label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); + label->setAlignment(TQt::AlignVCenter | TQt::DontClip); m_editWidgets["shares-label"] = label; // if we don't have more than 1 selected transaction, we don't need @@ -586,7 +586,7 @@ void InvestTransactionEditor::loadEditWidgets(KMyMoneyRegister::Action /* action else if(m_lastPostDate.isValid()) postDate->setDate(m_lastPostDate); else - postDate->setDate(TQDate::tqcurrentDate()); + postDate->setDate(TQDate::currentDate()); // security (but only if it's not the investment account) if(m_split.accountId() != m_account.id()) { @@ -1014,7 +1014,7 @@ bool InvestTransactionEditor::createTransaction(MyMoneyTransaction& t, const MyM s0.setReconcileFlag(status->state()); if(s0.reconcileFlag() == MyMoneySplit::Reconciled && !s0.reconcileDate().isValid()) - s0.setReconcileDate(TQDate::tqcurrentDate()); + s0.setReconcileDate(TQDate::currentDate()); // call the creation logic for the current selected activity bool rc = d->m_activity->createTransaction(t, s0, assetAccountSplit, feeSplits, m_feeSplits, interestSplits, m_interestSplits, security, currency); diff --git a/kmymoney2/dialogs/kaccountselectdlgdecl.ui b/kmymoney2/dialogs/kaccountselectdlgdecl.ui index 705998a..cdd2557 100644 --- a/kmymoney2/dialogs/kaccountselectdlgdecl.ui +++ b/kmymoney2/dialogs/kaccountselectdlgdecl.ui @@ -95,7 +95,7 @@ Expanding - + 110 20 @@ -127,7 +127,7 @@ Expanding - + 16 20 @@ -184,7 +184,7 @@ Expanding - + 160 0 diff --git a/kmymoney2/dialogs/kbackupdlgdecl.ui b/kmymoney2/dialogs/kbackupdlgdecl.ui index e0e3a7a..14f167a 100644 --- a/kmymoney2/dialogs/kbackupdlgdecl.ui +++ b/kmymoney2/dialogs/kbackupdlgdecl.ui @@ -135,7 +135,7 @@ Click OK to perform the backup. If your system does not use an automounter, make Expanding - + 0 24 @@ -168,7 +168,7 @@ Click OK to perform the backup. If your system does not use an automounter, make Expanding - + 455 0 diff --git a/kmymoney2/dialogs/kbalancechartdlg.cpp b/kmymoney2/dialogs/kbalancechartdlg.cpp index 85134da..1b61272 100644 --- a/kmymoney2/dialogs/kbalancechartdlg.cpp +++ b/kmymoney2/dialogs/kbalancechartdlg.cpp @@ -83,7 +83,7 @@ KBalanceChartDlg::KBalanceChartDlg(const MyMoneyAccount& account, TQWidget* pare reportCfg.addAccount(account.id()); reportCfg.setColumnsAreDays( true ); reportCfg.setConvertCurrency( false ); - reportCfg.setDateFilter(TQDate::tqcurrentDate().addDays(-90),TQDate::tqcurrentDate().addDays(+90)); + reportCfg.setDateFilter(TQDate::currentDate().addDays(-90),TQDate::currentDate().addDays(+90)); reports::PivotTable table(reportCfg); @@ -213,7 +213,7 @@ KBalanceChartDlg::KBalanceChartDlg(const MyMoneyAccount& account, TQWidget* pare // connect( buttonOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); connect( buttonClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); - resize( TQSize(700, 500).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(700, 500).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); #endif } diff --git a/kmymoney2/dialogs/kcategoryreassigndlgdecl.ui b/kmymoney2/dialogs/kcategoryreassigndlgdecl.ui index ee9faa4..666c714 100644 --- a/kmymoney2/dialogs/kcategoryreassigndlgdecl.ui +++ b/kmymoney2/dialogs/kcategoryreassigndlgdecl.ui @@ -29,7 +29,7 @@ textLabel1 - + 300 0 @@ -52,7 +52,7 @@ Fixed - + 20 16 @@ -82,7 +82,7 @@ Expanding - + 20 16 @@ -121,7 +121,7 @@ Expanding - + 305 20 diff --git a/kmymoney2/dialogs/kchooseimportexportdlgdecl.ui b/kmymoney2/dialogs/kchooseimportexportdlgdecl.ui index f52cbca..9ddaed0 100644 --- a/kmymoney2/dialogs/kchooseimportexportdlgdecl.ui +++ b/kmymoney2/dialogs/kchooseimportexportdlgdecl.ui @@ -95,7 +95,7 @@ Once you have chosen an import type please press the OK button. Expanding - tqsizeHint + sizeHint 20 20 @@ -132,7 +132,7 @@ Once you have chosen an import type please press the OK button. typeCombo - tqminimumSize + minimumSize 100 0 @@ -155,7 +155,7 @@ Once you have chosen an import type please press the OK button. - tqminimumSize + minimumSize 410 100 @@ -195,7 +195,7 @@ Once you have chosen an import type please press the OK button. Expanding - tqsizeHint + sizeHint 20 20 diff --git a/kmymoney2/dialogs/kconfirmmanualenterdlgdecl.ui b/kmymoney2/dialogs/kconfirmmanualenterdlgdecl.ui index 5a4b87b..8bdbdce 100644 --- a/kmymoney2/dialogs/kconfirmmanualenterdlgdecl.ui +++ b/kmymoney2/dialogs/kconfirmmanualenterdlgdecl.ui @@ -109,7 +109,7 @@ Expanding - + 180 16 diff --git a/kmymoney2/dialogs/kcsvprogressdlgdecl.ui b/kmymoney2/dialogs/kcsvprogressdlgdecl.ui index d7c0f20..f31e80a 100644 --- a/kmymoney2/dialogs/kcsvprogressdlgdecl.ui +++ b/kmymoney2/dialogs/kcsvprogressdlgdecl.ui @@ -187,7 +187,7 @@ You can cancel the process at any time by clicking on the Cancel button. - tqminimumSize + minimumSize 50 0 @@ -243,7 +243,7 @@ You can cancel the process at any time by clicking on the Cancel button. - tqminimumSize + minimumSize 50 0 @@ -303,7 +303,7 @@ You can cancel the process at any time by clicking on the Cancel button.Expanding - tqsizeHint + sizeHint 20 20 @@ -484,7 +484,7 @@ You can cancel the process at any time by clicking on the Cancel button.Expanding - tqsizeHint + sizeHint 20 20 diff --git a/kmymoney2/dialogs/kcurrencycalculator.cpp b/kmymoney2/dialogs/kcurrencycalculator.cpp index 2306816..9fe4404 100644 --- a/kmymoney2/dialogs/kcurrencycalculator.cpp +++ b/kmymoney2/dialogs/kcurrencycalculator.cpp @@ -125,7 +125,7 @@ KCurrencyCalculator::KCurrencyCalculator(const MyMoneySecurity& from, const MyMo if(date.isValid()) m_dateEdit->setDate(date); else - m_dateEdit->setDate(TQDate::tqcurrentDate()); + m_dateEdit->setDate(TQDate::currentDate()); m_fromCurrencyText->setText(m_fromCurrency.isCurrency() ? m_fromCurrency.id() : m_fromCurrency.tradingSymbol()); m_toCurrencyText->setText(m_toCurrency.isCurrency() ? m_toCurrency.id() : m_toCurrency.tradingSymbol()); diff --git a/kmymoney2/dialogs/kcurrencycalculatordecl.ui b/kmymoney2/dialogs/kcurrencycalculatordecl.ui index 2d17eb0..3a5ff3c 100644 --- a/kmymoney2/dialogs/kcurrencycalculatordecl.ui +++ b/kmymoney2/dialogs/kcurrencycalculatordecl.ui @@ -76,7 +76,7 @@ Expanding - + 80 20 @@ -109,7 +109,7 @@ Expanding - + 145 20 @@ -329,7 +329,7 @@ xx Expanding - + 20 16 @@ -368,7 +368,7 @@ xx Expanding - + 20 20 diff --git a/kmymoney2/dialogs/kcurrencyeditdlgdecl.ui b/kmymoney2/dialogs/kcurrencyeditdlgdecl.ui index cd803cb..fcb3fc8 100644 --- a/kmymoney2/dialogs/kcurrencyeditdlgdecl.ui +++ b/kmymoney2/dialogs/kcurrencyeditdlgdecl.ui @@ -78,7 +78,7 @@ Expanding - + 51 21 @@ -103,7 +103,7 @@ Expanding - + 61 31 @@ -246,7 +246,7 @@ Expanding - + 20 20 diff --git a/kmymoney2/dialogs/keditequityentrydecl.ui b/kmymoney2/dialogs/keditequityentrydecl.ui index ce06abb..47c1af0 100644 --- a/kmymoney2/dialogs/keditequityentrydecl.ui +++ b/kmymoney2/dialogs/keditequityentrydecl.ui @@ -163,7 +163,7 @@ Expanding - + 21 21 @@ -204,7 +204,7 @@ Expanding - + 21 21 @@ -233,7 +233,7 @@ Expanding - + 238 21 diff --git a/kmymoney2/dialogs/keditloanwizard.cpp b/kmymoney2/dialogs/keditloanwizard.cpp index 89b2f90..d7b372e 100644 --- a/kmymoney2/dialogs/keditloanwizard.cpp +++ b/kmymoney2/dialogs/keditloanwizard.cpp @@ -71,7 +71,7 @@ KEditLoanWizard::KEditLoanWizard(const MyMoneyAccount& account, TQWidget *parent loadWidgets(m_account); - if(m_account.openingDate() > TQDate::tqcurrentDate()) { + if(m_account.openingDate() > TQDate::currentDate()) { m_effectiveDateNoteLabel->setText(TQString("\n") + i18n( "Note: you will not be able to modify this account today, because the opening date \"%1\" is in the future. " "Please revisit this dialog when the time has come." @@ -123,10 +123,10 @@ void KEditLoanWizard::loadWidgets(const MyMoneyAccount& /* account */) } MyMoneyMoney ir; - if(m_schedule.startDate() > TQDate::tqcurrentDate()) { + if(m_schedule.startDate() > TQDate::currentDate()) { ir = m_account.interestRate(m_schedule.startDate()); } else { - ir = m_account.interestRate(TQDate::tqcurrentDate()); + ir = m_account.interestRate(TQDate::currentDate()); } m_interestRateEdit->loadText(ir.formatMoney("", 3)); m_newInterestRateEdit->loadText(ir.formatMoney("", 3)); @@ -417,7 +417,7 @@ void KEditLoanWizard::slotCheckPageFinished(void) if(currentPage() == m_effectiveDatePage) { if(m_effectiveChangeDateEdit->date() < m_account.openingDate() - || m_effectiveChangeDateEdit->date() > TQDate::tqcurrentDate()) + || m_effectiveChangeDateEdit->date() > TQDate::currentDate()) nextButton()->setEnabled(false); } else if(currentPage() == m_interestEditPage) { diff --git a/kmymoney2/dialogs/keditscheduledlg.cpp b/kmymoney2/dialogs/keditscheduledlg.cpp index c6ece41..195a232 100644 --- a/kmymoney2/dialogs/keditscheduledlg.cpp +++ b/kmymoney2/dialogs/keditscheduledlg.cpp @@ -165,7 +165,7 @@ KEditScheduleDlg::~KEditScheduleDlg() void KEditScheduleDlg::slotSetupSize(void) { - resize(width(), tqminimumSizeHint().height()); + resize(width(), minimumSizeHint().height()); } TransactionEditor* KEditScheduleDlg::startEdit(void) @@ -393,7 +393,7 @@ bool KEditScheduleDlg::focusNextPrevChild(bool next) TQWidget *w = 0; TQWidget *currentWidget; - w = tqApp->tqfocusWidget(); + w = tqApp->focusWidget(); while(w && d->m_tabOrderWidgets.find(w) == -1) { // qDebug("'%s' not in list, use parent", w->className()); w = w->parentWidget(); diff --git a/kmymoney2/dialogs/keditscheduledlgdecl.ui b/kmymoney2/dialogs/keditscheduledlgdecl.ui index d3ec65c..1aeb018 100644 --- a/kmymoney2/dialogs/keditscheduledlgdecl.ui +++ b/kmymoney2/dialogs/keditscheduledlgdecl.ui @@ -142,7 +142,7 @@ Expanding - + 61 21 @@ -320,7 +320,7 @@ Expanding - + 21 20 @@ -372,7 +372,7 @@ Fixed - + 20 20 @@ -428,7 +428,7 @@ Expanding - + 20 16 @@ -467,7 +467,7 @@ Expanding - + 280 0 diff --git a/kmymoney2/dialogs/kendingbalancedlg.cpp b/kmymoney2/dialogs/kendingbalancedlg.cpp index 9aeb0e1..5c4c337 100644 --- a/kmymoney2/dialogs/kendingbalancedlg.cpp +++ b/kmymoney2/dialogs/kendingbalancedlg.cpp @@ -70,7 +70,7 @@ KEndingBalanceDlg::KEndingBalanceDlg(const MyMoneyAccount& account, TQWidget *pa MyMoneySecurity currency = MyMoneyFile::instance()->security(account.currencyId()); m_enterInformationLabel->setText(TQString("")+i18n("Please enter the following fields with the information as you find them on your statement. Make sure to enter all values in %1.").tqarg(currency.name())+TQString("")); - m_statementDate->setDate(TQDate::tqcurrentDate()); + m_statementDate->setDate(TQDate::currentDate()); // If the previous reconciliation was postponed, // we show a different first page @@ -80,7 +80,7 @@ KEndingBalanceDlg::KEndingBalanceDlg(const MyMoneyAccount& account, TQWidget *pa // then take the last statement date and add one month and use that as statement // date. TQDate lastStatementDate = account.lastReconciliationDate(); - if(lastStatementDate.addMonths(1) < TQDate::tqcurrentDate()) { + if(lastStatementDate.addMonths(1) < TQDate::currentDate()) { m_statementDate->setDate(lastStatementDate.addMonths(1)); } diff --git a/kmymoney2/dialogs/kendingbalancedlgdecl.ui b/kmymoney2/dialogs/kendingbalancedlgdecl.ui index 2f67c50..0968bdd 100644 --- a/kmymoney2/dialogs/kendingbalancedlgdecl.ui +++ b/kmymoney2/dialogs/kendingbalancedlgdecl.ui @@ -89,7 +89,7 @@ Please enter the following information found on your statement: Expanding - + 0 19 @@ -120,7 +120,7 @@ Please enter the following information found on your statement: Expanding - + 42 0 @@ -179,7 +179,7 @@ Please enter the following information found on your statement: Expanding - + 44 0 @@ -198,7 +198,7 @@ Please enter the following information found on your statement: Expanding - + 0 20 @@ -259,7 +259,7 @@ Please enter the following information found on your statement: Expanding - + 51 0 @@ -318,7 +318,7 @@ Please enter the following information found on your statement: Expanding - + 71 0 @@ -348,7 +348,7 @@ Please enter the following information found on your statement: Expanding - + 0 19 @@ -475,7 +475,7 @@ Please enter the following information found on your statement: Expanding - + 0 25 @@ -547,7 +547,7 @@ All information you have entered into this wizard will be shown and all transact Expanding - + 20 50 @@ -578,7 +578,7 @@ All information you have entered into this wizard will be shown and all transact Expanding - + 42 0 @@ -650,7 +650,7 @@ All information you have entered into this wizard will be shown and all transact Expanding - + 46 0 @@ -669,7 +669,7 @@ All information you have entered into this wizard will be shown and all transact Expanding - + 16 87 @@ -729,7 +729,7 @@ All information you have entered into this wizard will be shown and all transact Expanding - + 16 16 @@ -754,7 +754,7 @@ All information you have entered into this wizard will be shown and all transact Expanding - + 60 20 @@ -924,7 +924,7 @@ All information you have entered into this wizard will be shown and all transact Expanding - + 60 20 @@ -943,7 +943,7 @@ All information you have entered into this wizard will be shown and all transact Expanding - + 16 16 diff --git a/kmymoney2/dialogs/kenterscheduledlg.cpp b/kmymoney2/dialogs/kenterscheduledlg.cpp index 4c078f1..c225de5 100644 --- a/kmymoney2/dialogs/kenterscheduledlg.cpp +++ b/kmymoney2/dialogs/kenterscheduledlg.cpp @@ -175,7 +175,7 @@ void KEnterScheduleDlg::resizeEvent(TQResizeEvent* ev) void KEnterScheduleDlg::slotSetupSize(void) { - resize(width(), tqminimumSizeHint().height()); + resize(width(), minimumSizeHint().height()); } int KEnterScheduleDlg::exec(void) @@ -266,10 +266,10 @@ TransactionEditor* KEnterScheduleDlg::startEdit(void) // Check if the editor has some preference on where to set the focus // If not, set the focus to the first widget in the tab order - TQWidget* tqfocusWidget = editor->firstWidget(); - if(!tqfocusWidget) - tqfocusWidget = d->m_tabOrderWidgets.first(); - tqfocusWidget->setFocus(); + TQWidget* focusWidget = editor->firstWidget(); + if(!focusWidget) + focusWidget = d->m_tabOrderWidgets.first(); + focusWidget->setFocus(); // Make sure, we use the adjusted date kMyMoneyDateInput* dateEdit = dynamic_cast(editor->haveWidget("postdate")); @@ -289,7 +289,7 @@ bool KEnterScheduleDlg::focusNextPrevChild(bool next) TQWidget *w = 0; TQWidget *currentWidget; - w = tqApp->tqfocusWidget(); + w = tqApp->focusWidget(); while(w && d->m_tabOrderWidgets.find(w) == -1) { // qDebug("'%s' not in list, use parent", w->className()); w = w->parentWidget(); diff --git a/kmymoney2/dialogs/kenterscheduledlgdecl.ui b/kmymoney2/dialogs/kenterscheduledlgdecl.ui index f36e6b6..d102246 100644 --- a/kmymoney2/dialogs/kenterscheduledlgdecl.ui +++ b/kmymoney2/dialogs/kenterscheduledlgdecl.ui @@ -45,7 +45,7 @@ 0 - + 70 0 @@ -79,7 +79,7 @@ 0 - + 70 0 @@ -245,7 +245,7 @@ Expanding - + 190 20 diff --git a/kmymoney2/dialogs/kequitypriceupdatedlg.cpp b/kmymoney2/dialogs/kequitypriceupdatedlg.cpp index 4121abd..ab752be 100644 --- a/kmymoney2/dialogs/kequitypriceupdatedlg.cpp +++ b/kmymoney2/dialogs/kequitypriceupdatedlg.cpp @@ -104,7 +104,7 @@ KEquityPriceUpdateDlg::KEquityPriceUpdateDlg(TQWidget *parent, const TQString& s if ( file->security( pair.first ).isCurrency() && ( securityId.isEmpty() || ( pair == currencyIds ) ) ) { const MyMoneyPriceEntries& entries = (*it_price); - if(entries.count() > 0 && entries.begin().key() <= TQDate::tqcurrentDate()) { + if(entries.count() > 0 && entries.begin().key() <= TQDate::currentDate()) { addPricePair(pair); btnUpdateAll->setEnabled(true); } @@ -282,7 +282,7 @@ void KEquityPriceUpdateDlg::logErrorMessage(const TQString& message) void KEquityPriceUpdateDlg::logStatusMessage(const TQString& message) { - lbtqStatus->append(message); + lbStatus->append(message); } MyMoneyPrice KEquityPriceUpdateDlg::price(const TQString& id) const @@ -492,8 +492,8 @@ void KEquityPriceUpdateDlg::slotReceivedQuote(const TQString& _id, const TQStrin if ( _price > 0.0f && _date.isValid() ) { TQDate date = _date; - if ( date > TQDate::tqcurrentDate() ) - date = TQDate::tqcurrentDate(); + if ( date > TQDate::currentDate() ) + date = TQDate::currentDate(); double price = _price; TQString id = _id.utf8(); diff --git a/kmymoney2/dialogs/kequitypriceupdatedlgdecl.ui b/kmymoney2/dialogs/kequitypriceupdatedlgdecl.ui index e1fb0de..cd9c769 100644 --- a/kmymoney2/dialogs/kequitypriceupdatedlgdecl.ui +++ b/kmymoney2/dialogs/kequitypriceupdatedlgdecl.ui @@ -24,7 +24,7 @@ lvEquityList - + 350 0 @@ -75,7 +75,7 @@ Expanding - + 21 20 @@ -105,12 +105,12 @@ textLabel1 - tqStatus: + Status: - lbtqStatus + lbStatus LogText @@ -139,7 +139,7 @@ Expanding - + 91 20 diff --git a/kmymoney2/dialogs/kexportdlgdecl.ui b/kmymoney2/dialogs/kexportdlgdecl.ui index ab3ff63..e429f53 100644 --- a/kmymoney2/dialogs/kexportdlgdecl.ui +++ b/kmymoney2/dialogs/kexportdlgdecl.ui @@ -209,7 +209,7 @@ You can choose the file's path, the account and the format of the QIF file (prof 0 - + 200 0 @@ -318,7 +318,7 @@ You can choose the file's path, the account and the format of the QIF file (prof 0 - + 50 0 @@ -340,7 +340,7 @@ You can choose the file's path, the account and the format of the QIF file (prof 0 - + 50 0 @@ -377,7 +377,7 @@ You can choose the file's path, the account and the format of the QIF file (prof Expanding - + 230 16 @@ -424,7 +424,7 @@ You can choose the file's path, the account and the format of the QIF file (prof Expanding - + 451 0 diff --git a/kmymoney2/dialogs/kfindtransactiondlgdecl.ui b/kmymoney2/dialogs/kfindtransactiondlgdecl.ui index e2a8ee1..3284fa0 100644 --- a/kmymoney2/dialogs/kfindtransactiondlgdecl.ui +++ b/kmymoney2/dialogs/kfindtransactiondlgdecl.ui @@ -84,7 +84,7 @@ Expanding - + 16 83 @@ -103,7 +103,7 @@ 0 - + 300 0 @@ -247,7 +247,7 @@ Expanding - + 40 20 @@ -266,7 +266,7 @@ Expanding - + 20 30 @@ -344,7 +344,7 @@ m_amountToEdit - + 100 0 @@ -372,7 +372,7 @@ m_amountEdit - + 100 0 @@ -392,7 +392,7 @@ m_amountFromEdit - + 100 0 @@ -411,7 +411,7 @@ Expanding - + 16 16 @@ -430,7 +430,7 @@ Expanding - + 16 75 @@ -554,7 +554,7 @@ Expanding - + 0 42 @@ -698,7 +698,7 @@ Expanding - + 130 20 @@ -816,7 +816,7 @@ Expanding - + 20 20 @@ -835,7 +835,7 @@ Expanding - + 16 16 @@ -886,7 +886,7 @@ Expanding - + 20 24 @@ -1008,7 +1008,7 @@ Expanding - + 51 20 diff --git a/kmymoney2/dialogs/kgncimportoptionsdlgdecl.ui b/kmymoney2/dialogs/kgncimportoptionsdlgdecl.ui index 39e3711..b40a178 100644 --- a/kmymoney2/dialogs/kgncimportoptionsdlgdecl.ui +++ b/kmymoney2/dialogs/kgncimportoptionsdlgdecl.ui @@ -167,7 +167,7 @@ Expanding - + 140 20 @@ -254,7 +254,7 @@ Expanding - + 20 40 @@ -299,7 +299,7 @@ Expanding - + 200 20 diff --git a/kmymoney2/dialogs/kgncpricesourcedlgdecl.ui b/kmymoney2/dialogs/kgncpricesourcedlgdecl.ui index 6eb3e84..82a2a45 100644 --- a/kmymoney2/dialogs/kgncpricesourcedlgdecl.ui +++ b/kmymoney2/dialogs/kgncpricesourcedlgdecl.ui @@ -41,7 +41,7 @@ Expanding - + 91 20 @@ -66,7 +66,7 @@ Expanding - + 80 20 @@ -94,7 +94,7 @@ Expanding - + 171 20 @@ -227,7 +227,7 @@ Expanding - + 21 370 diff --git a/kmymoney2/dialogs/kimportdlgdecl.ui b/kmymoney2/dialogs/kimportdlgdecl.ui index ed879b2..d5075df 100644 --- a/kmymoney2/dialogs/kimportdlgdecl.ui +++ b/kmymoney2/dialogs/kimportdlgdecl.ui @@ -131,7 +131,7 @@ Please enter the path to the QIF file or select it by clicking on the Browse but 0 - + 200 0 @@ -204,7 +204,7 @@ Please enter the path to the QIF file or select it by clicking on the Browse but Expanding - + 411 0 diff --git a/kmymoney2/dialogs/kloadtemplatedlgdecl.ui b/kmymoney2/dialogs/kloadtemplatedlgdecl.ui index c857cc8..3b89fcf 100644 --- a/kmymoney2/dialogs/kloadtemplatedlgdecl.ui +++ b/kmymoney2/dialogs/kloadtemplatedlgdecl.ui @@ -53,7 +53,7 @@ Expanding - + 228 20 diff --git a/kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui b/kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui index 6fd5756..43957dd 100644 --- a/kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui +++ b/kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui @@ -252,7 +252,7 @@ Expanding - + 20 20 @@ -305,7 +305,7 @@ Expanding - + 120 20 diff --git a/kmymoney2/dialogs/kmymoneypricedlgdecl.ui b/kmymoney2/dialogs/kmymoneypricedlgdecl.ui index e8a4117..ca39dae 100644 --- a/kmymoney2/dialogs/kmymoneypricedlgdecl.ui +++ b/kmymoney2/dialogs/kmymoneypricedlgdecl.ui @@ -100,7 +100,7 @@ Expanding - + 21 150 @@ -151,7 +151,7 @@ Expanding - + 560 20 diff --git a/kmymoney2/dialogs/kmymoneysplittable.cpp b/kmymoney2/dialogs/kmymoneysplittable.cpp index f549d4c..922b342 100644 --- a/kmymoney2/dialogs/kmymoneysplittable.cpp +++ b/kmymoney2/dialogs/kmymoneysplittable.cpp @@ -125,7 +125,7 @@ const TQColor kMyMoneySplitTable::rowBackgroundColor(const int row) const void kMyMoneySplitTable::paintCell(TQPainter *p, int row, int col, const TQRect& r, bool /*selected*/) { - TQColorGroup g = tqcolorGroup(); + TQColorGroup g = colorGroup(); TQColor textColor; g.setColor(TQColorGroup::Base, rowBackgroundColor(row)); @@ -452,7 +452,7 @@ void kMyMoneySplitTable::contentsMouseDoubleClickEvent( TQMouseEvent *e ) break; case 2: - editWidget = dynamic_cast (m_editAmount->tqfocusWidget()); + editWidget = dynamic_cast (m_editAmount->focusWidget()); break; default: @@ -493,7 +493,7 @@ void kMyMoneySplitTable::setNumRows(int irows) #if 0 // recalculate row height hint KMyMoneyCategory cat; - height = TQMAX(cat.tqsizeHint().height(), height); + height = TQMAX(cat.sizeHint().height(), height); #endif verticalHeader()->setUpdatesEnabled(false); @@ -568,7 +568,7 @@ void kMyMoneySplitTable::slotUpdateData(const MyMoneyTransaction& t) unsigned width = fontMetrics().width(amountTxt); valfield->setMinimumWidth(width); - width = valfield->tqminimumSizeHint().width(); + width = valfield->minimumSizeHint().width(); if(width > m_amountWidth) m_amountWidth = width; @@ -969,7 +969,7 @@ bool kMyMoneySplitTable::focusNextPrevChild(bool next) TQWidget *w = 0; TQWidget *currentWidget; - m_tabOrderWidgets.find(tqApp->tqfocusWidget()); + m_tabOrderWidgets.find(tqApp->focusWidget()); currentWidget = m_tabOrderWidgets.current(); w = next ? m_tabOrderWidgets.next() : m_tabOrderWidgets.prev(); diff --git a/kmymoney2/dialogs/knewaccountdlg.cpp b/kmymoney2/dialogs/knewaccountdlg.cpp index 2f2748b..c1b8f57 100644 --- a/kmymoney2/dialogs/knewaccountdlg.cpp +++ b/kmymoney2/dialogs/knewaccountdlg.cpp @@ -289,7 +289,7 @@ KNewAccountDlg::KNewAccountDlg(const MyMoneyAccount& account, bool isEditing, bo } if(!m_account.openingDate().isValid()) - m_account.setOpeningDate(TQDate::tqcurrentDate()); + m_account.setOpeningDate(TQDate::currentDate()); startDateEdit->setDate(m_account.openingDate()); accountNoEdit->setText(account.number()); diff --git a/kmymoney2/dialogs/knewaccountdlg.h b/kmymoney2/dialogs/knewaccountdlg.h index 807af7e..013fa3c 100644 --- a/kmymoney2/dialogs/knewaccountdlg.h +++ b/kmymoney2/dialogs/knewaccountdlg.h @@ -118,7 +118,7 @@ public: protected: void resizeEvent(TQResizeEvent* e); - void displayOnlineBankingtqStatus(void); + void displayOnlineBankingStatus(void); void adjustEditWidgets(kMyMoneyEdit* dst, kMyMoneyEdit* src, char mode, int corr); protected slots: diff --git a/kmymoney2/dialogs/knewaccountdlgdecl.ui b/kmymoney2/dialogs/knewaccountdlgdecl.ui index 5f42ead..e13989b 100644 --- a/kmymoney2/dialogs/knewaccountdlgdecl.ui +++ b/kmymoney2/dialogs/knewaccountdlgdecl.ui @@ -49,13 +49,13 @@ TextLabel1 - + 60 0 - + 60 32767 @@ -136,7 +136,7 @@ TextLabel1_2 - + 0 0 @@ -214,7 +214,7 @@ Expanding - + 140 20 @@ -235,13 +235,13 @@ TextLabel5 - + 0 0 - + 32767 32767 @@ -333,7 +333,7 @@ Expanding - + 20 16 @@ -418,13 +418,13 @@ TextLabel2_2 - + 60 0 - + 60 32767 @@ -477,7 +477,7 @@ Expanding - + 21 30 @@ -638,7 +638,7 @@ Expanding - + 20 30 @@ -733,7 +733,7 @@ Expanding - + 21 20 @@ -754,7 +754,7 @@ Expanding - + 20 40 @@ -815,13 +815,13 @@ m_amountGroup - + 0 0 - + 32767 32767 @@ -871,7 +871,7 @@ Expanding - + 20 21 @@ -933,7 +933,7 @@ Expanding - + 422 0 diff --git a/kmymoney2/dialogs/knewbankdlgdecl.ui b/kmymoney2/dialogs/knewbankdlgdecl.ui index 28a8cc2..f610612 100644 --- a/kmymoney2/dialogs/knewbankdlgdecl.ui +++ b/kmymoney2/dialogs/knewbankdlgdecl.ui @@ -62,7 +62,7 @@ TextLabel2 - + 100 0 @@ -81,7 +81,7 @@ TextLabel3 - + 100 0 @@ -100,7 +100,7 @@ TextLabel4 - + 100 0 @@ -119,7 +119,7 @@ TextLabel5 - + 100 0 @@ -138,7 +138,7 @@ TextLabel6 - + 100 0 @@ -157,7 +157,7 @@ TextLabel7 - + 100 0 @@ -184,7 +184,7 @@ Expanding - + 16 16 @@ -232,7 +232,7 @@ Expanding - + 449 0 diff --git a/kmymoney2/dialogs/knewbudgetdlg.cpp b/kmymoney2/dialogs/knewbudgetdlg.cpp index 0224abb..2e9ee8f 100644 --- a/kmymoney2/dialogs/knewbudgetdlg.cpp +++ b/kmymoney2/dialogs/knewbudgetdlg.cpp @@ -41,7 +41,7 @@ KNewBudgetDlg::KNewBudgetDlg(TQWidget* parent, const char *name) : KNewBudgetDlgDecl(parent, name) { TQStringList slYear; - TQDate dToday = TQDate::tqcurrentDate(); + TQDate dToday = TQDate::currentDate(); int iYear = dToday.year(); for (int i=0; i<=m_icFutureYears; i++) diff --git a/kmymoney2/dialogs/knewequityentrydecl.ui b/kmymoney2/dialogs/knewequityentrydecl.ui index 2fa832f..a9e35b7 100644 --- a/kmymoney2/dialogs/knewequityentrydecl.ui +++ b/kmymoney2/dialogs/knewequityentrydecl.ui @@ -150,7 +150,7 @@ Expanding - + 20 16 @@ -175,7 +175,7 @@ Expanding - + 81 20 diff --git a/kmymoney2/dialogs/knewfiledlgdecl.ui b/kmymoney2/dialogs/knewfiledlgdecl.ui index d0fcffa..f9db5aa 100644 --- a/kmymoney2/dialogs/knewfiledlgdecl.ui +++ b/kmymoney2/dialogs/knewfiledlgdecl.ui @@ -84,7 +84,7 @@ your KMyMoney file. TextLabel4 - + 100 0 @@ -113,7 +113,7 @@ your KMyMoney file. TextLabel2 - + 100 0 @@ -132,7 +132,7 @@ your KMyMoney file. TextLabel7 - + 100 0 @@ -154,7 +154,7 @@ your KMyMoney file. TextLabel6 - + 100 0 @@ -168,7 +168,7 @@ your KMyMoney file. TextLabel3 - + 100 0 @@ -187,7 +187,7 @@ your KMyMoney file. TextLabel5 - + 100 0 @@ -235,7 +235,7 @@ your KMyMoney file. Expanding - + 305 21 @@ -254,7 +254,7 @@ your KMyMoney file. Expanding - + 20 16 @@ -279,7 +279,7 @@ your KMyMoney file. Expanding - + 360 16 diff --git a/kmymoney2/dialogs/knewinvestmentwizarddecl.ui b/kmymoney2/dialogs/knewinvestmentwizarddecl.ui index 5e8196f..91403b7 100644 --- a/kmymoney2/dialogs/knewinvestmentwizarddecl.ui +++ b/kmymoney2/dialogs/knewinvestmentwizarddecl.ui @@ -47,7 +47,7 @@ Fixed - + 20 10 @@ -75,7 +75,7 @@ Expanding - + 20 30 @@ -128,7 +128,7 @@ Expanding - + 61 21 @@ -147,7 +147,7 @@ Expanding - + 20 60 @@ -188,7 +188,7 @@ Expanding - + 20 16 @@ -374,7 +374,7 @@ Expanding - + 20 16 @@ -478,7 +478,7 @@ m_onlineSourceCombo - + 180 0 @@ -522,7 +522,7 @@ Expanding - + 371 20 @@ -541,7 +541,7 @@ Expanding - + 20 181 diff --git a/kmymoney2/dialogs/knewloanwizard.cpp b/kmymoney2/dialogs/knewloanwizard.cpp index fe39525..ef5c4a4 100644 --- a/kmymoney2/dialogs/knewloanwizard.cpp +++ b/kmymoney2/dialogs/knewloanwizard.cpp @@ -111,7 +111,7 @@ KNewLoanWizard::KNewLoanWizard(TQWidget *parent, const char *name ) : m_interestFrequencyAmountEdit->setValue(1); m_interestFrequencyUnitEdit->setCurrentItem(static_cast(MyMoneyAccountLoan::changeYearly)); m_paymentFrequencyUnitEdit->setCurrentItem(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_MONTHLY))); - m_firstDueDateEdit->loadDate(TQDate(TQDate::tqcurrentDate().year(),TQDate::tqcurrentDate().month(),30)); + m_firstDueDateEdit->loadDate(TQDate(TQDate::currentDate().year(),TQDate::currentDate().month(),30)); m_paymentAccountEdit->removeButtons(); m_assetAccountEdit->removeButtons(); @@ -557,7 +557,7 @@ void KNewLoanWizard::next() if(m_assetAccountPage) setAppropriate(m_assetAccountPage, true); } else { - TQDate nextPayment(TQDate::tqcurrentDate().year(), 1, m_firstDueDateEdit->date().day()); + TQDate nextPayment(TQDate::currentDate().year(), 1, m_firstDueDateEdit->date().day()); m_nextDueDateEdit->setDate(nextPayment); if(m_assetAccountPage) setAppropriate(m_assetAccountPage, false); diff --git a/kmymoney2/dialogs/knewloanwizarddecl.ui b/kmymoney2/dialogs/knewloanwizarddecl.ui index 19c589f..d5cb1b7 100644 --- a/kmymoney2/dialogs/knewloanwizarddecl.ui +++ b/kmymoney2/dialogs/knewloanwizarddecl.ui @@ -12,7 +12,7 @@ 458 - + 800 32767 @@ -63,7 +63,7 @@ Expanding - + 98 0 @@ -98,7 +98,7 @@ Expanding - + 119 0 @@ -131,7 +131,7 @@ Please make sure that you have the relevant information handy. You usually get t Expanding - + 20 20 @@ -175,7 +175,7 @@ Please make sure that you have the relevant information handy. You usually get t Expanding - + 98 0 @@ -210,7 +210,7 @@ Please make sure that you have the relevant information handy. You usually get t Expanding - + 119 0 @@ -243,7 +243,7 @@ Please make sure that you have the relevant information handy. You usually get t Expanding - + 20 20 @@ -291,7 +291,7 @@ In the first step, KMyMoney will ask you some general information about the loan Expanding - + 0 32 @@ -322,7 +322,7 @@ In the first step, KMyMoney will ask you some general information about the loan Expanding - + 138 0 @@ -378,7 +378,7 @@ In the first step, KMyMoney will ask you some general information about the loan Expanding - + 0 25 @@ -397,7 +397,7 @@ In the first step, KMyMoney will ask you some general information about the loan Expanding - + 137 0 @@ -416,7 +416,7 @@ In the first step, KMyMoney will ask you some general information about the loan Expanding - + 0 32 @@ -464,7 +464,7 @@ Please select, which data of the loan you want to modify. Expanding - + 0 48 @@ -495,7 +495,7 @@ Please select, which data of the loan you want to modify. Expanding - + 93 0 @@ -561,7 +561,7 @@ Please select, which data of the loan you want to modify. Expanding - + 108 0 @@ -580,7 +580,7 @@ Please select, which data of the loan you want to modify. Expanding - + 0 47 @@ -638,7 +638,7 @@ Please select, which data of the loan you want to modify. Expanding - + 0 30 @@ -684,7 +684,7 @@ Please select, which data of the loan you want to modify. Expanding - + 0 87 @@ -732,7 +732,7 @@ Do you borrow or lend money? Expanding - + 0 61 @@ -804,7 +804,7 @@ Do you borrow or lend money? Expanding - + 299 0 @@ -823,7 +823,7 @@ Do you borrow or lend money? Expanding - + 0 60 @@ -865,7 +865,7 @@ How do you want to call this loan? Examples for names are 'car loan', 'school lo Expanding - + 16 56 @@ -911,7 +911,7 @@ How do you want to call this loan? Examples for names are 'car loan', 'school lo Expanding - + 16 56 @@ -959,7 +959,7 @@ How do you want to call this loan? Examples for names are 'car loan', 'school lo Expanding - + 16 56 @@ -1007,7 +1007,7 @@ Is the interest of this loan fixed over a period of time or is it adapted from t Expanding - + 0 53 @@ -1079,7 +1079,7 @@ Is the interest of this loan fixed over a period of time or is it adapted from t Expanding - + 286 0 @@ -1098,7 +1098,7 @@ Is the interest of this loan fixed over a period of time or is it adapted from t Expanding - + 0 53 @@ -1146,7 +1146,7 @@ Were there any payments for this loan whether they are entered into KMyMoney or Expanding - + 0 32 @@ -1218,7 +1218,7 @@ Were there any payments for this loan whether they are entered into KMyMoney or Expanding - + 202 0 @@ -1237,7 +1237,7 @@ Were there any payments for this loan whether they are entered into KMyMoney or Expanding - + 0 32 @@ -1265,7 +1265,7 @@ Were there any payments for this loan whether they are entered into KMyMoney or Expanding - + 0 32 @@ -1313,7 +1313,7 @@ Do you want to record all payments of this loan with KMyMoney? Expanding - + 0 69 @@ -1385,7 +1385,7 @@ Do you want to record all payments of this loan with KMyMoney? Expanding - + 137 0 @@ -1404,7 +1404,7 @@ Do you want to record all payments of this loan with KMyMoney? Expanding - + 0 69 @@ -1446,7 +1446,7 @@ Select the date when the interest rate for this loan will be modified and the fr Expanding - + 16 99 @@ -1522,7 +1522,7 @@ Select the date when the interest rate for this loan will be modified and the fr Expanding - + 20 80 @@ -1570,7 +1570,7 @@ Please enter the amount you pay for principal and interest or leave the field em Expanding - + 0 21 @@ -1601,7 +1601,7 @@ Please enter the amount you pay for principal and interest or leave the field em Expanding - + 100 0 @@ -1663,7 +1663,7 @@ Please enter the amount you pay for principal and interest or leave the field em Expanding - + 100 0 @@ -1682,7 +1682,7 @@ Please enter the amount you pay for principal and interest or leave the field em Expanding - + 0 19 @@ -1743,7 +1743,7 @@ Please enter the interest rate or leave the field empty to calculate it. Expanding - + 0 29 @@ -1774,7 +1774,7 @@ Please enter the interest rate or leave the field empty to calculate it. Expanding - + 101 0 @@ -1836,7 +1836,7 @@ Please enter the interest rate or leave the field empty to calculate it. Expanding - + 101 0 @@ -1855,7 +1855,7 @@ Please enter the interest rate or leave the field empty to calculate it. Expanding - + 0 29 @@ -1915,7 +1915,7 @@ If KMyMoney should calculate this value for you, then leave the field blank. Expanding - + 0 78 @@ -1961,7 +1961,7 @@ If KMyMoney should calculate this value for you, then leave the field blank. Expanding - + 0 28 @@ -2020,7 +2020,7 @@ You have successfully entered the general information about your loan. Next, KMy Expanding - + 0 19 @@ -2051,7 +2051,7 @@ You have successfully entered the general information about your loan. Next, KMy Expanding - + 136 0 @@ -2117,7 +2117,7 @@ You have successfully entered the general information about your loan. Next, KMy Expanding - + 0 18 @@ -2136,7 +2136,7 @@ You have successfully entered the general information about your loan. Next, KMy Expanding - + 135 0 @@ -2155,7 +2155,7 @@ You have successfully entered the general information about your loan. Next, KMy Expanding - + 0 23 @@ -2203,7 +2203,7 @@ How often will there be payments made to this loan? Expanding - + 0 49 @@ -2234,7 +2234,7 @@ How often will there be payments made to this loan? Expanding - + 39 0 @@ -2256,7 +2256,7 @@ How often will there be payments made to this loan? Expanding - + 56 0 @@ -2275,7 +2275,7 @@ How often will there be payments made to this loan? Expanding - + 0 49 @@ -2323,7 +2323,7 @@ When does the actual interest rate get calculated? Expanding - + 0 69 @@ -2395,7 +2395,7 @@ When does the actual interest rate get calculated? Expanding - + 296 0 @@ -2414,7 +2414,7 @@ When does the actual interest rate get calculated? Expanding - + 0 69 @@ -2461,7 +2461,7 @@ When does the actual interest rate get calculated? Expanding - + 0 15 @@ -2695,7 +2695,7 @@ Please enter the interest rate or leave the field empty to calculate it. Expanding - + 0 16 @@ -2923,7 +2923,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The Expanding - + 16 54 @@ -3164,7 +3164,7 @@ Please enter the amount you pay for principal and interest or leave the field em Expanding - + 0 16 @@ -3398,7 +3398,7 @@ Please enter the amount of a final amortization payment or leave the field empty Expanding - + 0 16 @@ -3632,7 +3632,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept Expanding - + 0 22 @@ -3837,7 +3837,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched Expanding - + 0 14 @@ -3868,7 +3868,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched Expanding - + 136 0 @@ -3937,7 +3937,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched Expanding - + 0 18 @@ -3956,7 +3956,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched Expanding - + 135 0 @@ -3975,7 +3975,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched Expanding - + 0 18 @@ -4023,7 +4023,7 @@ Please select the category you want to assign the interest payments to or create Expanding - + 0 38 @@ -4059,7 +4059,7 @@ Please select the category you want to assign the interest payments to or create Expanding - + 264 0 @@ -4086,7 +4086,7 @@ Please select the category you want to assign the interest payments to or create Expanding - + 0 22 @@ -4134,7 +4134,7 @@ If your regular payment contains any additional fees, click on the button "Addit Expanding - + 0 16 @@ -4285,7 +4285,7 @@ If your regular payment contains any additional fees, click on the button "Addit Expanding - + 40 20 @@ -4302,7 +4302,7 @@ If your regular payment contains any additional fees, click on the button "Addit Expanding - + 40 20 @@ -4321,7 +4321,7 @@ If your regular payment contains any additional fees, click on the button "Addit Expanding - + 0 16 @@ -4349,7 +4349,7 @@ If your regular payment contains any additional fees, click on the button "Addit Expanding - + 0 16 @@ -4397,7 +4397,7 @@ If you selected to record all payments this date has already been supplied. If y Expanding - + 0 23 @@ -4459,7 +4459,7 @@ If you selected to record all payments this date has already been supplied. If y Expanding - + 0 24 @@ -4507,7 +4507,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val Expanding - + 0 23 @@ -4733,7 +4733,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a Expanding - + 20 21 @@ -4779,7 +4779,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a Expanding - + 466 20 @@ -4837,7 +4837,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a Expanding - + 20 16 @@ -4885,7 +4885,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas Expanding - + 0 16 @@ -5444,7 +5444,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas Expanding - + 0 16 diff --git a/kmymoney2/dialogs/konlinequoteconfigurationdecl.ui b/kmymoney2/dialogs/konlinequoteconfigurationdecl.ui index 3d6547b..08560e6 100644 --- a/kmymoney2/dialogs/konlinequoteconfigurationdecl.ui +++ b/kmymoney2/dialogs/konlinequoteconfigurationdecl.ui @@ -64,7 +64,7 @@ Expanding - + 20 20 diff --git a/kmymoney2/dialogs/kpayeereassigndlgdecl.ui b/kmymoney2/dialogs/kpayeereassigndlgdecl.ui index 4b01cac..9db25ed 100644 --- a/kmymoney2/dialogs/kpayeereassigndlgdecl.ui +++ b/kmymoney2/dialogs/kpayeereassigndlgdecl.ui @@ -29,7 +29,7 @@ textLabel1 - + 300 0 @@ -52,7 +52,7 @@ Fixed - + 20 16 @@ -82,7 +82,7 @@ Expanding - + 20 20 @@ -132,7 +132,7 @@ Expanding - + 305 20 diff --git a/kmymoney2/dialogs/kplugindlg.ui b/kmymoney2/dialogs/kplugindlg.ui index 77b1ecb..2cf4373 100644 --- a/kmymoney2/dialogs/kplugindlg.ui +++ b/kmymoney2/dialogs/kplugindlg.ui @@ -36,7 +36,7 @@ - tqStatus + Status true @@ -82,7 +82,7 @@ Expanding - + 180 20 diff --git a/kmymoney2/dialogs/kreconciledlg.cpp b/kmymoney2/dialogs/kreconciledlg.cpp index c48e273..9c18d68 100644 --- a/kmymoney2/dialogs/kreconciledlg.cpp +++ b/kmymoney2/dialogs/kreconciledlg.cpp @@ -43,11 +43,11 @@ KReconcileDlg::KReconcileDlg(const MyMoneyMoney /* previousBal */, const MyMoney m_endingDate = endingDate; - totalCreditsLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); - totalDebitsLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); - previousLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); - endingLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); - differenceLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); + totalCreditsLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); + totalDebitsLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); + previousLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); + endingLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); + differenceLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); debitListView->setRootIsDecorated(false); @@ -313,11 +313,11 @@ void KReconcileDlg::resetData(const MyMoneyMoney /* previousBal */, const MyMone m_endingDate = endingDate; - //totalCreditsLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); - //totalDebitsLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); - //previousLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); - //endingLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); - //differenceLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); + //totalCreditsLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); + //totalDebitsLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); + //previousLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); + //endingLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); + //differenceLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); endingLabel->setText(KGlobal::locale()->formatMoney(m_clearedBalance.amount(),"")); diff --git a/kmymoney2/dialogs/kreconciledlgdecl.ui b/kmymoney2/dialogs/kreconciledlgdecl.ui index 9ce4dbe..b0a2770 100644 --- a/kmymoney2/dialogs/kreconciledlgdecl.ui +++ b/kmymoney2/dialogs/kreconciledlgdecl.ui @@ -12,7 +12,7 @@ 0 - + 0 0 @@ -103,7 +103,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto Layout25 - + 420 0 @@ -131,7 +131,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto 0 - + 420 15 @@ -153,7 +153,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto 0 - + 420 100 @@ -188,7 +188,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto 0 - + 0 15 @@ -210,7 +210,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto 0 - + 420 100 @@ -264,7 +264,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto Expanding - + 20 0 @@ -313,7 +313,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto Expanding - + 20 0 @@ -332,7 +332,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto 0 - + 250 120 @@ -377,7 +377,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto 0 - + 90 0 @@ -441,7 +441,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto 0 - + 90 0 @@ -468,7 +468,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto 0 - + 0 0 @@ -511,7 +511,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto 0 - + 90 0 @@ -538,7 +538,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto 0 - + 0 0 @@ -581,7 +581,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto 0 - + 90 0 @@ -655,7 +655,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto Expanding - + 20 0 diff --git a/kmymoney2/dialogs/kreportconfigurationfilterdlg.cpp b/kmymoney2/dialogs/kreportconfigurationfilterdlg.cpp index 388019a..8357678 100644 --- a/kmymoney2/dialogs/kreportconfigurationfilterdlg.cpp +++ b/kmymoney2/dialogs/kreportconfigurationfilterdlg.cpp @@ -378,7 +378,7 @@ void KReportConfigurationFilterDlg::slotReset(void) for(it_b = m_budgets.begin(); it_b != m_budgets.end(); ++it_b) { m_tab2->m_comboBudget->insertItem((*it_b).name(), i); //set the current selected item - if( (m_initialState.budget() == "Any" && (*it_b).budgetStart().year() == TQDate::tqcurrentDate().year()) + if( (m_initialState.budget() == "Any" && (*it_b).budgetStart().year() == TQDate::currentDate().year()) || m_initialState.budget() == (*it_b).id()) m_tab2->m_comboBudget->setCurrentItem(i); i++; diff --git a/kmymoney2/dialogs/ksecuritylisteditordecl.ui b/kmymoney2/dialogs/ksecuritylisteditordecl.ui index da8c628..a1b1570 100644 --- a/kmymoney2/dialogs/ksecuritylisteditordecl.ui +++ b/kmymoney2/dialogs/ksecuritylisteditordecl.ui @@ -141,7 +141,7 @@ Expanding - + 20 51 @@ -182,7 +182,7 @@ Expanding - + 20 110 @@ -233,7 +233,7 @@ Expanding - + 91 20 diff --git a/kmymoney2/dialogs/kselectdatabasedlgdecl.ui b/kmymoney2/dialogs/kselectdatabasedlgdecl.ui index 4b2b31e..fdf7fe8 100644 --- a/kmymoney2/dialogs/kselectdatabasedlgdecl.ui +++ b/kmymoney2/dialogs/kselectdatabasedlgdecl.ui @@ -177,7 +177,7 @@ As always, please make sure you have adequate backups of your data.</font> Expanding - + 20 20 @@ -202,7 +202,7 @@ As always, please make sure you have adequate backups of your data.</font> Expanding - + 31 20 diff --git a/kmymoney2/dialogs/kselecttransactionsdlgdecl.ui b/kmymoney2/dialogs/kselecttransactionsdlgdecl.ui index 5697104..e829e95 100644 --- a/kmymoney2/dialogs/kselecttransactionsdlgdecl.ui +++ b/kmymoney2/dialogs/kselecttransactionsdlgdecl.ui @@ -123,7 +123,7 @@ Expanding - + 430 20 diff --git a/kmymoney2/dialogs/ksortoptiondlg.ui b/kmymoney2/dialogs/ksortoptiondlg.ui index bfc4ca7..cc7ed68 100644 --- a/kmymoney2/dialogs/ksortoptiondlg.ui +++ b/kmymoney2/dialogs/ksortoptiondlg.ui @@ -61,7 +61,7 @@ Expanding - + 237 20 diff --git a/kmymoney2/dialogs/ksplitcorrectiondlg.ui b/kmymoney2/dialogs/ksplitcorrectiondlg.ui index 0f2a196..aac3714 100644 --- a/kmymoney2/dialogs/ksplitcorrectiondlg.ui +++ b/kmymoney2/dialogs/ksplitcorrectiondlg.ui @@ -12,7 +12,7 @@ 292 - + 80 0 @@ -133,7 +133,7 @@ Expanding - + 20 41 @@ -172,7 +172,7 @@ Expanding - + 61 20 @@ -191,7 +191,7 @@ 0 - + 80 0 @@ -213,7 +213,7 @@ 0 - + 80 0 diff --git a/kmymoney2/dialogs/ksplittransactiondlg.cpp b/kmymoney2/dialogs/ksplittransactiondlg.cpp index cb80e62..d64ecf0 100644 --- a/kmymoney2/dialogs/ksplittransactiondlg.cpp +++ b/kmymoney2/dialogs/ksplittransactiondlg.cpp @@ -126,7 +126,7 @@ KSplitTransactionDlg::KSplitTransactionDlg(const MyMoneyTransaction& t, kapp->config()->setGroup("SplitTransactionEditor"); size = kapp->config()->readSizeEntry("Geometry", &size); size.setHeight(size.height()-1); - TQDialog::resize( size.expandedTo(tqminimumSizeHint()) ); + TQDialog::resize( size.expandedTo(minimumSizeHint()) ); // Trick: it seems, that the initial sizing of the dialog does // not work correctly. At least, the columns do not get displayed diff --git a/kmymoney2/dialogs/ksplittransactiondlgdecl.ui b/kmymoney2/dialogs/ksplittransactiondlgdecl.ui index ecd6a90..9e96775 100644 --- a/kmymoney2/dialogs/ksplittransactiondlgdecl.ui +++ b/kmymoney2/dialogs/ksplittransactiondlgdecl.ui @@ -88,7 +88,7 @@ Expanding - + 0 16 @@ -99,7 +99,7 @@ Layout49 - + 32767 80 @@ -127,7 +127,7 @@ 0 - + 120 15 @@ -154,7 +154,7 @@ 0 - + 120 15 @@ -217,7 +217,7 @@ 0 - + 120 15 @@ -236,7 +236,7 @@ TextLabel1_2_2 - + 150 0 @@ -284,13 +284,13 @@ 0 - + 15 0 - + 32767 80 @@ -364,7 +364,7 @@ Expanding - + 20 120 diff --git a/kmymoney2/dialogs/kupdatestockpricedlg.cpp b/kmymoney2/dialogs/kupdatestockpricedlg.cpp index 53d930e..84253e6 100644 --- a/kmymoney2/dialogs/kupdatestockpricedlg.cpp +++ b/kmymoney2/dialogs/kupdatestockpricedlg.cpp @@ -37,7 +37,7 @@ KUpdateStockPriceDlg::KUpdateStockPriceDlg(TQWidget* parent, const char* name) : kUpdateStockPriceDecl(parent, name, true) { - m_date->setDate(TQDate::tqcurrentDate()); + m_date->setDate(TQDate::currentDate()); init(); } diff --git a/kmymoney2/dialogs/kupdatestockpricedlgdecl.ui b/kmymoney2/dialogs/kupdatestockpricedlgdecl.ui index 3b1659f..dbc8cf1 100644 --- a/kmymoney2/dialogs/kupdatestockpricedlgdecl.ui +++ b/kmymoney2/dialogs/kupdatestockpricedlgdecl.ui @@ -50,7 +50,7 @@ Expanding - + 71 21 @@ -90,7 +90,7 @@ Expanding - + 40 20 @@ -154,7 +154,7 @@ Expanding - + 40 20 @@ -175,7 +175,7 @@ Expanding - + 31 40 @@ -214,7 +214,7 @@ Expanding - + 71 21 diff --git a/kmymoney2/dialogs/mymoneyqifprofileeditordecl.ui b/kmymoney2/dialogs/mymoneyqifprofileeditordecl.ui index 8c27984..7bf4672 100644 --- a/kmymoney2/dialogs/mymoneyqifprofileeditordecl.ui +++ b/kmymoney2/dialogs/mymoneyqifprofileeditordecl.ui @@ -84,7 +84,7 @@ TextLabel2_2_3 - + 140 0 @@ -98,7 +98,7 @@ TextLabel2_2 - + 140 0 @@ -117,7 +117,7 @@ TextLabel2 - + 140 0 @@ -141,7 +141,7 @@ TextLabel2_2_2 - + 140 0 @@ -165,7 +165,7 @@ TextLabel1 - + 140 0 @@ -195,7 +195,7 @@ Expanding - + 20 20 @@ -243,7 +243,7 @@ TextLabel3 - + 140 0 @@ -268,7 +268,7 @@ TextLabel4 - + 140 0 @@ -293,7 +293,7 @@ Expanding - + 90 20 @@ -312,7 +312,7 @@ Expanding - + 20 80 @@ -586,7 +586,7 @@ TextLabel1_2 - + 150 0 @@ -600,7 +600,7 @@ TextLabel1_3 - + 150 0 @@ -627,7 +627,7 @@ Expanding - + 100 20 @@ -646,7 +646,7 @@ Expanding - + 16 16 @@ -678,7 +678,7 @@ TextLabel1_4_2 - + 140 0 @@ -705,7 +705,7 @@ TextLabel1_4_3 - + 140 0 @@ -727,7 +727,7 @@ TextLabel1_4 - + 140 0 @@ -749,7 +749,7 @@ Expanding - + 20 90 @@ -823,7 +823,7 @@ Expanding - + 104 0 diff --git a/kmymoney2/dialogs/settings/ksettingscolorsdecl.ui b/kmymoney2/dialogs/settings/ksettingscolorsdecl.ui index af307ac..a2920fb 100644 --- a/kmymoney2/dialogs/settings/ksettingscolorsdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingscolorsdecl.ui @@ -157,7 +157,7 @@ Expanding - + 21 20 @@ -382,7 +382,7 @@ Expanding - + 20 20 diff --git a/kmymoney2/dialogs/settings/ksettingsfontsdecl.ui b/kmymoney2/dialogs/settings/ksettingsfontsdecl.ui index bffa088..a6e48f9 100644 --- a/kmymoney2/dialogs/settings/ksettingsfontsdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsfontsdecl.ui @@ -58,7 +58,7 @@ Expanding - + 110 20 @@ -75,7 +75,7 @@ Expanding - + 100 20 @@ -110,7 +110,7 @@ Expanding - + 20 30 diff --git a/kmymoney2/dialogs/settings/ksettingsforecastdecl.ui b/kmymoney2/dialogs/settings/ksettingsforecastdecl.ui index e70f01e..4910424 100644 --- a/kmymoney2/dialogs/settings/ksettingsforecastdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsforecastdecl.ui @@ -105,7 +105,7 @@ Expanding - + 133 21 @@ -187,7 +187,7 @@ Expanding - + 130 21 @@ -255,7 +255,7 @@ Expanding - + 20 40 diff --git a/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui b/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui index 9f8adaa..9d8efdc 100644 --- a/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui @@ -120,7 +120,7 @@ Expanding - + 61 21 @@ -194,7 +194,7 @@ Expanding - + 354 20 @@ -304,7 +304,7 @@ Expanding - + 90 20 @@ -323,7 +323,7 @@ Expanding - + 20 20 @@ -452,7 +452,7 @@ Expanding - + 20 21 @@ -588,7 +588,7 @@ You can use <b>View/Show all accounts</b> to temporarily show hidden Expanding - + 63 20 @@ -620,7 +620,7 @@ You can use <b>View/Show all accounts</b> to temporarily show hidden Expanding - + 20 30 diff --git a/kmymoney2/dialogs/settings/ksettingsgpgdecl.ui b/kmymoney2/dialogs/settings/ksettingsgpgdecl.ui index 09f846a..fbeb29b 100644 --- a/kmymoney2/dialogs/settings/ksettingsgpgdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsgpgdecl.ui @@ -142,7 +142,7 @@ The <i>additional recovery encryption</i> is only accessible, if the Expanding - + 50 20 @@ -191,7 +191,7 @@ The <i>additional recovery encryption</i> is only accessible, if the Expanding - + 16 20 @@ -225,7 +225,7 @@ This mechanism is provided for the case that you have lost your key and cannot a Expanding - + 21 30 diff --git a/kmymoney2/dialogs/settings/ksettingshomedecl.ui b/kmymoney2/dialogs/settings/ksettingshomedecl.ui index cc8eaff..eda3bbb 100644 --- a/kmymoney2/dialogs/settings/ksettingshomedecl.ui +++ b/kmymoney2/dialogs/settings/ksettingshomedecl.ui @@ -45,7 +45,7 @@ Fixed - + 20 20 @@ -78,7 +78,7 @@ Expanding - + 21 70 @@ -97,7 +97,7 @@ Expanding - + 80 21 @@ -193,7 +193,7 @@ Use the buttons and checkboxes to customize the tqlayout of the home page. Expanding - + 40 20 diff --git a/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui b/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui index cc64bdb..6ff3521 100644 --- a/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui @@ -12,7 +12,7 @@ 442 - + 0 0 @@ -211,7 +211,7 @@ Expanding - + 240 20 diff --git a/kmymoney2/dialogs/settings/ksettingsregisterdecl.ui b/kmymoney2/dialogs/settings/ksettingsregisterdecl.ui index 1d8f320..33fbbe3 100644 --- a/kmymoney2/dialogs/settings/ksettingsregisterdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsregisterdecl.ui @@ -110,7 +110,7 @@ Expanding - + 20 40 @@ -323,7 +323,7 @@ Expanding - + 31 20 @@ -432,7 +432,7 @@ Selecting 0% will list all transactions. Expanding - + 20 20 @@ -498,7 +498,7 @@ Selecting 0% will list all transactions. Expanding - + 61 20 @@ -531,7 +531,7 @@ Selecting 0% will list all transactions. Expanding - + 20 60 diff --git a/kmymoney2/dialogs/settings/ksettingsschedulesdecl.ui b/kmymoney2/dialogs/settings/ksettingsschedulesdecl.ui index 94762cb..61681cf 100644 --- a/kmymoney2/dialogs/settings/ksettingsschedulesdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsschedulesdecl.ui @@ -103,7 +103,7 @@ Expanding - + 41 21 @@ -122,7 +122,7 @@ Expanding - + 20 40 diff --git a/kmymoney2/dialogs/transactioneditor.cpp b/kmymoney2/dialogs/transactioneditor.cpp index 63ff168..9646c91 100644 --- a/kmymoney2/dialogs/transactioneditor.cpp +++ b/kmymoney2/dialogs/transactioneditor.cpp @@ -599,7 +599,7 @@ bool TransactionEditor::enterTransactions(TQString& newId, bool askForSchedule, if((*it_ts).id().isEmpty()) { bool enter = true; - if(askForSchedule && (*it_ts).postDate() > TQDate::tqcurrentDate()) { + if(askForSchedule && (*it_ts).postDate() > TQDate::currentDate()) { KGuiItem enterItem; KIconLoader* il = KGlobal::iconLoader(); KGuiItem enterButton( i18n("&Enter" ), @@ -859,7 +859,7 @@ void StdTransactionEditor::createEditWidgets(void) TQLabel* label; m_editWidgets["category-label"] = label = new TQLabel(i18n("Category"), 0); - label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); + label->setAlignment(TQt::AlignVCenter | TQt::DontClip); // create a copy of tabbar above the form (if we are created for a form) KMyMoneyTransactionForm::TransactionForm* form = dynamic_cast(m_regForm); @@ -872,11 +872,11 @@ void StdTransactionEditor::createEditWidgets(void) } label = new TQLabel(i18n("Date"), 0); - label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); + label->setAlignment(TQt::AlignVCenter | TQt::DontClip); m_editWidgets["date-label"] = label; label = new TQLabel(i18n("Number"), 0); - label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); + label->setAlignment(TQt::AlignVCenter | TQt::DontClip); m_editWidgets["number-label"] = label; setupPrecision(); @@ -966,7 +966,7 @@ void StdTransactionEditor::loadEditWidgets(KMyMoneyRegister::Action action) else if(m_lastPostDate.isValid()) dynamic_cast(m_editWidgets["postdate"])->setDate(m_lastPostDate); else - dynamic_cast(m_editWidgets["postdate"])->setDate(TQDate::tqcurrentDate()); + dynamic_cast(m_editWidgets["postdate"])->setDate(TQDate::currentDate()); if((w = haveWidget("number")) != 0) { dynamic_cast(w)->loadText(m_split.number()); @@ -1195,7 +1195,7 @@ void StdTransactionEditor::slotUpdatePayee(const TQString& payeeId) // check if date has been altered by user kMyMoneyDateInput* postDate = dynamic_cast(m_editWidgets["postdate"]); if((m_lastPostDate.isValid() && (postDate->date() != m_lastPostDate)) - || (!m_lastPostDate.isValid() && (postDate->date() != TQDate::tqcurrentDate()))) + || (!m_lastPostDate.isValid() && (postDate->date() != TQDate::currentDate()))) return; #endif @@ -1615,7 +1615,7 @@ void StdTransactionEditor::updateVAT(bool amountChanged) // if we made this a split transaction, then move the // focus to the memo field - if(tqApp->tqfocusWidget() == haveWidget("category")) { + if(tqApp->focusWidget() == haveWidget("category")) { TQWidget* w = haveWidget("memo"); if(w) w->setFocus(); @@ -2029,7 +2029,7 @@ bool StdTransactionEditor::createTransaction(MyMoneyTransaction& t, const MyMone s0.setReconcileFlag(status->state()); if(s0.reconcileFlag() == MyMoneySplit::Reconciled && !s0.reconcileDate().isValid()) - s0.setReconcileDate(TQDate::tqcurrentDate()); + s0.setReconcileDate(TQDate::currentDate()); checkPayeeInSplit(s0, payeeId); -- cgit v1.2.1