diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
commit | 902ba103f2215bcefa22d62b1c9138aa4b88891c (patch) | |
tree | 63ef88424b9be33a31e5a8de61343fb8d7633937 /kmymoney2/views | |
parent | 7e51b6d5ddc01fc3bc69f30bc5d3933a7709dbf2 (diff) | |
download | kmymoney-902ba103f2215bcefa22d62b1c9138aa4b88891c.tar.gz kmymoney-902ba103f2215bcefa22d62b1c9138aa4b88891c.zip |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kmymoney@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmymoney2/views')
28 files changed, 146 insertions, 146 deletions
diff --git a/kmymoney2/views/kaccountsview.cpp b/kmymoney2/views/kaccountsview.cpp index f0da377..8de2b20 100644 --- a/kmymoney2/views/kaccountsview.cpp +++ b/kmymoney2/views/kaccountsview.cpp @@ -43,8 +43,8 @@ #include "../kmymoney2.h" -KMyMoneyAccountIconItem::KMyMoneyAccountIconItem(TQIconView *tqparent, const MyMoneyAccount& account) : - KIconViewItem(tqparent, account.name()), +KMyMoneyAccountIconItem::KMyMoneyAccountIconItem(TQIconView *parent, const MyMoneyAccount& account) : + KIconViewItem(parent, account.name()), m_account(account), m_reconcileFlag(false) { @@ -68,8 +68,8 @@ void KMyMoneyAccountIconItem::updateAccount(const MyMoneyAccount& account) setPixmap(account.accountPixmap(m_reconcileFlag)); } -KAccountsView::KAccountsView(TQWidget *tqparent, const char *name) : - KAccountsViewDecl(tqparent,name), +KAccountsView::KAccountsView(TQWidget *parent, const char *name) : + KAccountsViewDecl(parent,name), m_assetItem(0), m_liabilityItem(0) { @@ -419,7 +419,7 @@ void KAccountsView::loadListView(void) ::timetrace("done load accounts list view"); } -bool KAccountsView::loadSubAccounts(KMyMoneyAccountTreeItem* tqparent, const TQStringList& accountList) +bool KAccountsView::loadSubAccounts(KMyMoneyAccountTreeItem* parent, const TQStringList& accountList) { MyMoneyFile* file = MyMoneyFile::instance(); @@ -452,7 +452,7 @@ bool KAccountsView::loadSubAccounts(KMyMoneyAccountTreeItem* tqparent, const TQS delete e; } - KMyMoneyAccountTreeItem* item = new KMyMoneyAccountTreeItem(tqparent, acc, prices, security); + KMyMoneyAccountTreeItem* item = new KMyMoneyAccountTreeItem(parent, acc, prices, security); if(acc.id() == m_reconciliationAccount.id()) item->setReconciliation(true); diff --git a/kmymoney2/views/kaccountsview.h b/kmymoney2/views/kaccountsview.h index 33a787c..a8498fb 100644 --- a/kmymoney2/views/kaccountsview.h +++ b/kmymoney2/views/kaccountsview.h @@ -49,12 +49,12 @@ public: /** * Constructor to be used to construct an account icon object. * - * @param tqparent pointer to the KIconView object this entry should be + * @param parent pointer to the KIconView object this entry should be * added to. * @param account const reference to MyMoneyAccount for which * the KIconView entry is constructed */ - KMyMoneyAccountIconItem(TQIconView *tqparent, const MyMoneyAccount& account); + KMyMoneyAccountIconItem(TQIconView *parent, const MyMoneyAccount& account); ~KMyMoneyAccountIconItem(); /** @@ -91,7 +91,7 @@ class KAccountsView : public KAccountsViewDecl private: public: - KAccountsView(TQWidget *tqparent=0, const char *name=0); + KAccountsView(TQWidget *parent=0, const char *name=0); virtual ~KAccountsView(); public slots: @@ -137,7 +137,7 @@ protected: void loadListView(void); void loadIconView(void); - bool loadSubAccounts(KMyMoneyAccountTreeItem* tqparent, const TQStringList& accountList); + bool loadSubAccounts(KMyMoneyAccountTreeItem* parent, const TQStringList& accountList); /** * This method returns a pointer to the currently selected @@ -182,12 +182,12 @@ signals: /** * This signal is emitted, when the user selected to reparent the - * account @p acc to be a subordinate account of @p tqparent. + * account @p acc to be a subordinate account of @p parent. * * @param acc const reference to account to be reparented - * @param tqparent const reference to new tqparent account + * @param parent const reference to new parent account */ - void reparent(const MyMoneyAccount& acc, const MyMoneyAccount& tqparent); + void reparent(const MyMoneyAccount& acc, const MyMoneyAccount& parent); private: MyMoneyAccount m_reconciliationAccount; diff --git a/kmymoney2/views/kbudgetview.cpp b/kmymoney2/views/kbudgetview.cpp index aa4b619..9002ceb 100644 --- a/kmymoney2/views/kbudgetview.cpp +++ b/kmymoney2/views/kbudgetview.cpp @@ -61,8 +61,8 @@ #include "../kmymoney2.h" // *** KBudgetListItem Implementation *** -KBudgetListItem::KBudgetListItem(KListView *tqparent, const MyMoneyBudget& budget) : - KListViewItem(tqparent), +KBudgetListItem::KBudgetListItem(KListView *parent, const MyMoneyBudget& budget) : + KListViewItem(parent), m_budget(budget) { setText(0, budget.name()); @@ -95,8 +95,8 @@ void KBudgetListItem::paintCell(TQPainter *p, const TQColorGroup & cg, int colum const int KBudgetView::m_iBudgetYearsAhead = 5; const int KBudgetView::m_iBudgetYearsBack = 3; -KBudgetView::KBudgetView(TQWidget *tqparent, const char *name ) : - KBudgetViewDecl(tqparent,name), +KBudgetView::KBudgetView(TQWidget *parent, const char *name ) : + KBudgetViewDecl(parent,name), m_needReload(false), m_inSelection(false) { @@ -412,7 +412,7 @@ void KBudgetView::loadAccounts(void) } -bool KBudgetView::loadSubAccounts(KMyMoneyAccountTreeBudgetItem* tqparent, TQStringList& accountList, const MyMoneyBudget& budget) +bool KBudgetView::loadSubAccounts(KMyMoneyAccountTreeBudgetItem* parent, TQStringList& accountList, const MyMoneyBudget& budget) { MyMoneyFile* file = MyMoneyFile::instance(); @@ -461,7 +461,7 @@ bool KBudgetView::loadSubAccounts(KMyMoneyAccountTreeBudgetItem* tqparent, TQStr } TQStringList subAcctList = acc.accountList(); - KMyMoneyAccountTreeBudgetItem *item = new KMyMoneyAccountTreeBudgetItem(tqparent, acc, budget, prices, security); + KMyMoneyAccountTreeBudgetItem *item = new KMyMoneyAccountTreeBudgetItem(parent, acc, budget, prices, security); unused |= loadSubAccounts(item, subAcctList, budget); // no child accounts and no value assigned to this account diff --git a/kmymoney2/views/kbudgetview.h b/kmymoney2/views/kbudgetview.h index 14c7611..ee89007 100644 --- a/kmymoney2/views/kbudgetview.h +++ b/kmymoney2/views/kbudgetview.h @@ -50,12 +50,12 @@ public: /** * Constructor to be used to construct a budget entry object. * - * @param tqparent pointer to the KListView object this entry should be + * @param parent pointer to the KListView object this entry should be * added to. * @param budget const reference to MyMoneyBudget for which * the KListView entry is constructed */ - KBudgetListItem(KListView *tqparent, const MyMoneyBudget& budget); + KBudgetListItem(KListView *parent, const MyMoneyBudget& budget); ~KBudgetListItem(); /** @@ -81,7 +81,7 @@ class KBudgetView : public KBudgetViewDecl Q_OBJECT TQ_OBJECT public: - KBudgetView(TQWidget *tqparent=0, const char *name=0); + KBudgetView(TQWidget *parent=0, const char *name=0); ~KBudgetView(); void show(); @@ -126,7 +126,7 @@ public slots: protected: void resizeEvent(TQResizeEvent*); void loadAccounts(void); - bool loadSubAccounts(KMyMoneyAccountTreeBudgetItem* tqparent, TQStringList& accountList, const MyMoneyBudget& budget); + bool loadSubAccounts(KMyMoneyAccountTreeBudgetItem* parent, TQStringList& accountList, const MyMoneyBudget& budget); /** * This method loads all available budgets into the budget list widget. If a budget is diff --git a/kmymoney2/views/kcategoriesview.cpp b/kmymoney2/views/kcategoriesview.cpp index ae914dd..6bfbbea 100644 --- a/kmymoney2/views/kcategoriesview.cpp +++ b/kmymoney2/views/kcategoriesview.cpp @@ -46,8 +46,8 @@ #include "../kmymoney2.h" -KCategoriesView::KCategoriesView(TQWidget *tqparent, const char *name ) : - KCategoriesViewDecl(tqparent, name), +KCategoriesView::KCategoriesView(TQWidget *parent, const char *name ) : + KCategoriesViewDecl(parent, name), m_incomeItem(0), m_expenseItem(0), m_needReload(false) @@ -229,7 +229,7 @@ void KCategoriesView::loadAccounts(void) ::timetrace("done load categories view"); } -bool KCategoriesView::loadSubAccounts(KMyMoneyAccountTreeItem* tqparent, const TQStringList& accountList) +bool KCategoriesView::loadSubAccounts(KMyMoneyAccountTreeItem* parent, const TQStringList& accountList) { MyMoneyFile* file = MyMoneyFile::instance(); @@ -260,7 +260,7 @@ bool KCategoriesView::loadSubAccounts(KMyMoneyAccountTreeItem* tqparent, const T delete e; } - KMyMoneyAccountTreeItem* item = new KMyMoneyAccountTreeItem(tqparent, acc, prices, security); + KMyMoneyAccountTreeItem* item = new KMyMoneyAccountTreeItem(parent, acc, prices, security); unused |= loadSubAccounts(item, acc.accountList()); // no child accounts and not transactions in this account means 'unused' diff --git a/kmymoney2/views/kcategoriesview.h b/kmymoney2/views/kcategoriesview.h index d37e74d..77fb5d7 100644 --- a/kmymoney2/views/kcategoriesview.h +++ b/kmymoney2/views/kcategoriesview.h @@ -65,7 +65,7 @@ class KCategoriesView : public KCategoriesViewDecl Q_OBJECT TQ_OBJECT public: - KCategoriesView(TQWidget *tqparent=0, const char *name=0); + KCategoriesView(TQWidget *parent=0, const char *name=0); virtual ~KCategoriesView(); @@ -87,7 +87,7 @@ public slots: protected: void loadAccounts(void); - bool loadSubAccounts(KMyMoneyAccountTreeItem* tqparent, const TQStringList& accountList); + bool loadSubAccounts(KMyMoneyAccountTreeItem* parent, const TQStringList& accountList); protected slots: void slotUpdateProfit(void); @@ -122,12 +122,12 @@ signals: /** * This signal is emitted, when the user selected to reparent the - * account @p acc to be a subordinate account of @p tqparent. + * account @p acc to be a subordinate account of @p parent. * * @param acc const reference to account to be reparented - * @param tqparent const reference to new tqparent account + * @param parent const reference to new parent account */ - void reparent(const MyMoneyAccount& acc, const MyMoneyAccount& tqparent); + void reparent(const MyMoneyAccount& acc, const MyMoneyAccount& parent); private: TQMap<TQString, MyMoneySecurity> m_securityMap; diff --git a/kmymoney2/views/kforecastview.cpp b/kmymoney2/views/kforecastview.cpp index 790c51b..d636ec4 100644 --- a/kmymoney2/views/kforecastview.cpp +++ b/kmymoney2/views/kforecastview.cpp @@ -46,8 +46,8 @@ #include "../reports/pivottable.h" #include "../reports/pivotgrid.h" -KForecastView::KForecastView(TQWidget *tqparent, const char *name) : - KForecastViewDecl(tqparent,name) +KForecastView::KForecastView(TQWidget *parent, const char *name) : + KForecastViewDecl(parent,name) { for(int i=0; i < MaxViewTabs; ++i) m_needReload[i] = false; @@ -605,7 +605,7 @@ void KForecastView::loadAccounts(MyMoneyForecast& forecast, const MyMoneyAccount TQStringList::ConstIterator accList_t; for(accList_t = accList.begin(); accList_t != accList.end(); ++accList_t ) { MyMoneyAccount subAccount = file->account(*accList_t); - //only add the account if it is a forecast account or the tqparent of a forecast account + //only add the account if it is a forecast account or the parent of a forecast account if(includeAccount(forecast, subAccount)) { nameIdx[subAccount.id()] = subAccount.id(); } diff --git a/kmymoney2/views/kforecastview.h b/kmymoney2/views/kforecastview.h index 634135e..5bb9a51 100644 --- a/kmymoney2/views/kforecastview.h +++ b/kmymoney2/views/kforecastview.h @@ -50,7 +50,7 @@ class KForecastView : public KForecastViewDecl private: public: - KForecastView(TQWidget *tqparent=0, const char *name=0); + KForecastView(TQWidget *parent=0, const char *name=0); virtual ~KForecastView(); void show(void); diff --git a/kmymoney2/views/kgloballedgerview.cpp b/kmymoney2/views/kgloballedgerview.cpp index b22e219..87f8890 100644 --- a/kmymoney2/views/kgloballedgerview.cpp +++ b/kmymoney2/views/kgloballedgerview.cpp @@ -77,8 +77,8 @@ public: TQTimer m_viewPosTimer; }; -MousePressFilter::MousePressFilter(TQWidget* tqparent, const char* name) : - TQObject(tqparent, name), +MousePressFilter::MousePressFilter(TQWidget* parent, const char* name) : + TQObject(parent, name), m_lastMousePressEvent(0), m_filterActive(true) { @@ -94,10 +94,10 @@ void MousePressFilter::setFilterActive(bool state) m_filterActive = state; } -bool MousePressFilter::isChildOf( TQWidget* child, TQWidget *tqparent ) +bool MousePressFilter::isChildOf( TQWidget* child, TQWidget *parent ) { while(child) { - if(child == tqparent) + if(child == parent) return true; // If one of the ancestors is a KPassivePopup then it's as // if it is a child of our own @@ -145,8 +145,8 @@ KGlobalLedgerView::Private::Private() : TQDate KGlobalLedgerView::m_lastPostDate; -KGlobalLedgerView::KGlobalLedgerView(TQWidget *tqparent, const char *name ) - : KMyMoneyViewBase(tqparent, name, i18n("Ledgers")), +KGlobalLedgerView::KGlobalLedgerView(TQWidget *parent, const char *name ) + : KMyMoneyViewBase(parent, name, i18n("Ledgers")), d(new Private), m_needReload(false), m_newAccountLoaded(true), @@ -944,7 +944,7 @@ bool KGlobalLedgerView::slotSelectAccount(const TQString& id, const TQString& tr try { m_account = MyMoneyFile::instance()->account(id); // if a stock account is selected, we show the - // the corresponding tqparent (investment) account + // the corresponding parent (investment) account if(m_account.isInvest()) { m_account = MyMoneyFile::instance()->account(m_account.parentAccountId()); } @@ -1089,14 +1089,14 @@ TransactionEditor* KGlobalLedgerView::startEdit(const KMyMoneyRegister::Selected } // decide, if we edit in the register or in the form - TransactionEditorContainer* tqparent; + TransactionEditorContainer* parent; if(m_formFrame->isVisible()) - tqparent = m_form; + parent = m_form; else { - tqparent = m_register; + parent = m_register; } - editor = item->createEditor(tqparent, list, m_lastPostDate); + editor = item->createEditor(parent, list, m_lastPostDate); // check that we use the same transaction commodity in all selected transactions // if not, we need to update this in the editor's list. The user can also bail out @@ -1111,7 +1111,7 @@ TransactionEditor* KGlobalLedgerView::startEdit(const KMyMoneyRegister::Selected } if(editor) { - if(tqparent == m_register) { + if(parent == m_register) { // make sure, the height of the table is correct m_register->updateRegister(KMyMoneyGlobalSettings::ledgerLens() | !KMyMoneyGlobalSettings::transactionForm()); } @@ -1131,7 +1131,7 @@ TransactionEditor* KGlobalLedgerView::startEdit(const KMyMoneyRegister::Selected connect(editor, TQT_SIGNAL(assignNumber(void)), kmymoney2, TQT_SLOT(slotTransactionAssignNumber())); connect(editor, TQT_SIGNAL(lastPostDateUsed(const TQDate&)), this, TQT_SLOT(slotKeepPostDate(const TQDate&))); - // create the widgets, place them in the tqparent and load them with data + // create the widgets, place them in the parent and load them with data // setup tab order m_tabOrderWidgets.clear(); editor->setup(m_tabOrderWidgets, m_account, d->m_action); @@ -1209,7 +1209,7 @@ bool KGlobalLedgerView::focusNextPrevChild(bool next) w = tqApp->tqfocusWidget(); while(w && m_tabOrderWidgets.find(w) == -1) { - // qDebug("'%s' not in list, use tqparent", w->className()); + // qDebug("'%s' not in list, use parent", w->className()); w = w->parentWidget(); } // if(w) qDebug("tab order is at '%s'", w->className()); diff --git a/kmymoney2/views/kgloballedgerview.h b/kmymoney2/views/kgloballedgerview.h index 0d782ab..a91b557 100644 --- a/kmymoney2/views/kgloballedgerview.h +++ b/kmymoney2/views/kgloballedgerview.h @@ -68,10 +68,10 @@ class MousePressFilter : public TQObject Q_OBJECT TQ_OBJECT public: - MousePressFilter(TQWidget* tqparent = 0, const char* name = 0); + MousePressFilter(TQWidget* parent = 0, const char* name = 0); /** - * Add widget @p w to the list of possible tqparent objects. See eventFilter() how + * Add widget @p w to the list of possible parent objects. See eventFilter() how * they will be used. */ void addWidget(TQWidget* w); @@ -96,14 +96,14 @@ public slots: protected: /** * This method checks if the widget @p child is a child of - * the widget @p tqparent and returns either @a true or @a false. + * the widget @p parent and returns either @a true or @a false. * * @param child pointer to child widget - * @param tqparent pointer to tqparent widget - * @retval true @p child points to widget which has @p tqparent as tqparent or grand-tqparent - * @retval false @p child points to a widget which is not related to @p tqparent + * @param parent pointer to parent widget + * @retval true @p child points to widget which has @p parent as parent or grand-parent + * @retval false @p child points to a widget which is not related to @p parent */ - bool isChildOf(TQWidget* child, TQWidget* tqparent); + bool isChildOf(TQWidget* child, TQWidget* parent); /** * Reimplemented from base class. Sends out the mousePressedOnExternalWidget() signal @@ -133,7 +133,7 @@ class KGlobalLedgerView : public KMyMoneyViewBase Q_OBJECT TQ_OBJECT public: - KGlobalLedgerView(TQWidget *tqparent=0, const char *name=0); + KGlobalLedgerView(TQWidget *parent=0, const char *name=0); ~KGlobalLedgerView(); /** diff --git a/kmymoney2/views/khomeview.cpp b/kmymoney2/views/khomeview.cpp index eadf2ed..37523bc 100644 --- a/kmymoney2/views/khomeview.cpp +++ b/kmymoney2/views/khomeview.cpp @@ -108,8 +108,8 @@ void KHomeView::Private::addNameIndex(TQMap<TQString, MyMoneyAccount> &idx, cons } } -KHomeView::KHomeView(TQWidget *tqparent, const char *name ) : - KMyMoneyViewBase(tqparent, name, i18n("Home")), +KHomeView::KHomeView(TQWidget *parent, const char *name ) : + KMyMoneyViewBase(parent, name, i18n("Home")), d(new Private), m_showAllSchedules(false), m_needReload(true) diff --git a/kmymoney2/views/khomeview.h b/kmymoney2/views/khomeview.h index a99ffa9..23528bb 100644 --- a/kmymoney2/views/khomeview.h +++ b/kmymoney2/views/khomeview.h @@ -61,7 +61,7 @@ public: Payment = 2 ///< show payment accounts }; - KHomeView(TQWidget *tqparent=0, const char *name=0); + KHomeView(TQWidget *parent=0, const char *name=0); ~KHomeView(); protected: diff --git a/kmymoney2/views/kinstitutionsview.cpp b/kmymoney2/views/kinstitutionsview.cpp index d5a673c..0b9258f 100644 --- a/kmymoney2/views/kinstitutionsview.cpp +++ b/kmymoney2/views/kinstitutionsview.cpp @@ -36,8 +36,8 @@ #include "../kmymoneyglobalsettings.h" #include "../kmymoney2.h" -KInstitutionsView::KInstitutionsView(TQWidget *tqparent, const char *name) : - KInstitutionsViewDecl(tqparent,name), +KInstitutionsView::KInstitutionsView(TQWidget *parent, const char *name) : + KInstitutionsViewDecl(parent,name), m_needReload(false) { m_accountTree->header()->setLabel(0, i18n("Institution/Account")); @@ -129,7 +129,7 @@ void KInstitutionsView::loadAccounts(void) } // we need to make sure we show stock accounts - // under the right institution (the one of the tqparent account) + // under the right institution (the one of the parent account) TQMap<TQString, MyMoneyAccount>::iterator it_am; for(it_am = m_accountMap.begin(); it_am != m_accountMap.end(); ++it_am) { if((*it_am).isInvest()) { @@ -199,10 +199,10 @@ void KInstitutionsView::loadAccounts(void) ::timetrace("done load institutions view"); } -void KInstitutionsView::loadSubAccounts(KMyMoneyAccountTreeItem* tqparent) +void KInstitutionsView::loadSubAccounts(KMyMoneyAccountTreeItem* parent) { bool showClosedAccounts = kmymoney2->toggleAction("view_show_all_accounts")->isChecked(); - const MyMoneyAccount& account = dynamic_cast<const MyMoneyAccount&>(tqparent->itemObject()); + const MyMoneyAccount& account = dynamic_cast<const MyMoneyAccount&>(parent->itemObject()); TQValueList<TQString>::const_iterator it_a; MyMoneyFile* file = MyMoneyFile::instance(); for(it_a = account.accountList().begin(); it_a != account.accountList().end(); ++it_a) { @@ -218,13 +218,13 @@ void KInstitutionsView::loadSubAccounts(KMyMoneyAccountTreeItem* tqparent) MyMoneySecurity sec = m_securityMap[security.tradingCurrency()]; prices += file->price(sec.id(), file->baseCurrency().id()); } - KMyMoneyAccountTreeItem* item = new KMyMoneyAccountTreeItem(tqparent, acc, prices, security); + KMyMoneyAccountTreeItem* item = new KMyMoneyAccountTreeItem(parent, acc, prices, security); if(acc.id() == m_reconciliationAccount.id()) item->setReconciliation(true); } } -void KInstitutionsView::loadSubAccounts(KMyMoneyAccountTreeItem* tqparent, const TQString& institutionId) +void KInstitutionsView::loadSubAccounts(KMyMoneyAccountTreeItem* parent, const TQString& institutionId) { MyMoneyFile* file = MyMoneyFile::instance(); @@ -257,7 +257,7 @@ void KInstitutionsView::loadSubAccounts(KMyMoneyAccountTreeItem* tqparent, const delete e; } - KMyMoneyAccountTreeItem* item = new KMyMoneyAccountTreeItem(tqparent, acc, prices, security); + KMyMoneyAccountTreeItem* item = new KMyMoneyAccountTreeItem(parent, acc, prices, security); if(acc.id() == m_reconciliationAccount.id()) item->setReconciliation(true); @@ -276,8 +276,8 @@ void KInstitutionsView::loadSubAccounts(KMyMoneyAccountTreeItem* tqparent, const // it does not take the negative sign for liability accounts // into account. So we correct this here with the value we // have calculated while filling the list - tqparent->adjustTotalValue(-tqparent->totalValue()); // load a 0 - tqparent->adjustTotalValue(value); // now store the new value + parent->adjustTotalValue(-parent->totalValue()); // load a 0 + parent->adjustTotalValue(value); // now store the new value // we need to call slotUpdateNetWorth() here manually, because // KMyMoneyAccountTreeItem::adjustTotalValue() does not send out diff --git a/kmymoney2/views/kinstitutionsview.h b/kmymoney2/views/kinstitutionsview.h index 9c1ab96..6293f35 100644 --- a/kmymoney2/views/kinstitutionsview.h +++ b/kmymoney2/views/kinstitutionsview.h @@ -46,7 +46,7 @@ class KInstitutionsView : public KInstitutionsViewDecl private: public: - KInstitutionsView(TQWidget *tqparent=0, const char *name=0); + KInstitutionsView(TQWidget *parent=0, const char *name=0); virtual ~KInstitutionsView(); public slots: @@ -71,10 +71,10 @@ protected: void loadAccounts(void); // load accounts that are kept at a specific institution - void loadSubAccounts(KMyMoneyAccountTreeItem* tqparent, const TQString& institutionId); + void loadSubAccounts(KMyMoneyAccountTreeItem* parent, const TQString& institutionId); - // load stock accounts under the investment account (tqparent) - void loadSubAccounts(KMyMoneyAccountTreeItem* tqparent); + // load stock accounts under the investment account (parent) + void loadSubAccounts(KMyMoneyAccountTreeItem* parent); protected slots: void slotUpdateNetWorth(void); diff --git a/kmymoney2/views/kinvestmentlistitem.cpp b/kmymoney2/views/kinvestmentlistitem.cpp index 1429cd0..b7617d8 100644 --- a/kmymoney2/views/kinvestmentlistitem.cpp +++ b/kmymoney2/views/kinvestmentlistitem.cpp @@ -40,8 +40,8 @@ #include <kmymoney/mymoneysecurity.h> #include <kmymoney/mymoneyfile.h> -KInvestmentListItem::KInvestmentListItem(KListView* tqparent, const MyMoneyAccount& account) - : KListViewItem(tqparent) +KInvestmentListItem::KInvestmentListItem(KListView* parent, const MyMoneyAccount& account) + : KListViewItem(parent) { bColumn5Negative = false; bColumn6Negative = false; @@ -50,7 +50,7 @@ KInvestmentListItem::KInvestmentListItem(KListView* tqparent, const MyMoneyAccou bColumn9Negative = false; m_account = account; - m_listView = tqparent; + m_listView = parent; MyMoneySecurity security; MyMoneyFile* file = MyMoneyFile::instance(); diff --git a/kmymoney2/views/kinvestmentlistitem.h b/kmymoney2/views/kinvestmentlistitem.h index cb0d944..2cd69fb 100644 --- a/kmymoney2/views/kinvestmentlistitem.h +++ b/kmymoney2/views/kinvestmentlistitem.h @@ -59,7 +59,7 @@ class KInvestmentListItem : public KListViewItem { public: - KInvestmentListItem(KListView* tqparent, const MyMoneyAccount& security); + KInvestmentListItem(KListView* parent, const MyMoneyAccount& security); ~KInvestmentListItem(); TQString securityId() const { return m_account.currencyId(); }; diff --git a/kmymoney2/views/kinvestmentview.cpp b/kmymoney2/views/kinvestmentview.cpp index 7fe7500..ba1876f 100644 --- a/kmymoney2/views/kinvestmentview.cpp +++ b/kmymoney2/views/kinvestmentview.cpp @@ -62,8 +62,8 @@ public: -KInvestmentView::KInvestmentView(TQWidget *tqparent, const char *name) : - KInvestmentViewDecl(tqparent,name), +KInvestmentView::KInvestmentView(TQWidget *parent, const char *name) : + KInvestmentViewDecl(parent,name), d(new Private) { m_table->setRootIsDecorated(false); @@ -215,7 +215,7 @@ bool KInvestmentView::slotSelectAccount(const TQString& id, const TQString& tran try { d->m_account = MyMoneyFile::instance()->account(id); // if a stock account is selected, we show the - // the corresponding tqparent (investment) account + // the corresponding parent (investment) account if(d->m_account.isInvest()) { d->m_account = MyMoneyFile::instance()->account(d->m_account.parentAccountId()); } diff --git a/kmymoney2/views/kinvestmentview.h b/kmymoney2/views/kinvestmentview.h index 98e2b9a..ffe9131 100644 --- a/kmymoney2/views/kinvestmentview.h +++ b/kmymoney2/views/kinvestmentview.h @@ -50,7 +50,7 @@ class KInvestmentView : public KInvestmentViewDecl TQ_OBJECT public: - KInvestmentView(TQWidget *tqparent=0, const char *name=0); + KInvestmentView(TQWidget *parent=0, const char *name=0); ~KInvestmentView(); /** diff --git a/kmymoney2/views/kmymoneyview.cpp b/kmymoney2/views/kmymoneyview.cpp index 2c3a10d..ccdc5a7 100644 --- a/kmymoney2/views/kmymoneyview.cpp +++ b/kmymoney2/views/kmymoneyview.cpp @@ -120,15 +120,15 @@ #define RECOVER_KEY_ID "0xD2B08440" -KMyMoneyView::KMyMoneyView(TQWidget *tqparent, const char *name) - : KJanusWidget(tqparent, name, KJanusWidget::IconList), +KMyMoneyView::KMyMoneyView(TQWidget *parent, const char *name) + : KJanusWidget(parent, name, KJanusWidget::IconList), // m_bankRightClick(false), m_inConstructor(true), m_fileOpen(false), m_fmode(0600) { // the global variable kmymoney2 is not yet assigned. So we construct it here - TQObject* kmymoney2 = tqparent->tqparent(); + TQObject* kmymoney2 = parent->parent(); const int iconSize = (KMyMoneyGlobalSettings::iconSize()+1)*16; newStorage(); @@ -276,9 +276,9 @@ KMyMoneyView::~KMyMoneyView() removeStorage(); } -void KMyMoneyView::addTitleBar(TQWidget* tqparent, const TQString& title) +void KMyMoneyView::addTitleBar(TQWidget* parent, const TQString& title) { - KMyMoneyTitleLabel* label = new KMyMoneyTitleLabel( tqparent, "titleLabel" ); + KMyMoneyTitleLabel* label = new KMyMoneyTitleLabel( parent, "titleLabel" ); label->setMinimumSize( TQSize( 100, 30 ) ); label->setRightImageFile("pics/titlelabel_background.png" ); label->setText(title); @@ -459,7 +459,7 @@ void KMyMoneyView::slotLedgerSelected(const TQString& _accId, const TQString& tr switch(acc.accountType()) { case MyMoneyAccount::Stock: // if a stock account is selected, we show the - // the corresponding tqparent (investment) account + // the corresponding parent (investment) account acc = MyMoneyFile::instance()->account(acc.parentAccountId()); accId = acc.id(); // tricky fall through here @@ -1007,7 +1007,7 @@ void KMyMoneyView::saveToLocalFile(TQFile* qfile, IMyMoneyStorageFormat* pWriter } } - int tqmask = umask((~m_fmode) & 0777); + int mask = umask((~m_fmode) & 0777); bool blocked = MyMoneyFile::instance()->signalsBlocked(); MyMoneyFile::instance()->blockSignals(true); MyMoneyFileTransaction ft; @@ -1050,7 +1050,7 @@ void KMyMoneyView::saveToLocalFile(TQFile* qfile, IMyMoneyStorageFormat* pWriter statusDevice = base->device(); } } - umask(tqmask); + umask(mask); ft.commit(); pWriter->setProgressCallback(&KMyMoneyView::progressCallback); @@ -1135,9 +1135,9 @@ bool KMyMoneyView::saveFile(const KURL& url, const TQString& keyList) // create a new basic block here, so that the object qfile gets // deleted, before we reach the chown() call { - int tqmask = umask((~fmode) & 0777); + int mask = umask((~fmode) & 0777); KSaveFile qfile(filename, fmode); - umask(tqmask); + umask(mask); if(qfile.status() == 0) { try { saveToLocalFile(qfile.file(), pWriter, plaintext, keyList); @@ -1784,14 +1784,14 @@ void KMyMoneyView::fixFile_0(void) } // until early before 0.8 release, the equity account was not saved to // the file. If we have an equity account with no sub-accounts but - // find and equity account that has equity() as it's tqparent, we reparent + // find and equity account that has equity() as it's parent, we reparent // 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).parentAccountId() == equity.id()) { MyMoneyAccount acc = *it_a; - // tricky, force tqparent account to be empty so that we really - // can re-tqparent it + // tricky, force parent account to be empty so that we really + // can re-parent it acc.setParentAccountId(TQString()); file->reparentAccount(acc, equity); kdDebug(2) << __func__ << " fixed account " << acc.id() << " reparented to " << equity.id() << endl; @@ -2207,8 +2207,8 @@ class KMyMoneyViewBase::Private { TQVBoxLayout* m_viewLayout; }; -KMyMoneyViewBase::KMyMoneyViewBase(TQWidget* tqparent, const char* name, const TQString& title) : - TQWidget(tqparent, name), +KMyMoneyViewBase::KMyMoneyViewBase(TQWidget* parent, const char* name, const TQString& title) : + TQWidget(parent, name), d(new Private) { d->m_viewLayout = new TQVBoxLayout(this); diff --git a/kmymoney2/views/kmymoneyview.h b/kmymoney2/views/kmymoneyview.h index 613c7a5..2c1cd38 100644 --- a/kmymoney2/views/kmymoneyview.h +++ b/kmymoney2/views/kmymoneyview.h @@ -162,7 +162,7 @@ private: fileTypeE m_fileType; private: - void addTitleBar(TQWidget* tqparent, const TQString& title); + void addTitleBar(TQWidget* parent, const TQString& title); void ungetString(TQIODevice *qfile, char * buf, int len); @@ -230,7 +230,7 @@ public: * The constructor for KMyMoneyView. Just creates all the tabs for the * different aspects of the MyMoneyFile. */ - KMyMoneyView(TQWidget *tqparent=0, const char *name=0); + KMyMoneyView(TQWidget *parent=0, const char *name=0); /** * Destructor @@ -601,7 +601,7 @@ class KMyMoneyViewBase : public TQWidget Q_OBJECT TQ_OBJECT public: - KMyMoneyViewBase(TQWidget* tqparent, const char *name, const TQString& title); + KMyMoneyViewBase(TQWidget* parent, const char *name, const TQString& title); virtual ~KMyMoneyViewBase(); void setTitle(const TQString& title); diff --git a/kmymoney2/views/kpayeesview.cpp b/kmymoney2/views/kpayeesview.cpp index f15f06a..6fa22ee 100644 --- a/kmymoney2/views/kpayeesview.cpp +++ b/kmymoney2/views/kpayeesview.cpp @@ -260,8 +260,8 @@ void KTransactionPtrVector::setPayeeId(const TQString& id) // *** KPayeeListItem Implementation *** -KPayeeListItem::KPayeeListItem(KListView *tqparent, const MyMoneyPayee& payee) : - KListViewItem(tqparent), +KPayeeListItem::KPayeeListItem(KListView *parent, const MyMoneyPayee& payee) : + KListViewItem(parent), m_payee(payee) { setText(0, payee.name()); @@ -287,8 +287,8 @@ void KPayeeListItem::paintCell(TQPainter *p, const TQColorGroup & cg, int column TQListViewItem::paintCell(p, cg2, column, width, align); } -KTransactionListItem::KTransactionListItem(KListView* view, KTransactionListItem* tqparent, const TQString& accountId, const TQString& transactionId) : - KListViewItem(view, tqparent) +KTransactionListItem::KTransactionListItem(KListView* view, KTransactionListItem* parent, const TQString& accountId, const TQString& transactionId) : + KListViewItem(view, parent) { m_accountId = accountId; m_transactionId = transactionId; @@ -315,8 +315,8 @@ const TQColor KTransactionListItem::backgroundColor(void) // *** KPayeesView Implementation *** -KPayeesView::KPayeesView(TQWidget *tqparent, const char *name ) : - KPayeesViewDecl(tqparent,name), +KPayeesView::KPayeesView(TQWidget *parent, const char *name ) : + KPayeesViewDecl(parent,name), m_needReload(false), m_needConnection(true), m_updatesQueued(0), diff --git a/kmymoney2/views/kpayeesview.h b/kmymoney2/views/kpayeesview.h index f4a481e..95be179 100644 --- a/kmymoney2/views/kpayeesview.h +++ b/kmymoney2/views/kpayeesview.h @@ -147,12 +147,12 @@ public: /** * Constructor to be used to construct a payee entry object. * - * @param tqparent pointer to the KListView object this entry should be + * @param parent pointer to the KListView object this entry should be * added to. * @param payee const reference to MyMoneyPayee for which * the KListView entry is constructed */ - KPayeeListItem(KListView *tqparent, const MyMoneyPayee& payee); + KPayeeListItem(KListView *parent, const MyMoneyPayee& payee); ~KPayeeListItem(); /** @@ -175,7 +175,7 @@ private: class KTransactionListItem : public KListViewItem { public: - KTransactionListItem(KListView* view, KTransactionListItem* tqparent, const TQString& accountId, const TQString& transaction); + KTransactionListItem(KListView* view, KTransactionListItem* parent, const TQString& accountId, const TQString& transaction); ~KTransactionListItem(); const TQString& transactionId(void) const { return m_transactionId; }; @@ -203,7 +203,7 @@ class KPayeesView : public KPayeesViewDecl TQ_OBJECT public: - KPayeesView(TQWidget *tqparent=0, const char *name=0); + KPayeesView(TQWidget *parent=0, const char *name=0); ~KPayeesView(); void show(void); diff --git a/kmymoney2/views/kreportsview.cpp b/kmymoney2/views/kreportsview.cpp index fc8e017..9b7b834 100755 --- a/kmymoney2/views/kreportsview.cpp +++ b/kmymoney2/views/kreportsview.cpp @@ -86,8 +86,8 @@ using namespace reports; * KReportsView::KReportTab Implementation */ -KReportsView::KReportTab::KReportTab(KTabWidget* tqparent, const MyMoneyReport& report ): - TQWidget( tqparent, "reporttab" ), +KReportsView::KReportTab::KReportTab(KTabWidget* parent, const MyMoneyReport& report ): + TQWidget( parent, "reporttab" ), m_part( new KHTMLPart( this, "reporttabpart" ) ), m_chartView( new KReportChartView( this, "reportchart" ) ), m_control( new kMyMoneyReportControlDecl( this, "reportcontrol" ) ), @@ -117,8 +117,8 @@ KReportsView::KReportTab::KReportTab(KTabWidget* tqparent, const MyMoneyReport& if ( icon == TQString() ) icon = KGlobal::dirs()->findResource("icon", "hicolor/16x16/apps/kmymoney2.png"); - tqparent->insertTab( this, TQIconSet(TQPixmap(icon)), report.name() ); - tqparent->setTabEnabled( this, true ); + parent->insertTab( this, TQIconSet(TQPixmap(icon)), report.name() ); + parent->setTabEnabled( this, true ); #ifdef HAVE_KDCHART if ( m_report.isChartByDefault() ) @@ -311,8 +311,8 @@ public: TQCheckBox* includeCSS; }; -KReportsView::KReportsView(TQWidget *tqparent, const char *name ) : - KMyMoneyViewBase(tqparent, name, i18n("Reports")), +KReportsView::KReportsView(TQWidget *parent, const char *name ) : + KMyMoneyViewBase(parent, name, i18n("Reports")), d(new Private), m_needReload(false) { @@ -384,8 +384,8 @@ TQString KReportsView::KReportGroupListItem::key ( int column, bool ascending ) return KListViewItem::key(column,ascending); } -KReportsView::KReportGroupListItem::KReportGroupListItem(KListView* tqparent, const int nr, TQString name) : - KListViewItem(tqparent), +KReportsView::KReportGroupListItem::KReportGroupListItem(KListView* parent, const int nr, TQString name) : + KListViewItem(parent), m_name(name) { setNr(nr); diff --git a/kmymoney2/views/kreportsview.h b/kmymoney2/views/kreportsview.h index 218155a..493b312 100755 --- a/kmymoney2/views/kreportsview.h +++ b/kmymoney2/views/kreportsview.h @@ -102,7 +102,7 @@ public: reports::ReportTable* m_table; public: - KReportTab(KTabWidget* tqparent, const MyMoneyReport& report ); + KReportTab(KTabWidget* parent, const MyMoneyReport& report ); ~KReportTab(); const MyMoneyReport& report(void) const { return m_report; } void print(void); @@ -134,13 +134,13 @@ public: MyMoneyReport m_report; public: - KReportListItem( KListView* tqparent, const MyMoneyReport& report ): - KListViewItem( tqparent, report.name(), report.comment() ), + KReportListItem( KListView* parent, const MyMoneyReport& report ): + KListViewItem( parent, report.name(), report.comment() ), m_id( report.id() ), m_report( report ) {} - KReportListItem( KListViewItem* tqparent, const MyMoneyReport& report ): - KListViewItem( tqparent, report.name(), report.comment() ), + KReportListItem( KListViewItem* parent, const MyMoneyReport& report ): + KListViewItem( parent, report.name(), report.comment() ), m_id( report.id() ), m_report( report ) {} @@ -155,7 +155,7 @@ public: TQString m_name; public: - KReportGroupListItem( KListView* tqparent,const int nr,const TQString name); + KReportGroupListItem( KListView* parent,const int nr,const TQString name); virtual TQString key ( int column, bool ascending ) const; void setNr(const int nr); }; @@ -195,14 +195,14 @@ public: /** * Standard constructor. * - * @param tqparent The TQWidget this is used in. + * @param parent The TQWidget this is used in. * @param name The QT name. * * @return An object of type KReportsView * * @see ~KReportsView */ - KReportsView(TQWidget *tqparent=0, const char *name=0); + KReportsView(TQWidget *parent=0, const char *name=0); /** * Standard destructor. diff --git a/kmymoney2/views/kscheduledlistitem.cpp b/kmymoney2/views/kscheduledlistitem.cpp index d48b881..9983c7d 100644 --- a/kmymoney2/views/kscheduledlistitem.cpp +++ b/kmymoney2/views/kscheduledlistitem.cpp @@ -42,8 +42,8 @@ #include "../kmymoneyglobalsettings.h" #include "../kmymoneyutils.h" -KScheduledListItem::KScheduledListItem(KListView *tqparent, const TQString& name, const TQPixmap& pixmap, const TQString& sortKey) : - KListViewItem(tqparent, name), +KScheduledListItem::KScheduledListItem(KListView *parent, const TQString& name, const TQPixmap& pixmap, const TQString& sortKey) : + KListViewItem(parent, name), m_sortKey(sortKey) { setPixmap(0, pixmap); @@ -51,8 +51,8 @@ KScheduledListItem::KScheduledListItem(KListView *tqparent, const TQString& name m_sortKey = name; } -KScheduledListItem::KScheduledListItem(KScheduledListItem *tqparent, const MyMoneySchedule& schedule/*, bool even*/) - : KListViewItem(tqparent) +KScheduledListItem::KScheduledListItem(KScheduledListItem *parent, const MyMoneySchedule& schedule/*, bool even*/) + : KListViewItem(parent) { m_schedule = schedule; m_sortKey = schedule.name(); @@ -172,7 +172,7 @@ void KScheduledListItem::paintCell(TQPainter* p, const TQColorGroup& cg, int col cg2.setColor(TQColorGroup::Text, textColour); // display group items in bold - if (!tqparent()) + if (!parent()) cellFont.setBold(true); p->setFont(cellFont); diff --git a/kmymoney2/views/kscheduledlistitem.h b/kmymoney2/views/kscheduledlistitem.h index 62df861..44d2af8 100644 --- a/kmymoney2/views/kscheduledlistitem.h +++ b/kmymoney2/views/kscheduledlistitem.h @@ -56,14 +56,14 @@ public: * * Other types may be added in the future. * - * @param tqparent The list view to be a child of. + * @param parent The list view to be a child of. * @param description The (translated) description. * @param pixmap A pixmap for the entry * @param sortKey a sortkey, if empty, @c description will be used. * * @see MyMoneySchedule */ - KScheduledListItem(KListView *tqparent, const TQString& description, const TQPixmap& pixmap = TQPixmap(), const TQString& sortKey = TQString()); + KScheduledListItem(KListView *parent, const TQString& description, const TQPixmap& pixmap = TQPixmap(), const TQString& sortKey = TQString()); /** * This constructor is used to create a child of one of the tqchildren @@ -71,12 +71,12 @@ public: * * This child describes a schedule and represents the data in schedule. * - * @param tqparent The list view item to be a child of. + * @param parent The list view item to be a child of. * @param schedule The schedule to be represented. * * @see MyMoneySchedule */ - KScheduledListItem(KScheduledListItem *tqparent, const MyMoneySchedule& schedule/*, bool even*/); + KScheduledListItem(KScheduledListItem *parent, const MyMoneySchedule& schedule/*, bool even*/); /** * Standard destructor. diff --git a/kmymoney2/views/kscheduledview.cpp b/kmymoney2/views/kscheduledview.cpp index b5ee054..74ea25b 100644 --- a/kmymoney2/views/kscheduledview.cpp +++ b/kmymoney2/views/kscheduledview.cpp @@ -55,8 +55,8 @@ #include "../kmymoney2.h" -KScheduledView::KScheduledView(TQWidget *tqparent, const char *name ) : - KScheduledViewDecl(tqparent,name, false), +KScheduledView::KScheduledView(TQWidget *parent, const char *name ) : + KScheduledViewDecl(parent,name, false), m_openBills(true), m_openDeposits(true), m_openTransfers(true), @@ -196,7 +196,7 @@ void KScheduledView::refresh(bool full, const TQString& schedId) if (!bContinue) continue; - KScheduledListItem* tqparent = 0; + KScheduledListItem* parent = 0; switch (schedData.type()) { case MyMoneySchedule::TYPE_ANY: @@ -204,25 +204,25 @@ void KScheduledView::refresh(bool full, const TQString& schedId) // We just sort it as bill and fall through here case MyMoneySchedule::TYPE_BILL: - tqparent = itemBills; + parent = itemBills; break; case MyMoneySchedule::TYPE_DEPOSIT: - tqparent = itemDeposits; + parent = itemDeposits; break; case MyMoneySchedule::TYPE_TRANSFER: - tqparent = itemTransfers; + parent = itemTransfers; break; case MyMoneySchedule::TYPE_LOANPAYMENT: - tqparent = itemLoans; + parent = itemLoans; break; } - if(tqparent) { + if(parent) { if(!KMyMoneyGlobalSettings::hideFinishedSchedules() || !schedData.isFinished()) { - item = new KScheduledListItem(tqparent, schedData); + item = new KScheduledListItem(parent, schedData); if (schedData.id() == schedId) openItem = item; } diff --git a/kmymoney2/views/kscheduledview.h b/kmymoney2/views/kscheduledview.h index 25600bd..cf7e10d 100644 --- a/kmymoney2/views/kscheduledview.h +++ b/kmymoney2/views/kscheduledview.h @@ -62,7 +62,7 @@ public: /** * Standard constructor for TQWidgets. */ - KScheduledView(TQWidget *tqparent=0, const char *name=0); + KScheduledView(TQWidget *parent=0, const char *name=0); /** * Standard destructor. |