diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
commit | 6612bcfa1e491fbb2f441f2060f700b6ad589ffd (patch) | |
tree | 01ab5692b3735b315708ecef00f3a1a3d3e07d51 /kmymoney2/views | |
parent | 6aa61ac2c4eb5a0c0882b2255a9dd6789a428bc7 (diff) | |
download | kmymoney-6612bcfa1e491fbb2f441f2060f700b6ad589ffd.tar.gz kmymoney-6612bcfa1e491fbb2f441f2060f700b6ad589ffd.zip |
Remove the tq in front of these incorrectly TQt4-converted methods/data members:
tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kmymoney@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmymoney2/views')
-rw-r--r-- | kmymoney2/views/kaccountsview.cpp | 4 | ||||
-rw-r--r-- | kmymoney2/views/kaccountsviewdecl.ui | 2 | ||||
-rw-r--r-- | kmymoney2/views/kbudgetviewdecl.ui | 2 | ||||
-rw-r--r-- | kmymoney2/views/kcategoriesview.cpp | 4 | ||||
-rw-r--r-- | kmymoney2/views/kcategoriesviewdecl.ui | 2 | ||||
-rw-r--r-- | kmymoney2/views/kforecastview.cpp | 4 | ||||
-rw-r--r-- | kmymoney2/views/kforecastview.h | 2 | ||||
-rw-r--r-- | kmymoney2/views/kforecastviewdecl.ui | 2 | ||||
-rw-r--r-- | kmymoney2/views/kgloballedgerview.cpp | 6 | ||||
-rw-r--r-- | kmymoney2/views/khomeview.h | 2 | ||||
-rw-r--r-- | kmymoney2/views/kinstitutionsview.cpp | 2 | ||||
-rw-r--r-- | kmymoney2/views/kinstitutionsviewdecl.ui | 2 | ||||
-rw-r--r-- | kmymoney2/views/kinvestmentview.cpp | 2 | ||||
-rw-r--r-- | kmymoney2/views/kinvestmentviewdecl.ui | 2 | ||||
-rw-r--r-- | kmymoney2/views/kmymoneyview.cpp | 10 | ||||
-rw-r--r-- | kmymoney2/views/kpayeesviewdecl.ui | 2 | ||||
-rw-r--r-- | kmymoney2/views/kscheduledviewdecl.ui | 2 |
17 files changed, 26 insertions, 26 deletions
diff --git a/kmymoney2/views/kaccountsview.cpp b/kmymoney2/views/kaccountsview.cpp index c8cffb5..029e6ab 100644 --- a/kmymoney2/views/kaccountsview.cpp +++ b/kmymoney2/views/kaccountsview.cpp @@ -75,8 +75,8 @@ KAccountsView::KAccountsView(TQWidget *tqparent, const char *name) : { // create the searchline widget // and insert it into the existing tqlayout - m_searchWidget = new KListViewSearchLineWidget(m_accountTree, m_accountTree->tqparentWidget()); - TQVBoxLayout* tqlayout = dynamic_cast<TQVBoxLayout*>(m_accountTree->tqparentWidget()->tqlayout()); + m_searchWidget = new KListViewSearchLineWidget(m_accountTree, m_accountTree->parentWidget()); + TQVBoxLayout* tqlayout = dynamic_cast<TQVBoxLayout*>(m_accountTree->parentWidget()->tqlayout()); if(tqlayout) { tqlayout->insertWidget(0, m_searchWidget); } diff --git a/kmymoney2/views/kaccountsviewdecl.ui b/kmymoney2/views/kaccountsviewdecl.ui index 922844f..9b975f2 100644 --- a/kmymoney2/views/kaccountsviewdecl.ui +++ b/kmymoney2/views/kaccountsviewdecl.ui @@ -203,5 +203,5 @@ <includes> <include location="global" impldecl="in implementation">kmymoney/kmymoneyaccounttree.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/views/kbudgetviewdecl.ui b/kmymoney2/views/kbudgetviewdecl.ui index e03457d..90172ff 100644 --- a/kmymoney2/views/kbudgetviewdecl.ui +++ b/kmymoney2/views/kbudgetviewdecl.ui @@ -348,5 +348,5 @@ <include location="global" impldecl="in implementation">kmymoney/kmymoneyedit.h</include> <include location="global" impldecl="in implementation">kmymoney/kbudgetvalues.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/views/kcategoriesview.cpp b/kmymoney2/views/kcategoriesview.cpp index 7a6dec4..d543aae 100644 --- a/kmymoney2/views/kcategoriesview.cpp +++ b/kmymoney2/views/kcategoriesview.cpp @@ -54,8 +54,8 @@ KCategoriesView::KCategoriesView(TQWidget *tqparent, const char *name ) : { // create the searchline widget // and insert it into the existing tqlayout - m_searchWidget = new KListViewSearchLineWidget(m_accountTree, m_accountTree->tqparentWidget()); - TQVBoxLayout* tqlayout = dynamic_cast<TQVBoxLayout*>(m_accountTree->tqparentWidget()->tqlayout()); + m_searchWidget = new KListViewSearchLineWidget(m_accountTree, m_accountTree->parentWidget()); + TQVBoxLayout* tqlayout = dynamic_cast<TQVBoxLayout*>(m_accountTree->parentWidget()->tqlayout()); if(tqlayout) { tqlayout->insertWidget(0, m_searchWidget); } diff --git a/kmymoney2/views/kcategoriesviewdecl.ui b/kmymoney2/views/kcategoriesviewdecl.ui index 7ede46b..019080c 100644 --- a/kmymoney2/views/kcategoriesviewdecl.ui +++ b/kmymoney2/views/kcategoriesviewdecl.ui @@ -152,5 +152,5 @@ <includes> <include location="global" impldecl="in implementation">kmymoney/kmymoneyaccounttree.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/views/kforecastview.cpp b/kmymoney2/views/kforecastview.cpp index bf27e7f..790c51b 100644 --- a/kmymoney2/views/kforecastview.cpp +++ b/kmymoney2/views/kforecastview.cpp @@ -589,7 +589,7 @@ bool KForecastView::includeAccount(MyMoneyForecast& forecast, const MyMoneyAccou return false; } -void KForecastView::loadAccounts(MyMoneyForecast& forecast, const MyMoneyAccount& account, KMyMoneyAccountTreeForecastItem* tqparentItem, int forecastType ) +void KForecastView::loadAccounts(MyMoneyForecast& forecast, const MyMoneyAccount& account, KMyMoneyAccountTreeForecastItem* parentItem, int forecastType ) { TQMap<TQString, TQString> nameIdx; TQStringList accList; @@ -630,7 +630,7 @@ void KForecastView::loadAccounts(MyMoneyForecast& forecast, const MyMoneyAccount //get prices TQValueList<MyMoneyPrice> prices = getAccountPrices(subAccount); - forecastItem = new KMyMoneyAccountTreeForecastItem( tqparentItem, subAccount, forecast, prices, currency, static_cast<KMyMoneyAccountTreeForecastItem::EForecastViewType>(forecastType) ); + forecastItem = new KMyMoneyAccountTreeForecastItem( parentItem, subAccount, forecast, prices, currency, static_cast<KMyMoneyAccountTreeForecastItem::EForecastViewType>(forecastType) ); forecastItem->setOpen(true); loadAccounts(forecast, subAccount, forecastItem, forecastType); diff --git a/kmymoney2/views/kforecastview.h b/kmymoney2/views/kforecastview.h index 36de0e5..634135e 100644 --- a/kmymoney2/views/kforecastview.h +++ b/kmymoney2/views/kforecastview.h @@ -123,7 +123,7 @@ private: void addIncomeExpenseRows(const MyMoneyForecast& forecast); void addTotalRow(KMyMoneyAccountTreeForecast* forecastList, const MyMoneyForecast& forecast); bool includeAccount(MyMoneyForecast& forecast, const MyMoneyAccount& acc); - void loadAccounts(MyMoneyForecast& forecast, const MyMoneyAccount& account, KMyMoneyAccountTreeForecastItem* tqparentItem, int forecastType); + void loadAccounts(MyMoneyForecast& forecast, const MyMoneyAccount& account, KMyMoneyAccountTreeForecastItem* parentItem, int forecastType); bool m_needReload[MaxViewTabs]; KMyMoneyAccountTreeForecastItem* m_totalItem; diff --git a/kmymoney2/views/kforecastviewdecl.ui b/kmymoney2/views/kforecastviewdecl.ui index 3110bbf..79aa702 100644 --- a/kmymoney2/views/kforecastviewdecl.ui +++ b/kmymoney2/views/kforecastviewdecl.ui @@ -610,5 +610,5 @@ </sizepolicy> </customwidget> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/views/kgloballedgerview.cpp b/kmymoney2/views/kgloballedgerview.cpp index 65cfc7b..7bda222 100644 --- a/kmymoney2/views/kgloballedgerview.cpp +++ b/kmymoney2/views/kgloballedgerview.cpp @@ -103,7 +103,7 @@ bool MousePressFilter::isChildOf( TQWidget* child, TQWidget *tqparent ) // if it is a child of our own if(dynamic_cast<KPassivePopup*>(child)) return true; - child = child->tqparentWidget(); + child = child->parentWidget(); } return false; } @@ -946,7 +946,7 @@ bool KGlobalLedgerView::slotSelectAccount(const TQString& id, const TQString& tr // if a stock account is selected, we show the // the corresponding tqparent (investment) account if(m_account.isInvest()) { - m_account = MyMoneyFile::instance()->account(m_account.tqparentAccountId()); + m_account = MyMoneyFile::instance()->account(m_account.parentAccountId()); } m_newAccountLoaded = true; slotLoadView(); @@ -1210,7 +1210,7 @@ bool KGlobalLedgerView::focusNextPrevChild(bool next) w = tqApp->tqfocusWidget(); while(w && m_tabOrderWidgets.tqfind(w) == -1) { // qDebug("'%s' not in list, use tqparent", w->className()); - w = w->tqparentWidget(); + w = w->parentWidget(); } // if(w) qDebug("tab order is at '%s'", w->className()); currentWidget = m_tabOrderWidgets.current(); diff --git a/kmymoney2/views/khomeview.h b/kmymoney2/views/khomeview.h index f580ed4..a99ffa9 100644 --- a/kmymoney2/views/khomeview.h +++ b/kmymoney2/views/khomeview.h @@ -143,7 +143,7 @@ private: MyMoneyMoney forecastPaymentBalance(const MyMoneyAccount& acc, const MyMoneyMoney& payment, TQDate& paymentDate); KHTMLPart* m_part; - TQVBoxLayout* m_qvboxtqlayoutPage; + TQVBoxLayout* m_qvboxlayoutPage; TQString m_filename; bool m_showAllSchedules; bool m_needReload; diff --git a/kmymoney2/views/kinstitutionsview.cpp b/kmymoney2/views/kinstitutionsview.cpp index 4219851..544cb0c 100644 --- a/kmymoney2/views/kinstitutionsview.cpp +++ b/kmymoney2/views/kinstitutionsview.cpp @@ -133,7 +133,7 @@ void KInstitutionsView::loadAccounts(void) TQMap<TQString, MyMoneyAccount>::iterator it_am; for(it_am = m_accountMap.begin(); it_am != m_accountMap.end(); ++it_am) { if((*it_am).isInvest()) { - (*it_am).setInstitutionId(m_accountMap[(*it_am).tqparentAccountId()].institutionId()); + (*it_am).setInstitutionId(m_accountMap[(*it_am).parentAccountId()].institutionId()); } } diff --git a/kmymoney2/views/kinstitutionsviewdecl.ui b/kmymoney2/views/kinstitutionsviewdecl.ui index 678ec08..1134e3b 100644 --- a/kmymoney2/views/kinstitutionsviewdecl.ui +++ b/kmymoney2/views/kinstitutionsviewdecl.ui @@ -81,5 +81,5 @@ <includes> <include location="global" impldecl="in implementation">kmymoney/kmymoneyaccounttree.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/views/kinvestmentview.cpp b/kmymoney2/views/kinvestmentview.cpp index d6ebb1a..7fe7500 100644 --- a/kmymoney2/views/kinvestmentview.cpp +++ b/kmymoney2/views/kinvestmentview.cpp @@ -217,7 +217,7 @@ bool KInvestmentView::slotSelectAccount(const TQString& id, const TQString& tran // if a stock account is selected, we show the // the corresponding tqparent (investment) account if(d->m_account.isInvest()) { - d->m_account = MyMoneyFile::instance()->account(d->m_account.tqparentAccountId()); + d->m_account = MyMoneyFile::instance()->account(d->m_account.parentAccountId()); } // TODO if we don't have an investment account, then we should switch to the ledger view d->m_newAccountLoaded = true; diff --git a/kmymoney2/views/kinvestmentviewdecl.ui b/kmymoney2/views/kinvestmentviewdecl.ui index d339bbf..7c4a028 100644 --- a/kmymoney2/views/kinvestmentviewdecl.ui +++ b/kmymoney2/views/kinvestmentviewdecl.ui @@ -82,5 +82,5 @@ <includes> <include location="global" impldecl="in implementation">kmymoney/kmymoneyaccountcombo.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/views/kmymoneyview.cpp b/kmymoney2/views/kmymoneyview.cpp index bf1b5cc..8d7aa4d 100644 --- a/kmymoney2/views/kmymoneyview.cpp +++ b/kmymoney2/views/kmymoneyview.cpp @@ -155,7 +155,7 @@ KMyMoneyView::KMyMoneyView(TQWidget *tqparent, const char *name) connect(m_institutionsView, TQT_SIGNAL(openContextMenu(const MyMoneyObject&)), kmymoney2, TQT_SLOT(slotShowInstitutionContextMenu(const MyMoneyObject&))); connect(m_institutionsView, TQT_SIGNAL(openObject(const MyMoneyObject&)), kmymoney2, TQT_SLOT(slotInstitutionEdit(const MyMoneyObject&))); connect(m_institutionsView, TQT_SIGNAL(openObject(const MyMoneyObject&)), kmymoney2, TQT_SLOT(slotAccountOpen(const MyMoneyObject&))); - connect(m_institutionsView, TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyInstitution&)), kmymoney2, TQT_SLOT(slotRetqparentAccount(const MyMoneyAccount&, const MyMoneyInstitution&))); + connect(m_institutionsView, TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyInstitution&)), kmymoney2, TQT_SLOT(slotReparentAccount(const MyMoneyAccount&, const MyMoneyInstitution&))); connect(this, TQT_SIGNAL(reconciliationStarts(const MyMoneyAccount&, const TQDate&, const MyMoneyMoney&)), m_institutionsView, TQT_SLOT(slotReconcileAccount(const MyMoneyAccount&, const TQDate&, const MyMoneyMoney&))); // Page 2 @@ -168,7 +168,7 @@ KMyMoneyView::KMyMoneyView(TQWidget *tqparent, const char *name) connect(m_accountsView, TQT_SIGNAL(selectObject(const MyMoneyObject&)), kmymoney2, TQT_SLOT(slotSelectInvestment(const MyMoneyObject&))); connect(m_accountsView, TQT_SIGNAL(openContextMenu(const MyMoneyObject&)), kmymoney2, TQT_SLOT(slotShowAccountContextMenu(const MyMoneyObject&))); connect(m_accountsView, TQT_SIGNAL(openObject(const MyMoneyObject&)), kmymoney2, TQT_SLOT(slotAccountOpen(const MyMoneyObject&))); - connect(m_accountsView, TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyAccount&)), kmymoney2, TQT_SLOT(slotRetqparentAccount(const MyMoneyAccount&, const MyMoneyAccount&))); + connect(m_accountsView, TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyAccount&)), kmymoney2, TQT_SLOT(slotReparentAccount(const MyMoneyAccount&, const MyMoneyAccount&))); connect(this, TQT_SIGNAL(kmmFilePlugin(unsigned int)), m_accountsView, TQT_SLOT(slotUpdateIconPos(unsigned int))); connect(this, TQT_SIGNAL(reconciliationStarts(const MyMoneyAccount&, const TQDate&, const MyMoneyMoney&)), m_accountsView, TQT_SLOT(slotReconcileAccount(const MyMoneyAccount&, const TQDate&, const MyMoneyMoney&))); @@ -193,7 +193,7 @@ KMyMoneyView::KMyMoneyView(TQWidget *tqparent, const char *name) connect(m_categoriesView, TQT_SIGNAL(selectObject(const MyMoneyObject&)), kmymoney2, TQT_SLOT(slotSelectInstitution(const MyMoneyObject&))); connect(m_categoriesView, TQT_SIGNAL(openContextMenu(const MyMoneyObject&)), kmymoney2, TQT_SLOT(slotShowAccountContextMenu(const MyMoneyObject&))); connect(m_categoriesView, TQT_SIGNAL(openObject(const MyMoneyObject&)), kmymoney2, TQT_SLOT(slotAccountOpen(const MyMoneyObject&))); - connect(m_categoriesView, TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyAccount&)), kmymoney2, TQT_SLOT(slotRetqparentAccount(const MyMoneyAccount&, const MyMoneyAccount&))); + connect(m_categoriesView, TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyAccount&)), kmymoney2, TQT_SLOT(slotReparentAccount(const MyMoneyAccount&, const MyMoneyAccount&))); // Page 5 m_payeesViewFrame = addVBoxPage( i18n("Payees"), i18n("Payees"), @@ -460,7 +460,7 @@ void KMyMoneyView::slotLedgerSelected(const TQString& _accId, const TQString& tr case MyMoneyAccount::Stock: // if a stock account is selected, we show the // the corresponding tqparent (investment) account - acc = MyMoneyFile::instance()->account(acc.tqparentAccountId()); + acc = MyMoneyFile::instance()->account(acc.parentAccountId()); accId = acc.id(); // tricky fall through here @@ -1788,7 +1788,7 @@ void KMyMoneyView::fixFile_0(void) // this account. Need to move it to asset() first, because otherwise // MyMoneyFile::reparent would act as NOP. if(equityListEmpty && (*it_a).accountType() == MyMoneyAccount::Equity) { - if((*it_a).tqparentAccountId() == equity.id()) { + if((*it_a).parentAccountId() == equity.id()) { MyMoneyAccount acc = *it_a; // tricky, force tqparent account to be empty so that we really // can re-tqparent it diff --git a/kmymoney2/views/kpayeesviewdecl.ui b/kmymoney2/views/kpayeesviewdecl.ui index 0c2705e..05e8e09 100644 --- a/kmymoney2/views/kpayeesviewdecl.ui +++ b/kmymoney2/views/kpayeesviewdecl.ui @@ -662,5 +662,5 @@ new transactions with this payee</string> <includes> <include location="local" impldecl="in declaration">../widgets/kmymoneyaccountcombo.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/views/kscheduledviewdecl.ui b/kmymoney2/views/kscheduledviewdecl.ui index 215ec7f..f101b52 100644 --- a/kmymoney2/views/kscheduledviewdecl.ui +++ b/kmymoney2/views/kscheduledviewdecl.ui @@ -157,5 +157,5 @@ <data format="PNG" length="824">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000002ff49444154388db59531681c4714863f992dde820cb370815b50600f54e8ca0ba43970712a8fb838438a3895634813d238a5ab80e314ae4d0a812060a4226017c27221c8a9da6b8c4fe0e00d28b0571cec82043b85611f78c12966efa4bb8bc085f29a6567df7cef9f7fdeccaec571cc2cbaddee47ae21e2385e5b9b815f1ebcfcd8de6a63ad25cb338af7c52741acb5a4a729a3d723a82ec6bd99d267bf3f23fc1c4cab2442d14a915986e792fdfa59569766573049417784f1b12e8267954dab24b78714450a28beaf941f847c2a14e70a0841035a2d45d641eb027213c210c69756320767794684d6508bef0befde1a860796e4c402333542b4256c0f0cdd1e50b97191458be6e0e27d81563a87c643d8fb2d7793d685d696413cc8a6cae46f65f7d79c7c62b87b4f2e15fd0fb0d302be0fefde4a0d557a5f35e90f84e0334014d590f855c9de4ecee17e4eb319d1ff3a00ec02f8c67299f283307c61e7d06fbf1782d082588a33e1cf1705fd81cf773f3601e1f9bec59e2f4b5c7ef5209f0ac95f16630cfd818067c103b586dd274a726229cee0fe8380d191cb4d1267d3d58aa1de7d258ceae5d7d0a78fdd269a86f0c52d414c49bbe3762c9b686de41560d7a72e41c4795a6486a78f95e4c4151481d686efbe7b3398ac58b1a23868b8c474aaa8068c8e714a8dd06c1af2a9e5d1c38c641c909dba6e08237f19b358a7ac5cf3479bc2e41f257e55d2ffc6a73833746f09e186cfa387904f2cbffc90a2aa9886d0e99464d3c5965b512cebd01f1800f67672e2a392fb0f023a3d883a053ffddcc2340dd65ab452b6074dc2cd15c1cbceb863daed413e353cdfcfd97d92333a12da6d0181ec3443cf753ef3cdd092de0e116ff1a02cdc157338ca9d7b8269461cfee1ba2139b9286e1a427f10110f2d561555b076d18a39383d4d99a4c0cd0b787f20747b214962c8266e3cdcf0e97c59126ec2f6edd089f40a92f115e0d1eb11ba238461dd6a15f32b53666de841965bb203575a3cc15a48c64a965fe57105e3635db8fa96dcffc431172b5d715d7103dc3fea7f015f373c8ee3b57f0135105a0fae7717960000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> |