From 902ba103f2215bcefa22d62b1c9138aa4b88891c Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: 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 --- kmymoney2/widgets/kaccounttemplateselector.cpp | 30 ++++----- kmymoney2/widgets/kaccounttemplateselector.h | 2 +- kmymoney2/widgets/kaccounttemplateselectordecl.cpp | 6 +- kmymoney2/widgets/kbudgetvalues.cpp | 4 +- kmymoney2/widgets/kbudgetvalues.h | 2 +- kmymoney2/widgets/kbudgetvaluesdecl.cpp | 6 +- kmymoney2/widgets/kguiutils.h | 4 +- kmymoney2/widgets/klistviewsearchline.cpp | 14 ++-- kmymoney2/widgets/klistviewsearchline.h | 16 ++--- kmymoney2/widgets/kmymoneyaccountcombo.cpp | 4 +- kmymoney2/widgets/kmymoneyaccountcombo.h | 2 +- kmymoney2/widgets/kmymoneyaccountcompletion.cpp | 4 +- kmymoney2/widgets/kmymoneyaccountcompletion.h | 2 +- kmymoney2/widgets/kmymoneyaccountselector.cpp | 20 +++--- kmymoney2/widgets/kmymoneyaccountselector.h | 10 +-- kmymoney2/widgets/kmymoneyaccounttree.cpp | 16 ++--- kmymoney2/widgets/kmymoneyaccounttree.h | 14 ++-- kmymoney2/widgets/kmymoneyaccounttreebase.cpp | 38 +++++------ kmymoney2/widgets/kmymoneyaccounttreebase.h | 30 ++++----- kmymoney2/widgets/kmymoneyaccounttreebudget.cpp | 12 ++-- kmymoney2/widgets/kmymoneyaccounttreebudget.h | 10 +-- kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp | 18 +++--- kmymoney2/widgets/kmymoneyaccounttreeforecast.h | 10 +-- kmymoney2/widgets/kmymoneybriefschedule.cpp | 4 +- kmymoney2/widgets/kmymoneybriefschedule.h | 2 +- kmymoney2/widgets/kmymoneycalculator.cpp | 16 ++--- kmymoney2/widgets/kmymoneycalculator.h | 2 +- kmymoney2/widgets/kmymoneycalendar.cpp | 4 +- kmymoney2/widgets/kmymoneycalendar.h | 2 +- kmymoney2/widgets/kmymoneycategory.cpp | 18 +++--- kmymoney2/widgets/kmymoneycategory.h | 12 ++-- kmymoney2/widgets/kmymoneychecklistitem.cpp | 22 +++---- kmymoney2/widgets/kmymoneychecklistitem.h | 6 +- kmymoney2/widgets/kmymoneycombo.cpp | 20 +++--- kmymoney2/widgets/kmymoneycombo.h | 16 ++--- kmymoney2/widgets/kmymoneycompletion.cpp | 8 +-- kmymoney2/widgets/kmymoneycompletion.h | 2 +- kmymoney2/widgets/kmymoneycurrencyselector.cpp | 12 ++-- kmymoney2/widgets/kmymoneycurrencyselector.h | 6 +- kmymoney2/widgets/kmymoneydateinput.cpp | 4 +- kmymoney2/widgets/kmymoneydateinput.h | 4 +- kmymoney2/widgets/kmymoneydatetbl.cpp | 4 +- kmymoney2/widgets/kmymoneydatetbl.h | 2 +- kmymoney2/widgets/kmymoneyedit.cpp | 16 ++--- kmymoney2/widgets/kmymoneyedit.h | 12 ++-- kmymoney2/widgets/kmymoneyforecastlistviewitem.cpp | 4 +- kmymoney2/widgets/kmymoneyforecastlistviewitem.h | 2 +- kmymoney2/widgets/kmymoneygpgconfig.cpp | 4 +- kmymoney2/widgets/kmymoneygpgconfig.h | 2 +- kmymoney2/widgets/kmymoneylineedit.h | 2 +- kmymoney2/widgets/kmymoneylistviewitem.cpp | 18 +++--- kmymoney2/widgets/kmymoneylistviewitem.h | 4 +- kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp | 4 +- kmymoney2/widgets/kmymoneyonlinequoteconfig.h | 2 +- kmymoney2/widgets/kmymoneypriceview.cpp | 4 +- kmymoney2/widgets/kmymoneypriceview.h | 2 +- kmymoney2/widgets/kmymoneyscheduledcalendar.cpp | 4 +- kmymoney2/widgets/kmymoneyscheduledcalendar.h | 2 +- kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp | 4 +- kmymoney2/widgets/kmymoneyscheduleddatetbl.h | 2 +- kmymoney2/widgets/kmymoneyselector.cpp | 30 ++++----- kmymoney2/widgets/kmymoneyselector.h | 8 +-- kmymoney2/widgets/kmymoneytitlelabel.cpp | 4 +- kmymoney2/widgets/kmymoneytitlelabel.h | 2 +- kmymoney2/widgets/kmymoneywizard.cpp | 8 +-- kmymoney2/widgets/kmymoneywizard.h | 28 ++++---- kmymoney2/widgets/kmymoneywizard_p.h | 2 +- kmymoney2/widgets/register.cpp | 74 +++++++++++----------- kmymoney2/widgets/register.h | 26 ++++---- kmymoney2/widgets/registeritem.cpp | 10 +-- kmymoney2/widgets/registeritem.h | 12 ++-- kmymoney2/widgets/registersearchline.cpp | 12 ++-- kmymoney2/widgets/registersearchline.h | 10 +-- kmymoney2/widgets/scheduledtransaction.cpp | 6 +- kmymoney2/widgets/scheduledtransaction.h | 2 +- kmymoney2/widgets/sortoptionlistitem.h | 6 +- kmymoney2/widgets/stdtransactiondownloaded.cpp | 8 +-- kmymoney2/widgets/stdtransactiondownloaded.h | 4 +- kmymoney2/widgets/stdtransactionmatched.cpp | 6 +- kmymoney2/widgets/stdtransactionmatched.h | 2 +- kmymoney2/widgets/transaction.cpp | 18 +++--- kmymoney2/widgets/transaction.h | 6 +- kmymoney2/widgets/transactioneditorcontainer.h | 2 +- kmymoney2/widgets/transactionform.cpp | 14 ++-- kmymoney2/widgets/transactionform.h | 6 +- 85 files changed, 417 insertions(+), 417 deletions(-) (limited to 'kmymoney2/widgets') diff --git a/kmymoney2/widgets/kaccounttemplateselector.cpp b/kmymoney2/widgets/kaccounttemplateselector.cpp index 2fd689b..6e96b78 100644 --- a/kmymoney2/widgets/kaccounttemplateselector.cpp +++ b/kmymoney2/widgets/kaccounttemplateselector.cpp @@ -41,14 +41,14 @@ class KTemplateListItem : public KListViewItem { public: - KTemplateListItem(TQListViewItem* tqparent, const TQString& text); + KTemplateListItem(TQListViewItem* parent, const TQString& text); void setAvailable(void); public: bool m_isAvailable; }; -KTemplateListItem::KTemplateListItem(TQListViewItem* tqparent, const TQString& text) : - KListViewItem(tqparent, text), +KTemplateListItem::KTemplateListItem(TQListViewItem* parent, const TQString& text) : + KListViewItem(parent, text), m_isAvailable(false) { } @@ -64,7 +64,7 @@ class KAccountTemplateSelector::Private Private(KAccountTemplateSelector* p) { m_parent = p; } #ifndef KMM_DESIGNER TQValueList selectedTemplates(void) const; - TQListViewItem* hierarchyItem(const TQString& tqparent, const TQString& name); + TQListViewItem* hierarchyItem(const TQString& parent, const TQString& name); void loadHierarchy(void); #endif @@ -82,15 +82,15 @@ class KAccountTemplateSelector::Private #ifndef KMM_DESIGNER -TQListViewItem* KAccountTemplateSelector::Private::hierarchyItem(const TQString& tqparent, const TQString& name) +TQListViewItem* KAccountTemplateSelector::Private::hierarchyItem(const TQString& parent, const TQString& name) { - if(!m_templateHierarchy.contains(tqparent) - || m_templateHierarchy[tqparent] == 0) { + if(!m_templateHierarchy.contains(parent) + || m_templateHierarchy[parent] == 0) { TQRegExp exp("(.*):(.*)"); - if(exp.search(tqparent) != -1) - m_templateHierarchy[tqparent] = hierarchyItem(exp.cap(1), exp.cap(2)); + if(exp.search(parent) != -1) + m_templateHierarchy[parent] = hierarchyItem(exp.cap(1), exp.cap(2)); } - return new KTemplateListItem(m_templateHierarchy[tqparent], name); + return new KTemplateListItem(m_templateHierarchy[parent], name); } void KAccountTemplateSelector::Private::loadHierarchy(void) @@ -159,8 +159,8 @@ TQValueList KAccountTemplateSelector::Private::selectedTemplate #endif -KAccountTemplateSelector::KAccountTemplateSelector(TQWidget* tqparent, const char* name) : - KAccountTemplateSelectorDecl(tqparent, name), +KAccountTemplateSelector::KAccountTemplateSelector(TQWidget* parent, const char* name) : + KAccountTemplateSelectorDecl(parent, name), d(new Private(this)) { m_accountList->header()->hide(); @@ -233,8 +233,8 @@ void KAccountTemplateSelector::slotLoadCountry(void) { #ifndef KMM_DESIGNER - KListViewItem* tqparent = new KListViewItem(m_groupList, d->it_m.key()); - tqparent->setSelectable(false); + KListViewItem* parent = new KListViewItem(m_groupList, d->it_m.key()); + parent->setSelectable(false); TQStringList::iterator it; for(it = d->dirlist.begin(); it != d->dirlist.end(); ++it) { TQStringList::iterator it_f; @@ -244,7 +244,7 @@ void KAccountTemplateSelector::slotLoadCountry(void) for(it_f = files.begin(); it_f != files.end(); ++it_f) { MyMoneyTemplate templ(TQString("%1/%2").tqarg(dir.canonicalPath()).tqarg(*it_f)); d->m_templates[TQString("%1").tqarg(d->id)] = templ; - new KListViewItem(tqparent, templ.title(), templ.shortDescription(), TQString("%1").tqarg(d->id)); + new KListViewItem(parent, templ.title(), templ.shortDescription(), TQString("%1").tqarg(d->id)); ++d->id; } } diff --git a/kmymoney2/widgets/kaccounttemplateselector.h b/kmymoney2/widgets/kaccounttemplateselector.h index 859d08f..c35dbb0 100644 --- a/kmymoney2/widgets/kaccounttemplateselector.h +++ b/kmymoney2/widgets/kaccounttemplateselector.h @@ -38,7 +38,7 @@ class KAccountTemplateSelector : public KAccountTemplateSelectorDecl Q_OBJECT TQ_OBJECT public: - KAccountTemplateSelector(TQWidget* tqparent = 0, const char* name = 0); + KAccountTemplateSelector(TQWidget* parent = 0, const char* name = 0); ~KAccountTemplateSelector(); TQValueList selectedTemplates(void) const; diff --git a/kmymoney2/widgets/kaccounttemplateselectordecl.cpp b/kmymoney2/widgets/kaccounttemplateselectordecl.cpp index 795ac29..75f3d16 100644 --- a/kmymoney2/widgets/kaccounttemplateselectordecl.cpp +++ b/kmymoney2/widgets/kaccounttemplateselectordecl.cpp @@ -26,11 +26,11 @@ inline TQString kmm_i18n(const char* msg) { return i18n(msg); } #include /* - * Constructs a KAccountTemplateSelectorDecl as a child of 'tqparent', with the + * Constructs a KAccountTemplateSelectorDecl as a child of 'parent', with the * name 'name' and widget flags set to 'f'. */ -KAccountTemplateSelectorDecl::KAccountTemplateSelectorDecl( TQWidget* tqparent, const char* name, WFlags fl ) - : TQWidget( tqparent, name, fl ) +KAccountTemplateSelectorDecl::KAccountTemplateSelectorDecl( TQWidget* parent, const char* name, WFlags fl ) + : TQWidget( parent, name, fl ) { if ( !name ) setName( "KAccountTemplateSelectorDecl" ); diff --git a/kmymoney2/widgets/kbudgetvalues.cpp b/kmymoney2/widgets/kbudgetvalues.cpp index afb3170..d635eba 100644 --- a/kmymoney2/widgets/kbudgetvalues.cpp +++ b/kmymoney2/widgets/kbudgetvalues.cpp @@ -43,8 +43,8 @@ #include "kbudgetvalues.h" #include -KBudgetValues::KBudgetValues(TQWidget* tqparent, const char* name) : - KBudgetValuesDecl(tqparent, name), +KBudgetValues::KBudgetValues(TQWidget* parent, const char* name) : + KBudgetValuesDecl(parent, name), m_currentTab(m_monthlyButton) { m_budgetDate = TQDate(2007,1,1); diff --git a/kmymoney2/widgets/kbudgetvalues.h b/kmymoney2/widgets/kbudgetvalues.h index e2e7a09..0f4a63a 100644 --- a/kmymoney2/widgets/kbudgetvalues.h +++ b/kmymoney2/widgets/kbudgetvalues.h @@ -42,7 +42,7 @@ class KBudgetValues : public KBudgetValuesDecl Q_OBJECT TQ_OBJECT public: - KBudgetValues(TQWidget* tqparent = 0, const char* name = 0); + KBudgetValues(TQWidget* parent = 0, const char* name = 0); ~KBudgetValues(); void setBudgetValues(const MyMoneyBudget& budget, const MyMoneyBudget::AccountGroup& budgetAccount); diff --git a/kmymoney2/widgets/kbudgetvaluesdecl.cpp b/kmymoney2/widgets/kbudgetvaluesdecl.cpp index ac2e9f7..385cbfa 100644 --- a/kmymoney2/widgets/kbudgetvaluesdecl.cpp +++ b/kmymoney2/widgets/kbudgetvaluesdecl.cpp @@ -28,11 +28,11 @@ inline TQString kmm_i18n(const char* msg) { return i18n(msg); } #include /* - * Constructs a KBudgetValuesDecl as a child of 'tqparent', with the + * Constructs a KBudgetValuesDecl as a child of 'parent', with the * name 'name' and widget flags set to 'f'. */ -KBudgetValuesDecl::KBudgetValuesDecl( TQWidget* tqparent, const char* name, WFlags fl ) - : TQWidget( tqparent, name, fl ) +KBudgetValuesDecl::KBudgetValuesDecl( TQWidget* parent, const char* name, WFlags fl ) + : TQWidget( parent, name, fl ) { if ( !name ) setName( "KBudgetValuesDecl" ); diff --git a/kmymoney2/widgets/kguiutils.h b/kmymoney2/widgets/kguiutils.h index 94cd756..81c26aa 100644 --- a/kmymoney2/widgets/kguiutils.h +++ b/kmymoney2/widgets/kguiutils.h @@ -43,8 +43,8 @@ class kMandatoryFieldGroup : public TQObject TQ_OBJECT public: - kMandatoryFieldGroup(TQObject *tqparent) : - TQObject(tqparent), okButton(0), m_enabled(true) {} + kMandatoryFieldGroup(TQObject *parent) : + TQObject(parent), okButton(0), m_enabled(true) {} /** * This method adds a widget to the list of mandatory fields for the current dialog diff --git a/kmymoney2/widgets/klistviewsearchline.cpp b/kmymoney2/widgets/klistviewsearchline.cpp index ec411d4..8c01629 100644 --- a/kmymoney2/widgets/klistviewsearchline.cpp +++ b/kmymoney2/widgets/klistviewsearchline.cpp @@ -56,8 +56,8 @@ public: // public methods //////////////////////////////////////////////////////////////////////////////// -KListViewSearchLine::KListViewSearchLine(TQWidget *tqparent, KListView *listView, const char *name) : - KLineEdit(tqparent, name) +KListViewSearchLine::KListViewSearchLine(TQWidget *parent, KListView *listView, const char *name) : + KLineEdit(parent, name) { d = new KListViewSearchLinePrivate; @@ -79,8 +79,8 @@ KListViewSearchLine::KListViewSearchLine(TQWidget *tqparent, KListView *listView setEnabled(false); } -KListViewSearchLine::KListViewSearchLine(TQWidget *tqparent, const char *name) : - KLineEdit(tqparent, name) +KListViewSearchLine::KListViewSearchLine(TQWidget *parent, const char *name) : + KLineEdit(parent, name) { d = new KListViewSearchLinePrivate; @@ -422,9 +422,9 @@ public: }; KListViewSearchLineWidget::KListViewSearchLineWidget(KListView *listView, - TQWidget *tqparent, + TQWidget *parent, const char *name) : - TQHBox(tqparent, name) + TQHBox(parent, name) { d = new KListViewSearchLineWidgetPrivate; d->listView = listView; @@ -476,7 +476,7 @@ KListViewSearchLine *KListViewSearchLineWidget::searchLine() const void KListViewSearchLineWidget::positionInToolBar() { - KToolBar *toolBar = dynamic_cast(tqparent()); + KToolBar *toolBar = dynamic_cast(parent()); if(toolBar) { diff --git a/kmymoney2/widgets/klistviewsearchline.h b/kmymoney2/widgets/klistviewsearchline.h index b41d3ad..1ecb94b 100644 --- a/kmymoney2/widgets/klistviewsearchline.h +++ b/kmymoney2/widgets/klistviewsearchline.h @@ -52,13 +52,13 @@ public: * If \a listView is null then the widget will be disabled until a listview * is set with setListView(). */ - KListViewSearchLine(TQWidget *tqparent = 0, KListView *listView = 0, const char *name = 0); + KListViewSearchLine(TQWidget *parent = 0, KListView *listView = 0, const char *name = 0); /** * Constructs a KListViewSearchLine without any KListView to filter. The * KListView object has to be set later with setListView(). */ - KListViewSearchLine(TQWidget *tqparent, const char *name); + KListViewSearchLine(TQWidget *parent, const char *name); /** * Destroys the KListViewSearchLine. @@ -111,7 +111,7 @@ public slots: /** * When a search is active on a list that's organized into a tree view if - * a tqparent or ancesestor of an item is does not match the search then it + * a parent or ancesestor of an item is does not match the search then it * will be hidden and as such so too will any tqchildren that match. * * If this is set to true (the default) then the parents of matching items @@ -183,13 +183,13 @@ protected slots: private: /** - * This is used in case tqparent items of matching items shouldn't be + * This is used in case parent items of matching items shouldn't be * visible. It hides all items that don't match the search string. */ void checkItemParentsNotVisible(); /** - * This is used in case tqparent items of matching items should be visible. + * This is used in case parent items of matching items should be visible. * It makes a recursive call to all tqchildren. It returns true if at least * one item in the subtree with the given root item is visible. */ @@ -218,10 +218,10 @@ class KMYMONEY_EXPORT KListViewSearchLineWidget : public TQHBox public: /** - * Creates a KListViewSearchLineWidget for \a listView with \a tqparent as the - * tqparent with and \a name. + * Creates a KListViewSearchLineWidget for \a listView with \a parent as the + * parent with and \a name. */ - KListViewSearchLineWidget(KListView *listView = 0, TQWidget *tqparent = 0, + KListViewSearchLineWidget(KListView *listView = 0, TQWidget *parent = 0, const char *name = 0); /** diff --git a/kmymoney2/widgets/kmymoneyaccountcombo.cpp b/kmymoney2/widgets/kmymoneyaccountcombo.cpp index 6865c29..e37311c 100644 --- a/kmymoney2/widgets/kmymoneyaccountcombo.cpp +++ b/kmymoney2/widgets/kmymoneyaccountcombo.cpp @@ -38,8 +38,8 @@ #include #include "kmymoneyaccountcompletion.h" -KMyMoneyAccountCombo::KMyMoneyAccountCombo( TQWidget* tqparent, const char* name ) : - KComboBox( tqparent, name ), +KMyMoneyAccountCombo::KMyMoneyAccountCombo( TQWidget* parent, const char* name ) : + KComboBox( parent, name ), m_completion(0), m_mlbDown(false) { diff --git a/kmymoney2/widgets/kmymoneyaccountcombo.h b/kmymoney2/widgets/kmymoneyaccountcombo.h index 623260d..bdf6e9a 100644 --- a/kmymoney2/widgets/kmymoneyaccountcombo.h +++ b/kmymoney2/widgets/kmymoneyaccountcombo.h @@ -46,7 +46,7 @@ class KMyMoneyAccountCombo : public KComboBox Q_OBJECT TQ_OBJECT public: - KMyMoneyAccountCombo( TQWidget* tqparent = 0, const char* name = 0 ); + KMyMoneyAccountCombo( TQWidget* parent = 0, const char* name = 0 ); ~KMyMoneyAccountCombo(); /** diff --git a/kmymoney2/widgets/kmymoneyaccountcompletion.cpp b/kmymoney2/widgets/kmymoneyaccountcompletion.cpp index 26dcedf..6eab9c8 100644 --- a/kmymoney2/widgets/kmymoneyaccountcompletion.cpp +++ b/kmymoney2/widgets/kmymoneyaccountcompletion.cpp @@ -37,8 +37,8 @@ #include "kmymoneyaccountcompletion.h" #include -kMyMoneyAccountCompletion::kMyMoneyAccountCompletion(TQWidget *tqparent, const char *name ) : - kMyMoneyCompletion(tqparent, name) +kMyMoneyAccountCompletion::kMyMoneyAccountCompletion(TQWidget *parent, const char *name ) : + kMyMoneyCompletion(parent, name) { delete m_selector; m_selector = new kMyMoneyAccountSelector(this, 0, 0, false); diff --git a/kmymoney2/widgets/kmymoneyaccountcompletion.h b/kmymoney2/widgets/kmymoneyaccountcompletion.h index 4d309fd..48c0b2b 100644 --- a/kmymoney2/widgets/kmymoneyaccountcompletion.h +++ b/kmymoney2/widgets/kmymoneyaccountcompletion.h @@ -47,7 +47,7 @@ class kMyMoneyAccountCompletion : public kMyMoneyCompletion TQ_OBJECT public: - kMyMoneyAccountCompletion(TQWidget *tqparent=0, const char *name=0); + kMyMoneyAccountCompletion(TQWidget *parent=0, const char *name=0); virtual ~kMyMoneyAccountCompletion(); TQStringList accountList(const TQValueList& list = TQValueList()) const { return selector()->accountList(list); } diff --git a/kmymoney2/widgets/kmymoneyaccountselector.cpp b/kmymoney2/widgets/kmymoneyaccountselector.cpp index 234fa16..e33a2e5 100644 --- a/kmymoney2/widgets/kmymoneyaccountselector.cpp +++ b/kmymoney2/widgets/kmymoneyaccountselector.cpp @@ -49,8 +49,8 @@ #include "../kmymoneyutils.h" #include "../kmymoneyglobalsettings.h" -kMyMoneyAccountSelector::kMyMoneyAccountSelector(TQWidget *tqparent, const char *name, TQWidget::WFlags flags, const bool createButtons) : - KMyMoneySelector(tqparent, name, flags), +kMyMoneyAccountSelector::kMyMoneyAccountSelector(TQWidget *parent, const char *name, TQWidget::WFlags flags, const bool createButtons) : + KMyMoneySelector(parent, name, flags), m_allAccountsButton(0), m_noAccountButton(0), m_incomeCategoriesButton(0), @@ -349,23 +349,23 @@ int AccountSet::load(kMyMoneyAccountSelector* selector) key = TQString("A%1").tqarg(i18n("Favorites")); m_favorites = selector->newItem(i18n("Favorites"), key); - for(int tqmask = 0x01; tqmask != KMyMoneyUtils::last; tqmask <<= 1) { + for(int mask = 0x01; mask != KMyMoneyUtils::last; mask <<= 1) { TQListViewItem* item = 0; - if((typeMask & tqmask & KMyMoneyUtils::asset) != 0) { + if((typeMask & mask & KMyMoneyUtils::asset) != 0) { ++m_count; key = TQString("B%1").tqarg(i18n("Asset")); item = selector->newItem(i18n("Asset accounts"), key); list = m_file->asset().accountList(); } - if((typeMask & tqmask & KMyMoneyUtils::liability) != 0) { + if((typeMask & mask & KMyMoneyUtils::liability) != 0) { ++m_count; key = TQString("C%1").tqarg(i18n("Liability")); item = selector->newItem(i18n("Liability accounts"), key); list = m_file->liability().accountList(); } - if((typeMask & tqmask & KMyMoneyUtils::income) != 0) { + if((typeMask & mask & KMyMoneyUtils::income) != 0) { ++m_count; key = TQString("D%1").tqarg(i18n("Income")); item = selector->newItem(i18n("Income categories"), key); @@ -375,7 +375,7 @@ int AccountSet::load(kMyMoneyAccountSelector* selector) } } - if((typeMask & tqmask & KMyMoneyUtils::expense) != 0) { + if((typeMask & mask & KMyMoneyUtils::expense) != 0) { ++m_count; key = TQString("E%1").tqarg(i18n("Expense")); item = selector->newItem(i18n("Expense categories"), key); @@ -385,7 +385,7 @@ int AccountSet::load(kMyMoneyAccountSelector* selector) } } - if((typeMask & tqmask & KMyMoneyUtils::equity) != 0) { + if((typeMask & mask & KMyMoneyUtils::equity) != 0) { ++m_count; key = TQString("F%1").tqarg(i18n("Equity")); item = selector->newItem(i18n("Equity accounts"), key); @@ -486,7 +486,7 @@ int AccountSet::load(kMyMoneyAccountSelector* selector, const TQString& baseName return count; } -int AccountSet::loadSubAccounts(kMyMoneyAccountSelector* selector, TQListViewItem* tqparent, const TQString& key, const TQStringList& list) +int AccountSet::loadSubAccounts(kMyMoneyAccountSelector* selector, TQListViewItem* parent, const TQString& key, const TQStringList& list) { TQStringList::ConstIterator it_l; int count = 0; @@ -503,7 +503,7 @@ int AccountSet::loadSubAccounts(kMyMoneyAccountSelector* selector, TQListViewIte tmpKey = key + MyMoneyFile::AccountSeperator + acc.name(); ++count; ++m_count; - TQListViewItem* item = selector->newItem(tqparent, acc.name(), tmpKey, acc.id()); + TQListViewItem* item = selector->newItem(parent, acc.name(), tmpKey, acc.id()); if(acc.value("PreferredAccount") == "Yes" && m_typeList.contains(acc.accountType())) { selector->newItem(m_favorites, acc.name(), tmpKey, acc.id()); diff --git a/kmymoney2/widgets/kmymoneyaccountselector.h b/kmymoney2/widgets/kmymoneyaccountselector.h index dc03ceb..3c15023 100644 --- a/kmymoney2/widgets/kmymoneyaccountselector.h +++ b/kmymoney2/widgets/kmymoneyaccountselector.h @@ -60,7 +60,7 @@ class kMyMoneyAccountSelector : public KMyMoneySelector public: friend class AccountSet; - kMyMoneyAccountSelector(TQWidget *tqparent=0, const char *name=0, TQWidget::WFlags flags = 0, const bool createButtons = true); + kMyMoneyAccountSelector(TQWidget *parent=0, const char *name=0, TQWidget::WFlags flags = 0, const bool createButtons = true); virtual ~kMyMoneyAccountSelector(); /** @@ -120,13 +120,13 @@ public slots: protected: /** * This method loads the list of subaccounts as found in the - * @p list and attaches them to the tqparent widget passed as @p tqparent. + * @p list and attaches them to the parent widget passed as @p parent. * - * @param tqparent pointer to tqparent widget + * @param parent pointer to parent widget * @param list TQStringList containing the ids of all subaccounts to load * @return This method returns the number of accounts loaded into the list */ - int loadSubAccounts(TQListViewItem* tqparent, const TQStringList& list); + int loadSubAccounts(TQListViewItem* parent, const TQStringList& list); /** * This is a helper method for selectAllIncomeCategories() @@ -175,7 +175,7 @@ public: bool isHidingClosedAccounts (void) { return m_hideClosedAccounts; } protected: - int loadSubAccounts(kMyMoneyAccountSelector* selector, TQListViewItem* tqparent, const TQString& key, const TQStringList& list); + int loadSubAccounts(kMyMoneyAccountSelector* selector, TQListViewItem* parent, const TQString& key, const TQStringList& list); bool includeAccount(const MyMoneyAccount& acc); private: diff --git a/kmymoney2/widgets/kmymoneyaccounttree.cpp b/kmymoney2/widgets/kmymoneyaccounttree.cpp index f74a8f8..be2be0c 100644 --- a/kmymoney2/widgets/kmymoneyaccounttree.cpp +++ b/kmymoney2/widgets/kmymoneyaccounttree.cpp @@ -46,8 +46,8 @@ #include -KMyMoneyAccountTree::KMyMoneyAccountTree(TQWidget* tqparent, const char *name) : - KMyMoneyAccountTreeBase(tqparent,name) +KMyMoneyAccountTree::KMyMoneyAccountTree(TQWidget* parent, const char *name) : + KMyMoneyAccountTreeBase(parent,name) { showType(); @@ -62,22 +62,22 @@ KMyMoneyAccountTree::KMyMoneyAccountTree(TQWidget* tqparent, const char *name) : showValue(); } -KMyMoneyAccountTreeItem::KMyMoneyAccountTreeItem(KListView *tqparent, const MyMoneyAccount& account, const MyMoneySecurity& security , const TQString& name) : - KMyMoneyAccountTreeBaseItem(tqparent,account,security,name), +KMyMoneyAccountTreeItem::KMyMoneyAccountTreeItem(KListView *parent, const MyMoneyAccount& account, const MyMoneySecurity& security , const TQString& name) : + KMyMoneyAccountTreeBaseItem(parent,account,security,name), m_reconcileFlag(false) { updateAccount(); } -KMyMoneyAccountTreeItem::KMyMoneyAccountTreeItem(KMyMoneyAccountTreeBaseItem *tqparent, const MyMoneyAccount& account, const TQValueList& price, const MyMoneySecurity& security) : - KMyMoneyAccountTreeBaseItem(tqparent,account,price,security), +KMyMoneyAccountTreeItem::KMyMoneyAccountTreeItem(KMyMoneyAccountTreeBaseItem *parent, const MyMoneyAccount& account, const TQValueList& price, const MyMoneySecurity& security) : + KMyMoneyAccountTreeBaseItem(parent,account,price,security), m_reconcileFlag(false) { updateAccount(); } -KMyMoneyAccountTreeItem::KMyMoneyAccountTreeItem(KListView *tqparent, const MyMoneyInstitution& institution) : - KMyMoneyAccountTreeBaseItem(tqparent,institution), +KMyMoneyAccountTreeItem::KMyMoneyAccountTreeItem(KListView *parent, const MyMoneyInstitution& institution) : + KMyMoneyAccountTreeBaseItem(parent,institution), m_reconcileFlag(false) { } diff --git a/kmymoney2/widgets/kmymoneyaccounttree.h b/kmymoney2/widgets/kmymoneyaccounttree.h index 0b2d1ac..877ffcc 100644 --- a/kmymoney2/widgets/kmymoneyaccounttree.h +++ b/kmymoney2/widgets/kmymoneyaccounttree.h @@ -28,7 +28,7 @@ class KMyMoneyAccountTree : public KMyMoneyAccountTreeBase Q_OBJECT TQ_OBJECT public: - KMyMoneyAccountTree(TQWidget* tqparent = 0, const char *name = 0); + KMyMoneyAccountTree(TQWidget* parent = 0, const char *name = 0); int taxReportColumn(void) const { return m_taxReportColumn; } int vatCategoryColumn(void) const { return m_vatCategoryColumn; } private: @@ -43,18 +43,18 @@ public: * Constructor to be used to construct an institution 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 institution const reference to MyMoneyInstitution for which * the KListView entry is constructed */ - KMyMoneyAccountTreeItem(KListView *tqparent, const MyMoneyInstitution& institution); + KMyMoneyAccountTreeItem(KListView *parent, const MyMoneyInstitution& institution); /** * Constructor to be used to construct a standard account entry object (e.g. Asset, * Liability, etc.). * - * @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 account const reference to MyMoneyAccount for which * the KListView entry is constructed @@ -63,13 +63,13 @@ public: * @param name name of the account to be used instead of the one stored with @p account * If empty, the one stored with @p account will be used. Default: empty */ - KMyMoneyAccountTreeItem(KListView *tqparent, const MyMoneyAccount& account, const MyMoneySecurity& security = MyMoneySecurity(), const TQString& name = TQString()); + KMyMoneyAccountTreeItem(KListView *parent, const MyMoneyAccount& account, const MyMoneySecurity& security = MyMoneySecurity(), const TQString& name = TQString()); /** * Constructor to be used to construct an account entry * object. * - * @param tqparent pointer to the tqparent KAccountListView object this entry should be + * @param parent pointer to the parent KAccountListView object this entry should be * added to. * @param account const reference to MyMoneyAccount for which * the KListView entry is constructed @@ -78,7 +78,7 @@ public: * @param security const reference to the security used to show the value. Usually * one should pass MyMoneyFile::baseCurrency() here. */ - KMyMoneyAccountTreeItem(KMyMoneyAccountTreeBaseItem *tqparent, const MyMoneyAccount& account, const TQValueList& price = TQValueList(), const MyMoneySecurity& security = MyMoneySecurity()); + KMyMoneyAccountTreeItem(KMyMoneyAccountTreeBaseItem *parent, const MyMoneyAccount& account, const TQValueList& price = TQValueList(), const MyMoneySecurity& security = MyMoneySecurity()); void setReconciliation(bool); diff --git a/kmymoney2/widgets/kmymoneyaccounttreebase.cpp b/kmymoney2/widgets/kmymoneyaccounttreebase.cpp index 3491afc..48ecd28 100644 --- a/kmymoney2/widgets/kmymoneyaccounttreebase.cpp +++ b/kmymoney2/widgets/kmymoneyaccounttreebase.cpp @@ -46,8 +46,8 @@ #include -KMyMoneyAccountTreeBase::KMyMoneyAccountTreeBase(TQWidget* tqparent, const char* name) : - KListView(tqparent, name), +KMyMoneyAccountTreeBase::KMyMoneyAccountTreeBase(TQWidget* parent, const char* name) : + KListView(parent, name), m_accountConnections(false), m_institutionConnections(false), m_queuedSort(0) @@ -170,7 +170,7 @@ const KMyMoneyAccountTreeBaseItem* KMyMoneyAccountTreeBase::findItem(const TQStr TQListViewItem* next = p->firstChild(); if(!next) { while((next = p->nextSibling()) == 0) { - p = p->tqparent(); + p = p->parent(); if(!p) break; } @@ -186,7 +186,7 @@ bool KMyMoneyAccountTreeBase::dropAccountOnAccount(const MyMoneyAccount& accFrom bool rc = false; // it does not make sense to reparent an account to oneself - // or to reparent it to it's current tqparent + // or to reparent it to it's current parent if(accTo.id() != accFrom.id() && accFrom.parentAccountId() != accTo.id()) { // Moving within a group is generally ok @@ -287,7 +287,7 @@ void KMyMoneyAccountTreeBase::startDrag(void) return; } -void KMyMoneyAccountTreeBase::slotObjectDropped(TQDropEvent* event, TQListViewItem* /* tqparent */, TQListViewItem* /* after */) +void KMyMoneyAccountTreeBase::slotObjectDropped(TQDropEvent* event, TQListViewItem* /* parent */, TQListViewItem* /* after */) { m_autoopenTimer.stop(); slotStopAutoScroll(); @@ -533,8 +533,8 @@ const MyMoneyObject& KMyMoneyAccountTreeBaseItem::itemObject(void) const return m_account; } -KMyMoneyAccountTreeBaseItem::KMyMoneyAccountTreeBaseItem(KListView *tqparent, const MyMoneyInstitution& institution) : - KListViewItem(tqparent), +KMyMoneyAccountTreeBaseItem::KMyMoneyAccountTreeBaseItem(KListView *parent, const MyMoneyInstitution& institution) : + KListViewItem(parent), m_totalValue(MyMoneyMoney(0)), m_negative(false), m_institution(institution), @@ -543,8 +543,8 @@ KMyMoneyAccountTreeBaseItem::KMyMoneyAccountTreeBaseItem(KListView *tqparent, co setName(); } -KMyMoneyAccountTreeBaseItem::KMyMoneyAccountTreeBaseItem(KListView *tqparent, const MyMoneyAccount& account, const MyMoneySecurity& security, const TQString& name) : - KListViewItem(tqparent), +KMyMoneyAccountTreeBaseItem::KMyMoneyAccountTreeBaseItem(KListView *parent, const MyMoneyAccount& account, const MyMoneySecurity& security, const TQString& name) : + KListViewItem(parent), m_security(security), m_totalValue(MyMoneyMoney(0)), m_account(account), @@ -560,8 +560,8 @@ KMyMoneyAccountTreeBaseItem::KMyMoneyAccountTreeBaseItem(KListView *tqparent, co setName(); } -KMyMoneyAccountTreeBaseItem::KMyMoneyAccountTreeBaseItem(KMyMoneyAccountTreeBaseItem *tqparent, const MyMoneyAccount& account, const TQValueList& price, const MyMoneySecurity& security) : - KListViewItem(tqparent), +KMyMoneyAccountTreeBaseItem::KMyMoneyAccountTreeBaseItem(KMyMoneyAccountTreeBaseItem *parent, const MyMoneyAccount& account, const TQValueList& price, const MyMoneySecurity& security) : + KListViewItem(parent), m_price(price), m_security(security), m_totalValue(MyMoneyMoney(0)), @@ -585,9 +585,9 @@ const TQString& KMyMoneyAccountTreeBaseItem::id(void) const bool KMyMoneyAccountTreeBaseItem::isChildOf(const TQListViewItem* const item) const { - TQListViewItem *p = tqparent(); + TQListViewItem *p = parent(); while(p && p != item) { - p = p->tqparent(); + p = p->parent(); } return (p != 0); } @@ -636,7 +636,7 @@ void KMyMoneyAccountTreeBaseItem::fillColumns() if (lv->valueColumn()<0) return; // show the top accounts always in total value - if((isOpen() || m_account.accountList().count() == 0) && tqparent()) { + if((isOpen() || m_account.accountList().count() == 0) && parent()) { // only show the balance, if its a different security/currency if(m_security.id() != listView()->baseCurrency().id()) { @@ -646,7 +646,7 @@ void KMyMoneyAccountTreeBaseItem::fillColumns() } else { setText(lv->balanceColumn(), " "); - if(tqparent()) + if(parent()) setText(lv->valueColumn(), m_totalValue.formatMoney(listView()->baseCurrency()) + " "); else setText(lv->valueColumn(), m_totalValue.formatMoney(listView()->baseCurrency())); @@ -691,17 +691,17 @@ void KMyMoneyAccountTreeBaseItem::adjustTotalValue(const MyMoneyMoney& diff) KMyMoneyAccountTreeBase* lv = dynamic_cast(listView()); if(!lv) return; - if(!firstChild() || !tqparent() || (!isOpen() && firstChild())) { + if(!firstChild() || !parent() || (!isOpen() && firstChild())) { if(firstChild()) setText(lv->balanceColumn(), " "); - if(tqparent()) + if(parent()) setText(lv->valueColumn(), m_totalValue.formatMoney(listView()->baseCurrency()) + " "); else setText(lv->valueColumn(), m_totalValue.formatMoney(listView()->baseCurrency())); } // now make sure, the upstream accounts also get notified about the value change - KMyMoneyAccountTreeBaseItem* p = dynamic_cast(tqparent()); + KMyMoneyAccountTreeBaseItem* p = dynamic_cast(parent()); if(p != 0) { p->adjustTotalValue(diff); } @@ -747,7 +747,7 @@ void KMyMoneyAccountTreeBaseItem::paintCell(TQPainter *p, const TQColorGroup & c #ifndef KMM_DESIGNER // display base accounts in bold TQFont font = KMyMoneyGlobalSettings::listCellFont(); - if(!tqparent()) + if(!parent()) font.setBold(true); // strike out closed accounts diff --git a/kmymoney2/widgets/kmymoneyaccounttreebase.h b/kmymoney2/widgets/kmymoneyaccounttreebase.h index 3bd9e91..9843b9d 100644 --- a/kmymoney2/widgets/kmymoneyaccounttreebase.h +++ b/kmymoney2/widgets/kmymoneyaccounttreebase.h @@ -47,7 +47,7 @@ class KMyMoneyAccountTreeBase : public KListView Q_OBJECT TQ_OBJECT public: - KMyMoneyAccountTreeBase(TQWidget* tqparent = 0, const char *name = 0); + KMyMoneyAccountTreeBase(TQWidget* parent = 0, const char *name = 0); virtual ~KMyMoneyAccountTreeBase(); /** @@ -98,9 +98,9 @@ protected: * account @p accTo. * * @param accFrom source account - * @param accTo new tqparent account for @p accFrom + * @param accTo new parent account for @p accFrom * @retval true drop is ok - * @retval false drop is not ok (@p accTo cannot be tqparent of @p accFrom) + * @retval false drop is not ok (@p accTo cannot be parent of @p accFrom) */ bool dropAccountOnAccount(const MyMoneyAccount& accFrom, const MyMoneyAccount& accTo) const; // virtual void contentsDropEvent(TQDropEvent*); @@ -137,7 +137,7 @@ protected: void queueSort(void); protected slots: - void slotObjectDropped(TQDropEvent* event, TQListViewItem* tqparent, TQListViewItem* after); + void slotObjectDropped(TQDropEvent* event, TQListViewItem* parent, TQListViewItem* after); /** * Select the object pointed to by @p i. This slot emits selectObject signals @@ -238,12 +238,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); /** * This signal is emitted, when the user selected to reparent the @@ -267,18 +267,18 @@ public: * Constructor to be used to construct an institution 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 institution const reference to MyMoneyInstitution for which * the KListView entry is constructed */ - KMyMoneyAccountTreeBaseItem(KListView *tqparent, const MyMoneyInstitution& institution); + KMyMoneyAccountTreeBaseItem(KListView *parent, const MyMoneyInstitution& institution); /** * Constructor to be used to construct a standard account entry object (e.g. Asset, * Liability, etc.). * - * @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 account const reference to MyMoneyAccount for which * the KListView entry is constructed @@ -287,13 +287,13 @@ public: * @param name name of the account to be used instead of the one stored with @p account * If empty, the one stored with @p account will be used. Default: empty */ - KMyMoneyAccountTreeBaseItem(KListView *tqparent, const MyMoneyAccount& account, const MyMoneySecurity& security = MyMoneySecurity(), const TQString& name = TQString()); + KMyMoneyAccountTreeBaseItem(KListView *parent, const MyMoneyAccount& account, const MyMoneySecurity& security = MyMoneySecurity(), const TQString& name = TQString()); /** * Constructor to be used to construct an account entry * object. * - * @param tqparent pointer to the tqparent KAccountListView object this entry should be + * @param parent pointer to the parent KAccountListView object this entry should be * added to. * @param account const reference to MyMoneyAccount for which * the KListView entry is constructed @@ -302,7 +302,7 @@ public: * @param security const reference to the security used to show the value. Usually * one should pass MyMoneyFile::baseCurrency() here. */ - KMyMoneyAccountTreeBaseItem(KMyMoneyAccountTreeBaseItem *tqparent, const MyMoneyAccount& account, const TQValueList& price = TQValueList(), const MyMoneySecurity& security = MyMoneySecurity()); + KMyMoneyAccountTreeBaseItem(KMyMoneyAccountTreeBaseItem *parent, const MyMoneyAccount& account, const TQValueList& price = TQValueList(), const MyMoneySecurity& security = MyMoneySecurity()); ~KMyMoneyAccountTreeBaseItem(); @@ -411,7 +411,7 @@ public: * by @p item. * * @param item pointer to other KMyMoneyAccountTreeItem that - * should be checked for tqparent/grand-parenthood of this + * should be checked for parent/grand-parenthood of this * object * @retval true @p this object is a decendant of @p item * @retval false @p this object is no decendant of @p item @@ -447,7 +447,7 @@ protected: * Computes and returns the current value of the account held by this item. * This is the same as balance() but in the currency of the view. * if value() changed since the item has been displayed, updateAccount() - * will notify the tqparent. + * will notify the parent. * @return value of the account held by this item */ MyMoneyMoney value() const; diff --git a/kmymoney2/widgets/kmymoneyaccounttreebudget.cpp b/kmymoney2/widgets/kmymoneyaccounttreebudget.cpp index 9a6a7db..2038116 100644 --- a/kmymoney2/widgets/kmymoneyaccounttreebudget.cpp +++ b/kmymoney2/widgets/kmymoneyaccounttreebudget.cpp @@ -19,8 +19,8 @@ // Project Includes #include -KMyMoneyAccountTreeBudget::KMyMoneyAccountTreeBudget(TQWidget* tqparent, const char* name) : - KMyMoneyAccountTreeBase::KMyMoneyAccountTreeBase(tqparent, name) +KMyMoneyAccountTreeBudget::KMyMoneyAccountTreeBudget(TQWidget* parent, const char* name) : + KMyMoneyAccountTreeBase::KMyMoneyAccountTreeBase(parent, name) { showType(); showValue(); @@ -37,15 +37,15 @@ void KMyMoneyAccountTreeBudget::slotSelectObject(const TQListViewItem* i) } } -KMyMoneyAccountTreeBudgetItem::KMyMoneyAccountTreeBudgetItem(KListView *tqparent, const MyMoneyAccount& account, const MyMoneyBudget &budget, const MyMoneySecurity& security, const TQString& name) : - KMyMoneyAccountTreeBaseItem(tqparent, account, security, name), +KMyMoneyAccountTreeBudgetItem::KMyMoneyAccountTreeBudgetItem(KListView *parent, const MyMoneyAccount& account, const MyMoneyBudget &budget, const MyMoneySecurity& security, const TQString& name) : + KMyMoneyAccountTreeBaseItem(parent, account, security, name), m_budget(budget) { updateAccount(true); } -KMyMoneyAccountTreeBudgetItem::KMyMoneyAccountTreeBudgetItem(KMyMoneyAccountTreeBudgetItem *tqparent, const MyMoneyAccount& account, const MyMoneyBudget& budget, const TQValueList& price, const MyMoneySecurity& security) : - KMyMoneyAccountTreeBaseItem(tqparent, account, price, security), +KMyMoneyAccountTreeBudgetItem::KMyMoneyAccountTreeBudgetItem(KMyMoneyAccountTreeBudgetItem *parent, const MyMoneyAccount& account, const MyMoneyBudget& budget, const TQValueList& price, const MyMoneySecurity& security) : + KMyMoneyAccountTreeBaseItem(parent, account, price, security), m_budget(budget) { updateAccount(true); diff --git a/kmymoney2/widgets/kmymoneyaccounttreebudget.h b/kmymoney2/widgets/kmymoneyaccounttreebudget.h index 470a8f8..fc4a813 100644 --- a/kmymoney2/widgets/kmymoneyaccounttreebudget.h +++ b/kmymoney2/widgets/kmymoneyaccounttreebudget.h @@ -41,7 +41,7 @@ class KMyMoneyAccountTreeBudget : public KMyMoneyAccountTreeBase Q_OBJECT TQ_OBJECT public: - KMyMoneyAccountTreeBudget(TQWidget* tqparent = 0, const char *name = 0); + KMyMoneyAccountTreeBudget(TQWidget* parent = 0, const char *name = 0); virtual ~KMyMoneyAccountTreeBudget() {} public slots: @@ -57,7 +57,7 @@ public: * Constructor to be used to construct an account * entry object for a budget. * - * @param tqparent pointer to the tqparent KAccountListView object this entry should be + * @param parent pointer to the parent KAccountListView object this entry should be * added to. * @param account const reference to MyMoneyAccount for which * the KListView entry is constructed @@ -68,13 +68,13 @@ public: * @param security const reference to the security used to show the value. Usually * one should pass MyMoneyFile::baseCurrency() here. */ - KMyMoneyAccountTreeBudgetItem(KMyMoneyAccountTreeBudgetItem *tqparent, const MyMoneyAccount& account, const MyMoneyBudget& budget, const TQValueList& price = TQValueList(), const MyMoneySecurity& security = MyMoneySecurity()); + KMyMoneyAccountTreeBudgetItem(KMyMoneyAccountTreeBudgetItem *parent, const MyMoneyAccount& account, const MyMoneyBudget& budget, const TQValueList& price = TQValueList(), const MyMoneySecurity& security = MyMoneySecurity()); /** * Constructor to be used to construct an account * entry object for a budget. * - * @param tqparent pointer to the tqparent KAccountListView object this entry should be + * @param parent pointer to the parent KAccountListView object this entry should be * added to. * @param account const reference to MyMoneyAccount for which * the KListView entry is constructed @@ -85,7 +85,7 @@ public: * @param name name of the account to be used instead of the one stored with @p account * If empty, the one stored with @p account will be used. Default: empty */ - KMyMoneyAccountTreeBudgetItem(KListView *tqparent, const MyMoneyAccount& account, const MyMoneyBudget &budget, const MyMoneySecurity& security = MyMoneySecurity(), const TQString& name = TQString()); + KMyMoneyAccountTreeBudgetItem(KListView *parent, const MyMoneyAccount& account, const MyMoneyBudget &budget, const MyMoneySecurity& security = MyMoneySecurity(), const TQString& name = TQString()); ~KMyMoneyAccountTreeBudgetItem(); diff --git a/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp b/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp index df1f735..950200e 100644 --- a/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp +++ b/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp @@ -30,8 +30,8 @@ using namespace reports; -KMyMoneyAccountTreeForecast::KMyMoneyAccountTreeForecast(TQWidget* tqparent, const char* name) : - KMyMoneyAccountTreeBase::KMyMoneyAccountTreeBase(tqparent, name) +KMyMoneyAccountTreeForecast::KMyMoneyAccountTreeForecast(TQWidget* parent, const char* name) : + KMyMoneyAccountTreeBase::KMyMoneyAccountTreeBase(parent, name) { setResizeMode(TQListView::NoColumn); } @@ -156,16 +156,16 @@ void KMyMoneyAccountTreeForecast::slotSelectObject(const TQListViewItem* i) } } -KMyMoneyAccountTreeForecastItem::KMyMoneyAccountTreeForecastItem(KListView *tqparent, const MyMoneyAccount& account, const MyMoneyForecast &forecast, const MyMoneySecurity& security, const TQString& name) : - KMyMoneyAccountTreeBaseItem(tqparent, account, security, name), +KMyMoneyAccountTreeForecastItem::KMyMoneyAccountTreeForecastItem(KListView *parent, const MyMoneyAccount& account, const MyMoneyForecast &forecast, const MyMoneySecurity& security, const TQString& name) : + KMyMoneyAccountTreeBaseItem(parent, account, security, name), m_forecast(forecast) { updateAccount(true); } -KMyMoneyAccountTreeForecastItem::KMyMoneyAccountTreeForecastItem(KMyMoneyAccountTreeForecastItem *tqparent, const MyMoneyAccount& account, const MyMoneyForecast& forecast, const TQValueList& price, const MyMoneySecurity& security, const EForecastViewType forecastType) : - KMyMoneyAccountTreeBaseItem(tqparent, account, price, security), +KMyMoneyAccountTreeForecastItem::KMyMoneyAccountTreeForecastItem(KMyMoneyAccountTreeForecastItem *parent, const MyMoneyAccount& account, const MyMoneyForecast& forecast, const TQValueList& price, const MyMoneySecurity& security, const EForecastViewType forecastType) : + KMyMoneyAccountTreeBaseItem(parent, account, price, security), m_forecast(forecast), m_forecastType(forecastType) { @@ -336,7 +336,7 @@ void KMyMoneyAccountTreeForecastItem::adjustParentValue(int column, const MyMone KMyMoneyAccountTreeForecast* lv = dynamic_cast(listView()); if(!lv) return; - if(!firstChild() || !tqparent() || (!isOpen() && firstChild()) + if(!firstChild() || !parent() || (!isOpen() && firstChild()) || depth() == 1 ) { if(firstChild()) setText(column, " "); @@ -345,7 +345,7 @@ void KMyMoneyAccountTreeForecastItem::adjustParentValue(int column, const MyMone } // now make sure, the upstream accounts also get notified about the value change - KMyMoneyAccountTreeForecastItem* p = dynamic_cast(tqparent()); + KMyMoneyAccountTreeForecastItem* p = dynamic_cast(parent()); if(p != 0) { p->adjustParentValue(column, value); } @@ -353,7 +353,7 @@ void KMyMoneyAccountTreeForecastItem::adjustParentValue(int column, const MyMone void KMyMoneyAccountTreeForecastItem::setValue(int column, MyMoneyMoney amount, TQDate forecastDate) { - KMyMoneyAccountTreeForecastItem* p = dynamic_cast(tqparent()); + KMyMoneyAccountTreeForecastItem* p = dynamic_cast(parent()); //calculate the balance in base currency for the total row if(m_account.currencyId() != listView()->baseCurrency().id()) { diff --git a/kmymoney2/widgets/kmymoneyaccounttreeforecast.h b/kmymoney2/widgets/kmymoneyaccounttreeforecast.h index 5f3cd85..1f4199b 100644 --- a/kmymoney2/widgets/kmymoneyaccounttreeforecast.h +++ b/kmymoney2/widgets/kmymoneyaccounttreeforecast.h @@ -41,7 +41,7 @@ class KMyMoneyAccountTreeForecast : public KMyMoneyAccountTreeBase Q_OBJECT TQ_OBJECT public: - KMyMoneyAccountTreeForecast(TQWidget* tqparent = 0, const char *name = 0); + KMyMoneyAccountTreeForecast(TQWidget* parent = 0, const char *name = 0); virtual ~KMyMoneyAccountTreeForecast() {} void showSummary(MyMoneyForecast& forecast); @@ -66,7 +66,7 @@ public: * Constructor to be used to construct an account * entry object for a forecast. * - * @param tqparent pointer to the tqparent KAccountListView object this entry should be + * @param parent pointer to the parent KAccountListView object this entry should be * added to. * @param account const reference to MyMoneyAccount for which * the KListView entry is constructed @@ -77,13 +77,13 @@ public: * @param security const reference to the security used to show the value. Usually * one should pass MyMoneyFile::baseCurrency() here. */ - KMyMoneyAccountTreeForecastItem(KMyMoneyAccountTreeForecastItem *tqparent, const MyMoneyAccount& account, const MyMoneyForecast& forecast, const TQValueList& price = TQValueList(), const MyMoneySecurity& security = MyMoneySecurity(), const EForecastViewType forecastViewType = eUndefined); + KMyMoneyAccountTreeForecastItem(KMyMoneyAccountTreeForecastItem *parent, const MyMoneyAccount& account, const MyMoneyForecast& forecast, const TQValueList& price = TQValueList(), const MyMoneySecurity& security = MyMoneySecurity(), const EForecastViewType forecastViewType = eUndefined); /** * Constructor to be used to construct an account * entry object for a forecast. * - * @param tqparent pointer to the tqparent KAccountListView object this entry should be + * @param parent pointer to the parent KAccountListView object this entry should be * added to. * @param account const reference to MyMoneyAccount for which * the KListView entry is constructed @@ -94,7 +94,7 @@ public: * @param name name of the account to be used instead of the one stored with @p account * If empty, the one stored with @p account will be used. Default: empty */ - KMyMoneyAccountTreeForecastItem(KListView *tqparent, const MyMoneyAccount& account, const MyMoneyForecast &forecast, const MyMoneySecurity& security = MyMoneySecurity(), const TQString& name = TQString()); + KMyMoneyAccountTreeForecastItem(KListView *parent, const MyMoneyAccount& account, const MyMoneyForecast &forecast, const MyMoneySecurity& security = MyMoneySecurity(), const TQString& name = TQString()); ~KMyMoneyAccountTreeForecastItem(); diff --git a/kmymoney2/widgets/kmymoneybriefschedule.cpp b/kmymoney2/widgets/kmymoneybriefschedule.cpp index c4143ca..a3e3a5f 100644 --- a/kmymoney2/widgets/kmymoneybriefschedule.cpp +++ b/kmymoney2/widgets/kmymoneybriefschedule.cpp @@ -43,8 +43,8 @@ #include "kmymoneybriefschedule.h" #include "../kmymoneyutils.h" -KMyMoneyBriefSchedule::KMyMoneyBriefSchedule(TQWidget *tqparent, const char *name ) - : kScheduleBriefWidget(tqparent,name, WStyle_Customize | WStyle_NoBorder) +KMyMoneyBriefSchedule::KMyMoneyBriefSchedule(TQWidget *parent, const char *name ) + : kScheduleBriefWidget(parent,name, WStyle_Customize | WStyle_NoBorder) { KIconLoader *ic = KGlobal::iconLoader(); m_nextButton->setPixmap(BarIcon(TQString::tqfromLatin1("1rightarrow"))); diff --git a/kmymoney2/widgets/kmymoneybriefschedule.h b/kmymoney2/widgets/kmymoneybriefschedule.h index 252cd78..ec9e0d5 100644 --- a/kmymoney2/widgets/kmymoneybriefschedule.h +++ b/kmymoney2/widgets/kmymoneybriefschedule.h @@ -44,7 +44,7 @@ class KMyMoneyBriefSchedule : public kScheduleBriefWidget { Q_OBJECT TQ_OBJECT public: - KMyMoneyBriefSchedule(TQWidget *tqparent=0, const char *name=0); + KMyMoneyBriefSchedule(TQWidget *parent=0, const char *name=0); ~KMyMoneyBriefSchedule(); void setSchedules(TQValueList list, const TQDate& date); diff --git a/kmymoney2/widgets/kmymoneycalculator.cpp b/kmymoney2/widgets/kmymoneycalculator.cpp index e202b80..1a117fa 100644 --- a/kmymoney2/widgets/kmymoneycalculator.cpp +++ b/kmymoney2/widgets/kmymoneycalculator.cpp @@ -38,8 +38,8 @@ #include "kmymoneycalculator.h" -kMyMoneyCalculator::kMyMoneyCalculator(TQWidget* tqparent, const char *name) - : TQFrame(tqparent, name) +kMyMoneyCalculator::kMyMoneyCalculator(TQWidget* parent, const char *name) + : TQFrame(parent, name) { m_comma = KGlobal::locale()->monetaryDecimalSymbol()[0]; m_clearOperandOnDigit = false; @@ -321,23 +321,23 @@ const TQString kMyMoneyCalculator::result(void) const txt.replace(TQRegExp("\\."), m_comma); if(txt[0] == '-') { txt = txt.mid(1); // get rid of the minus sign - TQString tqmask; + TQString mask; switch(KGlobal::locale()->negativeMonetarySignPosition()) { case KLocale::ParensAround: - tqmask = "(%1)"; + mask = "(%1)"; break; case KLocale::AfterQuantityMoney: - tqmask = "%1-"; + mask = "%1-"; break; case KLocale::AfterMoney: case KLocale::BeforeMoney: - tqmask = "%1 -"; + mask = "%1 -"; break; case KLocale::BeforeQuantityMoney: - tqmask = "-%1"; + mask = "-%1"; break; } - txt = TQString(tqmask).tqarg(txt); + txt = TQString(mask).tqarg(txt); } return txt; } diff --git a/kmymoney2/widgets/kmymoneycalculator.h b/kmymoney2/widgets/kmymoneycalculator.h index 64674a1..c015da3 100644 --- a/kmymoney2/widgets/kmymoneycalculator.h +++ b/kmymoney2/widgets/kmymoneycalculator.h @@ -60,7 +60,7 @@ class kMyMoneyCalculator : public TQFrame { Q_OBJECT TQ_OBJECT public: - kMyMoneyCalculator(TQWidget* tqparent = 0, const char *name = 0); + kMyMoneyCalculator(TQWidget* parent = 0, const char *name = 0); ~kMyMoneyCalculator(); /** diff --git a/kmymoney2/widgets/kmymoneycalendar.cpp b/kmymoney2/widgets/kmymoneycalendar.cpp index 761cda8..6064b8d 100644 --- a/kmymoney2/widgets/kmymoneycalendar.cpp +++ b/kmymoney2/widgets/kmymoneycalendar.cpp @@ -91,8 +91,8 @@ public: TQPushButton *userButton2; }; -kMyMoneyCalendar::kMyMoneyCalendar(TQWidget *tqparent, const char *name ) : - TQFrame(tqparent,name), +kMyMoneyCalendar::kMyMoneyCalendar(TQWidget *parent, const char *name ) : + TQFrame(parent,name), table(0), d(new kMyMoneyCalendarPrivate) { diff --git a/kmymoney2/widgets/kmymoneycalendar.h b/kmymoney2/widgets/kmymoneycalendar.h index 25ce79f..fbcb24f 100644 --- a/kmymoney2/widgets/kmymoneycalendar.h +++ b/kmymoney2/widgets/kmymoneycalendar.h @@ -82,7 +82,7 @@ public: /** * Standard constructor. **/ - kMyMoneyCalendar(TQWidget *tqparent=0, const char *name=0); + kMyMoneyCalendar(TQWidget *parent=0, const char *name=0); /** * Standard destructor. diff --git a/kmymoney2/widgets/kmymoneycategory.cpp b/kmymoney2/widgets/kmymoneycategory.cpp index 85652f9..3e74bd3 100644 --- a/kmymoney2/widgets/kmymoneycategory.cpp +++ b/kmymoney2/widgets/kmymoneycategory.cpp @@ -53,8 +53,8 @@ public: bool recursive; }; -KMyMoneyCategory::KMyMoneyCategory(TQWidget* tqparent, const char * name, bool splitButton) : - KMyMoneyCombo(true, tqparent, name), +KMyMoneyCategory::KMyMoneyCategory(TQWidget* parent, const char * name, bool splitButton) : + KMyMoneyCombo(true, parent, name), d(new Private) { if(splitButton) { @@ -63,8 +63,8 @@ KMyMoneyCategory::KMyMoneyCategory(TQWidget* tqparent, const char * name, bool s TQHBoxLayout* tqlayout = new TQHBoxLayout(d->frame); // make sure not to use our own overridden version of reparent() here KMyMoneyCombo::reparent(d->frame, getWFlags() & ~WType_Mask, TQPoint(0, 0), true); - if(tqparent) - d->frame->reparent(tqparent, TQPoint(0, 0), true); + if(parent) + d->frame->reparent(parent, TQPoint(0, 0), true); // create button KGuiItem splitButtonItem("", @@ -102,12 +102,12 @@ void KMyMoneyCategory::setPalette(const TQPalette& palette) KMyMoneyCombo::setPalette(palette); } -void KMyMoneyCategory::reparent(TQWidget *tqparent, WFlags w, const TQPoint& pos, bool showIt) +void KMyMoneyCategory::reparent(TQWidget *parent, WFlags w, const TQPoint& pos, bool showIt) { if(d->frame) - d->frame->reparent(tqparent, w, pos, showIt); + d->frame->reparent(parent, w, pos, showIt); else - KMyMoneyCombo::reparent(tqparent, w, pos, showIt); + KMyMoneyCombo::reparent(parent, w, pos, showIt); } kMyMoneyAccountSelector* KMyMoneyCategory::selector(void) const @@ -183,8 +183,8 @@ void KMyMoneyCategory::setDisabled(bool disable) setEnabled(!disable); } -KMyMoneySecurity::KMyMoneySecurity(TQWidget* tqparent, const char * name) : - KMyMoneyCategory(tqparent, name, false) +KMyMoneySecurity::KMyMoneySecurity(TQWidget* parent, const char * name) : + KMyMoneyCategory(parent, name, false) { } diff --git a/kmymoney2/widgets/kmymoneycategory.h b/kmymoney2/widgets/kmymoneycategory.h index fa4998e..fa2975c 100644 --- a/kmymoney2/widgets/kmymoneycategory.h +++ b/kmymoney2/widgets/kmymoneycategory.h @@ -48,7 +48,7 @@ class kMyMoneyAccountSelector; * If any match is found a list selection box is opened and the user can use * the up/down, page-up/page-down keys or the mouse to navigate in the list. If * an account is selected, the selection box is closed. Other key-strokes are - * directed to the tqparent object to manipulate the text. The visible contents of + * directed to the parent object to manipulate the text. The visible contents of * the selection box is updated with every key-stroke. * * This object is a replacement of the kMyMoneyCategory object and should be used @@ -68,8 +68,8 @@ public: * will construct a surrounding TQFrame and reparent itself to be a child of this * TQFrame. It also adds a KPushButton with the "Split" icon to the right of the * input field. In this case it is important not to use the pointer to this widget - * but it's tqparent when placing the object in a TQLayout, TQTable or some such. The - * tqparent widget (the TQFrame in this case) can be extracted with the parentWidget() + * but it's parent when placing the object in a TQLayout, TQTable or some such. The + * parent widget (the TQFrame in this case) can be extracted with the parentWidget() * method. * * Reparenting is handled by the object transparently for both cases. @@ -92,7 +92,7 @@ public: * table->setCellWidget(category->parentWidget()); * @endcode */ - KMyMoneyCategory(TQWidget* tqparent = 0, const char* name = 0, bool splitButton = false); + KMyMoneyCategory(TQWidget* parent = 0, const char* name = 0, bool splitButton = false); virtual ~KMyMoneyCategory(); @@ -112,7 +112,7 @@ public: /** * Reimplemented for internal reasons. No API change */ - virtual void reparent( TQWidget *tqparent, WFlags, const TQPoint &, bool showIt = FALSE ); + virtual void reparent( TQWidget *parent, WFlags, const TQPoint &, bool showIt = FALSE ); /** * Reimplemented for internal reasons. No API change. @@ -180,7 +180,7 @@ class KMyMoneySecurity : public KMyMoneyCategory Q_OBJECT TQ_OBJECT public: - KMyMoneySecurity(TQWidget* tqparent = 0, const char* name = 0); + KMyMoneySecurity(TQWidget* parent = 0, const char* name = 0); virtual ~KMyMoneySecurity(); /** diff --git a/kmymoney2/widgets/kmymoneychecklistitem.cpp b/kmymoney2/widgets/kmymoneychecklistitem.cpp index c1b9be9..039d2c8 100644 --- a/kmymoney2/widgets/kmymoneychecklistitem.cpp +++ b/kmymoney2/widgets/kmymoneychecklistitem.cpp @@ -31,8 +31,8 @@ #include "kmymoneylistviewitem.h" #include "../kmymoneyglobalsettings.h" -KMyMoneyCheckListItem::KMyMoneyCheckListItem(TQListView* tqparent, const TQString& txt, const TQString& key, const TQString& id, Type type) : - TQCheckListItem(tqparent, txt, type), +KMyMoneyCheckListItem::KMyMoneyCheckListItem(TQListView* parent, const TQString& txt, const TQString& key, const TQString& id, Type type) : + TQCheckListItem(parent, txt, type), m_key(key), m_id(id), m_isOdd(0), @@ -43,8 +43,8 @@ KMyMoneyCheckListItem::KMyMoneyCheckListItem(TQListView* tqparent, const TQStrin m_key = txt; } -KMyMoneyCheckListItem::KMyMoneyCheckListItem(TQListViewItem* tqparent, const TQString& txt, const TQString& key, const TQString& id, Type type) : - TQCheckListItem(tqparent, txt, type), +KMyMoneyCheckListItem::KMyMoneyCheckListItem(TQListViewItem* parent, const TQString& txt, const TQString& key, const TQString& id, Type type) : + TQCheckListItem(parent, txt, type), m_key(key), m_id(id), m_isOdd(0), @@ -55,8 +55,8 @@ KMyMoneyCheckListItem::KMyMoneyCheckListItem(TQListViewItem* tqparent, const TQS m_key = txt; } -KMyMoneyCheckListItem::KMyMoneyCheckListItem(TQListView* tqparent, TQListViewItem* after, const TQString& txt, const TQString& key, const TQString& id, Type type) : - TQCheckListItem(tqparent, after, txt, type), +KMyMoneyCheckListItem::KMyMoneyCheckListItem(TQListView* parent, TQListViewItem* after, const TQString& txt, const TQString& key, const TQString& id, Type type) : + TQCheckListItem(parent, after, txt, type), m_key(key), m_id(id), m_isOdd(0), @@ -118,15 +118,15 @@ bool KMyMoneyCheckListItem::isAlternate(void) KMyMoneyCheckListItem* clItem; KMyMoneyListViewItem* liItem; bool previous = true; - if(TQListViewItem::tqparent()) { - clItem = dynamic_cast(TQListViewItem::tqparent()); - liItem = dynamic_cast(TQListViewItem::tqparent()); + if(TQListViewItem::parent()) { + clItem = dynamic_cast(TQListViewItem::parent()); + liItem = dynamic_cast(TQListViewItem::parent()); if(clItem) previous = clItem->m_isOdd; else previous = liItem->m_isOdd; - clItem = dynamic_cast(TQListViewItem::tqparent()->firstChild()); - liItem = dynamic_cast(TQListViewItem::tqparent()->firstChild()); + clItem = dynamic_cast(TQListViewItem::parent()->firstChild()); + liItem = dynamic_cast(TQListViewItem::parent()->firstChild()); } else { clItem = dynamic_cast(listView()->firstChild()); liItem = dynamic_cast(listView()->firstChild()); diff --git a/kmymoney2/widgets/kmymoneychecklistitem.h b/kmymoney2/widgets/kmymoneychecklistitem.h index 34776ce..26624f4 100644 --- a/kmymoney2/widgets/kmymoneychecklistitem.h +++ b/kmymoney2/widgets/kmymoneychecklistitem.h @@ -46,9 +46,9 @@ class KMyMoneyCheckListItem : public TQObject, public TQCheckListItem Q_OBJECT TQ_OBJECT public: - KMyMoneyCheckListItem(TQListView *tqparent, const TQString& txt, const TQString& key, const TQString& id, Type type = TQCheckListItem::CheckBox); - KMyMoneyCheckListItem(TQListView *tqparent, TQListViewItem* after, const TQString& txt, const TQString& key, const TQString& id, Type type = TQCheckListItem::CheckBox); - KMyMoneyCheckListItem(TQListViewItem *tqparent, const TQString& txt, const TQString& key, const TQString& id, Type type = TQCheckListItem::CheckBox); + KMyMoneyCheckListItem(TQListView *parent, const TQString& txt, const TQString& key, const TQString& id, Type type = TQCheckListItem::CheckBox); + KMyMoneyCheckListItem(TQListView *parent, TQListViewItem* after, const TQString& txt, const TQString& key, const TQString& id, Type type = TQCheckListItem::CheckBox); + KMyMoneyCheckListItem(TQListViewItem *parent, const TQString& txt, const TQString& key, const TQString& id, Type type = TQCheckListItem::CheckBox); ~KMyMoneyCheckListItem(); const TQString& id(void) const { return m_id; }; diff --git a/kmymoney2/widgets/kmymoneycombo.cpp b/kmymoney2/widgets/kmymoneycombo.cpp index 7471de7..0d8ce4d 100644 --- a/kmymoney2/widgets/kmymoneycombo.cpp +++ b/kmymoney2/widgets/kmymoneycombo.cpp @@ -546,8 +546,8 @@ void KMyMoneyActivityCombo::slotSetActivity(const TQString& id) update(); } -KMyMoneyPayeeCombo::KMyMoneyPayeeCombo(TQWidget* tqparent, const char * name) : - KMyMoneyCombo(true, tqparent, name) +KMyMoneyPayeeCombo::KMyMoneyPayeeCombo(TQWidget* parent, const char * name) : + KMyMoneyCombo(true, parent, name) { m_completion = new kMyMoneyCompletion(this); @@ -658,8 +658,8 @@ void KMyMoneyGeneralCombo::slotChangeItem(int idx) emit itemSelected(d->itemId(text(idx))); } -KMyMoneyPeriodCombo::KMyMoneyPeriodCombo(TQWidget* tqparent, const char* name) : - KMyMoneyGeneralCombo(tqparent, name) +KMyMoneyPeriodCombo::KMyMoneyPeriodCombo(TQWidget* parent, const char* name) : + KMyMoneyGeneralCombo(parent, name) { insertItem(i18n("All dates"), MyMoneyTransactionFilter::allDates); insertItem(i18n("As of today"), MyMoneyTransactionFilter::asOfToday); @@ -724,8 +724,8 @@ void KMyMoneyPeriodCombo::dates(TQDate& start, TQDate& end, MyMoneyTransactionFi } #endif -KMyMoneyOccurenceCombo::KMyMoneyOccurenceCombo(TQWidget* tqparent, const char* name) : - KMyMoneyGeneralCombo(tqparent, name) +KMyMoneyOccurenceCombo::KMyMoneyOccurenceCombo(TQWidget* parent, const char* name) : + KMyMoneyGeneralCombo(parent, name) { } @@ -734,8 +734,8 @@ MyMoneySchedule::occurenceE KMyMoneyOccurenceCombo::currentItem(void) const return static_cast(KMyMoneyGeneralCombo::currentItem()); } -KMyMoneyOccurencePeriodCombo::KMyMoneyOccurencePeriodCombo(TQWidget* tqparent, const char* name) : - KMyMoneyOccurenceCombo(tqparent, name) +KMyMoneyOccurencePeriodCombo::KMyMoneyOccurencePeriodCombo(TQWidget* parent, const char* name) : + KMyMoneyOccurenceCombo(parent, name) { insertItem(i18n(MyMoneySchedule::occurencePeriodToString(MyMoneySchedule::OCCUR_ONCE)), MyMoneySchedule::OCCUR_ONCE); insertItem(i18n(MyMoneySchedule::occurencePeriodToString(MyMoneySchedule::OCCUR_DAILY)), MyMoneySchedule::OCCUR_DAILY); @@ -745,8 +745,8 @@ KMyMoneyOccurencePeriodCombo::KMyMoneyOccurencePeriodCombo(TQWidget* tqparent, c insertItem(i18n(MyMoneySchedule::occurencePeriodToString(MyMoneySchedule::OCCUR_YEARLY)), MyMoneySchedule::OCCUR_YEARLY); } -KMyMoneyFrequencyCombo::KMyMoneyFrequencyCombo(TQWidget* tqparent, const char* name) : - KMyMoneyOccurenceCombo(tqparent, name) +KMyMoneyFrequencyCombo::KMyMoneyFrequencyCombo(TQWidget* parent, const char* name) : + KMyMoneyOccurenceCombo(parent, name) { insertItem(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_ONCE)), MyMoneySchedule::OCCUR_ONCE); insertItem(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_DAILY)), MyMoneySchedule::OCCUR_DAILY); diff --git a/kmymoney2/widgets/kmymoneycombo.h b/kmymoney2/widgets/kmymoneycombo.h index f889f3e..32f4ec5 100644 --- a/kmymoney2/widgets/kmymoneycombo.h +++ b/kmymoney2/widgets/kmymoneycombo.h @@ -332,7 +332,7 @@ private: * If any match is found a list selection box is opened and the user can use * the up/down, page-up/page-down keys or the mouse to navigate in the list. If * a payee is selected, the selection box is closed. Other key-strokes are - * directed to the tqparent object to manipulate the text. The visible contents of + * directed to the parent object to manipulate the text. The visible contents of * the selection box is updated with every key-stroke. * * This object is a replacement of the kMyMoneyPayee object and should be used @@ -345,7 +345,7 @@ class KMyMoneyPayeeCombo : public KMyMoneyCombo Q_OBJECT TQ_OBJECT public: - KMyMoneyPayeeCombo(TQWidget* tqparent = 0, const char* name = 0); + KMyMoneyPayeeCombo(TQWidget* parent = 0, const char* name = 0); void loadPayees(const TQValueList& list); }; @@ -355,7 +355,7 @@ class KMyMoneyGeneralCombo : public KComboBox Q_OBJECT TQ_OBJECT public: - KMyMoneyGeneralCombo(TQWidget* tqparent = 0, const char* name = 0); + KMyMoneyGeneralCombo(TQWidget* parent = 0, const char* name = 0); virtual ~KMyMoneyGeneralCombo(); void insertItem(const TQString& txt, int id, int idx = -1); @@ -398,7 +398,7 @@ class KMyMoneyPeriodCombo : public KMyMoneyGeneralCombo Q_OBJECT TQ_OBJECT public: - KMyMoneyPeriodCombo(TQWidget* tqparent = 0, const char* name = 0); + KMyMoneyPeriodCombo(TQWidget* parent = 0, const char* name = 0); MyMoneyTransactionFilter::dateOptionE currentItem(void) const; void setCurrentItem(MyMoneyTransactionFilter::dateOptionE id); @@ -422,7 +422,7 @@ public: /** * This class implements an occurence selector - * as a tqparent class for both OccurencePeriod and Frequency combos + * as a parent class for both OccurencePeriod and Frequency combos * * @author Colin Wright */ @@ -431,7 +431,7 @@ class KMyMoneyOccurenceCombo : public KMyMoneyGeneralCombo Q_OBJECT TQ_OBJECT public: - KMyMoneyOccurenceCombo(TQWidget* tqparent = 0, const char* name = 0); + KMyMoneyOccurenceCombo(TQWidget* parent = 0, const char* name = 0); MyMoneySchedule::occurenceE currentItem(void) const; }; @@ -446,7 +446,7 @@ class KMyMoneyOccurencePeriodCombo : public KMyMoneyOccurenceCombo Q_OBJECT TQ_OBJECT public: - KMyMoneyOccurencePeriodCombo(TQWidget* tqparent = 0, const char* name = 0); + KMyMoneyOccurencePeriodCombo(TQWidget* parent = 0, const char* name = 0); }; /** @@ -458,7 +458,7 @@ class KMyMoneyFrequencyCombo : public KMyMoneyOccurenceCombo Q_OBJECT TQ_OBJECT public: - KMyMoneyFrequencyCombo(TQWidget* tqparent = 0, const char* name = 0); + KMyMoneyFrequencyCombo(TQWidget* parent = 0, const char* name = 0); /** * This method returns the number of events for the selected payment diff --git a/kmymoney2/widgets/kmymoneycompletion.cpp b/kmymoney2/widgets/kmymoneycompletion.cpp index 55e4d75..fbcc8a5 100644 --- a/kmymoney2/widgets/kmymoneycompletion.cpp +++ b/kmymoney2/widgets/kmymoneycompletion.cpp @@ -40,14 +40,14 @@ const int kMyMoneyCompletion::MAX_ITEMS = 16; -kMyMoneyCompletion::kMyMoneyCompletion(TQWidget *tqparent, const char *name ) : - TQVBox(tqparent, name, WType_Popup) +kMyMoneyCompletion::kMyMoneyCompletion(TQWidget *parent, const char *name ) : + TQVBox(parent, name, WType_Popup) { m_selector = new KMyMoneySelector(this); m_selector->listView()->setFocusProxy(this); - m_parent = tqparent; - setFocusProxy((tqparent) ? tqparent : (TQWidget*) TQ_NoFocus); + m_parent = parent; + setFocusProxy((parent) ? parent : (TQWidget*) TQ_NoFocus); setFrameStyle(TQFrame::PopupPanel | TQFrame::Raised); connectSignals(m_selector, m_selector->listView()); } diff --git a/kmymoney2/widgets/kmymoneycompletion.h b/kmymoney2/widgets/kmymoneycompletion.h index ca83f0b..8c8055d 100644 --- a/kmymoney2/widgets/kmymoneycompletion.h +++ b/kmymoney2/widgets/kmymoneycompletion.h @@ -51,7 +51,7 @@ class kMyMoneyCompletion : public TQVBox TQ_OBJECT public: - kMyMoneyCompletion(TQWidget *tqparent=0, const char *name=0); + kMyMoneyCompletion(TQWidget *parent=0, const char *name=0); virtual ~kMyMoneyCompletion(); /** diff --git a/kmymoney2/widgets/kmymoneycurrencyselector.cpp b/kmymoney2/widgets/kmymoneycurrencyselector.cpp index 4b50e4d..b2637a2 100644 --- a/kmymoney2/widgets/kmymoneycurrencyselector.cpp +++ b/kmymoney2/widgets/kmymoneycurrencyselector.cpp @@ -36,8 +36,8 @@ #include "kmymoneycurrencyselector.h" -KMyMoneySecuritySelector::KMyMoneySecuritySelector(TQWidget *tqparent, const char *name ) : - KComboBox(tqparent, name), +KMyMoneySecuritySelector::KMyMoneySecuritySelector(TQWidget *parent, const char *name ) : + KComboBox(parent, name), m_displayItem(FullName), m_displayOnly(false), m_displayType(TypeAll) @@ -45,8 +45,8 @@ KMyMoneySecuritySelector::KMyMoneySecuritySelector(TQWidget *tqparent, const cha // update(TQString()); } -KMyMoneySecuritySelector::KMyMoneySecuritySelector(displayTypeE type, TQWidget *tqparent, const char *name ) : - KComboBox(tqparent,name), +KMyMoneySecuritySelector::KMyMoneySecuritySelector(displayTypeE type, TQWidget *parent, const char *name ) : + KComboBox(parent,name), m_displayItem(FullName), m_displayOnly(false), m_displayType(type) @@ -158,8 +158,8 @@ void KMyMoneySecuritySelector::setSecurity(const MyMoneySecurity& currency) update(TQString("x")); } -KMyMoneyCurrencySelector::KMyMoneyCurrencySelector(TQWidget *tqparent, const char *name ) : - KMyMoneySecuritySelector(TypeCurrencies, tqparent, name) +KMyMoneyCurrencySelector::KMyMoneyCurrencySelector(TQWidget *parent, const char *name ) : + KMyMoneySecuritySelector(TypeCurrencies, parent, name) { } diff --git a/kmymoney2/widgets/kmymoneycurrencyselector.h b/kmymoney2/widgets/kmymoneycurrencyselector.h index 00e3af6..938f5e4 100644 --- a/kmymoney2/widgets/kmymoneycurrencyselector.h +++ b/kmymoney2/widgets/kmymoneycurrencyselector.h @@ -58,8 +58,8 @@ public: TypeAll = 0x03 }; - KMyMoneySecuritySelector(TQWidget *tqparent=0, const char *name=0); - KMyMoneySecuritySelector(displayTypeE type = TypeAll, TQWidget *tqparent=0, const char *name=0); + KMyMoneySecuritySelector(TQWidget *parent=0, const char *name=0); + KMyMoneySecuritySelector(displayTypeE type = TypeAll, TQWidget *parent=0, const char *name=0); virtual ~KMyMoneySecuritySelector(); const MyMoneySecurity& security(void) const; @@ -84,7 +84,7 @@ private: class KMyMoneyCurrencySelector : public KMyMoneySecuritySelector { public: - KMyMoneyCurrencySelector(TQWidget *tqparent=0, const char *name=0); + KMyMoneyCurrencySelector(TQWidget *parent=0, const char *name=0); virtual ~KMyMoneyCurrencySelector() {} }; diff --git a/kmymoney2/widgets/kmymoneydateinput.cpp b/kmymoney2/widgets/kmymoneydateinput.cpp index 9cd3963..37db28b 100644 --- a/kmymoney2/widgets/kmymoneydateinput.cpp +++ b/kmymoney2/widgets/kmymoneydateinput.cpp @@ -69,8 +69,8 @@ bool KMyMoneyDateEdit::event(TQEvent* e) return rc; } -kMyMoneyDateInput::kMyMoneyDateInput(TQWidget *tqparent, const char *name, TQt::AlignmentFlags flags) - : TQHBox(tqparent,name) +kMyMoneyDateInput::kMyMoneyDateInput(TQWidget *parent, const char *name, TQt::AlignmentFlags flags) + : TQHBox(parent,name) { m_qttqalignment = flags; m_date = TQDate::tqcurrentDate(); diff --git a/kmymoney2/widgets/kmymoneydateinput.h b/kmymoney2/widgets/kmymoneydateinput.h index 0093a2d..2b72936 100644 --- a/kmymoney2/widgets/kmymoneydateinput.h +++ b/kmymoney2/widgets/kmymoneydateinput.h @@ -48,7 +48,7 @@ class KMyMoneyDateEdit : public TQDateEdit Q_OBJECT TQ_OBJECT public: - KMyMoneyDateEdit(const TQDate& date, TQWidget *tqparent=0, const char *name=0) : TQDateEdit(date, tqparent, name) {} + KMyMoneyDateEdit(const TQDate& date, TQWidget *parent=0, const char *name=0) : TQDateEdit(date, parent, name) {} protected: /** reimplemented for internal reasons */ @@ -67,7 +67,7 @@ class kMyMoneyDateInput : public TQHBox TQ_OBJECT public: - kMyMoneyDateInput(TQWidget *tqparent=0, const char *name=0, TQt::AlignmentFlags flags=TQt::AlignLeft); + kMyMoneyDateInput(TQWidget *parent=0, const char *name=0, TQt::AlignmentFlags flags=TQt::AlignLeft); ~kMyMoneyDateInput(); // Replace calls to this with the new date() method diff --git a/kmymoney2/widgets/kmymoneydatetbl.cpp b/kmymoney2/widgets/kmymoneydatetbl.cpp index 1066fc7..79a8c7b 100644 --- a/kmymoney2/widgets/kmymoneydatetbl.cpp +++ b/kmymoney2/widgets/kmymoneydatetbl.cpp @@ -69,8 +69,8 @@ // Project Includes #include "kmymoneydatetbl.h" -kMyMoneyDateTbl::kMyMoneyDateTbl(TQWidget *tqparent, TQDate date_, const char* name, WFlags f) - : TQGridView(tqparent, name, f) +kMyMoneyDateTbl::kMyMoneyDateTbl(TQWidget *parent, TQDate date_, const char* name, WFlags f) + : TQGridView(parent, name, f) { // call this first to make sure that member variables are initialized setType(MONTHLY); diff --git a/kmymoney2/widgets/kmymoneydatetbl.h b/kmymoney2/widgets/kmymoneydatetbl.h index f46d661..23da85f 100644 --- a/kmymoney2/widgets/kmymoneydatetbl.h +++ b/kmymoney2/widgets/kmymoneydatetbl.h @@ -74,7 +74,7 @@ public: /** * The constructor. */ - kMyMoneyDateTbl(TQWidget *tqparent=0, + kMyMoneyDateTbl(TQWidget *parent=0, TQDate date=TQDate::tqcurrentDate(), const char* name=0, WFlags f=0); /** diff --git a/kmymoney2/widgets/kmymoneyedit.cpp b/kmymoney2/widgets/kmymoneyedit.cpp index ad51606..59f4efd 100644 --- a/kmymoney2/widgets/kmymoneyedit.cpp +++ b/kmymoney2/widgets/kmymoneyedit.cpp @@ -42,14 +42,14 @@ #include "kmymoneycalculator.h" #include "../mymoney/mymoneymoney.h" -kMyMoneyMoneyValidator::kMyMoneyMoneyValidator(TQObject * tqparent, const char * name) : - TQDoubleValidator(tqparent, name) +kMyMoneyMoneyValidator::kMyMoneyMoneyValidator(TQObject * parent, const char * name) : + TQDoubleValidator(parent, name) { } kMyMoneyMoneyValidator::kMyMoneyMoneyValidator( double bottom, double top, int decimals, - TQObject * tqparent, const char * name ) : - TQDoubleValidator(bottom, top, decimals, tqparent, name) + TQObject * parent, const char * name ) : + TQDoubleValidator(bottom, top, decimals, parent, name) { } @@ -154,8 +154,8 @@ TQValidator::State kMyMoneyMoneyValidator::validate( TQString & input, int & _p return rc; } -kMyMoneyEdit::kMyMoneyEdit(TQWidget *tqparent, const char *name, const int prec) - : TQHBox(tqparent, name) +kMyMoneyEdit::kMyMoneyEdit(TQWidget *parent, const char *name, const int prec) + : TQHBox(parent, name) { m_prec = prec; if(prec < -1 || prec > 20) @@ -163,8 +163,8 @@ kMyMoneyEdit::kMyMoneyEdit(TQWidget *tqparent, const char *name, const int prec) init(); } -kMyMoneyEdit::kMyMoneyEdit(const MyMoneySecurity& sec, TQWidget *tqparent, const char *name) - : TQHBox(tqparent, name) +kMyMoneyEdit::kMyMoneyEdit(const MyMoneySecurity& sec, TQWidget *parent, const char *name) + : TQHBox(parent, name) { m_prec = MyMoneyMoney::denomToPrec(sec.smallestAccountFraction()); init(); diff --git a/kmymoney2/widgets/kmymoneyedit.h b/kmymoney2/widgets/kmymoneyedit.h index 6df557d..77c7a75 100644 --- a/kmymoney2/widgets/kmymoneyedit.h +++ b/kmymoney2/widgets/kmymoneyedit.h @@ -61,17 +61,17 @@ class kMyMoneyMoneyValidator : public TQDoubleValidator public: /** * Constuct a locale-aware KDoubleValidator with default range - * (whatever TQDoubleValidator uses for that) and tqparent @p - * tqparent + * (whatever TQDoubleValidator uses for that) and parent @p + * parent */ - kMyMoneyMoneyValidator( TQObject * tqparent, const char * name=0 ); + kMyMoneyMoneyValidator( TQObject * parent, const char * name=0 ); /** * Constuct a locale-aware KDoubleValidator for range [@p bottom,@p * top] and a precision of @p decimals decimals after the decimal * point. */ kMyMoneyMoneyValidator( double bottom, double top, int decimals, - TQObject * tqparent, const char * name=0 ); + TQObject * parent, const char * name=0 ); /** * Destructs the validator. */ @@ -143,8 +143,8 @@ protected slots: void slotCalculatorOpen(void); public: - kMyMoneyEdit(TQWidget *tqparent=0, const char *name=0, const int prec = -2); - kMyMoneyEdit(const MyMoneySecurity& eq, TQWidget *tqparent=0, const char *name=0); + kMyMoneyEdit(TQWidget *parent=0, const char *name=0, const int prec = -2); + kMyMoneyEdit(const MyMoneySecurity& eq, TQWidget *parent=0, const char *name=0); ~kMyMoneyEdit(); /** diff --git a/kmymoney2/widgets/kmymoneyforecastlistviewitem.cpp b/kmymoney2/widgets/kmymoneyforecastlistviewitem.cpp index 6bfd1c2..75f3491 100644 --- a/kmymoney2/widgets/kmymoneyforecastlistviewitem.cpp +++ b/kmymoney2/widgets/kmymoneyforecastlistviewitem.cpp @@ -33,8 +33,8 @@ #include -KMyMoneyForecastListViewItem::KMyMoneyForecastListViewItem (TQListView* tqparent, TQListViewItem* after, bool isNegative) : - KListViewItem(tqparent, after), +KMyMoneyForecastListViewItem::KMyMoneyForecastListViewItem (TQListView* parent, TQListViewItem* after, bool isNegative) : + KListViewItem(parent, after), m_negative(isNegative) { } diff --git a/kmymoney2/widgets/kmymoneyforecastlistviewitem.h b/kmymoney2/widgets/kmymoneyforecastlistviewitem.h index 9c4b568..6a08c61 100644 --- a/kmymoney2/widgets/kmymoneyforecastlistviewitem.h +++ b/kmymoney2/widgets/kmymoneyforecastlistviewitem.h @@ -41,7 +41,7 @@ class KMyMoneyForecastListViewItem : public KListViewItem { public: - KMyMoneyForecastListViewItem(TQListView* tqparent, TQListViewItem* after, bool isNegative); + KMyMoneyForecastListViewItem(TQListView* parent, TQListViewItem* after, bool isNegative); ~KMyMoneyForecastListViewItem(); diff --git a/kmymoney2/widgets/kmymoneygpgconfig.cpp b/kmymoney2/widgets/kmymoneygpgconfig.cpp index a64e709..5ca6991 100644 --- a/kmymoney2/widgets/kmymoneygpgconfig.cpp +++ b/kmymoney2/widgets/kmymoneygpgconfig.cpp @@ -38,8 +38,8 @@ #define RECOVER_KEY_ID "0xD2B08440" -kMyMoneyGPGConfig::kMyMoneyGPGConfig(TQWidget *tqparent, const char *name ) - : kMyMoneyGPGConfigDecl(tqparent, name), +kMyMoneyGPGConfig::kMyMoneyGPGConfig(TQWidget *parent, const char *name ) + : kMyMoneyGPGConfigDecl(parent, name), m_checkCount(0) { m_idGroup->setEnabled(KGPGFile::GPGAvailable()); diff --git a/kmymoney2/widgets/kmymoneygpgconfig.h b/kmymoney2/widgets/kmymoneygpgconfig.h index b66c941..70de400 100644 --- a/kmymoney2/widgets/kmymoneygpgconfig.h +++ b/kmymoney2/widgets/kmymoneygpgconfig.h @@ -42,7 +42,7 @@ class kMyMoneyGPGConfig : public kMyMoneyGPGConfigDecl Q_OBJECT TQ_OBJECT public: - kMyMoneyGPGConfig(TQWidget* tqparent, const char *name); + kMyMoneyGPGConfig(TQWidget* parent, const char *name); virtual ~kMyMoneyGPGConfig() {} void writeConfig(void); diff --git a/kmymoney2/widgets/kmymoneylineedit.h b/kmymoney2/widgets/kmymoneylineedit.h index f92bd08..e97205d 100644 --- a/kmymoney2/widgets/kmymoneylineedit.h +++ b/kmymoney2/widgets/kmymoneylineedit.h @@ -48,7 +48,7 @@ class kMyMoneyLineEdit : public KLineEdit TQ_OBJECT public: /** - * @param w pointer to tqparent + * @param w pointer to parent * @param name pointer to name of object * @param forceMonetaryDecimalSymbol if @a true, the numeric keypad comma key will have a fixed * value and does not follow the keyboard tqlayout (default: @p false) diff --git a/kmymoney2/widgets/kmymoneylistviewitem.cpp b/kmymoney2/widgets/kmymoneylistviewitem.cpp index d85fe77..2ed4377 100644 --- a/kmymoney2/widgets/kmymoneylistviewitem.cpp +++ b/kmymoney2/widgets/kmymoneylistviewitem.cpp @@ -35,8 +35,8 @@ #include "kmymoneychecklistitem.h" #include "../kmymoneyglobalsettings.h" -KMyMoneyListViewItem::KMyMoneyListViewItem(TQListView* tqparent, const TQString& txt, const TQString& key, const TQString& id) : - KListViewItem(tqparent, txt), +KMyMoneyListViewItem::KMyMoneyListViewItem(TQListView* parent, const TQString& txt, const TQString& key, const TQString& id) : + KListViewItem(parent, txt), m_key(key), m_id(id), m_isOdd(0), @@ -46,8 +46,8 @@ KMyMoneyListViewItem::KMyMoneyListViewItem(TQListView* tqparent, const TQString& m_key = txt; } -KMyMoneyListViewItem::KMyMoneyListViewItem(TQListViewItem* tqparent, const TQString& txt, const TQString& key, const TQString& id) : - KListViewItem(tqparent, txt), +KMyMoneyListViewItem::KMyMoneyListViewItem(TQListViewItem* parent, const TQString& txt, const TQString& key, const TQString& id) : + KListViewItem(parent, txt), m_key(key), m_id(id), m_isOdd(0), @@ -102,15 +102,15 @@ bool KMyMoneyListViewItem::isAlternate(void) KMyMoneyCheckListItem* clItem; KMyMoneyListViewItem* liItem; bool previous = true; - if(TQListViewItem::tqparent()) { - clItem = dynamic_cast(TQListViewItem::tqparent()); - liItem = dynamic_cast(TQListViewItem::tqparent()); + if(TQListViewItem::parent()) { + clItem = dynamic_cast(TQListViewItem::parent()); + liItem = dynamic_cast(TQListViewItem::parent()); if(clItem) previous = clItem->m_isOdd; else previous = liItem->m_isOdd; - clItem = dynamic_cast(TQListViewItem::tqparent()->firstChild()); - liItem = dynamic_cast(TQListViewItem::tqparent()->firstChild()); + clItem = dynamic_cast(TQListViewItem::parent()->firstChild()); + liItem = dynamic_cast(TQListViewItem::parent()->firstChild()); } else { clItem = dynamic_cast(listView()->firstChild()); liItem = dynamic_cast(listView()->firstChild()); diff --git a/kmymoney2/widgets/kmymoneylistviewitem.h b/kmymoney2/widgets/kmymoneylistviewitem.h index 4009aef..72e41ea 100644 --- a/kmymoney2/widgets/kmymoneylistviewitem.h +++ b/kmymoney2/widgets/kmymoneylistviewitem.h @@ -46,8 +46,8 @@ class KMyMoneyListViewItem : public TQObject, public KListViewItem Q_OBJECT TQ_OBJECT public: - KMyMoneyListViewItem(TQListView *tqparent, const TQString& txt, const TQString& key, const TQString& id); - KMyMoneyListViewItem(TQListViewItem *tqparent, const TQString& txt, const TQString& key, const TQString& id); + KMyMoneyListViewItem(TQListView *parent, const TQString& txt, const TQString& key, const TQString& id); + KMyMoneyListViewItem(TQListViewItem *parent, const TQString& txt, const TQString& key, const TQString& id); ~KMyMoneyListViewItem(); const TQString& id(void) const { return m_id; }; diff --git a/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp b/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp index 5016716..e41d4b8 100644 --- a/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp +++ b/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp @@ -38,8 +38,8 @@ #include "kmymoneyonlinequoteconfig.h" #include "../converter/webpricequote.h" -kMyMoneyOnlineQuoteConfig::kMyMoneyOnlineQuoteConfig(TQWidget *tqparent, const char *name ) - : kMyMoneyOnlineQuoteConfigDecl(tqparent, name) +kMyMoneyOnlineQuoteConfig::kMyMoneyOnlineQuoteConfig(TQWidget *parent, const char *name ) + : kMyMoneyOnlineQuoteConfigDecl(parent, name) { #if 1 TQStringList groups = WebPriceQuote::quoteSources(); diff --git a/kmymoney2/widgets/kmymoneyonlinequoteconfig.h b/kmymoney2/widgets/kmymoneyonlinequoteconfig.h index 6a7a02c..89e1b8d 100644 --- a/kmymoney2/widgets/kmymoneyonlinequoteconfig.h +++ b/kmymoney2/widgets/kmymoneyonlinequoteconfig.h @@ -35,7 +35,7 @@ class kMyMoneyOnlineQuoteConfig : public kMyMoneyOnlineQuoteConfigDecl Q_OBJECT TQ_OBJECT public: - kMyMoneyOnlineQuoteConfig(TQWidget* tqparent, const char *name); + kMyMoneyOnlineQuoteConfig(TQWidget* parent, const char *name); virtual ~kMyMoneyOnlineQuoteConfig() {} void writeConfig(void) {} diff --git a/kmymoney2/widgets/kmymoneypriceview.cpp b/kmymoney2/widgets/kmymoneypriceview.cpp index d1b5c85..091e255 100644 --- a/kmymoney2/widgets/kmymoneypriceview.cpp +++ b/kmymoney2/widgets/kmymoneypriceview.cpp @@ -118,8 +118,8 @@ int KMyMoneyPriceItem::compare(TQListViewItem* i, int col, bool ascending) const return rc; } -KMyMoneyPriceView::KMyMoneyPriceView(TQWidget *tqparent, const char *name ) : - KListView(tqparent,name), +KMyMoneyPriceView::KMyMoneyPriceView(TQWidget *parent, const char *name ) : + KListView(parent,name), m_contextMenu(0), m_showAll(false) { diff --git a/kmymoney2/widgets/kmymoneypriceview.h b/kmymoney2/widgets/kmymoneypriceview.h index 0de47ef..6352846 100644 --- a/kmymoney2/widgets/kmymoneypriceview.h +++ b/kmymoney2/widgets/kmymoneypriceview.h @@ -61,7 +61,7 @@ class KMyMoneyPriceView : public KListView Q_OBJECT TQ_OBJECT public: - KMyMoneyPriceView(TQWidget *tqparent=0, const char *name=0); + KMyMoneyPriceView(TQWidget *parent=0, const char *name=0); ~KMyMoneyPriceView(); protected: diff --git a/kmymoney2/widgets/kmymoneyscheduledcalendar.cpp b/kmymoney2/widgets/kmymoneyscheduledcalendar.cpp index 0e203cc..4599eb5 100644 --- a/kmymoney2/widgets/kmymoneyscheduledcalendar.cpp +++ b/kmymoney2/widgets/kmymoneyscheduledcalendar.cpp @@ -36,8 +36,8 @@ #include "../widgets/kmymoneyscheduledcalendar.h" #include "../mymoney/mymoneyfile.h" -kMyMoneyScheduledCalendar::kMyMoneyScheduledCalendar(TQWidget *tqparent, const char *name ) - : kMyMoneyCalendar(tqparent,name) +kMyMoneyScheduledCalendar::kMyMoneyScheduledCalendar(TQWidget *parent, const char *name ) + : kMyMoneyCalendar(parent,name) { TQPushButton *pb1 = new TQPushButton(i18n("Select Schedules"), this); diff --git a/kmymoney2/widgets/kmymoneyscheduledcalendar.h b/kmymoney2/widgets/kmymoneyscheduledcalendar.h index b8e9096..f9bb4f7 100644 --- a/kmymoney2/widgets/kmymoneyscheduledcalendar.h +++ b/kmymoney2/widgets/kmymoneyscheduledcalendar.h @@ -55,7 +55,7 @@ public: /** * Standard constructor. **/ - kMyMoneyScheduledCalendar(TQWidget *tqparent=0, const char *name=0); + kMyMoneyScheduledCalendar(TQWidget *parent=0, const char *name=0); /** * Standard destructor. diff --git a/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp b/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp index 569f873..d8f053d 100644 --- a/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp +++ b/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp @@ -62,8 +62,8 @@ #include "kmymoneyscheduleddatetbl.h" #include "../mymoney/mymoneyfile.h" -kMyMoneyScheduledDateTbl::kMyMoneyScheduledDateTbl(TQWidget *tqparent, TQDate date_, const char* name, WFlags f ) - : kMyMoneyDateTbl(tqparent, date_, name, f), +kMyMoneyScheduledDateTbl::kMyMoneyScheduledDateTbl(TQWidget *parent, TQDate date_, const char* name, WFlags f ) + : kMyMoneyDateTbl(parent, date_, name, f), m_filterBills(false), m_filterDeposits(false), m_filterTransfers(false) { connect(&briefWidget, TQT_SIGNAL(enterClicked(const MyMoneySchedule&, const TQDate&)), this, TQT_SIGNAL(enterClicked(const MyMoneySchedule&, const TQDate&))); diff --git a/kmymoney2/widgets/kmymoneyscheduleddatetbl.h b/kmymoney2/widgets/kmymoneyscheduleddatetbl.h index 9e3e102..e607ad0 100644 --- a/kmymoney2/widgets/kmymoneyscheduleddatetbl.h +++ b/kmymoney2/widgets/kmymoneyscheduleddatetbl.h @@ -45,7 +45,7 @@ class kMyMoneyScheduledDateTbl : public kMyMoneyDateTbl Q_OBJECT TQ_OBJECT public: - kMyMoneyScheduledDateTbl(TQWidget *tqparent=0, + kMyMoneyScheduledDateTbl(TQWidget *parent=0, TQDate date=TQDate::tqcurrentDate(), const char* name=0, WFlags f=0); diff --git a/kmymoney2/widgets/kmymoneyselector.cpp b/kmymoney2/widgets/kmymoneyselector.cpp index b4af52f..17428ce 100644 --- a/kmymoney2/widgets/kmymoneyselector.cpp +++ b/kmymoney2/widgets/kmymoneyselector.cpp @@ -36,8 +36,8 @@ #include "../kmymoneyglobalsettings.h" -KMyMoneySelector::KMyMoneySelector(TQWidget *tqparent, const char *name, TQWidget::WFlags flags) : - TQWidget(tqparent, name, flags) +KMyMoneySelector::KMyMoneySelector(TQWidget *parent, const char *name, TQWidget::WFlags flags) : + TQWidget(parent, name, flags) { m_selMode = TQListView::Single; @@ -47,9 +47,9 @@ KMyMoneySelector::KMyMoneySelector(TQWidget *tqparent, const char *name, TQWidge m_listView->setSorting(-1); - if(tqparent) { - setFocusProxy(tqparent->focusProxy()); - m_listView->setFocusProxy(tqparent->focusProxy()); + if(parent) { + setFocusProxy(parent->focusProxy()); + m_listView->setFocusProxy(parent->focusProxy()); } m_listView->setAllColumnsShowFocus(true); @@ -144,17 +144,17 @@ TQListViewItem* KMyMoneySelector::newTopItem(const TQString& name, const TQStrin return p; } -TQListViewItem* KMyMoneySelector::newItem(TQListViewItem* tqparent, const TQString& name, const TQString& key, const TQString& id) +TQListViewItem* KMyMoneySelector::newItem(TQListViewItem* parent, const TQString& name, const TQString& key, const TQString& id) { TQListViewItem* p; if(m_selMode == TQListView::Multi) { - KMyMoneyCheckListItem* q = new KMyMoneyCheckListItem(tqparent, name, key, id); + KMyMoneyCheckListItem* q = new KMyMoneyCheckListItem(parent, name, key, id); connect(q, TQT_SIGNAL(stateChanged(bool)), this, TQT_SIGNAL(stateChanged(void))); p = static_cast (q); } else { - KMyMoneyListViewItem* q = new KMyMoneyListViewItem(tqparent, name, key, id); + KMyMoneyListViewItem* q = new KMyMoneyListViewItem(parent, name, key, id); p = static_cast (q); } @@ -542,9 +542,9 @@ int KMyMoneySelector::slotMakeCompletion(const TQRegExp& exp) // The way out of this is as follows: Make all items visible. // Then go through the list again and perform the checks. // If an item does not have any tqchildren (last leaf in the tree view) - // perform the check. Then check recursively on the tqparent of this + // perform the check. Then check recursively on the parent of this // leaf that it has no visible tqchildren. If that is the case, make the - // tqparent invisible and continue this check with it's tqparent. + // parent invisible and continue this check with it's parent. while((it_v = it.current()) != 0) { it_v->setVisible(true); ++it; @@ -559,15 +559,15 @@ int KMyMoneySelector::slotMakeCompletion(const TQRegExp& exp) if(!match(exp, it_v)) { // this is a node which does not contain the // text and does not have tqchildren. So we can - // safely hide it. Then we check, if the tqparent + // safely hide it. Then we check, if the parent // has more tqchildren which are still visible. If - // none are found, the tqparent node is hidden also. We + // none are found, the parent node is hidden also. We // continue until the top of the tree or until we // find a node that still has visible tqchildren. bool hide = true; while(hide) { it_v->setVisible(false); - it_v = it_v->tqparent(); + it_v = it_v->parent(); if(it_v && it_v->isSelectable()) { hide = !match(exp, it_v); TQListViewItem* child = it_v->firstChild(); @@ -591,11 +591,11 @@ int KMyMoneySelector::slotMakeCompletion(const TQRegExp& exp) // to display all child nodes in this case, so we need // to advance the iterator to the next sibling of the // current node. This could well be the sibling of a - // tqparent or grandtqparent node. + // parent or grandparent node. TQListViewItem* curr = it_v; TQListViewItem* item; while((item = curr->nextSibling()) == 0) { - curr = curr->tqparent(); + curr = curr->parent(); if(curr == 0) break; if(match(exp, curr)) diff --git a/kmymoney2/widgets/kmymoneyselector.h b/kmymoney2/widgets/kmymoneyselector.h index a0facf0..ad0d87b 100644 --- a/kmymoney2/widgets/kmymoneyselector.h +++ b/kmymoney2/widgets/kmymoneyselector.h @@ -55,7 +55,7 @@ class KMyMoneySelector : public TQWidget Q_OBJECT TQ_OBJECT public: - KMyMoneySelector(TQWidget *tqparent=0, const char *name=0, TQWidget::WFlags flags = 0); + KMyMoneySelector(TQWidget *parent=0, const char *name=0, TQWidget::WFlags flags = 0); virtual ~KMyMoneySelector(); /** @@ -206,20 +206,20 @@ public: * * @note The new item will be the first one in the selection * - * @param tqparent pointer to tqparent item + * @param parent pointer to parent item * @param name the displayed name * @param key String to be used for completion. If empty defaults to @a name * @param id the id used to identify the objects * * @return pointer to newly created object */ - TQListViewItem* newItem(TQListViewItem* tqparent, const TQString& name, const TQString& key, const TQString& id); + TQListViewItem* newItem(TQListViewItem* parent, const TQString& name, const TQString& key, const TQString& id); /** * This method creates a new selectable object depending on the * selection mode. This is either a KListViewItem for single * selection mode or a KMyMoneyCheckListItem for multi selection mode. - * In contrast to the above method, the tqparent is always the view. + * In contrast to the above method, the parent is always the view. * * @note The new item will be the first one in the selection * diff --git a/kmymoney2/widgets/kmymoneytitlelabel.cpp b/kmymoney2/widgets/kmymoneytitlelabel.cpp index bad8a77..db3dba2 100644 --- a/kmymoney2/widgets/kmymoneytitlelabel.cpp +++ b/kmymoney2/widgets/kmymoneytitlelabel.cpp @@ -36,8 +36,8 @@ #include "kmymoneytitlelabel.h" -KMyMoneyTitleLabel::KMyMoneyTitleLabel(TQWidget *tqparent, const char *name) : - TQLabel(tqparent, name), +KMyMoneyTitleLabel::KMyMoneyTitleLabel(TQWidget *parent, const char *name) : + TQLabel(parent, name), m_bgColor( KGlobalSettings::highlightColor() ), m_textColor( KGlobalSettings::highlightedTextColor() ) { diff --git a/kmymoney2/widgets/kmymoneytitlelabel.h b/kmymoney2/widgets/kmymoneytitlelabel.h index 2990205..b8c0dc0 100644 --- a/kmymoney2/widgets/kmymoneytitlelabel.h +++ b/kmymoney2/widgets/kmymoneytitlelabel.h @@ -45,7 +45,7 @@ class KMyMoneyTitleLabel : public TQLabel TQ_PROPERTY( TQString text READ text WRITE setText DESIGNABLE true ) public: - KMyMoneyTitleLabel(TQWidget *tqparent = 0, const char *name = 0); + KMyMoneyTitleLabel(TQWidget *parent = 0, const char *name = 0); ~KMyMoneyTitleLabel(); void setBgColor(const TQColor& _color) { m_bgColor = _color; } diff --git a/kmymoney2/widgets/kmymoneywizard.cpp b/kmymoney2/widgets/kmymoneywizard.cpp index 68eaf02..0c038bc 100644 --- a/kmymoney2/widgets/kmymoneywizard.cpp +++ b/kmymoney2/widgets/kmymoneywizard.cpp @@ -42,8 +42,8 @@ #include #include -KMyMoneyWizardPagePrivate::KMyMoneyWizardPagePrivate(TQObject* tqparent, const char* name) : - TQObject(tqparent, name) +KMyMoneyWizardPagePrivate::KMyMoneyWizardPagePrivate(TQObject* parent, const char* name) : + TQObject(parent, name) { } @@ -109,8 +109,8 @@ const TQString& KMyMoneyWizardPage::helpContext(void) const return TQString(); } -KMyMoneyWizard::KMyMoneyWizard(TQWidget *tqparent, const char *name, bool modal, WFlags f) : - TQDialog(tqparent, name, modal, f), +KMyMoneyWizard::KMyMoneyWizard(TQWidget *parent, const char *name, bool modal, WFlags f) : + TQDialog(parent, name, modal, f), m_step(0) { // enable the little grip in the right corner diff --git a/kmymoney2/widgets/kmymoneywizard.h b/kmymoney2/widgets/kmymoneywizard.h index 88d8530..803061e 100644 --- a/kmymoney2/widgets/kmymoneywizard.h +++ b/kmymoney2/widgets/kmymoneywizard.h @@ -70,7 +70,7 @@ class kMandatoryFieldGroup; * class KNewUserPage : public KMyMoneyWizardPage * { * public: - * KNewUserPage(unsigned int step, TQWidget* widget, KNewUserWizard* tqparent, const char* name); + * KNewUserPage(unsigned int step, TQWidget* widget, KNewUserWizard* parent, const char* name); * * protected: * KNewUserWizard* m_wizard; @@ -80,9 +80,9 @@ class kMandatoryFieldGroup; * The implementation of this class is rather straight-forward: * * @code - * KNewUserPage::KNewUserPage(unsigned int step, TQWidget* widget, KNewUserWizard* tqparent, const char* name) : + * KNewUserPage::KNewUserPage(unsigned int step, TQWidget* widget, KNewUserWizard* parent, const char* name) : * KMyMoneyWizardPage(step, widget, name), - * m_wizard(tqparent) + * m_wizard(parent) * { * } * @endcode @@ -102,7 +102,7 @@ class kMandatoryFieldGroup; * Q_OBJECT TQ_OBJECT * public: - * KNewUserGeneral(KNewUserWizard* tqparent, const char* name = 0); + * KNewUserGeneral(KNewUserWizard* parent, const char* name = 0); * KMyMoneyWizardPage* nextPage(void); * bool isLastPage(void) { return false; } * @@ -115,9 +115,9 @@ class kMandatoryFieldGroup; * fill some widgets, it could be as simple as: * * @code - * KNewUserGeneral::KNewUserGeneral(KNewUserWizard* tqparent, const char* name) : - * KNewUserGeneralDecl(tqparent), - * KNewUserPage(1, this, tqparent, name) + * KNewUserGeneral::KNewUserGeneral(KNewUserWizard* parent, const char* name) : + * KNewUserGeneralDecl(parent), + * KNewUserPage(1, this, parent, name) * { * kMandatoryFieldGroup* mandatoryGroup = new kMandatoryFieldGroup(this); * mandatoryGroup->add(m_userName); @@ -270,10 +270,10 @@ template class WizardPage : public KMyMoneyWizardPage { public: - WizardPage(unsigned int step, TQWidget* widget, T* tqparent, const char* name) : + WizardPage(unsigned int step, TQWidget* widget, T* parent, const char* name) : KMyMoneyWizardPage(step, widget, name), - m_wizard(tqparent), - m_wizardBase(tqparent) + m_wizard(parent), + m_wizardBase(parent) { } virtual ~WizardPage() {} @@ -337,7 +337,7 @@ protected: * Q_OBJECT TQ_OBJECT * public: - * KNewUserWizard(TQWidget* tqparent = 0, const char* name = 0, bool modal = false, WFlags flags = 0); + * KNewUserWizard(TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags flags = 0); * * private: * KNewUserGeneral* m_generalPage; @@ -355,8 +355,8 @@ protected: * The implementation is also easy and looks like this: * * @code - * KNewUserWizard::KNewUserWizard(TQWidget* tqparent, const char* name, bool modal, WFlags flags) : - * KMyMoneyWizard(tqparent, name, modal, flags) + * KNewUserWizard::KNewUserWizard(TQWidget* parent, const char* name, bool modal, WFlags flags) : + * KMyMoneyWizard(parent, name, modal, flags) * { * setTitle("KMyMoney New User Setup"); * addStep("General Data"); @@ -450,7 +450,7 @@ protected: /** * Constructor (kept protected, so that one cannot create such an object directly) */ - KMyMoneyWizard(TQWidget *tqparent = 0, const char *name = 0, bool modal = false, WFlags f = 0); + KMyMoneyWizard(TQWidget *parent = 0, const char *name = 0, bool modal = false, WFlags f = 0); /** * This method sets up the first page after creation of the object diff --git a/kmymoney2/widgets/kmymoneywizard_p.h b/kmymoney2/widgets/kmymoneywizard_p.h index 853cb46..fd4c169 100644 --- a/kmymoney2/widgets/kmymoneywizard_p.h +++ b/kmymoney2/widgets/kmymoneywizard_p.h @@ -44,7 +44,7 @@ public: /** * Constructor */ - KMyMoneyWizardPagePrivate(TQObject* tqparent, const char* name = 0); + KMyMoneyWizardPagePrivate(TQObject* parent, const char* name = 0); void emitCompleteStateChanged(void); diff --git a/kmymoney2/widgets/register.cpp b/kmymoney2/widgets/register.cpp index e448fe4..b01513e 100644 --- a/kmymoney2/widgets/register.cpp +++ b/kmymoney2/widgets/register.cpp @@ -124,7 +124,7 @@ void ItemPtrVector::sort(void) bool ItemPtrVector::item_cmp(RegisterItem* i1, RegisterItem* i2) { - const TQValueList& sortOrder = i1->tqparent()->sortOrder(); + const TQValueList& sortOrder = i1->parent()->sortOrder(); TQValueList::const_iterator it; int rc = 0; bool ok1, ok2; @@ -220,10 +220,10 @@ bool ItemPtrVector::item_cmp(RegisterItem* i1, RegisterItem* i2) return rc < 0; } -GroupMarker::GroupMarker(Register *tqparent, const TQString& txt) : - RegisterItem(tqparent), +GroupMarker::GroupMarker(Register *parent, const TQString& txt) : + RegisterItem(parent), m_txt(txt), - m_drawCounter(tqparent->drawCounter()-1), // make sure we get painted the first time around + m_drawCounter(parent->drawCounter()-1), // make sure we get painted the first time around m_showDate(false) { int h; @@ -359,21 +359,21 @@ int GroupMarker::rowHeightHint(void) const return m_bg->height(); } -StatementGroupMarker::StatementGroupMarker(Register* tqparent, CashFlowDirection dir, const TQDate& date, const TQString& txt) : - FancyDateGroupMarker(tqparent, date, txt), +StatementGroupMarker::StatementGroupMarker(Register* parent, CashFlowDirection dir, const TQDate& date, const TQString& txt) : + FancyDateGroupMarker(parent, date, txt), m_dir(dir) { m_showDate = true; } -FancyDateGroupMarker::FancyDateGroupMarker(Register* tqparent, const TQDate& date, const TQString& txt) : - GroupMarker(tqparent, txt), +FancyDateGroupMarker::FancyDateGroupMarker(Register* parent, const TQDate& date, const TQString& txt) : + GroupMarker(parent, txt), m_date(date) { } -FiscalYearGroupMarker::FiscalYearGroupMarker(Register* tqparent, const TQDate& date, const TQString& txt) : - FancyDateGroupMarker(tqparent, date, txt) +FiscalYearGroupMarker::FiscalYearGroupMarker(Register* parent, const TQDate& date, const TQString& txt) : + FancyDateGroupMarker(parent, date, txt) { } @@ -383,8 +383,8 @@ void FiscalYearGroupMarker::setupColors(TQColorGroup& cg) } -SimpleDateGroupMarker::SimpleDateGroupMarker(Register* tqparent, const TQDate& date, const TQString& txt) : - FancyDateGroupMarker(tqparent, date, txt) +SimpleDateGroupMarker::SimpleDateGroupMarker(Register* parent, const TQDate& date, const TQString& txt) : + FancyDateGroupMarker(parent, date, txt) { } @@ -431,8 +431,8 @@ void SimpleDateGroupMarker::paintRegisterCell(TQPainter* painter, int row, int / painter->restore(); } -TypeGroupMarker::TypeGroupMarker(Register* tqparent, CashFlowDirection dir, MyMoneyAccount::accountTypeE accType) : - GroupMarker(tqparent), +TypeGroupMarker::TypeGroupMarker(Register* parent, CashFlowDirection dir, MyMoneyAccount::accountTypeE accType) : + GroupMarker(parent), m_dir(dir) { switch(dir) { @@ -454,18 +454,18 @@ TypeGroupMarker::TypeGroupMarker(Register* tqparent, CashFlowDirection dir, MyMo } } -PayeeGroupMarker::PayeeGroupMarker(Register* tqparent, const TQString& name) : - GroupMarker(tqparent, name) +PayeeGroupMarker::PayeeGroupMarker(Register* parent, const TQString& name) : + GroupMarker(parent, name) { } -CategoryGroupMarker::CategoryGroupMarker(Register* tqparent, const TQString& category) : - GroupMarker(tqparent, category) +CategoryGroupMarker::CategoryGroupMarker(Register* parent, const TQString& category) : + GroupMarker(parent, category) { } -ReconcileGroupMarker::ReconcileGroupMarker(Register* tqparent, MyMoneySplit::reconcileFlagE state) : - GroupMarker(tqparent), +ReconcileGroupMarker::ReconcileGroupMarker(Register* parent, MyMoneySplit::reconcileFlagE state) : + GroupMarker(parent), m_state(state) { switch(state) { @@ -490,7 +490,7 @@ ReconcileGroupMarker::ReconcileGroupMarker(Register* tqparent, MyMoneySplit::rec class RegisterToolTip : public TQToolTip { public: - RegisterToolTip(TQWidget* tqparent, Register* reg); + RegisterToolTip(TQWidget* parent, Register* reg); void maybeTip(const TQPoint& pos); virtual ~RegisterToolTip() {} @@ -498,8 +498,8 @@ private: Register* m_register; }; -RegisterToolTip::RegisterToolTip(TQWidget* tqparent, Register * reg) : - TQToolTip(tqparent), +RegisterToolTip::RegisterToolTip(TQWidget* parent, Register * reg) : + TQToolTip(parent), m_register(reg) { } @@ -535,8 +535,8 @@ void RegisterToolTip::maybeTip(const TQPoint& pos) return; } -Register::Register(TQWidget *tqparent, const char *name ) : - TransactionEditorContainer(tqparent, name), +Register::Register(TQWidget *parent, const char *name ) : + TransactionEditorContainer(parent, name), m_selectAnchor(0), m_focusItem(0), m_firstItem(0), @@ -2197,17 +2197,17 @@ void Register::keyPressEvent(TQKeyEvent* ev) } } -Transaction* Register::transactionFactory(Register *tqparent, const MyMoneyTransaction& transaction, const MyMoneySplit& split, int uniqueId) +Transaction* Register::transactionFactory(Register *parent, const MyMoneyTransaction& transaction, const MyMoneySplit& split, int uniqueId) { Transaction* t = 0; MyMoneySplit s = split; - if(tqparent->account() == MyMoneyAccount()) { - t = new KMyMoneyRegister::StdTransaction(tqparent, transaction, s, uniqueId); + if(parent->account() == MyMoneyAccount()) { + t = new KMyMoneyRegister::StdTransaction(parent, transaction, s, uniqueId); return t; } - switch(tqparent->account().accountType()) { + switch(parent->account().accountType()) { case MyMoneyAccount::Checkings: case MyMoneyAccount::Savings: case MyMoneyAccount::Cash: @@ -2221,29 +2221,29 @@ Transaction* Register::transactionFactory(Register *tqparent, const MyMoneyTrans case MyMoneyAccount::AssetLoan: case MyMoneyAccount::Equity: if(s.accountId().isEmpty()) - s.setAccountId(tqparent->account().id()); + s.setAccountId(parent->account().id()); if(s.isMatched()) - t = new KMyMoneyRegister::StdTransactionMatched(tqparent, transaction, s, uniqueId); + t = new KMyMoneyRegister::StdTransactionMatched(parent, transaction, s, uniqueId); else if(transaction.isImported()) - t = new KMyMoneyRegister::StdTransactionDownloaded(tqparent, transaction, s, uniqueId); + t = new KMyMoneyRegister::StdTransactionDownloaded(parent, transaction, s, uniqueId); else - t = new KMyMoneyRegister::StdTransaction(tqparent, transaction, s, uniqueId); + t = new KMyMoneyRegister::StdTransaction(parent, transaction, s, uniqueId); break; case MyMoneyAccount::Investment: if(s.isMatched()) - t = new KMyMoneyRegister::InvestTransaction/* Matched */(tqparent, transaction, s, uniqueId); + t = new KMyMoneyRegister::InvestTransaction/* Matched */(parent, transaction, s, uniqueId); else if(transaction.isImported()) - t = new KMyMoneyRegister::InvestTransactionDownloaded(tqparent, transaction, s, uniqueId); + t = new KMyMoneyRegister::InvestTransactionDownloaded(parent, transaction, s, uniqueId); else - t = new KMyMoneyRegister::InvestTransaction(tqparent, transaction, s, uniqueId); + t = new KMyMoneyRegister::InvestTransaction(parent, transaction, s, uniqueId); break; case MyMoneyAccount::CertificateDep: case MyMoneyAccount::MoneyMarket: case MyMoneyAccount::Stock: default: - qDebug("Register::transactionFactory: invalid accountTypeE %d", tqparent->account().accountType()); + qDebug("Register::transactionFactory: invalid accountTypeE %d", parent->account().accountType()); break; } return t; diff --git a/kmymoney2/widgets/register.h b/kmymoney2/widgets/register.h index c155fc7..f73b888 100644 --- a/kmymoney2/widgets/register.h +++ b/kmymoney2/widgets/register.h @@ -101,7 +101,7 @@ public: void removeOrphans(void) { TQWidgetContainer::iterator it_w; for(it_w = begin(); it_w != end(); ) { - if((*it_w) && (*it_w)->tqparent()) + if((*it_w) && (*it_w)->parent()) ++it_w; else { delete (*it_w); @@ -116,7 +116,7 @@ public: class GroupMarker : public RegisterItem { public: - GroupMarker(Register* tqparent, const TQString& txt = TQString()); + GroupMarker(Register* parent, const TQString& txt = TQString()); ~GroupMarker(); void setText(const TQString& txt) { m_txt = txt; } const TQString& text(void) const { return m_txt; } @@ -152,7 +152,7 @@ protected: class FancyDateGroupMarker : public GroupMarker { public: - FancyDateGroupMarker(Register* tqparent, const TQDate& date, const TQString& txt); + FancyDateGroupMarker(Register* parent, const TQDate& date, const TQString& txt); virtual const TQDate& sortPostDate(void) const { return m_date; } virtual const TQDate& sortEntryDate(void) const { return m_date; } @@ -164,7 +164,7 @@ private: class StatementGroupMarker : public FancyDateGroupMarker { public: - StatementGroupMarker(Register* tqparent, CashFlowDirection dir, const TQDate& date, const TQString& txt ); + StatementGroupMarker(Register* parent, CashFlowDirection dir, const TQDate& date, const TQString& txt ); CashFlowDirection sortType(void) const { return m_dir; } virtual int sortSamePostDate(void) const { return 3; } private: @@ -174,7 +174,7 @@ private: class SimpleDateGroupMarker : public FancyDateGroupMarker { public: - SimpleDateGroupMarker(Register* tqparent, const TQDate& date, const TQString& txt); + SimpleDateGroupMarker(Register* parent, const TQDate& date, const TQString& txt); void paintRegisterCell(TQPainter* painter, int row, int col, const TQRect& r, bool selected, const TQColorGroup& cg); int rowHeightHint(void) const; virtual const char* className(void) { return "SimpleDateGroupMarker"; } @@ -183,7 +183,7 @@ public: class TypeGroupMarker : public GroupMarker { public: - TypeGroupMarker(Register* tqparent, CashFlowDirection dir, MyMoneyAccount::accountTypeE accType); + TypeGroupMarker(Register* parent, CashFlowDirection dir, MyMoneyAccount::accountTypeE accType); CashFlowDirection sortType(void) const { return m_dir; } private: CashFlowDirection m_dir; @@ -192,7 +192,7 @@ private: class FiscalYearGroupMarker : public FancyDateGroupMarker { public: - FiscalYearGroupMarker(Register* tqparent, const TQDate& date, const TQString& txt); + FiscalYearGroupMarker(Register* parent, const TQDate& date, const TQString& txt); virtual const char* className(void) { return "FiscalYearGroupMarker"; } virtual int sortSamePostDate(void) const { return 1; } @@ -203,14 +203,14 @@ protected: class PayeeGroupMarker : public GroupMarker { public: - PayeeGroupMarker(Register* tqparent, const TQString& name); + PayeeGroupMarker(Register* parent, const TQString& name); const TQString& sortPayee(void) const { return m_txt; } }; class CategoryGroupMarker : public GroupMarker { public: - CategoryGroupMarker(Register* tqparent, const TQString& category); + CategoryGroupMarker(Register* parent, const TQString& category); const TQString& sortCategory(void) const { return m_txt; } const TQString& sortSecurity(void) const { return m_txt; } @@ -220,7 +220,7 @@ public: class ReconcileGroupMarker : public GroupMarker { public: - ReconcileGroupMarker(Register* tqparent, MyMoneySplit::reconcileFlagE state); + ReconcileGroupMarker(Register* parent, MyMoneySplit::reconcileFlagE state); virtual MyMoneySplit::reconcileFlagE sortReconcileState(void) const { return m_state; } private: MyMoneySplit::reconcileFlagE m_state; @@ -255,7 +255,7 @@ class Register : public TransactionEditorContainer friend class InvestTransaction; public: - Register(TQWidget *tqparent = 0, const char *name = 0); + Register(TQWidget *parent = 0, const char *name = 0); virtual ~Register(); /** @@ -418,14 +418,14 @@ public: * This method creates a specifc transaction according to the * transaction passed in @a transaction. * - * @param tqparent pointer to register where the created object should be added + * @param parent pointer to register where the created object should be added * @param transaction the transaction which should be used to create the object * @param split the split of the transaction which should be used to create the object * @param uniqueId an int that will be used to construct the id of the item * * @return pointer to created object (0 upon failure) */ - static Transaction* transactionFactory(Register *tqparent, const MyMoneyTransaction& transaction, const MyMoneySplit& split, int uniqueId); + static Transaction* transactionFactory(Register *parent, const MyMoneyTransaction& transaction, const MyMoneySplit& split, int uniqueId); const MyMoneyAccount& account(void) const { return m_account; } diff --git a/kmymoney2/widgets/registeritem.cpp b/kmymoney2/widgets/registeritem.cpp index 0a67fe2..58a9ef6 100644 --- a/kmymoney2/widgets/registeritem.cpp +++ b/kmymoney2/widgets/registeritem.cpp @@ -42,13 +42,13 @@ RegisterItem::RegisterItem() : init(); } -RegisterItem::RegisterItem(Register* tqparent) : - m_parent(tqparent), +RegisterItem::RegisterItem(Register* parent) : + m_parent(parent), m_prev(0), m_next(0) { init(); - tqparent->addItem(this); + parent->addItem(this); } void RegisterItem::init(void) @@ -64,9 +64,9 @@ RegisterItem::~RegisterItem() m_parent->removeItem(this); } -void RegisterItem::setParent(Register* tqparent) +void RegisterItem::setParent(Register* parent) { - m_parent = tqparent; + m_parent = parent; } void RegisterItem::setNumRowsRegister(int rows) diff --git a/kmymoney2/widgets/registeritem.h b/kmymoney2/widgets/registeritem.h index b75de1b..e9c21d3 100644 --- a/kmymoney2/widgets/registeritem.h +++ b/kmymoney2/widgets/registeritem.h @@ -67,7 +67,7 @@ class RegisterItem { public: RegisterItem(); - RegisterItem(Register* tqparent); + RegisterItem(Register* parent); virtual ~RegisterItem(); virtual const char* className(void) = 0; @@ -150,18 +150,18 @@ public: virtual const TQString& id(void) const { return MyMoneyObject::emptyId(); } /** - * Sets the tqparent of this item to be the register @p tqparent + * Sets the parent of this item to be the register @p parent * - * @param tqparent pointer to register + * @param parent pointer to register */ - void setParent(Register* tqparent); + void setParent(Register* parent); /** - * This member returns a pointer to the tqparent object + * This member returns a pointer to the parent object * * @retval pointer to Register */ - Register* tqparent(void) const { return m_parent; } + Register* parent(void) const { return m_parent; } void setNeedResize(void) { m_needResize = true; } diff --git a/kmymoney2/widgets/registersearchline.cpp b/kmymoney2/widgets/registersearchline.cpp index 61df5cb..d157808 100644 --- a/kmymoney2/widgets/registersearchline.cpp +++ b/kmymoney2/widgets/registersearchline.cpp @@ -53,15 +53,15 @@ public: int status; }; -RegisterSearchLine::RegisterSearchLine(TQWidget* tqparent, Register* reg, const char* name) : - KLineEdit(tqparent, name), +RegisterSearchLine::RegisterSearchLine(TQWidget* parent, Register* reg, const char* name) : + KLineEdit(parent, name), d(new RegisterSearchLinePrivate) { init(reg); } -RegisterSearchLine::RegisterSearchLine(TQWidget* tqparent, const char* name) : - KLineEdit(tqparent, name), +RegisterSearchLine::RegisterSearchLine(TQWidget* parent, const char* name) : + KLineEdit(parent, name), d(new RegisterSearchLinePrivate) { init(0); @@ -251,8 +251,8 @@ class RegisterSearchLineWidget::RegisterSearchLineWidgetPrivate }; -RegisterSearchLineWidget::RegisterSearchLineWidget(Register* reg, TQWidget* tqparent, const char* name) : - TQHBox(tqparent, name), +RegisterSearchLineWidget::RegisterSearchLineWidget(Register* reg, TQWidget* parent, const char* name) : + TQHBox(parent, name), d(new RegisterSearchLineWidgetPrivate) { d->reg = reg; diff --git a/kmymoney2/widgets/registersearchline.h b/kmymoney2/widgets/registersearchline.h index e9fcb39..9f5074d 100644 --- a/kmymoney2/widgets/registersearchline.h +++ b/kmymoney2/widgets/registersearchline.h @@ -55,14 +55,14 @@ public: * If @a reg is null then the widget will be disabled until a register * is set with setRegister(). */ - RegisterSearchLine(TQWidget* tqparent = 0, Register* reg = 0, const char* name = 0); + RegisterSearchLine(TQWidget* parent = 0, Register* reg = 0, const char* name = 0); /** * Constructs a RegisterSearchLine * * The widget will be disabled until a register is set with setRegister(). */ - RegisterSearchLine(TQWidget* tqparent = 0, const char* name = 0); + RegisterSearchLine(TQWidget* parent = 0, const char* name = 0); /** * Destroys the object @@ -113,10 +113,10 @@ class KMYMONEY_EXPORT RegisterSearchLineWidget : public TQHBox TQ_OBJECT public: /** - * Creates a RegisterSearchLineWidget for @a reg with @a tqparent as the - * tqparent and with @a name. + * Creates a RegisterSearchLineWidget for @a reg with @a parent as the + * parent and with @a name. */ - RegisterSearchLineWidget(Register* reg = 0, TQWidget* tqparent = 0, const char* name = 0); + RegisterSearchLineWidget(Register* reg = 0, TQWidget* parent = 0, const char* name = 0); /** * Destroys the object diff --git a/kmymoney2/widgets/scheduledtransaction.cpp b/kmymoney2/widgets/scheduledtransaction.cpp index 5842247..c954b85 100644 --- a/kmymoney2/widgets/scheduledtransaction.cpp +++ b/kmymoney2/widgets/scheduledtransaction.cpp @@ -33,9 +33,9 @@ using namespace KMyMoneyRegister; using namespace KMyMoneyTransactionForm; -StdTransactionScheduled::StdTransactionScheduled(Register *tqparent, const MyMoneyTransaction& transaction, const MyMoneySplit& split, int uniqueId) : - StdTransaction(tqparent, transaction, split, uniqueId), - m_drawCounter(tqparent->drawCounter()-1) +StdTransactionScheduled::StdTransactionScheduled(Register *parent, const MyMoneyTransaction& transaction, const MyMoneySplit& split, int uniqueId) : + StdTransaction(parent, transaction, split, uniqueId), + m_drawCounter(parent->drawCounter()-1) { // setup initial size setNumRowsRegister(numRowsRegister(KMyMoneyGlobalSettings::showRegisterDetailed())); diff --git a/kmymoney2/widgets/scheduledtransaction.h b/kmymoney2/widgets/scheduledtransaction.h index a1530ec..1c88f5b 100644 --- a/kmymoney2/widgets/scheduledtransaction.h +++ b/kmymoney2/widgets/scheduledtransaction.h @@ -38,7 +38,7 @@ namespace KMyMoneyRegister { class StdTransactionScheduled : public StdTransaction { public: - StdTransactionScheduled(Register* tqparent, const MyMoneyTransaction& transaction, const MyMoneySplit& split, int uniqueId); + StdTransactionScheduled(Register* parent, const MyMoneyTransaction& transaction, const MyMoneySplit& split, int uniqueId); virtual ~StdTransactionScheduled() {} virtual const char* className(void) { return "StdTransactionScheduled"; } diff --git a/kmymoney2/widgets/sortoptionlistitem.h b/kmymoney2/widgets/sortoptionlistitem.h index 84504c0..9276b16 100644 --- a/kmymoney2/widgets/sortoptionlistitem.h +++ b/kmymoney2/widgets/sortoptionlistitem.h @@ -349,7 +349,7 @@ static const char * sortDescendingXpm[] = { class SortOptionListItem : public KListViewItem { public: - SortOptionListItem(TQListView* tqparent, TQListViewItem* after, const TQString& txt, int direction); + SortOptionListItem(TQListView* parent, TQListViewItem* after, const TQString& txt, int direction); int direction(void) const; public slots: @@ -362,8 +362,8 @@ private: int m_direction; }; -SortOptionListItem::SortOptionListItem(TQListView* tqparent, TQListViewItem* after, const TQString& txt, int direction) : - KListViewItem(tqparent, after, txt) +SortOptionListItem::SortOptionListItem(TQListView* parent, TQListViewItem* after, const TQString& txt, int direction) : + KListViewItem(parent, after, txt) { m_direction = (direction >= 0) ? 1 : -1; setPixmap(); diff --git a/kmymoney2/widgets/stdtransactiondownloaded.cpp b/kmymoney2/widgets/stdtransactiondownloaded.cpp index 503ab15..caabdbf 100644 --- a/kmymoney2/widgets/stdtransactiondownloaded.cpp +++ b/kmymoney2/widgets/stdtransactiondownloaded.cpp @@ -34,8 +34,8 @@ using namespace KMyMoneyRegister; using namespace KMyMoneyTransactionForm; -StdTransactionDownloaded::StdTransactionDownloaded(Register *tqparent, const MyMoneyTransaction& transaction, const MyMoneySplit& split, int uniqueId) : - StdTransaction(tqparent, transaction, split, uniqueId) +StdTransactionDownloaded::StdTransactionDownloaded(Register *parent, const MyMoneyTransaction& transaction, const MyMoneySplit& split, int uniqueId) : + StdTransaction(parent, transaction, split, uniqueId) { } @@ -51,8 +51,8 @@ bool StdTransactionDownloaded::paintRegisterCellSetup(TQPainter* painter, int& r return rc; } -InvestTransactionDownloaded::InvestTransactionDownloaded(Register *tqparent, const MyMoneyTransaction& transaction, const MyMoneySplit& split, int uniqueId) : - InvestTransaction(tqparent, transaction, split, uniqueId) +InvestTransactionDownloaded::InvestTransactionDownloaded(Register *parent, const MyMoneyTransaction& transaction, const MyMoneySplit& split, int uniqueId) : + InvestTransaction(parent, transaction, split, uniqueId) { } diff --git a/kmymoney2/widgets/stdtransactiondownloaded.h b/kmymoney2/widgets/stdtransactiondownloaded.h index 0320882..d07b9b5 100644 --- a/kmymoney2/widgets/stdtransactiondownloaded.h +++ b/kmymoney2/widgets/stdtransactiondownloaded.h @@ -38,7 +38,7 @@ namespace KMyMoneyRegister { class StdTransactionDownloaded : public StdTransaction { public: - StdTransactionDownloaded(Register* tqparent, const MyMoneyTransaction& transaction, const MyMoneySplit& split, int uniqueId); + StdTransactionDownloaded(Register* parent, const MyMoneyTransaction& transaction, const MyMoneySplit& split, int uniqueId); virtual ~StdTransactionDownloaded() {} virtual const char* className(void) { return "StdTransactionDownloaded"; } @@ -90,7 +90,7 @@ public: class InvestTransactionDownloaded : public InvestTransaction { public: - InvestTransactionDownloaded(Register* tqparent, const MyMoneyTransaction& transaction, const MyMoneySplit& split, int uniqueId); + InvestTransactionDownloaded(Register* parent, const MyMoneyTransaction& transaction, const MyMoneySplit& split, int uniqueId); virtual ~InvestTransactionDownloaded() {} virtual const char* className(void) { return "InvestTransactionDownloaded"; } diff --git a/kmymoney2/widgets/stdtransactionmatched.cpp b/kmymoney2/widgets/stdtransactionmatched.cpp index ff5ccc3..352999e 100644 --- a/kmymoney2/widgets/stdtransactionmatched.cpp +++ b/kmymoney2/widgets/stdtransactionmatched.cpp @@ -36,9 +36,9 @@ using namespace KMyMoneyRegister; using namespace KMyMoneyTransactionForm; -StdTransactionMatched::StdTransactionMatched(Register *tqparent, const MyMoneyTransaction& transaction, const MyMoneySplit& split, int uniqueId) : - StdTransaction(tqparent, transaction, split, uniqueId), - m_drawCounter(tqparent->drawCounter()-1) +StdTransactionMatched::StdTransactionMatched(Register *parent, const MyMoneyTransaction& transaction, const MyMoneySplit& split, int uniqueId) : + StdTransaction(parent, transaction, split, uniqueId), + m_drawCounter(parent->drawCounter()-1) { // setup initial size setNumRowsRegister(numRowsRegister(KMyMoneyGlobalSettings::showRegisterDetailed())); diff --git a/kmymoney2/widgets/stdtransactionmatched.h b/kmymoney2/widgets/stdtransactionmatched.h index e8959a9..2340c68 100644 --- a/kmymoney2/widgets/stdtransactionmatched.h +++ b/kmymoney2/widgets/stdtransactionmatched.h @@ -41,7 +41,7 @@ class StdTransactionMatched : public StdTransaction static const int m_additionalRows = 3; public: - StdTransactionMatched(Register* tqparent, const MyMoneyTransaction& transaction, const MyMoneySplit& split, int uniqueId); + StdTransactionMatched(Register* parent, const MyMoneyTransaction& transaction, const MyMoneySplit& split, int uniqueId); virtual ~StdTransactionMatched() {} virtual const char* className(void) { return "StdTransactionMatched"; } diff --git a/kmymoney2/widgets/transaction.cpp b/kmymoney2/widgets/transaction.cpp index dc5e5a2..c56e4d1 100644 --- a/kmymoney2/widgets/transaction.cpp +++ b/kmymoney2/widgets/transaction.cpp @@ -135,8 +135,8 @@ static unsigned char attentionSign[] = { 0x42,0x60,0x82 }; -Transaction::Transaction(Register *tqparent, const MyMoneyTransaction& transaction, const MyMoneySplit& split, int uniqueId) : - RegisterItem(tqparent), +Transaction::Transaction(Register *parent, const MyMoneyTransaction& transaction, const MyMoneySplit& split, int uniqueId) : + RegisterItem(parent), m_transaction(transaction), m_split(split), m_form(0), @@ -160,7 +160,7 @@ Transaction::Transaction(Register *tqparent, const MyMoneyTransaction& transacti if(!m_split.payeeId().isEmpty()) { m_payee = file->payee(m_split.payeeId()).name(); } - if(tqparent->account().isIncomeExpense()) { + if(parent->account().isIncomeExpense()) { m_payeeHeader = m_split.shares().isNegative() ? i18n("From") : i18n("Pay to"); } else { m_payeeHeader = m_split.shares().isNegative() ? i18n("Pay to") : i18n("From"); @@ -839,8 +839,8 @@ void Transaction::setSelected(bool selected) m_selected = selected; } -StdTransaction::StdTransaction(Register *tqparent, const MyMoneyTransaction& transaction, const MyMoneySplit& split, int uniqueId) : - Transaction(tqparent, transaction, split, uniqueId), +StdTransaction::StdTransaction(Register *parent, const MyMoneyTransaction& transaction, const MyMoneySplit& split, int uniqueId) : + Transaction(parent, transaction, split, uniqueId), m_showAccountRow(false) { try { @@ -889,7 +889,7 @@ StdTransaction::StdTransaction(Register *tqparent, const MyMoneyTransaction& tra // setup initial size setNumRowsRegister(numRowsRegister(KMyMoneyGlobalSettings::showRegisterDetailed())); - emit tqparent->itemAdded(this); + emit parent->itemAdded(this); } void StdTransaction::setupFormHeader(const TQString& id) @@ -1376,8 +1376,8 @@ TransactionEditor* StdTransaction::createEditor(TransactionEditorContainer* regF return new StdTransactionEditor(regForm, this, list, lastPostDate); } -InvestTransaction::InvestTransaction(Register *tqparent, const MyMoneyTransaction& transaction, const MyMoneySplit& split, int uniqueId) : - Transaction(tqparent, transaction, split, uniqueId) +InvestTransaction::InvestTransaction(Register *parent, const MyMoneyTransaction& transaction, const MyMoneySplit& split, int uniqueId) : + Transaction(parent, transaction, split, uniqueId) { // dissect the transaction into its type, splits, currency, security etc. InvestTransactionEditor::dissectTransaction(m_transaction, m_split, @@ -1429,7 +1429,7 @@ InvestTransaction::InvestTransaction(Register *tqparent, const MyMoneyTransactio // setup initial size setNumRowsRegister(numRowsRegister(KMyMoneyGlobalSettings::showRegisterDetailed())); - emit tqparent->itemAdded(this); + emit parent->itemAdded(this); } void InvestTransaction::setupForm(TransactionForm* form) diff --git a/kmymoney2/widgets/transaction.h b/kmymoney2/widgets/transaction.h index f74bb60..a24c864 100644 --- a/kmymoney2/widgets/transaction.h +++ b/kmymoney2/widgets/transaction.h @@ -68,7 +68,7 @@ typedef enum { class Transaction : public RegisterItem { public: - Transaction(Register* tqparent, const MyMoneyTransaction& transaction, const MyMoneySplit& split, int uniqueId); + Transaction(Register* parent, const MyMoneyTransaction& transaction, const MyMoneySplit& split, int uniqueId); virtual ~Transaction() {} virtual const char* className(void) { return "Transaction"; } @@ -292,7 +292,7 @@ protected: class StdTransaction : public Transaction { public: - StdTransaction(Register* tqparent, const MyMoneyTransaction& transaction, const MyMoneySplit& split, int uniqueId); + StdTransaction(Register* parent, const MyMoneyTransaction& transaction, const MyMoneySplit& split, int uniqueId); virtual ~StdTransaction() {} virtual const char* className(void) { return "StdTransaction"; } @@ -343,7 +343,7 @@ private: class InvestTransaction : public Transaction { public: - InvestTransaction(Register* tqparent, const MyMoneyTransaction& transaction, const MyMoneySplit& split, int uniqueId); + InvestTransaction(Register* parent, const MyMoneyTransaction& transaction, const MyMoneySplit& split, int uniqueId); virtual ~InvestTransaction() {} virtual const TQString& sortSecurity(void) const { return m_security.name(); } diff --git a/kmymoney2/widgets/transactioneditorcontainer.h b/kmymoney2/widgets/transactioneditorcontainer.h index 6cf82cf..f46a8df 100644 --- a/kmymoney2/widgets/transactioneditorcontainer.h +++ b/kmymoney2/widgets/transactioneditorcontainer.h @@ -45,7 +45,7 @@ typedef enum { class TransactionEditorContainer : public TQTable { public: - TransactionEditorContainer(TQWidget* tqparent, const char* name) : TQTable(tqparent, name) {} + TransactionEditorContainer(TQWidget* parent, const char* name) : TQTable(parent, name) {} virtual void arrangeEditWidgets(TQMap& editWidgets, KMyMoneyRegister::Transaction* t) = 0; virtual void removeEditWidgets(TQMap& editWidgets) = 0; diff --git a/kmymoney2/widgets/transactionform.cpp b/kmymoney2/widgets/transactionform.cpp index 8e56571..b1d55cd 100644 --- a/kmymoney2/widgets/transactionform.cpp +++ b/kmymoney2/widgets/transactionform.cpp @@ -47,8 +47,8 @@ using namespace KMyMoneyTransactionForm; -TabBar::TabBar(TQWidget* tqparent, const char* name) : - TQTabBar(tqparent, name), +TabBar::TabBar(TQWidget* parent, const char* name) : + TQTabBar(parent, name), m_signalType(SignalNormal) { connect(this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(slotTabSelected(int))); @@ -165,8 +165,8 @@ void TabBar::copyTabs(const TabBar* otabbar) } } -TransactionForm::TransactionForm(TQWidget *tqparent, const char *name) : - TransactionEditorContainer(tqparent, name), +TransactionForm::TransactionForm(TQWidget *parent, const char *name) : + TransactionEditorContainer(parent, name), m_transaction(0), m_tabBar(0) { @@ -266,12 +266,12 @@ void TransactionForm::paintCell(TQPainter* painter, int row, int col, const TQRe } } -TabBar* TransactionForm::tabBar(TQWidget* tqparent) +TabBar* TransactionForm::tabBar(TQWidget* parent) { - if(!m_tabBar && tqparent) { + if(!m_tabBar && parent) { // determine the height of the objects in the table // create the tab bar - m_tabBar = new TabBar( tqparent ); + m_tabBar = new TabBar( parent ); m_tabBar->setSignalEmission(TabBar::SignalAlways); m_tabBar->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, m_tabBar->sizePolicy().hasHeightForWidth() ) ); connect(m_tabBar, TQT_SIGNAL(tabSelected(int)), this, TQT_SLOT(slotActionSelected(int))); diff --git a/kmymoney2/widgets/transactionform.h b/kmymoney2/widgets/transactionform.h index 5c50248..f07a1e4 100644 --- a/kmymoney2/widgets/transactionform.h +++ b/kmymoney2/widgets/transactionform.h @@ -58,7 +58,7 @@ public: SignalAlways // always signal selection of a tab } SignalEmissionE; - TabBar(TQWidget* tqparent = 0, const char* name = 0); + TabBar(TQWidget* parent = 0, const char* name = 0); virtual ~TabBar() {} SignalEmissionE setSignalEmission(SignalEmissionE type); @@ -126,7 +126,7 @@ class TransactionForm : public TransactionEditorContainer Q_OBJECT TQ_OBJECT public: - TransactionForm(TQWidget *tqparent = 0, const char *name = 0); + TransactionForm(TQWidget *parent = 0, const char *name = 0); virtual ~TransactionForm() {} /** @@ -152,7 +152,7 @@ public: */ void setCurrentCell(int, int) {} - TabBar* tabBar(TQWidget* tqparent = 0); + TabBar* tabBar(TQWidget* parent = 0); void setupForm(const MyMoneyAccount& acc); -- cgit v1.2.1