diff options
Diffstat (limited to 'kmymoney2/dialogs')
87 files changed, 796 insertions, 796 deletions
diff --git a/kmymoney2/dialogs/investactivities.cpp b/kmymoney2/dialogs/investactivities.cpp index 526b54e..75081b7 100644 --- a/kmymoney2/dialogs/investactivities.cpp +++ b/kmymoney2/dialogs/investactivities.cpp @@ -165,7 +165,7 @@ void Activity::preloadAssetAccount(void) cat = dynamic_cast<KMyMoneyCategory*>(haveWidget("asset-account")); if(cat->isVisible()) { if(cat->currentText().isEmpty()) { - MyMoneyAccount acc = MyMoneyFile::instance()->accountByName(i18n("%1 (Brokerage)").tqarg(m_parent->account().name())); + MyMoneyAccount acc = MyMoneyFile::instance()->accountByName(i18n("%1 (Brokerage)").arg(m_parent->account().name())); if(!acc.id().isEmpty()) { bool blocked = cat->signalsBlocked(); // block signals, so that the focus does not go crazy 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..81be6c2 100644 --- a/kmymoney2/dialogs/kaccountselectdlgdecl.ui +++ b/kmymoney2/dialogs/kaccountselectdlgdecl.ui @@ -30,7 +30,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout19</cstring> + <cstring>layout19</cstring> </property> <hbox> <property name="name"> @@ -58,7 +58,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout18</cstring> + <cstring>layout18</cstring> </property> <vbox> <property name="name"> @@ -66,7 +66,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <grid> <property name="name"> @@ -95,7 +95,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>110</width> <height>20</height> @@ -127,7 +127,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -154,7 +154,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -184,7 +184,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>160</width> <height>0</height> diff --git a/kmymoney2/dialogs/kbackupdlgdecl.ui b/kmymoney2/dialogs/kbackupdlgdecl.ui index e0e3a7a..2f27a20 100644 --- a/kmymoney2/dialogs/kbackupdlgdecl.ui +++ b/kmymoney2/dialogs/kbackupdlgdecl.ui @@ -42,7 +42,7 @@ Please make sure you have a disk inserted and that the drive is ready. Then choo Click OK to perform the backup. If your system does not use an automounter, make sure you mark the checkbox below to "mount this directory before backing up."</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -135,7 +135,7 @@ Click OK to perform the backup. If your system does not use an automounter, make <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>24</height> @@ -168,7 +168,7 @@ Click OK to perform the backup. If your system does not use an automounter, make <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>455</width> <height>0</height> diff --git a/kmymoney2/dialogs/kbalancechartdlg.cpp b/kmymoney2/dialogs/kbalancechartdlg.cpp index 85134da..ceb7ff8 100644 --- a/kmymoney2/dialogs/kbalancechartdlg.cpp +++ b/kmymoney2/dialogs/kbalancechartdlg.cpp @@ -22,7 +22,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <tqlayout.h> +#include <layout.h> #include <tqframe.h> // ---------------------------------------------------------------------------- @@ -56,7 +56,7 @@ KBalanceChartDlg::KBalanceChartDlg(const MyMoneyAccount& account, TQWidget* pare KDialog(parent, name) { #ifdef HAVE_KDCHART - setCaption(i18n("Balance of %1").tqarg(account.name())); + setCaption(i18n("Balance of %1").arg(account.name())); setSizeGripEnabled( TRUE ); setModal( TRUE ); @@ -67,7 +67,7 @@ KBalanceChartDlg::KBalanceChartDlg(const MyMoneyAccount& account, TQWidget* pare MyMoneyReport::eMonths, MyMoneyTransactionFilter::userDefined, // overridden by the setDateFilter() call below MyMoneyReport::eDetailTotal, - i18n("%1 Balance History").tqarg(account.name()), + i18n("%1 Balance History").arg(account.name()), i18n("Generated Report") ); reportCfg.setChartByDefault(true); @@ -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/kcategoryreassigndlg.cpp b/kmymoney2/dialogs/kcategoryreassigndlg.cpp index e0fb54d..4de99f6 100644 --- a/kmymoney2/dialogs/kcategoryreassigndlg.cpp +++ b/kmymoney2/dialogs/kcategoryreassigndlg.cpp @@ -78,7 +78,7 @@ TQString KCategoryReassignDlg::show(const MyMoneyAccount& category) // if there is no category for reassignment left, we bail out if(list.isEmpty()) { - KMessageBox::sorry(this, TQString("<qt>")+i18n("At least one transaction/schedule still references the category <b>%1</b>. However, at least one category with the same currency must exist so that the transactions/schedules can be reassigned.").tqarg(category.name())+TQString("</qt>")); + KMessageBox::sorry(this, TQString("<qt>")+i18n("At least one transaction/schedule still references the category <b>%1</b>. However, at least one category with the same currency must exist so that the transactions/schedules can be reassigned.").arg(category.name())+TQString("</qt>")); return TQString(); } diff --git a/kmymoney2/dialogs/kcategoryreassigndlgdecl.ui b/kmymoney2/dialogs/kcategoryreassigndlgdecl.ui index ee9faa4..f29d82b 100644 --- a/kmymoney2/dialogs/kcategoryreassigndlgdecl.ui +++ b/kmymoney2/dialogs/kcategoryreassigndlgdecl.ui @@ -29,7 +29,7 @@ <property name="name"> <cstring>textLabel1</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>300</width> <height>0</height> @@ -38,7 +38,7 @@ <property name="text"> <string>The transactions, schedules and budgets associated with the selected category need to be re-assigned to a different category before the selected category can be deleted. Please select a category from the list below.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignJustify|AlignTop</set> </property> </widget> @@ -52,7 +52,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -82,7 +82,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -105,7 +105,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -121,7 +121,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>305</width> <height>20</height> 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.</string> <enum>Expanding</enum> </property> <property> - <name>tqsizeHint</name> + <name>sizeHint</name> <size> <width>20</width> <height>20</height> @@ -132,7 +132,7 @@ Once you have chosen an import type please press the OK button.</string> <cstring>typeCombo</cstring> </property> <property stdset="1"> - <name>tqminimumSize</name> + <name>minimumSize</name> <size> <width>100</width> <height>0</height> @@ -155,7 +155,7 @@ Once you have chosen an import type please press the OK button.</string> </sizepolicy> </property> <property stdset="1"> - <name>tqminimumSize</name> + <name>minimumSize</name> <size> <width>410</width> <height>100</height> @@ -195,7 +195,7 @@ Once you have chosen an import type please press the OK button.</string> <enum>Expanding</enum> </property> <property> - <name>tqsizeHint</name> + <name>sizeHint</name> <size> <width>20</width> <height>20</height> diff --git a/kmymoney2/dialogs/kconfirmmanualenterdlg.cpp b/kmymoney2/dialogs/kconfirmmanualenterdlg.cpp index 0179721..966ed55 100644 --- a/kmymoney2/dialogs/kconfirmmanualenterdlg.cpp +++ b/kmymoney2/dialogs/kconfirmmanualenterdlg.cpp @@ -83,7 +83,7 @@ void KConfirmManualEnterDlg::loadTransactions(const MyMoneyTransaction& to, cons if (po != pn) { noItemsChanged++; - messageDetail += i18n("Payee changed.<br> Old: <b>%1</b>, New: <b>%2</b><p>").tqarg(po).tqarg(pn); + messageDetail += i18n("Payee changed.<br> Old: <b>%1</b>, New: <b>%2</b><p>").arg(po).arg(pn); } #if 0 if ( (m_schedule.type() == MyMoneySchedule::TYPE_TRANSFER || @@ -92,7 +92,7 @@ void KConfirmManualEnterDlg::loadTransactions(const MyMoneyTransaction& to, cons { noItemsChanged++; messageDetail += i18n("Account changed. Old: \"%1\", New: \"%2\"") - .tqarg(m_schedule.account().name()).tqarg(m_from->currentText()) + TQString("\n"); + .arg(m_schedule.account().name()).arg(m_from->currentText()) + TQString("\n"); } if ( m_schedule.type() == MyMoneySchedule::TYPE_DEPOSIT && @@ -100,23 +100,23 @@ void KConfirmManualEnterDlg::loadTransactions(const MyMoneyTransaction& to, cons { noItemsChanged++; messageDetail += i18n("Account changed. Old: \"%1\", New: \"%2\"") - .tqarg(m_schedule.account().name()).tqarg(m_to->currentText()) + TQString("\n"); + .arg(m_schedule.account().name()).arg(m_to->currentText()) + TQString("\n"); } #endif if(to.splits()[0].accountId() != tn.splits()[0].accountId()) { noItemsChanged++; messageDetail += i18n("Account changed.<br> Old: <b>%1</b>, New: <b>%2</b><p>") - .tqarg(file->account(to.splits()[0].accountId()).name()) - .tqarg(file->account(tn.splits()[0].accountId()).name()); + .arg(file->account(to.splits()[0].accountId()).name()) + .arg(file->account(tn.splits()[0].accountId()).name()); } if(file->isTransfer(to) && file->isTransfer(tn)) { if(to.splits()[1].accountId() != tn.splits()[1].accountId()) { noItemsChanged++; messageDetail += i18n("Transfer account changed.<br> Old: <b>%1</b>, New: <b>%2</b><p>") - .tqarg(file->account(to.splits()[1].accountId()).name()) - .tqarg(file->account(tn.splits()[1].accountId()).name()); + .arg(file->account(to.splits()[1].accountId()).name()) + .arg(file->account(tn.splits()[1].accountId()).name()); } } else { TQString co, cn; @@ -142,7 +142,7 @@ void KConfirmManualEnterDlg::loadTransactions(const MyMoneyTransaction& to, cons if (co != cn) { noItemsChanged++; - messageDetail += i18n("Category changed.<br> Old: <b>%1</b>, New: <b>%2</b><p>").tqarg(co).tqarg(cn); + messageDetail += i18n("Category changed.<br> Old: <b>%1</b>, New: <b>%2</b><p>").arg(co).arg(cn); } } @@ -156,7 +156,7 @@ void KConfirmManualEnterDlg::loadTransactions(const MyMoneyTransaction& to, cons if (mo != mn) { noItemsChanged++; - messageDetail += i18n("Memo changed.<br> Old: <b>%1</b>, New: <b>%2</b><p>").tqarg(mo).tqarg(mn); + messageDetail += i18n("Memo changed.<br> Old: <b>%1</b>, New: <b>%2</b><p>").arg(mo).arg(mn); } const MyMoneySecurity& sec = MyMoneyFile::instance()->security(to.commodity()); @@ -166,7 +166,7 @@ void KConfirmManualEnterDlg::loadTransactions(const MyMoneyTransaction& to, cons if (ao != an) { noItemsChanged++; messageDetail += i18n("Amount changed.<br> Old: <b>%1</b>, New: <b>%2</b><p>") - .tqarg(ao.formatMoney(sec.smallestAccountFraction())).tqarg(an.formatMoney(sec.smallestAccountFraction())); + .arg(ao.formatMoney(sec.smallestAccountFraction())).arg(an.formatMoney(sec.smallestAccountFraction())); } MyMoneySplit::reconcileFlagE fo, fn; @@ -175,8 +175,8 @@ void KConfirmManualEnterDlg::loadTransactions(const MyMoneyTransaction& to, cons if(fo != fn) { noItemsChanged++; messageDetail += i18n("Reconciliation flag changed.<br> Old: <b>%1</b>, New: <b>%2</b><p>") - .tqarg(KMyMoneyUtils::reconcileStateToString(fo, true)) - .tqarg(KMyMoneyUtils::reconcileStateToString(fn, true)); + .arg(KMyMoneyUtils::reconcileStateToString(fo, true)) + .arg(KMyMoneyUtils::reconcileStateToString(fn, true)); } } catch (MyMoneyException *e) diff --git a/kmymoney2/dialogs/kconfirmmanualenterdlgdecl.ui b/kmymoney2/dialogs/kconfirmmanualenterdlgdecl.ui index 5a4b87b..a605fdb 100644 --- a/kmymoney2/dialogs/kconfirmmanualenterdlgdecl.ui +++ b/kmymoney2/dialogs/kconfirmmanualenterdlgdecl.ui @@ -93,7 +93,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -109,7 +109,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>180</width> <height>16</height> diff --git a/kmymoney2/dialogs/kcsvprogressdlg.cpp b/kmymoney2/dialogs/kcsvprogressdlg.cpp index 2330a8a..a1eef8c 100644 --- a/kmymoney2/dialogs/kcsvprogressdlg.cpp +++ b/kmymoney2/dialogs/kcsvprogressdlg.cpp @@ -25,7 +25,7 @@ // ---------------------------------------------------------------------------- // QT Includes #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqlabel.h> #include <tqpushbutton.h> #include <tqprogressbar.h> diff --git a/kmymoney2/dialogs/kcsvprogressdlgdecl.ui b/kmymoney2/dialogs/kcsvprogressdlgdecl.ui index d7c0f20..04912ff 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.</string </sizepolicy> </property> <property stdset="1"> - <name>tqminimumSize</name> + <name>minimumSize</name> <size> <width>50</width> <height>0</height> @@ -243,7 +243,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string </sizepolicy> </property> <property stdset="1"> - <name>tqminimumSize</name> + <name>minimumSize</name> <size> <width>50</width> <height>0</height> @@ -303,7 +303,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string <enum>Expanding</enum> </property> <property> - <name>tqsizeHint</name> + <name>sizeHint</name> <size> <width>20</width> <height>20</height> @@ -387,7 +387,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string <string>Unknown</string> </property> <property stdset="1"> - <name>tqalignment</name> + <name>alignment</name> <set>AlignVCenter|AlignRight</set> </property> <property> @@ -433,7 +433,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string <string>0 of 0</string> </property> <property stdset="1"> - <name>tqalignment</name> + <name>alignment</name> <set>AlignVCenter|AlignRight</set> </property> <property> @@ -484,7 +484,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string <enum>Expanding</enum> </property> <property> - <name>tqsizeHint</name> + <name>sizeHint</name> <size> <width>20</width> <height>20</height> diff --git a/kmymoney2/dialogs/kcurrencycalculator.cpp b/kmymoney2/dialogs/kcurrencycalculator.cpp index 2306816..0ecd16e 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()); @@ -247,22 +247,22 @@ void KCurrencyCalculator::updateExample(const MyMoneyMoney& price) { TQString msg; if(price.isZero()) { - msg = TQString("1 %1 = ? %2").tqarg(m_fromCurrency.tradingSymbol()) - .tqarg(m_toCurrency.tradingSymbol()); + msg = TQString("1 %1 = ? %2").arg(m_fromCurrency.tradingSymbol()) + .arg(m_toCurrency.tradingSymbol()); if(m_fromCurrency.isCurrency()) { msg += TQString("\n"); - msg += TQString("1 %1 = ? %2").tqarg(m_toCurrency.tradingSymbol()) - .tqarg(m_fromCurrency.tradingSymbol()); + msg += TQString("1 %1 = ? %2").arg(m_toCurrency.tradingSymbol()) + .arg(m_fromCurrency.tradingSymbol()); } } else { - msg = TQString("1 %1 = %2 %3").tqarg(m_fromCurrency.tradingSymbol()) - .tqarg(price.formatMoney("", KMyMoneyGlobalSettings::pricePrecision())) - .tqarg(m_toCurrency.tradingSymbol()); + msg = TQString("1 %1 = %2 %3").arg(m_fromCurrency.tradingSymbol()) + .arg(price.formatMoney("", KMyMoneyGlobalSettings::pricePrecision())) + .arg(m_toCurrency.tradingSymbol()); if(m_fromCurrency.isCurrency()) { msg += TQString("\n"); - msg += TQString("1 %1 = %2 %3").tqarg(m_toCurrency.tradingSymbol()) - .tqarg((MyMoneyMoney(1,1)/price).formatMoney("", KMyMoneyGlobalSettings::pricePrecision())) - .tqarg(m_fromCurrency.tradingSymbol()); + msg += TQString("1 %1 = %2 %3").arg(m_toCurrency.tradingSymbol()) + .arg((MyMoneyMoney(1,1)/price).formatMoney("", KMyMoneyGlobalSettings::pricePrecision())) + .arg(m_fromCurrency.tradingSymbol()); } } m_conversionExample->setText(msg); diff --git a/kmymoney2/dialogs/kcurrencycalculatordecl.ui b/kmymoney2/dialogs/kcurrencycalculatordecl.ui index 2d17eb0..ce43b13 100644 --- a/kmymoney2/dialogs/kcurrencycalculatordecl.ui +++ b/kmymoney2/dialogs/kcurrencycalculatordecl.ui @@ -44,7 +44,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -76,7 +76,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>80</width> <height>20</height> @@ -109,7 +109,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>145</width> <height>20</height> @@ -122,7 +122,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -157,7 +157,7 @@ <property name="text"> <string>xxx</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -192,7 +192,7 @@ <property name="text"> <string>xxx</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -202,7 +202,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <grid> <property name="name"> @@ -329,7 +329,7 @@ xx</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -352,7 +352,7 @@ xx</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -368,7 +368,7 @@ xx</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kmymoney2/dialogs/kcurrencyeditdlgdecl.ui b/kmymoney2/dialogs/kcurrencyeditdlgdecl.ui index cd803cb..2ab7f00 100644 --- a/kmymoney2/dialogs/kcurrencyeditdlgdecl.ui +++ b/kmymoney2/dialogs/kcurrencyeditdlgdecl.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -32,7 +32,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -62,7 +62,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -78,7 +78,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>21</height> @@ -103,7 +103,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>31</height> @@ -129,7 +129,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <grid> <property name="name"> @@ -246,7 +246,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kmymoney2/dialogs/keditequityentrydecl.ui b/kmymoney2/dialogs/keditequityentrydecl.ui index ce06abb..d51151e 100644 --- a/kmymoney2/dialogs/keditequityentrydecl.ui +++ b/kmymoney2/dialogs/keditequityentrydecl.ui @@ -25,7 +25,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <grid> <property name="name"> @@ -66,7 +66,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -87,7 +87,7 @@ <property name="text"> <string>1 /</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -147,7 +147,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> @@ -163,7 +163,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>21</height> @@ -204,7 +204,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>21</height> @@ -217,7 +217,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -233,7 +233,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>238</width> <height>21</height> diff --git a/kmymoney2/dialogs/keditequityentrydlg.cpp b/kmymoney2/dialogs/keditequityentrydlg.cpp index 3eed5e6..b5919b5 100644 --- a/kmymoney2/dialogs/keditequityentrydlg.cpp +++ b/kmymoney2/dialogs/keditequityentrydlg.cpp @@ -82,7 +82,7 @@ KEditEquityEntryDlg::KEditEquityEntryDlg(const MyMoneySecurity& selectedSecurity slotDataChanged(); m_changes = false; - // force a resize to optimize the tqlayout of all widgets + // force a resize to optimize the layout of all widgets resize(width()-1, height()-1); TQTimer::singleShot(10, this, TQT_SLOT(slotTimerDone())); } diff --git a/kmymoney2/dialogs/keditloanwizard.cpp b/kmymoney2/dialogs/keditloanwizard.cpp index 89b2f90..6350845 100644 --- a/kmymoney2/dialogs/keditloanwizard.cpp +++ b/kmymoney2/dialogs/keditloanwizard.cpp @@ -57,7 +57,7 @@ KEditLoanWizard::KEditLoanWizard(const MyMoneyAccount& account, TQWidget *parent m_effectiveDateLabel->setText(TQString("\n") + i18n( "Please enter the date from which on the following changes will be effective. " "The date entered must be later than the opening date of this account (%1), but must " - "not be in the future. The default will be today.").tqarg(KGlobal::locale()->formatDate(account.openingDate(), true))); + "not be in the future. The default will be today.").arg(KGlobal::locale()->formatDate(account.openingDate(), true))); m_account = account; try { TQString id = m_account.value("schedule"); @@ -71,11 +71,11 @@ 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." - ).tqarg(KGlobal::locale()->formatDate(m_account.openingDate(), true))); + ).arg(KGlobal::locale()->formatDate(m_account.openingDate(), true))); } else { m_effectiveDateNoteLabel->hide(); } @@ -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)); @@ -243,7 +243,7 @@ void KEditLoanWizard::next() TQString errMsg = i18n( "Your previous selection was \"%1\". If you select another option, " "KMyMoney will dismiss the changes you have just entered. " - "Do you wish to proceed?").tqarg(button->text()); + "Do you wish to proceed?").arg(button->text()); if(KMessageBox::questionYesNo(this, errMsg) == KMessageBox::No) { dontLeavePage = true; @@ -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..40b89f0 100644 --- a/kmymoney2/dialogs/keditscheduledlg.cpp +++ b/kmymoney2/dialogs/keditscheduledlg.cpp @@ -22,7 +22,7 @@ #include <tqwidgetlist.h> #include <tqcheckbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvaluevector.h> // ---------------------------------------------------------------------------- @@ -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..a717abc 100644 --- a/kmymoney2/dialogs/keditscheduledlgdecl.ui +++ b/kmymoney2/dialogs/keditscheduledlgdecl.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -32,7 +32,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -55,7 +55,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -105,7 +105,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -142,7 +142,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>21</height> @@ -247,7 +247,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <grid> <property name="name"> @@ -285,7 +285,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -320,7 +320,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -372,7 +372,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -428,7 +428,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -437,7 +437,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10_3</cstring> + <cstring>layout10_3</cstring> </property> <hbox> <property name="name"> @@ -467,7 +467,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>280</width> <height>0</height> diff --git a/kmymoney2/dialogs/kendingbalancedlg.cpp b/kmymoney2/dialogs/kendingbalancedlg.cpp index 9aeb0e1..0195e48 100644 --- a/kmymoney2/dialogs/kendingbalancedlg.cpp +++ b/kmymoney2/dialogs/kendingbalancedlg.cpp @@ -68,9 +68,9 @@ KEndingBalanceDlg::KEndingBalanceDlg(const MyMoneyAccount& account, TQWidget *pa d->m_account = account; MyMoneySecurity currency = MyMoneyFile::instance()->security(account.currencyId()); - m_enterInformationLabel->setText(TQString("<qt>")+i18n("Please enter the following fields with the information as you find them on your statement. Make sure to enter all values in <b>%1</b>.").tqarg(currency.name())+TQString("</qt>")); + m_enterInformationLabel->setText(TQString("<qt>")+i18n("Please enter the following fields with the information as you find them on your statement. Make sure to enter all values in <b>%1</b>.").arg(currency.name())+TQString("</qt>")); - 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)); } @@ -122,7 +122,7 @@ KEndingBalanceDlg::KEndingBalanceDlg(const MyMoneyAccount& account, TQWidget *pa m_lastStatementDate->setText(TQString()); if(account.lastReconciliationDate().isValid()) { m_lastStatementDate->setText(i18n("Last reconciled statement: %1") - .tqarg(KGlobal::locale()->formatDate(account.lastReconciliationDate(), true))); + .arg(KGlobal::locale()->formatDate(account.lastReconciliationDate(), true))); } // remove all unwanted pages @@ -510,8 +510,8 @@ void KEndingBalanceLoanDlg::next(void) m_loanOverview->setText(i18n("KMyMoney has calculated the following amounts for " "interest and amortization according to recorded payments " "between %1 and %2.") - .tqarg(KGlobal::locale()->formatDate(m_startDateEdit->date(), true)) - .tqarg(KGlobal::locale()->formatDate(m_endDateEdit->date(), true))); + .arg(KGlobal::locale()->formatDate(m_startDateEdit->date(), true)) + .arg(KGlobal::locale()->formatDate(m_endDateEdit->date(), true))); // preload widgets with calculated values if they are empty if(m_amortizationTotalEdit->value().isZero() && !amortization.isZero()) diff --git a/kmymoney2/dialogs/kendingbalancedlgdecl.ui b/kmymoney2/dialogs/kendingbalancedlgdecl.ui index 2f67c50..97addb0 100644 --- a/kmymoney2/dialogs/kendingbalancedlgdecl.ui +++ b/kmymoney2/dialogs/kendingbalancedlgdecl.ui @@ -43,7 +43,7 @@ All relevant information necessary for this process is usually printed on your s On the next page you will verify, that the starting and ending balance are matching those on your statement. If not, please modify the figures.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -75,7 +75,7 @@ On the next page you will verify, that the starting and ending balance are match Please enter the following information found on your statement:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -89,7 +89,7 @@ Please enter the following information found on your statement:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>19</height> @@ -120,7 +120,7 @@ Please enter the following information found on your statement:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>42</width> <height>0</height> @@ -179,7 +179,7 @@ Please enter the following information found on your statement:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>44</width> <height>0</height> @@ -198,7 +198,7 @@ Please enter the following information found on your statement:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -231,7 +231,7 @@ Please enter the following information found on your statement:</string> <property name="text"> <string>1</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -259,7 +259,7 @@ Please enter the following information found on your statement:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>0</height> @@ -318,7 +318,7 @@ Please enter the following information found on your statement:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>71</width> <height>0</height> @@ -334,7 +334,7 @@ Please enter the following information found on your statement:</string> <property name="text"> <string>If your statement shows different amounts, please cancel this dialog and correct the false transactions or correct the values in this dialog. In the later case, KMyMoney will create an adjustment transaction and add it to the ledger.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -348,7 +348,7 @@ Please enter the following information found on your statement:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>19</height> @@ -381,7 +381,7 @@ Please enter the following information found on your statement:</string> <property name="text"> <string>In order to create the adjustment transaction, KMyMoney requires an account and possibly an interest category to assign the differences to. Please select an account and - if necessary - a category.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -475,7 +475,7 @@ Please enter the following information found on your statement:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>25</height> @@ -512,7 +512,7 @@ It is important, that you continue with the same statement you used when you pos All information you have entered into this wizard will be shown and all transactions that you already cleared are marked with a 'C'.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -547,7 +547,7 @@ All information you have entered into this wizard will be shown and all transact <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> @@ -578,7 +578,7 @@ All information you have entered into this wizard will be shown and all transact <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>42</width> <height>0</height> @@ -650,7 +650,7 @@ All information you have entered into this wizard will be shown and all transact <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>46</width> <height>0</height> @@ -669,7 +669,7 @@ All information you have entered into this wizard will be shown and all transact <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>87</height> @@ -729,7 +729,7 @@ All information you have entered into this wizard will be shown and all transact <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>16</height> @@ -738,7 +738,7 @@ All information you have entered into this wizard will be shown and all transact </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <hbox> <property name="name"> @@ -754,7 +754,7 @@ All information you have entered into this wizard will be shown and all transact <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>60</width> <height>20</height> @@ -763,7 +763,7 @@ All information you have entered into this wizard will be shown and all transact </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout16</cstring> + <cstring>layout16</cstring> </property> <vbox> <property name="name"> @@ -771,7 +771,7 @@ All information you have entered into this wizard will be shown and all transact </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <hbox> <property name="name"> @@ -837,7 +837,7 @@ All information you have entered into this wizard will be shown and all transact </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout18</cstring> + <cstring>layout18</cstring> </property> <hbox> <property name="name"> @@ -889,7 +889,7 @@ All information you have entered into this wizard will be shown and all transact </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout19</cstring> + <cstring>layout19</cstring> </property> <hbox> <property name="name"> @@ -924,7 +924,7 @@ All information you have entered into this wizard will be shown and all transact <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>60</width> <height>20</height> @@ -943,7 +943,7 @@ All information you have entered into this wizard will be shown and all transact <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>16</height> 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<kMyMoneyDateInput*>(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..5e707e4 100644 --- a/kmymoney2/dialogs/kenterscheduledlgdecl.ui +++ b/kmymoney2/dialogs/kenterscheduledlgdecl.ui @@ -45,7 +45,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>70</width> <height>0</height> @@ -79,7 +79,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>70</width> <height>0</height> @@ -221,7 +221,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -245,7 +245,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>190</width> <height>20</height> diff --git a/kmymoney2/dialogs/kequitypriceupdatedlg.cpp b/kmymoney2/dialogs/kequitypriceupdatedlg.cpp index 4121abd..c943d10 100644 --- a/kmymoney2/dialogs/kequitypriceupdatedlg.cpp +++ b/kmymoney2/dialogs/kequitypriceupdatedlg.cpp @@ -28,9 +28,9 @@ #include <tqpushbutton.h> #include <tqradiobutton.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqtimer.h> -#include <tqlayout.h> +#include <layout.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -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); } @@ -157,7 +157,7 @@ KEquityPriceUpdateDlg::KEquityPriceUpdateDlg(TQWidget *parent, const TQString& s { btnUpdateSelected->hide(); btnUpdateAll->hide(); - // delete tqlayout1; + // delete layout1; TQTimer::singleShot(100,this,TQT_SLOT(slotUpdateAllClicked())); } @@ -183,8 +183,8 @@ void KEquityPriceUpdateDlg::addPricePair(const MyMoneySecurityPair& pair, bool d { MyMoneyFile* file = MyMoneyFile::instance(); - TQString symbol = TQString("%1 > %2").tqarg(pair.first,pair.second); - TQString id = TQString("%1 %2").tqarg(pair.first,pair.second); + TQString symbol = TQString("%1 > %2").arg(pair.first,pair.second); + TQString id = TQString("%1 %2").arg(pair.first,pair.second); if ( ! lvEquityList->findItem(id,ID_COL,TQt::ExactMatch) ) { MyMoneyPrice pr = file->price(pair.first,pair.second); @@ -219,7 +219,7 @@ void KEquityPriceUpdateDlg::addPricePair(const MyMoneySecurityPair& pair, bool d if(keep) { KListViewItem* item = new KListViewItem(lvEquityList, symbol, - i18n("%1 units in %2").tqarg(pair.first,pair.second)); + i18n("%1 units in %2").arg(pair.first,pair.second)); if(pr.isValid()) { item->setText(PRICE_COL, pr.rate(pair.second).formatMoney(file->currency(pair.second).tradingSymbol(), KMyMoneyGlobalSettings::pricePrecision())); item->setText(DATE_COL, pr.date().toString(Qt::ISODate)); @@ -260,7 +260,7 @@ void KEquityPriceUpdateDlg::addInvestment(const MyMoneySecurity& inv) } item->setText(ID_COL,id); if (inv.value("kmm-online-quote-system") == "Finance::Quote") - item->setText(SOURCE_COL, TQString("Finance::Quote %1").tqarg( inv.value("kmm-online-source"))); + item->setText(SOURCE_COL, TQString("Finance::Quote %1").arg( inv.value("kmm-online-source"))); else item->setText(SOURCE_COL, inv.value("kmm-online-source")); @@ -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 @@ -342,7 +342,7 @@ void KEquityPriceUpdateDlg::storePrices(void) TQStringList ids = TQStringList::split(" ",TQString(id)); TQString fromid = ids[0].utf8(); TQString toid = ids[1].utf8(); - name = TQString("%1 --> %2").tqarg(fromid).tqarg(toid); + name = TQString("%1 --> %2").arg(fromid).arg(toid); MyMoneyPrice price(fromid,toid,TQDate().fromString(item->text(DATE_COL), Qt::ISODate),rate,item->text(SOURCE_COL)); file->addPrice(price); } @@ -422,9 +422,9 @@ void KEquityPriceUpdateDlg::slotQuoteFailed(const TQString& _id, const TQString& // Give the user some options int result; if(_id.contains(" ")) { - result = KMessageBox::warningContinueCancel(this, i18n("Failed to retrieve an exchange rate for %1 from %2. It will be skipped this time.").tqarg(_symbol, item->text(SOURCE_COL)), i18n("Price Update Failed")); + result = KMessageBox::warningContinueCancel(this, i18n("Failed to retrieve an exchange rate for %1 from %2. It will be skipped this time.").arg(_symbol, item->text(SOURCE_COL)), i18n("Price Update Failed")); } else { - result = KMessageBox::questionYesNoCancel(this, TQString("<qt>%1</qt>").tqarg(i18n("Failed to retrieve a quote for %1 from %2. Press <b>No</b> to remove the online price source from this security permanently, <b>Yes</b> to continue updating this security during future price updates or <b>Cancel</b> to stop the current update operation.").tqarg(_symbol, item->text(SOURCE_COL))), i18n("Price Update Failed"), KStdGuiItem::yes(), KStdGuiItem::no()); + result = KMessageBox::questionYesNoCancel(this, TQString("<qt>%1</qt>").arg(i18n("Failed to retrieve a quote for %1 from %2. Press <b>No</b> to remove the online price source from this security permanently, <b>Yes</b> to continue updating this security during future price updates or <b>Cancel</b> to stop the current update operation.").arg(_symbol, item->text(SOURCE_COL))), i18n("Price Update Failed"), KStdGuiItem::yes(), KStdGuiItem::no()); } if ( result == KMessageBox::No ) @@ -444,7 +444,7 @@ void KEquityPriceUpdateDlg::slotQuoteFailed(const TQString& _id, const TQString& MyMoneyFile::instance()->modifySecurity(security); ft.commit(); } catch(MyMoneyException* e) { - KMessageBox::error(this, TQString("<qt>")+i18n("Cannot update security <b>%1</b>: %2").tqarg(_symbol, e->what())+TQString("</qt>"), i18n("Price Update Failed")); + KMessageBox::error(this, TQString("<qt>")+i18n("Cannot update security <b>%1</b>: %2").arg(_symbol, e->what())+TQString("</qt>"), i18n("Price Update Failed")); delete e; } } @@ -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(); @@ -525,13 +525,13 @@ void KEquityPriceUpdateDlg::slotReceivedQuote(const TQString& _id, const TQStrin } item->setText(PRICE_COL, KGlobal::locale()->formatMoney(price, sec.tradingSymbol(), KMyMoneyGlobalSettings::pricePrecision())); item->setText(DATE_COL, date.toString(Qt::ISODate)); - logStatusMessage(i18n("Price for %1 updated (id %2)").tqarg(_symbol,_id)); + logStatusMessage(i18n("Price for %1 updated (id %2)").arg(_symbol,_id)); // make sure to make OK button available btnOK->setEnabled(true); } else { - logErrorMessage(i18n("Received an invalid price for %1, unable to update.").tqarg(_symbol)); + logErrorMessage(i18n("Received an invalid price for %1, unable to update.").arg(_symbol)); } prgOnlineProgress->advance(1); @@ -551,7 +551,7 @@ void KEquityPriceUpdateDlg::slotReceivedQuote(const TQString& _id, const TQStrin } else { - logErrorMessage(i18n("Received a price for %1 (id %2), but this symbol is not on the list! Aborting entire update.").tqarg(_symbol,_id)); + logErrorMessage(i18n("Received a price for %1 (id %2), but this symbol is not on the list! Aborting entire update.").arg(_symbol,_id)); } if (next) diff --git a/kmymoney2/dialogs/kequitypriceupdatedlgdecl.ui b/kmymoney2/dialogs/kequitypriceupdatedlgdecl.ui index e1fb0de..a381e0d 100644 --- a/kmymoney2/dialogs/kequitypriceupdatedlgdecl.ui +++ b/kmymoney2/dialogs/kequitypriceupdatedlgdecl.ui @@ -24,7 +24,7 @@ <property name="name"> <cstring>lvEquityList</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>350</width> <height>0</height> @@ -51,7 +51,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -75,7 +75,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -105,12 +105,12 @@ <cstring>textLabel1</cstring> </property> <property name="text"> - <string>tqStatus:</string> + <string>Status:</string> </property> </widget> <widget class="KTextEdit"> <property name="name"> - <cstring>lbtqStatus</cstring> + <cstring>lbStatus</cstring> </property> <property name="textFormat"> <enum>LogText</enum> @@ -123,7 +123,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -139,7 +139,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>91</width> <height>20</height> diff --git a/kmymoney2/dialogs/kexportdlgdecl.ui b/kmymoney2/dialogs/kexportdlgdecl.ui index ab3ff63..5444b18 100644 --- a/kmymoney2/dialogs/kexportdlgdecl.ui +++ b/kmymoney2/dialogs/kexportdlgdecl.ui @@ -57,7 +57,7 @@ You can choose the file's path, the account and the format of the QIF file (profile). Choose Account to export all the transactions between the specified dates or just categories. You can also limit the transactions that are exported by start and ending date. Once you have pressed the Export button a message box will appear when the export has completed detailing how many transactions, categories and payees were exported.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop|AlignLeft</set> </property> <property name="wordwrap" stdset="0"> @@ -132,7 +132,7 @@ You can choose the file's path, the account and the format of the QIF file (prof </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -140,7 +140,7 @@ You can choose the file's path, the account and the format of the QIF file (prof </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <vbox> <property name="name"> @@ -209,7 +209,7 @@ You can choose the file's path, the account and the format of the QIF file (prof <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -235,7 +235,7 @@ You can choose the file's path, the account and the format of the QIF file (prof </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <hbox> <property name="name"> @@ -295,7 +295,7 @@ You can choose the file's path, the account and the format of the QIF file (prof </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <grid> <property name="name"> @@ -318,7 +318,7 @@ You can choose the file's path, the account and the format of the QIF file (prof <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>50</width> <height>0</height> @@ -340,7 +340,7 @@ You can choose the file's path, the account and the format of the QIF file (prof <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>50</width> <height>0</height> @@ -377,7 +377,7 @@ You can choose the file's path, the account and the format of the QIF file (prof <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>230</width> <height>16</height> @@ -424,7 +424,7 @@ You can choose the file's path, the account and the format of the QIF file (prof <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>451</width> <height>0</height> diff --git a/kmymoney2/dialogs/kfindtransactiondlg.cpp b/kmymoney2/dialogs/kfindtransactiondlg.cpp index c97e32e..21cf5ec 100644 --- a/kmymoney2/dialogs/kfindtransactiondlg.cpp +++ b/kmymoney2/dialogs/kfindtransactiondlg.cpp @@ -22,7 +22,7 @@ #include <tqcheckbox.h> #include <tqtimer.h> #include <tqtabwidget.h> -#include <tqlayout.h> +#include <layout.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -714,9 +714,9 @@ void KFindTransactionDlg::loadView(void) #if KMM_DEBUG m_foundText->setText(i18n("Found %1 matching transactions (D %2 / P %3 = %4)") - .tqarg(splitCount).tqarg(deposit.formatMoney("", 2)).tqarg(payment.formatMoney("", 2)).tqarg((deposit-payment).formatMoney("", 2))); + .arg(splitCount).arg(deposit.formatMoney("", 2)).arg(payment.formatMoney("", 2)).arg((deposit-payment).formatMoney("", 2))); #else - m_foundText->setText(i18n("Found %1 matching transactions") .tqarg(splitCount)); + m_foundText->setText(i18n("Found %1 matching transactions") .arg(splitCount)); #endif m_tabWidget->setTabEnabled(m_resultPage, true); diff --git a/kmymoney2/dialogs/kfindtransactiondlgdecl.ui b/kmymoney2/dialogs/kfindtransactiondlgdecl.ui index e2a8ee1..81d17c1 100644 --- a/kmymoney2/dialogs/kfindtransactiondlgdecl.ui +++ b/kmymoney2/dialogs/kfindtransactiondlgdecl.ui @@ -84,7 +84,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>83</height> @@ -103,7 +103,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>300</width> <height>0</height> @@ -180,7 +180,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout16</cstring> + <cstring>layout16</cstring> </property> <hbox> <property name="name"> @@ -188,7 +188,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <grid> <property name="name"> @@ -247,7 +247,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -266,7 +266,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> @@ -288,7 +288,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout22</cstring> + <cstring>layout22</cstring> </property> <hbox> <property name="name"> @@ -334,7 +334,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout20</cstring> + <cstring>layout20</cstring> </property> <grid> <property name="name"> @@ -344,7 +344,7 @@ <property name="name"> <cstring>m_amountToEdit</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -372,7 +372,7 @@ <property name="name"> <cstring>m_amountEdit</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -392,7 +392,7 @@ <property name="name"> <cstring>m_amountFromEdit</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -411,7 +411,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>16</height> @@ -430,7 +430,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>75</height> @@ -554,7 +554,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>42</height> @@ -578,7 +578,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout19</cstring> + <cstring>layout19</cstring> </property> <hbox> <property name="name"> @@ -586,7 +586,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout18</cstring> + <cstring>layout18</cstring> </property> <grid> <property name="name"> @@ -698,7 +698,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>130</width> <height>20</height> @@ -709,7 +709,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout21</cstring> + <cstring>layout21</cstring> </property> <hbox> <property name="name"> @@ -757,7 +757,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <grid> <property name="name"> @@ -816,7 +816,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -835,7 +835,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>16</height> @@ -852,7 +852,7 @@ <property name="text"> <string>text</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> @@ -886,7 +886,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>24</height> @@ -969,7 +969,7 @@ <property name="text"> <string>F</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> </widget> @@ -978,7 +978,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout25</cstring> + <cstring>layout25</cstring> </property> <hbox> <property name="name"> @@ -1008,7 +1008,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> diff --git a/kmymoney2/dialogs/kgncimportoptionsdlg.cpp b/kmymoney2/dialogs/kgncimportoptionsdlg.cpp index 40f47d8..c3da2a7 100644 --- a/kmymoney2/dialogs/kgncimportoptionsdlg.cpp +++ b/kmymoney2/dialogs/kgncimportoptionsdlg.cpp @@ -19,7 +19,7 @@ // QT Includes #include <tqcheckbox.h> #include <tqlineedit.h> -#include <tqlayout.h> +#include <layout.h> #include <tqapplication.h> #include <tqcombobox.h> diff --git a/kmymoney2/dialogs/kgncimportoptionsdlg.h b/kmymoney2/dialogs/kgncimportoptionsdlg.h index 1c682c0..00949a5 100644 --- a/kmymoney2/dialogs/kgncimportoptionsdlg.h +++ b/kmymoney2/dialogs/kgncimportoptionsdlg.h @@ -22,7 +22,7 @@ // QT Includes #include <tqbuttongroup.h> #include <tqcheckbox.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqptrlist.h> // ---------------------------------------------------------------------------- diff --git a/kmymoney2/dialogs/kgncimportoptionsdlgdecl.ui b/kmymoney2/dialogs/kgncimportoptionsdlgdecl.ui index 39e3711..a09d8e1 100644 --- a/kmymoney2/dialogs/kgncimportoptionsdlgdecl.ui +++ b/kmymoney2/dialogs/kgncimportoptionsdlgdecl.ui @@ -17,7 +17,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <property name="geometry"> <rect> @@ -38,7 +38,7 @@ <property name="text"> <string>Use 'Help' for more information on these options</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -137,7 +137,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -167,7 +167,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>140</width> <height>20</height> @@ -254,7 +254,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -263,7 +263,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <hbox> <property name="name"> @@ -299,7 +299,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>200</width> <height>20</height> diff --git a/kmymoney2/dialogs/kgncpricesourcedlg.cpp b/kmymoney2/dialogs/kgncpricesourcedlg.cpp index 8c807f3..2c2be36 100644 --- a/kmymoney2/dialogs/kgncpricesourcedlg.cpp +++ b/kmymoney2/dialogs/kgncpricesourcedlg.cpp @@ -21,7 +21,7 @@ #include <tqlistbox.h> #include <tqlineedit.h> #include <tqbuttongroup.h> -#include <tqlayout.h> +#include <layout.h> #include <tqapplication.h> // ---------------------------------------------------------------------------- @@ -45,8 +45,8 @@ KGncPriceSourceDlg::KGncPriceSourceDlg(const TQString &stockName, const TQString connect( buttonGroup5, TQT_SIGNAL( released(int) ), this, TQT_SLOT( buttonPressed(int) ) ); connect( buttonHelp, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotHelp() ) ); // initialize data fields - textStockName->setText (i18n ("Investment: %1").tqarg(stockName)); - textGncSource->setText (i18n ("Quote source: %1").tqarg(gncSource)); + textStockName->setText (i18n ("Investment: %1").arg(stockName)); + textGncSource->setText (i18n ("Quote source: %1").arg(gncSource)); listKnownSource->insertStringList (WebPriceQuote::quoteSources()); lineUserSource->setText (gncSource); checkAlwaysUse->setChecked(true); diff --git a/kmymoney2/dialogs/kgncpricesourcedlgdecl.ui b/kmymoney2/dialogs/kgncpricesourcedlgdecl.ui index 6eb3e84..6ee7982 100644 --- a/kmymoney2/dialogs/kgncpricesourcedlgdecl.ui +++ b/kmymoney2/dialogs/kgncpricesourcedlgdecl.ui @@ -17,7 +17,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <property name="geometry"> <rect> @@ -41,7 +41,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>91</width> <height>20</height> @@ -66,7 +66,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>80</width> <height>20</height> @@ -94,7 +94,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>171</width> <height>20</height> @@ -120,7 +120,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> @@ -227,7 +227,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>370</height> diff --git a/kmymoney2/dialogs/kgpgkeyselectiondlg.cpp b/kmymoney2/dialogs/kgpgkeyselectiondlg.cpp index 03bdff4..39b49ce 100644 --- a/kmymoney2/dialogs/kgpgkeyselectiondlg.cpp +++ b/kmymoney2/dialogs/kgpgkeyselectiondlg.cpp @@ -17,7 +17,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqwhatsthis.h> diff --git a/kmymoney2/dialogs/kimportdlg.cpp b/kmymoney2/dialogs/kimportdlg.cpp index 72a7452..a6023d6 100644 --- a/kmymoney2/dialogs/kimportdlg.cpp +++ b/kmymoney2/dialogs/kimportdlg.cpp @@ -22,7 +22,7 @@ // QT Headers #include <tqlineedit.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqprogressbar.h> #include <tqlabel.h> #include <tqbuttongroup.h> @@ -107,7 +107,7 @@ void KImportDlg::slotBrowse() tmpprofile.loadProfile("Profile-" + profile()); KFileDialog dialog(KGlobalSettings::documentPath(), - i18n("%1|Import files\n%2|All files (*.*)").tqarg(tmpprofile.filterFileType()).tqarg("*"), + i18n("%1|Import files\n%2|All files (*.*)").arg(tmpprofile.filterFileType()).arg("*"), this, i18n("Import File..."), true); dialog.setMode(KFile::File | KFile::ExistingOnly); diff --git a/kmymoney2/dialogs/kimportdlgdecl.ui b/kmymoney2/dialogs/kimportdlgdecl.ui index ed879b2..94643f8 100644 --- a/kmymoney2/dialogs/kimportdlgdecl.ui +++ b/kmymoney2/dialogs/kimportdlgdecl.ui @@ -52,7 +52,7 @@ Please enter the path to the QIF file or select it by clicking on the Browse but </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <grid> <property name="name"> @@ -131,7 +131,7 @@ Please enter the path to the QIF file or select it by clicking on the Browse but <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -204,7 +204,7 @@ Please enter the path to the QIF file or select it by clicking on the Browse but <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>411</width> <height>0</height> diff --git a/kmymoney2/dialogs/kloadtemplatedlgdecl.ui b/kmymoney2/dialogs/kloadtemplatedlgdecl.ui index c857cc8..6b39148 100644 --- a/kmymoney2/dialogs/kloadtemplatedlgdecl.ui +++ b/kmymoney2/dialogs/kloadtemplatedlgdecl.ui @@ -29,7 +29,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -53,7 +53,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>228</width> <height>20</height> diff --git a/kmymoney2/dialogs/kmymoneyfileinfodlg.cpp b/kmymoney2/dialogs/kmymoneyfileinfodlg.cpp index b692bf7..49852a7 100644 --- a/kmymoney2/dialogs/kmymoneyfileinfodlg.cpp +++ b/kmymoney2/dialogs/kmymoneyfileinfodlg.cpp @@ -48,12 +48,12 @@ KMyMoneyFileInfoDlg::KMyMoneyFileInfoDlg(TQWidget *parent, const char *name ) m_lastModificationDate->setText(storage->lastModificationDate().toString(Qt::ISODate)); m_baseCurrency->setText(storage->value("kmm-baseCurrency")); - m_payeeCount->setText(TQString("%1").tqarg(storage->payeeList().count())); - m_institutionCount->setText(TQString("%1").tqarg(storage->institutionList().count())); + m_payeeCount->setText(TQString("%1").arg(storage->payeeList().count())); + m_institutionCount->setText(TQString("%1").arg(storage->institutionList().count())); TQValueList<MyMoneyAccount> a_list; storage->accountList(a_list); - m_accountCount->setText(TQString("%1").tqarg(a_list.count())); + m_accountCount->setText(TQString("%1").arg(a_list.count())); TQMap<MyMoneyAccount::accountTypeE, int> accountMap; TQMap<MyMoneyAccount::accountTypeE, int> accountMapClosed; @@ -67,22 +67,22 @@ KMyMoneyFileInfoDlg::KMyMoneyFileInfoDlg(TQWidget *parent, const char *name ) TQMap<MyMoneyAccount::accountTypeE, int>::const_iterator it_m; for(it_m = accountMap.begin(); it_m != accountMap.end(); ++it_m) { - new KListViewItem(m_accountView, KMyMoneyUtils::accountTypeToString(it_m.key()), TQString("%1").tqarg(*it_m), TQString("%1").tqarg(accountMapClosed[it_m.key()])); + new KListViewItem(m_accountView, KMyMoneyUtils::accountTypeToString(it_m.key()), TQString("%1").arg(*it_m), TQString("%1").arg(accountMapClosed[it_m.key()])); } MyMoneyTransactionFilter filter; filter.setReportAllSplits(false); - m_transactionCount->setText(TQString("%1").tqarg(storage->transactionList(filter).count())); + m_transactionCount->setText(TQString("%1").arg(storage->transactionList(filter).count())); filter.setReportAllSplits(true); - m_splitCount->setText(TQString("%1").tqarg(storage->transactionList(filter).count())); - m_scheduleCount->setText(TQString("%1").tqarg(storage->scheduleList().count())); + m_splitCount->setText(TQString("%1").arg(storage->transactionList(filter).count())); + m_scheduleCount->setText(TQString("%1").arg(storage->scheduleList().count())); MyMoneyPriceList list = storage->priceList(); MyMoneyPriceList::const_iterator it_p; int pCount = 0; for(it_p = list.begin(); it_p != list.end(); ++it_p) pCount += (*it_p).count(); - m_priceCount->setText(TQString("%1").tqarg(pCount)); + m_priceCount->setText(TQString("%1").arg(pCount)); } KMyMoneyFileInfoDlg::~KMyMoneyFileInfoDlg() diff --git a/kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui b/kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui index 6fd5756..4a625f7 100644 --- a/kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui +++ b/kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui @@ -27,7 +27,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> @@ -252,7 +252,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -275,7 +275,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -305,7 +305,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>120</width> <height>20</height> diff --git a/kmymoney2/dialogs/kmymoneypricedlgdecl.ui b/kmymoney2/dialogs/kmymoneypricedlgdecl.ui index e8a4117..48ab056 100644 --- a/kmymoney2/dialogs/kmymoneypricedlgdecl.ui +++ b/kmymoney2/dialogs/kmymoneypricedlgdecl.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout24</cstring> + <cstring>layout24</cstring> </property> <hbox> <property name="name"> @@ -29,7 +29,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout23</cstring> + <cstring>layout23</cstring> </property> <vbox> <property name="name"> @@ -52,7 +52,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <vbox> <property name="name"> @@ -100,7 +100,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>150</height> @@ -135,7 +135,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -151,7 +151,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>560</width> <height>20</height> @@ -160,7 +160,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> diff --git a/kmymoney2/dialogs/kmymoneysplittable.cpp b/kmymoney2/dialogs/kmymoneysplittable.cpp index f549d4c..fecc7e0 100644 --- a/kmymoney2/dialogs/kmymoneysplittable.cpp +++ b/kmymoney2/dialogs/kmymoneysplittable.cpp @@ -30,7 +30,7 @@ #include <tqcursor.h> #include <tqapplication.h> #include <tqtimer.h> -#include <tqlayout.h> +#include <layout.h> #include <tqeventloop.h> // ---------------------------------------------------------------------------- @@ -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<KLineEdit*> (m_editAmount->tqfocusWidget()); + editWidget = dynamic_cast<KLineEdit*> (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..e67fb49 100644 --- a/kmymoney2/dialogs/knewaccountdlg.cpp +++ b/kmymoney2/dialogs/knewaccountdlg.cpp @@ -33,8 +33,8 @@ #include <tqtabwidget.h> #include <tqbuttongroup.h> #include <tqradiobutton.h> -#include <tqtextedit.h> -#include <tqlayout.h> +#include <textedit.h> +#include <layout.h> #include <tqtabwidget.h> // ---------------------------------------------------------------------------- @@ -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()); @@ -394,7 +394,7 @@ KNewAccountDlg::KNewAccountDlg(const MyMoneyAccount& account, bool isEditing, bo m_vatAssignment->setChecked(false); // make sure our account does not have an id and no parent assigned - // and certainly no tqchildren in case we create a new account + // and certainly no children in case we create a new account if(!m_isEditing) { m_account.clearId(); m_account.setParentAccountId(TQString()); @@ -549,7 +549,7 @@ void KNewAccountDlg::okClicked() // we don't need this check anymore. if(!file->nameToAccount(accountNameText).isEmpty() && (file->nameToAccount(accountNameText) != m_account.id())) { - KMessageBox::error(this, TQString("<qt>")+i18n("An account named <b>%1</b> already exists. You cannot create a second account with the same name.").tqarg(accountNameText)+TQString("</qt>")); + KMessageBox::error(this, TQString("<qt>")+i18n("An account named <b>%1</b> already exists. You cannot create a second account with the same name.").arg(accountNameText)+TQString("</qt>")); return; } #endif @@ -564,7 +564,7 @@ void KNewAccountDlg::okClicked() newName += accountNameText; if(!file->categoryToAccount(newName, acctype).isEmpty() && (file->categoryToAccount(newName, acctype) != m_account.id())) { - KMessageBox::error(this, TQString("<qt>")+i18n("A category named <b>%1</b> already exists. You cannot create a second category with the same name.").tqarg(newName)+TQString("</qt>")); + KMessageBox::error(this, TQString("<qt>")+i18n("A category named <b>%1</b> already exists. You cannot create a second category with the same name.").arg(newName)+TQString("</qt>")); return; } } @@ -669,7 +669,7 @@ const MyMoneyAccount& KNewAccountDlg::account(void) break; case 1: case 2: - m_account.setValue("priceMode", TQString("%1").tqarg(m_priceMode->currentItem())); + m_account.setValue("priceMode", TQString("%1").arg(m_priceMode->currentItem())); break; } @@ -924,7 +924,7 @@ void KNewAccountDlg::initParentWidget(TQString parentId, const TQString& account if (m_parentItem) { - m_subAccountLabel->setText(i18n("Is a sub account of %1").tqarg(m_parentAccount.name())); + m_subAccountLabel->setText(i18n("Is a sub account of %1").arg(m_parentAccount.name())); m_parentItem->setOpen(true); m_qlistviewParentAccounts->setSelected(m_parentItem, true); } @@ -976,7 +976,7 @@ void KNewAccountDlg::slotSelectionChanged(TQListViewItem *item) //qDebug("Selected account id: %s", accountItem->accountID().data()); m_parentAccount = file->account(accountItem->id()); - m_subAccountLabel->setText(i18n("Is a sub account of %1").tqarg(m_parentAccount.name())); + m_subAccountLabel->setText(i18n("Is a sub account of %1").arg(m_parentAccount.name())); if(m_qlistviewParentAccounts->isEnabled()) { m_bSelectedParentAccount = true; } 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..ecbeaf0 100644 --- a/kmymoney2/dialogs/knewaccountdlgdecl.ui +++ b/kmymoney2/dialogs/knewaccountdlgdecl.ui @@ -39,7 +39,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <hbox> <property name="name"> @@ -49,13 +49,13 @@ <property name="name"> <cstring>TextLabel1</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>60</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -136,7 +136,7 @@ <property name="name"> <cstring>TextLabel1_2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -185,7 +185,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout20</cstring> + <cstring>layout20</cstring> </property> <grid> <property name="name"> @@ -193,7 +193,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout19</cstring> + <cstring>layout19</cstring> </property> <hbox> <property name="name"> @@ -214,7 +214,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>140</width> <height>20</height> @@ -235,13 +235,13 @@ <property name="name"> <cstring>TextLabel5</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -250,7 +250,7 @@ <property name="text"> <string>Notes:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> @@ -263,7 +263,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout18</cstring> + <cstring>layout18</cstring> </property> <grid> <property name="name"> @@ -279,7 +279,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <hbox> <property name="name"> @@ -333,7 +333,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -403,7 +403,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <grid> <property name="name"> @@ -418,13 +418,13 @@ <property name="name"> <cstring>TextLabel2_2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>60</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -477,7 +477,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>30</height> @@ -534,7 +534,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout16</cstring> + <cstring>layout16</cstring> </property> <grid> <property name="name"> @@ -638,7 +638,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> @@ -671,7 +671,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout34</cstring> + <cstring>layout34</cstring> </property> <vbox> <property name="name"> @@ -712,7 +712,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout33</cstring> + <cstring>layout33</cstring> </property> <hbox> <property name="name"> @@ -733,7 +733,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -754,7 +754,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -782,7 +782,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <vbox> <property name="name"> @@ -805,7 +805,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <vbox> <property name="name"> @@ -815,13 +815,13 @@ <property name="name"> <cstring>m_amountGroup</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -871,7 +871,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -933,7 +933,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>422</width> <height>0</height> 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 @@ <property name="name"> <cstring>TextLabel2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -81,7 +81,7 @@ <property name="name"> <cstring>TextLabel3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -100,7 +100,7 @@ <property name="name"> <cstring>TextLabel4</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -119,7 +119,7 @@ <property name="name"> <cstring>TextLabel5</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -138,7 +138,7 @@ <property name="name"> <cstring>TextLabel6</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -157,7 +157,7 @@ <property name="name"> <cstring>TextLabel7</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -184,7 +184,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>16</height> @@ -232,7 +232,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>449</width> <height>0</height> 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/knewbudgetdlgdecl.ui b/kmymoney2/dialogs/knewbudgetdlgdecl.ui index bbfbad6..1fb8e7a 100644 --- a/kmymoney2/dialogs/knewbudgetdlgdecl.ui +++ b/kmymoney2/dialogs/knewbudgetdlgdecl.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -32,7 +32,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -40,7 +40,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <vbox> <property name="name"> @@ -66,7 +66,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <vbox> <property name="name"> @@ -102,7 +102,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> diff --git a/kmymoney2/dialogs/knewequityentrydecl.ui b/kmymoney2/dialogs/knewequityentrydecl.ui index 2fa832f..0bec33d 100644 --- a/kmymoney2/dialogs/knewequityentrydecl.ui +++ b/kmymoney2/dialogs/knewequityentrydecl.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <grid> <property name="name"> @@ -59,7 +59,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -80,7 +80,7 @@ <property name="text"> <string>1 /</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -150,7 +150,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -159,7 +159,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -175,7 +175,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>81</width> <height>20</height> diff --git a/kmymoney2/dialogs/knewfiledlgdecl.ui b/kmymoney2/dialogs/knewfiledlgdecl.ui index d0fcffa..b9f39da 100644 --- a/kmymoney2/dialogs/knewfiledlgdecl.ui +++ b/kmymoney2/dialogs/knewfiledlgdecl.ui @@ -74,7 +74,7 @@ your KMyMoney file.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout20</cstring> + <cstring>layout20</cstring> </property> <grid> <property name="name"> @@ -84,7 +84,7 @@ your KMyMoney file.</string> <property name="name"> <cstring>TextLabel4</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -113,7 +113,7 @@ your KMyMoney file.</string> <property name="name"> <cstring>TextLabel2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -132,7 +132,7 @@ your KMyMoney file.</string> <property name="name"> <cstring>TextLabel7</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -154,7 +154,7 @@ your KMyMoney file.</string> <property name="name"> <cstring>TextLabel6</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -168,7 +168,7 @@ your KMyMoney file.</string> <property name="name"> <cstring>TextLabel3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -187,7 +187,7 @@ your KMyMoney file.</string> <property name="name"> <cstring>TextLabel5</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -211,7 +211,7 @@ your KMyMoney file.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout22</cstring> + <cstring>layout22</cstring> </property> <hbox> <property name="name"> @@ -235,7 +235,7 @@ your KMyMoney file.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>305</width> <height>21</height> @@ -254,7 +254,7 @@ your KMyMoney file.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -263,7 +263,7 @@ your KMyMoney file.</string> </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -279,7 +279,7 @@ your KMyMoney file.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>360</width> <height>16</height> diff --git a/kmymoney2/dialogs/knewinvestmentwizard.cpp b/kmymoney2/dialogs/knewinvestmentwizard.cpp index 85e6cc9..5eb793d 100644 --- a/kmymoney2/dialogs/knewinvestmentwizard.cpp +++ b/kmymoney2/dialogs/knewinvestmentwizard.cpp @@ -294,7 +294,7 @@ void KNewInvestmentWizard::createObjects(const TQString& parentId) break; case 1: case 2: - m_account.setValue("priceMode", TQString("%1").tqarg(m_priceMode->currentItem())); + m_account.setValue("priceMode", TQString("%1").arg(m_priceMode->currentItem())); break; } @@ -306,7 +306,7 @@ void KNewInvestmentWizard::createObjects(const TQString& parentId) } ft.commit(); } catch(MyMoneyException* e) { - KMessageBox::detailedSorry(0, i18n("Unable to create all objects for the investment"), TQString("%1 caugt in %2:%3").tqarg(e->what()).tqarg(e->file()).tqarg(e->line())); + KMessageBox::detailedSorry(0, i18n("Unable to create all objects for the investment"), TQString("%1 caugt in %2:%3").arg(e->what()).arg(e->file()).arg(e->line())); delete e; } } diff --git a/kmymoney2/dialogs/knewinvestmentwizarddecl.ui b/kmymoney2/dialogs/knewinvestmentwizarddecl.ui index 5e8196f..531505a 100644 --- a/kmymoney2/dialogs/knewinvestmentwizarddecl.ui +++ b/kmymoney2/dialogs/knewinvestmentwizarddecl.ui @@ -33,7 +33,7 @@ <property name="text"> <string>This wizard allows you to create a new investment.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -47,7 +47,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>10</height> @@ -61,7 +61,7 @@ <property name="text"> <string>The first step in this process requires to select the type of investment. The following steps collect more details about the investment from you.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -75,7 +75,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> @@ -84,7 +84,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -128,7 +128,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>21</height> @@ -147,7 +147,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>60</height> @@ -174,7 +174,7 @@ <property name="text"> <string>Enter the details below and click <b>Next</b> to continue entering the online update details.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -188,7 +188,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -197,7 +197,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> @@ -210,7 +210,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -231,7 +231,7 @@ <property name="text"> <string>1 /</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -374,7 +374,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -401,13 +401,13 @@ <property name="text"> <string>Select an online source and click <b>Finish</b> to store the investment data. If you don't want to use online updates, just leave the data as is.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout25</cstring> + <cstring>layout25</cstring> </property> <hbox> <property name="name"> @@ -421,7 +421,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout24</cstring> + <cstring>layout24</cstring> </property> <vbox> <property name="name"> @@ -429,7 +429,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout21</cstring> + <cstring>layout21</cstring> </property> <hbox> <property name="name"> @@ -455,7 +455,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout23</cstring> + <cstring>layout23</cstring> </property> <hbox> <property name="name"> @@ -478,7 +478,7 @@ <property name="name"> <cstring>m_onlineSourceCombo</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>180</width> <height>0</height> @@ -489,7 +489,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout22</cstring> + <cstring>layout22</cstring> </property> <hbox> <property name="name"> @@ -522,7 +522,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>371</width> <height>20</height> @@ -541,7 +541,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>181</height> diff --git a/kmymoney2/dialogs/knewloanwizard.cpp b/kmymoney2/dialogs/knewloanwizard.cpp index fe39525..884807f 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<int>(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(); @@ -510,7 +510,7 @@ void KNewLoanWizard::next() if(m_loanAmountEdit->lineedit()->text().isEmpty() && m_interestRateEdit->lineedit()->text().isEmpty()) { dontLeavePage = true; - KMessageBox::error(0, errMsg.tqarg(i18n("interest rate")), i18n("Calculation error")); + KMessageBox::error(0, errMsg.arg(i18n("interest rate")), i18n("Calculation error")); } else updateInterestRate(); @@ -519,7 +519,7 @@ void KNewLoanWizard::next() || m_interestRateEdit->lineedit()->text().isEmpty()) && m_durationValueEdit->value() == 0) { dontLeavePage = true; - KMessageBox::error(0, errMsg.tqarg(i18n("term")), i18n("Calculation error")); + KMessageBox::error(0, errMsg.arg(i18n("term")), i18n("Calculation error")); } else updateDuration(); @@ -529,7 +529,7 @@ void KNewLoanWizard::next() || m_durationValueEdit->value() == 0) && m_paymentEdit->lineedit()->text().isEmpty()) { dontLeavePage = true; - KMessageBox::error(0, errMsg.tqarg(i18n("principal and interest")), i18n("Calculation error")); + KMessageBox::error(0, errMsg.arg(i18n("principal and interest")), i18n("Calculation error")); } else updatePayment(); @@ -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); @@ -709,14 +709,14 @@ int KNewLoanWizard::calculateLoan(void) val = calc.presentValue(); m_loanAmountEdit->loadText(MyMoneyMoney(static_cast<double>(val)).abs().formatMoney(fraction)); result = i18n("KMyMoney has calculated the amount of the loan as %1.") - .tqarg(m_loanAmountEdit->lineedit()->text()); + .arg(m_loanAmountEdit->lineedit()->text()); } else if(m_interestRateEdit->lineedit()->text().isEmpty()) { // calculate the interest rate out of the other information val = calc.interestRate(); m_interestRateEdit->loadText(MyMoneyMoney(static_cast<double>(val)).abs().formatMoney("", 3)); result = i18n("KMyMoney has calculated the interest rate to %1%.") - .tqarg(m_interestRateEdit->lineedit()->text()); + .arg(m_interestRateEdit->lineedit()->text()); } else if(m_paymentEdit->lineedit()->text().isEmpty()) { // calculate the periodical amount of the payment out of the other information @@ -729,7 +729,7 @@ int KNewLoanWizard::calculateLoan(void) calc.setPmt(val); result = i18n("KMyMoney has calculated a periodic payment of %1 to cover principal and interest.") - .tqarg(m_paymentEdit->lineedit()->text()); + .arg(m_paymentEdit->lineedit()->text()); val = calc.futureValue(); if((m_borrowButton->isChecked() && val < 0 && fabsl(val) >= fabsl(calc.payment())) @@ -741,7 +741,7 @@ int KNewLoanWizard::calculateLoan(void) m_finalPaymentEdit->loadText(refVal.abs().formatMoney(fraction)); result += TQString(" "); result += i18n("The number of payments has been decremented and the final payment has been modified to %1.") - .tqarg(m_finalPaymentEdit->lineedit()->text()); + .arg(m_finalPaymentEdit->lineedit()->text()); } else if((m_borrowButton->isChecked() && val < 0 && fabsl(val) < fabsl(calc.payment())) || (m_lendButton->isChecked() && val > 0 && fabs(val) < fabs(calc.payment()))) { m_finalPaymentEdit->loadText(MyMoneyMoney(0,1).formatMoney(fraction)); @@ -749,7 +749,7 @@ int KNewLoanWizard::calculateLoan(void) MyMoneyMoney refVal(static_cast<double>(val)); m_finalPaymentEdit->loadText(refVal.abs().formatMoney(fraction)); result += i18n("The final payment has been modified to %1.") - .tqarg(m_finalPaymentEdit->lineedit()->text()); + .arg(m_finalPaymentEdit->lineedit()->text()); } } else if(m_durationValueEdit->value() == 0) { @@ -761,7 +761,7 @@ int KNewLoanWizard::calculateLoan(void) // if the number of payments has a fractional part, then we // round it to the smallest integer and calculate the balloon payment result = i18n("KMyMoney has calculated the term of your loan as %1. ") - .tqarg(updateTermWidgets(floorl(val))); + .arg(updateTermWidgets(floorl(val))); if(val != floorl(val)) { calc.setNpp(floorl(val)); @@ -769,7 +769,7 @@ int KNewLoanWizard::calculateLoan(void) MyMoneyMoney refVal(static_cast<double>(val)); m_finalPaymentEdit->loadText(refVal.abs().formatMoney(fraction)); result += i18n("The final payment has been modified to %1.") - .tqarg(m_finalPaymentEdit->lineedit()->text()); + .arg(m_finalPaymentEdit->lineedit()->text()); } } else { @@ -800,7 +800,7 @@ int KNewLoanWizard::calculateLoan(void) MyMoneyMoney refVal(static_cast<double>(val)); result = i18n("KMyMoney has calculated a final payment of %1 for this loan.") - .tqarg(refVal.abs().formatMoney(fraction)); + .arg(refVal.abs().formatMoney(fraction)); if(!m_finalPaymentEdit->lineedit()->text().isEmpty()) { if((m_finalPaymentEdit->value().abs() - refVal.abs()).abs().toDouble() > 1) { @@ -889,7 +889,7 @@ void KNewLoanWizard::slotCreateCategory(void) m_interestAccountEdit->setSelected(id); } catch (MyMoneyException *e) { - KMessageBox::information(this, i18n("Unable to add account: %1").tqarg(e->what())); + KMessageBox::information(this, i18n("Unable to add account: %1").arg(e->what())); delete e; } } diff --git a/kmymoney2/dialogs/knewloanwizarddecl.ui b/kmymoney2/dialogs/knewloanwizarddecl.ui index 19c589f..c20d955 100644 --- a/kmymoney2/dialogs/knewloanwizarddecl.ui +++ b/kmymoney2/dialogs/knewloanwizarddecl.ui @@ -12,7 +12,7 @@ <height>458</height> </rect> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>800</width> <height>32767</height> @@ -63,7 +63,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>98</width> <height>0</height> @@ -84,7 +84,7 @@ <property name="text"> <string>New Loan Account Wizard</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignHCenter</set> </property> </widget> @@ -98,7 +98,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>119</width> <height>0</height> @@ -117,7 +117,7 @@ Welcome to the New Loan Account Wizard which will guide you through the creation Please make sure that you have the relevant information handy. You usually get the information out of your contract and the last statement.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -131,7 +131,7 @@ Please make sure that you have the relevant information handy. You usually get t <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -175,7 +175,7 @@ Please make sure that you have the relevant information handy. You usually get t <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>98</width> <height>0</height> @@ -196,7 +196,7 @@ Please make sure that you have the relevant information handy. You usually get t <property name="text"> <string>Edit Loan Account Wizard</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignHCenter</set> </property> </widget> @@ -210,7 +210,7 @@ Please make sure that you have the relevant information handy. You usually get t <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>119</width> <height>0</height> @@ -229,7 +229,7 @@ Welcome to the Edit Loan Account Wizard. Please use this wizard to modify inform Please make sure that you have the relevant information handy. You usually get the information out of your contract and the last statement.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -243,7 +243,7 @@ Please make sure that you have the relevant information handy. You usually get t <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -277,7 +277,7 @@ Please make sure that you have the relevant information handy. You usually get t <string> In the first step, KMyMoney will ask you some general information about the loan account to be created.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -291,7 +291,7 @@ In the first step, KMyMoney will ask you some general information about the loan <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>32</height> @@ -322,7 +322,7 @@ In the first step, KMyMoney will ask you some general information about the loan <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>138</width> <height>0</height> @@ -350,7 +350,7 @@ In the first step, KMyMoney will ask you some general information about the loan <property name="text"> <string>1. General Information</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> @@ -378,7 +378,7 @@ In the first step, KMyMoney will ask you some general information about the loan <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>25</height> @@ -397,7 +397,7 @@ In the first step, KMyMoney will ask you some general information about the loan <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>137</width> <height>0</height> @@ -416,7 +416,7 @@ In the first step, KMyMoney will ask you some general information about the loan <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>32</height> @@ -450,7 +450,7 @@ In the first step, KMyMoney will ask you some general information about the loan <string> Please select, which data of the loan you want to modify.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -464,7 +464,7 @@ Please select, which data of the loan you want to modify.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>48</height> @@ -495,7 +495,7 @@ Please select, which data of the loan you want to modify.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>93</width> <height>0</height> @@ -561,7 +561,7 @@ Please select, which data of the loan you want to modify.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>108</width> <height>0</height> @@ -580,7 +580,7 @@ Please select, which data of the loan you want to modify.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>47</height> @@ -613,7 +613,7 @@ Please select, which data of the loan you want to modify.</string> <property name="text"> <string>1</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -624,7 +624,7 @@ Please select, which data of the loan you want to modify.</string> <property name="text"> <string>1</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -638,7 +638,7 @@ Please select, which data of the loan you want to modify.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>30</height> @@ -684,7 +684,7 @@ Please select, which data of the loan you want to modify.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>87</height> @@ -718,7 +718,7 @@ Please select, which data of the loan you want to modify.</string> <string> Do you borrow or lend money?</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -732,7 +732,7 @@ Do you borrow or lend money?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>61</height> @@ -804,7 +804,7 @@ Do you borrow or lend money?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>299</width> <height>0</height> @@ -823,7 +823,7 @@ Do you borrow or lend money?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>60</height> @@ -851,7 +851,7 @@ Do you borrow or lend money?</string> <string> How do you want to call this loan? Examples for names are 'car loan', 'school loan', 'home owner loan'.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -865,7 +865,7 @@ How do you want to call this loan? Examples for names are 'car loan', 'school lo <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>56</height> @@ -911,7 +911,7 @@ How do you want to call this loan? Examples for names are 'car loan', 'school lo <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>56</height> @@ -928,7 +928,7 @@ How do you want to call this loan? Examples for names are 'car loan', 'school lo </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout55</cstring> + <cstring>layout55</cstring> </property> <hbox> <property name="name"> @@ -959,7 +959,7 @@ How do you want to call this loan? Examples for names are 'car loan', 'school lo <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>56</height> @@ -993,7 +993,7 @@ How do you want to call this loan? Examples for names are 'car loan', 'school lo <string> Is the interest of this loan fixed over a period of time or is it adapted from time to time? If the interest rate changes during the amortization phase of the loan you should choose the option 'variable interest rate'.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -1007,7 +1007,7 @@ Is the interest of this loan fixed over a period of time or is it adapted from t <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>53</height> @@ -1079,7 +1079,7 @@ Is the interest of this loan fixed over a period of time or is it adapted from t <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>286</width> <height>0</height> @@ -1098,7 +1098,7 @@ Is the interest of this loan fixed over a period of time or is it adapted from t <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>53</height> @@ -1132,7 +1132,7 @@ Is the interest of this loan fixed over a period of time or is it adapted from t <string> Were there any payments for this loan whether they are entered into KMyMoney or not?</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -1146,7 +1146,7 @@ Were there any payments for this loan whether they are entered into KMyMoney or <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>32</height> @@ -1218,7 +1218,7 @@ Were there any payments for this loan whether they are entered into KMyMoney or <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>202</width> <height>0</height> @@ -1237,7 +1237,7 @@ Were there any payments for this loan whether they are entered into KMyMoney or <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>32</height> @@ -1251,7 +1251,7 @@ Were there any payments for this loan whether they are entered into KMyMoney or <property name="text"> <string>Note: Payments made to obtain the loan (e.g. Dissagio) are not considered as payments in this context.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -1265,7 +1265,7 @@ Were there any payments for this loan whether they are entered into KMyMoney or <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>32</height> @@ -1299,7 +1299,7 @@ Were there any payments for this loan whether they are entered into KMyMoney or <string> Do you want to record all payments of this loan with KMyMoney?</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -1313,7 +1313,7 @@ Do you want to record all payments of this loan with KMyMoney?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>69</height> @@ -1385,7 +1385,7 @@ Do you want to record all payments of this loan with KMyMoney?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>137</width> <height>0</height> @@ -1404,7 +1404,7 @@ Do you want to record all payments of this loan with KMyMoney?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>69</height> @@ -1432,7 +1432,7 @@ Do you want to record all payments of this loan with KMyMoney?</string> <string> Select the date when the interest rate for this loan will be modified and the frequency of the future changes.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -1446,7 +1446,7 @@ Select the date when the interest rate for this loan will be modified and the fr <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>99</height> @@ -1455,7 +1455,7 @@ Select the date when the interest rate for this loan will be modified and the fr </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout44</cstring> + <cstring>layout44</cstring> </property> <grid> <property name="name"> @@ -1471,7 +1471,7 @@ Select the date when the interest rate for this loan will be modified and the fr </widget> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>tqlayout42</cstring> + <cstring>layout42</cstring> </property> <hbox> <property name="name"> @@ -1522,7 +1522,7 @@ Select the date when the interest rate for this loan will be modified and the fr <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>80</height> @@ -1556,7 +1556,7 @@ Select the date when the interest rate for this loan will be modified and the fr <string> Please enter the amount you pay for principal and interest or leave the field empty to calculate it.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -1570,7 +1570,7 @@ Please enter the amount you pay for principal and interest or leave the field em <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>21</height> @@ -1601,7 +1601,7 @@ Please enter the amount you pay for principal and interest or leave the field em <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>100</width> <height>0</height> @@ -1663,7 +1663,7 @@ Please enter the amount you pay for principal and interest or leave the field em <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>100</width> <height>0</height> @@ -1682,7 +1682,7 @@ Please enter the amount you pay for principal and interest or leave the field em <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>19</height> @@ -1698,7 +1698,7 @@ Please enter the amount you pay for principal and interest or leave the field em If KMyMoney should calculate this value for you, then leave the field blank.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -1729,7 +1729,7 @@ If KMyMoney should calculate this value for you, then leave the field blank.</st <string> Please enter the interest rate or leave the field empty to calculate it.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -1743,7 +1743,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>29</height> @@ -1774,7 +1774,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>101</width> <height>0</height> @@ -1836,7 +1836,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>101</width> <height>0</height> @@ -1855,7 +1855,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>29</height> @@ -1871,7 +1871,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string If KMyMoney should calculate this value for you, then leave the field blank.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -1901,7 +1901,7 @@ If KMyMoney should calculate this value for you, then leave the field blank.</st <property name="text"> <string>1</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -1915,7 +1915,7 @@ If KMyMoney should calculate this value for you, then leave the field blank.</st <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>78</height> @@ -1961,7 +1961,7 @@ If KMyMoney should calculate this value for you, then leave the field blank.</st <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>28</height> @@ -1975,7 +1975,7 @@ If KMyMoney should calculate this value for you, then leave the field blank.</st <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignBottom</set> </property> </widget> @@ -2006,7 +2006,7 @@ If KMyMoney should calculate this value for you, then leave the field blank.</st <string> You have successfully entered the general information about your loan. Next, KMyMoney needs some information about the calculation of the loan.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -2020,7 +2020,7 @@ You have successfully entered the general information about your loan. Next, KMy <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>19</height> @@ -2051,7 +2051,7 @@ You have successfully entered the general information about your loan. Next, KMy <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>136</width> <height>0</height> @@ -2082,7 +2082,7 @@ You have successfully entered the general information about your loan. Next, KMy <property name="text"> <string>1. General Information</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> @@ -2117,7 +2117,7 @@ You have successfully entered the general information about your loan. Next, KMy <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>18</height> @@ -2136,7 +2136,7 @@ You have successfully entered the general information about your loan. Next, KMy <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>135</width> <height>0</height> @@ -2155,7 +2155,7 @@ You have successfully entered the general information about your loan. Next, KMy <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>23</height> @@ -2189,7 +2189,7 @@ You have successfully entered the general information about your loan. Next, KMy <string> How often will there be payments made to this loan?</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -2203,7 +2203,7 @@ How often will there be payments made to this loan?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>49</height> @@ -2234,7 +2234,7 @@ How often will there be payments made to this loan?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>39</width> <height>0</height> @@ -2256,7 +2256,7 @@ How often will there be payments made to this loan?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>56</width> <height>0</height> @@ -2275,7 +2275,7 @@ How often will there be payments made to this loan?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>49</height> @@ -2309,7 +2309,7 @@ How often will there be payments made to this loan?</string> <string> When does the actual interest rate get calculated?</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -2323,7 +2323,7 @@ When does the actual interest rate get calculated?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>69</height> @@ -2395,7 +2395,7 @@ When does the actual interest rate get calculated?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>296</width> <height>0</height> @@ -2414,7 +2414,7 @@ When does the actual interest rate get calculated?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>69</height> @@ -2447,7 +2447,7 @@ When does the actual interest rate get calculated?</string> <property name="text"> <string>1</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -2461,7 +2461,7 @@ When does the actual interest rate get calculated?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>15</height> @@ -2524,7 +2524,7 @@ When does the actual interest rate get calculated?</string> <property name="text"> <string>Loan amount:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignRight</set> </property> </widget> @@ -2535,7 +2535,7 @@ When does the actual interest rate get calculated?</string> <property name="text"> <string>Interest rate:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -2546,7 +2546,7 @@ When does the actual interest rate get calculated?</string> <property name="text"> <string>Term:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -2557,7 +2557,7 @@ When does the actual interest rate get calculated?</string> <property name="text"> <string>Principal + Interest:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -2568,7 +2568,7 @@ When does the actual interest rate get calculated?</string> <property name="text"> <string>Final amortization payment</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -2681,7 +2681,7 @@ When does the actual interest rate get calculated?</string> <string> Please enter the interest rate or leave the field empty to calculate it.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -2695,7 +2695,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>16</height> @@ -2758,7 +2758,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string <property name="text"> <string>Loan amount:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignRight</set> </property> </widget> @@ -2769,7 +2769,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string <property name="text"> <string>Interest rate:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -2780,7 +2780,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string <property name="text"> <string>Term:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -2791,7 +2791,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string <property name="text"> <string>Principal + Interest:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -2802,7 +2802,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string <property name="text"> <string>Final amortization payment</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -2909,7 +2909,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string <string> Please enter the term of this loan or leave the field empty to calculate it. The term is the time that is required to fully repay the loan. This time might be different from the time your loan contract is signed for.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -2923,7 +2923,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>54</height> @@ -2932,7 +2932,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout43</cstring> + <cstring>layout43</cstring> </property> <hbox> <property name="name"> @@ -2993,7 +2993,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The <property name="text"> <string>Loan amount:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignRight</set> </property> </widget> @@ -3004,7 +3004,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The <property name="text"> <string>Interest rate:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -3015,7 +3015,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The <property name="text"> <string>Term:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -3026,7 +3026,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The <property name="text"> <string>Principal + Interest:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -3037,7 +3037,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The <property name="text"> <string>Final amortization payment</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -3150,7 +3150,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The <string> Please enter the amount you pay for principal and interest or leave the field empty to calculate it.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -3164,7 +3164,7 @@ Please enter the amount you pay for principal and interest or leave the field em <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>16</height> @@ -3227,7 +3227,7 @@ Please enter the amount you pay for principal and interest or leave the field em <property name="text"> <string>Loan amount:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignRight</set> </property> </widget> @@ -3238,7 +3238,7 @@ Please enter the amount you pay for principal and interest or leave the field em <property name="text"> <string>Interest rate:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -3249,7 +3249,7 @@ Please enter the amount you pay for principal and interest or leave the field em <property name="text"> <string>Term:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -3260,7 +3260,7 @@ Please enter the amount you pay for principal and interest or leave the field em <property name="text"> <string>Principal + Interest:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -3271,7 +3271,7 @@ Please enter the amount you pay for principal and interest or leave the field em <property name="text"> <string>Final amortization payment</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -3384,7 +3384,7 @@ Please enter the amount you pay for principal and interest or leave the field em <string> Please enter the amount of a final amortization payment or leave the field empty to calculate it.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -3398,7 +3398,7 @@ Please enter the amount of a final amortization payment or leave the field empty <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>16</height> @@ -3461,7 +3461,7 @@ Please enter the amount of a final amortization payment or leave the field empty <property name="text"> <string>Loan amount:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignRight</set> </property> </widget> @@ -3472,7 +3472,7 @@ Please enter the amount of a final amortization payment or leave the field empty <property name="text"> <string>Interest rate:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -3483,7 +3483,7 @@ Please enter the amount of a final amortization payment or leave the field empty <property name="text"> <string>Term:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -3494,7 +3494,7 @@ Please enter the amount of a final amortization payment or leave the field empty <property name="text"> <string>Principal + Interest:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -3505,7 +3505,7 @@ Please enter the amount of a final amortization payment or leave the field empty <property name="text"> <string>Final amortization payment</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -3618,7 +3618,7 @@ Please enter the amount of a final amortization payment or leave the field empty <string> KMyMoney has calculated the loan as shown in the overview below. You can accept these values by selecting "Next" or change them by choosing "Back" to return to the input field for the information you want to change.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -3632,7 +3632,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>22</height> @@ -3666,7 +3666,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept <property name="text"> <string>Loan amount:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignRight</set> </property> </widget> @@ -3677,7 +3677,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept <property name="text"> <string>Interest rate:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -3688,7 +3688,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept <property name="text"> <string>Term:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -3699,7 +3699,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept <property name="text"> <string>Principal + Interest:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -3710,7 +3710,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept <property name="text"> <string>Final amortization payment</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -3823,7 +3823,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept <string> In the following steps, KMyMoney supports you in setting up categories and schedules for your loan payments.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -3837,7 +3837,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>14</height> @@ -3868,7 +3868,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>136</width> <height>0</height> @@ -3899,7 +3899,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched <property name="text"> <string>1. General Information</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> @@ -3937,7 +3937,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>18</height> @@ -3956,7 +3956,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>135</width> <height>0</height> @@ -3975,7 +3975,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>18</height> @@ -4009,7 +4009,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched <string> Please select the category you want to assign the interest payments to or create a new category.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -4023,7 +4023,7 @@ Please select the category you want to assign the interest payments to or create <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>38</height> @@ -4059,7 +4059,7 @@ Please select the category you want to assign the interest payments to or create <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>264</width> <height>0</height> @@ -4086,7 +4086,7 @@ Please select the category you want to assign the interest payments to or create <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>22</height> @@ -4120,7 +4120,7 @@ Please select the category you want to assign the interest payments to or create <string> If your regular payment contains any additional fees, click on the button "Additional fees" to enter them.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -4134,7 +4134,7 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>16</height> @@ -4168,7 +4168,7 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="text"> <string>= periodical payment:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -4187,7 +4187,7 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="textFormat"> <enum>PlainText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -4206,7 +4206,7 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="textFormat"> <enum>PlainText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -4231,7 +4231,7 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="text"> <string>+</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -4260,7 +4260,7 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="textFormat"> <enum>PlainText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -4271,7 +4271,7 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="text"> <string>Principal + Interest:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -4285,7 +4285,7 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -4302,7 +4302,7 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -4321,7 +4321,7 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>16</height> @@ -4335,7 +4335,7 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="text"> <string>If no additional fees are included in your periodical payment or you have entered all such fees, then click on "Next".</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -4349,7 +4349,7 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>16</height> @@ -4383,7 +4383,7 @@ If your regular payment contains any additional fees, click on the button "Addit <string>KMyMoney will create a schedule for this payment and reminds you whenever a payment must be made.<p> If you selected to record all payments this date has already been supplied. If you selected to record only this years payments, then the <b>First payment due date</b> is the date of the first payment made in this year.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -4397,7 +4397,7 @@ If you selected to record all payments this date has already been supplied. If y <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>23</height> @@ -4443,7 +4443,7 @@ If you selected to record all payments this date has already been supplied. If y <property name="text"> <string>Make payment from/to:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> @@ -4459,7 +4459,7 @@ If you selected to record all payments this date has already been supplied. If y <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>24</height> @@ -4493,7 +4493,7 @@ If you selected to record all payments this date has already been supplied. If y <string> KMyMoney has calculated the loan as shown below. If you want to accept these values use the "Finish" button to update your account, otherwise use the "Back" button to modify your settings.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -4507,7 +4507,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>23</height> @@ -4541,7 +4541,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val <property name="text"> <string>Principal + Interest:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignRight</set> </property> </widget> @@ -4552,7 +4552,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val <property name="text"> <string>Additional fees:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -4563,7 +4563,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val <property name="text"> <string>Total payment:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -4574,7 +4574,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val <property name="text"> <string>Interest rate:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -4585,7 +4585,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val <property name="text"> <string>Valid from:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -4596,7 +4596,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val <property name="text"> <string>Affected payments:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -4719,7 +4719,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val <string>If this loan is for an asset, such as a car or a house, you can create the asset account now. An asset account represents the total value of an asset. The money from this loan will be transfered into the asset account you create or select. If this loan is a 'consumer loan' (money to use however you want), you can use a checking account instead.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -4733,7 +4733,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -4750,7 +4750,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout124</cstring> + <cstring>layout124</cstring> </property> <vbox> <property name="name"> @@ -4763,7 +4763,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout123</cstring> + <cstring>layout123</cstring> </property> <hbox> <property name="name"> @@ -4779,7 +4779,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>466</width> <height>20</height> @@ -4806,7 +4806,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout170</cstring> + <cstring>layout170</cstring> </property> <hbox> <property name="name"> @@ -4837,7 +4837,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -4871,7 +4871,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a <string> This page summarizes the data you entered. If you need to modify anything, please use the "Back" button to go to respective page. Otherwise use the "Finish" button to create the account.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -4885,7 +4885,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>16</height> @@ -4958,7 +4958,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="text"> <string>Payee:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -5001,7 +5001,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="text"> <string>First payment:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -5028,7 +5028,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="text"> <string>Amount is:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -5122,7 +5122,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="text"> <string>Periodic Payment:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -5133,7 +5133,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="text"> <string>Additional Fees:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -5144,7 +5144,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="text"> <string>Interest category:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -5155,7 +5155,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="text"> <string>Payment from:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -5198,7 +5198,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="text"> <string>Next due date:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -5262,7 +5262,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="text"> <string>Term:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -5289,7 +5289,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="text"> <string>Interest rate:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -5316,7 +5316,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="text"> <string>Final Payment:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -5343,7 +5343,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="text"> <string>Interest is due:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -5370,7 +5370,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="text"> <string>Principal + Interest:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -5397,7 +5397,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="text"> <string>Loan amount:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -5408,7 +5408,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="text"> <string>Payment frequency:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -5444,7 +5444,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>16</height> 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 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kmymoney2/dialogs/kpayeereassigndlgdecl.ui b/kmymoney2/dialogs/kpayeereassigndlgdecl.ui index 4b01cac..fd38082 100644 --- a/kmymoney2/dialogs/kpayeereassigndlgdecl.ui +++ b/kmymoney2/dialogs/kpayeereassigndlgdecl.ui @@ -29,7 +29,7 @@ <property name="name"> <cstring>textLabel1</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>300</width> <height>0</height> @@ -38,7 +38,7 @@ <property name="text"> <string>The transactions associated with the selected payees need to be re-assigned to a different payee before the selected payees can be deleted. Please select a payee from the list below.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignJustify|AlignTop</set> </property> </widget> @@ -52,7 +52,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -82,7 +82,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -116,7 +116,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -132,7 +132,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>305</width> <height>20</height> 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 @@ </column> <column> <property name="text"> - <string>tqStatus</string> + <string>Status</string> </property> <property name="clickable"> <bool>true</bool> @@ -82,7 +82,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>180</width> <height>20</height> 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..d5893e8 100644 --- a/kmymoney2/dialogs/kreconciledlgdecl.ui +++ b/kmymoney2/dialogs/kreconciledlgdecl.ui @@ -12,7 +12,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -63,7 +63,7 @@ a transaction you can return to the register by clicking on the Edit Transaction Your account is balanced when the Difference is Zero. Click on the Finish button to save the reconciled transactions.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="wordwrap" stdset="0"> @@ -103,7 +103,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="name"> <cstring>Layout25</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>420</width> <height>0</height> @@ -131,7 +131,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>420</width> <height>15</height> @@ -153,7 +153,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>420</width> <height>100</height> @@ -188,7 +188,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>15</height> @@ -210,7 +210,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>420</width> <height>100</height> @@ -264,7 +264,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -313,7 +313,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -332,7 +332,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>250</width> <height>120</height> @@ -377,7 +377,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>0</height> @@ -386,7 +386,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="text"> <string>Previous Balance:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -407,7 +407,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="text"> <string>0</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -441,7 +441,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>0</height> @@ -450,7 +450,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="text"> <string>Ending Balance:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -468,7 +468,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -477,7 +477,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="text"> <string>0</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -511,7 +511,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>0</height> @@ -520,7 +520,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="text"> <string>Cleared Balance:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -538,7 +538,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -547,7 +547,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="text"> <string>0</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -581,7 +581,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>0</height> @@ -590,7 +590,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="text"> <string>Difference:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -611,7 +611,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="text"> <string>0</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -655,7 +655,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> diff --git a/kmymoney2/dialogs/kreportconfigurationfilterdlg.cpp b/kmymoney2/dialogs/kreportconfigurationfilterdlg.cpp index 388019a..637fd4d 100644 --- a/kmymoney2/dialogs/kreportconfigurationfilterdlg.cpp +++ b/kmymoney2/dialogs/kreportconfigurationfilterdlg.cpp @@ -36,13 +36,13 @@ #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqradiobutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqspinbox.h> #include <tqtooltip.h> #include <tqwhatsthis.h> #include <tqtabwidget.h> -#include <tqtextedit.h> -#include <tqlayout.h> +#include <textedit.h> +#include <layout.h> #include <tqapplication.h> // ---------------------------------------------------------------------------- @@ -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/ksecuritylisteditor.cpp b/kmymoney2/dialogs/ksecuritylisteditor.cpp index 0be4b0b..2feac68 100644 --- a/kmymoney2/dialogs/ksecuritylisteditor.cpp +++ b/kmymoney2/dialogs/ksecuritylisteditor.cpp @@ -181,10 +181,10 @@ void KSecurityListEditor::slotDeleteSecurity(void) TQString msg; TQString dontAsk; if(security.isCurrency()) { - msg = TQString("<p>") + i18n("Do you really want to remove the currency <b>%1</b> from the file?</p><i>Note: It is currently not supported to add currencies.</i>").tqarg(security.name()); + msg = TQString("<p>") + i18n("Do you really want to remove the currency <b>%1</b> from the file?</p><i>Note: It is currently not supported to add currencies.</i>").arg(security.name()); dontAsk = "DeleteCurrency"; } else { - msg = TQString("<p>") + i18n("Do you really want to remove the %1 <b>%2</b> from the file?").tqarg(KMyMoneyUtils::securityTypeToString(security.securityType())).tqarg(security.name()); + msg = TQString("<p>") + i18n("Do you really want to remove the %1 <b>%2</b> from the file?").arg(KMyMoneyUtils::securityTypeToString(security.securityType())).arg(security.name()); dontAsk = "DeleteSecurity"; } if(KMessageBox::questionYesNo(this, msg, i18n("Delete security"), KStdGuiItem::yes(), KStdGuiItem::no(), dontAsk) == KMessageBox::Yes) { diff --git a/kmymoney2/dialogs/ksecuritylisteditordecl.ui b/kmymoney2/dialogs/ksecuritylisteditordecl.ui index da8c628..d9033da 100644 --- a/kmymoney2/dialogs/ksecuritylisteditordecl.ui +++ b/kmymoney2/dialogs/ksecuritylisteditordecl.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -125,7 +125,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -141,7 +141,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>51</height> @@ -182,7 +182,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>110</height> @@ -217,7 +217,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -233,7 +233,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>91</width> <height>20</height> diff --git a/kmymoney2/dialogs/kselectdatabasedlg.cpp b/kmymoney2/dialogs/kselectdatabasedlg.cpp index 9bb1e33..b81ddf7 100644 --- a/kmymoney2/dialogs/kselectdatabasedlg.cpp +++ b/kmymoney2/dialogs/kselectdatabasedlg.cpp @@ -22,7 +22,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqapplication.h> #include <tqsqldatabase.h> @@ -107,11 +107,11 @@ KSelectDatabaseDlg::KSelectDatabaseDlg(KURL openURL, TQWidget *parent, const cha // list drivers supported by KMM TQMap<TQString, TQString> map = m_map.driverMap(); if (!list.contains(driverName)) { - KMessageBox::error (0, i18n("TQt SQL driver %1 is no longer installed on your system").tqarg(driverName), + KMessageBox::error (0, i18n("TQt SQL driver %1 is no longer installed on your system").arg(driverName), ""); setError(); } else if (!map.contains(driverName)) { - KMessageBox::error (0, i18n("TQt SQL driver %1 is not suported").tqarg(driverName), + KMessageBox::error (0, i18n("TQt SQL driver %1 is not suported").arg(driverName), ""); setError(); } else { @@ -159,7 +159,7 @@ const KURL KSelectDatabaseDlg::selectedURL() { url.setHost(textHostName->text()); url.setPath("/" + textDbName->text()); TQString qs = TQString("driver=%1") - .tqarg(listDrivers->currentText().section (' ', 0, 0)); + .arg(listDrivers->currentText().section (' ', 0, 0)); if (checkPreLoad->isChecked()) qs.append("&options=loadAll"); if (!textPassword->text().isEmpty()) qs.append("&secure=yes"); url.setQuery(qs); @@ -171,7 +171,7 @@ void KSelectDatabaseDlg::slotDriverSelected (TQListBoxItem *driver) { if (!m_map.isTested(dbType)) { int rc = KMessageBox::warningContinueCancel (0, i18n("TQt SQL driver %1 has not been fully tested in a KMyMoney environment. Please make sure you have adequate backups of your data. Please report any problems to the developer mailing list at kmymoney2-developer@lists.sourceforge.net") - .tqarg(driver->text()), + .arg(driver->text()), ""); if (rc == KMessageBox::Cancel) { listDrivers->clearSelection(); diff --git a/kmymoney2/dialogs/kselectdatabasedlgdecl.ui b/kmymoney2/dialogs/kselectdatabasedlgdecl.ui index 4b2b31e..2215b9a 100644 --- a/kmymoney2/dialogs/kselectdatabasedlgdecl.ui +++ b/kmymoney2/dialogs/kselectdatabasedlgdecl.ui @@ -153,7 +153,7 @@ As always, please make sure you have adequate backups of your data.</font> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -177,7 +177,7 @@ As always, please make sure you have adequate backups of your data.</font> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -202,7 +202,7 @@ As always, please make sure you have adequate backups of your data.</font> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>20</height> diff --git a/kmymoney2/dialogs/kselecttransactionsdlgdecl.ui b/kmymoney2/dialogs/kselecttransactionsdlgdecl.ui index 5697104..f4fb116 100644 --- a/kmymoney2/dialogs/kselecttransactionsdlgdecl.ui +++ b/kmymoney2/dialogs/kselecttransactionsdlgdecl.ui @@ -99,7 +99,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -123,7 +123,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>430</width> <height>20</height> diff --git a/kmymoney2/dialogs/ksortoptiondlg.ui b/kmymoney2/dialogs/ksortoptiondlg.ui index bfc4ca7..ac10946 100644 --- a/kmymoney2/dialogs/ksortoptiondlg.ui +++ b/kmymoney2/dialogs/ksortoptiondlg.ui @@ -37,7 +37,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -61,7 +61,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>237</width> <height>20</height> diff --git a/kmymoney2/dialogs/ksplitcorrectiondlg.ui b/kmymoney2/dialogs/ksplitcorrectiondlg.ui index 0f2a196..3c94f93 100644 --- a/kmymoney2/dialogs/ksplitcorrectiondlg.ui +++ b/kmymoney2/dialogs/ksplitcorrectiondlg.ui @@ -12,7 +12,7 @@ <height>292</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>80</width> <height>0</height> @@ -33,7 +33,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -133,7 +133,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>41</height> @@ -156,7 +156,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -172,7 +172,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>20</height> @@ -191,7 +191,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>80</width> <height>0</height> @@ -213,7 +213,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>80</width> <height>0</height> diff --git a/kmymoney2/dialogs/ksplittransactiondlg.cpp b/kmymoney2/dialogs/ksplittransactiondlg.cpp index cb80e62..907f927 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 @@ -183,15 +183,15 @@ int KSplitTransactionDlg::exec(void) TQString q = i18n("The total amount of this transaction is %1 while " "the sum of the splits is %2. The remaining %3 are " "unassigned.") - .tqarg(total) - .tqarg(sums) - .tqarg(diff); + .arg(total) + .arg(sums) + .arg(diff); corrDlg->explanation->setText(q); - q = i18n("Change &total amount of transaction to %1.").tqarg(sums); + q = i18n("Change &total amount of transaction to %1.").arg(sums); corrDlg->changeBtn->setText(q); - q = i18n("&Distribute difference of %1 among all splits.").tqarg(diff); + q = i18n("&Distribute difference of %1 among all splits.").arg(diff); corrDlg->distributeBtn->setText(q); // FIXME remove the following line once distribution among // all splits is implemented @@ -200,9 +200,9 @@ int KSplitTransactionDlg::exec(void) // if we have only two splits left, we don't allow leaving sth. unassigned. if(m_transaction.splitCount() < 3) { - q = i18n("&Leave total amount of transaction at %1.").tqarg(total); + q = i18n("&Leave total amount of transaction at %1.").arg(total); } else { - q = i18n("&Leave %1 unassigned.").tqarg(diff); + q = i18n("&Leave %1 unassigned.").arg(diff); } corrDlg->leaveBtn->setText(q); diff --git a/kmymoney2/dialogs/ksplittransactiondlgdecl.ui b/kmymoney2/dialogs/ksplittransactiondlgdecl.ui index ecd6a90..8f45927 100644 --- a/kmymoney2/dialogs/ksplittransactiondlgdecl.ui +++ b/kmymoney2/dialogs/ksplittransactiondlgdecl.ui @@ -88,7 +88,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>16</height> @@ -99,7 +99,7 @@ <property name="name"> <cstring>Layout49</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>80</height> @@ -127,7 +127,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>120</width> <height>15</height> @@ -136,7 +136,7 @@ <property name="text"> <string><b>11,00<b></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -154,7 +154,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>120</width> <height>15</height> @@ -163,7 +163,7 @@ <property name="text"> <string><b>111,00<b></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -181,7 +181,7 @@ <property name="text"> <string>Unassigned</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -199,7 +199,7 @@ <property name="text"> <string>Sum of splits</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -217,7 +217,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>120</width> <height>15</height> @@ -226,7 +226,7 @@ <property name="text"> <string>100,00</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -236,7 +236,7 @@ <property name="name"> <cstring>TextLabel1_2_2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>0</height> @@ -250,7 +250,7 @@ <property name="text"> <string>Transaction amount</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -284,13 +284,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>15</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>80</height> @@ -309,7 +309,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -364,7 +364,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>120</height> diff --git a/kmymoney2/dialogs/kstartdlg.cpp b/kmymoney2/dialogs/kstartdlg.cpp index a9f3bae..fcc6510 100644 --- a/kmymoney2/dialogs/kstartdlg.cpp +++ b/kmymoney2/dialogs/kstartdlg.cpp @@ -19,11 +19,11 @@ // QT Includes #include <tqvbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqbuttongroup.h> #include <tqabstractlayout.h> #include <tqpixmap.h> -#include <tqtextview.h> +#include <textview.h> #include <tqlabel.h> // ---------------------------------------------------------------------------- @@ -89,7 +89,7 @@ void KStartDlg::setPage_Documents() kurlrequest = new KURLRequester( recentMainFrame, "kurlrequest" ); //allow user to select either a .kmy file, or any generic file. - kurlrequest->fileDialog()->setFilter( i18n("%1|KMyMoney files (*.kmy)\n" "%2|All files (*.*)").tqarg("*.kmy").tqarg("*.*") ); + kurlrequest->fileDialog()->setFilter( i18n("%1|KMyMoney files (*.kmy)\n" "%2|All files (*.*)").arg("*.kmy").arg("*.*") ); kurlrequest->fileDialog()->setMode(KFile::File || KFile::ExistingOnly); kurlrequest->fileDialog()->setURL(KURL(kmymoney2->readLastUsedDir()));//kurlrequest->fileDialog()->setURL(KURL(KGlobalSettings::documentPath())); mainLayout->addWidget( kurlrequest ); @@ -138,7 +138,7 @@ void KStartDlg::readConfig() // it does not make a difference, if you call setGroup() outside of // this loop. The first time it does make a difference! config->setGroup("Recent Files"); - value = config->readEntry( TQString( "File%1" ).tqarg( i ), TQString() ); + value = config->readEntry( TQString( "File%1" ).arg( i ), TQString() ); if( !value.isNull() && fileExists(value) ) { TQString file_name = value.mid(value.findRev('/')+1); 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..40e178f 100644 --- a/kmymoney2/dialogs/kupdatestockpricedlgdecl.ui +++ b/kmymoney2/dialogs/kupdatestockpricedlgdecl.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout38</cstring> + <cstring>layout38</cstring> </property> <grid> <property name="name"> @@ -29,7 +29,7 @@ </property> <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> - <cstring>tqlayout37</cstring> + <cstring>layout37</cstring> </property> <hbox> <property name="name"> @@ -50,7 +50,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>71</width> <height>21</height> @@ -61,7 +61,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>tqlayout36</cstring> + <cstring>layout36</cstring> </property> <hbox> <property name="name"> @@ -90,7 +90,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -125,7 +125,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout35</cstring> + <cstring>layout35</cstring> </property> <hbox> <property name="name"> @@ -154,7 +154,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -175,7 +175,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>40</height> @@ -198,7 +198,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -214,7 +214,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>71</width> <height>21</height> diff --git a/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp b/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp index 65c361c..7cb1f1b 100644 --- a/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp +++ b/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp @@ -433,7 +433,7 @@ void MyMoneyQifProfileEditor::slotDelete(void) { TQString profile = m_profile.profileName().mid(8); - if(KMessageBox::questionYesNo(this, i18n("Do you really want to delete profile '%1'?").tqarg(profile)) == KMessageBox::Yes) { + if(KMessageBox::questionYesNo(this, i18n("Do you really want to delete profile '%1'?").arg(profile)) == KMessageBox::Yes) { int idx = m_profileListBox->currentItem(); m_profile.saveProfile(); deleteProfile(profile); diff --git a/kmymoney2/dialogs/mymoneyqifprofileeditordecl.ui b/kmymoney2/dialogs/mymoneyqifprofileeditordecl.ui index 8c27984..b7036de 100644 --- a/kmymoney2/dialogs/mymoneyqifprofileeditordecl.ui +++ b/kmymoney2/dialogs/mymoneyqifprofileeditordecl.ui @@ -30,7 +30,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <hbox> <property name="name"> @@ -74,7 +74,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> @@ -84,7 +84,7 @@ <property name="name"> <cstring>TextLabel2_2_3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>140</width> <height>0</height> @@ -98,7 +98,7 @@ <property name="name"> <cstring>TextLabel2_2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>140</width> <height>0</height> @@ -117,7 +117,7 @@ <property name="name"> <cstring>TextLabel2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>140</width> <height>0</height> @@ -141,7 +141,7 @@ <property name="name"> <cstring>TextLabel2_2_2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>140</width> <height>0</height> @@ -165,7 +165,7 @@ <property name="name"> <cstring>TextLabel1</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>140</width> <height>0</height> @@ -195,7 +195,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -217,7 +217,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout43</cstring> + <cstring>layout43</cstring> </property> <hbox> <property name="name"> @@ -225,7 +225,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout36</cstring> + <cstring>layout36</cstring> </property> <grid> <property name="name"> @@ -243,7 +243,7 @@ <property name="name"> <cstring>TextLabel3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>140</width> <height>0</height> @@ -268,7 +268,7 @@ <property name="name"> <cstring>TextLabel4</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>140</width> <height>0</height> @@ -293,7 +293,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>90</width> <height>20</height> @@ -312,7 +312,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>80</height> @@ -563,7 +563,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout41</cstring> + <cstring>layout41</cstring> </property> <hbox> <property name="name"> @@ -571,7 +571,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout40</cstring> + <cstring>layout40</cstring> </property> <grid> <property name="name"> @@ -586,7 +586,7 @@ <property name="name"> <cstring>TextLabel1_2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>0</height> @@ -600,7 +600,7 @@ <property name="name"> <cstring>TextLabel1_3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>0</height> @@ -627,7 +627,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>100</width> <height>20</height> @@ -646,7 +646,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>16</height> @@ -668,7 +668,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <grid> <property name="name"> @@ -678,7 +678,7 @@ <property name="name"> <cstring>TextLabel1_4_2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>140</width> <height>0</height> @@ -705,7 +705,7 @@ <property name="name"> <cstring>TextLabel1_4_3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>140</width> <height>0</height> @@ -727,7 +727,7 @@ <property name="name"> <cstring>TextLabel1_4</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>140</width> <height>0</height> @@ -749,7 +749,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>90</height> @@ -823,7 +823,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>104</width> <height>0</height> 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 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -382,7 +382,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> 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 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>110</width> <height>20</height> @@ -75,7 +75,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>100</width> <height>20</height> @@ -110,7 +110,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> diff --git a/kmymoney2/dialogs/settings/ksettingsforecastdecl.ui b/kmymoney2/dialogs/settings/ksettingsforecastdecl.ui index e70f01e..7c5139f 100644 --- a/kmymoney2/dialogs/settings/ksettingsforecastdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsforecastdecl.ui @@ -40,7 +40,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <grid> <property name="name"> @@ -48,7 +48,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -105,7 +105,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>133</width> <height>21</height> @@ -187,7 +187,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>130</width> <height>21</height> @@ -255,7 +255,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui b/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui index 9f8adaa..c442639 100644 --- a/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui @@ -120,7 +120,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>21</height> @@ -194,7 +194,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>354</width> <height>20</height> @@ -304,7 +304,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>90</width> <height>20</height> @@ -323,7 +323,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -366,7 +366,7 @@ <property name="text"> <string>Check the views you want to enable, uncheck those you want to hide, because you don't need the functionality.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -452,7 +452,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -554,7 +554,7 @@ You can use <b>View/Show all accounts</b> to temporarily show hidden </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -588,7 +588,7 @@ You can use <b>View/Show all accounts</b> to temporarily show hidden <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>63</width> <height>20</height> @@ -620,7 +620,7 @@ You can use <b>View/Show all accounts</b> to temporarily show hidden <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> diff --git a/kmymoney2/dialogs/settings/ksettingsgpg.cpp b/kmymoney2/dialogs/settings/ksettingsgpg.cpp index fc0c4eb..07b5d18 100644 --- a/kmymoney2/dialogs/settings/ksettingsgpg.cpp +++ b/kmymoney2/dialogs/settings/ksettingsgpg.cpp @@ -153,7 +153,7 @@ void KSettingsGpg::show(void) TQString name = fields[1]; name.replace('(', "["); name.replace(')', "]"); - name = TQString("%1 (0x%2)").tqarg(name).tqarg(fields[0]); + name = TQString("%1 (0x%2)").arg(name).arg(fields[0]); m_masterKeyCombo->insertItem(name); if(name.contains(masterKey)) m_masterKeyCombo->setCurrentItem(name); @@ -177,7 +177,7 @@ void KSettingsGpg::slotStatusChanged(bool state) state = false; if((state == true) && (oncePerSession == true) && isVisible()) { - KMessageBox::information(this, TQString("<qt>%1</qt>").tqarg(i18n("You have turned on the GPG encryption support. This means, that new files will be stored encrypted. Existing files will not be encrypted automatically. To achieve encryption of existing files, please use the <b>File/Save as...</b> feature and store the file under a different name. Once confident with the result, feel free to delete the old file and rename the encrypted one to the old name.")), i18n("GPG encryption activated"), "GpgEncryptionActivated"); + KMessageBox::information(this, TQString("<qt>%1</qt>").arg(i18n("You have turned on the GPG encryption support. This means, that new files will be stored encrypted. Existing files will not be encrypted automatically. To achieve encryption of existing files, please use the <b>File/Save as...</b> feature and store the file under a different name. Once confident with the result, feel free to delete the old file and rename the encrypted one to the old name.")), i18n("GPG encryption activated"), "GpgEncryptionActivated"); oncePerSession = false; } diff --git a/kmymoney2/dialogs/settings/ksettingsgpgdecl.ui b/kmymoney2/dialogs/settings/ksettingsgpgdecl.ui index 09f846a..e256d73 100644 --- a/kmymoney2/dialogs/settings/ksettingsgpgdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsgpgdecl.ui @@ -48,7 +48,7 @@ The <i>additional recovery encryption</i> is only accessible, if the </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -104,7 +104,7 @@ The <i>additional recovery encryption</i> is only accessible, if the </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -142,7 +142,7 @@ The <i>additional recovery encryption</i> is only accessible, if the <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>20</height> @@ -153,7 +153,7 @@ The <i>additional recovery encryption</i> is only accessible, if the </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -191,7 +191,7 @@ The <i>additional recovery encryption</i> is only accessible, if the <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -225,7 +225,7 @@ This mechanism is provided for the case that you have lost your key and cannot a <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>30</height> diff --git a/kmymoney2/dialogs/settings/ksettingshomedecl.ui b/kmymoney2/dialogs/settings/ksettingshomedecl.ui index cc8eaff..f6342f3 100644 --- a/kmymoney2/dialogs/settings/ksettingshomedecl.ui +++ b/kmymoney2/dialogs/settings/ksettingshomedecl.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> @@ -29,7 +29,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="2"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -78,7 +78,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>70</height> @@ -97,7 +97,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>80</width> <height>21</height> @@ -118,9 +118,9 @@ </property> <property name="text"> <string>Selected entries are shown on the home page of the application.<p> -Use the buttons and checkboxes to customize the tqlayout of the home page.</string> +Use the buttons and checkboxes to customize the layout of the home page.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -193,7 +193,7 @@ Use the buttons and checkboxes to customize the tqlayout of the home page.</stri <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui b/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui index cc64bdb..ad68131 100644 --- a/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui @@ -12,7 +12,7 @@ <height>442</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -179,7 +179,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <hbox> <property name="name"> @@ -211,7 +211,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>240</width> <height>20</height> diff --git a/kmymoney2/dialogs/settings/ksettingsplugins.cpp b/kmymoney2/dialogs/settings/ksettingsplugins.cpp index 20434f6..203db56 100644 --- a/kmymoney2/dialogs/settings/ksettingsplugins.cpp +++ b/kmymoney2/dialogs/settings/ksettingsplugins.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <tqlayout.h> +#include <layout.h> #include <tqstring.h> #include <tqlabel.h> @@ -38,10 +38,10 @@ KSettingsPlugins::KSettingsPlugins(TQWidget* parent) : TQWidget(parent) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); KMyMoneyPlugin::PluginLoader::instance()->pluginSelectorWidget()->reparent(this, TQPoint()); - tqlayout->addWidget(KMyMoneyPlugin::PluginLoader::instance()->pluginSelectorWidget()); - tqlayout->setSpacing(KDialog::spacingHint()); + layout->addWidget(KMyMoneyPlugin::PluginLoader::instance()->pluginSelectorWidget()); + layout->setSpacing(KDialog::spacingHint()); } KSettingsPlugins::~KSettingsPlugins() diff --git a/kmymoney2/dialogs/settings/ksettingsregisterdecl.ui b/kmymoney2/dialogs/settings/ksettingsregisterdecl.ui index 1d8f320..0c23a4b 100644 --- a/kmymoney2/dialogs/settings/ksettingsregisterdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsregisterdecl.ui @@ -110,7 +110,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -276,7 +276,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -323,7 +323,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>20</height> @@ -362,7 +362,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -432,7 +432,7 @@ Selecting 0% will list all transactions.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -454,7 +454,7 @@ Selecting 0% will list all transactions.</string> </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -498,7 +498,7 @@ Selecting 0% will list all transactions.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>20</height> @@ -531,7 +531,7 @@ Selecting 0% will list all transactions.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>60</height> diff --git a/kmymoney2/dialogs/settings/ksettingsschedulesdecl.ui b/kmymoney2/dialogs/settings/ksettingsschedulesdecl.ui index 94762cb..3fe9a40 100644 --- a/kmymoney2/dialogs/settings/ksettingsschedulesdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsschedulesdecl.ui @@ -74,7 +74,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -103,7 +103,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>21</height> @@ -122,7 +122,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kmymoney2/dialogs/transactioneditor.cpp b/kmymoney2/dialogs/transactioneditor.cpp index 63ff168..cdc111a 100644 --- a/kmymoney2/dialogs/transactioneditor.cpp +++ b/kmymoney2/dialogs/transactioneditor.cpp @@ -220,7 +220,7 @@ void TransactionEditor::slotNumberChanged(const TQString& txt) if(number) { if(MyMoneyFile::instance()->checkNoUsed(m_account.id(), txt)) { - if(KMessageBox::questionYesNo(m_regForm, TQString("<qt>")+i18n("The number <b>%1</b> has already been used in account <b>%2</b>. Do you want to replace it with the next available number?").tqarg(txt).tqarg(m_account.name())+TQString("</qt>"), i18n("Duplicate number")) == KMessageBox::Yes) { + if(KMessageBox::questionYesNo(m_regForm, TQString("<qt>")+i18n("The number <b>%1</b> has already been used in account <b>%2</b>. Do you want to replace it with the next available number?").arg(txt).arg(m_account.name())+TQString("</qt>"), i18n("Duplicate number")) == KMessageBox::Yes) { number->loadText(KMyMoneyUtils::nextCheckNumber(m_account)); } } @@ -302,11 +302,11 @@ int TransactionEditor::slotEditSplits(void) acc = MyMoneyAccount(); } TQString msg; - msg = TQString("<p>")+i18n("This transaction has more than two splits and is based on a different currency (%1). Using this account to modify the transaction is currently not very well supported by KMyMoney and may result in false results.").tqarg(sec.name())+TQString(" "); + msg = TQString("<p>")+i18n("This transaction has more than two splits and is based on a different currency (%1). Using this account to modify the transaction is currently not very well supported by KMyMoney and may result in false results.").arg(sec.name())+TQString(" "); if(acc.id().isEmpty()) { msg += i18n("KMyMoney was not able to find a more appropriate account to edit this transaction. Nevertheless, you are allowed to modify the transaction. If you don't want to edit this transaction, please cancel from editing next."); } else { - msg += i18n("Using e.g. <b>%1</b> to edit this transaction is a better choice. Nevertheless, you are allowed to modify the transaction. If you want to use the suggested account instead, please cancel from editing next and change the view to the suggested account.").tqarg(acc.name()); + msg += i18n("Using e.g. <b>%1</b> to edit this transaction is a better choice. Nevertheless, you are allowed to modify the transaction. If you want to use the suggested account instead, please cancel from editing next and change the view to the suggested account.").arg(acc.name()); } KMessageBox::information(0, msg); } @@ -409,12 +409,12 @@ bool TransactionEditor::fixTransactionCommodity(const MyMoneyAccount& account) if(firstTimeMultiCurrency) { firstTimeMultiCurrency = false; if(!isMultiSelection()) { - msg = i18n("This transaction has more than two splits and is originally based on a different currency (%1). Using this account to modify the transaction may result in rounding errors. Do you want to continue?").tqarg(osec.name()); + msg = i18n("This transaction has more than two splits and is originally based on a different currency (%1). Using this account to modify the transaction may result in rounding errors. Do you want to continue?").arg(osec.name()); } else { - msg = i18n("At least one of the selected transactions has more than two splits and is originally based on a different currency (%1). Using this account to modify the transactions may result in rounding errors. Do you want to continue?").tqarg(osec.name()); + msg = i18n("At least one of the selected transactions has more than two splits and is originally based on a different currency (%1). Using this account to modify the transactions may result in rounding errors. Do you want to continue?").arg(osec.name()); } - if(KMessageBox::warningContinueCancel(0, TQString("<qt>%1</qt>").tqarg(msg)) == KMessageBox::Cancel) { + if(KMessageBox::warningContinueCancel(0, TQString("<qt>%1</qt>").arg(msg)) == KMessageBox::Cancel) { rc = false; } } @@ -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" ), @@ -611,7 +611,7 @@ bool TransactionEditor::enterTransactions(TQString& newId, bool askForSchedule, i18n("Accepts the entered data and stores it as schedule"), i18n("Use this to schedule the transaction for later entry into the ledger.")); - enter = KMessageBox::questionYesNo(m_regForm, TQString("<qt>%1</qt>").tqarg(i18n("The transaction you are about to enter has a post date in the future.<br/><br/>Do you want to enter it in the ledger or add it to the schedules?")), i18n("Dialog caption for 'Enter or schedule' dialog", "Enter or schedule?"), enterButton, scheduleButton, "EnterOrScheduleTransactionInFuture") == KMessageBox::Yes; + enter = KMessageBox::questionYesNo(m_regForm, TQString("<qt>%1</qt>").arg(i18n("The transaction you are about to enter has a post date in the future.<br/><br/>Do you want to enter it in the ledger or add it to the schedules?")), i18n("Dialog caption for 'Enter or schedule' dialog", "Enter or schedule?"), enterButton, scheduleButton, "EnterOrScheduleTransactionInFuture") == KMessageBox::Yes; } if(enter) { // add new transaction @@ -679,25 +679,25 @@ bool TransactionEditor::enterTransactions(TQString& newId, bool askForSchedule, key = "minBalanceEarly"; if(!acc.value(key).isEmpty()) { if(minBalanceEarly[acc.id()] == false && balance < MyMoneyMoney(acc.value(key))) { - msg = TQString("<qt>%1</qt>").tqarg(i18n("The balance of account <b>%1</b> dropped below the warning balance of %2.").tqarg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec))); + msg = TQString("<qt>%1</qt>").arg(i18n("The balance of account <b>%1</b> dropped below the warning balance of %2.").arg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec))); } } key = "minBalanceAbsolute"; if(!acc.value(key).isEmpty()) { if(minBalanceAbsolute[acc.id()] == false && balance < MyMoneyMoney(acc.value(key))) { - msg = TQString("<qt>%1</qt>").tqarg(i18n("The balance of account <b>%1</b> dropped below the minimum balance of %2.").tqarg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec))); + msg = TQString("<qt>%1</qt>").arg(i18n("The balance of account <b>%1</b> dropped below the minimum balance of %2.").arg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec))); } } key = "maxCreditEarly"; if(!acc.value(key).isEmpty()) { if(maxCreditEarly[acc.id()] == false && balance < MyMoneyMoney(acc.value(key))) { - msg = TQString("<qt>%1</qt>").tqarg(i18n("The balance of account <b>%1</b> dropped below the maximum credit warning limit of %2.").tqarg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec))); + msg = TQString("<qt>%1</qt>").arg(i18n("The balance of account <b>%1</b> dropped below the maximum credit warning limit of %2.").arg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec))); } } key = "maxCreditAbsolute"; if(!acc.value(key).isEmpty()) { if(maxCreditAbsolute[acc.id()] == false && balance < MyMoneyMoney(acc.value(key))) { - msg = TQString("<qt>%1</qt>").tqarg(i18n("The balance of account <b>%1</b> dropped below the maximum credit limit of %2.").tqarg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec))); + msg = TQString("<qt>%1</qt>").arg(i18n("The balance of account <b>%1</b> dropped below the maximum credit limit of %2.").arg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec))); } } @@ -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<KMyMoneyTransactionForm::TransactionForm*>(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<kMyMoneyDateInput*>(m_editWidgets["postdate"])->setDate(m_lastPostDate); else - dynamic_cast<kMyMoneyDateInput*>(m_editWidgets["postdate"])->setDate(TQDate::tqcurrentDate()); + dynamic_cast<kMyMoneyDateInput*>(m_editWidgets["postdate"])->setDate(TQDate::currentDate()); if((w = haveWidget("number")) != 0) { dynamic_cast<kMyMoneyLineEdit*>(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<kMyMoneyDateInput*>(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 @@ -1240,7 +1240,7 @@ void StdTransactionEditor::autoFill(const TQString& payeeId) int cnt = 0; TQMap<TQString, struct uniqTransaction>::iterator it_u; do { - TQString ukey = TQString("%1-%2").tqarg(key).tqarg(cnt); + TQString ukey = TQString("%1-%2").arg(key).arg(cnt); it_u = uniqList.find(ukey); if(it_u == uniqList.end()) { uniqList[ukey].t = &((*it_t).first); @@ -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); diff --git a/kmymoney2/dialogs/transactionmatcher.cpp b/kmymoney2/dialogs/transactionmatcher.cpp index 2ed5356..ce1c16e 100644 --- a/kmymoney2/dialogs/transactionmatcher.cpp +++ b/kmymoney2/dialogs/transactionmatcher.cpp @@ -80,7 +80,7 @@ void TransactionMatcher::match(MyMoneyTransaction tm, MyMoneySplit sm, MyMoneyTr // verify that the amounts are the same, otherwise we should not be matching! if(sm.shares() != si.shares()) { - throw new MYMONEYEXCEPTION(i18n("Splits for %1 have conflicting values (%2,%3)").tqarg(m_account.name()).tqarg(sm.shares().formatMoney(m_account, sec), si.shares().formatMoney(m_account, sec))); + throw new MYMONEYEXCEPTION(i18n("Splits for %1 have conflicting values (%2,%3)").arg(m_account.name()).arg(sm.shares().formatMoney(m_account, sec), si.shares().formatMoney(m_account, sec))); } // ipwizard: I took over the code to keep the bank id found in the endMatchTransaction @@ -93,12 +93,12 @@ void TransactionMatcher::match(MyMoneyTransaction tm, MyMoneySplit sm, MyMoneyTr sm.setBankID( bankID ); tm.modifySplit(sm); } else if(sm.bankID() != bankID) { - throw new MYMONEYEXCEPTION(i18n("Both of these transactions have been imported into %1. Therefore they cannot be matched. Matching works with one imported transaction and one non-imported transaction.").tqarg(m_account.name())); + throw new MYMONEYEXCEPTION(i18n("Both of these transactions have been imported into %1. Therefore they cannot be matched. Matching works with one imported transaction and one non-imported transaction.").arg(m_account.name())); } } catch(MyMoneyException *e) { TQString estr = e->what(); delete e; - throw new MYMONEYEXCEPTION(i18n("Unable to match all splits (%1)").tqarg(estr)); + throw new MYMONEYEXCEPTION(i18n("Unable to match all splits (%1)").arg(estr)); } } @@ -130,7 +130,7 @@ void TransactionMatcher::match(MyMoneyTransaction tm, MyMoneySplit sm, MyMoneyTr if ( (*it_split).value() != startSplit.value() ) { TQString accountname = MyMoneyFile::instance()->account(accountid).name(); - throw new MYMONEYEXCEPTION(i18n("Splits for %1 have conflicting values (%2,%3)").tqarg(accountname).tqarg((*it_split).value().formatMoney(),startSplit.value().formatMoney())); + throw new MYMONEYEXCEPTION(i18n("Splits for %1 have conflicting values (%2,%3)").arg(accountname).arg((*it_split).value().formatMoney(),startSplit.value().formatMoney())); } TQString bankID = (*it_split).bankID(); @@ -146,14 +146,14 @@ void TransactionMatcher::match(MyMoneyTransaction tm, MyMoneySplit sm, MyMoneyTr else { TQString accountname = MyMoneyFile::instance()->account(accountid).name(); - throw new MYMONEYEXCEPTION(i18n("Both of these transactions have been imported into %1. Therefore they cannot be matched. Matching works with one imported transaction and one non-imported transaction.").tqarg(accountname)); + throw new MYMONEYEXCEPTION(i18n("Both of these transactions have been imported into %1. Therefore they cannot be matched. Matching works with one imported transaction and one non-imported transaction.").arg(accountname)); } } catch(MyMoneyException *e) { TQString estr = e->what(); delete e; - throw new MYMONEYEXCEPTION(i18n("Unable to match all splits (%1)").tqarg(estr)); + throw new MYMONEYEXCEPTION(i18n("Unable to match all splits (%1)").arg(estr)); } } ++it_split; |