summaryrefslogtreecommitdiffstats
path: root/kmymoney2
diff options
context:
space:
mode:
Diffstat (limited to 'kmymoney2')
-rw-r--r--kmymoney2/converter/mymoneygncreader.cpp54
-rw-r--r--kmymoney2/converter/mymoneygncreader.h8
-rw-r--r--kmymoney2/converter/mymoneyqifreader.cpp26
-rw-r--r--kmymoney2/converter/mymoneystatementreader.cpp28
-rw-r--r--kmymoney2/converter/mymoneytemplate.cpp30
-rw-r--r--kmymoney2/converter/mymoneytemplate.h6
-rw-r--r--kmymoney2/converter/webpricequote.cpp4
-rw-r--r--kmymoney2/converter/webpricequote.h2
-rw-r--r--kmymoney2/dialogs/investtransactioneditor.cpp4
-rw-r--r--kmymoney2/dialogs/kaccountselectdlg.cpp4
-rw-r--r--kmymoney2/dialogs/kaccountselectdlg.h2
-rw-r--r--kmymoney2/dialogs/kbackupdlg.cpp4
-rw-r--r--kmymoney2/dialogs/kbackupdlg.h2
-rw-r--r--kmymoney2/dialogs/kbalancechartdlg.cpp4
-rw-r--r--kmymoney2/dialogs/kbalancechartdlg.h2
-rw-r--r--kmymoney2/dialogs/kbalancewarning.cpp8
-rw-r--r--kmymoney2/dialogs/kbalancewarning.h4
-rw-r--r--kmymoney2/dialogs/kcategoryreassigndlg.cpp4
-rw-r--r--kmymoney2/dialogs/kcategoryreassigndlg.h2
-rw-r--r--kmymoney2/dialogs/kchooseimportexportdlg.cpp4
-rw-r--r--kmymoney2/dialogs/kchooseimportexportdlg.h2
-rw-r--r--kmymoney2/dialogs/kconfirmmanualenterdlg.cpp4
-rw-r--r--kmymoney2/dialogs/kconfirmmanualenterdlg.h2
-rw-r--r--kmymoney2/dialogs/kcsvprogressdlg.cpp4
-rw-r--r--kmymoney2/dialogs/kcsvprogressdlg.h2
-rw-r--r--kmymoney2/dialogs/kcurrencycalculator.cpp4
-rw-r--r--kmymoney2/dialogs/kcurrencycalculator.h4
-rw-r--r--kmymoney2/dialogs/kcurrencyeditdlg.cpp4
-rw-r--r--kmymoney2/dialogs/kcurrencyeditdlg.h2
-rw-r--r--kmymoney2/dialogs/keditequityentrydlg.cpp4
-rw-r--r--kmymoney2/dialogs/keditequityentrydlg.h2
-rw-r--r--kmymoney2/dialogs/keditloanwizard.cpp4
-rw-r--r--kmymoney2/dialogs/keditloanwizard.h2
-rw-r--r--kmymoney2/dialogs/keditscheduledlg.cpp8
-rw-r--r--kmymoney2/dialogs/keditscheduledlg.h2
-rw-r--r--kmymoney2/dialogs/kendingbalancedlg.cpp12
-rw-r--r--kmymoney2/dialogs/kendingbalancedlg.h8
-rw-r--r--kmymoney2/dialogs/kenterscheduledlg.cpp8
-rw-r--r--kmymoney2/dialogs/kenterscheduledlg.h2
-rw-r--r--kmymoney2/dialogs/kequitypriceupdatedlg.cpp4
-rw-r--r--kmymoney2/dialogs/kequitypriceupdatedlg.h2
-rw-r--r--kmymoney2/dialogs/kexportdlg.cpp4
-rw-r--r--kmymoney2/dialogs/kexportdlg.h2
-rw-r--r--kmymoney2/dialogs/kfindtransactiondlg.cpp4
-rw-r--r--kmymoney2/dialogs/kfindtransactiondlg.h2
-rw-r--r--kmymoney2/dialogs/kgncimportoptionsdlg.cpp4
-rw-r--r--kmymoney2/dialogs/kgncimportoptionsdlg.h2
-rw-r--r--kmymoney2/dialogs/kgncpricesourcedlg.cpp4
-rw-r--r--kmymoney2/dialogs/kgncpricesourcedlg.h2
-rw-r--r--kmymoney2/dialogs/kgpgkeyselectiondlg.cpp4
-rw-r--r--kmymoney2/dialogs/kgpgkeyselectiondlg.h2
-rw-r--r--kmymoney2/dialogs/kimportdlg.cpp4
-rw-r--r--kmymoney2/dialogs/kimportdlg.h2
-rw-r--r--kmymoney2/dialogs/kloadtemplatedlg.cpp4
-rw-r--r--kmymoney2/dialogs/kloadtemplatedlg.h2
-rw-r--r--kmymoney2/dialogs/kmergetransactionsdlg.cpp4
-rw-r--r--kmymoney2/dialogs/kmergetransactionsdlg.h2
-rw-r--r--kmymoney2/dialogs/kmymoneyfileinfodlg.cpp4
-rw-r--r--kmymoney2/dialogs/kmymoneyfileinfodlg.h2
-rw-r--r--kmymoney2/dialogs/kmymoneypricedlg.cpp4
-rw-r--r--kmymoney2/dialogs/kmymoneypricedlg.h2
-rw-r--r--kmymoney2/dialogs/kmymoneysplittable.cpp4
-rw-r--r--kmymoney2/dialogs/kmymoneysplittable.h2
-rw-r--r--kmymoney2/dialogs/knewaccountdlg.cpp28
-rw-r--r--kmymoney2/dialogs/knewaccountdlg.h8
-rw-r--r--kmymoney2/dialogs/knewbankdlg.cpp4
-rw-r--r--kmymoney2/dialogs/knewbankdlg.h2
-rw-r--r--kmymoney2/dialogs/knewbudgetdlg.cpp4
-rw-r--r--kmymoney2/dialogs/knewbudgetdlg.h2
-rw-r--r--kmymoney2/dialogs/knewequityentrydlg.cpp4
-rw-r--r--kmymoney2/dialogs/knewequityentrydlg.h2
-rw-r--r--kmymoney2/dialogs/knewfiledlg.cpp8
-rw-r--r--kmymoney2/dialogs/knewfiledlg.h4
-rw-r--r--kmymoney2/dialogs/knewinvestmentwizard.cpp16
-rw-r--r--kmymoney2/dialogs/knewinvestmentwizard.h8
-rw-r--r--kmymoney2/dialogs/knewloanwizard.cpp4
-rw-r--r--kmymoney2/dialogs/knewloanwizard.h2
-rw-r--r--kmymoney2/dialogs/konlinequoteconfigurationdlg.cpp2
-rw-r--r--kmymoney2/dialogs/konlinequoteconfigurationdlg.h2
-rw-r--r--kmymoney2/dialogs/kpayeereassigndlg.cpp4
-rw-r--r--kmymoney2/dialogs/kpayeereassigndlg.h2
-rw-r--r--kmymoney2/dialogs/krecentfileitem.cpp8
-rw-r--r--kmymoney2/dialogs/krecentfileitem.h2
-rw-r--r--kmymoney2/dialogs/kreconciledlg.cpp4
-rw-r--r--kmymoney2/dialogs/kreconciledlg.h2
-rw-r--r--kmymoney2/dialogs/kreportconfigurationfilterdlg.cpp4
-rw-r--r--kmymoney2/dialogs/kreportconfigurationfilterdlg.h2
-rw-r--r--kmymoney2/dialogs/ksecuritylisteditor.cpp4
-rw-r--r--kmymoney2/dialogs/ksecuritylisteditor.h2
-rw-r--r--kmymoney2/dialogs/kselectdatabasedlg.cpp8
-rw-r--r--kmymoney2/dialogs/kselectdatabasedlg.h4
-rw-r--r--kmymoney2/dialogs/kselecttransactionsdlg.cpp4
-rw-r--r--kmymoney2/dialogs/kselecttransactionsdlg.h2
-rw-r--r--kmymoney2/dialogs/ksplittransactiondlg.cpp14
-rw-r--r--kmymoney2/dialogs/ksplittransactiondlg.h8
-rw-r--r--kmymoney2/dialogs/kstartdlg.cpp2
-rw-r--r--kmymoney2/dialogs/kstartdlg.h2
-rw-r--r--kmymoney2/dialogs/kupdatestockpricedlg.cpp4
-rw-r--r--kmymoney2/dialogs/kupdatestockpricedlg.h2
-rw-r--r--kmymoney2/dialogs/mymoneyqifprofileeditor.cpp4
-rw-r--r--kmymoney2/dialogs/mymoneyqifprofileeditor.h2
-rw-r--r--kmymoney2/dialogs/settings/ksettingscolors.cpp4
-rw-r--r--kmymoney2/dialogs/settings/ksettingscolors.h2
-rw-r--r--kmymoney2/dialogs/settings/ksettingsfonts.cpp4
-rw-r--r--kmymoney2/dialogs/settings/ksettingsfonts.h2
-rw-r--r--kmymoney2/dialogs/settings/ksettingsforecast.cpp4
-rw-r--r--kmymoney2/dialogs/settings/ksettingsforecast.h2
-rw-r--r--kmymoney2/dialogs/settings/ksettingsgeneral.cpp4
-rw-r--r--kmymoney2/dialogs/settings/ksettingsgeneral.h2
-rw-r--r--kmymoney2/dialogs/settings/ksettingsgpg.cpp4
-rw-r--r--kmymoney2/dialogs/settings/ksettingsgpg.h2
-rw-r--r--kmymoney2/dialogs/settings/ksettingshome.cpp4
-rw-r--r--kmymoney2/dialogs/settings/ksettingshome.h2
-rw-r--r--kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp4
-rw-r--r--kmymoney2/dialogs/settings/ksettingsonlinequotes.h2
-rw-r--r--kmymoney2/dialogs/settings/ksettingsplugins.cpp4
-rw-r--r--kmymoney2/dialogs/settings/ksettingsplugins.h2
-rw-r--r--kmymoney2/dialogs/settings/ksettingsregister.cpp4
-rw-r--r--kmymoney2/dialogs/settings/ksettingsregister.h2
-rw-r--r--kmymoney2/dialogs/settings/ksettingsschedules.cpp4
-rw-r--r--kmymoney2/dialogs/settings/ksettingsschedules.h2
-rw-r--r--kmymoney2/dialogs/transactioneditor.cpp16
-rw-r--r--kmymoney2/dialogs/transactioneditor.h14
-rw-r--r--kmymoney2/kmymoney2.cpp78
-rw-r--r--kmymoney2/kmymoney2.h26
-rw-r--r--kmymoney2/kmymoneyutils.cpp12
-rw-r--r--kmymoney2/kmymoneyutils.h8
-rw-r--r--kmymoney2/mymoney/mymoneyaccount.cpp10
-rw-r--r--kmymoney2/mymoney/mymoneyaccount.h14
-rw-r--r--kmymoney2/mymoney/mymoneyaccounttest.cpp12
-rw-r--r--kmymoney2/mymoney/mymoneybudget.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneybudget.h6
-rw-r--r--kmymoney2/mymoney/mymoneyfile.cpp126
-rw-r--r--kmymoney2/mymoney/mymoneyfile.h16
-rw-r--r--kmymoney2/mymoney/mymoneyfiletest.cpp46
-rw-r--r--kmymoney2/mymoney/mymoneyfiletest.h2
-rw-r--r--kmymoney2/mymoney/mymoneyfinancialcalculator.cpp40
-rw-r--r--kmymoney2/mymoney/mymoneyfinancialcalculator.h2
-rw-r--r--kmymoney2/mymoney/mymoneyfinancialcalculatortest.cpp14
-rw-r--r--kmymoney2/mymoney/mymoneyinstitution.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneyinstitution.h2
-rw-r--r--kmymoney2/mymoney/mymoneyinvesttransaction.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneyinvesttransaction.h2
-rw-r--r--kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneykeyvaluecontainer.h6
-rw-r--r--kmymoney2/mymoney/mymoneyobject.h6
-rw-r--r--kmymoney2/mymoney/mymoneypayee.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneypayee.h2
-rw-r--r--kmymoney2/mymoney/mymoneypayeetest.cpp14
-rw-r--r--kmymoney2/mymoney/mymoneyreport.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneyreport.h8
-rw-r--r--kmymoney2/mymoney/mymoneyscheduled.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneyscheduled.h2
-rw-r--r--kmymoney2/mymoney/mymoneysecurity.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneysecurity.h2
-rw-r--r--kmymoney2/mymoney/mymoneysplit.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneysplit.h2
-rw-r--r--kmymoney2/mymoney/mymoneytransaction.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneytransaction.h2
-rw-r--r--kmymoney2/mymoney/mymoneyutils.h2
-rw-r--r--kmymoney2/mymoney/storage/imymoneyserialize.h6
-rw-r--r--kmymoney2/mymoney/storage/imymoneystorage.h10
-rw-r--r--kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp58
-rw-r--r--kmymoney2/mymoney/storage/mymoneydatabasemgr.h10
-rw-r--r--kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp18
-rw-r--r--kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp56
-rw-r--r--kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h14
-rw-r--r--kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp18
-rw-r--r--kmymoney2/mymoney/storage/mymoneystoragedump.cpp4
-rw-r--r--kmymoney2/mymoney/storage/mymoneystoragexml.cpp12
-rw-r--r--kmymoney2/plugins/importinterface.cpp4
-rw-r--r--kmymoney2/plugins/importinterface.h4
-rw-r--r--kmymoney2/plugins/interfaces/kmmimportinterface.cpp8
-rw-r--r--kmymoney2/plugins/interfaces/kmmimportinterface.h4
-rw-r--r--kmymoney2/plugins/interfaces/kmmstatementinterface.cpp4
-rw-r--r--kmymoney2/plugins/interfaces/kmmstatementinterface.h2
-rw-r--r--kmymoney2/plugins/interfaces/kmmviewinterface.cpp4
-rw-r--r--kmymoney2/plugins/interfaces/kmmviewinterface.h2
-rw-r--r--kmymoney2/plugins/kmymoneyplugin.cpp6
-rw-r--r--kmymoney2/plugins/kmymoneyplugin.h2
-rw-r--r--kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp4
-rw-r--r--kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.h2
-rw-r--r--kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp8
-rw-r--r--kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.h4
-rw-r--r--kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp4
-rw-r--r--kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.h2
-rw-r--r--kmymoney2/plugins/ofximport/ofximporterplugin.cpp4
-rw-r--r--kmymoney2/plugins/ofximport/ofximporterplugin.h2
-rw-r--r--kmymoney2/plugins/pluginloader.cpp4
-rw-r--r--kmymoney2/plugins/pluginloader.h2
-rw-r--r--kmymoney2/plugins/statementinterface.cpp4
-rw-r--r--kmymoney2/plugins/statementinterface.h2
-rw-r--r--kmymoney2/plugins/viewinterface.cpp4
-rw-r--r--kmymoney2/plugins/viewinterface.h2
-rw-r--r--kmymoney2/reports/kreportchartview.cpp2
-rw-r--r--kmymoney2/reports/kreportchartview.h4
-rw-r--r--kmymoney2/reports/pivottable.cpp12
-rw-r--r--kmymoney2/reports/pivottable.h2
-rw-r--r--kmymoney2/reports/pivottabletest.cpp2
-rw-r--r--kmymoney2/reports/querytable.cpp22
-rw-r--r--kmymoney2/reports/reportaccount.cpp6
-rw-r--r--kmymoney2/reports/reportaccount.h24
-rw-r--r--kmymoney2/reports/reportstestcommon.cpp4
-rw-r--r--kmymoney2/views/kaccountsview.cpp12
-rw-r--r--kmymoney2/views/kaccountsview.h14
-rw-r--r--kmymoney2/views/kbudgetview.cpp12
-rw-r--r--kmymoney2/views/kbudgetview.h8
-rw-r--r--kmymoney2/views/kcategoriesview.cpp8
-rw-r--r--kmymoney2/views/kcategoriesview.h10
-rw-r--r--kmymoney2/views/kforecastview.cpp6
-rw-r--r--kmymoney2/views/kforecastview.h2
-rw-r--r--kmymoney2/views/kgloballedgerview.cpp28
-rw-r--r--kmymoney2/views/kgloballedgerview.h16
-rw-r--r--kmymoney2/views/khomeview.cpp4
-rw-r--r--kmymoney2/views/khomeview.h2
-rw-r--r--kmymoney2/views/kinstitutionsview.cpp20
-rw-r--r--kmymoney2/views/kinstitutionsview.h8
-rw-r--r--kmymoney2/views/kinvestmentlistitem.cpp6
-rw-r--r--kmymoney2/views/kinvestmentlistitem.h2
-rw-r--r--kmymoney2/views/kinvestmentview.cpp6
-rw-r--r--kmymoney2/views/kinvestmentview.h2
-rw-r--r--kmymoney2/views/kmymoneyview.cpp30
-rw-r--r--kmymoney2/views/kmymoneyview.h6
-rw-r--r--kmymoney2/views/kpayeesview.cpp12
-rw-r--r--kmymoney2/views/kpayeesview.h8
-rwxr-xr-xkmymoney2/views/kreportsview.cpp16
-rwxr-xr-xkmymoney2/views/kreportsview.h16
-rw-r--r--kmymoney2/views/kscheduledlistitem.cpp10
-rw-r--r--kmymoney2/views/kscheduledlistitem.h8
-rw-r--r--kmymoney2/views/kscheduledview.cpp18
-rw-r--r--kmymoney2/views/kscheduledview.h2
-rw-r--r--kmymoney2/widgets/kaccounttemplateselector.cpp30
-rw-r--r--kmymoney2/widgets/kaccounttemplateselector.h2
-rw-r--r--kmymoney2/widgets/kaccounttemplateselectordecl.cpp6
-rw-r--r--kmymoney2/widgets/kbudgetvalues.cpp4
-rw-r--r--kmymoney2/widgets/kbudgetvalues.h2
-rw-r--r--kmymoney2/widgets/kbudgetvaluesdecl.cpp6
-rw-r--r--kmymoney2/widgets/kguiutils.h4
-rw-r--r--kmymoney2/widgets/klistviewsearchline.cpp14
-rw-r--r--kmymoney2/widgets/klistviewsearchline.h16
-rw-r--r--kmymoney2/widgets/kmymoneyaccountcombo.cpp4
-rw-r--r--kmymoney2/widgets/kmymoneyaccountcombo.h2
-rw-r--r--kmymoney2/widgets/kmymoneyaccountcompletion.cpp4
-rw-r--r--kmymoney2/widgets/kmymoneyaccountcompletion.h2
-rw-r--r--kmymoney2/widgets/kmymoneyaccountselector.cpp20
-rw-r--r--kmymoney2/widgets/kmymoneyaccountselector.h10
-rw-r--r--kmymoney2/widgets/kmymoneyaccounttree.cpp16
-rw-r--r--kmymoney2/widgets/kmymoneyaccounttree.h14
-rw-r--r--kmymoney2/widgets/kmymoneyaccounttreebase.cpp38
-rw-r--r--kmymoney2/widgets/kmymoneyaccounttreebase.h30
-rw-r--r--kmymoney2/widgets/kmymoneyaccounttreebudget.cpp12
-rw-r--r--kmymoney2/widgets/kmymoneyaccounttreebudget.h10
-rw-r--r--kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp18
-rw-r--r--kmymoney2/widgets/kmymoneyaccounttreeforecast.h10
-rw-r--r--kmymoney2/widgets/kmymoneybriefschedule.cpp4
-rw-r--r--kmymoney2/widgets/kmymoneybriefschedule.h2
-rw-r--r--kmymoney2/widgets/kmymoneycalculator.cpp16
-rw-r--r--kmymoney2/widgets/kmymoneycalculator.h2
-rw-r--r--kmymoney2/widgets/kmymoneycalendar.cpp4
-rw-r--r--kmymoney2/widgets/kmymoneycalendar.h2
-rw-r--r--kmymoney2/widgets/kmymoneycategory.cpp18
-rw-r--r--kmymoney2/widgets/kmymoneycategory.h12
-rw-r--r--kmymoney2/widgets/kmymoneychecklistitem.cpp22
-rw-r--r--kmymoney2/widgets/kmymoneychecklistitem.h6
-rw-r--r--kmymoney2/widgets/kmymoneycombo.cpp20
-rw-r--r--kmymoney2/widgets/kmymoneycombo.h16
-rw-r--r--kmymoney2/widgets/kmymoneycompletion.cpp8
-rw-r--r--kmymoney2/widgets/kmymoneycompletion.h2
-rw-r--r--kmymoney2/widgets/kmymoneycurrencyselector.cpp12
-rw-r--r--kmymoney2/widgets/kmymoneycurrencyselector.h6
-rw-r--r--kmymoney2/widgets/kmymoneydateinput.cpp4
-rw-r--r--kmymoney2/widgets/kmymoneydateinput.h4
-rw-r--r--kmymoney2/widgets/kmymoneydatetbl.cpp4
-rw-r--r--kmymoney2/widgets/kmymoneydatetbl.h2
-rw-r--r--kmymoney2/widgets/kmymoneyedit.cpp16
-rw-r--r--kmymoney2/widgets/kmymoneyedit.h12
-rw-r--r--kmymoney2/widgets/kmymoneyforecastlistviewitem.cpp4
-rw-r--r--kmymoney2/widgets/kmymoneyforecastlistviewitem.h2
-rw-r--r--kmymoney2/widgets/kmymoneygpgconfig.cpp4
-rw-r--r--kmymoney2/widgets/kmymoneygpgconfig.h2
-rw-r--r--kmymoney2/widgets/kmymoneylineedit.h2
-rw-r--r--kmymoney2/widgets/kmymoneylistviewitem.cpp18
-rw-r--r--kmymoney2/widgets/kmymoneylistviewitem.h4
-rw-r--r--kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp4
-rw-r--r--kmymoney2/widgets/kmymoneyonlinequoteconfig.h2
-rw-r--r--kmymoney2/widgets/kmymoneypriceview.cpp4
-rw-r--r--kmymoney2/widgets/kmymoneypriceview.h2
-rw-r--r--kmymoney2/widgets/kmymoneyscheduledcalendar.cpp4
-rw-r--r--kmymoney2/widgets/kmymoneyscheduledcalendar.h2
-rw-r--r--kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp4
-rw-r--r--kmymoney2/widgets/kmymoneyscheduleddatetbl.h2
-rw-r--r--kmymoney2/widgets/kmymoneyselector.cpp30
-rw-r--r--kmymoney2/widgets/kmymoneyselector.h8
-rw-r--r--kmymoney2/widgets/kmymoneytitlelabel.cpp4
-rw-r--r--kmymoney2/widgets/kmymoneytitlelabel.h2
-rw-r--r--kmymoney2/widgets/kmymoneywizard.cpp8
-rw-r--r--kmymoney2/widgets/kmymoneywizard.h28
-rw-r--r--kmymoney2/widgets/kmymoneywizard_p.h2
-rw-r--r--kmymoney2/widgets/register.cpp74
-rw-r--r--kmymoney2/widgets/register.h26
-rw-r--r--kmymoney2/widgets/registeritem.cpp10
-rw-r--r--kmymoney2/widgets/registeritem.h12
-rw-r--r--kmymoney2/widgets/registersearchline.cpp12
-rw-r--r--kmymoney2/widgets/registersearchline.h10
-rw-r--r--kmymoney2/widgets/scheduledtransaction.cpp6
-rw-r--r--kmymoney2/widgets/scheduledtransaction.h2
-rw-r--r--kmymoney2/widgets/sortoptionlistitem.h6
-rw-r--r--kmymoney2/widgets/stdtransactiondownloaded.cpp8
-rw-r--r--kmymoney2/widgets/stdtransactiondownloaded.h4
-rw-r--r--kmymoney2/widgets/stdtransactionmatched.cpp6
-rw-r--r--kmymoney2/widgets/stdtransactionmatched.h2
-rw-r--r--kmymoney2/widgets/transaction.cpp18
-rw-r--r--kmymoney2/widgets/transaction.h6
-rw-r--r--kmymoney2/widgets/transactioneditorcontainer.h2
-rw-r--r--kmymoney2/widgets/transactionform.cpp14
-rw-r--r--kmymoney2/widgets/transactionform.h6
-rw-r--r--kmymoney2/wizards/newaccountwizard/khierarchypagedecl.ui2
-rw-r--r--kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp20
-rw-r--r--kmymoney2/wizards/newaccountwizard/knewaccountwizard.h6
-rw-r--r--kmymoney2/wizards/newaccountwizard/knewaccountwizard_p.h26
-rw-r--r--kmymoney2/wizards/newuserwizard/knewuserwizard.cpp4
-rw-r--r--kmymoney2/wizards/newuserwizard/knewuserwizard.h2
-rw-r--r--kmymoney2/wizards/newuserwizard/knewuserwizard_p.h14
-rw-r--r--kmymoney2/wizards/wizardpages/accounts.cpp4
-rw-r--r--kmymoney2/wizards/wizardpages/accounts.h2
-rw-r--r--kmymoney2/wizards/wizardpages/currency.cpp4
-rw-r--r--kmymoney2/wizards/wizardpages/currency.h2
-rw-r--r--kmymoney2/wizards/wizardpages/userinfo.cpp4
-rw-r--r--kmymoney2/wizards/wizardpages/userinfo.h2
329 files changed, 1363 insertions, 1363 deletions
diff --git a/kmymoney2/converter/mymoneygncreader.cpp b/kmymoney2/converter/mymoneygncreader.cpp
index 4d2d71d..bfd6911 100644
--- a/kmymoney2/converter/mymoneygncreader.cpp
+++ b/kmymoney2/converter/mymoneygncreader.cpp
@@ -487,7 +487,7 @@ GncAccount::GncAccount () {
m_subElementList = subEls;
m_dataElementListCount = END_Account_DELS;
static const TQString dataEls[] = {"act:id", "act:name", "act:description",
- "act:type", "act:tqparent"};
+ "act:type", "act:parent"};
m_dataElementList = dataEls;
static const unsigned int anonClasses[] = {ASIS, NXTACC, SUPPRESS, ASIS, ASIS};
m_anonClassList = anonClasses;
@@ -958,7 +958,7 @@ bool XmlReader::endElement( const TQString&, const TQString&, const TQString&elN
m_co->resetDataPtr(); // so we don't get extraneous data loaded into the variables
if (elName == m_co->getElName()) { // check if this is the end of the current object
if (pMain->gncdebug) m_co->debugDump(); // dump the object data (temp)
- // call the terminate routine, pop the stack, and advise the tqparent that it's done
+ // call the terminate routine, pop the stack, and advise the parent that it's done
m_co->terminate();
GncObject *temp = m_co;
m_os.pop();
@@ -1201,8 +1201,8 @@ void MyMoneyGncReader::convertAccount (const GncAccount* gac) {
m_currencyCount[gac->commodity()->id()]++;
}
- acc.setParentAccountId (gac->tqparent().utf8());
- // now determine the account type and its tqparent id
+ acc.setParentAccountId (gac->parent().utf8());
+ // now determine the account type and its parent id
/* This list taken from
# Feb 2006: A RELAX NG Compact schema for gnucash "v2" XML files.
# Copyright (C) 2006 Joshua Sled <[email protected]>
@@ -1251,7 +1251,7 @@ void MyMoneyGncReader::convertAccount (const GncAccount* gac) {
i18n("Current importer does not recognize GnuCash account type %1").tqarg(gac->type());
throw new MYMONEYEXCEPTION (em);
}
- // if no tqparent account is present, assign to one of our standard accounts
+ // if no parent account is present, assign to one of our standard accounts
if ((acc.parentAccountId().isEmpty()) || (acc.parentAccountId() == m_rootId)) {
switch (acc.accountGroup()) {
case MyMoneyAccount::Asset: acc.setParentAccountId (m_storage->asset().id()); break;
@@ -1310,7 +1310,7 @@ void MyMoneyGncReader::convertAccount (const GncAccount* gac) {
m_storage->addAccount(acc);
m_mapIds[gac->id().utf8()] = acc.id(); // to link gnucash id to ours for tx posting
- if (gncdebug) qDebug("Gnucash account %s has id of %s, type of %s, tqparent is %s",
+ if (gncdebug) qDebug("Gnucash account %s has id of %s, type of %s, parent is %s",
gac->id().latin1(), acc.id().data(),
KMyMoneyUtils::accountTypeToString(acc.accountType()).latin1(), acc.parentAccountId().data());
@@ -1906,7 +1906,7 @@ void MyMoneyGncReader::terminate () {
for (stocks = m_stockList.begin(); stocks != m_stockList.end(); ++stocks) {
checkInvestmentOption (*stocks);
}
- // Next step is to walk the list and assign the tqparent/child relationship between the objects.
+ // Next step is to walk the list and assign the parent/child relationship between the objects.
unsigned int i = 0;
signalProgress (0, m_accountCount, i18n ("Reorganizing accounts..."));
TQValueList<MyMoneyAccount> list;
@@ -1936,17 +1936,17 @@ void MyMoneyGncReader::terminate () {
} else if ((*acc).parentAccountId() == m_rootId) {
if (gncdebug) qDebug("Account id %s is a child of root", (*acc).id().data());
} else {
- // it is not under one of the main accounts, so find gnucash tqparent
+ // it is not under one of the main accounts, so find gnucash parent
TQString parentKey = (*acc).parentAccountId();
- if (gncdebug) qDebug ("acc %s, tqparent %s", (*acc).id().data(),
+ if (gncdebug) qDebug ("acc %s, parent %s", (*acc).id().data(),
(*acc).parentAccountId().data());
map_accountIds::Iterator id = m_mapIds.find(parentKey);
if (id != m_mapIds.end()) {
- if (gncdebug) qDebug("Setting account id %s's tqparent account id to %s",
+ if (gncdebug) qDebug("Setting account id %s's parent account id to %s",
(*acc).id().data(), id.data().data());
- MyMoneyAccount tqparent = m_storage->account(id.data());
- tqparent = checkConsistency (tqparent, (*acc));
- m_storage->addAccount (tqparent, (*acc));
+ MyMoneyAccount parent = m_storage->account(id.data());
+ parent = checkConsistency (parent, (*acc));
+ m_storage->addAccount (parent, (*acc));
} else {
throw new MYMONEYEXCEPTION ("terminate() could not find account id");
}
@@ -2173,40 +2173,40 @@ TQDate MyMoneyGncReader::incrDate (TQDate lastDate, unsigned char interval, unsi
PASS
}
//********************************* checkConsistency **********************************
-MyMoneyAccount MyMoneyGncReader::checkConsistency (MyMoneyAccount& tqparent, MyMoneyAccount& child) {
+MyMoneyAccount MyMoneyGncReader::checkConsistency (MyMoneyAccount& parent, MyMoneyAccount& child) {
TRY
// gnucash is flexible/weird enough to allow various inconsistencies
// these are a couple I found in my file, no doubt more will be discovered
if ((child.accountType() == MyMoneyAccount::Investment) &&
- (tqparent.accountType() != MyMoneyAccount::Asset)) {
+ (parent.accountType() != MyMoneyAccount::Asset)) {
postMessage ("CC", 1, child.name().latin1());
return m_storage->asset();
}
if ((child.accountType() == MyMoneyAccount::Income) &&
- (tqparent.accountType() != MyMoneyAccount::Income)) {
+ (parent.accountType() != MyMoneyAccount::Income)) {
postMessage ("CC", 2, child.name().latin1());
return m_storage->income();
}
if ((child.accountType() == MyMoneyAccount::Expense) &&
- (tqparent.accountType() != MyMoneyAccount::Expense)) {
+ (parent.accountType() != MyMoneyAccount::Expense)) {
postMessage ("CC", 3, child.name().latin1());
return m_storage->expense();
}
- return (tqparent);
+ return (parent);
PASS
}
//*********************************** checkInvestmentOption *************************
void MyMoneyGncReader::checkInvestmentOption (TQString stockId) {
// implement the investment option for stock accounts
- // first check whether the tqparent account (gnucash id) is actually an
+ // first check whether the parent account (gnucash id) is actually an
// investment account. if it is, no further action is needed
MyMoneyAccount stockAcc = m_storage->account (m_mapIds[stockId.utf8()]);
- MyMoneyAccount tqparent;
+ MyMoneyAccount parent;
TQString parentKey = stockAcc.parentAccountId();
map_accountIds::Iterator id = m_mapIds.find (parentKey);
if (id != m_mapIds.end()) {
- tqparent = m_storage->account (id.data());
- if (tqparent.accountType() == MyMoneyAccount::Investment) return ;
+ parent = m_storage->account (id.data());
+ if (parent.accountType() == MyMoneyAccount::Investment) return ;
}
// so now, check the investment option requested by the user
// option 0 creates a separate investment account for each stock account
@@ -2214,10 +2214,10 @@ void MyMoneyGncReader::checkInvestmentOption (TQString stockId) {
MyMoneyAccount invAcc (stockAcc);
invAcc.setAccountType (MyMoneyAccount::Investment);
invAcc.setCurrencyId (TQString("")); // we don't know what currency it is!!
- invAcc.setParentAccountId (parentKey); // intersperse it between old tqparent and child stock acct
+ invAcc.setParentAccountId (parentKey); // intersperse it between old parent and child stock acct
m_storage->addAccount (invAcc);
m_mapIds [invAcc.id()] = invAcc.id(); // so stock account gets parented (again) to investment account later
- if (gncdebug) qDebug ("Created investment account %s as id %s, tqparent %s", invAcc.name().data(), invAcc.id().data(),
+ if (gncdebug) qDebug ("Created investment account %s as id %s, parent %s", invAcc.name().data(), invAcc.id().data(),
invAcc.parentAccountId().data());
if (gncdebug) qDebug ("Setting stock %s, id %s, as child of %s", stockAcc.name().data(), stockAcc.id().data(), invAcc.id().data());
stockAcc.setParentAccountId (invAcc.id());
@@ -2240,7 +2240,7 @@ void MyMoneyGncReader::checkInvestmentOption (TQString stockId) {
singleInvAcc.setParentAccountId (m_storage->asset().id());
m_storage->addAccount (singleInvAcc);
m_mapIds [singleInvAcc.id()] = singleInvAcc.id(); // so stock account gets parented (again) to investment account later
- if (gncdebug) qDebug ("Created investment account %s as id %s, tqparent %s, reparenting stock",
+ if (gncdebug) qDebug ("Created investment account %s as id %s, parent %s, reparenting stock",
singleInvAcc.name().data(), singleInvAcc.id().data(), singleInvAcc.parentAccountId().data());
singleInvAccId = singleInvAcc.id();
} else { // the account has already been created
@@ -2265,9 +2265,9 @@ void MyMoneyGncReader::checkInvestmentOption (TQString stockId) {
}
//if (accList.isEmpty()) qFatal ("No available accounts");
bool ok = false;
- while (!ok) { // keep going till we have a valid investment tqparent
+ while (!ok) { // keep going till we have a valid investment parent
TQString invAccName = TQInputDialog::getItem (
- PACKAGE, i18n("Select tqparent investment account or enter new name. Stock %1").tqarg(stockAcc.name ()),
+ PACKAGE, i18n("Select parent investment account or enter new name. Stock %1").tqarg(stockAcc.name ()),
accList, lastSelected, true, &ok);
if (ok) {
lastSelected = accList.findIndex (invAccName); // preserve selection for next time
diff --git a/kmymoney2/converter/mymoneygncreader.h b/kmymoney2/converter/mymoneygncreader.h
index fcda8ea..b34abf7 100644
--- a/kmymoney2/converter/mymoneygncreader.h
+++ b/kmymoney2/converter/mymoneygncreader.h
@@ -96,14 +96,14 @@ element name which started the current object. If so, the object's terminate()
function is called. If the object represents a similar KMM object, this will
normally result in a call to a conversion routine in the main
(MyMoneyGncReader) class to convert the data to native format and place it in
-storage. The stack is then popped, and the tqparent (now current) object notified
+storage. The stack is then popped, and the parent (now current) object notified
by a call to its endSubEl() function. Again depending on the type of object,
this will either delete the instance, or save it in its own storage for later
processing.
For example, a GncSplit object makes little sense outside the context of its
transaction, so will be saved by the transaction. A GncTransaction object on the
other hand will be converted, along with its attendant splits, and then deleted
-by its tqparent.
+by its parent.
Since at any one time an object will only be processing either a subobject or a
data element, a single object variable, m_state, is used to determine the actual
@@ -419,7 +419,7 @@ protected:
TQString name () const { return (var(NAME));};
TQString desc () const { return (var(DESC));};
TQString type () const { return (var(TYPE));};
- TQString tqparent () const { return (var(PARENT));};
+ TQString parent () const { return (var(PARENT));};
private:
// subsidiary objects/elements
enum AccountSubEls {CMDTY, KVP, LOTS, END_Account_SELS };
@@ -895,7 +895,7 @@ private:
TQString createPayee (const TQString&); // create a payee and return it's id
TQString createOrphanAccount (const TQString&); // create unknown account and return the id
TQDate incrDate (TQDate lastDate, unsigned char interval, unsigned int intervalCount); // for date calculations
- MyMoneyAccount checkConsistency (MyMoneyAccount& tqparent, MyMoneyAccount& child); // gnucash is sometimes TOO flexible
+ MyMoneyAccount checkConsistency (MyMoneyAccount& parent, MyMoneyAccount& child); // gnucash is sometimes TOO flexible
void checkInvestmentOption (TQString stockId); // implement user investment option
void getPriceSource (MyMoneySecurity stock, TQString gncSource);
#endif // _GNCFILEANON
diff --git a/kmymoney2/converter/mymoneyqifreader.cpp b/kmymoney2/converter/mymoneyqifreader.cpp
index 74513c7..809d71c 100644
--- a/kmymoney2/converter/mymoneyqifreader.cpp
+++ b/kmymoney2/converter/mymoneyqifreader.cpp
@@ -1929,7 +1929,7 @@ TQString MyMoneyQifReader::checkCategory(const TQString& name, const MyMoneyMone
if(!name.isEmpty()) {
// The category might be constructed with an arbitraty depth (number of
- // colon delimited fields). We try to find a tqparent account within this
+ // colon delimited fields). We try to find a parent account within this
// hierarchy by searching the following sequence:
//
// aaaa:bbbb:cccc:ddddd
@@ -1942,39 +1942,39 @@ TQString MyMoneyQifReader::checkCategory(const TQString& name, const MyMoneyMone
account.setName(name);
TQString accName; // part to be created (right side in above list)
- TQString tqparent(name); // a possible tqparent part (left side in above list)
+ TQString parent(name); // a possible parent part (left side in above list)
do {
- accountId = file->categoryToAccount(tqparent);
+ accountId = file->categoryToAccount(parent);
if(accountId.isEmpty()) {
found = false;
// prepare next step
if(!accName.isEmpty())
accName.prepend(':');
- accName.prepend(tqparent.section(':', -1));
+ accName.prepend(parent.section(':', -1));
account.setName(accName);
- tqparent = tqparent.section(':', 0, -2);
+ parent = parent.section(':', 0, -2);
} else if(!accName.isEmpty()) {
account.setParentAccountId(accountId);
}
}
- while(!tqparent.isEmpty() && accountId.isEmpty());
+ while(!parent.isEmpty() && accountId.isEmpty());
// if we did not find the category, we create it
if(!found) {
- MyMoneyAccount tqparent;
+ MyMoneyAccount parent;
if(account.parentAccountId().isEmpty()) {
if(!value.isNegative() && value2.isNegative())
- tqparent = file->income();
+ parent = file->income();
else
- tqparent = file->expense();
+ parent = file->expense();
} else {
- tqparent = file->account(account.parentAccountId());
+ parent = file->account(account.parentAccountId());
}
account.setAccountType((!value.isNegative() && value2.isNegative()) ? MyMoneyAccount::Income : MyMoneyAccount::Expense);
MyMoneyAccount brokerage;
- // clear out the tqparent id, because createAccount() does not like that
+ // clear out the parent id, because createAccount() does not like that
account.setParentAccountId(TQString());
- kmymoney2->createAccount(account, tqparent, brokerage, MyMoneyMoney());
+ kmymoney2->createAccount(account, parent, brokerage, MyMoneyMoney());
accountId = account.id();
}
}
@@ -2049,7 +2049,7 @@ TQString MyMoneyQifReader::processAccountEntry(bool resetAccountId)
parentAccount = acc;
qDebug("We still need to create the stock account in MyMoneyQifReader::processAccountEntry()");
} else {
- // setup tqparent according the type of the account
+ // setup parent according the type of the account
switch(account.accountGroup()) {
case MyMoneyAccount::Asset:
default:
diff --git a/kmymoney2/converter/mymoneystatementreader.cpp b/kmymoney2/converter/mymoneystatementreader.cpp
index 2a59ad8..6595033 100644
--- a/kmymoney2/converter/mymoneystatementreader.cpp
+++ b/kmymoney2/converter/mymoneystatementreader.cpp
@@ -87,7 +87,7 @@ class MyMoneyStatementReader::Private
bool m_skipCategoryMatching;
private:
void scanCategories(TQString& id, const MyMoneyAccount& invAcc, const MyMoneyAccount& parentAccount, const TQString& defaultName);
- TQString nameToId(const TQString&name, MyMoneyAccount& tqparent);
+ TQString nameToId(const TQString&name, MyMoneyAccount& parent);
private:
TQString m_feeId;
TQString m_interestId;
@@ -107,30 +107,30 @@ const TQString& MyMoneyStatementReader::Private::interestId(const MyMoneyAccount
return m_interestId;
}
-TQString MyMoneyStatementReader::Private::nameToId(const TQString&name, MyMoneyAccount& tqparent)
+TQString MyMoneyStatementReader::Private::nameToId(const TQString&name, MyMoneyAccount& parent)
{
MyMoneyFile* file = MyMoneyFile::instance();
MyMoneyAccount acc = file->accountByName(name);
// if it does not exist, we have to create it
if(acc.id().isEmpty()) {
acc.setName( name );
- acc.setAccountType( tqparent.accountType() );
- acc.setCurrencyId(tqparent.currencyId());
- file->addAccount(acc, tqparent);
+ acc.setAccountType( parent.accountType() );
+ acc.setCurrencyId(parent.currencyId());
+ file->addAccount(acc, parent);
}
return acc.id();
}
TQString MyMoneyStatementReader::Private::interestId(const TQString& name)
{
- MyMoneyAccount tqparent = MyMoneyFile::instance()->income();
- return nameToId(name, tqparent);
+ MyMoneyAccount parent = MyMoneyFile::instance()->income();
+ return nameToId(name, parent);
}
TQString MyMoneyStatementReader::Private::feeId(const TQString& name)
{
- MyMoneyAccount tqparent = MyMoneyFile::instance()->expense();
- return nameToId(name, tqparent);
+ MyMoneyAccount parent = MyMoneyFile::instance()->expense();
+ return nameToId(name, parent);
}
@@ -146,11 +146,11 @@ void MyMoneyStatementReader::Private::scanCategories(TQString& id, const MyMoney
MyMoneyAccount acc = file->accountByName(defaultName);
// if it does not exist, we have to create it
if(acc.id().isEmpty()) {
- MyMoneyAccount tqparent = parentAccount;
+ MyMoneyAccount parent = parentAccount;
acc.setName( defaultName );
- acc.setAccountType( tqparent.accountType() );
- acc.setCurrencyId(tqparent.currencyId());
- file->addAccount(acc, tqparent);
+ acc.setAccountType( parent.accountType() );
+ acc.setCurrencyId(parent.currencyId());
+ file->addAccount(acc, parent);
}
id = acc.id();
}
@@ -912,7 +912,7 @@ void MyMoneyStatementReader::processTransactionEntry(const MyMoneyStatement::Tra
payee.setMatchData(MyMoneyPayee::matchName, true, TQStringList());
if (m_askPayeeCategory) {
// We use a TQGuardedPtr because the dialog may get deleted
- // during exec() if the tqparent of the dialog gets deleted.
+ // during exec() if the parent of the dialog gets deleted.
// In that case the guarded ptr will reset to 0.
TQGuardedPtr<KDialogBase> dialog = new KDialogBase(
"Default Category for Payee",
diff --git a/kmymoney2/converter/mymoneytemplate.cpp b/kmymoney2/converter/mymoneytemplate.cpp
index 1a8860b..bf70d0a 100644
--- a/kmymoney2/converter/mymoneytemplate.cpp
+++ b/kmymoney2/converter/mymoneytemplate.cpp
@@ -148,14 +148,14 @@ bool MyMoneyTemplate::loadDescription(void)
return validMask == validHeader;
}
-bool MyMoneyTemplate::hierarchy(TQMap<TQString, TQListViewItem*>& list, const TQString& tqparent, TQDomNode account)
+bool MyMoneyTemplate::hierarchy(TQMap<TQString, TQListViewItem*>& list, const TQString& parent, TQDomNode account)
{
bool rc = true;
while(rc == true && !account.isNull()) {
if(account.isElement()) {
TQDomElement accountElement = account.toElement();
if(accountElement.tagName() == "account") {
- TQString name = TQString("%1:%2").tqarg(tqparent).tqarg(accountElement.attribute("name"));
+ TQString name = TQString("%1:%2").tqarg(parent).tqarg(accountElement.attribute("name"));
list[name] = 0;
hierarchy(list, name, account.firstChild());
}
@@ -219,22 +219,22 @@ bool MyMoneyTemplate::importTemplate(void(*callback)(int, int, const TQString&))
if(childElement.tagName() == "account"
&& childElement.attribute("name") == "") {
++m_accountsRead;
- MyMoneyAccount tqparent;
+ MyMoneyAccount parent;
switch(childElement.attribute("type").toUInt()) {
case MyMoneyAccount::Asset:
- tqparent = file->asset();
+ parent = file->asset();
break;
case MyMoneyAccount::Liability:
- tqparent = file->liability();
+ parent = file->liability();
break;
case MyMoneyAccount::Income:
- tqparent = file->income();
+ parent = file->income();
break;
case MyMoneyAccount::Expense:
- tqparent = file->expense();
+ parent = file->expense();
break;
case MyMoneyAccount::Equity:
- tqparent = file->equity();
+ parent = file->equity();
break;
default:
@@ -243,7 +243,7 @@ bool MyMoneyTemplate::importTemplate(void(*callback)(int, int, const TQString&))
}
if(rc == true) {
- rc = createAccounts(tqparent, childElement.firstChild());
+ rc = createAccounts(parent, childElement.firstChild());
}
} else {
rc = false;
@@ -254,7 +254,7 @@ bool MyMoneyTemplate::importTemplate(void(*callback)(int, int, const TQString&))
return rc;
}
-bool MyMoneyTemplate::createAccounts(MyMoneyAccount& tqparent, TQDomNode account)
+bool MyMoneyTemplate::createAccounts(MyMoneyAccount& parent, TQDomNode account)
{
bool rc = true;
while(rc == true && !account.isNull()) {
@@ -266,8 +266,8 @@ bool MyMoneyTemplate::createAccounts(MyMoneyAccount& tqparent, TQDomNode account
TQValueList<MyMoneyAccount> subAccountList;
TQValueList<MyMoneyAccount>::ConstIterator it;
it = subAccountList.end();
- if(!tqparent.accountList().isEmpty()) {
- MyMoneyFile::instance()->accountList(subAccountList, tqparent.accountList());
+ if(!parent.accountList().isEmpty()) {
+ MyMoneyFile::instance()->accountList(subAccountList, parent.accountList());
for(it = subAccountList.begin(); it != subAccountList.end(); ++it) {
if((*it).name() == accountElement.attribute("name")) {
acc = *it;
@@ -281,7 +281,7 @@ bool MyMoneyTemplate::createAccounts(MyMoneyAccount& tqparent, TQDomNode account
acc.setAccountType(static_cast<MyMoneyAccount::_accountTypeE>(accountElement.attribute("type").toUInt()));
setFlags(acc, account.firstChild());
try {
- MyMoneyFile::instance()->addAccount(acc, tqparent);
+ MyMoneyFile::instance()->addAccount(acc, parent);
} catch(MyMoneyException *e) {
delete e;
}
@@ -355,10 +355,10 @@ bool MyMoneyTemplate::exportTemplate(void(*callback)(int, int, const TQString&))
return true;
}
-bool MyMoneyTemplate::addAccountStructure(TQDomElement& tqparent, const MyMoneyAccount& acc)
+bool MyMoneyTemplate::addAccountStructure(TQDomElement& parent, const MyMoneyAccount& acc)
{
TQDomElement account = m_doc.createElement("account");
- tqparent.appendChild(account);
+ parent.appendChild(account);
if(MyMoneyFile::instance()->isStandardAccount(acc.id()))
account.setAttribute(TQString("name"), TQString());
diff --git a/kmymoney2/converter/mymoneytemplate.h b/kmymoney2/converter/mymoneytemplate.h
index 352fd4e..ed96150 100644
--- a/kmymoney2/converter/mymoneytemplate.h
+++ b/kmymoney2/converter/mymoneytemplate.h
@@ -66,11 +66,11 @@ public:
protected:
bool loadDescription(void);
- bool createAccounts(MyMoneyAccount& tqparent, TQDomNode account);
+ bool createAccounts(MyMoneyAccount& parent, TQDomNode account);
bool setFlags(MyMoneyAccount& acc, TQDomNode flags);
bool saveToLocalFile(TQFile* qfile);
- bool addAccountStructure(TQDomElement& tqparent, const MyMoneyAccount& acc);
- bool hierarchy(TQMap<TQString, TQListViewItem*>& list, const TQString& tqparent, TQDomNode account);
+ bool addAccountStructure(TQDomElement& parent, const MyMoneyAccount& acc);
+ bool hierarchy(TQMap<TQString, TQListViewItem*>& list, const TQString& parent, TQDomNode account);
/**
* This method is used to update the progress information. It
diff --git a/kmymoney2/converter/webpricequote.cpp b/kmymoney2/converter/webpricequote.cpp
index d1fd158..1560967 100644
--- a/kmymoney2/converter/webpricequote.cpp
+++ b/kmymoney2/converter/webpricequote.cpp
@@ -1010,8 +1010,8 @@ TQDate MyMoneyDateFormat::convertString(const TQString& _in, bool _strict, unsig
// Unit test helpers
//
-convertertest::QuoteReceiver::QuoteReceiver(WebPriceQuote* q, TQObject* tqparent, const char *name) :
- TQObject(tqparent,name)
+convertertest::QuoteReceiver::QuoteReceiver(WebPriceQuote* q, TQObject* parent, const char *name) :
+ TQObject(parent,name)
{
connect(q,TQT_SIGNAL(quote(const TQString&,const TQDate&, const double&)),
this,TQT_SLOT(slotGetQuote(const TQString&,const TQDate&, const double&)));
diff --git a/kmymoney2/converter/webpricequote.h b/kmymoney2/converter/webpricequote.h
index ba8146b..ada7684 100644
--- a/kmymoney2/converter/webpricequote.h
+++ b/kmymoney2/converter/webpricequote.h
@@ -235,7 +235,7 @@ class QuoteReceiver : public TQObject
Q_OBJECT
TQ_OBJECT
public:
- QuoteReceiver(WebPriceQuote* q, TQObject *tqparent = 0, const char *name = 0);
+ QuoteReceiver(WebPriceQuote* q, TQObject *parent = 0, const char *name = 0);
~QuoteReceiver();
public slots:
void slotGetQuote(const TQString&,const TQDate&, const double&);
diff --git a/kmymoney2/dialogs/investtransactioneditor.cpp b/kmymoney2/dialogs/investtransactioneditor.cpp
index 6e777ca..92ea338 100644
--- a/kmymoney2/dialogs/investtransactioneditor.cpp
+++ b/kmymoney2/dialogs/investtransactioneditor.cpp
@@ -64,8 +64,8 @@ class InvestTransactionEditor::Private {
friend class Invest::Activity;
public:
- Private(InvestTransactionEditor* tqparent) :
- m_parent(tqparent),
+ Private(InvestTransactionEditor* parent) :
+ m_parent(parent),
m_activity(0)
{
m_phonyAccount = MyMoneyAccount("Phony-ID", MyMoneyAccount());
diff --git a/kmymoney2/dialogs/kaccountselectdlg.cpp b/kmymoney2/dialogs/kaccountselectdlg.cpp
index 48cef18..3a05481 100644
--- a/kmymoney2/dialogs/kaccountselectdlg.cpp
+++ b/kmymoney2/dialogs/kaccountselectdlg.cpp
@@ -48,8 +48,8 @@
#include <../kmymoney2.h>
-KAccountSelectDlg::KAccountSelectDlg(const KMyMoneyUtils::categoryTypeE accountType, const TQString& purpose, TQWidget *tqparent, const char *name )
- : KAccountSelectDlgDecl(tqparent, name),
+KAccountSelectDlg::KAccountSelectDlg(const KMyMoneyUtils::categoryTypeE accountType, const TQString& purpose, TQWidget *parent, const char *name )
+ : KAccountSelectDlgDecl(parent, name),
m_purpose(purpose),
m_accountType(accountType),
m_aborted(false)
diff --git a/kmymoney2/dialogs/kaccountselectdlg.h b/kmymoney2/dialogs/kaccountselectdlg.h
index 180587e..1b106df 100644
--- a/kmymoney2/dialogs/kaccountselectdlg.h
+++ b/kmymoney2/dialogs/kaccountselectdlg.h
@@ -49,7 +49,7 @@ class KAccountSelectDlg : public KAccountSelectDlgDecl
Q_OBJECT
TQ_OBJECT
public:
- KAccountSelectDlg(const KMyMoneyUtils::categoryTypeE type, const TQString& purpose = "General", TQWidget *tqparent=0, const char *name=0);
+ KAccountSelectDlg(const KMyMoneyUtils::categoryTypeE type, const TQString& purpose = "General", TQWidget *parent=0, const char *name=0);
~KAccountSelectDlg();
/**
diff --git a/kmymoney2/dialogs/kbackupdlg.cpp b/kmymoney2/dialogs/kbackupdlg.cpp
index d975e46..08e0cef 100644
--- a/kmymoney2/dialogs/kbackupdlg.cpp
+++ b/kmymoney2/dialogs/kbackupdlg.cpp
@@ -44,8 +44,8 @@
#include "kbackupdlg.h"
-KBackupDlg::KBackupDlg( TQWidget* tqparent, const char* name/*, bool modal*/)
- : kbackupdlgdecl( tqparent, name , true)
+KBackupDlg::KBackupDlg( TQWidget* parent, const char* name/*, bool modal*/)
+ : kbackupdlgdecl( parent, name , true)
{
readConfig();
diff --git a/kmymoney2/dialogs/kbackupdlg.h b/kmymoney2/dialogs/kbackupdlg.h
index be2e749..0705d93 100644
--- a/kmymoney2/dialogs/kbackupdlg.h
+++ b/kmymoney2/dialogs/kbackupdlg.h
@@ -38,7 +38,7 @@ protected slots:
void chooseButtonClicked();
public:
- KBackupDlg( TQWidget* tqparent, const char* name/*, bool modal*/);
+ KBackupDlg( TQWidget* parent, const char* name/*, bool modal*/);
~KBackupDlg();
};
diff --git a/kmymoney2/dialogs/kbalancechartdlg.cpp b/kmymoney2/dialogs/kbalancechartdlg.cpp
index f1fcdda..85134da 100644
--- a/kmymoney2/dialogs/kbalancechartdlg.cpp
+++ b/kmymoney2/dialogs/kbalancechartdlg.cpp
@@ -52,8 +52,8 @@
#define KMM_KDCHART_PROPSET_NORMAL_DATA KDCHART_PROPSET_NORMAL_DATA
#endif
-KBalanceChartDlg::KBalanceChartDlg(const MyMoneyAccount& account, TQWidget* tqparent, const char* name) :
- KDialog(tqparent, name)
+KBalanceChartDlg::KBalanceChartDlg(const MyMoneyAccount& account, TQWidget* parent, const char* name) :
+ KDialog(parent, name)
{
#ifdef HAVE_KDCHART
setCaption(i18n("Balance of %1").tqarg(account.name()));
diff --git a/kmymoney2/dialogs/kbalancechartdlg.h b/kmymoney2/dialogs/kbalancechartdlg.h
index afb1b1d..d7ff4a9 100644
--- a/kmymoney2/dialogs/kbalancechartdlg.h
+++ b/kmymoney2/dialogs/kbalancechartdlg.h
@@ -39,7 +39,7 @@ class KBalanceChartDlg : public KDialog
Q_OBJECT
TQ_OBJECT
public:
- KBalanceChartDlg(const MyMoneyAccount& account, TQWidget* tqparent = 0, const char* name = 0);
+ KBalanceChartDlg(const MyMoneyAccount& account, TQWidget* parent = 0, const char* name = 0);
~KBalanceChartDlg();
};
diff --git a/kmymoney2/dialogs/kbalancewarning.cpp b/kmymoney2/dialogs/kbalancewarning.cpp
index f42be18..542b993 100644
--- a/kmymoney2/dialogs/kbalancewarning.cpp
+++ b/kmymoney2/dialogs/kbalancewarning.cpp
@@ -40,8 +40,8 @@ public:
TQMap<TQString, bool> m_deselectedAccounts;
};
-KBalanceWarning::KBalanceWarning(TQObject* tqparent, const char* name) :
- TQObject(tqparent, name),
+KBalanceWarning::KBalanceWarning(TQObject* parent, const char* name) :
+ TQObject(parent, name),
d(new Private)
{
KMessageBox::enableMessage(d->dontShowAgain());
@@ -52,10 +52,10 @@ KBalanceWarning::~KBalanceWarning()
delete d;
}
-void KBalanceWarning::slotShowMessage(TQWidget* tqparent, const MyMoneyAccount& account, const TQString& msg)
+void KBalanceWarning::slotShowMessage(TQWidget* parent, const MyMoneyAccount& account, const TQString& msg)
{
if(d->m_deselectedAccounts.find(account.id()) == d->m_deselectedAccounts.end()) {
- KMessageBox::information(tqparent, msg, TQString(), d->dontShowAgain());
+ KMessageBox::information(parent, msg, TQString(), d->dontShowAgain());
if(!KMessageBox::shouldBeShownContinue(d->dontShowAgain())) {
d->m_deselectedAccounts[account.id()] = true;
KMessageBox::enableMessage(d->dontShowAgain());
diff --git a/kmymoney2/dialogs/kbalancewarning.h b/kmymoney2/dialogs/kbalancewarning.h
index cb9848d..5466388 100644
--- a/kmymoney2/dialogs/kbalancewarning.h
+++ b/kmymoney2/dialogs/kbalancewarning.h
@@ -37,11 +37,11 @@ class KBalanceWarning : public TQObject
Q_OBJECT
TQ_OBJECT
public:
- KBalanceWarning(TQObject* tqparent, const char* name = 0);
+ KBalanceWarning(TQObject* parent, const char* name = 0);
virtual ~KBalanceWarning();
public slots:
- void slotShowMessage(TQWidget* tqparent, const MyMoneyAccount& account, const TQString& msg);
+ void slotShowMessage(TQWidget* parent, const MyMoneyAccount& account, const TQString& msg);
private:
class Private;
diff --git a/kmymoney2/dialogs/kcategoryreassigndlg.cpp b/kmymoney2/dialogs/kcategoryreassigndlg.cpp
index 3bead48..e0fb54d 100644
--- a/kmymoney2/dialogs/kcategoryreassigndlg.cpp
+++ b/kmymoney2/dialogs/kcategoryreassigndlg.cpp
@@ -36,8 +36,8 @@
#include <kmymoney/kmymoneyaccountselector.h>
#include <kmymoney/kguiutils.h>
-KCategoryReassignDlg::KCategoryReassignDlg( TQWidget* tqparent, const char* name) :
- KCategoryReassignDlgDecl( tqparent, name)
+KCategoryReassignDlg::KCategoryReassignDlg( TQWidget* parent, const char* name) :
+ KCategoryReassignDlgDecl( parent, name)
{
buttonOk->setGuiItem(KStdGuiItem::ok());
buttonCancel->setGuiItem(KStdGuiItem::cancel());
diff --git a/kmymoney2/dialogs/kcategoryreassigndlg.h b/kmymoney2/dialogs/kcategoryreassigndlg.h
index 4639bd4..9880f07 100644
--- a/kmymoney2/dialogs/kcategoryreassigndlg.h
+++ b/kmymoney2/dialogs/kcategoryreassigndlg.h
@@ -42,7 +42,7 @@ class KCategoryReassignDlg : public KCategoryReassignDlgDecl
TQ_OBJECT
public:
/** Default constructor */
- KCategoryReassignDlg( TQWidget* tqparent = 0, const char* name = 0);
+ KCategoryReassignDlg( TQWidget* parent = 0, const char* name = 0);
/** Destructor */
~KCategoryReassignDlg();
diff --git a/kmymoney2/dialogs/kchooseimportexportdlg.cpp b/kmymoney2/dialogs/kchooseimportexportdlg.cpp
index 1038bf1..4a44fa3 100644
--- a/kmymoney2/dialogs/kchooseimportexportdlg.cpp
+++ b/kmymoney2/dialogs/kchooseimportexportdlg.cpp
@@ -33,8 +33,8 @@
#include "kchooseimportexportdlg.h"
-KChooseImportExportDlg::KChooseImportExportDlg(int type, TQWidget *tqparent, const char *name )
- : KChooseImportExportDlgDecl(tqparent,name, true)
+KChooseImportExportDlg::KChooseImportExportDlg(int type, TQWidget *parent, const char *name )
+ : KChooseImportExportDlgDecl(parent,name, true)
{
TQString filename;
diff --git a/kmymoney2/dialogs/kchooseimportexportdlg.h b/kmymoney2/dialogs/kchooseimportexportdlg.h
index c93ba8b..83ba6b7 100644
--- a/kmymoney2/dialogs/kchooseimportexportdlg.h
+++ b/kmymoney2/dialogs/kchooseimportexportdlg.h
@@ -40,7 +40,7 @@ protected slots:
void slotTypeActivated(const TQString& text);
public:
- KChooseImportExportDlg(int type, TQWidget *tqparent=0, const char *name=0);
+ KChooseImportExportDlg(int type, TQWidget *parent=0, const char *name=0);
~KChooseImportExportDlg();
TQString importExportType(void);
};
diff --git a/kmymoney2/dialogs/kconfirmmanualenterdlg.cpp b/kmymoney2/dialogs/kconfirmmanualenterdlg.cpp
index 8c1678f..0179721 100644
--- a/kmymoney2/dialogs/kconfirmmanualenterdlg.cpp
+++ b/kmymoney2/dialogs/kconfirmmanualenterdlg.cpp
@@ -36,8 +36,8 @@
#include <kmymoney/kmymoneyutils.h>
#include "kconfirmmanualenterdlg.h"
-KConfirmManualEnterDlg::KConfirmManualEnterDlg(const MyMoneySchedule& schedule, TQWidget* tqparent, const char* name) :
- KConfirmManualEnterDlgDecl(tqparent, name)
+KConfirmManualEnterDlg::KConfirmManualEnterDlg(const MyMoneySchedule& schedule, TQWidget* parent, const char* name) :
+ KConfirmManualEnterDlgDecl(parent, name)
{
buttonOk->setGuiItem(KStdGuiItem::ok());
buttonCancel->setGuiItem(KStdGuiItem::cancel());
diff --git a/kmymoney2/dialogs/kconfirmmanualenterdlg.h b/kmymoney2/dialogs/kconfirmmanualenterdlg.h
index 95a0b9b..25bba1e 100644
--- a/kmymoney2/dialogs/kconfirmmanualenterdlg.h
+++ b/kmymoney2/dialogs/kconfirmmanualenterdlg.h
@@ -38,7 +38,7 @@ class KConfirmManualEnterDlg : public KConfirmManualEnterDlgDecl
Q_OBJECT
TQ_OBJECT
public:
- KConfirmManualEnterDlg(const MyMoneySchedule& schedule, TQWidget* tqparent = 0, const char* name = 0);
+ KConfirmManualEnterDlg(const MyMoneySchedule& schedule, TQWidget* parent = 0, const char* name = 0);
typedef enum {
UseOriginal = 0,
diff --git a/kmymoney2/dialogs/kcsvprogressdlg.cpp b/kmymoney2/dialogs/kcsvprogressdlg.cpp
index 7b923e7..2330a8a 100644
--- a/kmymoney2/dialogs/kcsvprogressdlg.cpp
+++ b/kmymoney2/dialogs/kcsvprogressdlg.cpp
@@ -47,8 +47,8 @@
#include "../kmymoneyutils.h"
/** Simple constructor */
-KCsvProgressDlg::KCsvProgressDlg(int type, MyMoneyAccount *account, TQWidget *tqparent, const char *name )
- : KCsvProgressDlgDecl(tqparent,name, true)
+KCsvProgressDlg::KCsvProgressDlg(int type, MyMoneyAccount *account, TQWidget *parent, const char *name )
+ : KCsvProgressDlgDecl(parent,name, true)
{
m_nType = type;
if (m_nType==0)
diff --git a/kmymoney2/dialogs/kcsvprogressdlg.h b/kmymoney2/dialogs/kcsvprogressdlg.h
index 20d6990..c1ba969 100644
--- a/kmymoney2/dialogs/kcsvprogressdlg.h
+++ b/kmymoney2/dialogs/kcsvprogressdlg.h
@@ -62,7 +62,7 @@ protected slots:
void slotSetProgress(int progress);
public:
- KCsvProgressDlg(int type, MyMoneyAccount *account, TQWidget *tqparent=0, const char *name=0);
+ KCsvProgressDlg(int type, MyMoneyAccount *account, TQWidget *parent=0, const char *name=0);
~KCsvProgressDlg();
};
diff --git a/kmymoney2/dialogs/kcurrencycalculator.cpp b/kmymoney2/dialogs/kcurrencycalculator.cpp
index 1b73ecd..2306816 100644
--- a/kmymoney2/dialogs/kcurrencycalculator.cpp
+++ b/kmymoney2/dialogs/kcurrencycalculator.cpp
@@ -111,8 +111,8 @@ bool KCurrencyCalculator::setupSplitPrice(MyMoneyMoney& shares, const MyMoneyTra
return rc;
}
-KCurrencyCalculator::KCurrencyCalculator(const MyMoneySecurity& from, const MyMoneySecurity& to, const MyMoneyMoney& value, const MyMoneyMoney& shares, const TQDate& date, const signed64 resultFraction, TQWidget *tqparent, const char *name ) :
- KCurrencyCalculatorDecl(tqparent, name),
+KCurrencyCalculator::KCurrencyCalculator(const MyMoneySecurity& from, const MyMoneySecurity& to, const MyMoneyMoney& value, const MyMoneyMoney& shares, const TQDate& date, const signed64 resultFraction, TQWidget *parent, const char *name ) :
+ KCurrencyCalculatorDecl(parent, name),
m_fromCurrency(from),
m_toCurrency(to),
m_result(shares.abs()),
diff --git a/kmymoney2/dialogs/kcurrencycalculator.h b/kmymoney2/dialogs/kcurrencycalculator.h
index 41cfed0..a4c4c24 100644
--- a/kmymoney2/dialogs/kcurrencycalculator.h
+++ b/kmymoney2/dialogs/kcurrencycalculator.h
@@ -54,12 +54,12 @@ public:
* @param shares the number of foreign currency units
* @param date the date when the conversion took place
* @param resultFraction the smallest fraction of the result (default 100)
- * @param tqparent see TQWidget constructor
+ * @param parent see TQWidget constructor
* @param name see TQWidget constructor
*
* @note @p value must not be 0!
*/
- KCurrencyCalculator(const MyMoneySecurity& from, const MyMoneySecurity& to, const MyMoneyMoney& value, const MyMoneyMoney& shares, const TQDate& date, const signed64 resultFraction = 100, TQWidget *tqparent=0, const char *name=0);
+ KCurrencyCalculator(const MyMoneySecurity& from, const MyMoneySecurity& to, const MyMoneyMoney& value, const MyMoneyMoney& shares, const TQDate& date, const signed64 resultFraction = 100, TQWidget *parent=0, const char *name=0);
~KCurrencyCalculator();
const MyMoneyMoney price(void) const;
diff --git a/kmymoney2/dialogs/kcurrencyeditdlg.cpp b/kmymoney2/dialogs/kcurrencyeditdlg.cpp
index aad8f20..d902941 100644
--- a/kmymoney2/dialogs/kcurrencyeditdlg.cpp
+++ b/kmymoney2/dialogs/kcurrencyeditdlg.cpp
@@ -56,8 +56,8 @@
#include "../widgets/kmymoneypriceview.h"
-KCurrencyEditDlg::KCurrencyEditDlg(TQWidget *tqparent, const char *name ) :
- KCurrencyEditDlgDecl(tqparent,name)
+KCurrencyEditDlg::KCurrencyEditDlg(TQWidget *parent, const char *name ) :
+ KCurrencyEditDlgDecl(parent,name)
{
m_currencyList->addColumn(i18n("Currency"));
m_currencyList->header()->hide();
diff --git a/kmymoney2/dialogs/kcurrencyeditdlg.h b/kmymoney2/dialogs/kcurrencyeditdlg.h
index 5a1e00f..d5a30fa 100644
--- a/kmymoney2/dialogs/kcurrencyeditdlg.h
+++ b/kmymoney2/dialogs/kcurrencyeditdlg.h
@@ -48,7 +48,7 @@ class KCurrencyEditDlg : public KCurrencyEditDlgDecl
Q_OBJECT
TQ_OBJECT
public:
- KCurrencyEditDlg(TQWidget *tqparent=0, const char *name=0);
+ KCurrencyEditDlg(TQWidget *parent=0, const char *name=0);
~KCurrencyEditDlg();
public slots:
diff --git a/kmymoney2/dialogs/keditequityentrydlg.cpp b/kmymoney2/dialogs/keditequityentrydlg.cpp
index ef9ed84..3eed5e6 100644
--- a/kmymoney2/dialogs/keditequityentrydlg.cpp
+++ b/kmymoney2/dialogs/keditequityentrydlg.cpp
@@ -40,8 +40,8 @@
#include "kupdatestockpricedlg.h"
#include "../widgets/kmymoneypriceview.h"
-KEditEquityEntryDlg::KEditEquityEntryDlg(const MyMoneySecurity& selectedSecurity, TQWidget *tqparent, const char *name)
- : KEditEquityEntryDecl(tqparent, name, true)
+KEditEquityEntryDlg::KEditEquityEntryDlg(const MyMoneySecurity& selectedSecurity, TQWidget *parent, const char *name)
+ : KEditEquityEntryDecl(parent, name, true)
{
m_selectedSecurity = selectedSecurity;
diff --git a/kmymoney2/dialogs/keditequityentrydlg.h b/kmymoney2/dialogs/keditequityentrydlg.h
index ae9dc58..c9fc34c 100644
--- a/kmymoney2/dialogs/keditequityentrydlg.h
+++ b/kmymoney2/dialogs/keditequityentrydlg.h
@@ -49,7 +49,7 @@ class KEditEquityEntryDlg : public KEditEquityEntryDecl
Q_OBJECT
TQ_OBJECT
public:
- KEditEquityEntryDlg(const MyMoneySecurity& selectedSecurity, TQWidget *tqparent = NULL, const char *name = NULL);
+ KEditEquityEntryDlg(const MyMoneySecurity& selectedSecurity, TQWidget *parent = NULL, const char *name = NULL);
~KEditEquityEntryDlg();
void updatedEquity(MyMoneySecurity& security) { security = m_selectedSecurity; }
diff --git a/kmymoney2/dialogs/keditloanwizard.cpp b/kmymoney2/dialogs/keditloanwizard.cpp
index 7fda8bc..89b2f90 100644
--- a/kmymoney2/dialogs/keditloanwizard.cpp
+++ b/kmymoney2/dialogs/keditloanwizard.cpp
@@ -48,8 +48,8 @@
#include "../mymoney/mymoneyfile.h"
#include "../kmymoneyutils.h"
-KEditLoanWizard::KEditLoanWizard(const MyMoneyAccount& account, TQWidget *tqparent, const char *name ) :
- KNewLoanWizard(tqparent, name)
+KEditLoanWizard::KEditLoanWizard(const MyMoneyAccount& account, TQWidget *parent, const char *name ) :
+ KNewLoanWizard(parent, name)
{
MyMoneyFile* file = MyMoneyFile::instance();
diff --git a/kmymoney2/dialogs/keditloanwizard.h b/kmymoney2/dialogs/keditloanwizard.h
index f2efbdf..252bbd0 100644
--- a/kmymoney2/dialogs/keditloanwizard.h
+++ b/kmymoney2/dialogs/keditloanwizard.h
@@ -46,7 +46,7 @@ class KEditLoanWizard : public KNewLoanWizard
Q_OBJECT
TQ_OBJECT
public:
- KEditLoanWizard(const MyMoneyAccount& account, TQWidget *tqparent=0, const char *name=0);
+ KEditLoanWizard(const MyMoneyAccount& account, TQWidget *parent=0, const char *name=0);
~KEditLoanWizard();
/**
diff --git a/kmymoney2/dialogs/keditscheduledlg.cpp b/kmymoney2/dialogs/keditscheduledlg.cpp
index 42fc31e..c6ece41 100644
--- a/kmymoney2/dialogs/keditscheduledlg.cpp
+++ b/kmymoney2/dialogs/keditscheduledlg.cpp
@@ -60,8 +60,8 @@ public:
kMandatoryFieldGroup* m_requiredFields;
};
-KEditScheduleDlg::KEditScheduleDlg(const MyMoneySchedule& schedule, TQWidget *tqparent, const char *name) :
- KEditScheduleDlgDecl(tqparent, name, true),
+KEditScheduleDlg::KEditScheduleDlg(const MyMoneySchedule& schedule, TQWidget *parent, const char *name) :
+ KEditScheduleDlgDecl(parent, name, true),
d(new Private)
{
d->m_schedule = schedule;
@@ -197,7 +197,7 @@ TransactionEditor* KEditScheduleDlg::startEdit(void)
connect(editor, TQT_SIGNAL(createSecurity(MyMoneyAccount&, const MyMoneyAccount&)), kmymoney2, TQT_SLOT(slotInvestmentNew(MyMoneyAccount&, const MyMoneyAccount&)));
connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), editor, TQT_SLOT(slotReloadEditWidgets()));
- // create the widgets, place them in the tqparent and load them with data
+ // create the widgets, place them in the parent and load them with data
// setup tab order
d->m_tabOrderWidgets.clear();
KMyMoneyRegister::Action action = KMyMoneyRegister::ActionWithdrawal;
@@ -395,7 +395,7 @@ bool KEditScheduleDlg::focusNextPrevChild(bool next)
w = tqApp->tqfocusWidget();
while(w && d->m_tabOrderWidgets.find(w) == -1) {
- // qDebug("'%s' not in list, use tqparent", w->className());
+ // qDebug("'%s' not in list, use parent", w->className());
w = w->parentWidget();
}
// if(w) qDebug("tab order is at '%s'", w->className());
diff --git a/kmymoney2/dialogs/keditscheduledlg.h b/kmymoney2/dialogs/keditscheduledlg.h
index db80aea..e00069e 100644
--- a/kmymoney2/dialogs/keditscheduledlg.h
+++ b/kmymoney2/dialogs/keditscheduledlg.h
@@ -45,7 +45,7 @@ public:
/**
* Standard TQWidget constructor.
**/
- KEditScheduleDlg(const MyMoneySchedule& schedule, TQWidget *tqparent=0, const char *name=0);
+ KEditScheduleDlg(const MyMoneySchedule& schedule, TQWidget *parent=0, const char *name=0);
/**
* Standard destructor.
diff --git a/kmymoney2/dialogs/kendingbalancedlg.cpp b/kmymoney2/dialogs/kendingbalancedlg.cpp
index 05b2896..9aeb0e1 100644
--- a/kmymoney2/dialogs/kendingbalancedlg.cpp
+++ b/kmymoney2/dialogs/kendingbalancedlg.cpp
@@ -58,8 +58,8 @@ public:
TQMap<TQWidget*, TQString> m_helpAnchor;
};
-KEndingBalanceDlg::KEndingBalanceDlg(const MyMoneyAccount& account, TQWidget *tqparent, const char *name) :
- KEndingBalanceDlgDecl(tqparent, name, true),
+KEndingBalanceDlg::KEndingBalanceDlg(const MyMoneyAccount& account, TQWidget *parent, const char *name) :
+ KEndingBalanceDlgDecl(parent, name, true),
d(new Private)
{
TQString value;
@@ -246,12 +246,12 @@ void KEndingBalanceDlg::slotCreateChargesCategory(const TQString& txt, TQString&
createCategory(txt, id, MyMoneyFile::instance()->expense());
}
-void KEndingBalanceDlg::createCategory(const TQString& txt, TQString& id, const MyMoneyAccount& tqparent)
+void KEndingBalanceDlg::createCategory(const TQString& txt, TQString& id, const MyMoneyAccount& parent)
{
MyMoneyAccount acc;
acc.setName(txt);
- emit createCategory(acc, tqparent);
+ emit createCategory(acc, parent);
id = acc.id();
}
@@ -380,8 +380,8 @@ void KEndingBalanceDlg::help(void)
kapp->invokeHelp(anchor);
}
-KEndingBalanceLoanDlg::KEndingBalanceLoanDlg(const MyMoneyAccount& account, TQWidget *tqparent, const char *name) :
- KEndingBalanceDlgDecl(tqparent, name, true),
+KEndingBalanceLoanDlg::KEndingBalanceLoanDlg(const MyMoneyAccount& account, TQWidget *parent, const char *name) :
+ KEndingBalanceDlgDecl(parent, name, true),
d(new Private)
{
d->m_account = account;
diff --git a/kmymoney2/dialogs/kendingbalancedlg.h b/kmymoney2/dialogs/kendingbalancedlg.h
index 67a1098..5bb6831 100644
--- a/kmymoney2/dialogs/kendingbalancedlg.h
+++ b/kmymoney2/dialogs/kendingbalancedlg.h
@@ -53,7 +53,7 @@ class KEndingBalanceDlg : public KEndingBalanceDlgDecl
Q_OBJECT
TQ_OBJECT
public:
- KEndingBalanceDlg(const MyMoneyAccount& account, TQWidget *tqparent=0, const char *name=0);
+ KEndingBalanceDlg(const MyMoneyAccount& account, TQWidget *parent=0, const char *name=0);
~KEndingBalanceDlg();
const MyMoneyMoney endingBalance(void) const;
@@ -66,7 +66,7 @@ public:
protected:
bool createTransaction(MyMoneyTransaction& t, const int sign, kMyMoneyEdit *amountEdit, KMyMoneyCategory *categoryEdit, kMyMoneyDateInput* dateEdit);
const MyMoneyMoney adjustedReturnValue(const MyMoneyMoney& v) const;
- void createCategory(const TQString& txt, TQString& id, const MyMoneyAccount& tqparent);
+ void createCategory(const TQString& txt, TQString& id, const MyMoneyAccount& parent);
protected slots:
void slotCheckPageFinished(void);
@@ -86,7 +86,7 @@ signals:
/**
* emit when a category is about to be created
*/
- void createCategory(MyMoneyAccount& acc, const MyMoneyAccount& tqparent);
+ void createCategory(MyMoneyAccount& acc, const MyMoneyAccount& parent);
private:
/// \internal d-pointer class.
@@ -105,7 +105,7 @@ class KEndingBalanceLoanDlg : public KEndingBalanceDlgDecl
Q_OBJECT
TQ_OBJECT
public:
- KEndingBalanceLoanDlg(const MyMoneyAccount& account, TQWidget *tqparent=0, const char *name=0);
+ KEndingBalanceLoanDlg(const MyMoneyAccount& account, TQWidget *parent=0, const char *name=0);
~KEndingBalanceLoanDlg();
/**
diff --git a/kmymoney2/dialogs/kenterscheduledlg.cpp b/kmymoney2/dialogs/kenterscheduledlg.cpp
index 58d2e25..4c078f1 100644
--- a/kmymoney2/dialogs/kenterscheduledlg.cpp
+++ b/kmymoney2/dialogs/kenterscheduledlg.cpp
@@ -62,8 +62,8 @@ public:
KMyMoneyUtils::EnterScheduleResultCodeE m_extendedReturnCode;
};
-KEnterScheduleDlg::KEnterScheduleDlg(TQWidget *tqparent, const MyMoneySchedule& schedule) :
- KEnterScheduleDlgDecl(tqparent, "kenterscheduledlg"),
+KEnterScheduleDlg::KEnterScheduleDlg(TQWidget *parent, const MyMoneySchedule& schedule) :
+ KEnterScheduleDlgDecl(parent, "kenterscheduledlg"),
d(new Private)
{
d->m_schedule = schedule;
@@ -217,7 +217,7 @@ TransactionEditor* KEnterScheduleDlg::startEdit(void)
connect(editor, TQT_SIGNAL(createSecurity(MyMoneyAccount&, const MyMoneyAccount&)), kmymoney2, TQT_SLOT(slotInvestmentNew(MyMoneyAccount&, const MyMoneyAccount&)));
connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), editor, TQT_SLOT(slotReloadEditWidgets()));
- // create the widgets, place them in the tqparent and load them with data
+ // create the widgets, place them in the parent and load them with data
// setup tab order
d->m_tabOrderWidgets.clear();
KMyMoneyRegister::Action action = KMyMoneyRegister::ActionWithdrawal;
@@ -291,7 +291,7 @@ bool KEnterScheduleDlg::focusNextPrevChild(bool next)
w = tqApp->tqfocusWidget();
while(w && d->m_tabOrderWidgets.find(w) == -1) {
- // qDebug("'%s' not in list, use tqparent", w->className());
+ // qDebug("'%s' not in list, use parent", w->className());
w = w->parentWidget();
}
// if(w) qDebug("tab order is at '%s'", w->className());
diff --git a/kmymoney2/dialogs/kenterscheduledlg.h b/kmymoney2/dialogs/kenterscheduledlg.h
index 8f45d75..c3d670a 100644
--- a/kmymoney2/dialogs/kenterscheduledlg.h
+++ b/kmymoney2/dialogs/kenterscheduledlg.h
@@ -41,7 +41,7 @@ class KEnterScheduleDlg : public KEnterScheduleDlgDecl
Q_OBJECT
TQ_OBJECT
public:
- KEnterScheduleDlg(TQWidget *tqparent, const MyMoneySchedule& schedule);
+ KEnterScheduleDlg(TQWidget *parent, const MyMoneySchedule& schedule);
~KEnterScheduleDlg();
TransactionEditor* startEdit(void);
diff --git a/kmymoney2/dialogs/kequitypriceupdatedlg.cpp b/kmymoney2/dialogs/kequitypriceupdatedlg.cpp
index ede8f88..4121abd 100644
--- a/kmymoney2/dialogs/kequitypriceupdatedlg.cpp
+++ b/kmymoney2/dialogs/kequitypriceupdatedlg.cpp
@@ -61,8 +61,8 @@
#define ID_COL 4
#define SOURCE_COL 5
-KEquityPriceUpdateDlg::KEquityPriceUpdateDlg(TQWidget *tqparent, const TQString& securityId) :
- KEquityPriceUpdateDlgDecl(tqparent),
+KEquityPriceUpdateDlg::KEquityPriceUpdateDlg(TQWidget *parent, const TQString& securityId) :
+ KEquityPriceUpdateDlgDecl(parent),
m_fUpdateAll(false)
{
lvEquityList->setRootIsDecorated(false);
diff --git a/kmymoney2/dialogs/kequitypriceupdatedlg.h b/kmymoney2/dialogs/kequitypriceupdatedlg.h
index a5a0bac..ecc8030 100644
--- a/kmymoney2/dialogs/kequitypriceupdatedlg.h
+++ b/kmymoney2/dialogs/kequitypriceupdatedlg.h
@@ -53,7 +53,7 @@ class KEquityPriceUpdateDlg : public KEquityPriceUpdateDlgDecl
Q_OBJECT
TQ_OBJECT
public:
- KEquityPriceUpdateDlg(TQWidget *tqparent, const TQString& securityId = TQString());
+ KEquityPriceUpdateDlg(TQWidget *parent, const TQString& securityId = TQString());
~KEquityPriceUpdateDlg();
void storePrices(void);
MyMoneyPrice price(const TQString& id) const;
diff --git a/kmymoney2/dialogs/kexportdlg.cpp b/kmymoney2/dialogs/kexportdlg.cpp
index a0b5743..3332c0d 100644
--- a/kmymoney2/dialogs/kexportdlg.cpp
+++ b/kmymoney2/dialogs/kexportdlg.cpp
@@ -45,8 +45,8 @@
#include "../widgets/kmymoneyaccountcombo.h"
#include "../kmymoneyutils.h"
-KExportDlg::KExportDlg(TQWidget *tqparent)
- : KExportDlgDecl(tqparent, 0, true)
+KExportDlg::KExportDlg(TQWidget *parent)
+ : KExportDlgDecl(parent, 0, true)
{
// Set (almost) all the last used options
readConfig();
diff --git a/kmymoney2/dialogs/kexportdlg.h b/kmymoney2/dialogs/kexportdlg.h
index 9afca12..8fdcf1f 100644
--- a/kmymoney2/dialogs/kexportdlg.h
+++ b/kmymoney2/dialogs/kexportdlg.h
@@ -58,7 +58,7 @@ class KExportDlg : public KExportDlgDecl
TQ_OBJECT
public:
- KExportDlg(TQWidget *tqparent);
+ KExportDlg(TQWidget *parent);
~KExportDlg();
/**
diff --git a/kmymoney2/dialogs/kfindtransactiondlg.cpp b/kmymoney2/dialogs/kfindtransactiondlg.cpp
index 5c7a789..c97e32e 100644
--- a/kmymoney2/dialogs/kfindtransactiondlg.cpp
+++ b/kmymoney2/dialogs/kfindtransactiondlg.cpp
@@ -56,8 +56,8 @@
#include "ksortoptiondlg.h"
-KFindTransactionDlg::KFindTransactionDlg(TQWidget *tqparent, const char *name) :
- KFindTransactionDlgDecl(tqparent, name, false),
+KFindTransactionDlg::KFindTransactionDlg(TQWidget *parent, const char *name) :
+ KFindTransactionDlgDecl(parent, name, false),
m_needReload(false)
{
m_register->installEventFilter(this);
diff --git a/kmymoney2/dialogs/kfindtransactiondlg.h b/kmymoney2/dialogs/kfindtransactiondlg.h
index bd0cb7a..c40cb40 100644
--- a/kmymoney2/dialogs/kfindtransactiondlg.h
+++ b/kmymoney2/dialogs/kfindtransactiondlg.h
@@ -78,7 +78,7 @@ public:
dateOptionCount
};
*/
- KFindTransactionDlg(TQWidget *tqparent=0, const char *name=0);
+ KFindTransactionDlg(TQWidget *parent=0, const char *name=0);
~KFindTransactionDlg() {}
virtual bool eventFilter( TQObject *o, TQEvent *e );
diff --git a/kmymoney2/dialogs/kgncimportoptionsdlg.cpp b/kmymoney2/dialogs/kgncimportoptionsdlg.cpp
index 9aaf5b6..40f47d8 100644
--- a/kmymoney2/dialogs/kgncimportoptionsdlg.cpp
+++ b/kmymoney2/dialogs/kgncimportoptionsdlg.cpp
@@ -35,8 +35,8 @@
#include "kgncimportoptionsdlg.h"
// dialog constructor
-KGncImportOptionsDlg::KGncImportOptionsDlg(TQWidget *tqparent, const char *name)
- : KGncImportOptionsDlgDecl(tqparent, name)
+KGncImportOptionsDlg::KGncImportOptionsDlg(TQWidget *parent, const char *name)
+ : KGncImportOptionsDlgDecl(parent, name)
{
buttonInvestGroup->setRadioButtonExclusive (true);
buttonInvestGroup->setButton (0);
diff --git a/kmymoney2/dialogs/kgncimportoptionsdlg.h b/kmymoney2/dialogs/kgncimportoptionsdlg.h
index 787bd8b..1c682c0 100644
--- a/kmymoney2/dialogs/kgncimportoptionsdlg.h
+++ b/kmymoney2/dialogs/kgncimportoptionsdlg.h
@@ -44,7 +44,7 @@ class KGncImportOptionsDlg : public KGncImportOptionsDlgDecl
Q_OBJECT
TQ_OBJECT
public:
- KGncImportOptionsDlg(TQWidget *tqparent = 0, const char *name = 0);
+ KGncImportOptionsDlg(TQWidget *parent = 0, const char *name = 0);
~KGncImportOptionsDlg();
int investmentOption () const {return (buttonInvestGroup->selectedId());};
diff --git a/kmymoney2/dialogs/kgncpricesourcedlg.cpp b/kmymoney2/dialogs/kgncpricesourcedlg.cpp
index 5058d5b..8c807f3 100644
--- a/kmymoney2/dialogs/kgncpricesourcedlg.cpp
+++ b/kmymoney2/dialogs/kgncpricesourcedlg.cpp
@@ -36,8 +36,8 @@
#include "kgncpricesourcedlg.h"
#include "../converter/webpricequote.h"
-KGncPriceSourceDlg::KGncPriceSourceDlg(TQWidget *tqparent, const char *name)
- : KGncPriceSourceDlgDecl(tqparent, name)
+KGncPriceSourceDlg::KGncPriceSourceDlg(TQWidget *parent, const char *name)
+ : KGncPriceSourceDlgDecl(parent, name)
{
}
KGncPriceSourceDlg::KGncPriceSourceDlg(const TQString &stockName, const TQString &gncSource){
diff --git a/kmymoney2/dialogs/kgncpricesourcedlg.h b/kmymoney2/dialogs/kgncpricesourcedlg.h
index 1d2eac6..4550240 100644
--- a/kmymoney2/dialogs/kgncpricesourcedlg.h
+++ b/kmymoney2/dialogs/kgncpricesourcedlg.h
@@ -36,7 +36,7 @@ class KGncPriceSourceDlg : public KGncPriceSourceDlgDecl
Q_OBJECT
TQ_OBJECT
public:
- KGncPriceSourceDlg(TQWidget *tqparent = 0, const char *name = 0);
+ KGncPriceSourceDlg(TQWidget *parent = 0, const char *name = 0);
KGncPriceSourceDlg(const TQString &stockName, const TQString &gncSource);
~KGncPriceSourceDlg();
diff --git a/kmymoney2/dialogs/kgpgkeyselectiondlg.cpp b/kmymoney2/dialogs/kgpgkeyselectiondlg.cpp
index 38ff094..03bdff4 100644
--- a/kmymoney2/dialogs/kgpgkeyselectiondlg.cpp
+++ b/kmymoney2/dialogs/kgpgkeyselectiondlg.cpp
@@ -34,8 +34,8 @@
#include "kgpgkeyselectiondlg.h"
#include <kmymoney/kgpgfile.h>
-KGpgKeySelectionDlg::KGpgKeySelectionDlg(TQWidget *tqparent, const char *name) :
- KDialogBase(tqparent, name, true, i18n("Select additional keys"), Ok | Cancel),
+KGpgKeySelectionDlg::KGpgKeySelectionDlg(TQWidget *parent, const char *name) :
+ KDialogBase(parent, name, true, i18n("Select additional keys"), Ok | Cancel),
m_needCheckList(true),
m_listOk(false),
m_checkCount(0)
diff --git a/kmymoney2/dialogs/kgpgkeyselectiondlg.h b/kmymoney2/dialogs/kgpgkeyselectiondlg.h
index 35b86b4..83536a2 100644
--- a/kmymoney2/dialogs/kgpgkeyselectiondlg.h
+++ b/kmymoney2/dialogs/kgpgkeyselectiondlg.h
@@ -39,7 +39,7 @@ class KGpgKeySelectionDlg : public KDialogBase
TQ_OBJECT
public:
- KGpgKeySelectionDlg(TQWidget *tqparent=0, const char *name=0);
+ KGpgKeySelectionDlg(TQWidget *parent=0, const char *name=0);
virtual ~KGpgKeySelectionDlg() {}
/**
diff --git a/kmymoney2/dialogs/kimportdlg.cpp b/kmymoney2/dialogs/kimportdlg.cpp
index 4a1b591..72a7452 100644
--- a/kmymoney2/dialogs/kimportdlg.cpp
+++ b/kmymoney2/dialogs/kimportdlg.cpp
@@ -51,8 +51,8 @@
#include "mymoneyqifprofileeditor.h"
#include "../converter/mymoneyqifprofile.h"
-KImportDlg::KImportDlg(TQWidget *tqparent, const char * name)
- : KImportDlgDecl(tqparent, name, TRUE)
+KImportDlg::KImportDlg(TQWidget *parent, const char * name)
+ : KImportDlgDecl(parent, name, TRUE)
{
// Set all the last used options
readConfig();
diff --git a/kmymoney2/dialogs/kimportdlg.h b/kmymoney2/dialogs/kimportdlg.h
index 119d77d..5c3d068 100644
--- a/kmymoney2/dialogs/kimportdlg.h
+++ b/kmymoney2/dialogs/kimportdlg.h
@@ -60,7 +60,7 @@ public:
/**
* Standard constructor
*/
- KImportDlg(TQWidget *tqparent, const char *name = 0);
+ KImportDlg(TQWidget *parent, const char *name = 0);
/** Standard destructor */
~KImportDlg();
diff --git a/kmymoney2/dialogs/kloadtemplatedlg.cpp b/kmymoney2/dialogs/kloadtemplatedlg.cpp
index 3666281..ed075b4 100644
--- a/kmymoney2/dialogs/kloadtemplatedlg.cpp
+++ b/kmymoney2/dialogs/kloadtemplatedlg.cpp
@@ -33,8 +33,8 @@
#include "kloadtemplatedlg.h"
#include "../widgets/kaccounttemplateselector.h"
-KLoadTemplateDlg::KLoadTemplateDlg(TQWidget* tqparent, const char* name) :
- KLoadTemplateDlgDecl(tqparent, name)
+KLoadTemplateDlg::KLoadTemplateDlg(TQWidget* parent, const char* name) :
+ KLoadTemplateDlgDecl(parent, name)
{
buttonOk->setGuiItem(KStdGuiItem::ok());
buttonCancel->setGuiItem(KStdGuiItem::cancel());
diff --git a/kmymoney2/dialogs/kloadtemplatedlg.h b/kmymoney2/dialogs/kloadtemplatedlg.h
index d2f36b1..51a75a0 100644
--- a/kmymoney2/dialogs/kloadtemplatedlg.h
+++ b/kmymoney2/dialogs/kloadtemplatedlg.h
@@ -36,7 +36,7 @@ class KLoadTemplateDlg : public KLoadTemplateDlgDecl
TQ_OBJECT
public:
- KLoadTemplateDlg(TQWidget *tqparent = 0, const char *name = 0);
+ KLoadTemplateDlg(TQWidget *parent = 0, const char *name = 0);
TQValueList<MyMoneyTemplate> templates(void) const;
diff --git a/kmymoney2/dialogs/kmergetransactionsdlg.cpp b/kmymoney2/dialogs/kmergetransactionsdlg.cpp
index 99dadbd..aeb4f69 100644
--- a/kmymoney2/dialogs/kmergetransactionsdlg.cpp
+++ b/kmymoney2/dialogs/kmergetransactionsdlg.cpp
@@ -31,8 +31,8 @@
#include "kmergetransactionsdlg.h"
-KMergeTransactionsDlg::KMergeTransactionsDlg(const MyMoneyAccount& account, TQWidget* tqparent, const char* name) :
- KSelectTransactionsDlg(account, tqparent, name)
+KMergeTransactionsDlg::KMergeTransactionsDlg(const MyMoneyAccount& account, TQWidget* parent, const char* name) :
+ KSelectTransactionsDlg(account, parent, name)
{
// setup descriptive texts
diff --git a/kmymoney2/dialogs/kmergetransactionsdlg.h b/kmymoney2/dialogs/kmergetransactionsdlg.h
index 23d1d5d..a8f2cb6 100644
--- a/kmymoney2/dialogs/kmergetransactionsdlg.h
+++ b/kmymoney2/dialogs/kmergetransactionsdlg.h
@@ -41,7 +41,7 @@ class KMergeTransactionsDlg: public KSelectTransactionsDlg
Q_OBJECT
TQ_OBJECT
public:
- KMergeTransactionsDlg(const MyMoneyAccount& account, TQWidget* tqparent = 0, const char* name = 0);
+ KMergeTransactionsDlg(const MyMoneyAccount& account, TQWidget* parent = 0, const char* name = 0);
bool eventFilter(TQObject* , TQEvent* ) { return false; }
diff --git a/kmymoney2/dialogs/kmymoneyfileinfodlg.cpp b/kmymoney2/dialogs/kmymoneyfileinfodlg.cpp
index c7ae4b1..b692bf7 100644
--- a/kmymoney2/dialogs/kmymoneyfileinfodlg.cpp
+++ b/kmymoney2/dialogs/kmymoneyfileinfodlg.cpp
@@ -34,8 +34,8 @@
#include <kmymoney/mymoneyfile.h>
#include <kmymoney/kmymoneyutils.h>
-KMyMoneyFileInfoDlg::KMyMoneyFileInfoDlg(TQWidget *tqparent, const char *name )
- : KMyMoneyFileInfoDlgDecl(tqparent, name)
+KMyMoneyFileInfoDlg::KMyMoneyFileInfoDlg(TQWidget *parent, const char *name )
+ : KMyMoneyFileInfoDlgDecl(parent, name)
{
// Hide the unused buttons.
buttonCancel->hide();
diff --git a/kmymoney2/dialogs/kmymoneyfileinfodlg.h b/kmymoney2/dialogs/kmymoneyfileinfodlg.h
index 548b5a3..8ead4f2 100644
--- a/kmymoney2/dialogs/kmymoneyfileinfodlg.h
+++ b/kmymoney2/dialogs/kmymoneyfileinfodlg.h
@@ -38,7 +38,7 @@ class KMyMoneyFileInfoDlg : public KMyMoneyFileInfoDlgDecl
Q_OBJECT
TQ_OBJECT
public:
- KMyMoneyFileInfoDlg(TQWidget *tqparent=0, const char *name=0);
+ KMyMoneyFileInfoDlg(TQWidget *parent=0, const char *name=0);
virtual ~KMyMoneyFileInfoDlg();
};
diff --git a/kmymoney2/dialogs/kmymoneypricedlg.cpp b/kmymoney2/dialogs/kmymoneypricedlg.cpp
index a64fd13..5e5e268 100644
--- a/kmymoney2/dialogs/kmymoneypricedlg.cpp
+++ b/kmymoney2/dialogs/kmymoneypricedlg.cpp
@@ -53,8 +53,8 @@
#define PRICE_COL 3
#define SOURCE_COL 4
-KMyMoneyPriceDlg::KMyMoneyPriceDlg(TQWidget* tqparent, const char *name) :
- KMyMoneyPriceDlgDecl(tqparent, name)
+KMyMoneyPriceDlg::KMyMoneyPriceDlg(TQWidget* parent, const char *name) :
+ KMyMoneyPriceDlgDecl(parent, name)
{
KIconLoader *il = KGlobal::iconLoader();
KGuiItem removeButtenItem( i18n( "&Delete" ),
diff --git a/kmymoney2/dialogs/kmymoneypricedlg.h b/kmymoney2/dialogs/kmymoneypricedlg.h
index c3c23e5..a050507 100644
--- a/kmymoney2/dialogs/kmymoneypricedlg.h
+++ b/kmymoney2/dialogs/kmymoneypricedlg.h
@@ -42,7 +42,7 @@ class KMyMoneyPriceDlg : public KMyMoneyPriceDlgDecl
Q_OBJECT
TQ_OBJECT
public:
- KMyMoneyPriceDlg(TQWidget* tqparent, const char *name);
+ KMyMoneyPriceDlg(TQWidget* parent, const char *name);
~KMyMoneyPriceDlg();
protected slots:
diff --git a/kmymoney2/dialogs/kmymoneysplittable.cpp b/kmymoney2/dialogs/kmymoneysplittable.cpp
index 61b8d4e..f549d4c 100644
--- a/kmymoney2/dialogs/kmymoneysplittable.cpp
+++ b/kmymoney2/dialogs/kmymoneysplittable.cpp
@@ -62,8 +62,8 @@
#include "../mymoney/mymoneyutils.h"
-kMyMoneySplitTable::kMyMoneySplitTable(TQWidget *tqparent, const char *name ) :
- TQTable(tqparent,name),
+kMyMoneySplitTable::kMyMoneySplitTable(TQWidget *parent, const char *name ) :
+ TQTable(parent,name),
m_currentRow(0),
m_maxRows(0),
m_editMode(false),
diff --git a/kmymoney2/dialogs/kmymoneysplittable.h b/kmymoney2/dialogs/kmymoneysplittable.h
index 2fda964..bbb5994 100644
--- a/kmymoney2/dialogs/kmymoneysplittable.h
+++ b/kmymoney2/dialogs/kmymoneysplittable.h
@@ -55,7 +55,7 @@ class kMyMoneySplitTable : public TQTable
Q_OBJECT
TQ_OBJECT
public:
- kMyMoneySplitTable(TQWidget *tqparent=0, const char *name=0);
+ kMyMoneySplitTable(TQWidget *parent=0, const char *name=0);
virtual ~kMyMoneySplitTable();
void paintCell(TQPainter *p, int row, int col, const TQRect& r, bool /*selected*/);
diff --git a/kmymoney2/dialogs/knewaccountdlg.cpp b/kmymoney2/dialogs/knewaccountdlg.cpp
index 529fbf8..2f2748b 100644
--- a/kmymoney2/dialogs/knewaccountdlg.cpp
+++ b/kmymoney2/dialogs/knewaccountdlg.cpp
@@ -88,8 +88,8 @@
#define KMM_KDCHART_PROPSET_NORMAL_DATA KDCHART_PROPSET_NORMAL_DATA
#endif
-KNewAccountDlg::KNewAccountDlg(const MyMoneyAccount& account, bool isEditing, bool categoryEditor, TQWidget *tqparent, const char *name, const TQString& title)
- : KNewAccountDlgDecl(tqparent,name,true),
+KNewAccountDlg::KNewAccountDlg(const MyMoneyAccount& account, bool isEditing, bool categoryEditor, TQWidget *parent, const char *name, const TQString& title)
+ : KNewAccountDlgDecl(parent,name,true),
m_account(account),
m_bSelectedParentAccount(false),
m_categoryEditor(categoryEditor),
@@ -393,7 +393,7 @@ KNewAccountDlg::KNewAccountDlg(const MyMoneyAccount& account, bool isEditing, bo
m_vatCategory->setChecked(false);
m_vatAssignment->setChecked(false);
- // make sure our account does not have an id and no tqparent assigned
+ // make sure our account does not have an id and no parent assigned
// and certainly no tqchildren in case we create a new account
if(!m_isEditing) {
m_account.clearId();
@@ -403,7 +403,7 @@ KNewAccountDlg::KNewAccountDlg(const MyMoneyAccount& account, bool isEditing, bo
m_account.removeAccountId(*it);
if(m_parentItem == 0) {
- // force loading of initial tqparent
+ // force loading of initial parent
m_account.setAccountType(MyMoneyAccount::UnknownAccountType);
MyMoneyAccount::_accountTypeE type = account.accountType();
if(type == MyMoneyAccount::UnknownAccountType)
@@ -476,10 +476,10 @@ void KNewAccountDlg::okClicked()
return;
}
- MyMoneyAccount tqparent = parentAccount();
- if (tqparent.name().length() == 0)
+ MyMoneyAccount parent = parentAccount();
+ if (parent.name().length() == 0)
{
- KMessageBox::error(this, i18n("Please select a tqparent account."));
+ KMessageBox::error(this, i18n("Please select a parent account."));
return;
}
@@ -538,10 +538,10 @@ void KNewAccountDlg::okClicked()
if (!m_categoryEditor)
{
acctype = KMyMoneyUtils::stringToAccountType(typeCombo->currentText());
- // If it's a loan, check if the tqparent is asset or liability. In
+ // If it's a loan, check if the parent is asset or liability. In
// case of asset, we change the account type to be AssetLoan
if(acctype == MyMoneyAccount::Loan
- && tqparent.accountGroup() == MyMoneyAccount::Asset)
+ && parent.accountGroup() == MyMoneyAccount::Asset)
acctype = MyMoneyAccount::AssetLoan;
#if 0
@@ -556,10 +556,10 @@ void KNewAccountDlg::okClicked()
}
else
{
- acctype = tqparent.accountGroup();
+ acctype = parent.accountGroup();
TQString newName;
- if(!MyMoneyFile::instance()->isStandardAccount(tqparent.id())) {
- newName = MyMoneyFile::instance()->accountToCategory(tqparent.id()) + MyMoneyFile::AccountSeperator;
+ if(!MyMoneyFile::instance()->isStandardAccount(parent.id())) {
+ newName = MyMoneyFile::instance()->accountToCategory(parent.id()) + MyMoneyFile::AccountSeperator;
}
newName += accountNameText;
if(!file->categoryToAccount(newName, acctype).isEmpty()
@@ -723,7 +723,7 @@ void KNewAccountDlg::initParentWidget(TQString parentId, const TQString& account
m_parentItem = 0;
m_accountItem = 0;
- // Determine the tqparent account
+ // Determine the parent account
try
{
m_parentAccount = file->account(parentId);
@@ -748,7 +748,7 @@ void KNewAccountDlg::initParentWidget(TQString parentId, const TQString& account
m_qlistviewParentAccounts->clear();
- // Now scan all 4 account roots to load the list and mark the tqparent
+ // Now scan all 4 account roots to load the list and mark the parent
try
{
if (!m_categoryEditor)
diff --git a/kmymoney2/dialogs/knewaccountdlg.h b/kmymoney2/dialogs/knewaccountdlg.h
index a4ae636..807af7e 100644
--- a/kmymoney2/dialogs/knewaccountdlg.h
+++ b/kmymoney2/dialogs/knewaccountdlg.h
@@ -81,17 +81,17 @@ public:
* apply and will be handled by the dialog.
*
* @param account The original data to be used to create the account. In case
- * of @p isEditing is false, the account id, the tqparent account id
+ * of @p isEditing is false, the account id, the parent account id
* and the list of all child accounts will be cleared.
* @param isEditing If @p false, rules for new account creation apply.
* If @p true, rules for account editing apply
* @param categoryEditor If @p false, rules for asset/liability accounts apply.
* If @p true, rules for income/expense account apply.
- * @param tqparent Pointer to tqparent object (passed to TQDialog). Default is 0.
+ * @param parent Pointer to parent object (passed to TQDialog). Default is 0.
* @param name Name of the object (passed to TQDialog). Default is 0.
* @param title Caption of the object (passed to TQDialog). Default is empty string.
*/
- KNewAccountDlg(const MyMoneyAccount& account, bool isEditing, bool categoryEditor, TQWidget *tqparent=0, const char *name=0, const TQString& title=TQString());
+ KNewAccountDlg(const MyMoneyAccount& account, bool isEditing, bool categoryEditor, TQWidget *parent=0, const char *name=0, const TQString& title=TQString());
/**
* This method returns the edited account object.
@@ -99,7 +99,7 @@ public:
const MyMoneyAccount& account(void);
/**
- * This method returns the tqparent account of the edited account object.
+ * This method returns the parent account of the edited account object.
*/
const MyMoneyAccount& parentAccount(void);
diff --git a/kmymoney2/dialogs/knewbankdlg.cpp b/kmymoney2/dialogs/knewbankdlg.cpp
index fd886b8..efbf3b5 100644
--- a/kmymoney2/dialogs/knewbankdlg.cpp
+++ b/kmymoney2/dialogs/knewbankdlg.cpp
@@ -43,8 +43,8 @@
#include "knewbankdlg.h"
-KNewBankDlg::KNewBankDlg(MyMoneyInstitution& institution, TQWidget *tqparent, const char *name)
- : KNewBankDlgDecl(tqparent,name,true), m_institution(institution)
+KNewBankDlg::KNewBankDlg(MyMoneyInstitution& institution, TQWidget *parent, const char *name)
+ : KNewBankDlgDecl(parent,name,true), m_institution(institution)
{
okBtn->setGuiItem(KStdGuiItem::ok());
cancelBtn->setGuiItem(KStdGuiItem::cancel());
diff --git a/kmymoney2/dialogs/knewbankdlg.h b/kmymoney2/dialogs/knewbankdlg.h
index 55deee1..6b5ae21 100644
--- a/kmymoney2/dialogs/knewbankdlg.h
+++ b/kmymoney2/dialogs/knewbankdlg.h
@@ -42,7 +42,7 @@ class KNewBankDlg : public KNewBankDlgDecl
TQ_OBJECT
public:
- KNewBankDlg(MyMoneyInstitution& institution, TQWidget *tqparent = 0, const char *name = 0);
+ KNewBankDlg(MyMoneyInstitution& institution, TQWidget *parent = 0, const char *name = 0);
~KNewBankDlg();
const MyMoneyInstitution& institution(void);
diff --git a/kmymoney2/dialogs/knewbudgetdlg.cpp b/kmymoney2/dialogs/knewbudgetdlg.cpp
index 67fcbda..0224abb 100644
--- a/kmymoney2/dialogs/knewbudgetdlg.cpp
+++ b/kmymoney2/dialogs/knewbudgetdlg.cpp
@@ -37,8 +37,8 @@
const int KNewBudgetDlg::m_icFutureYears = 5;
const int KNewBudgetDlg::m_icPastYears = 2;
-KNewBudgetDlg::KNewBudgetDlg(TQWidget* tqparent, const char *name) :
- KNewBudgetDlgDecl(tqparent, name)
+KNewBudgetDlg::KNewBudgetDlg(TQWidget* parent, const char *name) :
+ KNewBudgetDlgDecl(parent, name)
{
TQStringList slYear;
TQDate dToday = TQDate::tqcurrentDate();
diff --git a/kmymoney2/dialogs/knewbudgetdlg.h b/kmymoney2/dialogs/knewbudgetdlg.h
index 697ecfd..287f965 100644
--- a/kmymoney2/dialogs/knewbudgetdlg.h
+++ b/kmymoney2/dialogs/knewbudgetdlg.h
@@ -38,7 +38,7 @@ class KNewBudgetDlg : public KNewBudgetDlgDecl
Q_OBJECT
TQ_OBJECT
public:
- KNewBudgetDlg(TQWidget* tqparent, const char *name);
+ KNewBudgetDlg(TQWidget* parent, const char *name);
~KNewBudgetDlg();
TQString& getYear() {return m_year;};
diff --git a/kmymoney2/dialogs/knewequityentrydlg.cpp b/kmymoney2/dialogs/knewequityentrydlg.cpp
index 29a91b3..60e2fe0 100644
--- a/kmymoney2/dialogs/knewequityentrydlg.cpp
+++ b/kmymoney2/dialogs/knewequityentrydlg.cpp
@@ -36,8 +36,8 @@
#include "../widgets/kmymoneyedit.h"
#include "../mymoney/mymoneymoney.h"
-KNewEquityEntryDlg::KNewEquityEntryDlg(TQWidget *tqparent, const char *name)
- : kNewEquityEntryDecl(tqparent, name, TRUE)
+KNewEquityEntryDlg::KNewEquityEntryDlg(TQWidget *parent, const char *name)
+ : kNewEquityEntryDecl(parent, name, TRUE)
{
edtFraction->setCalculatorButtonVisible(false);
edtFraction->setPrecision(0);
diff --git a/kmymoney2/dialogs/knewequityentrydlg.h b/kmymoney2/dialogs/knewequityentrydlg.h
index d3a5a89..cbcfadb 100644
--- a/kmymoney2/dialogs/knewequityentrydlg.h
+++ b/kmymoney2/dialogs/knewequityentrydlg.h
@@ -41,7 +41,7 @@ class KNewEquityEntryDlg : public kNewEquityEntryDecl
Q_OBJECT
TQ_OBJECT
public:
- KNewEquityEntryDlg(TQWidget *tqparent = NULL, const char *name = NULL);
+ KNewEquityEntryDlg(TQWidget *parent = NULL, const char *name = NULL);
virtual ~KNewEquityEntryDlg();
void setSymbolName(const TQString& str);
diff --git a/kmymoney2/dialogs/knewfiledlg.cpp b/kmymoney2/dialogs/knewfiledlg.cpp
index 7a3b221..1fe8f88 100644
--- a/kmymoney2/dialogs/knewfiledlg.cpp
+++ b/kmymoney2/dialogs/knewfiledlg.cpp
@@ -43,16 +43,16 @@
#include "knewfiledlg.h"
-KNewFileDlg::KNewFileDlg(TQWidget *tqparent, const char *name, const TQString& title)
- : KNewFileDlgDecl(tqparent,name,true)
+KNewFileDlg::KNewFileDlg(TQWidget *parent, const char *name, const TQString& title)
+ : KNewFileDlgDecl(parent,name,true)
{
init(title);
}
KNewFileDlg::KNewFileDlg(TQString userName, TQString userStreet,
TQString userTown, TQString userCounty, TQString userPostcode, TQString userTelephone,
- TQString userEmail, TQWidget *tqparent, const char *name, const TQString& title)
- : KNewFileDlgDecl(tqparent,name,true)
+ TQString userEmail, TQWidget *parent, const char *name, const TQString& title)
+ : KNewFileDlgDecl(parent,name,true)
{
userNameEdit->setText(userName);
streetEdit->setText(userStreet);
diff --git a/kmymoney2/dialogs/knewfiledlg.h b/kmymoney2/dialogs/knewfiledlg.h
index 3cf8c7c..e9cf61a 100644
--- a/kmymoney2/dialogs/knewfiledlg.h
+++ b/kmymoney2/dialogs/knewfiledlg.h
@@ -35,10 +35,10 @@ class KNewFileDlg : public KNewFileDlgDecl {
Q_OBJECT
TQ_OBJECT
public:
- KNewFileDlg(TQWidget *tqparent=0, const char *name=0, const TQString& title=TQString());
+ KNewFileDlg(TQWidget *parent=0, const char *name=0, const TQString& title=TQString());
KNewFileDlg(TQString userName, TQString userStreet,
TQString userTown, TQString userCounty, TQString userPostcode, TQString userTelephone,
- TQString userEmail, TQWidget *tqparent=0, const char *name=0, const TQString& title=TQString());
+ TQString userEmail, TQWidget *parent=0, const char *name=0, const TQString& title=TQString());
~KNewFileDlg();
KPushButton* cancelButton(void) { return cancelBtn; };
diff --git a/kmymoney2/dialogs/knewinvestmentwizard.cpp b/kmymoney2/dialogs/knewinvestmentwizard.cpp
index 3a963f2..85e6cc9 100644
--- a/kmymoney2/dialogs/knewinvestmentwizard.cpp
+++ b/kmymoney2/dialogs/knewinvestmentwizard.cpp
@@ -45,8 +45,8 @@
#include "../converter/webpricequote.h"
#include "../kmymoneyutils.h"
-KNewInvestmentWizard::KNewInvestmentWizard( TQWidget *tqparent, const char *name ) :
- KNewInvestmentWizardDecl( tqparent, name )
+KNewInvestmentWizard::KNewInvestmentWizard( TQWidget *parent, const char *name ) :
+ KNewInvestmentWizardDecl( parent, name )
{
init1();
slotCheckPage(TQString());
@@ -55,8 +55,8 @@ KNewInvestmentWizard::KNewInvestmentWizard( TQWidget *tqparent, const char *name
connect(m_investmentSymbol, TQT_SIGNAL(lineChanged(const TQString&)), this, TQT_SLOT(slotCheckForExistingSymbol(const TQString&)));
}
-KNewInvestmentWizard::KNewInvestmentWizard( const MyMoneyAccount& acc, TQWidget *tqparent, const char *name ) :
- KNewInvestmentWizardDecl( tqparent, name ),
+KNewInvestmentWizard::KNewInvestmentWizard( const MyMoneyAccount& acc, TQWidget *parent, const char *name ) :
+ KNewInvestmentWizardDecl( parent, name ),
m_account(acc)
{
setCaption(i18n("Investment detail wizard"));
@@ -75,8 +75,8 @@ KNewInvestmentWizard::KNewInvestmentWizard( const MyMoneyAccount& acc, TQWidget
}
-KNewInvestmentWizard::KNewInvestmentWizard( const MyMoneySecurity& security, TQWidget *tqparent, const char *name ) :
- KNewInvestmentWizardDecl( tqparent, name ),
+KNewInvestmentWizard::KNewInvestmentWizard( const MyMoneySecurity& security, TQWidget *parent, const char *name ) :
+ KNewInvestmentWizardDecl( parent, name ),
m_security(security)
{
setCaption(i18n("Security detail wizard"));
@@ -299,8 +299,8 @@ void KNewInvestmentWizard::createObjects(const TQString& parentId)
}
if(m_account.id().isEmpty()) {
- MyMoneyAccount tqparent = file->account(parentId);
- file->addAccount(m_account, tqparent);
+ MyMoneyAccount parent = file->account(parentId);
+ file->addAccount(m_account, parent);
} else
file->modifyAccount(m_account);
}
diff --git a/kmymoney2/dialogs/knewinvestmentwizard.h b/kmymoney2/dialogs/knewinvestmentwizard.h
index 43a3be7..5b00d52 100644
--- a/kmymoney2/dialogs/knewinvestmentwizard.h
+++ b/kmymoney2/dialogs/knewinvestmentwizard.h
@@ -44,17 +44,17 @@ public:
/**
* Use this constructor for the creation of a new investment
*/
- KNewInvestmentWizard( TQWidget *tqparent = 0, const char *name = 0 );
+ KNewInvestmentWizard( TQWidget *parent = 0, const char *name = 0 );
/**
* Use this constructor for the modification of an existing investment
*/
- KNewInvestmentWizard( const MyMoneyAccount& acc, TQWidget *tqparent = 0, const char *name = 0 );
+ KNewInvestmentWizard( const MyMoneyAccount& acc, TQWidget *parent = 0, const char *name = 0 );
/**
* Use this constructor for the modification of an existing security
*/
- KNewInvestmentWizard( const MyMoneySecurity& sec, TQWidget *tqparent = 0, const char *name = 0 );
+ KNewInvestmentWizard( const MyMoneySecurity& sec, TQWidget *parent = 0, const char *name = 0 );
~KNewInvestmentWizard();
@@ -68,7 +68,7 @@ public:
* creates all necessary objects for the investment or updates
* them.
*
- * @param parentId id of tqparent account for the investment
+ * @param parentId id of parent account for the investment
*/
void createObjects(const TQString& parentId);
diff --git a/kmymoney2/dialogs/knewloanwizard.cpp b/kmymoney2/dialogs/knewloanwizard.cpp
index e56dbf9..fe39525 100644
--- a/kmymoney2/dialogs/knewloanwizard.cpp
+++ b/kmymoney2/dialogs/knewloanwizard.cpp
@@ -59,8 +59,8 @@
#include "../kmymoney2.h"
-KNewLoanWizard::KNewLoanWizard(TQWidget *tqparent, const char *name ) :
- KNewLoanWizardDecl(tqparent, name, true)
+KNewLoanWizard::KNewLoanWizard(TQWidget *parent, const char *name ) :
+ KNewLoanWizardDecl(parent, name, true)
{
connect(m_borrowButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLiabilityLoan()));
connect(m_lendButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAssetLoan()));
diff --git a/kmymoney2/dialogs/knewloanwizard.h b/kmymoney2/dialogs/knewloanwizard.h
index 8cf019d..42e8a0f 100644
--- a/kmymoney2/dialogs/knewloanwizard.h
+++ b/kmymoney2/dialogs/knewloanwizard.h
@@ -56,7 +56,7 @@ class KNewLoanWizard : public KNewLoanWizardDecl
Q_OBJECT
TQ_OBJECT
public:
- KNewLoanWizard(TQWidget *tqparent=0, const char *name=0);
+ KNewLoanWizard(TQWidget *parent=0, const char *name=0);
~KNewLoanWizard();
/**
diff --git a/kmymoney2/dialogs/konlinequoteconfigurationdlg.cpp b/kmymoney2/dialogs/konlinequoteconfigurationdlg.cpp
index d479c81..10a46bd 100644
--- a/kmymoney2/dialogs/konlinequoteconfigurationdlg.cpp
+++ b/kmymoney2/dialogs/konlinequoteconfigurationdlg.cpp
@@ -38,7 +38,7 @@
#include "konlinequoteconfigurationdlg.h"
-KOnlineQuoteConfigurationDlg::KOnlineQuoteConfigurationDlg(TQWidget *tqparent) : kOnlineQuoteConfigurationDecl(tqparent)
+KOnlineQuoteConfigurationDlg::KOnlineQuoteConfigurationDlg(TQWidget *parent) : kOnlineQuoteConfigurationDecl(parent)
{
}
diff --git a/kmymoney2/dialogs/konlinequoteconfigurationdlg.h b/kmymoney2/dialogs/konlinequoteconfigurationdlg.h
index 7a9eb65..78667e5 100644
--- a/kmymoney2/dialogs/konlinequoteconfigurationdlg.h
+++ b/kmymoney2/dialogs/konlinequoteconfigurationdlg.h
@@ -42,7 +42,7 @@ class KOnlineQuoteConfigurationDlg : public kOnlineQuoteConfigurationDecl
Q_OBJECT
TQ_OBJECT
public:
- KOnlineQuoteConfigurationDlg(TQWidget *tqparent);
+ KOnlineQuoteConfigurationDlg(TQWidget *parent);
~KOnlineQuoteConfigurationDlg();
};
diff --git a/kmymoney2/dialogs/kpayeereassigndlg.cpp b/kmymoney2/dialogs/kpayeereassigndlg.cpp
index dc03518..0c3c0cf 100644
--- a/kmymoney2/dialogs/kpayeereassigndlg.cpp
+++ b/kmymoney2/dialogs/kpayeereassigndlg.cpp
@@ -36,8 +36,8 @@
#include <kmymoney/kmymoneycombo.h>
#include <kmymoney/kguiutils.h>
-KPayeeReassignDlg::KPayeeReassignDlg( TQWidget* tqparent, const char* name) :
- KPayeeReassignDlgDecl( tqparent, name)
+KPayeeReassignDlg::KPayeeReassignDlg( TQWidget* parent, const char* name) :
+ KPayeeReassignDlgDecl( parent, name)
{
buttonOk->setGuiItem(KStdGuiItem::ok());
buttonCancel->setGuiItem(KStdGuiItem::cancel());
diff --git a/kmymoney2/dialogs/kpayeereassigndlg.h b/kmymoney2/dialogs/kpayeereassigndlg.h
index f0f21ac..c77f9a2 100644
--- a/kmymoney2/dialogs/kpayeereassigndlg.h
+++ b/kmymoney2/dialogs/kpayeereassigndlg.h
@@ -45,7 +45,7 @@ class KPayeeReassignDlg : public KPayeeReassignDlgDecl
TQ_OBJECT
public:
/** Default constructor */
- KPayeeReassignDlg( TQWidget* tqparent = 0, const char* name = 0);
+ KPayeeReassignDlg( TQWidget* parent = 0, const char* name = 0);
/** Destructor */
~KPayeeReassignDlg();
diff --git a/kmymoney2/dialogs/krecentfileitem.cpp b/kmymoney2/dialogs/krecentfileitem.cpp
index dfcb0b8..ff06c6a 100644
--- a/kmymoney2/dialogs/krecentfileitem.cpp
+++ b/kmymoney2/dialogs/krecentfileitem.cpp
@@ -37,12 +37,12 @@
#include "krecentfileitem.h"
-KRecentFileItem::KRecentFileItem(const TQString& url, TQIconView* tqparent, const TQString& text, const TQPixmap& icon)
- : TQIconViewItem(tqparent, text, icon),
+KRecentFileItem::KRecentFileItem(const TQString& url, TQIconView* parent, const TQString& text, const TQPixmap& icon)
+ : TQIconViewItem(parent, text, icon),
m_url(url),
- m_parent(tqparent)
+ m_parent(parent)
{
- TQToolTip::add(tqparent, rect(), url);
+ TQToolTip::add(parent, rect(), url);
// avoid moving this item around
setDragEnabled(false);
}
diff --git a/kmymoney2/dialogs/krecentfileitem.h b/kmymoney2/dialogs/krecentfileitem.h
index 1859c96..89a080a 100644
--- a/kmymoney2/dialogs/krecentfileitem.h
+++ b/kmymoney2/dialogs/krecentfileitem.h
@@ -42,7 +42,7 @@
class KRecentFileItem : public TQIconViewItem {
public:
- KRecentFileItem(const TQString& url, TQIconView* tqparent, const TQString& text, const TQPixmap& icon);
+ KRecentFileItem(const TQString& url, TQIconView* parent, const TQString& text, const TQPixmap& icon);
~KRecentFileItem();
TQString fileURL(void) const { return m_url; }
diff --git a/kmymoney2/dialogs/kreconciledlg.cpp b/kmymoney2/dialogs/kreconciledlg.cpp
index 11a2a00..c48e273 100644
--- a/kmymoney2/dialogs/kreconciledlg.cpp
+++ b/kmymoney2/dialogs/kreconciledlg.cpp
@@ -24,8 +24,8 @@
KReconcileDlg::KReconcileDlg(const MyMoneyMoney /* previousBal */, const MyMoneyMoney /* endingBal */,
const TQDate /* endingDate */, MyMoneyAccount* /*accountIndex */,
- const MyMoneyFile* /* file */, TQWidget *tqparent, const char *name)
- : KReconcileDlgDecl(tqparent,name,true)
+ const MyMoneyFile* /* file */, TQWidget *parent, const char *name)
+ : KReconcileDlgDecl(parent,name,true)
{
/*
m_balanced = false;
diff --git a/kmymoney2/dialogs/kreconciledlg.h b/kmymoney2/dialogs/kreconciledlg.h
index 214c583..61b2931 100644
--- a/kmymoney2/dialogs/kreconciledlg.h
+++ b/kmymoney2/dialogs/kreconciledlg.h
@@ -31,7 +31,7 @@ class KReconcileDlg : public KReconcileDlgDecl {
Q_OBJECT
TQ_OBJECT
public:
- KReconcileDlg(const MyMoneyMoney previousBal, const MyMoneyMoney endingBal, const TQDate endingDate, MyMoneyAccount *accountIndex, const MyMoneyFile* file, TQWidget *tqparent=0, const char *name=0);
+ KReconcileDlg(const MyMoneyMoney previousBal, const MyMoneyMoney endingBal, const TQDate endingDate, MyMoneyAccount *accountIndex, const MyMoneyFile* file, TQWidget *parent=0, const char *name=0);
~KReconcileDlg();
// void updateData(void);
void resetData(const MyMoneyMoney previousBal, const MyMoneyMoney endingBal, const TQDate endingDate, MyMoneyAccount *accountIndex, const MyMoneyFile* file);
diff --git a/kmymoney2/dialogs/kreportconfigurationfilterdlg.cpp b/kmymoney2/dialogs/kreportconfigurationfilterdlg.cpp
index d904d1a..388019a 100644
--- a/kmymoney2/dialogs/kreportconfigurationfilterdlg.cpp
+++ b/kmymoney2/dialogs/kreportconfigurationfilterdlg.cpp
@@ -76,8 +76,8 @@
#include "../widgets/kmymoneyreportconfigtabchartdecl.h"
KReportConfigurationFilterDlg::KReportConfigurationFilterDlg(
- MyMoneyReport report, TQWidget *tqparent, const char *name)
- : KFindTransactionDlg(tqparent, name),
+ MyMoneyReport report, TQWidget *parent, const char *name)
+ : KFindTransactionDlg(parent, name),
m_tab2(0),
m_tab3(0),
m_tabChart(0),
diff --git a/kmymoney2/dialogs/kreportconfigurationfilterdlg.h b/kmymoney2/dialogs/kreportconfigurationfilterdlg.h
index 0a80e60..b903034 100644
--- a/kmymoney2/dialogs/kreportconfigurationfilterdlg.h
+++ b/kmymoney2/dialogs/kreportconfigurationfilterdlg.h
@@ -44,7 +44,7 @@ class KReportConfigurationFilterDlg : public KFindTransactionDlg
Q_OBJECT
TQ_OBJECT
public:
- KReportConfigurationFilterDlg(MyMoneyReport report, TQWidget *tqparent = 0, const char *name = 0);
+ KReportConfigurationFilterDlg(MyMoneyReport report, TQWidget *parent = 0, const char *name = 0);
~KReportConfigurationFilterDlg();
const MyMoneyReport& getConfig(void) const { return m_currentState; }
diff --git a/kmymoney2/dialogs/ksecuritylisteditor.cpp b/kmymoney2/dialogs/ksecuritylisteditor.cpp
index 86e2e66..0be4b0b 100644
--- a/kmymoney2/dialogs/ksecuritylisteditor.cpp
+++ b/kmymoney2/dialogs/ksecuritylisteditor.cpp
@@ -53,8 +53,8 @@
#define CURRENCY_MARKET TQString("ISO 4217")
-KSecurityListEditor::KSecurityListEditor(TQWidget *tqparent, const char *name) :
- KSecurityListEditorDecl(tqparent, name)
+KSecurityListEditor::KSecurityListEditor(TQWidget *parent, const char *name) :
+ KSecurityListEditorDecl(parent, name)
{
m_listView->setColumnWidth(ID_COL, 0);
m_listView->setColumnWidthMode(NAME_COL, TQListView::Maximum);
diff --git a/kmymoney2/dialogs/ksecuritylisteditor.h b/kmymoney2/dialogs/ksecuritylisteditor.h
index ec77483..fde851b 100644
--- a/kmymoney2/dialogs/ksecuritylisteditor.h
+++ b/kmymoney2/dialogs/ksecuritylisteditor.h
@@ -42,7 +42,7 @@ class KSecurityListEditor : public KSecurityListEditorDecl
Q_OBJECT
TQ_OBJECT
public:
- KSecurityListEditor(TQWidget *tqparent, const char* name = 0);
+ KSecurityListEditor(TQWidget *parent, const char* name = 0);
~KSecurityListEditor();
protected slots:
diff --git a/kmymoney2/dialogs/kselectdatabasedlg.cpp b/kmymoney2/dialogs/kselectdatabasedlg.cpp
index cf29d4e..85b407a 100644
--- a/kmymoney2/dialogs/kselectdatabasedlg.cpp
+++ b/kmymoney2/dialogs/kselectdatabasedlg.cpp
@@ -45,8 +45,8 @@
#include "kselectdatabasedlg.h"
-KSelectDatabaseDlg::KSelectDatabaseDlg(TQWidget *tqparent, const char *name)
- : KSelectDatabaseDlgDecl(tqparent, name) {
+KSelectDatabaseDlg::KSelectDatabaseDlg(TQWidget *parent, const char *name)
+ : KSelectDatabaseDlgDecl(parent, name) {
listDrivers->clear();
// list drivers supported by KMM
TQMap<TQString, TQString> map = m_map.driverMap();
@@ -95,8 +95,8 @@ KSelectDatabaseDlg::KSelectDatabaseDlg(TQWidget *tqparent, const char *name)
}
}
-KSelectDatabaseDlg::KSelectDatabaseDlg(KURL openURL, TQWidget *tqparent, const char *name)
- : KSelectDatabaseDlgDecl(tqparent, name) {
+KSelectDatabaseDlg::KSelectDatabaseDlg(KURL openURL, TQWidget *parent, const char *name)
+ : KSelectDatabaseDlgDecl(parent, name) {
// here we are re-opening a database from a URL
// probably taken from the last-used or recent file list
listDrivers->clear();
diff --git a/kmymoney2/dialogs/kselectdatabasedlg.h b/kmymoney2/dialogs/kselectdatabasedlg.h
index 28c44d8..efaf9f5 100644
--- a/kmymoney2/dialogs/kselectdatabasedlg.h
+++ b/kmymoney2/dialogs/kselectdatabasedlg.h
@@ -39,8 +39,8 @@ class KSelectDatabaseDlg : public KSelectDatabaseDlgDecl
Q_OBJECT
TQ_OBJECT
public:
- KSelectDatabaseDlg(TQWidget *tqparent = 0, const char *name = 0);
- KSelectDatabaseDlg(KURL openURL, TQWidget *tqparent = 0, const char *name = 0);
+ KSelectDatabaseDlg(TQWidget *parent = 0, const char *name = 0);
+ KSelectDatabaseDlg(KURL openURL, TQWidget *parent = 0, const char *name = 0);
~KSelectDatabaseDlg();
/** Set the mode of this dialog
* @param - openMode (IO_ReadWrite = open database; IO_WriteOnly = saveas database)
diff --git a/kmymoney2/dialogs/kselecttransactionsdlg.cpp b/kmymoney2/dialogs/kselecttransactionsdlg.cpp
index 1b21089..04e377e 100644
--- a/kmymoney2/dialogs/kselecttransactionsdlg.cpp
+++ b/kmymoney2/dialogs/kselecttransactionsdlg.cpp
@@ -36,8 +36,8 @@
#include "kmergetransactionsdlg.h"
-KSelectTransactionsDlg::KSelectTransactionsDlg(const MyMoneyAccount& _account, TQWidget* tqparent, const char* name) :
- KSelectTransactionsDlgDecl(tqparent, name),
+KSelectTransactionsDlg::KSelectTransactionsDlg(const MyMoneyAccount& _account, TQWidget* parent, const char* name) :
+ KSelectTransactionsDlgDecl(parent, name),
m_account(_account)
{
// setup descriptive texts
diff --git a/kmymoney2/dialogs/kselecttransactionsdlg.h b/kmymoney2/dialogs/kselecttransactionsdlg.h
index 8a2e73b..a244ed3 100644
--- a/kmymoney2/dialogs/kselecttransactionsdlg.h
+++ b/kmymoney2/dialogs/kselecttransactionsdlg.h
@@ -41,7 +41,7 @@ class KSelectTransactionsDlg: public KSelectTransactionsDlgDecl
Q_OBJECT
TQ_OBJECT
public:
- KSelectTransactionsDlg(const MyMoneyAccount& account, TQWidget* tqparent = 0, const char* name = 0);
+ KSelectTransactionsDlg(const MyMoneyAccount& account, TQWidget* parent = 0, const char* name = 0);
/**
* Adds the transaction @a t to the dialog
diff --git a/kmymoney2/dialogs/ksplittransactiondlg.cpp b/kmymoney2/dialogs/ksplittransactiondlg.cpp
index 9236bea..cb80e62 100644
--- a/kmymoney2/dialogs/ksplittransactiondlg.cpp
+++ b/kmymoney2/dialogs/ksplittransactiondlg.cpp
@@ -62,8 +62,8 @@ KSplitTransactionDlg::KSplitTransactionDlg(const MyMoneyTransaction& t,
const bool deposit,
const MyMoneyMoney& calculatedValue,
const TQMap<TQString, MyMoneyMoney>& priceInfo,
- TQWidget* tqparent, const char* name) :
- KSplitTransactionDlgDecl(tqparent, name, true),
+ TQWidget* parent, const char* name) :
+ KSplitTransactionDlgDecl(parent, name, true),
m_account(acc),
m_split(s),
m_precision(2),
@@ -428,19 +428,19 @@ MyMoneyMoney KSplitTransactionDlg::diffAmount(void)
void KSplitTransactionDlg::slotCreateCategory(const TQString& name, TQString& id)
{
- MyMoneyAccount acc, tqparent;
+ MyMoneyAccount acc, parent;
acc.setName(name);
if(m_isDeposit)
- tqparent = MyMoneyFile::instance()->income();
+ parent = MyMoneyFile::instance()->income();
else
- tqparent = MyMoneyFile::instance()->expense();
+ parent = MyMoneyFile::instance()->expense();
// TODO extract possible first part of a hierarchy and check if it is one
- // of our top categories. If so, remove it and select the tqparent
+ // of our top categories. If so, remove it and select the parent
// according to this information.
- emit createCategory(acc, tqparent);
+ emit createCategory(acc, parent);
// return id
id = acc.id();
diff --git a/kmymoney2/dialogs/ksplittransactiondlg.h b/kmymoney2/dialogs/ksplittransactiondlg.h
index 76261bd..1a292d2 100644
--- a/kmymoney2/dialogs/ksplittransactiondlg.h
+++ b/kmymoney2/dialogs/ksplittransactiondlg.h
@@ -61,7 +61,7 @@ public:
const bool deposit,
const MyMoneyMoney& calculatedValue,
const TQMap<TQString, MyMoneyMoney>& priceInfo,
- TQWidget* tqparent = 0, const char* name = 0);
+ TQWidget* parent = 0, const char* name = 0);
virtual ~KSplitTransactionDlg();
@@ -116,13 +116,13 @@ protected slots:
signals:
/**
* This signal is sent out, when a new category needs to be created
- * Depending on the setting of either a payment or deposit, the tqparent
+ * Depending on the setting of either a payment or deposit, the parent
* account will be preset to Expense or Income.
*
* @param account reference to account info. Will be filled by called slot
- * @param tqparent reference to tqparent account
+ * @param parent reference to parent account
*/
- void createCategory(MyMoneyAccount& account, const MyMoneyAccount& tqparent);
+ void createCategory(MyMoneyAccount& account, const MyMoneyAccount& parent);
/**
* Signal is emitted, if any of the widgets enters (@a state equals @a true)
diff --git a/kmymoney2/dialogs/kstartdlg.cpp b/kmymoney2/dialogs/kstartdlg.cpp
index f1c413f..a9f3bae 100644
--- a/kmymoney2/dialogs/kstartdlg.cpp
+++ b/kmymoney2/dialogs/kstartdlg.cpp
@@ -52,7 +52,7 @@
#include <tqtooltip.h>
-KStartDlg::KStartDlg(TQWidget *tqparent, const char *name, bool modal) : KDialogBase(IconList,i18n("Start Dialog"),Help|Ok|Cancel,Ok, tqparent, name, modal, true)
+KStartDlg::KStartDlg(TQWidget *parent, const char *name, bool modal) : KDialogBase(IconList,i18n("Start Dialog"),Help|Ok|Cancel,Ok, parent, name, modal, true)
{
setPage_Template();
setPage_Documents();
diff --git a/kmymoney2/dialogs/kstartdlg.h b/kmymoney2/dialogs/kstartdlg.h
index 55d6955..e81f1c5 100644
--- a/kmymoney2/dialogs/kstartdlg.h
+++ b/kmymoney2/dialogs/kstartdlg.h
@@ -40,7 +40,7 @@ class KStartDlg : public KDialogBase {
Q_OBJECT
TQ_OBJECT
public:
- KStartDlg( TQWidget *tqparent=0, const char *name=0, bool modal=true );
+ KStartDlg( TQWidget *parent=0, const char *name=0, bool modal=true );
virtual ~KStartDlg();
bool isNewFile(void) const { return isnewfile; }
bool isOpenFile(void) const { return !kurlrequest->url().isEmpty(); }
diff --git a/kmymoney2/dialogs/kupdatestockpricedlg.cpp b/kmymoney2/dialogs/kupdatestockpricedlg.cpp
index ef7bfab..53d930e 100644
--- a/kmymoney2/dialogs/kupdatestockpricedlg.cpp
+++ b/kmymoney2/dialogs/kupdatestockpricedlg.cpp
@@ -34,8 +34,8 @@
#include "kupdatestockpricedlg.h"
#include "../widgets/kmymoneycurrencyselector.h"
-KUpdateStockPriceDlg::KUpdateStockPriceDlg(TQWidget* tqparent, const char* name) :
- kUpdateStockPriceDecl(tqparent, name, true)
+KUpdateStockPriceDlg::KUpdateStockPriceDlg(TQWidget* parent, const char* name) :
+ kUpdateStockPriceDecl(parent, name, true)
{
m_date->setDate(TQDate::tqcurrentDate());
init();
diff --git a/kmymoney2/dialogs/kupdatestockpricedlg.h b/kmymoney2/dialogs/kupdatestockpricedlg.h
index ed75120..31691c1 100644
--- a/kmymoney2/dialogs/kupdatestockpricedlg.h
+++ b/kmymoney2/dialogs/kupdatestockpricedlg.h
@@ -58,7 +58,7 @@ class KUpdateStockPriceDlg : public kUpdateStockPriceDecl
TQ_OBJECT
public:
- KUpdateStockPriceDlg(TQWidget* tqparent = NULL, const char* name = NULL);
+ KUpdateStockPriceDlg(TQWidget* parent = NULL, const char* name = NULL);
~KUpdateStockPriceDlg();
const TQDate date() const { return m_date->date(); };
diff --git a/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp b/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp
index e24b76f..65c361c 100644
--- a/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp
+++ b/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp
@@ -75,8 +75,8 @@ TQValidator::State MyMoneyQifProfileNameValidator::validate(TQString& name, int&
return TQValidator::Acceptable;
}
-MyMoneyQifProfileEditor::MyMoneyQifProfileEditor(const bool edit, TQWidget *tqparent, const char *name )
- : MyMoneyQifProfileEditorDecl(tqparent,name),
+MyMoneyQifProfileEditor::MyMoneyQifProfileEditor(const bool edit, TQWidget *parent, const char *name )
+ : MyMoneyQifProfileEditorDecl(parent,name),
m_inEdit(edit),
m_isDirty(false),
m_isAccepted(false),
diff --git a/kmymoney2/dialogs/mymoneyqifprofileeditor.h b/kmymoney2/dialogs/mymoneyqifprofileeditor.h
index 67993c2..1efd5a6 100644
--- a/kmymoney2/dialogs/mymoneyqifprofileeditor.h
+++ b/kmymoney2/dialogs/mymoneyqifprofileeditor.h
@@ -57,7 +57,7 @@ class MyMoneyQifProfileEditor : public MyMoneyQifProfileEditorDecl
TQ_OBJECT
public:
- MyMoneyQifProfileEditor(const bool edit = false, TQWidget *tqparent=0, const char *name=0);
+ MyMoneyQifProfileEditor(const bool edit = false, TQWidget *parent=0, const char *name=0);
virtual ~MyMoneyQifProfileEditor();
/**
diff --git a/kmymoney2/dialogs/settings/ksettingscolors.cpp b/kmymoney2/dialogs/settings/ksettingscolors.cpp
index 06a5199..9fe1990 100644
--- a/kmymoney2/dialogs/settings/ksettingscolors.cpp
+++ b/kmymoney2/dialogs/settings/ksettingscolors.cpp
@@ -25,8 +25,8 @@
#include "ksettingscolors.h"
-KSettingsColors::KSettingsColors(TQWidget* tqparent, const char* name) :
- KSettingsColorsDecl(tqparent, name)
+KSettingsColors::KSettingsColors(TQWidget* parent, const char* name) :
+ KSettingsColorsDecl(parent, name)
{
}
diff --git a/kmymoney2/dialogs/settings/ksettingscolors.h b/kmymoney2/dialogs/settings/ksettingscolors.h
index 0f877a2..2e26b18 100644
--- a/kmymoney2/dialogs/settings/ksettingscolors.h
+++ b/kmymoney2/dialogs/settings/ksettingscolors.h
@@ -34,7 +34,7 @@ class KSettingsColors : public KSettingsColorsDecl
TQ_OBJECT
public:
- KSettingsColors(TQWidget* tqparent = 0, const char* name = 0);
+ KSettingsColors(TQWidget* parent = 0, const char* name = 0);
~KSettingsColors();
};
#endif
diff --git a/kmymoney2/dialogs/settings/ksettingsfonts.cpp b/kmymoney2/dialogs/settings/ksettingsfonts.cpp
index c21437d..4bc1ddc 100644
--- a/kmymoney2/dialogs/settings/ksettingsfonts.cpp
+++ b/kmymoney2/dialogs/settings/ksettingsfonts.cpp
@@ -25,8 +25,8 @@
#include "ksettingsfonts.h"
-KSettingsFonts::KSettingsFonts(TQWidget* tqparent, const char* name) :
- KSettingsFontsDecl(tqparent, name)
+KSettingsFonts::KSettingsFonts(TQWidget* parent, const char* name) :
+ KSettingsFontsDecl(parent, name)
{
}
diff --git a/kmymoney2/dialogs/settings/ksettingsfonts.h b/kmymoney2/dialogs/settings/ksettingsfonts.h
index eda94fd..162d1ce 100644
--- a/kmymoney2/dialogs/settings/ksettingsfonts.h
+++ b/kmymoney2/dialogs/settings/ksettingsfonts.h
@@ -34,7 +34,7 @@ class KSettingsFonts : public KSettingsFontsDecl
TQ_OBJECT
public:
- KSettingsFonts(TQWidget* tqparent = 0, const char* name = 0);
+ KSettingsFonts(TQWidget* parent = 0, const char* name = 0);
~KSettingsFonts();
};
#endif
diff --git a/kmymoney2/dialogs/settings/ksettingsforecast.cpp b/kmymoney2/dialogs/settings/ksettingsforecast.cpp
index d3e8770..a0b4ea0 100644
--- a/kmymoney2/dialogs/settings/ksettingsforecast.cpp
+++ b/kmymoney2/dialogs/settings/ksettingsforecast.cpp
@@ -25,8 +25,8 @@
#include "ksettingsforecast.h"
-KSettingsForecast::KSettingsForecast(TQWidget* tqparent, const char* name) :
- KSettingsForecastDecl(tqparent, name)
+KSettingsForecast::KSettingsForecast(TQWidget* parent, const char* name) :
+ KSettingsForecastDecl(parent, name)
{
}
diff --git a/kmymoney2/dialogs/settings/ksettingsforecast.h b/kmymoney2/dialogs/settings/ksettingsforecast.h
index 4423a39..f7e28b4 100644
--- a/kmymoney2/dialogs/settings/ksettingsforecast.h
+++ b/kmymoney2/dialogs/settings/ksettingsforecast.h
@@ -35,7 +35,7 @@ class KSettingsForecast : public KSettingsForecastDecl
TQ_OBJECT
public:
- KSettingsForecast(TQWidget* tqparent = 0, const char* name = 0);
+ KSettingsForecast(TQWidget* parent = 0, const char* name = 0);
~KSettingsForecast();
};
#endif
diff --git a/kmymoney2/dialogs/settings/ksettingsgeneral.cpp b/kmymoney2/dialogs/settings/ksettingsgeneral.cpp
index e36530f..1fba568 100644
--- a/kmymoney2/dialogs/settings/ksettingsgeneral.cpp
+++ b/kmymoney2/dialogs/settings/ksettingsgeneral.cpp
@@ -31,8 +31,8 @@
#include <kmymoney/kmymoneydateinput.h>
#include "ksettingsgeneral.h"
-KSettingsGeneral::KSettingsGeneral(TQWidget* tqparent, const char* name) :
- KSettingsGeneralDecl(tqparent, name)
+KSettingsGeneral::KSettingsGeneral(TQWidget* parent, const char* name) :
+ KSettingsGeneralDecl(parent, name)
{
// hide the internally used date field
kcfg_StartDate->hide();
diff --git a/kmymoney2/dialogs/settings/ksettingsgeneral.h b/kmymoney2/dialogs/settings/ksettingsgeneral.h
index 246a600..09ba37f 100644
--- a/kmymoney2/dialogs/settings/ksettingsgeneral.h
+++ b/kmymoney2/dialogs/settings/ksettingsgeneral.h
@@ -34,7 +34,7 @@ class KSettingsGeneral : public KSettingsGeneralDecl
TQ_OBJECT
public:
- KSettingsGeneral(TQWidget* tqparent = 0, const char* name = 0);
+ KSettingsGeneral(TQWidget* parent = 0, const char* name = 0);
~KSettingsGeneral();
protected slots:
diff --git a/kmymoney2/dialogs/settings/ksettingsgpg.cpp b/kmymoney2/dialogs/settings/ksettingsgpg.cpp
index b6cca2e..fc0c4eb 100644
--- a/kmymoney2/dialogs/settings/ksettingsgpg.cpp
+++ b/kmymoney2/dialogs/settings/ksettingsgpg.cpp
@@ -40,8 +40,8 @@
#define RECOVER_KEY_ID "0xD2B08440"
#define RECOVER_KEY_ID_FULL "59B0F826D2B08440"
-KSettingsGpg::KSettingsGpg(TQWidget* tqparent, const char* name) :
- KSettingsGpgDecl(tqparent, name),
+KSettingsGpg::KSettingsGpg(TQWidget* parent, const char* name) :
+ KSettingsGpgDecl(parent, name),
m_checkCount(0),
m_needCheckList(true),
m_listOk(false)
diff --git a/kmymoney2/dialogs/settings/ksettingsgpg.h b/kmymoney2/dialogs/settings/ksettingsgpg.h
index 2508192..ff279b3 100644
--- a/kmymoney2/dialogs/settings/ksettingsgpg.h
+++ b/kmymoney2/dialogs/settings/ksettingsgpg.h
@@ -35,7 +35,7 @@ class KSettingsGpg : public KSettingsGpgDecl
TQ_OBJECT
public:
- KSettingsGpg(TQWidget* tqparent = 0, const char* name = 0);
+ KSettingsGpg(TQWidget* parent = 0, const char* name = 0);
~KSettingsGpg();
public slots:
diff --git a/kmymoney2/dialogs/settings/ksettingshome.cpp b/kmymoney2/dialogs/settings/ksettingshome.cpp
index a874de7..44bd10b 100644
--- a/kmymoney2/dialogs/settings/ksettingshome.cpp
+++ b/kmymoney2/dialogs/settings/ksettingshome.cpp
@@ -38,8 +38,8 @@
#include "kmymoney2/kmymoneyglobalsettings.h"
#include "kmymoney2/kmymoneyutils.h"
-KSettingsHome::KSettingsHome(TQWidget* tqparent, const char* name) :
- KSettingsHomeDecl(tqparent, name),
+KSettingsHome::KSettingsHome(TQWidget* parent, const char* name) :
+ KSettingsHomeDecl(parent, name),
m_noNeedToUpdateList(false)
{
m_homePageList->addColumn("");
diff --git a/kmymoney2/dialogs/settings/ksettingshome.h b/kmymoney2/dialogs/settings/ksettingshome.h
index 9717b2d..be51648 100644
--- a/kmymoney2/dialogs/settings/ksettingshome.h
+++ b/kmymoney2/dialogs/settings/ksettingshome.h
@@ -36,7 +36,7 @@ class KSettingsHome : public KSettingsHomeDecl
TQ_OBJECT
public:
- KSettingsHome(TQWidget* tqparent = 0, const char* name = 0);
+ KSettingsHome(TQWidget* parent = 0, const char* name = 0);
~KSettingsHome();
protected slots:
diff --git a/kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp b/kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp
index 670e5ab..8a774da 100644
--- a/kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp
+++ b/kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp
@@ -39,8 +39,8 @@
#include "ksettingsonlinequotes.h"
#include "kmymoney2/converter/webpricequote.h"
-KSettingsOnlineQuotes::KSettingsOnlineQuotes(TQWidget *tqparent, const char *name )
- : KSettingsOnlineQuotesDecl(tqparent, name)
+KSettingsOnlineQuotes::KSettingsOnlineQuotes(TQWidget *parent, const char *name )
+ : KSettingsOnlineQuotesDecl(parent, name)
{
TQStringList groups = WebPriceQuote::quoteSources();
diff --git a/kmymoney2/dialogs/settings/ksettingsonlinequotes.h b/kmymoney2/dialogs/settings/ksettingsonlinequotes.h
index ef9abe2..d144e5b 100644
--- a/kmymoney2/dialogs/settings/ksettingsonlinequotes.h
+++ b/kmymoney2/dialogs/settings/ksettingsonlinequotes.h
@@ -35,7 +35,7 @@ class KSettingsOnlineQuotes : public KSettingsOnlineQuotesDecl
Q_OBJECT
TQ_OBJECT
public:
- KSettingsOnlineQuotes(TQWidget* tqparent = 0, const char *name = 0);
+ KSettingsOnlineQuotes(TQWidget* parent = 0, const char *name = 0);
virtual ~KSettingsOnlineQuotes() {}
void writeConfig(void) {}
diff --git a/kmymoney2/dialogs/settings/ksettingsplugins.cpp b/kmymoney2/dialogs/settings/ksettingsplugins.cpp
index b44e124..20434f6 100644
--- a/kmymoney2/dialogs/settings/ksettingsplugins.cpp
+++ b/kmymoney2/dialogs/settings/ksettingsplugins.cpp
@@ -35,8 +35,8 @@
#include "kmymoney2/plugins/pluginloader.h"
#include "ksettingsplugins.h"
-KSettingsPlugins::KSettingsPlugins(TQWidget* tqparent)
- : TQWidget(tqparent)
+KSettingsPlugins::KSettingsPlugins(TQWidget* parent)
+ : TQWidget(parent)
{
TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
KMyMoneyPlugin::PluginLoader::instance()->pluginSelectorWidget()->reparent(this, TQPoint());
diff --git a/kmymoney2/dialogs/settings/ksettingsplugins.h b/kmymoney2/dialogs/settings/ksettingsplugins.h
index 0106afb..3f62e13 100644
--- a/kmymoney2/dialogs/settings/ksettingsplugins.h
+++ b/kmymoney2/dialogs/settings/ksettingsplugins.h
@@ -36,7 +36,7 @@ class KSettingsPlugins : public TQWidget
public:
- KSettingsPlugins(TQWidget* tqparent = 0);
+ KSettingsPlugins(TQWidget* parent = 0);
~KSettingsPlugins();
public slots:
diff --git a/kmymoney2/dialogs/settings/ksettingsregister.cpp b/kmymoney2/dialogs/settings/ksettingsregister.cpp
index e6a278e..5929eaf 100644
--- a/kmymoney2/dialogs/settings/ksettingsregister.cpp
+++ b/kmymoney2/dialogs/settings/ksettingsregister.cpp
@@ -28,8 +28,8 @@
#include "ksettingsregister.h"
#include <kmymoney/transactionsortoption.h>
-KSettingsRegister::KSettingsRegister(TQWidget* tqparent, const char* name) :
- KSettingsRegisterDecl(tqparent, name)
+KSettingsRegister::KSettingsRegister(TQWidget* parent, const char* name) :
+ KSettingsRegisterDecl(parent, name)
{
// hide the internally used text fields
kcfg_sortNormalView->hide();
diff --git a/kmymoney2/dialogs/settings/ksettingsregister.h b/kmymoney2/dialogs/settings/ksettingsregister.h
index 7fa475f..a56a7dd 100644
--- a/kmymoney2/dialogs/settings/ksettingsregister.h
+++ b/kmymoney2/dialogs/settings/ksettingsregister.h
@@ -34,7 +34,7 @@ class KSettingsRegister : public KSettingsRegisterDecl
TQ_OBJECT
public:
- KSettingsRegister(TQWidget* tqparent = 0, const char* name = 0);
+ KSettingsRegister(TQWidget* parent = 0, const char* name = 0);
~KSettingsRegister();
protected slots:
diff --git a/kmymoney2/dialogs/settings/ksettingsschedules.cpp b/kmymoney2/dialogs/settings/ksettingsschedules.cpp
index 05dc80f..f51c465 100644
--- a/kmymoney2/dialogs/settings/ksettingsschedules.cpp
+++ b/kmymoney2/dialogs/settings/ksettingsschedules.cpp
@@ -25,8 +25,8 @@
#include "ksettingsschedules.h"
-KSettingsSchedules::KSettingsSchedules(TQWidget* tqparent, const char* name) :
- KSettingsSchedulesDecl(tqparent, name)
+KSettingsSchedules::KSettingsSchedules(TQWidget* parent, const char* name) :
+ KSettingsSchedulesDecl(parent, name)
{
}
diff --git a/kmymoney2/dialogs/settings/ksettingsschedules.h b/kmymoney2/dialogs/settings/ksettingsschedules.h
index 06e5af6..f70aa77 100644
--- a/kmymoney2/dialogs/settings/ksettingsschedules.h
+++ b/kmymoney2/dialogs/settings/ksettingsschedules.h
@@ -35,7 +35,7 @@ class KSettingsSchedules : public KSettingsSchedulesDecl
TQ_OBJECT
public:
- KSettingsSchedules(TQWidget* tqparent = 0, const char* name = 0);
+ KSettingsSchedules(TQWidget* parent = 0, const char* name = 0);
~KSettingsSchedules();
};
#endif
diff --git a/kmymoney2/dialogs/transactioneditor.cpp b/kmymoney2/dialogs/transactioneditor.cpp
index ec01613..63ff168 100644
--- a/kmymoney2/dialogs/transactioneditor.cpp
+++ b/kmymoney2/dialogs/transactioneditor.cpp
@@ -1785,33 +1785,33 @@ bool StdTransactionEditor::isComplete(TQString& reason) const
void StdTransactionEditor::slotCreateCategory(const TQString& name, TQString& id)
{
- MyMoneyAccount acc, tqparent;
+ MyMoneyAccount acc, parent;
acc.setName(name);
KMyMoneyCashFlowCombo* cashflow = dynamic_cast<KMyMoneyCashFlowCombo*>(haveWidget("cashflow"));
if(cashflow) {
// form based input
if(cashflow->direction() == KMyMoneyRegister::Deposit)
- tqparent = MyMoneyFile::instance()->income();
+ parent = MyMoneyFile::instance()->income();
else
- tqparent = MyMoneyFile::instance()->expense();
+ parent = MyMoneyFile::instance()->expense();
} else if(haveWidget("deposit")) {
// register based input
kMyMoneyEdit* deposit = dynamic_cast<kMyMoneyEdit*>(m_editWidgets["deposit"]);
if(deposit->value().isPositive())
- tqparent = MyMoneyFile::instance()->income();
+ parent = MyMoneyFile::instance()->income();
else
- tqparent = MyMoneyFile::instance()->expense();
+ parent = MyMoneyFile::instance()->expense();
} else
- tqparent = MyMoneyFile::instance()->expense();
+ parent = MyMoneyFile::instance()->expense();
// TODO extract possible first part of a hierarchy and check if it is one
- // of our top categories. If so, remove it and select the tqparent
+ // of our top categories. If so, remove it and select the parent
// according to this information.
- emit createCategory(acc, tqparent);
+ emit createCategory(acc, parent);
// return id
id = acc.id();
diff --git a/kmymoney2/dialogs/transactioneditor.h b/kmymoney2/dialogs/transactioneditor.h
index 72ecff8..5d3bc96 100644
--- a/kmymoney2/dialogs/transactioneditor.h
+++ b/kmymoney2/dialogs/transactioneditor.h
@@ -212,13 +212,13 @@ signals:
/**
* This signal is sent out, when a new category needs to be created
- * Depending on the setting of either a payment or deposit, the tqparent
+ * Depending on the setting of either a payment or deposit, the parent
* account will be preset to Expense or Income.
*
* @param account reference to account info. Will be filled by called slot
- * @param tqparent reference to tqparent account
+ * @param parent reference to parent account
*/
- void createCategory(MyMoneyAccount& account, const MyMoneyAccount& tqparent);
+ void createCategory(MyMoneyAccount& account, const MyMoneyAccount& parent);
/**
* This signal is sent out, when a new security (e.g. stock )needs to be created
@@ -226,9 +226,9 @@ signals:
* will be created.
*
* @param account reference to account info. Will be filled by called slot
- * @param tqparent reference to tqparent account
+ * @param parent reference to parent account
*/
- void createSecurity(MyMoneyAccount& account, const MyMoneyAccount& tqparent);
+ void createSecurity(MyMoneyAccount& account, const MyMoneyAccount& parent);
/**
* Signal is emitted, if any of the widgets enters (@a state equals @a true)
@@ -274,9 +274,9 @@ signals:
/**
* This signal is sent out, if any of the balance warning levels
* for @p account has been reached. @p msg contains the message text.
- * @p tqparent points to the tqparent widget to be used for the warning message box.
+ * @p parent points to the parent widget to be used for the warning message box.
*/
- void balanceWarning(TQWidget* tqparent, const MyMoneyAccount& account, const TQString& msg);
+ void balanceWarning(TQWidget* parent, const MyMoneyAccount& account, const TQString& msg);
protected:
TQValueList<MyMoneySplit> m_splits;
diff --git a/kmymoney2/kmymoney2.cpp b/kmymoney2/kmymoney2.cpp
index f9e3bf9..67c4984 100644
--- a/kmymoney2/kmymoney2.cpp
+++ b/kmymoney2/kmymoney2.cpp
@@ -175,7 +175,7 @@ public:
TQString m_lastPayeeEntered;
};
-KMyMoney2App::KMyMoney2App(TQWidget * /*tqparent*/ , const char* name) :
+KMyMoney2App::KMyMoney2App(TQWidget * /*parent*/ , const char* name) :
KMainWindow(0, name),
DCOPObject("kmymoney2app"),
d(new Private),
@@ -849,7 +849,7 @@ void KMyMoney2App::slotFileNew(void)
}
}
-KURL KMyMoney2App::selectFile(const TQString& title, const TQString& _path, const TQString& tqmask, KFile::Mode mode)
+KURL KMyMoney2App::selectFile(const TQString& title, const TQString& _path, const TQString& mask, KFile::Mode mode)
{
KURL url;
TQString path(_path);
@@ -857,7 +857,7 @@ KURL KMyMoney2App::selectFile(const TQString& title, const TQString& _path, cons
if(path.isEmpty())
path = KGlobalSettings::documentPath();
- KFileDialog* dialog = new KFileDialog(path, tqmask, this, title, true);
+ KFileDialog* dialog = new KFileDialog(path, mask, this, title, true);
dialog->setMode(mode);
if(dialog->exec() == TQDialog::Accepted) {
@@ -2230,7 +2230,7 @@ void KMyMoney2App::slotInstitutionDelete(void)
}
}
-const MyMoneyAccount& KMyMoney2App::findAccount(const MyMoneyAccount& acc, const MyMoneyAccount& tqparent) const
+const MyMoneyAccount& KMyMoney2App::findAccount(const MyMoneyAccount& acc, const MyMoneyAccount& parent) const
{
static MyMoneyAccount nullAccount;
@@ -2241,15 +2241,15 @@ const MyMoneyAccount& KMyMoney2App::findAccount(const MyMoneyAccount& acc, const
if(!acc.id().isEmpty()) {
return file->account(acc.id());
}
- // collect the parents. in case tqparent does not have an id, we scan the all top-level accounts
- if(tqparent.id().isEmpty()) {
+ // collect the parents. in case parent does not have an id, we scan the all top-level accounts
+ if(parent.id().isEmpty()) {
parents << file->asset();
parents << file->liability();
parents << file->income();
parents << file->expense();
parents << file->equity();
} else {
- parents << tqparent;
+ parents << parent;
}
TQValueList<MyMoneyAccount>::const_iterator it_p;
for(it_p = parents.begin(); it_p != parents.end(); ++it_p) {
@@ -2309,7 +2309,7 @@ void KMyMoney2App::createAccount(MyMoneyAccount& newAccount, MyMoneyAccount& par
} else {
parentAccount = existingAccount;
}
- newAccount.setParentAccountId(TQString()); // make sure, there's no tqparent
+ newAccount.setParentAccountId(TQString()); // make sure, there's no parent
newAccount.clearId(); // and no id set for adding
newAccount.removeAccountIds(); // and no sub-account ids
newAccount.setName(remainder);
@@ -2399,12 +2399,12 @@ void KMyMoney2App::slotCategoryNew(const TQString& name, TQString& id)
id = account.id();
}
-void KMyMoney2App::slotCategoryNew(MyMoneyAccount& account, const MyMoneyAccount& tqparent)
+void KMyMoney2App::slotCategoryNew(MyMoneyAccount& account, const MyMoneyAccount& parent)
{
if(KMessageBox::questionYesNo(this,
- TQString("<qt>%1</qt>").tqarg(i18n("The category <b>%1</b> currently does not exist. Do you want to create it?<p><i>The tqparent account will default to <b>%2</b> but can be changed in the following dialog</i>.").tqarg(account.name()).tqarg(tqparent.name())), i18n("Create category"),
+ TQString("<qt>%1</qt>").tqarg(i18n("The category <b>%1</b> currently does not exist. Do you want to create it?<p><i>The parent account will default to <b>%2</b> but can be changed in the following dialog</i>.").tqarg(account.name()).tqarg(parent.name())), i18n("Create category"),
KStdGuiItem::yes(), KStdGuiItem::no(), "CreateNewCategories") == KMessageBox::Yes) {
- createCategory(account, tqparent);
+ createCategory(account, parent);
} else {
// we should not keep the 'no' setting because that can confuse people like
// I have seen in some usability tests. So we just delete it right away.
@@ -2418,30 +2418,30 @@ void KMyMoney2App::slotCategoryNew(MyMoneyAccount& account, const MyMoneyAccount
void KMyMoney2App::slotCategoryNew(void)
{
- MyMoneyAccount tqparent;
+ MyMoneyAccount parent;
MyMoneyAccount account;
- // Preselect the tqparent account by looking at the current selected account/category
+ // Preselect the parent account by looking at the current selected account/category
if(!m_selectedAccount.id().isEmpty() && m_selectedAccount.isIncomeExpense()) {
MyMoneyFile* file = MyMoneyFile::instance();
try {
- tqparent = file->account(m_selectedAccount.id());
+ parent = file->account(m_selectedAccount.id());
} catch(MyMoneyException *e) {
delete e;
}
}
- createCategory(account, tqparent);
+ createCategory(account, parent);
}
-void KMyMoney2App::createCategory(MyMoneyAccount& account, const MyMoneyAccount& tqparent)
+void KMyMoney2App::createCategory(MyMoneyAccount& account, const MyMoneyAccount& parent)
{
- if(!tqparent.id().isEmpty()) {
+ if(!parent.id().isEmpty()) {
try {
- // make sure tqparent account exists
- MyMoneyFile::instance()->account(tqparent.id());
- account.setParentAccountId(tqparent.id());
- account.setAccountType( tqparent.accountType() );
+ // make sure parent account exists
+ MyMoneyFile::instance()->account(parent.id());
+ account.setParentAccountId(parent.id());
+ account.setAccountType( parent.accountType() );
} catch(MyMoneyException *e) {
delete e;
}
@@ -2483,8 +2483,8 @@ void KMyMoney2App::slotAccountNew(MyMoneyAccount& account)
MyMoneyFile* file = MyMoneyFile::instance();
try {
// create the account
- MyMoneyAccount tqparent = wizard->parentAccount();
- file->addAccount(acc, tqparent);
+ MyMoneyAccount parent = wizard->parentAccount();
+ file->addAccount(acc, parent);
// tell the wizard about the account id which it
// needs to create a possible schedule and transactions
@@ -2506,7 +2506,7 @@ void KMyMoney2App::slotAccountNew(MyMoneyAccount& account)
// create a brokerage account if selected
MyMoneyAccount brokerageAccount = wizard->brokerageAccount();
if(!(brokerageAccount == MyMoneyAccount())) {
- file->addAccount(brokerageAccount, tqparent);
+ file->addAccount(brokerageAccount, parent);
}
// create a possible schedule
@@ -2530,17 +2530,17 @@ void KMyMoney2App::slotAccountNew(MyMoneyAccount& account)
delete wizard;
}
-void KMyMoney2App::slotInvestmentNew(MyMoneyAccount& account, const MyMoneyAccount& tqparent)
+void KMyMoney2App::slotInvestmentNew(MyMoneyAccount& account, const MyMoneyAccount& parent)
{
TQString dontShowAgain = "CreateNewInvestments";
if(KMessageBox::questionYesNo(this,
TQString("<qt>")+i18n("The security <b>%1</b> currently does not exist as sub-account of <b>%2</b>. "
- "Do you want to create it?").tqarg(account.name()).tqarg(tqparent.name())+TQString("</qt>"), i18n("Create security"),
+ "Do you want to create it?").tqarg(account.name()).tqarg(parent.name())+TQString("</qt>"), i18n("Create security"),
KStdGuiItem::yes(), KStdGuiItem::no(), dontShowAgain) == KMessageBox::Yes) {
KNewInvestmentWizard dlg;
dlg.setName(account.name());
if(dlg.exec() == TQDialog::Accepted) {
- dlg.createObjects(tqparent.id());
+ dlg.createObjects(parent.id());
account = dlg.account();
}
} else {
@@ -2847,7 +2847,7 @@ void KMyMoney2App::slotAccountDelete(void)
// delete them all, but just the category itself?
MyMoneyAccount parentAccount = file->account(m_selectedAccount.parentAccountId());
- TQStringList accountsToRetqparent;
+ TQStringList accountsToReparent;
int result = KMessageBox::questionYesNoCancel(this, TQString("<qt>")+
i18n("Do you want to delete category <b>%1</b> with all its sub-categories or only "
"the category itself? If you only delete the category itself, all its sub-categories "
@@ -2861,7 +2861,7 @@ void KMyMoney2App::slotAccountDelete(void)
bool need_confirmation = false;
// case C - User only wants to delete the category itself
if (result == KMessageBox::No)
- accountsToRetqparent = m_selectedAccount.accountList();
+ accountsToReparent = m_selectedAccount.accountList();
else {
// case D - User wants to delete all subcategories, now check all subcats of
// m_selectedAccount and remember all that cannot be deleted and
@@ -2871,19 +2871,19 @@ void KMyMoney2App::slotAccountDelete(void)
{
// reparent account if a transaction is assigned
if (file->transactionCount(*it)!=0)
- accountsToRetqparent.push_back(*it);
+ accountsToReparent.push_back(*it);
else if (!file->account(*it).accountList().isEmpty()) {
// or if we have at least one sub-account that is used for transactions
if (!file->hasOnlyUnusedAccounts(file->account(*it).accountList())) {
- accountsToRetqparent.push_back(*it);
+ accountsToReparent.push_back(*it);
//kdDebug() << "subaccount not empty" << endl;
}
}
}
- if (!accountsToRetqparent.isEmpty())
+ if (!accountsToReparent.isEmpty())
need_confirmation = true;
}
- if (!accountsToRetqparent.isEmpty() && need_confirmation) {
+ if (!accountsToReparent.isEmpty() && need_confirmation) {
if (KMessageBox::questionYesNo(this, TQString("<p>")+i18n("Some sub-categories of category <b>%1</b> cannot "
"be deleted, because they are still used. They will be made sub-categories of <b>%2</b>. Proceed?").tqarg(m_selectedAccount.name()).tqarg(parentAccount.name())) != KMessageBox::Yes) {
return; // user gets wet feet...
@@ -2891,10 +2891,10 @@ void KMyMoney2App::slotAccountDelete(void)
}
// all good, now first reparent selected sub-categories
try {
- MyMoneyAccount tqparent = file->account(m_selectedAccount.parentAccountId());
- for (TQStringList::const_iterator it = accountsToRetqparent.begin(); it != accountsToRetqparent.end(); ++it) {
+ MyMoneyAccount parent = file->account(m_selectedAccount.parentAccountId());
+ for (TQStringList::const_iterator it = accountsToReparent.begin(); it != accountsToReparent.end(); ++it) {
MyMoneyAccount child = file->account(*it);
- file->reparentAccount(child, tqparent);
+ file->reparentAccount(child, parent);
}
// reload the account because the sub-account list might have changed
m_selectedAccount = file->account(m_selectedAccount.id());
@@ -2998,7 +2998,7 @@ void KMyMoney2App::slotAccountEdit(void)
MyMoneyFileTransaction ft;
MyMoneyAccount account = dlg.account();
- MyMoneyAccount tqparent = dlg.parentAccount();
+ MyMoneyAccount parent = dlg.parentAccount();
if(it_plugin != m_onlinePlugins.end()) {
account.setOnlineBankingSettings((*it_plugin)->onlineBankingSettings(account.onlineBankingSettings()));
}
@@ -3009,8 +3009,8 @@ void KMyMoney2App::slotAccountEdit(void)
// we need to modify first, as reparent would override all other changes
file->modifyAccount(account);
- if(account.parentAccountId() != tqparent.id()) {
- file->reparentAccount(account, tqparent);
+ if(account.parentAccountId() != parent.id()) {
+ file->reparentAccount(account, parent);
}
if(!tid.isEmpty() && dlg.openingBalance().isZero()) {
file->removeTransaction(t);
diff --git a/kmymoney2/kmymoney2.h b/kmymoney2/kmymoney2.h
index e310f26..d7f9b15 100644
--- a/kmymoney2/kmymoney2.h
+++ b/kmymoney2/kmymoney2.h
@@ -230,7 +230,7 @@ protected slots:
/**
* Brings up the new category editor and saves the information.
- * The dialog will be preset with the name. The tqparent defaults to
+ * The dialog will be preset with the name. The parent defaults to
* MyMoneyFile::expense()
*
* @param name Name of the account to be created. Could include a full hierarchy
@@ -253,9 +253,9 @@ protected slots:
void slotInvestmentNew(void);
/**
- * Create a new investment in a given @p tqparent investment account
+ * Create a new investment in a given @p parent investment account
*/
- void slotInvestmentNew(MyMoneyAccount& account, const MyMoneyAccount& tqparent);
+ void slotInvestmentNew(MyMoneyAccount& account, const MyMoneyAccount& parent);
/**
* This slot opens the investment editor to edit the currently
@@ -464,7 +464,7 @@ public:
/**
* construtor of KMyMoney2App, calls all init functions to create the application.
*/
- KMyMoney2App(TQWidget* tqparent=0, const char* name=0);
+ KMyMoney2App(TQWidget* parent=0, const char* name=0);
/**
* Destructor
@@ -517,10 +517,10 @@ public:
/**
* This method opens the category editor with the data found in @a account. The
- * tqparent account is preset to @a tqparent but can be modified. If the user
+ * parent account is preset to @a parent but can be modified. If the user
* acknowledges, the category is created.
*/
- void createCategory(MyMoneyAccount& account, const MyMoneyAccount& tqparent);
+ void createCategory(MyMoneyAccount& account, const MyMoneyAccount& parent);
/**
* This method returns the account for a given @a key - @a value pair.
@@ -535,9 +535,9 @@ public:
*/
void setAccountOnlineParameters(const MyMoneyAccount& acc, const MyMoneyKeyValueContainer& kvps);
- KURL selectFile(const TQString& title, const TQString& path, const TQString& tqmask, KFile::Mode mode);
+ KURL selectFile(const TQString& title, const TQString& path, const TQString& mask, KFile::Mode mode);
- const MyMoneyAccount& findAccount(const MyMoneyAccount& acc, const MyMoneyAccount& tqparent) const;
+ const MyMoneyAccount& findAccount(const MyMoneyAccount& acc, const MyMoneyAccount& parent) const;
void createAccount(MyMoneyAccount& newAccount, MyMoneyAccount& parentAccount, MyMoneyAccount& brokerageAccount, MyMoneyMoney openingBal);
@@ -858,7 +858,7 @@ public slots:
* This slot reparents account @p src to be a child of account @p dest
*
* @param src account to be reparented
- * @param dest new tqparent
+ * @param dest new parent
*/
void slotReparentAccount(const MyMoneyAccount& src, const MyMoneyAccount& dest);
@@ -866,7 +866,7 @@ public slots:
* This slot reparents account @p src to be a held at institution @p dest
*
* @param src account to be reparented
- * @param dest new tqparent institution
+ * @param dest new parent institution
*/
void slotReparentAccount(const MyMoneyAccount& src, const MyMoneyInstitution& dest);
@@ -990,15 +990,15 @@ public slots:
/**
* Brings up the new category editor and saves the information.
- * The dialog will be preset with the name and tqparent account.
+ * The dialog will be preset with the name and parent account.
*
* @param account reference of category to be created. The @p name member
* should be filled by the caller. The object will be filled
* with additional information during the creation process
* esp. the @p id member.
- * @param tqparent reference to tqparent account (defaults to none)
+ * @param parent reference to parent account (defaults to none)
*/
- void slotCategoryNew(MyMoneyAccount& account, const MyMoneyAccount& tqparent = MyMoneyAccount());
+ void slotCategoryNew(MyMoneyAccount& account, const MyMoneyAccount& parent = MyMoneyAccount());
/**
* This method updates all KAction items to the current state.
diff --git a/kmymoney2/kmymoneyutils.cpp b/kmymoney2/kmymoneyutils.cpp
index 428c259..4fae4e1 100644
--- a/kmymoney2/kmymoneyutils.cpp
+++ b/kmymoney2/kmymoneyutils.cpp
@@ -277,7 +277,7 @@ TQString KMyMoneyUtils::findResource(const char* type, const TQString& filename)
{
TQString language = KGlobal::locale()->language();
TQString country = KGlobal::locale()->country();
- TQString rc, tqmask;
+ TQString rc, mask;
// check that the placeholder is present
if(!filename.find("%1")) {
@@ -286,15 +286,15 @@ TQString KMyMoneyUtils::findResource(const char* type, const TQString& filename)
}
// search the given resource
- tqmask = filename.tqarg("_%1.%2");
- rc = KGlobal::dirs()->findResource(type, tqmask.tqarg(country).tqarg(language));
+ mask = filename.tqarg("_%1.%2");
+ rc = KGlobal::dirs()->findResource(type, mask.tqarg(country).tqarg(language));
if(rc.isEmpty()) {
- tqmask = filename.tqarg("_%1");
- rc = KGlobal::dirs()->findResource(type, tqmask.tqarg(language));
+ mask = filename.tqarg("_%1");
+ rc = KGlobal::dirs()->findResource(type, mask.tqarg(language));
}
if(rc.isEmpty()) {
// qDebug(TQString("html/home_%1.html not found").tqarg(country).latin1());
- rc = KGlobal::dirs()->findResource(type, tqmask.tqarg(country));
+ rc = KGlobal::dirs()->findResource(type, mask.tqarg(country));
}
if(rc.isEmpty()) {
rc = KGlobal::dirs()->findResource(type, filename.tqarg(""));
diff --git a/kmymoney2/kmymoneyutils.h b/kmymoney2/kmymoneyutils.h
index c6054e5..1587a3a 100644
--- a/kmymoney2/kmymoneyutils.h
+++ b/kmymoney2/kmymoneyutils.h
@@ -50,11 +50,11 @@ class KMyMoneyUtils
{
public:
/**
- * This enum is used to describe the bits of an account type filter tqmask.
+ * This enum is used to describe the bits of an account type filter mask.
* Each bit is used to define a specific account class. Multiple classes
* can be specified by OR'ing multiple entries. The special entry @p last
- * marks the left most bit in the tqmask and is used by scanners of this
- * bittqmask to determine the end of processing.
+ * marks the left most bit in the mask and is used by scanners of this
+ * bitmask to determine the end of processing.
*/
enum categoryTypeE {
none = 0x00, ///< no account class selected
@@ -63,7 +63,7 @@ public:
expense = 0x04, ///< expense accounts selected
income = 0x08, ///< income accounts selected
equity = 0x10, ///< equity accounts selected
- last = 0x20 ///< the leftmost bit in the tqmask
+ last = 0x20 ///< the leftmost bit in the mask
};
enum transactionTypeE {
diff --git a/kmymoney2/mymoney/mymoneyaccount.cpp b/kmymoney2/mymoney/mymoneyaccount.cpp
index b41e04a..5d74e62 100644
--- a/kmymoney2/mymoney/mymoneyaccount.cpp
+++ b/kmymoney2/mymoney/mymoneyaccount.cpp
@@ -105,7 +105,7 @@ MyMoneyAccount::MyMoneyAccount(const TQDomElement& node) :
setDescription(node.attribute("description"));
m_id = TQStringEmpty(node.attribute("id"));
- // qDebug("Account %s has id of %s, type of %d, tqparent is %s.", acc.name().data(), id.data(), type, acc.parentAccountId().data());
+ // qDebug("Account %s has id of %s, type of %d, parent is %s.", acc.name().data(), id.data(), type, acc.parentAccountId().data());
// Process any Sub-Account information found inside the account entry.
m_accountList.clear();
@@ -168,9 +168,9 @@ void MyMoneyAccount::setLastReconciliationDate(const TQDate& date)
m_lastReconciliationDate = date;
}
-void MyMoneyAccount::setParentAccountId(const TQString& tqparent)
+void MyMoneyAccount::setParentAccountId(const TQString& parent)
{
- m_parentAccount = tqparent;
+ m_parentAccount = parent;
}
void MyMoneyAccount::setAccountType(const accountTypeE type)
@@ -475,7 +475,7 @@ int MyMoneyAccountLoan::interestCompounding(void) const
return value("compoundingFrequency").toInt();
}
-void MyMoneyAccount::writeXML(TQDomDocument& document, TQDomElement& tqparent) const
+void MyMoneyAccount::writeXML(TQDomDocument& document, TQDomElement& parent) const
{
TQDomElement el = document.createElement("ACCOUNT");
@@ -529,7 +529,7 @@ void MyMoneyAccount::writeXML(TQDomDocument& document, TQDomElement& tqparent) c
//Add in Key-Value Pairs for accounts.
MyMoneyKeyValueContainer::writeXML(document, el);
- tqparent.appendChild(el);
+ parent.appendChild(el);
}
bool MyMoneyAccount::hasReferenceTo(const TQString& id) const
diff --git a/kmymoney2/mymoney/mymoneyaccount.h b/kmymoney2/mymoney/mymoneyaccount.h
index 69b015d..968cadb 100644
--- a/kmymoney2/mymoney/mymoneyaccount.h
+++ b/kmymoney2/mymoney/mymoneyaccount.h
@@ -233,8 +233,8 @@ public:
const TQDate& lastModified(void) const { return m_lastModified; }
/**
- * This method is used to return the ID of the tqparent account
- * @return TQString with the ID of the tqparent of this account
+ * This method is used to return the ID of the parent account
+ * @return TQString with the ID of the parent of this account
*/
const TQString& parentAccountId(void) const { return m_parentAccount; };
@@ -334,10 +334,10 @@ public:
void setAccountType(const accountTypeE type);
/**
- * This method is used to set a new tqparent account id
- * @param tqparent TQString reference to new tqparent account
+ * This method is used to set a new parent account id
+ * @param parent TQString reference to new parent account
*/
- void setParentAccountId(const TQString& tqparent);
+ void setParentAccountId(const TQString& parent);
/**
* This method is used to update m_lastModified to the current date
@@ -364,7 +364,7 @@ public:
*/
void setCurrencyId(const TQString& id);
- void writeXML(TQDomDocument& document, TQDomElement& tqparent) const;
+ void writeXML(TQDomDocument& document, TQDomElement& parent) const;
/**
* This method checks if a reference to the given object exists. It returns,
@@ -594,7 +594,7 @@ private:
TQStringList m_accountList;
/**
- * This member contains the ID of the tqparent account
+ * This member contains the ID of the parent account
*/
TQString m_parentAccount;
diff --git a/kmymoney2/mymoney/mymoneyaccounttest.cpp b/kmymoney2/mymoney/mymoneyaccounttest.cpp
index 151dcc1..a7c55af 100644
--- a/kmymoney2/mymoney/mymoneyaccounttest.cpp
+++ b/kmymoney2/mymoney/mymoneyaccounttest.cpp
@@ -45,7 +45,7 @@ void MyMoneyAccountTest::testEmptyConstructor() {
void MyMoneyAccountTest::testConstructor() {
TQString id = "A000001";
TQString institutionid = "B000001";
- TQString tqparent = "Parent";
+ TQString parent = "Parent";
MyMoneyAccount r;
MyMoneySplit s;
r.setAccountType(MyMoneyAccount::Asset);
@@ -53,7 +53,7 @@ void MyMoneyAccountTest::testConstructor() {
r.setLastModified(TQDate::tqcurrentDate());
r.setDescription("Desc");
r.setNumber("465500");
- r.setParentAccountId(tqparent);
+ r.setParentAccountId(parent);
r.setValue(TQString("key"), "value");
s.setShares(MyMoneyMoney(1,1));
r.adjustBalance(s);
@@ -105,7 +105,7 @@ void MyMoneyAccountTest::testSetFunctions() {
void MyMoneyAccountTest::testCopyConstructor() {
TQString id = "A000001";
TQString institutionid = "B000001";
- TQString tqparent = "ParentAccount";
+ TQString parent = "ParentAccount";
MyMoneyAccount r;
r.setAccountType(MyMoneyAccount::Expense);
r.setOpeningDate(TQDate::tqcurrentDate());
@@ -114,7 +114,7 @@ void MyMoneyAccountTest::testCopyConstructor() {
r.setInstitutionId("Inst1");
r.setDescription("Desc1");
r.setNumber("Number");
- r.setParentAccountId(tqparent);
+ r.setParentAccountId(parent);
r.setValue("Key", "Value");
MyMoneyAccount a(id, r);
@@ -274,7 +274,7 @@ void MyMoneyAccountTest::testEquality()
void MyMoneyAccountTest::testWriteXML() {
TQString id = "A000001";
TQString institutionid = "B000001";
- TQString tqparent = "Parent";
+ TQString parent = "Parent";
MyMoneyAccount r;
r.setAccountType(MyMoneyAccount::Asset);
@@ -283,7 +283,7 @@ void MyMoneyAccountTest::testWriteXML() {
r.setDescription("Desc");
r.setName("AccountName");
r.setNumber("465500");
- r.setParentAccountId(tqparent);
+ r.setParentAccountId(parent);
r.setInstitutionId(institutionid);
r.setValue(TQString("key"), "value");
r.addAccountId("A000002");
diff --git a/kmymoney2/mymoney/mymoneybudget.cpp b/kmymoney2/mymoney/mymoneybudget.cpp
index 55cd6cc..491a97d 100644
--- a/kmymoney2/mymoney/mymoneybudget.cpp
+++ b/kmymoney2/mymoney/mymoneybudget.cpp
@@ -289,11 +289,11 @@ bool MyMoneyBudget::read(const TQDomElement& e)
return result;
}
-void MyMoneyBudget::writeXML(TQDomDocument& document, TQDomElement& tqparent) const
+void MyMoneyBudget::writeXML(TQDomDocument& document, TQDomElement& parent) const
{
TQDomElement el = document.createElement("BUDGET");
write(el,&document);
- tqparent.appendChild(el);
+ parent.appendChild(el);
}
bool MyMoneyBudget::hasReferenceTo(const TQString& id) const
diff --git a/kmymoney2/mymoney/mymoneybudget.h b/kmymoney2/mymoney/mymoneybudget.h
index deb9b19..485d1a2 100644
--- a/kmymoney2/mymoney/mymoneybudget.h
+++ b/kmymoney2/mymoney/mymoneybudget.h
@@ -220,13 +220,13 @@ public:
/**
* This method creates a TQDomElement for the @p document
- * under the tqparent node @p tqparent. (This version overwrites the
+ * under the parent node @p parent. (This version overwrites the
* MMObject base class.)
*
* @param document reference to TQDomDocument
- * @param tqparent reference to TQDomElement tqparent node
+ * @param parent reference to TQDomElement parent node
*/
- virtual void writeXML(TQDomDocument& document, TQDomElement& tqparent) const;
+ virtual void writeXML(TQDomDocument& document, TQDomElement& parent) const;
/**
* This method checks if a reference to the given object exists. It returns,
diff --git a/kmymoney2/mymoney/mymoneyfile.cpp b/kmymoney2/mymoney/mymoneyfile.cpp
index 4b354ef..c36c163 100644
--- a/kmymoney2/mymoney/mymoneyfile.cpp
+++ b/kmymoney2/mymoney/mymoneyfile.cpp
@@ -175,7 +175,7 @@ void MyMoneyFile::addInstitution(MyMoneyInstitution& institution)
{
// perform some checks to see that the institution stuff is OK. For
// now we assume that the institution must have a name, the ID is not set
- // and it does not have a tqparent (MyMoneyFile).
+ // and it does not have a parent (MyMoneyFile).
if(institution.name().length() == 0
|| institution.id().length() != 0)
@@ -318,7 +318,7 @@ void MyMoneyFile::modifyAccount(const MyMoneyAccount& _account)
addNotification(account.id());
}
-void MyMoneyFile::reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqparent)
+void MyMoneyFile::reparentAccount(MyMoneyAccount &account, MyMoneyAccount& parent)
{
checkTransaction(__PRETTY_FUNCTION__);
@@ -326,27 +326,27 @@ void MyMoneyFile::reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqpar
if(isStandardAccount(account.id()))
throw new MYMONEYEXCEPTION("Unable to reparent the standard account groups");
- if(account.accountGroup() == tqparent.accountGroup()
- || (account.accountType() == MyMoneyAccount::Income && tqparent.accountType() == MyMoneyAccount::Expense)
- || (account.accountType() == MyMoneyAccount::Expense && tqparent.accountType() == MyMoneyAccount::Income)) {
+ if(account.accountGroup() == parent.accountGroup()
+ || (account.accountType() == MyMoneyAccount::Income && parent.accountType() == MyMoneyAccount::Expense)
+ || (account.accountType() == MyMoneyAccount::Expense && parent.accountType() == MyMoneyAccount::Income)) {
- if(account.isInvest() && tqparent.accountType() != MyMoneyAccount::Investment)
+ if(account.isInvest() && parent.accountType() != MyMoneyAccount::Investment)
throw new MYMONEYEXCEPTION("Unable to reparent Stock to non-investment account");
- if(tqparent.accountType() == MyMoneyAccount::Investment && !account.isInvest())
+ if(parent.accountType() == MyMoneyAccount::Investment && !account.isInvest())
throw new MYMONEYEXCEPTION("Unable to reparent non-stock to investment account");
// clear all changed objects from cache
MyMoneyNotifier notifier(this);
- // keep a notification of the current tqparent
+ // keep a notification of the current parent
addNotification(account.parentAccountId());
- m_storage->reparentAccount(account, tqparent);
+ m_storage->reparentAccount(account, parent);
- // and also keep one for the account itself and the new tqparent
+ // and also keep one for the account itself and the new parent
addNotification(account.id());
- addNotification(tqparent.id());
+ addNotification(parent.id());
} else
throw new MYMONEYEXCEPTION("Unable to reparent to different account type");
@@ -429,14 +429,14 @@ void MyMoneyFile::removeAccount(const MyMoneyAccount& account)
{
checkTransaction(__PRETTY_FUNCTION__);
- MyMoneyAccount tqparent;
+ MyMoneyAccount parent;
MyMoneyAccount acc;
MyMoneyInstitution institution;
- // check that the account and its tqparent exist
+ // check that the account and its parent exist
// this will throw an exception if the id is unknown
acc = MyMoneyFile::account(account.id());
- tqparent = MyMoneyFile::account(account.parentAccountId());
+ parent = MyMoneyFile::account(account.parentAccountId());
if(!acc.institutionId().isEmpty())
institution = MyMoneyFile::institution(acc.institutionId());
@@ -455,8 +455,8 @@ void MyMoneyFile::removeAccount(const MyMoneyAccount& account)
TQStringList::ConstIterator it;
for(it = acc.accountList().begin(); it != acc.accountList().end(); ++it)
addNotification(*it);
- // don't forget the tqparent and a possible institution
- addNotification(tqparent.id());
+ // don't forget the parent and a possible institution
+ addNotification(parent.id());
addNotification(account.institutionId());
if(!institution.id().isEmpty()) {
@@ -542,7 +542,7 @@ void MyMoneyFile::removeInstitution(const MyMoneyInstitution& institution)
addNotification(institution.id(), false);
}
-void MyMoneyFile::addAccount(MyMoneyAccount& account, MyMoneyAccount& tqparent)
+void MyMoneyFile::addAccount(MyMoneyAccount& account, MyMoneyAccount& parent)
{
checkTransaction(__PRETTY_FUNCTION__);
@@ -550,7 +550,7 @@ void MyMoneyFile::addAccount(MyMoneyAccount& account, MyMoneyAccount& tqparent)
// perform some checks to see that the account stuff is OK. For
// now we assume that the account must have a name, has no
- // transaction and sub-accounts and tqparent account
+ // transaction and sub-accounts and parent account
// it's own ID is not set and it does not have a pointer to (MyMoneyFile)
if(account.name().length() == 0)
@@ -563,15 +563,15 @@ void MyMoneyFile::addAccount(MyMoneyAccount& account, MyMoneyAccount& tqparent)
throw new MYMONEYEXCEPTION("New account must have no sub-accounts");
if(!account.parentAccountId().isEmpty())
- throw new MYMONEYEXCEPTION("New account must have no tqparent-id");
+ throw new MYMONEYEXCEPTION("New account must have no parent-id");
if(account.accountType() == MyMoneyAccount::UnknownAccountType)
throw new MYMONEYEXCEPTION("Account has invalid type");
- // make sure, that the tqparent account exists
+ // make sure, that the parent account exists
// if not, an exception is thrown. If it exists,
// get a copy of the current data
- MyMoneyAccount acc = MyMoneyFile::account(tqparent.id());
+ MyMoneyAccount acc = MyMoneyFile::account(parent.id());
#if 0
// TODO: remove the following code as we now can have multiple accounts
@@ -589,22 +589,22 @@ void MyMoneyFile::addAccount(MyMoneyAccount& account, MyMoneyAccount& tqparent)
}
#endif
- // FIXME: make sure, that the tqparent has the same type
+ // FIXME: make sure, that the parent has the same type
// I left it out here because I don't know, if there is
// a tight coupling between e.g. checking accounts and the
// class asset. It certainly does not make sense to create an
// expense account under an income account. Maybe it does, I don't know.
- // We enforce, that a stock account can never be a tqparent and
- // that the tqparent for a stock account must be an investment. Also,
- // an investment cannot have another investment account as it's tqparent
- if(tqparent.isInvest())
- throw new MYMONEYEXCEPTION("Stock account cannot be tqparent account");
+ // We enforce, that a stock account can never be a parent and
+ // that the parent for a stock account must be an investment. Also,
+ // an investment cannot have another investment account as it's parent
+ if(parent.isInvest())
+ throw new MYMONEYEXCEPTION("Stock account cannot be parent account");
- if(account.isInvest() && tqparent.accountType() != MyMoneyAccount::Investment)
- throw new MYMONEYEXCEPTION("Stock account must have investment account as tqparent ");
+ if(account.isInvest() && parent.accountType() != MyMoneyAccount::Investment)
+ throw new MYMONEYEXCEPTION("Stock account must have investment account as parent ");
- if(!account.isInvest() && tqparent.accountType() == MyMoneyAccount::Investment)
+ if(!account.isInvest() && parent.accountType() == MyMoneyAccount::Investment)
throw new MYMONEYEXCEPTION("Investment account can only have stock accounts as tqchildren");
// clear all changed objects from cache
@@ -622,10 +622,10 @@ void MyMoneyFile::addAccount(MyMoneyAccount& account, MyMoneyAccount& tqparent)
account.setOpeningDate(TQDate::tqcurrentDate());
}
- account.setParentAccountId(tqparent.id());
+ account.setParentAccountId(parent.id());
m_storage->addAccount(account);
- m_storage->addAccount(tqparent, account);
+ m_storage->addAccount(parent, account);
if(account.institutionId().length() != 0) {
institution.addAccountId(account.id());
@@ -634,7 +634,7 @@ void MyMoneyFile::addAccount(MyMoneyAccount& account, MyMoneyAccount& tqparent)
}
d->m_cache.preloadAccount(account);
- addNotification(tqparent.id());
+ addNotification(parent.id());
}
MyMoneyTransaction MyMoneyFile::createOpeningBalanceTransaction(const MyMoneyAccount& acc, const MyMoneyMoney& balance)
@@ -793,8 +793,8 @@ const MyMoneyAccount MyMoneyFile::createOpeningBalanceAccount(const MyMoneySecur
acc.setAccountType(MyMoneyAccount::Equity);
acc.setCurrencyId(security.id());
- MyMoneyAccount tqparent = equity();
- this->addAccount(acc, tqparent);
+ MyMoneyAccount parent = equity();
+ this->addAccount(acc, parent);
return acc;
}
@@ -1351,7 +1351,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void)
TQMap<TQString, bool> interestAccounts;
- MyMoneyAccount tqparent;
+ MyMoneyAccount parent;
MyMoneyAccount child;
MyMoneyAccount toplevel;
@@ -1408,14 +1408,14 @@ const TQStringList MyMoneyFile::consistencyCheck(void)
try {
bool dropOut = false;
while(!isStandardAccount(parentId) && !dropOut) {
- tqparent = account(parentId);
- if(tqparent.id() == (*it_a).id()) {
- // tqparent loops, so we need to re-tqparent to toplevel account
- // find tqparent account in our list
+ parent = account(parentId);
+ if(parent.id() == (*it_a).id()) {
+ // parent loops, so we need to re-parent to toplevel account
+ // find parent account in our list
problemCount++;
TQValueList<MyMoneyAccount>::Iterator it_b;
for(it_b = list.begin(); it_b != list.end(); ++it_b) {
- if((*it_b).id() == tqparent.id()) {
+ if((*it_b).id() == parent.id()) {
if(problemAccount != (*it_a).name()) {
problemAccount = (*it_a).name();
rc << i18n("* Problem with account '%1'").tqarg(problemAccount);
@@ -1432,51 +1432,51 @@ const TQStringList MyMoneyFile::consistencyCheck(void)
}
}
}
- parentId = tqparent.parentAccountId();
+ parentId = parent.parentAccountId();
}
} catch(MyMoneyException *e) {
- // if we don't know about a tqparent, we catch it later
+ // if we don't know about a parent, we catch it later
delete e;
}
- // check that the tqparent exists
+ // check that the parent exists
parentId = (*it_a).parentAccountId();
try {
- tqparent = account(parentId);
- if((*it_a).accountGroup() != tqparent.accountGroup()) {
+ parent = account(parentId);
+ if((*it_a).accountGroup() != parent.accountGroup()) {
problemCount++;
if(problemAccount != (*it_a).name()) {
problemAccount = (*it_a).name();
rc << i18n("* Problem with account '%1'").tqarg(problemAccount);
}
- // the tqparent belongs to a different group, so we reconnect to the
+ // the parent belongs to a different group, so we reconnect to the
// master group account (asset, liability, etc) to which this account
// should belong and update it in the engine.
- rc << i18n(" * Parent account '%1' belongs to a different group.").tqarg(tqparent.name());
- rc << i18n(" New tqparent account is the top level account '%1'.").tqarg(toplevel.name());
+ rc << i18n(" * Parent account '%1' belongs to a different group.").tqarg(parent.name());
+ rc << i18n(" New parent account is the top level account '%1'.").tqarg(toplevel.name());
(*it_a).setParentAccountId(toplevel.id());
// make sure to rebuild the sub-accounts of the top account
// and the one we removed this account from
if(accountRebuild.contains(toplevel.id()) == 0)
accountRebuild << toplevel.id();
- if(accountRebuild.contains(tqparent.id()) == 0)
- accountRebuild << tqparent.id();
- } else if(!tqparent.accountList().contains((*it_a).id())) {
+ if(accountRebuild.contains(parent.id()) == 0)
+ accountRebuild << parent.id();
+ } else if(!parent.accountList().contains((*it_a).id())) {
problemCount++;
if(problemAccount != (*it_a).name()) {
problemAccount = (*it_a).name();
rc << i18n("* Problem with account '%1'").tqarg(problemAccount);
}
- // tqparent exists, but does not have a reference to the account
- rc << i18n(" * Parent account '%1' does not contain '%2' as sub-account.").tqarg(tqparent.name(), problemAccount);
- if(accountRebuild.contains(tqparent.id()) == 0)
- accountRebuild << tqparent.id();
+ // parent exists, but does not have a reference to the account
+ rc << i18n(" * Parent account '%1' does not contain '%2' as sub-account.").tqarg(parent.name(), problemAccount);
+ if(accountRebuild.contains(parent.id()) == 0)
+ accountRebuild << parent.id();
}
} catch(MyMoneyException *e) {
delete e;
- // apparently, the tqparent does not exist anymore. we reconnect to the
+ // apparently, the parent does not exist anymore. we reconnect to the
// master group account (asset, liability, etc) to which this account
// should belong and update it in the engine.
problemCount++;
@@ -1484,8 +1484,8 @@ const TQStringList MyMoneyFile::consistencyCheck(void)
problemAccount = (*it_a).name();
rc << i18n("* Problem with account '%1'").tqarg(problemAccount);
}
- rc << i18n(" * The tqparent with id %1 does not exist anymore.").tqarg(parentId);
- rc << i18n(" New tqparent account is the top level account '%1'.").tqarg(toplevel.name());
+ rc << i18n(" * The parent with id %1 does not exist anymore.").tqarg(parentId);
+ rc << i18n(" New parent account is the top level account '%1'.").tqarg(toplevel.name());
(*it_a).setParentAccountId(toplevel.id());
addNotification((*it_a).id());
@@ -1777,7 +1777,7 @@ TQString MyMoneyFile::createCategory(const MyMoneyAccount& base, const TQString&
{
checkTransaction(__PRETTY_FUNCTION__);
- MyMoneyAccount tqparent = base;
+ MyMoneyAccount parent = base;
TQString categoryText;
if(base.id() != expense().id() && base.id() != income().id())
@@ -1802,7 +1802,7 @@ TQString MyMoneyFile::createCategory(const MyMoneyAccount& base, const TQString&
{
TQString categoryId = categoryToAccount(categoryText);
if (categoryId.isEmpty())
- addAccount(categoryAccount, tqparent);
+ addAccount(categoryAccount, parent);
else
{
categoryAccount = account(categoryId);
@@ -1812,13 +1812,13 @@ TQString MyMoneyFile::createCategory(const MyMoneyAccount& base, const TQString&
{
qDebug("Unable to add account %s, %s, %s: %s",
categoryAccount.name().latin1(),
- tqparent.name().latin1(),
+ parent.name().latin1(),
categoryText.latin1(),
e->what().latin1());
delete e;
}
- tqparent = categoryAccount;
+ parent = categoryAccount;
}
return categoryToAccount(name);
diff --git a/kmymoney2/mymoney/mymoneyfile.h b/kmymoney2/mymoney/mymoneyfile.h
index f697267..410115d 100644
--- a/kmymoney2/mymoney/mymoneyfile.h
+++ b/kmymoney2/mymoney/mymoneyfile.h
@@ -402,15 +402,15 @@ public:
* b) the account must not have an id assigned
* c) the transaction list must be empty
* d) the account must not have any sub-ordinate accounts
- * e) the account must have no tqparent account
+ * e) the account must have no parent account
* f) the account must not have any reference to a MyMoneyFile object
*
* An exception will be thrown upon error conditions.
*
* @param account The complete account information in a MyMoneyAccount object
- * @param tqparent The complete account information of the tqparent account
+ * @param parent The complete account information of the parent account
*/
- void addAccount(MyMoneyAccount& account, MyMoneyAccount& tqparent);
+ void addAccount(MyMoneyAccount& account, MyMoneyAccount& parent);
/**
* Modifies an already existing account in the file global account pool.
@@ -427,9 +427,9 @@ public:
* An exception will be thrown upon error conditions.
*
* @param account MyMoneyAccount reference to account to be re-parented
- * @param tqparent MyMoneyAccount reference to new tqparent account
+ * @param parent MyMoneyAccount reference to new parent account
*/
- void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqparent);
+ void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& parent);
/**
* moves splits from one account to another
@@ -772,11 +772,11 @@ public:
TQString nameToAccount(const TQString& name) const;
/**
- * This method is used to extract the tqparent part of an account hierarchy
+ * This method is used to extract the parent part of an account hierarchy
* name who's parts are seperated by MyMoneyAccount::AccountSeperator.
*
* @param name full account name
- * @return tqparent name (full account name excluding the last part)
+ * @return parent name (full account name excluding the last part)
*/
TQString parentName(const TQString& name) const;
@@ -967,7 +967,7 @@ public:
* already exist. e.g if name = Bills:Credit Card and
* base = expense(), Bills will first be checked to see if
* it exists and created if not. Credit Card will then
- * be created with Bills as it's tqparent. The Credit Card account
+ * be created with Bills as it's parent. The Credit Card account
* will have it's id returned.
*
* @param base The base account (expense or income)
diff --git a/kmymoney2/mymoney/mymoneyfiletest.cpp b/kmymoney2/mymoney/mymoneyfiletest.cpp
index 4d10c56..431debb 100644
--- a/kmymoney2/mymoney/mymoneyfiletest.cpp
+++ b/kmymoney2/mymoney/mymoneyfiletest.cpp
@@ -380,8 +380,8 @@ void MyMoneyFileTest::testAddAccounts() {
MyMoneyFileTransaction ft;
try {
- MyMoneyAccount tqparent = m->asset();
- m->addAccount(a, tqparent);
+ MyMoneyAccount parent = m->asset();
+ m->addAccount(a, parent);
ft.commit();
CPPUNIT_ASSERT(m->accountCount() == 6);
CPPUNIT_ASSERT(a.parentAccountId() == "AStd::Asset");
@@ -403,8 +403,8 @@ void MyMoneyFileTest::testAddAccounts() {
// try to add this account again, should not work
ft.restart();
try {
- MyMoneyAccount tqparent = m->asset();
- m->addAccount(a, tqparent);
+ MyMoneyAccount parent = m->asset();
+ m->addAccount(a, parent);
CPPUNIT_FAIL("Expecting exception!");
} catch(MyMoneyException *e) {
ft.commit();
@@ -434,8 +434,8 @@ void MyMoneyFileTest::testAddAccounts() {
b.setInstitutionId(institution.id());
ft.restart();
try {
- MyMoneyAccount tqparent = m->asset();
- m->addAccount(b, tqparent);
+ MyMoneyAccount parent = m->asset();
+ m->addAccount(b, parent);
ft.commit();
CPPUNIT_ASSERT(m->dirty() == true);
CPPUNIT_ASSERT(b.id() == "A000002");
@@ -646,7 +646,7 @@ void MyMoneyFileTest::testRemoveAccountTree() {
delete e;
}
- // make sure that tqchildren are re-parented to tqparent account
+ // make sure that tqchildren are re-parented to parent account
try {
a = m->account("A000001");
CPPUNIT_ASSERT(a.parentAccountId() == m->asset().id());
@@ -690,9 +690,9 @@ void MyMoneyFileTest::testAddTransaction () {
MyMoneyFileTransaction ft;
try {
- MyMoneyAccount tqparent = m->expense();
- m->addAccount(exp1, tqparent);
- m->addAccount(exp2, tqparent);
+ MyMoneyAccount parent = m->expense();
+ m->addAccount(exp1, parent);
+ m->addAccount(exp2, parent);
ft.commit();
} catch(MyMoneyException *e) {
delete e;
@@ -1281,8 +1281,8 @@ void MyMoneyFileTest::testAddEquityAccount() {
MyMoneyFileTransaction ft;
try {
- MyMoneyAccount tqparent = m->asset();
- m->addAccount(i, tqparent);
+ MyMoneyAccount parent = m->asset();
+ m->addAccount(i, parent);
ft.commit();
} catch(MyMoneyException *e) {
unexpectedException(e);
@@ -1337,7 +1337,7 @@ void MyMoneyFileTest::testAddEquityAccount() {
void MyMoneyFileTest::testReparentEquity() {
testAddEquityAccount();
testAddEquityAccount();
- MyMoneyAccount tqparent;
+ MyMoneyAccount parent;
// check the bad cases
TQValueList<MyMoneyAccount::accountTypeE> list;
@@ -1349,25 +1349,25 @@ void MyMoneyFileTest::testReparentEquity() {
list << MyMoneyAccount::Asset;
list << MyMoneyAccount::AssetLoan;
list << MyMoneyAccount::Currency;
- tqparent = m->asset();
- testReparentEquity(list, tqparent);
+ parent = m->asset();
+ testReparentEquity(list, parent);
list.clear();
list << MyMoneyAccount::CreditCard;
list << MyMoneyAccount::Loan;
list << MyMoneyAccount::Liability;
- tqparent = m->liability();
- testReparentEquity(list, tqparent);
+ parent = m->liability();
+ testReparentEquity(list, parent);
list.clear();
list << MyMoneyAccount::Income;
- tqparent = m->income();
- testReparentEquity(list, tqparent);
+ parent = m->income();
+ testReparentEquity(list, parent);
list.clear();
list << MyMoneyAccount::Expense;
- tqparent = m->expense();
- testReparentEquity(list, tqparent);
+ parent = m->expense();
+ testReparentEquity(list, parent);
// now check the good case
MyMoneyAccount stock = m->account("A000002");
@@ -1381,7 +1381,7 @@ void MyMoneyFileTest::testReparentEquity() {
}
}
-void MyMoneyFileTest::testReparentEquity(TQValueList<MyMoneyAccount::accountTypeE>& list, MyMoneyAccount& tqparent)
+void MyMoneyFileTest::testReparentEquity(TQValueList<MyMoneyAccount::accountTypeE>& list, MyMoneyAccount& parent)
{
MyMoneyAccount a;
MyMoneyAccount stock = m->account("A000002");
@@ -1392,7 +1392,7 @@ void MyMoneyFileTest::testReparentEquity(TQValueList<MyMoneyAccount::accountType
a.setName(TQString("Testaccount %1").tqarg(*it));
a.setAccountType(*it);
try {
- m->addAccount(a, tqparent);
+ m->addAccount(a, parent);
char msg[100];
m->reparentAccount(stock, a);
sprintf(msg, "Can reparent stock to non-investment type %d account", *it);
diff --git a/kmymoney2/mymoney/mymoneyfiletest.h b/kmymoney2/mymoney/mymoneyfiletest.h
index da39a28..917f1f4 100644
--- a/kmymoney2/mymoney/mymoneyfiletest.h
+++ b/kmymoney2/mymoney/mymoneyfiletest.h
@@ -116,7 +116,7 @@ public:
void testHasAccount();
void testAddEquityAccount();
void testReparentEquity();
- void testReparentEquity(TQValueList<MyMoneyAccount::accountTypeE>& list, MyMoneyAccount& tqparent);
+ void testReparentEquity(TQValueList<MyMoneyAccount::accountTypeE>& list, MyMoneyAccount& parent);
void testBaseCurrency();
void testOpeningBalanceNoBase();
void testOpeningBalance();
diff --git a/kmymoney2/mymoney/mymoneyfinancialcalculator.cpp b/kmymoney2/mymoney/mymoneyfinancialcalculator.cpp
index 33d5855..d6686a6 100644
--- a/kmymoney2/mymoney/mymoneyfinancialcalculator.cpp
+++ b/kmymoney2/mymoney/mymoneyfinancialcalculator.cpp
@@ -86,8 +86,8 @@ MyMoneyFinancialCalculator::MyMoneyFinancialCalculator()
setPmt(0.0);
setFv(0.0);
- // clear the tqmask
- m_tqmask = 0;
+ // clear the mask
+ m_mask = 0;
}
MyMoneyFinancialCalculator::~MyMoneyFinancialCalculator()
@@ -122,38 +122,38 @@ void MyMoneyFinancialCalculator::setDisc(const bool disc)
void MyMoneyFinancialCalculator::setIr(const FCALC_DOUBLE ir)
{
m_ir = ir;
- m_tqmask |= IR_SET;
+ m_mask |= IR_SET;
}
void MyMoneyFinancialCalculator::setPv(const FCALC_DOUBLE pv)
{
m_pv = pv;
- m_tqmask |= PV_SET;
+ m_mask |= PV_SET;
}
void MyMoneyFinancialCalculator::setPmt(const FCALC_DOUBLE pmt)
{
m_pmt = pmt;
- m_tqmask |= PMT_SET;
+ m_mask |= PMT_SET;
}
void MyMoneyFinancialCalculator::setNpp(const FCALC_DOUBLE npp)
{
m_npp = npp;
- m_tqmask |= NPP_SET;
+ m_mask |= NPP_SET;
}
void MyMoneyFinancialCalculator::setFv(const FCALC_DOUBLE fv)
{
m_fv = fv;
- m_tqmask |= FV_SET;
+ m_mask |= FV_SET;
}
FCALC_DOUBLE MyMoneyFinancialCalculator::numPayments(void)
{
- const unsigned short tqmask = PV_SET | IR_SET | PMT_SET | FV_SET;
+ const unsigned short mask = PV_SET | IR_SET | PMT_SET | FV_SET;
- if((m_tqmask & tqmask) != tqmask)
+ if((m_mask & mask) != mask)
throw new MYMONEYEXCEPTION("Not all parameters set for calculation of numPayments");
FCALC_DOUBLE eint = eff_int();
@@ -162,15 +162,15 @@ FCALC_DOUBLE MyMoneyFinancialCalculator::numPayments(void)
CC = (CC - m_fv) / (CC + m_pv);
m_npp = (CC > 0.0) ? logl (CC) / logl (eint +1.0) : 0.0;
- m_tqmask |= NPP_SET;
+ m_mask |= NPP_SET;
return m_npp;
}
FCALC_DOUBLE MyMoneyFinancialCalculator::payment(void)
{
- const unsigned short tqmask = PV_SET | IR_SET | NPP_SET | FV_SET;
+ const unsigned short mask = PV_SET | IR_SET | NPP_SET | FV_SET;
- if((m_tqmask & tqmask) != tqmask)
+ if((m_mask & mask) != mask)
throw new MYMONEYEXCEPTION("Not all parameters set for calculation of payment");
FCALC_DOUBLE eint = eff_int();
@@ -180,15 +180,15 @@ FCALC_DOUBLE MyMoneyFinancialCalculator::payment(void)
m_pmt = -rnd((m_fv + m_pv * (AA + 1.0)) / (AA * BB));
//m_pmt = -floorl((m_fv + m_pv * (AA + 1.0)) / (AA * BB));
- m_tqmask |= PMT_SET;
+ m_mask |= PMT_SET;
return m_pmt;
}
FCALC_DOUBLE MyMoneyFinancialCalculator::presentValue(void)
{
- const unsigned short tqmask = PMT_SET | IR_SET | NPP_SET | FV_SET;
+ const unsigned short mask = PMT_SET | IR_SET | NPP_SET | FV_SET;
- if((m_tqmask & tqmask) != tqmask)
+ if((m_mask & mask) != mask)
throw new MYMONEYEXCEPTION("Not all parameters set for calculation of payment");
FCALC_DOUBLE eint = eff_int();
@@ -197,15 +197,15 @@ FCALC_DOUBLE MyMoneyFinancialCalculator::presentValue(void)
m_pv = rnd(-(m_fv + (AA * CC)) / (AA + 1.0));
- m_tqmask |= PV_SET;
+ m_mask |= PV_SET;
return m_pv;
}
FCALC_DOUBLE MyMoneyFinancialCalculator::futureValue(void)
{
- const unsigned short tqmask = PMT_SET | IR_SET | NPP_SET | PV_SET;
+ const unsigned short mask = PMT_SET | IR_SET | NPP_SET | PV_SET;
- if((m_tqmask & tqmask) != tqmask)
+ if((m_mask & mask) != mask)
throw new MYMONEYEXCEPTION("Not all parameters set for calculation of payment");
FCALC_DOUBLE eint = eff_int();
@@ -213,7 +213,7 @@ FCALC_DOUBLE MyMoneyFinancialCalculator::futureValue(void)
FCALC_DOUBLE CC = _Cx(eint);
m_fv = rnd(-(m_pv + AA * (m_pv + CC)));
- m_tqmask |= FV_SET;
+ m_mask |= FV_SET;
return m_fv;
}
@@ -260,7 +260,7 @@ FCALC_DOUBLE MyMoneyFinancialCalculator::interestRate(void)
}
while (ri);
}
- m_tqmask |= IR_SET;
+ m_mask |= IR_SET;
m_ir = rnd(nom_int(eint) * 100.0);
return m_ir;
}
diff --git a/kmymoney2/mymoney/mymoneyfinancialcalculator.h b/kmymoney2/mymoney/mymoneyfinancialcalculator.h
index 8bc7033..c603d12 100644
--- a/kmymoney2/mymoney/mymoneyfinancialcalculator.h
+++ b/kmymoney2/mymoney/mymoneyfinancialcalculator.h
@@ -306,7 +306,7 @@ private:
bool m_bep; // beginning/end of period payment flag
bool m_disc; // discrete/continous compounding flag
- unsigned short m_tqmask; // available value tqmask
+ unsigned short m_mask; // available value mask
#define PV_SET 0x0001
#define IR_SET 0x0002
#define PMT_SET 0x0004
diff --git a/kmymoney2/mymoney/mymoneyfinancialcalculatortest.cpp b/kmymoney2/mymoney/mymoneyfinancialcalculatortest.cpp
index aae78ab..fa5b1a3 100644
--- a/kmymoney2/mymoney/mymoneyfinancialcalculatortest.cpp
+++ b/kmymoney2/mymoney/mymoneyfinancialcalculatortest.cpp
@@ -41,7 +41,7 @@ void MyMoneyFinancialCalculatorTest::testEmptyConstructor() {
CPPUNIT_ASSERT(m->m_prec == 2);
CPPUNIT_ASSERT(m->m_bep == false);
CPPUNIT_ASSERT(m->m_disc == true);
- CPPUNIT_ASSERT(m->m_tqmask == 0);
+ CPPUNIT_ASSERT(m->m_mask == 0);
}
void MyMoneyFinancialCalculatorTest::testSetPrec() {
@@ -52,7 +52,7 @@ void MyMoneyFinancialCalculatorTest::testSetPrec() {
void MyMoneyFinancialCalculatorTest::testSetNpp() {
m->setNpp(20);
CPPUNIT_ASSERT(m->m_npp == 20);
- CPPUNIT_ASSERT(m->m_tqmask == NPP_SET);
+ CPPUNIT_ASSERT(m->m_mask == NPP_SET);
}
void MyMoneyFinancialCalculatorTest::testSetPF() {
@@ -86,25 +86,25 @@ void MyMoneyFinancialCalculatorTest::testSetDisc() {
void MyMoneyFinancialCalculatorTest::testSetIr() {
m->setIr(12.3);
CPPUNIT_ASSERT(m->m_ir == 12.3);
- CPPUNIT_ASSERT(m->m_tqmask == IR_SET);
+ CPPUNIT_ASSERT(m->m_mask == IR_SET);
}
void MyMoneyFinancialCalculatorTest::testSetPv() {
m->setPv(23.4);
CPPUNIT_ASSERT(m->m_pv == 23.4);
- CPPUNIT_ASSERT(m->m_tqmask == PV_SET);
+ CPPUNIT_ASSERT(m->m_mask == PV_SET);
}
void MyMoneyFinancialCalculatorTest::testSetPmt() {
m->setPmt(34.5);
CPPUNIT_ASSERT(m->m_pmt == 34.5);
- CPPUNIT_ASSERT(m->m_tqmask == PMT_SET);
+ CPPUNIT_ASSERT(m->m_mask == PMT_SET);
}
void MyMoneyFinancialCalculatorTest::testSetFv() {
m->setFv(45.6);
CPPUNIT_ASSERT(m->m_fv == 45.6);
- CPPUNIT_ASSERT(m->m_tqmask == FV_SET);
+ CPPUNIT_ASSERT(m->m_mask == FV_SET);
}
void MyMoneyFinancialCalculatorTest::testCombinedSet() {
@@ -114,7 +114,7 @@ void MyMoneyFinancialCalculatorTest::testCombinedSet() {
m->setPmt(34.5);
m->setFv(45.6);
- CPPUNIT_ASSERT(m->m_tqmask == (NPP_SET | PV_SET | IR_SET | PMT_SET | FV_SET));
+ CPPUNIT_ASSERT(m->m_mask == (NPP_SET | PV_SET | IR_SET | PMT_SET | FV_SET));
}
void MyMoneyFinancialCalculatorTest::testNumPayments() {
diff --git a/kmymoney2/mymoney/mymoneyinstitution.cpp b/kmymoney2/mymoney/mymoneyinstitution.cpp
index d66d9df..6e5b102 100644
--- a/kmymoney2/mymoney/mymoneyinstitution.cpp
+++ b/kmymoney2/mymoney/mymoneyinstitution.cpp
@@ -138,7 +138,7 @@ bool MyMoneyInstitution::operator == (const MyMoneyInstitution& right) const
return false;
}
-void MyMoneyInstitution::writeXML(TQDomDocument& document, TQDomElement& tqparent) const
+void MyMoneyInstitution::writeXML(TQDomDocument& document, TQDomElement& parent) const
{
TQDomElement el = document.createElement("INSTITUTION");
@@ -167,7 +167,7 @@ void MyMoneyInstitution::writeXML(TQDomDocument& document, TQDomElement& tqparen
//Add in Key-Value Pairs for institutions.
MyMoneyKeyValueContainer::writeXML(document, el);
- tqparent.appendChild(el);
+ parent.appendChild(el);
}
bool MyMoneyInstitution::hasReferenceTo(const TQString& /* id */) const
diff --git a/kmymoney2/mymoney/mymoneyinstitution.h b/kmymoney2/mymoney/mymoneyinstitution.h
index 47d9321..b4c1cf1 100644
--- a/kmymoney2/mymoney/mymoneyinstitution.h
+++ b/kmymoney2/mymoney/mymoneyinstitution.h
@@ -141,7 +141,7 @@ public:
bool operator == (const MyMoneyInstitution&) const;
bool operator < (const MyMoneyInstitution& right) const;
- void writeXML(TQDomDocument& document, TQDomElement& tqparent) const;
+ void writeXML(TQDomDocument& document, TQDomElement& parent) const;
/**
* This method checks if a reference to the given object exists. It returns,
diff --git a/kmymoney2/mymoney/mymoneyinvesttransaction.cpp b/kmymoney2/mymoney/mymoneyinvesttransaction.cpp
index 89bef92..675e746 100644
--- a/kmymoney2/mymoney/mymoneyinvesttransaction.cpp
+++ b/kmymoney2/mymoney/mymoneyinvesttransaction.cpp
@@ -23,10 +23,10 @@
#include "mymoneyinvesttransaction.h"
#if 0
-MyMoneyInvestTransaction::MyMoneyInvestTransaction(MyMoneyAccount *tqparent, const long id, transactionMethod method, const TQString& number, const TQString& memo,
+MyMoneyInvestTransaction::MyMoneyInvestTransaction(MyMoneyAccount *parent, const long id, transactionMethod method, const TQString& number, const TQString& memo,
const MyMoneyMoney& amount, const TQDate& date, const TQString& categoryMajor, const TQString& categoryMinor, const TQString& atmName,
const TQString& fromTo, const TQString& bankFrom, const TQString& bankTo, stateE state)
- : MyMoneyTransaction(tqparent, id, method, number, memo, amount, date, categoryMajor, categoryMinor, atmName, fromTo, bankFrom, bankTo, state)
+ : MyMoneyTransaction(parent, id, method, number, memo, amount, date, categoryMajor, categoryMinor, atmName, fromTo, bankFrom, bankTo, state)
{
}
diff --git a/kmymoney2/mymoney/mymoneyinvesttransaction.h b/kmymoney2/mymoney/mymoneyinvesttransaction.h
index e414b3a..ee09456 100644
--- a/kmymoney2/mymoney/mymoneyinvesttransaction.h
+++ b/kmymoney2/mymoney/mymoneyinvesttransaction.h
@@ -33,7 +33,7 @@
class MyMoneyInvestTransaction : public MyMoneyTransaction {
public:
MyMoneyInvestTransaction();
- MyMoneyInvestTransaction(MyMoneyAccount *tqparent, const long id, transactionMethod method, const TQString& number, const TQString& memo,
+ MyMoneyInvestTransaction(MyMoneyAccount *parent, const long id, transactionMethod method, const TQString& number, const TQString& memo,
const MyMoneyMoney& amount, const TQDate& date, const TQString& categoryMajor, const TQString& categoryMinor, const TQString& atmName,
const TQString& fromTo, const TQString& bankFrom, const TQString& bankTo, stateE state);
~MyMoneyInvestTransaction();
diff --git a/kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp b/kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp
index 9e047d5..22fa1ac 100644
--- a/kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp
+++ b/kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp
@@ -101,7 +101,7 @@ bool MyMoneyKeyValueContainer::operator == (const MyMoneyKeyValueContainer& righ
return (it_a == m_kvp.end() && it_b == right.m_kvp.end());
}
-void MyMoneyKeyValueContainer::writeXML(TQDomDocument& document, TQDomElement& tqparent) const
+void MyMoneyKeyValueContainer::writeXML(TQDomDocument& document, TQDomElement& parent) const
{
if(m_kvp.count() != 0) {
TQDomElement el = document.createElement("KEYVALUEPAIRS");
@@ -115,6 +115,6 @@ void MyMoneyKeyValueContainer::writeXML(TQDomDocument& document, TQDomElement& t
el.appendChild(pair);
}
- tqparent.appendChild(el);
+ parent.appendChild(el);
}
}
diff --git a/kmymoney2/mymoney/mymoneykeyvaluecontainer.h b/kmymoney2/mymoney/mymoneykeyvaluecontainer.h
index 42169d5..9be002e 100644
--- a/kmymoney2/mymoney/mymoneykeyvaluecontainer.h
+++ b/kmymoney2/mymoney/mymoneykeyvaluecontainer.h
@@ -122,12 +122,12 @@ public:
/**
* This method creates a TQDomElement for the @p document
- * under the tqparent node @p tqparent.
+ * under the parent node @p parent.
*
* @param document reference to TQDomDocument
- * @param tqparent reference to TQDomElement tqparent node
+ * @param parent reference to TQDomElement parent node
*/
- void writeXML(TQDomDocument& document, TQDomElement& tqparent) const;
+ void writeXML(TQDomDocument& document, TQDomElement& parent) const;
private:
/**
diff --git a/kmymoney2/mymoney/mymoneyobject.h b/kmymoney2/mymoney/mymoneyobject.h
index 854bf4d..cd8d43d 100644
--- a/kmymoney2/mymoney/mymoneyobject.h
+++ b/kmymoney2/mymoney/mymoneyobject.h
@@ -78,12 +78,12 @@ public:
/**
* This method creates a TQDomElement for the @p document
- * under the tqparent node @p tqparent.
+ * under the parent node @p parent.
*
* @param document reference to TQDomDocument
- * @param tqparent reference to TQDomElement tqparent node
+ * @param parent reference to TQDomElement parent node
*/
- virtual void writeXML(TQDomDocument& document, TQDomElement& tqparent) const = 0;
+ virtual void writeXML(TQDomDocument& document, TQDomElement& parent) const = 0;
bool operator == (const MyMoneyObject& right) const;
diff --git a/kmymoney2/mymoney/mymoneypayee.cpp b/kmymoney2/mymoney/mymoneypayee.cpp
index 7023e51..b2eab64 100644
--- a/kmymoney2/mymoney/mymoneypayee.cpp
+++ b/kmymoney2/mymoney/mymoneypayee.cpp
@@ -131,7 +131,7 @@ bool MyMoneyPayee::operator == (const MyMoneyPayee& right) const
((m_defaultAccountId.length() == 0 && right.m_defaultAccountId.length() == 0) || m_defaultAccountId == right.m_defaultAccountId) );
}
-void MyMoneyPayee::writeXML(TQDomDocument& document, TQDomElement& tqparent) const
+void MyMoneyPayee::writeXML(TQDomDocument& document, TQDomElement& parent) const
{
TQDomElement el = document.createElement("PAYEE");
@@ -164,7 +164,7 @@ void MyMoneyPayee::writeXML(TQDomDocument& document, TQDomElement& tqparent) con
el.appendChild(address);
- tqparent.appendChild(el);
+ parent.appendChild(el);
}
bool MyMoneyPayee::hasReferenceTo(const TQString& id) const
diff --git a/kmymoney2/mymoney/mymoneypayee.h b/kmymoney2/mymoney/mymoneypayee.h
index b1d2fce..f8112d4 100644
--- a/kmymoney2/mymoney/mymoneypayee.h
+++ b/kmymoney2/mymoney/mymoneypayee.h
@@ -184,7 +184,7 @@ public:
// Equality operator
bool operator == (const MyMoneyPayee &) const;
- void writeXML(TQDomDocument& document, TQDomElement& tqparent) const;
+ void writeXML(TQDomDocument& document, TQDomElement& parent) const;
/**
* This method checks if a reference to the given object exists. It returns,
diff --git a/kmymoney2/mymoney/mymoneypayeetest.cpp b/kmymoney2/mymoney/mymoneypayeetest.cpp
index 124cc65..0dad126 100644
--- a/kmymoney2/mymoney/mymoneypayeetest.cpp
+++ b/kmymoney2/mymoney/mymoneypayeetest.cpp
@@ -27,20 +27,20 @@ void MyMoneyPayeeTest::tearDown () {
void MyMoneyPayeeTest::testXml(){
TQDomDocument doc;
- TQDomElement tqparent = doc.createElement("Test");
- doc.appendChild(tqparent);
+ TQDomElement parent = doc.createElement("Test");
+ doc.appendChild(parent);
MyMoneyPayee payee1;
payee1.m_id = "some random id";//if the ID isn't set, w ethrow an exception
- payee1.writeXML(doc,tqparent);
+ payee1.writeXML(doc,parent);
TQString temp1 = "Account1";
payee1.setDefaultAccountId(temp1);
- payee1.writeXML(doc,tqparent);
+ payee1.writeXML(doc,parent);
TQString temp2 = "Account2";
payee1.setDefaultAccountId(temp2);
- payee1.writeXML(doc,tqparent);
+ payee1.writeXML(doc,parent);
payee1.setDefaultAccountId();
- payee1.writeXML(doc,tqparent);
- TQDomElement el = tqparent.firstChild().toElement();
+ payee1.writeXML(doc,parent);
+ TQDomElement el = parent.firstChild().toElement();
CPPUNIT_ASSERT(!el.isNull());
MyMoneyPayee payee2(el);
CPPUNIT_ASSERT(!payee2.defaultAccountEnabled());
diff --git a/kmymoney2/mymoney/mymoneyreport.cpp b/kmymoney2/mymoney/mymoneyreport.cpp
index 4fd4b79..2904ed5 100644
--- a/kmymoney2/mymoney/mymoneyreport.cpp
+++ b/kmymoney2/mymoney/mymoneyreport.cpp
@@ -765,11 +765,11 @@ bool MyMoneyReport::read ( const TQDomElement& e )
return result;
}
-void MyMoneyReport::writeXML ( TQDomDocument& document, TQDomElement& tqparent ) const
+void MyMoneyReport::writeXML ( TQDomDocument& document, TQDomElement& parent ) const
{
TQDomElement el = document.createElement ( "REPORT" );
write ( el, &document, false );
- tqparent.appendChild ( el );
+ parent.appendChild ( el );
}
bool MyMoneyReport::hasReferenceTo ( const TQString& id ) const
diff --git a/kmymoney2/mymoney/mymoneyreport.h b/kmymoney2/mymoney/mymoneyreport.h
index f7e38ea..a04573f 100644
--- a/kmymoney2/mymoney/mymoneyreport.h
+++ b/kmymoney2/mymoney/mymoneyreport.h
@@ -64,7 +64,7 @@ public:
enum EReportType { eNoReport = 0, ePivotTable, eQueryTable, eInfoTable };
enum EColumnType { eNoColumns = 0, eDays = 1, eMonths = 1, eBiMonths = 2, eQuarters = 3, eWeeks = 7, eYears = 12 };
- // if you add bits to this bittqmask, start with the value currently assigned to eTQCend and update its value afterwards
+ // if you add bits to this bitmask, start with the value currently assigned to eTQCend and update its value afterwards
// also don't forget to add column names to kQueryColumnsText in mymoneyreport.cpp
enum EQueryColumns { eTQCnone = 0x0, eTQCbegin = 0x1, eTQCnumber = 0x1, eTQCpayee = 0x2, eTQCcategory = 0x4, eTQCmemo = 0x8, eTQCaccount = 0x10, eTQCreconciled = 0x20, eTQCaction = 0x40, eTQCshares = 0x80, eTQCprice = 0x100, eTQCperformance = 0x200, eTQCloan = 0x400, eTQCbalance = 0x800, eTQCend = 0x1000 };
@@ -314,13 +314,13 @@ public:
/**
* This method creates a TQDomElement for the @p document
- * under the tqparent node @p tqparent. (This version overwrites the
+ * under the parent node @p parent. (This version overwrites the
* MMObject base class.)
*
* @param document reference to TQDomDocument
- * @param tqparent reference to TQDomElement tqparent node
+ * @param parent reference to TQDomElement parent node
*/
- virtual void writeXML(TQDomDocument& document, TQDomElement& tqparent) const;
+ virtual void writeXML(TQDomDocument& document, TQDomElement& parent) const;
/**
* This method checks if a reference to the given object exists. It returns,
diff --git a/kmymoney2/mymoney/mymoneyscheduled.cpp b/kmymoney2/mymoney/mymoneyscheduled.cpp
index b7e5633..594bc69 100644
--- a/kmymoney2/mymoney/mymoneyscheduled.cpp
+++ b/kmymoney2/mymoney/mymoneyscheduled.cpp
@@ -747,7 +747,7 @@ void MyMoneySchedule::fixDate(TQDate& date) const
}
}
-void MyMoneySchedule::writeXML(TQDomDocument& document, TQDomElement& tqparent) const
+void MyMoneySchedule::writeXML(TQDomDocument& document, TQDomElement& parent) const
{
TQDomElement el = document.createElement("SCHEDULED_TX");
@@ -779,7 +779,7 @@ void MyMoneySchedule::writeXML(TQDomDocument& document, TQDomElement& tqparent)
//store the transaction data for this task.
m_transaction.writeXML(document, el);
- tqparent.appendChild(el);
+ parent.appendChild(el);
}
bool MyMoneySchedule::hasReferenceTo(const TQString& id) const
diff --git a/kmymoney2/mymoney/mymoneyscheduled.h b/kmymoney2/mymoney/mymoneyscheduled.h
index cc92b1d..cf5cb07 100644
--- a/kmymoney2/mymoney/mymoneyscheduled.h
+++ b/kmymoney2/mymoney/mymoneyscheduled.h
@@ -465,7 +465,7 @@ public:
void recordPayment(const TQDate&);
TQValueList<TQDate> recordedPayments(void) const { return m_recordedPayments; }
- void writeXML(TQDomDocument& document, TQDomElement& tqparent) const;
+ void writeXML(TQDomDocument& document, TQDomElement& parent) const;
/**
* This method checks if a reference to the given object exists. It returns,
diff --git a/kmymoney2/mymoney/mymoneysecurity.cpp b/kmymoney2/mymoney/mymoneysecurity.cpp
index 27a1352..027441c 100644
--- a/kmymoney2/mymoney/mymoneysecurity.cpp
+++ b/kmymoney2/mymoney/mymoneysecurity.cpp
@@ -123,7 +123,7 @@ bool MyMoneySecurity::hasReferenceTo(const TQString& id) const
return (id == m_tradingCurrency);
}
-void MyMoneySecurity::writeXML(TQDomDocument& document, TQDomElement& tqparent) const
+void MyMoneySecurity::writeXML(TQDomDocument& document, TQDomElement& parent) const
{
TQDomElement el;
if(isCurrency())
@@ -148,7 +148,7 @@ void MyMoneySecurity::writeXML(TQDomDocument& document, TQDomElement& tqparent)
//Add in Key-Value Pairs for securities.
MyMoneyKeyValueContainer::writeXML(document, el);
- tqparent.appendChild(el);
+ parent.appendChild(el);
}
TQString MyMoneySecurity::securityTypeToString(const eSECURITYTYPE securityType)
diff --git a/kmymoney2/mymoney/mymoneysecurity.h b/kmymoney2/mymoney/mymoneysecurity.h
index fa49cb8..4013a45 100644
--- a/kmymoney2/mymoney/mymoneysecurity.h
+++ b/kmymoney2/mymoney/mymoneysecurity.h
@@ -111,7 +111,7 @@ public:
void setPartsPerUnit(const int ppu) { m_partsPerUnit = ppu; };
void setSmallestCashFraction(const int sf) { m_smallestCashFraction = sf; };
- void writeXML(TQDomDocument& document, TQDomElement& tqparent) const;
+ void writeXML(TQDomDocument& document, TQDomElement& parent) const;
/**
* This method checks if a reference to the given object exists. It returns,
diff --git a/kmymoney2/mymoney/mymoneysplit.cpp b/kmymoney2/mymoney/mymoneysplit.cpp
index 8c00d89..64d5123 100644
--- a/kmymoney2/mymoney/mymoneysplit.cpp
+++ b/kmymoney2/mymoney/mymoneysplit.cpp
@@ -194,7 +194,7 @@ MyMoneyMoney MyMoneySplit::price(void) const
return MyMoneyMoney(1,1);
}
-void MyMoneySplit::writeXML(TQDomDocument& document, TQDomElement& tqparent) const
+void MyMoneySplit::writeXML(TQDomDocument& document, TQDomElement& parent) const
{
TQDomElement el = document.createElement("SPLIT");
@@ -217,7 +217,7 @@ void MyMoneySplit::writeXML(TQDomDocument& document, TQDomElement& tqparent) con
MyMoneyKeyValueContainer::writeXML(document, el);
- tqparent.appendChild(el);
+ parent.appendChild(el);
}
bool MyMoneySplit::hasReferenceTo(const TQString& id) const
diff --git a/kmymoney2/mymoney/mymoneysplit.h b/kmymoney2/mymoney/mymoneysplit.h
index de7c849..b300aa1 100644
--- a/kmymoney2/mymoney/mymoneysplit.h
+++ b/kmymoney2/mymoney/mymoneysplit.h
@@ -98,7 +98,7 @@ public:
bool operator == (const MyMoneySplit&) const;
- void writeXML(TQDomDocument& document, TQDomElement& tqparent) const;
+ void writeXML(TQDomDocument& document, TQDomElement& parent) const;
/**
* This method checks if a reference to the given object exists. It returns,
diff --git a/kmymoney2/mymoney/mymoneytransaction.cpp b/kmymoney2/mymoney/mymoneytransaction.cpp
index f586da4..79f4fd9 100644
--- a/kmymoney2/mymoney/mymoneytransaction.cpp
+++ b/kmymoney2/mymoney/mymoneytransaction.cpp
@@ -408,7 +408,7 @@ bool MyMoneyTransaction::isDuplicate(const MyMoneyTransaction& r) const
return rc;
}
-void MyMoneyTransaction::writeXML(TQDomDocument& document, TQDomElement& tqparent) const
+void MyMoneyTransaction::writeXML(TQDomDocument& document, TQDomElement& parent) const
{
TQDomElement el = document.createElement("TRANSACTION");
@@ -428,7 +428,7 @@ void MyMoneyTransaction::writeXML(TQDomDocument& document, TQDomElement& tqparen
MyMoneyKeyValueContainer::writeXML(document, el);
- tqparent.appendChild(el);
+ parent.appendChild(el);
}
bool MyMoneyTransaction::hasReferenceTo(const TQString& id) const
diff --git a/kmymoney2/mymoney/mymoneytransaction.h b/kmymoney2/mymoney/mymoneytransaction.h
index 21c28ea..6787c1d 100644
--- a/kmymoney2/mymoney/mymoneytransaction.h
+++ b/kmymoney2/mymoney/mymoneytransaction.h
@@ -241,7 +241,7 @@ public:
*/
static const TQString firstSplitID(void);
- void writeXML(TQDomDocument& document, TQDomElement& tqparent) const;
+ void writeXML(TQDomDocument& document, TQDomElement& parent) const;
/**
* This method checks if a reference to the given object exists. It returns,
diff --git a/kmymoney2/mymoney/mymoneyutils.h b/kmymoney2/mymoney/mymoneyutils.h
index ce0eb42..9e111d6 100644
--- a/kmymoney2/mymoney/mymoneyutils.h
+++ b/kmymoney2/mymoney/mymoneyutils.h
@@ -81,7 +81,7 @@ public:
/**
* This method allows to trace a printf like formatted text
*
- * @param format format tqmask
+ * @param format format mask
*/
void printf(const char *format, ...) const __attribute__ ((format (__printf__, 2, 3)));
diff --git a/kmymoney2/mymoney/storage/imymoneyserialize.h b/kmymoney2/mymoney/storage/imymoneyserialize.h
index c900687..dc37edd 100644
--- a/kmymoney2/mymoney/storage/imymoneyserialize.h
+++ b/kmymoney2/mymoney/storage/imymoneyserialize.h
@@ -194,12 +194,12 @@ public:
/**
* This method is used to add one account as sub-ordinate to another
- * (tqparent) account. The objects that are passed will be modified
+ * (parent) account. The objects that are passed will be modified
* accordingly.
*
* An exception will be thrown upon error conditions.
*
- * @param tqparent tqparent account the account should be added to
+ * @param parent parent account the account should be added to
* @param account the account to be added
*
* @deprecated This method is only provided as long as we provide
@@ -207,7 +207,7 @@ public:
* this compatability mode this method will disappear from
* this interface!
*/
- virtual void addAccount(MyMoneyAccount& tqparent, MyMoneyAccount& account) = 0;
+ virtual void addAccount(MyMoneyAccount& parent, MyMoneyAccount& account) = 0;
/**
* This method is used to create a new payee
diff --git a/kmymoney2/mymoney/storage/imymoneystorage.h b/kmymoney2/mymoney/storage/imymoneystorage.h
index cac0e45..02e53c2 100644
--- a/kmymoney2/mymoney/storage/imymoneystorage.h
+++ b/kmymoney2/mymoney/storage/imymoneystorage.h
@@ -135,15 +135,15 @@ public:
/**
* This method is used to add one account as sub-ordinate to another
- * (tqparent) account. The objects that are passed will be modified
+ * (parent) account. The objects that are passed will be modified
* accordingly.
*
* An exception will be thrown upon error conditions.
*
- * @param tqparent tqparent account the account should be added to
+ * @param parent parent account the account should be added to
* @param account the account to be added
*/
- virtual void addAccount(MyMoneyAccount& tqparent, MyMoneyAccount& account) = 0;
+ virtual void addAccount(MyMoneyAccount& parent, MyMoneyAccount& account) = 0;
/**
* This method is used to create a new payee
@@ -375,9 +375,9 @@ public:
* An exception will be thrown upon error conditions.
*
* @param account MyMoneyAccount reference to account to be re-parented
- * @param tqparent MyMoneyAccount reference to new tqparent account
+ * @param parent MyMoneyAccount reference to new parent account
*/
- virtual void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqparent) = 0;
+ virtual void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& parent) = 0;
/**
* This method is used to remove a transaction from the transaction
diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp b/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp
index 8bafce8..a80d5af 100644
--- a/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp
+++ b/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp
@@ -104,21 +104,21 @@ void MyMoneyDatabaseMgr::addAccount(MyMoneyAccount& account)
}
}
-void MyMoneyDatabaseMgr::addAccount(MyMoneyAccount& tqparent, MyMoneyAccount& account)
+void MyMoneyDatabaseMgr::addAccount(MyMoneyAccount& parent, MyMoneyAccount& account)
{
TQMap<TQString, MyMoneyAccount> accountList;
TQStringList accountIdList;
TQMap<TQString, MyMoneyAccount>::ConstIterator theParent;
TQMap<TQString, MyMoneyAccount>::ConstIterator theChild;
- accountIdList << tqparent.id() << account.id();
+ accountIdList << parent.id() << account.id();
startTransaction();
accountList = m_sql->fetchAccounts(accountIdList, true);
- theParent = accountList.find(tqparent.id());
+ theParent = accountList.find(parent.id());
if(theParent == accountList.end()) {
- TQString msg = "Unknown tqparent account '";
- msg += tqparent.id() + "'";
+ TQString msg = "Unknown parent account '";
+ msg += parent.id() + "'";
throw new MYMONEYEXCEPTION(msg);
}
@@ -131,16 +131,16 @@ void MyMoneyDatabaseMgr::addAccount(MyMoneyAccount& tqparent, MyMoneyAccount& ac
MyMoneyAccount acc = *theParent;
acc.addAccountId(account.id());
- tqparent = acc;
+ parent = acc;
acc = *theChild;
- acc.setParentAccountId(tqparent.id());
+ acc.setParentAccountId(parent.id());
account = acc;
//FIXME: MyMoneyBalanceCacheItem balance;
//FIXME: m_balanceCache[account.id()] = balance;
- m_sql->modifyAccount(tqparent);
+ m_sql->modifyAccount(parent);
m_sql->modifyAccount(account);
commitTransaction();
}
@@ -648,9 +648,9 @@ void MyMoneyDatabaseMgr::modifyTransaction(const MyMoneyTransaction& transaction
m_sql->modifyTransaction(transaction);
}
-void MyMoneyDatabaseMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqparent)
+void MyMoneyDatabaseMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccount& parent)
{
- if(account.accountType() == MyMoneyAccount::Stock && tqparent.accountType() != MyMoneyAccount::Investment)
+ if(account.accountType() == MyMoneyAccount::Stock && parent.accountType() != MyMoneyAccount::Investment)
throw new MYMONEYEXCEPTION("Cannot move a stock acocunt into a non-investment account");
TQStringList accountIdList;
@@ -660,9 +660,9 @@ void MyMoneyDatabaseMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccount
// verify that accounts exist. If one does not,
// an exception is thrown
- accountIdList << account.id() << tqparent.id();
+ accountIdList << account.id() << parent.id();
MyMoneyDatabaseMgr::account(account.id());
- MyMoneyDatabaseMgr::account(tqparent.id());
+ MyMoneyDatabaseMgr::account(parent.id());
if(!account.parentAccountId().isEmpty()) {
accountIdList << account.parentAccountId();
@@ -676,7 +676,7 @@ void MyMoneyDatabaseMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccount
oldParent = accountList.find(account.parentAccountId());
}
- newParent = accountList.find(tqparent.id());
+ newParent = accountList.find(parent.id());
childAccount = accountList.find(account.id());
MyMoneyAccount acc;
@@ -686,13 +686,13 @@ void MyMoneyDatabaseMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccount
m_sql->modifyAccount(acc);
}
- tqparent = (*newParent);
- tqparent.addAccountId(account.id());
+ parent = (*newParent);
+ parent.addAccountId(account.id());
account = (*childAccount);
- account.setParentAccountId(tqparent.id());
+ account.setParentAccountId(parent.id());
- m_sql->modifyAccount(tqparent);
+ m_sql->modifyAccount(parent);
m_sql->modifyAccount(account);
commitTransaction();
}
@@ -787,12 +787,12 @@ void MyMoneyDatabaseMgr::transactionList(TQValueList<TQPair<MyMoneyTransaction,
void MyMoneyDatabaseMgr::removeAccount(const MyMoneyAccount& account)
{
- MyMoneyAccount tqparent;
+ MyMoneyAccount parent;
- // check that the account and it's tqparent exist
+ // check that the account and it's parent exist
// this will throw an exception if the id is unknown
MyMoneyDatabaseMgr::account(account.id());
- tqparent = MyMoneyDatabaseMgr::account(account.parentAccountId());
+ parent = MyMoneyDatabaseMgr::account(account.parentAccountId());
// check that it's not one of the standard account groups
if(isStandardAccount(account.id()))
@@ -802,7 +802,7 @@ void MyMoneyDatabaseMgr::removeAccount(const MyMoneyAccount& account)
throw new MYMONEYEXCEPTION("Unable to remove account with active splits");
}
- // re-tqparent all sub-ordinate accounts to the tqparent of the account
+ // re-parent all sub-ordinate accounts to the parent of the account
// to be deleted. First round check that all accounts exist, second
// round do the re-parenting.
TQStringList::ConstIterator it;
@@ -814,7 +814,7 @@ void MyMoneyDatabaseMgr::removeAccount(const MyMoneyAccount& account)
// thrown and we would not make it until here.
TQStringList accountIdList;
- accountIdList << tqparent.id() << account.id();
+ accountIdList << parent.id() << account.id();
startTransaction();
TQMap<TQString, MyMoneyAccount> accountList = m_sql->fetchAccounts(accountIdList, true);
@@ -827,9 +827,9 @@ void MyMoneyDatabaseMgr::removeAccount(const MyMoneyAccount& account)
if(it_a == accountList.end())
throw new MYMONEYEXCEPTION("Internal error: account not found in list");
- it_p = accountList.find(tqparent.id());
+ it_p = accountList.find(parent.id());
if(it_p == accountList.end())
- throw new MYMONEYEXCEPTION("Internal error: tqparent account not found in list");
+ throw new MYMONEYEXCEPTION("Internal error: parent account not found in list");
if(!account.institutionId().isEmpty())
throw new MYMONEYEXCEPTION("Cannot remove account still attached to an institution");
@@ -848,19 +848,19 @@ void MyMoneyDatabaseMgr::removeAccount(const MyMoneyAccount& account)
if((*it_a).accountList().count() > 0) {
for(it = (*it_a).accountList().begin(); it != (*it_a).accountList().end(); ++it) {
MyMoneyAccount acc(MyMoneyDatabaseMgr::account(*it));
- reparentAccount(acc, tqparent);//, false);
+ reparentAccount(acc, parent);//, false);
}
}
- // remove account from tqparent's list
- tqparent.removeAccountId(account.id());
- m_sql->modifyAccount(tqparent);
+ // remove account from parent's list
+ parent.removeAccountId(account.id());
+ m_sql->modifyAccount(parent);
// remove account from the global account pool
//m_accountList.remove(account.id());
// remove from balance list
//FIXME: m_balanceCache.remove(account.id());
-//FIXME: invalidateBalanceCache(tqparent.id());
+//FIXME: invalidateBalanceCache(parent.id());
m_sql->removeAccount(account);
}
diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgr.h b/kmymoney2/mymoney/storage/mymoneydatabasemgr.h
index e146a70..5135ca4 100644
--- a/kmymoney2/mymoney/storage/mymoneydatabasemgr.h
+++ b/kmymoney2/mymoney/storage/mymoneydatabasemgr.h
@@ -82,15 +82,15 @@ public:
/**
* This method is used to add one account as sub-ordinate to another
- * (tqparent) account. The objects that are passed will be modified
+ * (parent) account. The objects that are passed will be modified
* accordingly.
*
* An exception will be thrown upon error conditions.
*
- * @param tqparent tqparent account the account should be added to
+ * @param parent parent account the account should be added to
* @param account the account to be added
*/
- virtual void addAccount(MyMoneyAccount& tqparent, MyMoneyAccount& account);
+ virtual void addAccount(MyMoneyAccount& parent, MyMoneyAccount& account);
/**
* This method is used to create a new payee
@@ -325,9 +325,9 @@ public:
* An exception will be thrown upon error conditions.
*
* @param account MyMoneyAccount reference to account to be re-parented
- * @param tqparent MyMoneyAccount reference to new tqparent account
+ * @param parent MyMoneyAccount reference to new parent account
*/
- virtual void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqparent);
+ virtual void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& parent);
/**
* This method is used to remove a transaction from the transaction
diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp b/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp
index 8886447..0591e2d 100644
--- a/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp
+++ b/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp
@@ -449,7 +449,7 @@ void MyMoneyDatabaseMgrTest::testModifyAccount() {
delete e;
}
- // use different tqparent
+ // use different parent
a.setParentAccountId("A000002");
try {
m->modifyAccount(c);
@@ -535,18 +535,18 @@ void MyMoneyDatabaseMgrTest::testReparentAccount() {
CPPUNIT_ASSERT(in.id() == "A000005");
CPPUNIT_ASSERT(ch.id() == "A000006");
- MyMoneyAccount tqparent = m->expense();
+ MyMoneyAccount parent = m->expense();
- m->addAccount(tqparent, ex1);
+ m->addAccount(parent, ex1);
m->addAccount(ex1, ex2);
- m->addAccount(tqparent, ex3);
- m->addAccount(tqparent, ex4);
+ m->addAccount(parent, ex3);
+ m->addAccount(parent, ex4);
- tqparent = m->income();
- m->addAccount(tqparent, in);
+ parent = m->income();
+ m->addAccount(parent, in);
- tqparent = m->asset();
- m->addAccount(tqparent, ch);
+ parent = m->asset();
+ m->addAccount(parent, ch);
MyMoneyFile::instance()->preloadCache();
CPPUNIT_ASSERT(m->expense().accountCount() == 3);
diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp
index efc88b7..ef4c3a9 100644
--- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp
+++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp
@@ -248,15 +248,15 @@ const TQValueList<MyMoneyPayee> MyMoneySeqAccessMgr::payeeList(void) const
}
-void MyMoneySeqAccessMgr::addAccount(MyMoneyAccount& tqparent, MyMoneyAccount& account)
+void MyMoneySeqAccessMgr::addAccount(MyMoneyAccount& parent, MyMoneyAccount& account)
{
TQMap<TQString, MyMoneyAccount>::ConstIterator theParent;
TQMap<TQString, MyMoneyAccount>::ConstIterator theChild;
- theParent = m_accountList.find(tqparent.id());
+ theParent = m_accountList.find(parent.id());
if(theParent == m_accountList.end()) {
- TQString msg = "Unknown tqparent account '";
- msg += tqparent.id() + "'";
+ TQString msg = "Unknown parent account '";
+ msg += parent.id() + "'";
throw new MYMONEYEXCEPTION(msg);
}
@@ -270,10 +270,10 @@ void MyMoneySeqAccessMgr::addAccount(MyMoneyAccount& tqparent, MyMoneyAccount& a
MyMoneyAccount acc = *theParent;
acc.addAccountId(account.id());
m_accountList.modify(acc.id(), acc);
- tqparent = acc;
+ parent = acc;
acc = *theChild;
- acc.setParentAccountId(tqparent.id());
+ acc.setParentAccountId(parent.id());
m_accountList.modify(acc.id(), acc);
account = acc;
@@ -591,12 +591,12 @@ void MyMoneySeqAccessMgr::modifyTransaction(const MyMoneyTransaction& transactio
m_transactionKeys.modify(transaction.id(), newKey);
}
-void MyMoneySeqAccessMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqparent)
+void MyMoneySeqAccessMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccount& parent)
{
- reparentAccount(account, tqparent, true);
+ reparentAccount(account, parent, true);
}
-void MyMoneySeqAccessMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqparent, const bool /* sendNotification */)
+void MyMoneySeqAccessMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccount& parent, const bool /* sendNotification */)
{
TQMap<TQString, MyMoneyAccount>::ConstIterator oldParent;
TQMap<TQString, MyMoneyAccount>::ConstIterator newParent;
@@ -605,16 +605,16 @@ void MyMoneySeqAccessMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccoun
// verify that accounts exist. If one does not,
// an exception is thrown
MyMoneySeqAccessMgr::account(account.id());
- MyMoneySeqAccessMgr::account(tqparent.id());
+ MyMoneySeqAccessMgr::account(parent.id());
if(!account.parentAccountId().isEmpty()) {
MyMoneySeqAccessMgr::account(account.parentAccountId());
oldParent = m_accountList.find(account.parentAccountId());
}
- if(account.accountType() == MyMoneyAccount::Stock && tqparent.accountType() != MyMoneyAccount::Investment)
+ if(account.accountType() == MyMoneyAccount::Stock && parent.accountType() != MyMoneyAccount::Investment)
throw new MYMONEYEXCEPTION("Cannot move a stock acocunt into a non-investment account");
- newParent = m_accountList.find(tqparent.id());
+ newParent = m_accountList.find(parent.id());
childAccount = m_accountList.find(account.id());
MyMoneyAccount acc;
@@ -624,16 +624,16 @@ void MyMoneySeqAccessMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccoun
m_accountList.modify(acc.id(), acc);
}
- tqparent = (*newParent);
- tqparent.addAccountId(account.id());
- m_accountList.modify(tqparent.id(), tqparent);
+ parent = (*newParent);
+ parent.addAccountId(account.id());
+ m_accountList.modify(parent.id(), parent);
account = (*childAccount);
- account.setParentAccountId(tqparent.id());
+ account.setParentAccountId(parent.id());
m_accountList.modify(account.id(), account);
#if 0
- // make sure the type is the same as the new tqparent. This does not work for stock and investment
+ // make sure the type is the same as the new parent. This does not work for stock and investment
if(account.accountType() != MyMoneyAccount::Stock && account.accountType() != MyMoneyAccount::Investment)
(*childAccount).setAccountType((*newParent).accountType());
#endif
@@ -677,12 +677,12 @@ void MyMoneySeqAccessMgr::removeTransaction(const MyMoneyTransaction& transactio
void MyMoneySeqAccessMgr::removeAccount(const MyMoneyAccount& account)
{
- MyMoneyAccount tqparent;
+ MyMoneyAccount parent;
- // check that the account and it's tqparent exist
+ // check that the account and it's parent exist
// this will throw an exception if the id is unknown
MyMoneySeqAccessMgr::account(account.id());
- tqparent = MyMoneySeqAccessMgr::account(account.parentAccountId());
+ parent = MyMoneySeqAccessMgr::account(account.parentAccountId());
// check that it's not one of the standard account groups
if(isStandardAccount(account.id()))
@@ -692,7 +692,7 @@ void MyMoneySeqAccessMgr::removeAccount(const MyMoneyAccount& account)
throw new MYMONEYEXCEPTION("Unable to remove account with active splits");
}
- // re-tqparent all sub-ordinate accounts to the tqparent of the account
+ // re-parent all sub-ordinate accounts to the parent of the account
// to be deleted. First round check that all accounts exist, second
// round do the re-parenting.
TQStringList::ConstIterator it;
@@ -712,9 +712,9 @@ void MyMoneySeqAccessMgr::removeAccount(const MyMoneyAccount& account)
if(it_a == m_accountList.end())
throw new MYMONEYEXCEPTION("Internal error: account not found in list");
- it_p = m_accountList.find(tqparent.id());
+ it_p = m_accountList.find(parent.id());
if(it_p == m_accountList.end())
- throw new MYMONEYEXCEPTION("Internal error: tqparent account not found in list");
+ throw new MYMONEYEXCEPTION("Internal error: parent account not found in list");
if(!account.institutionId().isEmpty())
throw new MYMONEYEXCEPTION("Cannot remove account still attached to an institution");
@@ -736,19 +736,19 @@ void MyMoneySeqAccessMgr::removeAccount(const MyMoneyAccount& account)
while((*it_a).accountList().count() > 0) {
it = (*it_a).accountList().begin();
MyMoneyAccount acc(MyMoneySeqAccessMgr::account(*it));
- reparentAccount(acc, tqparent, false);
+ reparentAccount(acc, parent, false);
}
}
- // remove account from tqparent's list
- tqparent.removeAccountId(account.id());
- m_accountList.modify(tqparent.id(), tqparent);
+ // remove account from parent's list
+ parent.removeAccountId(account.id());
+ m_accountList.modify(parent.id(), parent);
// remove account from the global account pool
m_accountList.remove(account.id());
// remove from balance list
m_balanceCache.remove(account.id());
- invalidateBalanceCache(tqparent.id());
+ invalidateBalanceCache(parent.id());
}
}
diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h
index f570d92..0aebe23 100644
--- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h
+++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h
@@ -219,13 +219,13 @@ public:
/**
* This method is used to add one account as sub-ordinate to another
- * (tqparent) account. The objects passed as arguments will be modified
+ * (parent) account. The objects passed as arguments will be modified
* accordingly.
*
- * @param tqparent tqparent account the account should be added to
+ * @param parent parent account the account should be added to
* @param account the account to be added
*/
- void addAccount(MyMoneyAccount& tqparent, MyMoneyAccount& account);
+ void addAccount(MyMoneyAccount& parent, MyMoneyAccount& account);
/**
* Adds an institution to the storage. A
@@ -291,9 +291,9 @@ public:
* An exception will be thrown upon error conditions.
*
* @param account MyMoneyAccount reference to account to be re-parented
- * @param tqparent MyMoneyAccount reference to new tqparent account
+ * @param parent MyMoneyAccount reference to new parent account
*/
- void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqparent);
+ void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& parent);
/**
* This method is used to remove a transaction from the transaction
@@ -1212,11 +1212,11 @@ private:
* An exception will be thrown upon error conditions.
*
* @param account MyMoneyAccount reference to account to be re-parented
- * @param tqparent MyMoneyAccount reference to new tqparent account
+ * @param parent MyMoneyAccount reference to new parent account
* @param sendNotification if true, notifications with the ids
* of all modified objects are send
*/
- void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqparent, const bool sendNotification);
+ void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& parent, const bool sendNotification);
/**
* This method will close a database and log the use roff
*/
diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp b/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp
index c4505e3..94d98f5 100644
--- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp
+++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp
@@ -383,7 +383,7 @@ void MyMoneySeqAccessMgrTest::testModifyAccount() {
delete e;
}
- // use different tqparent
+ // use different parent
a.setParentAccountId("A000002");
try {
m->modifyAccount(c);
@@ -460,18 +460,18 @@ void MyMoneySeqAccessMgrTest::testReparentAccount() {
CPPUNIT_ASSERT(in.id() == "A000005");
CPPUNIT_ASSERT(ch.id() == "A000006");
- MyMoneyAccount tqparent = m->expense();
+ MyMoneyAccount parent = m->expense();
- m->addAccount(tqparent, ex1);
+ m->addAccount(parent, ex1);
m->addAccount(ex1, ex2);
- m->addAccount(tqparent, ex3);
- m->addAccount(tqparent, ex4);
+ m->addAccount(parent, ex3);
+ m->addAccount(parent, ex4);
- tqparent = m->income();
- m->addAccount(tqparent, in);
+ parent = m->income();
+ m->addAccount(parent, in);
- tqparent = m->asset();
- m->addAccount(tqparent, ch);
+ parent = m->asset();
+ m->addAccount(parent, ch);
CPPUNIT_ASSERT(m->expense().accountCount() == 3);
CPPUNIT_ASSERT(m->account(ex1.id()).accountCount() == 1);
diff --git a/kmymoney2/mymoney/storage/mymoneystoragedump.cpp b/kmymoney2/mymoney/storage/mymoneystoragedump.cpp
index 8dd022a..73521b0 100644
--- a/kmymoney2/mymoney/storage/mymoneystoragedump.cpp
+++ b/kmymoney2/mymoney/storage/mymoneystoragedump.cpp
@@ -162,8 +162,8 @@ void MyMoneyStorageDump::writeStream(TQDataStream& _s, IMyMoneySerialize* _stora
}
s << " Parent = " << (*it_a).parentAccountId();
if(!(*it_a).parentAccountId().isEmpty()) {
- MyMoneyAccount tqparent = storage->account((*it_a).parentAccountId());
- s << " (" << tqparent.name() << ")";
+ MyMoneyAccount parent = storage->account((*it_a).parentAccountId());
+ s << " (" << parent.name() << ")";
} else {
s << "n/a";
}
diff --git a/kmymoney2/mymoney/storage/mymoneystoragexml.cpp b/kmymoney2/mymoney/storage/mymoneystoragexml.cpp
index 6290962..6c4cdcc 100644
--- a/kmymoney2/mymoney/storage/mymoneystoragexml.cpp
+++ b/kmymoney2/mymoney/storage/mymoneystoragexml.cpp
@@ -738,32 +738,32 @@ void MyMoneyStorageXML::writeCurrencies(TQDomElement& currencies)
}
}
-void MyMoneyStorageXML::writeReports(TQDomElement& tqparent)
+void MyMoneyStorageXML::writeReports(TQDomElement& parent)
{
const TQValueList<MyMoneyReport> list = m_storage->reportList();
TQValueList<MyMoneyReport>::ConstIterator it;
- tqparent.setAttribute("count", list.count());
+ parent.setAttribute("count", list.count());
signalProgress(0, list.count(), i18n("Saving reports..."));
unsigned i = 0;
for(it = list.begin(); it != list.end(); ++it)
{
- (*it).writeXML(*m_doc, tqparent);
+ (*it).writeXML(*m_doc, parent);
signalProgress(++i, 0);
}
}
-void MyMoneyStorageXML::writeBudgets(TQDomElement& tqparent)
+void MyMoneyStorageXML::writeBudgets(TQDomElement& parent)
{
const TQValueList<MyMoneyBudget> list = m_storage->budgetList();
TQValueList<MyMoneyBudget>::ConstIterator it;
- tqparent.setAttribute("count", list.count());
+ parent.setAttribute("count", list.count());
signalProgress(0, list.count(), i18n("Saving budgets..."));
unsigned i = 0;
for(it = list.begin(); it != list.end(); ++it)
{
- writeBudget(tqparent, (*it));
+ writeBudget(parent, (*it));
signalProgress(++i, 0);
}
}
diff --git a/kmymoney2/plugins/importinterface.cpp b/kmymoney2/plugins/importinterface.cpp
index 9c90df8..6a4ab6b 100644
--- a/kmymoney2/plugins/importinterface.cpp
+++ b/kmymoney2/plugins/importinterface.cpp
@@ -26,8 +26,8 @@
#include "importinterface.h"
-KMyMoneyPlugin::ImportInterface::ImportInterface(TQObject* tqparent, const char* name) :
- TQObject(tqparent, name)
+KMyMoneyPlugin::ImportInterface::ImportInterface(TQObject* parent, const char* name) :
+ TQObject(parent, name)
{
}
diff --git a/kmymoney2/plugins/importinterface.h b/kmymoney2/plugins/importinterface.h
index 26083c1..22df51a 100644
--- a/kmymoney2/plugins/importinterface.h
+++ b/kmymoney2/plugins/importinterface.h
@@ -52,10 +52,10 @@ class KMYMONEY_EXPORT ImportInterface : public TQObject
TQ_OBJECT
public:
- ImportInterface(TQObject* tqparent, const char* name = 0);
+ ImportInterface(TQObject* parent, const char* name = 0);
~ImportInterface() {}
- virtual KURL selectFile(const TQString& title, const TQString& path, const TQString& tqmask, KFile::Mode mode) const = 0;
+ virtual KURL selectFile(const TQString& title, const TQString& path, const TQString& mask, KFile::Mode mode) const = 0;
signals:
};
diff --git a/kmymoney2/plugins/interfaces/kmmimportinterface.cpp b/kmymoney2/plugins/interfaces/kmmimportinterface.cpp
index d21959b..041044e 100644
--- a/kmymoney2/plugins/interfaces/kmmimportinterface.cpp
+++ b/kmymoney2/plugins/interfaces/kmmimportinterface.cpp
@@ -27,15 +27,15 @@
#include "../../kmymoney2.h"
#include "kmmimportinterface.h"
-KMyMoneyPlugin::KMMImportInterface::KMMImportInterface(KMyMoney2App* app, TQObject* tqparent, const char* name) :
- ImportInterface(tqparent, name),
+KMyMoneyPlugin::KMMImportInterface::KMMImportInterface(KMyMoney2App* app, TQObject* parent, const char* name) :
+ ImportInterface(parent, name),
m_app(app)
{
}
-KURL KMyMoneyPlugin::KMMImportInterface::selectFile(const TQString& title, const TQString& path, const TQString& tqmask, KFile::Mode mode) const
+KURL KMyMoneyPlugin::KMMImportInterface::selectFile(const TQString& title, const TQString& path, const TQString& mask, KFile::Mode mode) const
{
- return m_app->selectFile(title, path, tqmask, mode);
+ return m_app->selectFile(title, path, mask, mode);
}
#include "kmmimportinterface.moc"
diff --git a/kmymoney2/plugins/interfaces/kmmimportinterface.h b/kmymoney2/plugins/interfaces/kmmimportinterface.h
index 97ffa5e..0cea34a 100644
--- a/kmymoney2/plugins/interfaces/kmmimportinterface.h
+++ b/kmymoney2/plugins/interfaces/kmmimportinterface.h
@@ -48,10 +48,10 @@ class KMMImportInterface : public ImportInterface {
TQ_OBJECT
public:
- KMMImportInterface(KMyMoney2App* app, TQObject* tqparent, const char* name = 0);
+ KMMImportInterface(KMyMoney2App* app, TQObject* parent, const char* name = 0);
~KMMImportInterface() {}
- KURL selectFile(const TQString& title, const TQString& path, const TQString& tqmask, KFile::Mode mode) const;
+ KURL selectFile(const TQString& title, const TQString& path, const TQString& mask, KFile::Mode mode) const;
private:
KMyMoney2App* m_app;
diff --git a/kmymoney2/plugins/interfaces/kmmstatementinterface.cpp b/kmymoney2/plugins/interfaces/kmmstatementinterface.cpp
index c14caea..7fcefb0 100644
--- a/kmymoney2/plugins/interfaces/kmmstatementinterface.cpp
+++ b/kmymoney2/plugins/interfaces/kmmstatementinterface.cpp
@@ -31,8 +31,8 @@
#include <kmymoney/mymoneyaccount.h>
#include <kmymoney/mymoneykeyvaluecontainer.h>
-KMyMoneyPlugin::KMMStatementInterface::KMMStatementInterface(KMyMoney2App* app, TQObject* tqparent, const char* name) :
- StatementInterface(tqparent, name),
+KMyMoneyPlugin::KMMStatementInterface::KMMStatementInterface(KMyMoney2App* app, TQObject* parent, const char* name) :
+ StatementInterface(parent, name),
m_app(app)
{
}
diff --git a/kmymoney2/plugins/interfaces/kmmstatementinterface.h b/kmymoney2/plugins/interfaces/kmmstatementinterface.h
index 6eee779..df7677a 100644
--- a/kmymoney2/plugins/interfaces/kmmstatementinterface.h
+++ b/kmymoney2/plugins/interfaces/kmmstatementinterface.h
@@ -49,7 +49,7 @@ class KMMStatementInterface : public StatementInterface
TQ_OBJECT
public:
- KMMStatementInterface(KMyMoney2App* app, TQObject* tqparent, const char* name = 0);
+ KMMStatementInterface(KMyMoney2App* app, TQObject* parent, const char* name = 0);
~KMMStatementInterface() {}
/**
diff --git a/kmymoney2/plugins/interfaces/kmmviewinterface.cpp b/kmymoney2/plugins/interfaces/kmmviewinterface.cpp
index cc6ec5b..b4ff102 100644
--- a/kmymoney2/plugins/interfaces/kmmviewinterface.cpp
+++ b/kmymoney2/plugins/interfaces/kmmviewinterface.cpp
@@ -29,8 +29,8 @@
#include "../../widgets/selectedtransaction.h"
#include "kmmviewinterface.h"
-KMyMoneyPlugin::KMMViewInterface::KMMViewInterface(KMyMoney2App* app, KMyMoneyView* view, TQObject* tqparent, const char* name) :
- ViewInterface(tqparent, name),
+KMyMoneyPlugin::KMMViewInterface::KMMViewInterface(KMyMoney2App* app, KMyMoneyView* view, TQObject* parent, const char* name) :
+ ViewInterface(parent, name),
m_app(app),
m_view(view)
{
diff --git a/kmymoney2/plugins/interfaces/kmmviewinterface.h b/kmymoney2/plugins/interfaces/kmmviewinterface.h
index 9797a8c..da9fb8e 100644
--- a/kmymoney2/plugins/interfaces/kmmviewinterface.h
+++ b/kmymoney2/plugins/interfaces/kmmviewinterface.h
@@ -48,7 +48,7 @@ class KMMViewInterface : public ViewInterface {
TQ_OBJECT
public:
- KMMViewInterface(KMyMoney2App* app, KMyMoneyView* view, TQObject* tqparent, const char* name = 0);
+ KMMViewInterface(KMyMoney2App* app, KMyMoneyView* view, TQObject* parent, const char* name = 0);
~KMMViewInterface() {}
/**
diff --git a/kmymoney2/plugins/kmymoneyplugin.cpp b/kmymoney2/plugins/kmymoneyplugin.cpp
index d604d19..add4588 100644
--- a/kmymoney2/plugins/kmymoneyplugin.cpp
+++ b/kmymoney2/plugins/kmymoneyplugin.cpp
@@ -75,17 +75,17 @@ KToggleAction* KMyMoneyPlugin::Plugin::toggleAction(const TQString& actionName)
KMyMoneyPlugin::ViewInterface* KMyMoneyPlugin::Plugin::viewInterface() const
{
- return static_cast<ViewInterface*>( tqparent()->child( 0, "KMyMoneyPlugin::ViewInterface" ) );
+ return static_cast<ViewInterface*>( parent()->child( 0, "KMyMoneyPlugin::ViewInterface" ) );
}
KMyMoneyPlugin::StatementInterface* KMyMoneyPlugin::Plugin::statementInterface() const
{
- return static_cast<StatementInterface*>( tqparent()->child( 0, "KMyMoneyPlugin::StatementInterface" ) );
+ return static_cast<StatementInterface*>( parent()->child( 0, "KMyMoneyPlugin::StatementInterface" ) );
}
KMyMoneyPlugin::ImportInterface* KMyMoneyPlugin::Plugin::importInterface() const
{
- return static_cast<ImportInterface*>( tqparent()->child( 0, "KMyMoneyPlugin::ImportInterface" ) );
+ return static_cast<ImportInterface*>( parent()->child( 0, "KMyMoneyPlugin::ImportInterface" ) );
}
#include "kmymoneyplugin.moc"
diff --git a/kmymoney2/plugins/kmymoneyplugin.h b/kmymoney2/plugins/kmymoneyplugin.h
index f5cdac6..523e578 100644
--- a/kmymoney2/plugins/kmymoneyplugin.h
+++ b/kmymoney2/plugins/kmymoneyplugin.h
@@ -61,7 +61,7 @@ namespace KMyMoneyPlugin {
Q_OBJECT
TQ_OBJECT
public:
- Plugin(TQObject* tqparent, const char* name);
+ Plugin(TQObject* parent, const char* name);
virtual ~Plugin();
protected:
diff --git a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp
index 9248854..398f369 100644
--- a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp
+++ b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp
@@ -54,8 +54,8 @@ public:
TQFile m_fpTrace;
};
-KOfxDirectConnectDlg::KOfxDirectConnectDlg(const MyMoneyAccount& account, TQWidget *tqparent, const char *name) :
- KOfxDirectConnectDlgDecl(tqparent, name),
+KOfxDirectConnectDlg::KOfxDirectConnectDlg(const MyMoneyAccount& account, TQWidget *parent, const char *name) :
+ KOfxDirectConnectDlgDecl(parent, name),
d(new Private),
m_tmpfile(NULL),
m_connector(account),
diff --git a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.h b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.h
index 4d165ec..b07e191 100644
--- a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.h
+++ b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.h
@@ -51,7 +51,7 @@ class KOfxDirectConnectDlg : public KOfxDirectConnectDlgDecl
Q_OBJECT
TQ_OBJECT
public:
- KOfxDirectConnectDlg(const MyMoneyAccount&, TQWidget *tqparent = 0, const char *name = 0);
+ KOfxDirectConnectDlg(const MyMoneyAccount&, TQWidget *parent = 0, const char *name = 0);
~KOfxDirectConnectDlg();
void init(void);
diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp
index eac5079..6d57e49 100644
--- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp
+++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp
@@ -58,8 +58,8 @@ public:
TQTextStream m_trace;
};
-KOnlineBankingSetupWizard::KOnlineBankingSetupWizard(TQWidget *tqparent, const char *name):
- KOnlineBankingSetupDecl(tqparent,name),
+KOnlineBankingSetupWizard::KOnlineBankingSetupWizard(TQWidget *parent, const char *name):
+ KOnlineBankingSetupDecl(parent,name),
d(new Private),
m_fDone(false),
m_fInit(false),
@@ -429,8 +429,8 @@ bool KOnlineBankingSetupWizard::chosenSettings( MyMoneyKeyValueContainer& settin
return result;
}
-KOnlineBankingSetupWizard::ListViewItem::ListViewItem( TQListView* tqparent, const MyMoneyKeyValueContainer& kvps ):
- MyMoneyKeyValueContainer( kvps ), TQListViewItem( tqparent )
+KOnlineBankingSetupWizard::ListViewItem::ListViewItem( TQListView* parent, const MyMoneyKeyValueContainer& kvps ):
+ MyMoneyKeyValueContainer( kvps ), TQListViewItem( parent )
{
setText( 0, value("accountid") );
setText( 1, value("type") );
diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.h b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.h
index 4faccbc..35b010c 100644
--- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.h
+++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.h
@@ -66,11 +66,11 @@ public:
class ListViewItem: public MyMoneyKeyValueContainer, public TQListViewItem
{
public:
- ListViewItem( TQListView* tqparent, const MyMoneyKeyValueContainer& kvps );
+ ListViewItem( TQListView* parent, const MyMoneyKeyValueContainer& kvps );
virtual void x(void);
};
- KOnlineBankingSetupWizard(TQWidget *tqparent=0, const char *name=0);
+ KOnlineBankingSetupWizard(TQWidget *parent=0, const char *name=0);
~KOnlineBankingSetupWizard();
bool chosenSettings( MyMoneyKeyValueContainer& settings );
diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp
index 8ca0aac..d2b9880 100644
--- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp
+++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp
@@ -48,8 +48,8 @@
#include <libofx/libofx.h>
#include "mymoneyofxconnector.h"
-KOnlineBankingtqStatus::KOnlineBankingtqStatus(const MyMoneyAccount& acc, TQWidget *tqparent, const char *name) :
- KOnlineBankingStatusDecl(tqparent,name),
+KOnlineBankingtqStatus::KOnlineBankingtqStatus(const MyMoneyAccount& acc, TQWidget *parent, const char *name) :
+ KOnlineBankingStatusDecl(parent,name),
m_appId(0)
{
m_ledOnlinetqStatus->off();
diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.h b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.h
index 75e3369..52e43ee 100644
--- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.h
+++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.h
@@ -46,7 +46,7 @@ class KOnlineBankingtqStatus : public KOnlineBankingStatusDecl
Q_OBJECT
TQ_OBJECT
public:
- KOnlineBankingtqStatus(const MyMoneyAccount& acc, TQWidget *tqparent=0, const char *name=0);
+ KOnlineBankingtqStatus(const MyMoneyAccount& acc, TQWidget *parent=0, const char *name=0);
~KOnlineBankingtqStatus();
const TQString& appId(void) const;
TQString headerVersion(void) const;
diff --git a/kmymoney2/plugins/ofximport/ofximporterplugin.cpp b/kmymoney2/plugins/ofximport/ofximporterplugin.cpp
index 82919e0..7755dc8 100644
--- a/kmymoney2/plugins/ofximport/ofximporterplugin.cpp
+++ b/kmymoney2/plugins/ofximport/ofximporterplugin.cpp
@@ -45,8 +45,8 @@
K_EXPORT_COMPONENT_FACTORY( kmm_ofximport,
KGenericFactory<OfxImporterPlugin>( "kmm_ofximport" ) )
-OfxImporterPlugin::OfxImporterPlugin(TQObject *tqparent, const char *name, const TQStringList&) :
- KMyMoneyPlugin::Plugin( tqparent, name ),
+OfxImporterPlugin::OfxImporterPlugin(TQObject *parent, const char *name, const TQStringList&) :
+ KMyMoneyPlugin::Plugin( parent, name ),
KMyMoneyPlugin::ImporterPlugin(),
m_valid( false )
{
diff --git a/kmymoney2/plugins/ofximport/ofximporterplugin.h b/kmymoney2/plugins/ofximport/ofximporterplugin.h
index 36473d8..2103ccb 100644
--- a/kmymoney2/plugins/ofximport/ofximporterplugin.h
+++ b/kmymoney2/plugins/ofximport/ofximporterplugin.h
@@ -45,7 +45,7 @@ class OfxImporterPlugin : public KMyMoneyPlugin::Plugin, public KMyMoneyPlugin::
Q_OBJECT
TQ_OBJECT
public:
- OfxImporterPlugin(TQObject *tqparent = 0, const char *name = 0, const TQStringList& = TQStringList());
+ OfxImporterPlugin(TQObject *parent = 0, const char *name = 0, const TQStringList& = TQStringList());
~OfxImporterPlugin();
diff --git a/kmymoney2/plugins/pluginloader.cpp b/kmymoney2/plugins/pluginloader.cpp
index c3d479b..5e1dcc6 100644
--- a/kmymoney2/plugins/pluginloader.cpp
+++ b/kmymoney2/plugins/pluginloader.cpp
@@ -58,14 +58,14 @@ struct PluginLoader::Private
PluginsMap m_loadedPlugins;
};
-PluginLoader::PluginLoader(TQObject* tqparent)
+PluginLoader::PluginLoader(TQObject* parent)
{
Q_ASSERT( s_instance == 0 );
s_instance = this;
d = new Private;
- d->m_parent = tqparent;
+ d->m_parent = parent;
KTrader::OfferList offers = KTrader::self()->query("KMyMoneyPlugin");
d->m_pluginList = KPluginInfo::fromServices(offers);
diff --git a/kmymoney2/plugins/pluginloader.h b/kmymoney2/plugins/pluginloader.h
index 5111948..e6c6aec 100644
--- a/kmymoney2/plugins/pluginloader.h
+++ b/kmymoney2/plugins/pluginloader.h
@@ -48,7 +48,7 @@ namespace KMyMoneyPlugin
Q_OBJECT
TQ_OBJECT
public:
- PluginLoader(TQObject* tqparent);
+ PluginLoader(TQObject* parent);
virtual ~PluginLoader();
static PluginLoader* instance();
diff --git a/kmymoney2/plugins/statementinterface.cpp b/kmymoney2/plugins/statementinterface.cpp
index 3dfac42..0fd81ff 100644
--- a/kmymoney2/plugins/statementinterface.cpp
+++ b/kmymoney2/plugins/statementinterface.cpp
@@ -26,8 +26,8 @@
#include "statementinterface.h"
-KMyMoneyPlugin::StatementInterface::StatementInterface(TQObject* tqparent, const char* name) :
- TQObject(tqparent, name)
+KMyMoneyPlugin::StatementInterface::StatementInterface(TQObject* parent, const char* name) :
+ TQObject(parent, name)
{
}
diff --git a/kmymoney2/plugins/statementinterface.h b/kmymoney2/plugins/statementinterface.h
index 66d533a..7ced222 100644
--- a/kmymoney2/plugins/statementinterface.h
+++ b/kmymoney2/plugins/statementinterface.h
@@ -48,7 +48,7 @@ class KMYMONEY_EXPORT StatementInterface : public TQObject {
TQ_OBJECT
public:
- StatementInterface(TQObject* tqparent, const char* name = 0);
+ StatementInterface(TQObject* parent, const char* name = 0);
~StatementInterface() {}
/**
diff --git a/kmymoney2/plugins/viewinterface.cpp b/kmymoney2/plugins/viewinterface.cpp
index 03f0d0b..d1cf119 100644
--- a/kmymoney2/plugins/viewinterface.cpp
+++ b/kmymoney2/plugins/viewinterface.cpp
@@ -26,8 +26,8 @@
#include "viewinterface.h"
-KMyMoneyPlugin::ViewInterface::ViewInterface(TQObject* tqparent, const char* name) :
- TQObject(tqparent, name)
+KMyMoneyPlugin::ViewInterface::ViewInterface(TQObject* parent, const char* name) :
+ TQObject(parent, name)
{
}
diff --git a/kmymoney2/plugins/viewinterface.h b/kmymoney2/plugins/viewinterface.h
index edec926..620cef1 100644
--- a/kmymoney2/plugins/viewinterface.h
+++ b/kmymoney2/plugins/viewinterface.h
@@ -58,7 +58,7 @@ class KMYMONEY_EXPORT ViewInterface : public TQObject {
TQ_OBJECT
public:
- ViewInterface(TQObject* tqparent, const char* name = 0);
+ ViewInterface(TQObject* parent, const char* name = 0);
~ViewInterface() {}
/**
diff --git a/kmymoney2/reports/kreportchartview.cpp b/kmymoney2/reports/kreportchartview.cpp
index c20618b..79a5b5d 100644
--- a/kmymoney2/reports/kreportchartview.cpp
+++ b/kmymoney2/reports/kreportchartview.cpp
@@ -34,7 +34,7 @@
using namespace reports;
-KReportChartView::KReportChartView( TQWidget* tqparent, const char* name ): KDChartWidget(tqparent,name)
+KReportChartView::KReportChartView( TQWidget* parent, const char* name ): KDChartWidget(parent,name)
{
// ********************************************************************
// Set KMyMoney's Chart Parameter Defaults
diff --git a/kmymoney2/reports/kreportchartview.h b/kmymoney2/reports/kreportchartview.h
index d04e291..70963f6 100644
--- a/kmymoney2/reports/kreportchartview.h
+++ b/kmymoney2/reports/kreportchartview.h
@@ -51,7 +51,7 @@ namespace reports {
class KReportChartView: public KDChartWidget
{
public:
- KReportChartView( TQWidget* tqparent, const char* name );
+ KReportChartView( TQWidget* parent, const char* name );
~KReportChartView() {}
static bool implemented(void) { return true; }
void setNewData( const KDChartTableData& newdata ) { this->setData(new KDChartTableData(newdata)); }
@@ -83,7 +83,7 @@ namespace reports {
class KReportChartView : public TQWidget
{
public:
- KReportChartView( TQWidget* tqparent, const char* name ): TQWidget(tqparent,name) {}
+ KReportChartView( TQWidget* parent, const char* name ): TQWidget(parent,name) {}
~KReportChartView() {}
static bool implemented(void) { return false; }
};
diff --git a/kmymoney2/reports/pivottable.cpp b/kmymoney2/reports/pivottable.cpp
index d39e226..bf048cb 100644
--- a/kmymoney2/reports/pivottable.cpp
+++ b/kmymoney2/reports/pivottable.cpp
@@ -783,7 +783,7 @@ MyMoneyMoney PivotTable::cellBalance(const TQString& outergroup, const ReportAcc
// ensure the row already exists (and its parental hierarchy)
createRow( outergroup, row, true );
- // Determine the inner group from the top-most tqparent account
+ // Determine the inner group from the top-most parent account
TQString innergroup( row.topParentName() );
if ( m_numColumns <= _column )
@@ -869,7 +869,7 @@ void PivotTable::calculateBudgetMapping( void )
m_budgetMap[acid] = id;
// kdDebug(2) << ReportAccount(acid).debugName() << " self-maps / type =" << budget.account(id).budgetLevel() << endl;
}
- // Otherwise, search for a tqparent account which includes sub-accounts
+ // Otherwise, search for a parent account which includes sub-accounts
else
{
//if includeBudgetActuals, include all accounts regardless of whether in budget or not
@@ -1248,7 +1248,7 @@ void PivotTable::assignCell( const TQString& outergroup, const ReportAccount& _r
// ensure the row already exists (and its parental hierarchy)
createRow( outergroup, row, true );
- // Determine the inner group from the top-most tqparent account
+ // Determine the inner group from the top-most parent account
TQString innergroup( row.topParentName() );
if ( m_numColumns <= column )
@@ -1276,7 +1276,7 @@ void PivotTable::createRow( const TQString& outergroup, const ReportAccount& row
{
DEBUG_ENTER(__PRETTY_FUNCTION__);
- // Determine the inner group from the top-most tqparent account
+ // Determine the inner group from the top-most parent account
TQString innergroup( row.topParentName() );
if ( ! m_grid.contains(outergroup) )
@@ -1297,7 +1297,7 @@ void PivotTable::createRow( const TQString& outergroup, const ReportAccount& row
m_grid[outergroup][innergroup][row] = PivotGridRowSet(m_numColumns);
if ( recursive && !row.isTopLevel() )
- createRow( outergroup, row.tqparent(), recursive );
+ createRow( outergroup, row.parent(), recursive );
}
}
@@ -1732,7 +1732,7 @@ TQString PivotTable::renderHTML( void ) const
if(!rowname.isClosed() || isUsed) {
innergroupdata += TQString("<tr class=\"row-%1\"%2><td%3 class=\"left\" style=\"text-indent: %4.0em\">%5%6</td>")
.tqarg(rownum & 0x01 ? "even" : "odd")
- .tqarg(rowname.isTopLevel() ? " id=\"toptqparent\"" : "")
+ .tqarg(rowname.isTopLevel() ? " id=\"topparent\"" : "")
.tqarg("") //.tqarg((*it_row).m_total.isZero() ? colspan : "") // colspan the distance if this row will be blank
.tqarg(rowname.hierarchyDepth() - 1)
.tqarg(rowname.name().replace(TQRegExp(" "), "&nbsp;"))
diff --git a/kmymoney2/reports/pivottable.h b/kmymoney2/reports/pivottable.h
index 5d3a8c6..8749b73 100644
--- a/kmymoney2/reports/pivottable.h
+++ b/kmymoney2/reports/pivottable.h
@@ -165,7 +165,7 @@ protected:
*
* @param outergroup The outer row group
* @param row The row itself
- * @param recursive Whether to also recursively create rows for our tqparent accounts
+ * @param recursive Whether to also recursively create rows for our parent accounts
*/
void createRow( const TQString& outergroup, const ReportAccount& row, bool recursive );
diff --git a/kmymoney2/reports/pivottabletest.cpp b/kmymoney2/reports/pivottabletest.cpp
index f5dbe12..ddee89e 100644
--- a/kmymoney2/reports/pivottabletest.cpp
+++ b/kmymoney2/reports/pivottabletest.cpp
@@ -436,7 +436,7 @@ void PivotTableTest::testMultipleCurrencies()
CPPUNIT_ASSERT(spending_f.m_grid["Expense"]["Foreign"][acCanCash][eActual][3]==(moCanTransaction*moCanPrice));
CPPUNIT_ASSERT(spending_f.m_grid["Expense"]["Foreign"][acCanCash][eActual][4]==(moCanTransaction*moCanPrice));
- // test multiple foreign currencies under a common tqparent
+ // test multiple foreign currencies under a common parent
CPPUNIT_ASSERT(spending_f.m_grid["Expense"]["Foreign"][acJpyCash][eActual][2]==(moJpyTransaction*moJpyPrice));
CPPUNIT_ASSERT(spending_f.m_grid["Expense"]["Foreign"][acJpyCash][eActual][3]==(moJpyTransaction*moJpyPrice));
CPPUNIT_ASSERT(spending_f.m_grid["Expense"]["Foreign"][acJpyCash][eActual][4]==(moJpyTransaction*moJpyPrice));
diff --git a/kmymoney2/reports/querytable.cpp b/kmymoney2/reports/querytable.cpp
index cc38a2f..8257ce3 100644
--- a/kmymoney2/reports/querytable.cpp
+++ b/kmymoney2/reports/querytable.cpp
@@ -548,8 +548,8 @@ void QueryTable::constructTransactionTable(void)
if (splitAcc.isInvest()) {
- // use the institution of the tqparent for stock accounts
- institution = splitAcc.tqparent().institutionId();
+ // use the institution of the parent for stock accounts
+ institution = splitAcc.parent().institutionId();
MyMoneyMoney shares = (*it_split).shares();
qA["action"] = (*it_split).action();
@@ -559,7 +559,7 @@ void QueryTable::constructTransactionTable(void)
if (((*it_split).action() == MyMoneySplit::ActionBuyShares) && (*it_split).shares().isNegative())
qA["action"] = "Sell";
- qA["investaccount"] = splitAcc.tqparent().name();
+ qA["investaccount"] = splitAcc.parent().name();
}
if (it_split == myBegin) {
@@ -829,9 +829,9 @@ void QueryTable::constructTransactionTable(void)
TQString institution = account.institutionId();
- // use the institution of the tqparent for stock accounts
+ // use the institution of the parent for stock accounts
if (account.isInvest())
- institution = account.tqparent().institutionId();
+ institution = account.parent().institutionId();
MyMoneyMoney startBalance, endBalance, startPrice, endPrice;
MyMoneyMoney startShares, endShares;
@@ -1148,7 +1148,7 @@ void QueryTable::constructAccountTable(void)
TQString iid = (*it_account).institutionId();
- // If an account does not have an institution, get it from the top-tqparent.
+ // If an account does not have an institution, get it from the top-parent.
if ( iid.isEmpty() && ! account.isTopLevel() )
{
ReportAccount topaccount = account.topParent();
@@ -1308,8 +1308,8 @@ void QueryTable::constructSplitsTable(void)
if (splitAcc.isInvest()) {
- // use the institution of the tqparent for stock accounts
- institution = splitAcc.tqparent().institutionId();
+ // use the institution of the parent for stock accounts
+ institution = splitAcc.parent().institutionId();
MyMoneyMoney shares = (*it_split).shares();
qA["action"] = (*it_split).action();
@@ -1319,7 +1319,7 @@ void QueryTable::constructSplitsTable(void)
if (((*it_split).action() == MyMoneySplit::ActionBuyShares) && (*it_split).shares().isNegative())
qA["action"] = "Sell";
- qA["investaccount"] = splitAcc.tqparent().name();
+ qA["investaccount"] = splitAcc.parent().name();
}
include_me = m_config.includes(splitAcc);
@@ -1461,9 +1461,9 @@ void QueryTable::constructSplitsTable(void)
TQString institution = account.institutionId();
- // use the institution of the tqparent for stock accounts
+ // use the institution of the parent for stock accounts
if (account.isInvest())
- institution = account.tqparent().institutionId();
+ institution = account.parent().institutionId();
MyMoneyMoney startBalance, endBalance, startPrice, endPrice;
MyMoneyMoney startShares, endShares;
diff --git a/kmymoney2/reports/reportaccount.cpp b/kmymoney2/reports/reportaccount.cpp
index 5f091e2..cdc8097 100644
--- a/kmymoney2/reports/reportaccount.cpp
+++ b/kmymoney2/reports/reportaccount.cpp
@@ -83,7 +83,7 @@ void ReportAccount::calculateAccountHierarchy( void )
#endif
while (!file->isStandardAccount(parentid))
{
- // take on the identity of our tqparent
+ // take on the identity of our parent
resultid = parentid;
// and try again
@@ -305,7 +305,7 @@ unsigned ReportAccount::hierarchyDepth( void ) const
return ( m_nameHierarchy.size() );
}
-ReportAccount ReportAccount::tqparent( void ) const
+ReportAccount ReportAccount::parent( void ) const
{
return ReportAccount( parentAccountId() );
}
@@ -320,7 +320,7 @@ ReportAccount ReportAccount::topParent( void ) const
while (!file->isStandardAccount(parentid))
{
- // take on the identity of our tqparent
+ // take on the identity of our parent
resultid = parentid;
// and try again
diff --git a/kmymoney2/reports/reportaccount.h b/kmymoney2/reports/reportaccount.h
index 91db6a2..e3bf663 100644
--- a/kmymoney2/reports/reportaccount.h
+++ b/kmymoney2/reports/reportaccount.h
@@ -174,39 +174,39 @@ public:
TQString debugName( void ) const;
/**
- * Whether this account is a 'top level' tqparent account. This means that
- * it's tqparent is an account class, like asset, liability, expense or income
+ * Whether this account is a 'top level' parent account. This means that
+ * it's parent is an account class, like asset, liability, expense or income
*
- * @return bool True if this account is a top level tqparent account
+ * @return bool True if this account is a top level parent account
*/
/*inline*/ bool isTopLevel( void ) const;
/**
- * Returns the name of the top level tqparent account
+ * Returns the name of the top level parent account
*
- * (See isTopLevel for a definition of 'top level tqparent')
+ * (See isTopLevel for a definition of 'top level parent')
*
- * @return TQString The name of the top level tqparent account
+ * @return TQString The name of the top level parent account
*/
/*inline*/ TQString topParentName( void ) const;
/**
- * Returns a report account containing the top tqparent account
+ * Returns a report account containing the top parent account
*
- * @return ReportAccount The account of the top tqparent
+ * @return ReportAccount The account of the top parent
*/
ReportAccount topParent( void ) const;
/**
- * Returns a report account containing the immediate tqparent account
+ * Returns a report account containing the immediate parent account
*
- * @return ReportAccount The account of the immediate tqparent
+ * @return ReportAccount The account of the immediate parent
*/
- ReportAccount tqparent( void ) const;
+ ReportAccount parent( void ) const;
/**
* Returns the number of accounts in this account's hierarchy. If this is a
- * Top Category, it returns 1. If it's tqparent is a Top Category, returns 2,
+ * Top Category, it returns 1. If it's parent is a Top Category, returns 2,
* etc.
*
* @return unsigned Hierarchy depth
diff --git a/kmymoney2/reports/reportstestcommon.cpp b/kmymoney2/reports/reportstestcommon.cpp
index 7d42abc..6783b08 100644
--- a/kmymoney2/reports/reportstestcommon.cpp
+++ b/kmymoney2/reports/reportstestcommon.cpp
@@ -244,8 +244,8 @@ TQString makeAccount( const TQString& _name, MyMoneyAccount::accountTypeE _type,
if(_taxReport)
info.setValue("Tax", "Yes");
- MyMoneyAccount tqparent = MyMoneyFile::instance()->account(_parent);
- MyMoneyFile::instance()->addAccount( info, tqparent );
+ MyMoneyAccount parent = MyMoneyFile::instance()->account(_parent);
+ MyMoneyFile::instance()->addAccount( info, parent );
// create the opening balance transaction if any
if(!_balance.isZero()) {
MyMoneySecurity sec = MyMoneyFile::instance()->currency(info.currencyId());
diff --git a/kmymoney2/views/kaccountsview.cpp b/kmymoney2/views/kaccountsview.cpp
index f0da377..8de2b20 100644
--- a/kmymoney2/views/kaccountsview.cpp
+++ b/kmymoney2/views/kaccountsview.cpp
@@ -43,8 +43,8 @@
#include "../kmymoney2.h"
-KMyMoneyAccountIconItem::KMyMoneyAccountIconItem(TQIconView *tqparent, const MyMoneyAccount& account) :
- KIconViewItem(tqparent, account.name()),
+KMyMoneyAccountIconItem::KMyMoneyAccountIconItem(TQIconView *parent, const MyMoneyAccount& account) :
+ KIconViewItem(parent, account.name()),
m_account(account),
m_reconcileFlag(false)
{
@@ -68,8 +68,8 @@ void KMyMoneyAccountIconItem::updateAccount(const MyMoneyAccount& account)
setPixmap(account.accountPixmap(m_reconcileFlag));
}
-KAccountsView::KAccountsView(TQWidget *tqparent, const char *name) :
- KAccountsViewDecl(tqparent,name),
+KAccountsView::KAccountsView(TQWidget *parent, const char *name) :
+ KAccountsViewDecl(parent,name),
m_assetItem(0),
m_liabilityItem(0)
{
@@ -419,7 +419,7 @@ void KAccountsView::loadListView(void)
::timetrace("done load accounts list view");
}
-bool KAccountsView::loadSubAccounts(KMyMoneyAccountTreeItem* tqparent, const TQStringList& accountList)
+bool KAccountsView::loadSubAccounts(KMyMoneyAccountTreeItem* parent, const TQStringList& accountList)
{
MyMoneyFile* file = MyMoneyFile::instance();
@@ -452,7 +452,7 @@ bool KAccountsView::loadSubAccounts(KMyMoneyAccountTreeItem* tqparent, const TQS
delete e;
}
- KMyMoneyAccountTreeItem* item = new KMyMoneyAccountTreeItem(tqparent, acc, prices, security);
+ KMyMoneyAccountTreeItem* item = new KMyMoneyAccountTreeItem(parent, acc, prices, security);
if(acc.id() == m_reconciliationAccount.id())
item->setReconciliation(true);
diff --git a/kmymoney2/views/kaccountsview.h b/kmymoney2/views/kaccountsview.h
index 33a787c..a8498fb 100644
--- a/kmymoney2/views/kaccountsview.h
+++ b/kmymoney2/views/kaccountsview.h
@@ -49,12 +49,12 @@ public:
/**
* Constructor to be used to construct an account icon object.
*
- * @param tqparent pointer to the KIconView object this entry should be
+ * @param parent pointer to the KIconView object this entry should be
* added to.
* @param account const reference to MyMoneyAccount for which
* the KIconView entry is constructed
*/
- KMyMoneyAccountIconItem(TQIconView *tqparent, const MyMoneyAccount& account);
+ KMyMoneyAccountIconItem(TQIconView *parent, const MyMoneyAccount& account);
~KMyMoneyAccountIconItem();
/**
@@ -91,7 +91,7 @@ class KAccountsView : public KAccountsViewDecl
private:
public:
- KAccountsView(TQWidget *tqparent=0, const char *name=0);
+ KAccountsView(TQWidget *parent=0, const char *name=0);
virtual ~KAccountsView();
public slots:
@@ -137,7 +137,7 @@ protected:
void loadListView(void);
void loadIconView(void);
- bool loadSubAccounts(KMyMoneyAccountTreeItem* tqparent, const TQStringList& accountList);
+ bool loadSubAccounts(KMyMoneyAccountTreeItem* parent, const TQStringList& accountList);
/**
* This method returns a pointer to the currently selected
@@ -182,12 +182,12 @@ signals:
/**
* This signal is emitted, when the user selected to reparent the
- * account @p acc to be a subordinate account of @p tqparent.
+ * account @p acc to be a subordinate account of @p parent.
*
* @param acc const reference to account to be reparented
- * @param tqparent const reference to new tqparent account
+ * @param parent const reference to new parent account
*/
- void reparent(const MyMoneyAccount& acc, const MyMoneyAccount& tqparent);
+ void reparent(const MyMoneyAccount& acc, const MyMoneyAccount& parent);
private:
MyMoneyAccount m_reconciliationAccount;
diff --git a/kmymoney2/views/kbudgetview.cpp b/kmymoney2/views/kbudgetview.cpp
index aa4b619..9002ceb 100644
--- a/kmymoney2/views/kbudgetview.cpp
+++ b/kmymoney2/views/kbudgetview.cpp
@@ -61,8 +61,8 @@
#include "../kmymoney2.h"
// *** KBudgetListItem Implementation ***
-KBudgetListItem::KBudgetListItem(KListView *tqparent, const MyMoneyBudget& budget) :
- KListViewItem(tqparent),
+KBudgetListItem::KBudgetListItem(KListView *parent, const MyMoneyBudget& budget) :
+ KListViewItem(parent),
m_budget(budget)
{
setText(0, budget.name());
@@ -95,8 +95,8 @@ void KBudgetListItem::paintCell(TQPainter *p, const TQColorGroup & cg, int colum
const int KBudgetView::m_iBudgetYearsAhead = 5;
const int KBudgetView::m_iBudgetYearsBack = 3;
-KBudgetView::KBudgetView(TQWidget *tqparent, const char *name ) :
- KBudgetViewDecl(tqparent,name),
+KBudgetView::KBudgetView(TQWidget *parent, const char *name ) :
+ KBudgetViewDecl(parent,name),
m_needReload(false),
m_inSelection(false)
{
@@ -412,7 +412,7 @@ void KBudgetView::loadAccounts(void)
}
-bool KBudgetView::loadSubAccounts(KMyMoneyAccountTreeBudgetItem* tqparent, TQStringList& accountList, const MyMoneyBudget& budget)
+bool KBudgetView::loadSubAccounts(KMyMoneyAccountTreeBudgetItem* parent, TQStringList& accountList, const MyMoneyBudget& budget)
{
MyMoneyFile* file = MyMoneyFile::instance();
@@ -461,7 +461,7 @@ bool KBudgetView::loadSubAccounts(KMyMoneyAccountTreeBudgetItem* tqparent, TQStr
}
TQStringList subAcctList = acc.accountList();
- KMyMoneyAccountTreeBudgetItem *item = new KMyMoneyAccountTreeBudgetItem(tqparent, acc, budget, prices, security);
+ KMyMoneyAccountTreeBudgetItem *item = new KMyMoneyAccountTreeBudgetItem(parent, acc, budget, prices, security);
unused |= loadSubAccounts(item, subAcctList, budget);
// no child accounts and no value assigned to this account
diff --git a/kmymoney2/views/kbudgetview.h b/kmymoney2/views/kbudgetview.h
index 14c7611..ee89007 100644
--- a/kmymoney2/views/kbudgetview.h
+++ b/kmymoney2/views/kbudgetview.h
@@ -50,12 +50,12 @@ public:
/**
* Constructor to be used to construct a budget entry object.
*
- * @param tqparent pointer to the KListView object this entry should be
+ * @param parent pointer to the KListView object this entry should be
* added to.
* @param budget const reference to MyMoneyBudget for which
* the KListView entry is constructed
*/
- KBudgetListItem(KListView *tqparent, const MyMoneyBudget& budget);
+ KBudgetListItem(KListView *parent, const MyMoneyBudget& budget);
~KBudgetListItem();
/**
@@ -81,7 +81,7 @@ class KBudgetView : public KBudgetViewDecl
Q_OBJECT
TQ_OBJECT
public:
- KBudgetView(TQWidget *tqparent=0, const char *name=0);
+ KBudgetView(TQWidget *parent=0, const char *name=0);
~KBudgetView();
void show();
@@ -126,7 +126,7 @@ public slots:
protected:
void resizeEvent(TQResizeEvent*);
void loadAccounts(void);
- bool loadSubAccounts(KMyMoneyAccountTreeBudgetItem* tqparent, TQStringList& accountList, const MyMoneyBudget& budget);
+ bool loadSubAccounts(KMyMoneyAccountTreeBudgetItem* parent, TQStringList& accountList, const MyMoneyBudget& budget);
/**
* This method loads all available budgets into the budget list widget. If a budget is
diff --git a/kmymoney2/views/kcategoriesview.cpp b/kmymoney2/views/kcategoriesview.cpp
index ae914dd..6bfbbea 100644
--- a/kmymoney2/views/kcategoriesview.cpp
+++ b/kmymoney2/views/kcategoriesview.cpp
@@ -46,8 +46,8 @@
#include "../kmymoney2.h"
-KCategoriesView::KCategoriesView(TQWidget *tqparent, const char *name ) :
- KCategoriesViewDecl(tqparent, name),
+KCategoriesView::KCategoriesView(TQWidget *parent, const char *name ) :
+ KCategoriesViewDecl(parent, name),
m_incomeItem(0),
m_expenseItem(0),
m_needReload(false)
@@ -229,7 +229,7 @@ void KCategoriesView::loadAccounts(void)
::timetrace("done load categories view");
}
-bool KCategoriesView::loadSubAccounts(KMyMoneyAccountTreeItem* tqparent, const TQStringList& accountList)
+bool KCategoriesView::loadSubAccounts(KMyMoneyAccountTreeItem* parent, const TQStringList& accountList)
{
MyMoneyFile* file = MyMoneyFile::instance();
@@ -260,7 +260,7 @@ bool KCategoriesView::loadSubAccounts(KMyMoneyAccountTreeItem* tqparent, const T
delete e;
}
- KMyMoneyAccountTreeItem* item = new KMyMoneyAccountTreeItem(tqparent, acc, prices, security);
+ KMyMoneyAccountTreeItem* item = new KMyMoneyAccountTreeItem(parent, acc, prices, security);
unused |= loadSubAccounts(item, acc.accountList());
// no child accounts and not transactions in this account means 'unused'
diff --git a/kmymoney2/views/kcategoriesview.h b/kmymoney2/views/kcategoriesview.h
index d37e74d..77fb5d7 100644
--- a/kmymoney2/views/kcategoriesview.h
+++ b/kmymoney2/views/kcategoriesview.h
@@ -65,7 +65,7 @@ class KCategoriesView : public KCategoriesViewDecl
Q_OBJECT
TQ_OBJECT
public:
- KCategoriesView(TQWidget *tqparent=0, const char *name=0);
+ KCategoriesView(TQWidget *parent=0, const char *name=0);
virtual ~KCategoriesView();
@@ -87,7 +87,7 @@ public slots:
protected:
void loadAccounts(void);
- bool loadSubAccounts(KMyMoneyAccountTreeItem* tqparent, const TQStringList& accountList);
+ bool loadSubAccounts(KMyMoneyAccountTreeItem* parent, const TQStringList& accountList);
protected slots:
void slotUpdateProfit(void);
@@ -122,12 +122,12 @@ signals:
/**
* This signal is emitted, when the user selected to reparent the
- * account @p acc to be a subordinate account of @p tqparent.
+ * account @p acc to be a subordinate account of @p parent.
*
* @param acc const reference to account to be reparented
- * @param tqparent const reference to new tqparent account
+ * @param parent const reference to new parent account
*/
- void reparent(const MyMoneyAccount& acc, const MyMoneyAccount& tqparent);
+ void reparent(const MyMoneyAccount& acc, const MyMoneyAccount& parent);
private:
TQMap<TQString, MyMoneySecurity> m_securityMap;
diff --git a/kmymoney2/views/kforecastview.cpp b/kmymoney2/views/kforecastview.cpp
index 790c51b..d636ec4 100644
--- a/kmymoney2/views/kforecastview.cpp
+++ b/kmymoney2/views/kforecastview.cpp
@@ -46,8 +46,8 @@
#include "../reports/pivottable.h"
#include "../reports/pivotgrid.h"
-KForecastView::KForecastView(TQWidget *tqparent, const char *name) :
- KForecastViewDecl(tqparent,name)
+KForecastView::KForecastView(TQWidget *parent, const char *name) :
+ KForecastViewDecl(parent,name)
{
for(int i=0; i < MaxViewTabs; ++i)
m_needReload[i] = false;
@@ -605,7 +605,7 @@ void KForecastView::loadAccounts(MyMoneyForecast& forecast, const MyMoneyAccount
TQStringList::ConstIterator accList_t;
for(accList_t = accList.begin(); accList_t != accList.end(); ++accList_t ) {
MyMoneyAccount subAccount = file->account(*accList_t);
- //only add the account if it is a forecast account or the tqparent of a forecast account
+ //only add the account if it is a forecast account or the parent of a forecast account
if(includeAccount(forecast, subAccount)) {
nameIdx[subAccount.id()] = subAccount.id();
}
diff --git a/kmymoney2/views/kforecastview.h b/kmymoney2/views/kforecastview.h
index 634135e..5bb9a51 100644
--- a/kmymoney2/views/kforecastview.h
+++ b/kmymoney2/views/kforecastview.h
@@ -50,7 +50,7 @@ class KForecastView : public KForecastViewDecl
private:
public:
- KForecastView(TQWidget *tqparent=0, const char *name=0);
+ KForecastView(TQWidget *parent=0, const char *name=0);
virtual ~KForecastView();
void show(void);
diff --git a/kmymoney2/views/kgloballedgerview.cpp b/kmymoney2/views/kgloballedgerview.cpp
index b22e219..87f8890 100644
--- a/kmymoney2/views/kgloballedgerview.cpp
+++ b/kmymoney2/views/kgloballedgerview.cpp
@@ -77,8 +77,8 @@ public:
TQTimer m_viewPosTimer;
};
-MousePressFilter::MousePressFilter(TQWidget* tqparent, const char* name) :
- TQObject(tqparent, name),
+MousePressFilter::MousePressFilter(TQWidget* parent, const char* name) :
+ TQObject(parent, name),
m_lastMousePressEvent(0),
m_filterActive(true)
{
@@ -94,10 +94,10 @@ void MousePressFilter::setFilterActive(bool state)
m_filterActive = state;
}
-bool MousePressFilter::isChildOf( TQWidget* child, TQWidget *tqparent )
+bool MousePressFilter::isChildOf( TQWidget* child, TQWidget *parent )
{
while(child) {
- if(child == tqparent)
+ if(child == parent)
return true;
// If one of the ancestors is a KPassivePopup then it's as
// if it is a child of our own
@@ -145,8 +145,8 @@ KGlobalLedgerView::Private::Private() :
TQDate KGlobalLedgerView::m_lastPostDate;
-KGlobalLedgerView::KGlobalLedgerView(TQWidget *tqparent, const char *name )
- : KMyMoneyViewBase(tqparent, name, i18n("Ledgers")),
+KGlobalLedgerView::KGlobalLedgerView(TQWidget *parent, const char *name )
+ : KMyMoneyViewBase(parent, name, i18n("Ledgers")),
d(new Private),
m_needReload(false),
m_newAccountLoaded(true),
@@ -944,7 +944,7 @@ bool KGlobalLedgerView::slotSelectAccount(const TQString& id, const TQString& tr
try {
m_account = MyMoneyFile::instance()->account(id);
// if a stock account is selected, we show the
- // the corresponding tqparent (investment) account
+ // the corresponding parent (investment) account
if(m_account.isInvest()) {
m_account = MyMoneyFile::instance()->account(m_account.parentAccountId());
}
@@ -1089,14 +1089,14 @@ TransactionEditor* KGlobalLedgerView::startEdit(const KMyMoneyRegister::Selected
}
// decide, if we edit in the register or in the form
- TransactionEditorContainer* tqparent;
+ TransactionEditorContainer* parent;
if(m_formFrame->isVisible())
- tqparent = m_form;
+ parent = m_form;
else {
- tqparent = m_register;
+ parent = m_register;
}
- editor = item->createEditor(tqparent, list, m_lastPostDate);
+ editor = item->createEditor(parent, list, m_lastPostDate);
// check that we use the same transaction commodity in all selected transactions
// if not, we need to update this in the editor's list. The user can also bail out
@@ -1111,7 +1111,7 @@ TransactionEditor* KGlobalLedgerView::startEdit(const KMyMoneyRegister::Selected
}
if(editor) {
- if(tqparent == m_register) {
+ if(parent == m_register) {
// make sure, the height of the table is correct
m_register->updateRegister(KMyMoneyGlobalSettings::ledgerLens() | !KMyMoneyGlobalSettings::transactionForm());
}
@@ -1131,7 +1131,7 @@ TransactionEditor* KGlobalLedgerView::startEdit(const KMyMoneyRegister::Selected
connect(editor, TQT_SIGNAL(assignNumber(void)), kmymoney2, TQT_SLOT(slotTransactionAssignNumber()));
connect(editor, TQT_SIGNAL(lastPostDateUsed(const TQDate&)), this, TQT_SLOT(slotKeepPostDate(const TQDate&)));
- // create the widgets, place them in the tqparent and load them with data
+ // create the widgets, place them in the parent and load them with data
// setup tab order
m_tabOrderWidgets.clear();
editor->setup(m_tabOrderWidgets, m_account, d->m_action);
@@ -1209,7 +1209,7 @@ bool KGlobalLedgerView::focusNextPrevChild(bool next)
w = tqApp->tqfocusWidget();
while(w && m_tabOrderWidgets.find(w) == -1) {
- // qDebug("'%s' not in list, use tqparent", w->className());
+ // qDebug("'%s' not in list, use parent", w->className());
w = w->parentWidget();
}
// if(w) qDebug("tab order is at '%s'", w->className());
diff --git a/kmymoney2/views/kgloballedgerview.h b/kmymoney2/views/kgloballedgerview.h
index 0d782ab..a91b557 100644
--- a/kmymoney2/views/kgloballedgerview.h
+++ b/kmymoney2/views/kgloballedgerview.h
@@ -68,10 +68,10 @@ class MousePressFilter : public TQObject
Q_OBJECT
TQ_OBJECT
public:
- MousePressFilter(TQWidget* tqparent = 0, const char* name = 0);
+ MousePressFilter(TQWidget* parent = 0, const char* name = 0);
/**
- * Add widget @p w to the list of possible tqparent objects. See eventFilter() how
+ * Add widget @p w to the list of possible parent objects. See eventFilter() how
* they will be used.
*/
void addWidget(TQWidget* w);
@@ -96,14 +96,14 @@ public slots:
protected:
/**
* This method checks if the widget @p child is a child of
- * the widget @p tqparent and returns either @a true or @a false.
+ * the widget @p parent and returns either @a true or @a false.
*
* @param child pointer to child widget
- * @param tqparent pointer to tqparent widget
- * @retval true @p child points to widget which has @p tqparent as tqparent or grand-tqparent
- * @retval false @p child points to a widget which is not related to @p tqparent
+ * @param parent pointer to parent widget
+ * @retval true @p child points to widget which has @p parent as parent or grand-parent
+ * @retval false @p child points to a widget which is not related to @p parent
*/
- bool isChildOf(TQWidget* child, TQWidget* tqparent);
+ bool isChildOf(TQWidget* child, TQWidget* parent);
/**
* Reimplemented from base class. Sends out the mousePressedOnExternalWidget() signal
@@ -133,7 +133,7 @@ class KGlobalLedgerView : public KMyMoneyViewBase
Q_OBJECT
TQ_OBJECT
public:
- KGlobalLedgerView(TQWidget *tqparent=0, const char *name=0);
+ KGlobalLedgerView(TQWidget *parent=0, const char *name=0);
~KGlobalLedgerView();
/**
diff --git a/kmymoney2/views/khomeview.cpp b/kmymoney2/views/khomeview.cpp
index eadf2ed..37523bc 100644
--- a/kmymoney2/views/khomeview.cpp
+++ b/kmymoney2/views/khomeview.cpp
@@ -108,8 +108,8 @@ void KHomeView::Private::addNameIndex(TQMap<TQString, MyMoneyAccount> &idx, cons
}
}
-KHomeView::KHomeView(TQWidget *tqparent, const char *name ) :
- KMyMoneyViewBase(tqparent, name, i18n("Home")),
+KHomeView::KHomeView(TQWidget *parent, const char *name ) :
+ KMyMoneyViewBase(parent, name, i18n("Home")),
d(new Private),
m_showAllSchedules(false),
m_needReload(true)
diff --git a/kmymoney2/views/khomeview.h b/kmymoney2/views/khomeview.h
index a99ffa9..23528bb 100644
--- a/kmymoney2/views/khomeview.h
+++ b/kmymoney2/views/khomeview.h
@@ -61,7 +61,7 @@ public:
Payment = 2 ///< show payment accounts
};
- KHomeView(TQWidget *tqparent=0, const char *name=0);
+ KHomeView(TQWidget *parent=0, const char *name=0);
~KHomeView();
protected:
diff --git a/kmymoney2/views/kinstitutionsview.cpp b/kmymoney2/views/kinstitutionsview.cpp
index d5a673c..0b9258f 100644
--- a/kmymoney2/views/kinstitutionsview.cpp
+++ b/kmymoney2/views/kinstitutionsview.cpp
@@ -36,8 +36,8 @@
#include "../kmymoneyglobalsettings.h"
#include "../kmymoney2.h"
-KInstitutionsView::KInstitutionsView(TQWidget *tqparent, const char *name) :
- KInstitutionsViewDecl(tqparent,name),
+KInstitutionsView::KInstitutionsView(TQWidget *parent, const char *name) :
+ KInstitutionsViewDecl(parent,name),
m_needReload(false)
{
m_accountTree->header()->setLabel(0, i18n("Institution/Account"));
@@ -129,7 +129,7 @@ void KInstitutionsView::loadAccounts(void)
}
// we need to make sure we show stock accounts
- // under the right institution (the one of the tqparent account)
+ // under the right institution (the one of the parent account)
TQMap<TQString, MyMoneyAccount>::iterator it_am;
for(it_am = m_accountMap.begin(); it_am != m_accountMap.end(); ++it_am) {
if((*it_am).isInvest()) {
@@ -199,10 +199,10 @@ void KInstitutionsView::loadAccounts(void)
::timetrace("done load institutions view");
}
-void KInstitutionsView::loadSubAccounts(KMyMoneyAccountTreeItem* tqparent)
+void KInstitutionsView::loadSubAccounts(KMyMoneyAccountTreeItem* parent)
{
bool showClosedAccounts = kmymoney2->toggleAction("view_show_all_accounts")->isChecked();
- const MyMoneyAccount& account = dynamic_cast<const MyMoneyAccount&>(tqparent->itemObject());
+ const MyMoneyAccount& account = dynamic_cast<const MyMoneyAccount&>(parent->itemObject());
TQValueList<TQString>::const_iterator it_a;
MyMoneyFile* file = MyMoneyFile::instance();
for(it_a = account.accountList().begin(); it_a != account.accountList().end(); ++it_a) {
@@ -218,13 +218,13 @@ void KInstitutionsView::loadSubAccounts(KMyMoneyAccountTreeItem* tqparent)
MyMoneySecurity sec = m_securityMap[security.tradingCurrency()];
prices += file->price(sec.id(), file->baseCurrency().id());
}
- KMyMoneyAccountTreeItem* item = new KMyMoneyAccountTreeItem(tqparent, acc, prices, security);
+ KMyMoneyAccountTreeItem* item = new KMyMoneyAccountTreeItem(parent, acc, prices, security);
if(acc.id() == m_reconciliationAccount.id())
item->setReconciliation(true);
}
}
-void KInstitutionsView::loadSubAccounts(KMyMoneyAccountTreeItem* tqparent, const TQString& institutionId)
+void KInstitutionsView::loadSubAccounts(KMyMoneyAccountTreeItem* parent, const TQString& institutionId)
{
MyMoneyFile* file = MyMoneyFile::instance();
@@ -257,7 +257,7 @@ void KInstitutionsView::loadSubAccounts(KMyMoneyAccountTreeItem* tqparent, const
delete e;
}
- KMyMoneyAccountTreeItem* item = new KMyMoneyAccountTreeItem(tqparent, acc, prices, security);
+ KMyMoneyAccountTreeItem* item = new KMyMoneyAccountTreeItem(parent, acc, prices, security);
if(acc.id() == m_reconciliationAccount.id())
item->setReconciliation(true);
@@ -276,8 +276,8 @@ void KInstitutionsView::loadSubAccounts(KMyMoneyAccountTreeItem* tqparent, const
// it does not take the negative sign for liability accounts
// into account. So we correct this here with the value we
// have calculated while filling the list
- tqparent->adjustTotalValue(-tqparent->totalValue()); // load a 0
- tqparent->adjustTotalValue(value); // now store the new value
+ parent->adjustTotalValue(-parent->totalValue()); // load a 0
+ parent->adjustTotalValue(value); // now store the new value
// we need to call slotUpdateNetWorth() here manually, because
// KMyMoneyAccountTreeItem::adjustTotalValue() does not send out
diff --git a/kmymoney2/views/kinstitutionsview.h b/kmymoney2/views/kinstitutionsview.h
index 9c1ab96..6293f35 100644
--- a/kmymoney2/views/kinstitutionsview.h
+++ b/kmymoney2/views/kinstitutionsview.h
@@ -46,7 +46,7 @@ class KInstitutionsView : public KInstitutionsViewDecl
private:
public:
- KInstitutionsView(TQWidget *tqparent=0, const char *name=0);
+ KInstitutionsView(TQWidget *parent=0, const char *name=0);
virtual ~KInstitutionsView();
public slots:
@@ -71,10 +71,10 @@ protected:
void loadAccounts(void);
// load accounts that are kept at a specific institution
- void loadSubAccounts(KMyMoneyAccountTreeItem* tqparent, const TQString& institutionId);
+ void loadSubAccounts(KMyMoneyAccountTreeItem* parent, const TQString& institutionId);
- // load stock accounts under the investment account (tqparent)
- void loadSubAccounts(KMyMoneyAccountTreeItem* tqparent);
+ // load stock accounts under the investment account (parent)
+ void loadSubAccounts(KMyMoneyAccountTreeItem* parent);
protected slots:
void slotUpdateNetWorth(void);
diff --git a/kmymoney2/views/kinvestmentlistitem.cpp b/kmymoney2/views/kinvestmentlistitem.cpp
index 1429cd0..b7617d8 100644
--- a/kmymoney2/views/kinvestmentlistitem.cpp
+++ b/kmymoney2/views/kinvestmentlistitem.cpp
@@ -40,8 +40,8 @@
#include <kmymoney/mymoneysecurity.h>
#include <kmymoney/mymoneyfile.h>
-KInvestmentListItem::KInvestmentListItem(KListView* tqparent, const MyMoneyAccount& account)
- : KListViewItem(tqparent)
+KInvestmentListItem::KInvestmentListItem(KListView* parent, const MyMoneyAccount& account)
+ : KListViewItem(parent)
{
bColumn5Negative = false;
bColumn6Negative = false;
@@ -50,7 +50,7 @@ KInvestmentListItem::KInvestmentListItem(KListView* tqparent, const MyMoneyAccou
bColumn9Negative = false;
m_account = account;
- m_listView = tqparent;
+ m_listView = parent;
MyMoneySecurity security;
MyMoneyFile* file = MyMoneyFile::instance();
diff --git a/kmymoney2/views/kinvestmentlistitem.h b/kmymoney2/views/kinvestmentlistitem.h
index cb0d944..2cd69fb 100644
--- a/kmymoney2/views/kinvestmentlistitem.h
+++ b/kmymoney2/views/kinvestmentlistitem.h
@@ -59,7 +59,7 @@
class KInvestmentListItem : public KListViewItem
{
public:
- KInvestmentListItem(KListView* tqparent, const MyMoneyAccount& security);
+ KInvestmentListItem(KListView* parent, const MyMoneyAccount& security);
~KInvestmentListItem();
TQString securityId() const { return m_account.currencyId(); };
diff --git a/kmymoney2/views/kinvestmentview.cpp b/kmymoney2/views/kinvestmentview.cpp
index 7fe7500..ba1876f 100644
--- a/kmymoney2/views/kinvestmentview.cpp
+++ b/kmymoney2/views/kinvestmentview.cpp
@@ -62,8 +62,8 @@ public:
-KInvestmentView::KInvestmentView(TQWidget *tqparent, const char *name) :
- KInvestmentViewDecl(tqparent,name),
+KInvestmentView::KInvestmentView(TQWidget *parent, const char *name) :
+ KInvestmentViewDecl(parent,name),
d(new Private)
{
m_table->setRootIsDecorated(false);
@@ -215,7 +215,7 @@ bool KInvestmentView::slotSelectAccount(const TQString& id, const TQString& tran
try {
d->m_account = MyMoneyFile::instance()->account(id);
// if a stock account is selected, we show the
- // the corresponding tqparent (investment) account
+ // the corresponding parent (investment) account
if(d->m_account.isInvest()) {
d->m_account = MyMoneyFile::instance()->account(d->m_account.parentAccountId());
}
diff --git a/kmymoney2/views/kinvestmentview.h b/kmymoney2/views/kinvestmentview.h
index 98e2b9a..ffe9131 100644
--- a/kmymoney2/views/kinvestmentview.h
+++ b/kmymoney2/views/kinvestmentview.h
@@ -50,7 +50,7 @@ class KInvestmentView : public KInvestmentViewDecl
TQ_OBJECT
public:
- KInvestmentView(TQWidget *tqparent=0, const char *name=0);
+ KInvestmentView(TQWidget *parent=0, const char *name=0);
~KInvestmentView();
/**
diff --git a/kmymoney2/views/kmymoneyview.cpp b/kmymoney2/views/kmymoneyview.cpp
index 2c3a10d..ccdc5a7 100644
--- a/kmymoney2/views/kmymoneyview.cpp
+++ b/kmymoney2/views/kmymoneyview.cpp
@@ -120,15 +120,15 @@
#define RECOVER_KEY_ID "0xD2B08440"
-KMyMoneyView::KMyMoneyView(TQWidget *tqparent, const char *name)
- : KJanusWidget(tqparent, name, KJanusWidget::IconList),
+KMyMoneyView::KMyMoneyView(TQWidget *parent, const char *name)
+ : KJanusWidget(parent, name, KJanusWidget::IconList),
// m_bankRightClick(false),
m_inConstructor(true),
m_fileOpen(false),
m_fmode(0600)
{
// the global variable kmymoney2 is not yet assigned. So we construct it here
- TQObject* kmymoney2 = tqparent->tqparent();
+ TQObject* kmymoney2 = parent->parent();
const int iconSize = (KMyMoneyGlobalSettings::iconSize()+1)*16;
newStorage();
@@ -276,9 +276,9 @@ KMyMoneyView::~KMyMoneyView()
removeStorage();
}
-void KMyMoneyView::addTitleBar(TQWidget* tqparent, const TQString& title)
+void KMyMoneyView::addTitleBar(TQWidget* parent, const TQString& title)
{
- KMyMoneyTitleLabel* label = new KMyMoneyTitleLabel( tqparent, "titleLabel" );
+ KMyMoneyTitleLabel* label = new KMyMoneyTitleLabel( parent, "titleLabel" );
label->setMinimumSize( TQSize( 100, 30 ) );
label->setRightImageFile("pics/titlelabel_background.png" );
label->setText(title);
@@ -459,7 +459,7 @@ void KMyMoneyView::slotLedgerSelected(const TQString& _accId, const TQString& tr
switch(acc.accountType()) {
case MyMoneyAccount::Stock:
// if a stock account is selected, we show the
- // the corresponding tqparent (investment) account
+ // the corresponding parent (investment) account
acc = MyMoneyFile::instance()->account(acc.parentAccountId());
accId = acc.id();
// tricky fall through here
@@ -1007,7 +1007,7 @@ void KMyMoneyView::saveToLocalFile(TQFile* qfile, IMyMoneyStorageFormat* pWriter
}
}
- int tqmask = umask((~m_fmode) & 0777);
+ int mask = umask((~m_fmode) & 0777);
bool blocked = MyMoneyFile::instance()->signalsBlocked();
MyMoneyFile::instance()->blockSignals(true);
MyMoneyFileTransaction ft;
@@ -1050,7 +1050,7 @@ void KMyMoneyView::saveToLocalFile(TQFile* qfile, IMyMoneyStorageFormat* pWriter
statusDevice = base->device();
}
}
- umask(tqmask);
+ umask(mask);
ft.commit();
pWriter->setProgressCallback(&KMyMoneyView::progressCallback);
@@ -1135,9 +1135,9 @@ bool KMyMoneyView::saveFile(const KURL& url, const TQString& keyList)
// create a new basic block here, so that the object qfile gets
// deleted, before we reach the chown() call
{
- int tqmask = umask((~fmode) & 0777);
+ int mask = umask((~fmode) & 0777);
KSaveFile qfile(filename, fmode);
- umask(tqmask);
+ umask(mask);
if(qfile.status() == 0) {
try {
saveToLocalFile(qfile.file(), pWriter, plaintext, keyList);
@@ -1784,14 +1784,14 @@ void KMyMoneyView::fixFile_0(void)
}
// until early before 0.8 release, the equity account was not saved to
// the file. If we have an equity account with no sub-accounts but
- // find and equity account that has equity() as it's tqparent, we reparent
+ // find and equity account that has equity() as it's parent, we reparent
// this account. Need to move it to asset() first, because otherwise
// MyMoneyFile::reparent would act as NOP.
if(equityListEmpty && (*it_a).accountType() == MyMoneyAccount::Equity) {
if((*it_a).parentAccountId() == equity.id()) {
MyMoneyAccount acc = *it_a;
- // tricky, force tqparent account to be empty so that we really
- // can re-tqparent it
+ // tricky, force parent account to be empty so that we really
+ // can re-parent it
acc.setParentAccountId(TQString());
file->reparentAccount(acc, equity);
kdDebug(2) << __func__ << " fixed account " << acc.id() << " reparented to " << equity.id() << endl;
@@ -2207,8 +2207,8 @@ class KMyMoneyViewBase::Private {
TQVBoxLayout* m_viewLayout;
};
-KMyMoneyViewBase::KMyMoneyViewBase(TQWidget* tqparent, const char* name, const TQString& title) :
- TQWidget(tqparent, name),
+KMyMoneyViewBase::KMyMoneyViewBase(TQWidget* parent, const char* name, const TQString& title) :
+ TQWidget(parent, name),
d(new Private)
{
d->m_viewLayout = new TQVBoxLayout(this);
diff --git a/kmymoney2/views/kmymoneyview.h b/kmymoney2/views/kmymoneyview.h
index 613c7a5..2c1cd38 100644
--- a/kmymoney2/views/kmymoneyview.h
+++ b/kmymoney2/views/kmymoneyview.h
@@ -162,7 +162,7 @@ private:
fileTypeE m_fileType;
private:
- void addTitleBar(TQWidget* tqparent, const TQString& title);
+ void addTitleBar(TQWidget* parent, const TQString& title);
void ungetString(TQIODevice *qfile, char * buf, int len);
@@ -230,7 +230,7 @@ public:
* The constructor for KMyMoneyView. Just creates all the tabs for the
* different aspects of the MyMoneyFile.
*/
- KMyMoneyView(TQWidget *tqparent=0, const char *name=0);
+ KMyMoneyView(TQWidget *parent=0, const char *name=0);
/**
* Destructor
@@ -601,7 +601,7 @@ class KMyMoneyViewBase : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- KMyMoneyViewBase(TQWidget* tqparent, const char *name, const TQString& title);
+ KMyMoneyViewBase(TQWidget* parent, const char *name, const TQString& title);
virtual ~KMyMoneyViewBase();
void setTitle(const TQString& title);
diff --git a/kmymoney2/views/kpayeesview.cpp b/kmymoney2/views/kpayeesview.cpp
index f15f06a..6fa22ee 100644
--- a/kmymoney2/views/kpayeesview.cpp
+++ b/kmymoney2/views/kpayeesview.cpp
@@ -260,8 +260,8 @@ void KTransactionPtrVector::setPayeeId(const TQString& id)
// *** KPayeeListItem Implementation ***
-KPayeeListItem::KPayeeListItem(KListView *tqparent, const MyMoneyPayee& payee) :
- KListViewItem(tqparent),
+KPayeeListItem::KPayeeListItem(KListView *parent, const MyMoneyPayee& payee) :
+ KListViewItem(parent),
m_payee(payee)
{
setText(0, payee.name());
@@ -287,8 +287,8 @@ void KPayeeListItem::paintCell(TQPainter *p, const TQColorGroup & cg, int column
TQListViewItem::paintCell(p, cg2, column, width, align);
}
-KTransactionListItem::KTransactionListItem(KListView* view, KTransactionListItem* tqparent, const TQString& accountId, const TQString& transactionId) :
- KListViewItem(view, tqparent)
+KTransactionListItem::KTransactionListItem(KListView* view, KTransactionListItem* parent, const TQString& accountId, const TQString& transactionId) :
+ KListViewItem(view, parent)
{
m_accountId = accountId;
m_transactionId = transactionId;
@@ -315,8 +315,8 @@ const TQColor KTransactionListItem::backgroundColor(void)
// *** KPayeesView Implementation ***
-KPayeesView::KPayeesView(TQWidget *tqparent, const char *name ) :
- KPayeesViewDecl(tqparent,name),
+KPayeesView::KPayeesView(TQWidget *parent, const char *name ) :
+ KPayeesViewDecl(parent,name),
m_needReload(false),
m_needConnection(true),
m_updatesQueued(0),
diff --git a/kmymoney2/views/kpayeesview.h b/kmymoney2/views/kpayeesview.h
index f4a481e..95be179 100644
--- a/kmymoney2/views/kpayeesview.h
+++ b/kmymoney2/views/kpayeesview.h
@@ -147,12 +147,12 @@ public:
/**
* Constructor to be used to construct a payee entry object.
*
- * @param tqparent pointer to the KListView object this entry should be
+ * @param parent pointer to the KListView object this entry should be
* added to.
* @param payee const reference to MyMoneyPayee for which
* the KListView entry is constructed
*/
- KPayeeListItem(KListView *tqparent, const MyMoneyPayee& payee);
+ KPayeeListItem(KListView *parent, const MyMoneyPayee& payee);
~KPayeeListItem();
/**
@@ -175,7 +175,7 @@ private:
class KTransactionListItem : public KListViewItem
{
public:
- KTransactionListItem(KListView* view, KTransactionListItem* tqparent, const TQString& accountId, const TQString& transaction);
+ KTransactionListItem(KListView* view, KTransactionListItem* parent, const TQString& accountId, const TQString& transaction);
~KTransactionListItem();
const TQString& transactionId(void) const { return m_transactionId; };
@@ -203,7 +203,7 @@ class KPayeesView : public KPayeesViewDecl
TQ_OBJECT
public:
- KPayeesView(TQWidget *tqparent=0, const char *name=0);
+ KPayeesView(TQWidget *parent=0, const char *name=0);
~KPayeesView();
void show(void);
diff --git a/kmymoney2/views/kreportsview.cpp b/kmymoney2/views/kreportsview.cpp
index fc8e017..9b7b834 100755
--- a/kmymoney2/views/kreportsview.cpp
+++ b/kmymoney2/views/kreportsview.cpp
@@ -86,8 +86,8 @@ using namespace reports;
* KReportsView::KReportTab Implementation
*/
-KReportsView::KReportTab::KReportTab(KTabWidget* tqparent, const MyMoneyReport& report ):
- TQWidget( tqparent, "reporttab" ),
+KReportsView::KReportTab::KReportTab(KTabWidget* parent, const MyMoneyReport& report ):
+ TQWidget( parent, "reporttab" ),
m_part( new KHTMLPart( this, "reporttabpart" ) ),
m_chartView( new KReportChartView( this, "reportchart" ) ),
m_control( new kMyMoneyReportControlDecl( this, "reportcontrol" ) ),
@@ -117,8 +117,8 @@ KReportsView::KReportTab::KReportTab(KTabWidget* tqparent, const MyMoneyReport&
if ( icon == TQString() )
icon = KGlobal::dirs()->findResource("icon", "hicolor/16x16/apps/kmymoney2.png");
- tqparent->insertTab( this, TQIconSet(TQPixmap(icon)), report.name() );
- tqparent->setTabEnabled( this, true );
+ parent->insertTab( this, TQIconSet(TQPixmap(icon)), report.name() );
+ parent->setTabEnabled( this, true );
#ifdef HAVE_KDCHART
if ( m_report.isChartByDefault() )
@@ -311,8 +311,8 @@ public:
TQCheckBox* includeCSS;
};
-KReportsView::KReportsView(TQWidget *tqparent, const char *name ) :
- KMyMoneyViewBase(tqparent, name, i18n("Reports")),
+KReportsView::KReportsView(TQWidget *parent, const char *name ) :
+ KMyMoneyViewBase(parent, name, i18n("Reports")),
d(new Private),
m_needReload(false)
{
@@ -384,8 +384,8 @@ TQString KReportsView::KReportGroupListItem::key ( int column, bool ascending )
return KListViewItem::key(column,ascending);
}
-KReportsView::KReportGroupListItem::KReportGroupListItem(KListView* tqparent, const int nr, TQString name) :
- KListViewItem(tqparent),
+KReportsView::KReportGroupListItem::KReportGroupListItem(KListView* parent, const int nr, TQString name) :
+ KListViewItem(parent),
m_name(name)
{
setNr(nr);
diff --git a/kmymoney2/views/kreportsview.h b/kmymoney2/views/kreportsview.h
index 218155a..493b312 100755
--- a/kmymoney2/views/kreportsview.h
+++ b/kmymoney2/views/kreportsview.h
@@ -102,7 +102,7 @@ public:
reports::ReportTable* m_table;
public:
- KReportTab(KTabWidget* tqparent, const MyMoneyReport& report );
+ KReportTab(KTabWidget* parent, const MyMoneyReport& report );
~KReportTab();
const MyMoneyReport& report(void) const { return m_report; }
void print(void);
@@ -134,13 +134,13 @@ public:
MyMoneyReport m_report;
public:
- KReportListItem( KListView* tqparent, const MyMoneyReport& report ):
- KListViewItem( tqparent, report.name(), report.comment() ),
+ KReportListItem( KListView* parent, const MyMoneyReport& report ):
+ KListViewItem( parent, report.name(), report.comment() ),
m_id( report.id() ),
m_report( report )
{}
- KReportListItem( KListViewItem* tqparent, const MyMoneyReport& report ):
- KListViewItem( tqparent, report.name(), report.comment() ),
+ KReportListItem( KListViewItem* parent, const MyMoneyReport& report ):
+ KListViewItem( parent, report.name(), report.comment() ),
m_id( report.id() ),
m_report( report )
{}
@@ -155,7 +155,7 @@ public:
TQString m_name;
public:
- KReportGroupListItem( KListView* tqparent,const int nr,const TQString name);
+ KReportGroupListItem( KListView* parent,const int nr,const TQString name);
virtual TQString key ( int column, bool ascending ) const;
void setNr(const int nr);
};
@@ -195,14 +195,14 @@ public:
/**
* Standard constructor.
*
- * @param tqparent The TQWidget this is used in.
+ * @param parent The TQWidget this is used in.
* @param name The QT name.
*
* @return An object of type KReportsView
*
* @see ~KReportsView
*/
- KReportsView(TQWidget *tqparent=0, const char *name=0);
+ KReportsView(TQWidget *parent=0, const char *name=0);
/**
* Standard destructor.
diff --git a/kmymoney2/views/kscheduledlistitem.cpp b/kmymoney2/views/kscheduledlistitem.cpp
index d48b881..9983c7d 100644
--- a/kmymoney2/views/kscheduledlistitem.cpp
+++ b/kmymoney2/views/kscheduledlistitem.cpp
@@ -42,8 +42,8 @@
#include "../kmymoneyglobalsettings.h"
#include "../kmymoneyutils.h"
-KScheduledListItem::KScheduledListItem(KListView *tqparent, const TQString& name, const TQPixmap& pixmap, const TQString& sortKey) :
- KListViewItem(tqparent, name),
+KScheduledListItem::KScheduledListItem(KListView *parent, const TQString& name, const TQPixmap& pixmap, const TQString& sortKey) :
+ KListViewItem(parent, name),
m_sortKey(sortKey)
{
setPixmap(0, pixmap);
@@ -51,8 +51,8 @@ KScheduledListItem::KScheduledListItem(KListView *tqparent, const TQString& name
m_sortKey = name;
}
-KScheduledListItem::KScheduledListItem(KScheduledListItem *tqparent, const MyMoneySchedule& schedule/*, bool even*/)
- : KListViewItem(tqparent)
+KScheduledListItem::KScheduledListItem(KScheduledListItem *parent, const MyMoneySchedule& schedule/*, bool even*/)
+ : KListViewItem(parent)
{
m_schedule = schedule;
m_sortKey = schedule.name();
@@ -172,7 +172,7 @@ void KScheduledListItem::paintCell(TQPainter* p, const TQColorGroup& cg, int col
cg2.setColor(TQColorGroup::Text, textColour);
// display group items in bold
- if (!tqparent())
+ if (!parent())
cellFont.setBold(true);
p->setFont(cellFont);
diff --git a/kmymoney2/views/kscheduledlistitem.h b/kmymoney2/views/kscheduledlistitem.h
index 62df861..44d2af8 100644
--- a/kmymoney2/views/kscheduledlistitem.h
+++ b/kmymoney2/views/kscheduledlistitem.h
@@ -56,14 +56,14 @@ public:
*
* Other types may be added in the future.
*
- * @param tqparent The list view to be a child of.
+ * @param parent The list view to be a child of.
* @param description The (translated) description.
* @param pixmap A pixmap for the entry
* @param sortKey a sortkey, if empty, @c description will be used.
*
* @see MyMoneySchedule
*/
- KScheduledListItem(KListView *tqparent, const TQString& description, const TQPixmap& pixmap = TQPixmap(), const TQString& sortKey = TQString());
+ KScheduledListItem(KListView *parent, const TQString& description, const TQPixmap& pixmap = TQPixmap(), const TQString& sortKey = TQString());
/**
* This constructor is used to create a child of one of the tqchildren
@@ -71,12 +71,12 @@ public:
*
* This child describes a schedule and represents the data in schedule.
*
- * @param tqparent The list view item to be a child of.
+ * @param parent The list view item to be a child of.
* @param schedule The schedule to be represented.
*
* @see MyMoneySchedule
*/
- KScheduledListItem(KScheduledListItem *tqparent, const MyMoneySchedule& schedule/*, bool even*/);
+ KScheduledListItem(KScheduledListItem *parent, const MyMoneySchedule& schedule/*, bool even*/);
/**
* Standard destructor.
diff --git a/kmymoney2/views/kscheduledview.cpp b/kmymoney2/views/kscheduledview.cpp
index b5ee054..74ea25b 100644
--- a/kmymoney2/views/kscheduledview.cpp
+++ b/kmymoney2/views/kscheduledview.cpp
@@ -55,8 +55,8 @@
#include "../kmymoney2.h"
-KScheduledView::KScheduledView(TQWidget *tqparent, const char *name ) :
- KScheduledViewDecl(tqparent,name, false),
+KScheduledView::KScheduledView(TQWidget *parent, const char *name ) :
+ KScheduledViewDecl(parent,name, false),
m_openBills(true),
m_openDeposits(true),
m_openTransfers(true),
@@ -196,7 +196,7 @@ void KScheduledView::refresh(bool full, const TQString& schedId)
if (!bContinue)
continue;
- KScheduledListItem* tqparent = 0;
+ KScheduledListItem* parent = 0;
switch (schedData.type())
{
case MyMoneySchedule::TYPE_ANY:
@@ -204,25 +204,25 @@ void KScheduledView::refresh(bool full, const TQString& schedId)
// We just sort it as bill and fall through here
case MyMoneySchedule::TYPE_BILL:
- tqparent = itemBills;
+ parent = itemBills;
break;
case MyMoneySchedule::TYPE_DEPOSIT:
- tqparent = itemDeposits;
+ parent = itemDeposits;
break;
case MyMoneySchedule::TYPE_TRANSFER:
- tqparent = itemTransfers;
+ parent = itemTransfers;
break;
case MyMoneySchedule::TYPE_LOANPAYMENT:
- tqparent = itemLoans;
+ parent = itemLoans;
break;
}
- if(tqparent) {
+ if(parent) {
if(!KMyMoneyGlobalSettings::hideFinishedSchedules() || !schedData.isFinished()) {
- item = new KScheduledListItem(tqparent, schedData);
+ item = new KScheduledListItem(parent, schedData);
if (schedData.id() == schedId)
openItem = item;
}
diff --git a/kmymoney2/views/kscheduledview.h b/kmymoney2/views/kscheduledview.h
index 25600bd..cf7e10d 100644
--- a/kmymoney2/views/kscheduledview.h
+++ b/kmymoney2/views/kscheduledview.h
@@ -62,7 +62,7 @@ public:
/**
* Standard constructor for TQWidgets.
*/
- KScheduledView(TQWidget *tqparent=0, const char *name=0);
+ KScheduledView(TQWidget *parent=0, const char *name=0);
/**
* Standard destructor.
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<MyMoneyTemplate> 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<MyMoneyTemplate> 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<MyMoneyTemplate> 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 <tqwhatsthis.h>
/*
- * 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 <kmymoney/kmymoneyedit.h>
-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 <tqwhatsthis.h>
/*
- * 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<KToolBar *>(tqparent());
+ KToolBar *toolBar = dynamic_cast<KToolBar *>(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 <kmymoney/kmymoneyaccountcombo.h>
#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 <kmymoney/mymoneyfile.h>
-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<MyMoneyAccount::accountTypeE>& list = TQValueList<MyMoneyAccount::accountTypeE>()) 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 <kmymoney/kmymoneyutils.h>
-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<MyMoneyPrice>& price, const MyMoneySecurity& security) :
- KMyMoneyAccountTreeBaseItem(tqparent,account,price,security),
+KMyMoneyAccountTreeItem::KMyMoneyAccountTreeItem(KMyMoneyAccountTreeBaseItem *parent, const MyMoneyAccount& account, const TQValueList<MyMoneyPrice>& 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<MyMoneyPrice>& price = TQValueList<MyMoneyPrice>(), const MyMoneySecurity& security = MyMoneySecurity());
+ KMyMoneyAccountTreeItem(KMyMoneyAccountTreeBaseItem *parent, const MyMoneyAccount& account, const TQValueList<MyMoneyPrice>& price = TQValueList<MyMoneyPrice>(), 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 <kmymoney/kmymoneyutils.h>
-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<MyMoneyPrice>& price, const MyMoneySecurity& security) :
- KListViewItem(tqparent),
+KMyMoneyAccountTreeBaseItem::KMyMoneyAccountTreeBaseItem(KMyMoneyAccountTreeBaseItem *parent, const MyMoneyAccount& account, const TQValueList<MyMoneyPrice>& 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<KMyMoneyAccountTreeBase*>(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<KMyMoneyAccountTreeBaseItem*>(tqparent());
+ KMyMoneyAccountTreeBaseItem* p = dynamic_cast<KMyMoneyAccountTreeBaseItem*>(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<MyMoneyPrice>& price = TQValueList<MyMoneyPrice>(), const MyMoneySecurity& security = MyMoneySecurity());
+ KMyMoneyAccountTreeBaseItem(KMyMoneyAccountTreeBaseItem *parent, const MyMoneyAccount& account, const TQValueList<MyMoneyPrice>& price = TQValueList<MyMoneyPrice>(), 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.h>
-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<MyMoneyPrice>& price, const MyMoneySecurity& security) :
- KMyMoneyAccountTreeBaseItem(tqparent, account, price, security),
+KMyMoneyAccountTreeBudgetItem::KMyMoneyAccountTreeBudgetItem(KMyMoneyAccountTreeBudgetItem *parent, const MyMoneyAccount& account, const MyMoneyBudget& budget, const TQValueList<MyMoneyPrice>& 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<MyMoneyPrice>& price = TQValueList<MyMoneyPrice>(), const MyMoneySecurity& security = MyMoneySecurity());
+ KMyMoneyAccountTreeBudgetItem(KMyMoneyAccountTreeBudgetItem *parent, const MyMoneyAccount& account, const MyMoneyBudget& budget, const TQValueList<MyMoneyPrice>& price = TQValueList<MyMoneyPrice>(), 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<MyMoneyPrice>& price, const MyMoneySecurity& security, const EForecastViewType forecastType) :
- KMyMoneyAccountTreeBaseItem(tqparent, account, price, security),
+KMyMoneyAccountTreeForecastItem::KMyMoneyAccountTreeForecastItem(KMyMoneyAccountTreeForecastItem *parent, const MyMoneyAccount& account, const MyMoneyForecast& forecast, const TQValueList<MyMoneyPrice>& 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<KMyMoneyAccountTreeForecast*>(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<KMyMoneyAccountTreeForecastItem*>(tqparent());
+ KMyMoneyAccountTreeForecastItem* p = dynamic_cast<KMyMoneyAccountTreeForecastItem*>(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<KMyMoneyAccountTreeForecastItem*>(tqparent());
+ KMyMoneyAccountTreeForecastItem* p = dynamic_cast<KMyMoneyAccountTreeForecastItem*>(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<MyMoneyPrice>& price = TQValueList<MyMoneyPrice>(), const MyMoneySecurity& security = MyMoneySecurity(), const EForecastViewType forecastViewType = eUndefined);
+ KMyMoneyAccountTreeForecastItem(KMyMoneyAccountTreeForecastItem *parent, const MyMoneyAccount& account, const MyMoneyForecast& forecast, const TQValueList<MyMoneyPrice>& price = TQValueList<MyMoneyPrice>(), 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<MyMoneySchedule> 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<KMyMoneyCheckListItem *>(TQListViewItem::tqparent());
- liItem = dynamic_cast<KMyMoneyListViewItem*>(TQListViewItem::tqparent());
+ if(TQListViewItem::parent()) {
+ clItem = dynamic_cast<KMyMoneyCheckListItem *>(TQListViewItem::parent());
+ liItem = dynamic_cast<KMyMoneyListViewItem*>(TQListViewItem::parent());
if(clItem)
previous = clItem->m_isOdd;
else
previous = liItem->m_isOdd;
- clItem = dynamic_cast<KMyMoneyCheckListItem *>(TQListViewItem::tqparent()->firstChild());
- liItem = dynamic_cast<KMyMoneyListViewItem*>(TQListViewItem::tqparent()->firstChild());
+ clItem = dynamic_cast<KMyMoneyCheckListItem *>(TQListViewItem::parent()->firstChild());
+ liItem = dynamic_cast<KMyMoneyListViewItem*>(TQListViewItem::parent()->firstChild());
} else {
clItem = dynamic_cast<KMyMoneyCheckListItem *>(listView()->firstChild());
liItem = dynamic_cast<KMyMoneyListViewItem*>(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<MyMoneySchedule::occurenceE>(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<MyMoneyPayee>& 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 <kmymoney/kmymoneyglobalsettings.h>
-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<KMyMoneyCheckListItem *>(TQListViewItem::tqparent());
- liItem = dynamic_cast<KMyMoneyListViewItem*>(TQListViewItem::tqparent());
+ if(TQListViewItem::parent()) {
+ clItem = dynamic_cast<KMyMoneyCheckListItem *>(TQListViewItem::parent());
+ liItem = dynamic_cast<KMyMoneyListViewItem*>(TQListViewItem::parent());
if(clItem)
previous = clItem->m_isOdd;
else
previous = liItem->m_isOdd;
- clItem = dynamic_cast<KMyMoneyCheckListItem *>(TQListViewItem::tqparent()->firstChild());
- liItem = dynamic_cast<KMyMoneyListViewItem*>(TQListViewItem::tqparent()->firstChild());
+ clItem = dynamic_cast<KMyMoneyCheckListItem *>(TQListViewItem::parent()->firstChild());
+ liItem = dynamic_cast<KMyMoneyListViewItem*>(TQListViewItem::parent()->firstChild());
} else {
clItem = dynamic_cast<KMyMoneyCheckListItem *>(listView()->firstChild());
liItem = dynamic_cast<KMyMoneyListViewItem*>(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<TQListViewItem*> (q);
} else {
- KMyMoneyListViewItem* q = new KMyMoneyListViewItem(tqparent, name, key, id);
+ KMyMoneyListViewItem* q = new KMyMoneyListViewItem(parent, name, key, id);
p = static_cast<TQListViewItem*> (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 <kmymoney/kmymoneytitlelabel.h>
#include <kmymoney/kguiutils.h>
-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 T>
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<TransactionSortField>& sortOrder = i1->tqparent()->sortOrder();
+ const TQValueList<TransactionSortField>& sortOrder = i1->parent()->sortOrder();
TQValueList<TransactionSortField>::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<TQString, TQWidget*>& editWidgets, KMyMoneyRegister::Transaction* t) = 0;
virtual void removeEditWidgets(TQMap<TQString, TQWidget*>& 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);
diff --git a/kmymoney2/wizards/newaccountwizard/khierarchypagedecl.ui b/kmymoney2/wizards/newaccountwizard/khierarchypagedecl.ui
index a68f46a..1380be1 100644
--- a/kmymoney2/wizards/newaccountwizard/khierarchypagedecl.ui
+++ b/kmymoney2/wizards/newaccountwizard/khierarchypagedecl.ui
@@ -32,7 +32,7 @@
<enum>NoFocus</enum>
</property>
<property name="text">
- <string>This page allows you to select the tqparent account.</string>
+ <string>This page allows you to select the parent account.</string>
</property>
</widget>
<widget class="TQLabel">
diff --git a/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp b/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp
index 7fe0a70..b4c481b 100644
--- a/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp
+++ b/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp
@@ -76,8 +76,8 @@ namespace NewAccountWizard {
StepFinish
};
};
-NewAccountWizard::Wizard::Wizard(TQWidget *tqparent, const char *name, bool modal, WFlags flags)
- : KMyMoneyWizard(tqparent, name, modal, flags)
+NewAccountWizard::Wizard::Wizard(TQWidget *parent, const char *name, bool modal, WFlags flags)
+ : KMyMoneyWizard(parent, name, modal, flags)
{
setTitle(i18n("KMyMoney New Account Setup"));
addStep(i18n("Institution"));
@@ -1318,15 +1318,15 @@ LoanSchedulePage::LoanSchedulePage(Wizard* wizard, const char* name) :
void LoanSchedulePage::slotCreateCategory(const TQString& name, TQString& id)
{
- MyMoneyAccount acc, tqparent;
+ MyMoneyAccount acc, parent;
acc.setName(name);
if(m_wizard->moneyBorrowed())
- tqparent = MyMoneyFile::instance()->expense();
+ parent = MyMoneyFile::instance()->expense();
else
- tqparent = MyMoneyFile::instance()->income();
+ parent = MyMoneyFile::instance()->income();
- emit m_wizard->createCategory(acc, tqparent);
+ emit m_wizard->createCategory(acc, parent);
// return id
id = acc.id();
@@ -1504,14 +1504,14 @@ void HierarchyPage::enterPage(void)
}
KMyMoneyAccountTreeItem* HierarchyPage::buildAccountTree
- ( KMyMoneyAccountTreeBase* tqparent
+ ( KMyMoneyAccountTreeBase* parent
, const MyMoneyAccount& account
, bool open ) const
{
// Recursively add child accounts to the list
if ( account.accountType() == MyMoneyAccount::Investment)
return NULL;
- KMyMoneyAccountTreeItem* childItem = new KMyMoneyAccountTreeItem( tqparent, account );
+ KMyMoneyAccountTreeItem* childItem = new KMyMoneyAccountTreeItem( parent, account );
if ( open )
childItem->setOpen(true);
for ( TQStringList::ConstIterator it = account.accountList().begin();
@@ -1529,14 +1529,14 @@ KMyMoneyAccountTreeItem* HierarchyPage::buildAccountTree
}
KMyMoneyAccountTreeItem* HierarchyPage::buildAccountTree
- ( KMyMoneyAccountTreeItem* tqparent
+ ( KMyMoneyAccountTreeItem* parent
, const MyMoneyAccount& account
, bool open ) const
{
// Recursively add child accounts to the list
if ( account.accountType() == MyMoneyAccount::Investment)
return NULL;
- KMyMoneyAccountTreeItem* childItem = new KMyMoneyAccountTreeItem( tqparent, account );
+ KMyMoneyAccountTreeItem* childItem = new KMyMoneyAccountTreeItem( parent, account );
if ( open )
childItem->setOpen(true);
for ( TQStringList::ConstIterator it = account.accountList().begin();
diff --git a/kmymoney2/wizards/newaccountwizard/knewaccountwizard.h b/kmymoney2/wizards/newaccountwizard/knewaccountwizard.h
index 158df41..c288d11 100644
--- a/kmymoney2/wizards/newaccountwizard/knewaccountwizard.h
+++ b/kmymoney2/wizards/newaccountwizard/knewaccountwizard.h
@@ -69,7 +69,7 @@ class Wizard : public KMyMoneyWizard
Q_OBJECT
TQ_OBJECT
public:
- Wizard(TQWidget* tqparent = 0, const char* name = 0, bool modal = false, WFlags flags = 0);
+ Wizard(TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags flags = 0);
/**
* Returns the information about the account as entered by
@@ -83,10 +83,10 @@ public:
void setAccount(const MyMoneyAccount& acc);
/**
- * Returns the information about the tqparent account as entered by
+ * Returns the information about the parent account as entered by
* the user.
* @note For now it's either fixed as Asset or Liability. We will provide
- * user selected tqparent accounts later.
+ * user selected parent accounts later.
*/
const MyMoneyAccount& parentAccount(void);
diff --git a/kmymoney2/wizards/newaccountwizard/knewaccountwizard_p.h b/kmymoney2/wizards/newaccountwizard/knewaccountwizard_p.h
index 2d2e612..9838cff 100644
--- a/kmymoney2/wizards/newaccountwizard/knewaccountwizard_p.h
+++ b/kmymoney2/wizards/newaccountwizard/knewaccountwizard_p.h
@@ -64,7 +64,7 @@ class InstitutionPage : public KInstitutionPageDecl, public WizardPage<Wizard>
Q_OBJECT
TQ_OBJECT
public:
- InstitutionPage(Wizard* tqparent, const char* name = 0);
+ InstitutionPage(Wizard* parent, const char* name = 0);
~InstitutionPage();
KMyMoneyWizardPage* nextPage(void) const;
@@ -94,7 +94,7 @@ class AccountTypePage : public KAccountTypePageDecl, public WizardPage<Wizard>
Q_OBJECT
TQ_OBJECT
public:
- AccountTypePage(Wizard* tqparent, const char* name = 0);
+ AccountTypePage(Wizard* parent, const char* name = 0);
virtual bool isComplete(void) const;
KMyMoneyWizardPage* nextPage(void) const;
@@ -128,7 +128,7 @@ class BrokeragePage : public KBrokeragePageDecl, public WizardPage<Wizard>
Q_OBJECT
TQ_OBJECT
public:
- BrokeragePage(Wizard* tqparent, const char* name = 0);
+ BrokeragePage(Wizard* parent, const char* name = 0);
KMyMoneyWizardPage* nextPage(void) const;
void enterPage(void);
@@ -143,7 +143,7 @@ class CreditCardSchedulePage : public KSchedulePageDecl, public WizardPage<Wizar
Q_OBJECT
TQ_OBJECT
public:
- CreditCardSchedulePage(Wizard* tqparent, const char* name = 0);
+ CreditCardSchedulePage(Wizard* parent, const char* name = 0);
KMyMoneyWizardPage* nextPage(void) const;
virtual bool isComplete(void) const;
void enterPage(void);
@@ -159,7 +159,7 @@ class GeneralLoanInfoPage : public KGeneralLoanInfoPageDecl, public WizardPage<W
Q_OBJECT
TQ_OBJECT
public:
- GeneralLoanInfoPage(Wizard* tqparent, const char* name = 0);
+ GeneralLoanInfoPage(Wizard* parent, const char* name = 0);
KMyMoneyWizardPage* nextPage(void) const;
virtual bool isComplete(void) const;
void enterPage(void);
@@ -184,7 +184,7 @@ class LoanDetailsPage : public KLoanDetailsPageDecl, public WizardPage<Wizard>
Q_OBJECT
TQ_OBJECT
public:
- LoanDetailsPage(Wizard* tqparent, const char* name = 0);
+ LoanDetailsPage(Wizard* parent, const char* name = 0);
void enterPage(void);
KMyMoneyWizardPage* nextPage(void) const;
virtual bool isComplete(void) const;
@@ -218,7 +218,7 @@ class LoanPaymentPage : public KLoanPaymentPageDecl, public WizardPage<Wizard>
Q_OBJECT
TQ_OBJECT
public:
- LoanPaymentPage(Wizard* tqparent, const char* name = 0);
+ LoanPaymentPage(Wizard* parent, const char* name = 0);
~LoanPaymentPage();
KMyMoneyWizardPage* nextPage(void) const;
@@ -260,7 +260,7 @@ class LoanSchedulePage : public KLoanSchedulePageDecl, public WizardPage<Wizard>
Q_OBJECT
TQ_OBJECT
public:
- LoanSchedulePage(Wizard* tqparent, const char* name = 0);
+ LoanSchedulePage(Wizard* parent, const char* name = 0);
void enterPage(void);
KMyMoneyWizardPage* nextPage(void) const;
@@ -283,7 +283,7 @@ class LoanPayoutPage : public KLoanPayoutPageDecl, public WizardPage<Wizard>
Q_OBJECT
TQ_OBJECT
public:
- LoanPayoutPage(Wizard* tqparent, const char* name = 0);
+ LoanPayoutPage(Wizard* parent, const char* name = 0);
void enterPage(void);
virtual bool isComplete(void) const;
@@ -304,7 +304,7 @@ class HierarchyPage : public KHierarchyPageDecl, public WizardPage<Wizard>
Q_OBJECT
TQ_OBJECT
public:
- HierarchyPage(Wizard* tqparent, const char* name = 0);
+ HierarchyPage(Wizard* parent, const char* name = 0);
void enterPage(void);
KMyMoneyWizardPage* nextPage(void) const;
TQWidget* initialFocusWidget(void) const { return m_qlistviewParentAccounts; }
@@ -312,11 +312,11 @@ public:
private:
KMyMoneyAccountTreeItem* buildAccountTree
- ( KMyMoneyAccountTreeBase* tqparent
+ ( KMyMoneyAccountTreeBase* parent
, const MyMoneyAccount& account
, bool open = false ) const;
KMyMoneyAccountTreeItem* buildAccountTree
- ( KMyMoneyAccountTreeItem* tqparent
+ ( KMyMoneyAccountTreeItem* parent
, const MyMoneyAccount& account
, bool open = false ) const;
MyMoneyAccount m_topAccount; // Last populated top account
@@ -328,7 +328,7 @@ class AccountSummaryPage : public KAccountSummaryPageDecl, public WizardPage<Wiz
Q_OBJECT
TQ_OBJECT
public:
- AccountSummaryPage(Wizard* tqparent, const char* name = 0);
+ AccountSummaryPage(Wizard* parent, const char* name = 0);
void enterPage(void);
TQWidget* initialFocusWidget(void) const { return m_dataList; }
};
diff --git a/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp b/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp
index d8607fc..c1159d9 100644
--- a/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp
+++ b/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp
@@ -68,8 +68,8 @@ using namespace NewUserWizard;
static int stepCount;
-NewUserWizard::Wizard::Wizard(TQWidget *tqparent, const char *name, bool modal, WFlags flags) :
- KMyMoneyWizard(tqparent, name, modal, flags),
+NewUserWizard::Wizard::Wizard(TQWidget *parent, const char *name, bool modal, WFlags flags) :
+ KMyMoneyWizard(parent, name, modal, flags),
m_introPage(0)
{
bool isFirstTime = KMyMoneyGlobalSettings::firstTimeRun();
diff --git a/kmymoney2/wizards/newuserwizard/knewuserwizard.h b/kmymoney2/wizards/newuserwizard/knewuserwizard.h
index 25e010f..5de23dd 100644
--- a/kmymoney2/wizards/newuserwizard/knewuserwizard.h
+++ b/kmymoney2/wizards/newuserwizard/knewuserwizard.h
@@ -67,7 +67,7 @@ class Wizard : public KMyMoneyWizard
Q_OBJECT
TQ_OBJECT
public:
- Wizard(TQWidget* tqparent = 0, const char* name = 0, bool modal = false, WFlags flags = 0);
+ Wizard(TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags flags = 0);
/**
* Returns the personal information of the user (e.g. name, address, etc.)
*/
diff --git a/kmymoney2/wizards/newuserwizard/knewuserwizard_p.h b/kmymoney2/wizards/newuserwizard/knewuserwizard_p.h
index ea1910a..ed7036f 100644
--- a/kmymoney2/wizards/newuserwizard/knewuserwizard_p.h
+++ b/kmymoney2/wizards/newuserwizard/knewuserwizard_p.h
@@ -46,7 +46,7 @@ class IntroPage : public KIntroPageDecl, public WizardPage<Wizard>
Q_OBJECT
TQ_OBJECT
public:
- IntroPage(Wizard* tqparent, const char* name = 0);
+ IntroPage(Wizard* parent, const char* name = 0);
KMyMoneyWizardPage* nextPage(void) const;
};
@@ -60,7 +60,7 @@ class GeneralPage : public UserInfo, public WizardPage<Wizard>
Q_OBJECT
TQ_OBJECT
public:
- GeneralPage(Wizard* tqparent, const char* name = 0);
+ GeneralPage(Wizard* parent, const char* name = 0);
KMyMoneyWizardPage* nextPage(void) const;
protected slots:
@@ -79,7 +79,7 @@ class CurrencyPage : public Currency, public WizardPage<Wizard>
Q_OBJECT
TQ_OBJECT
public:
- CurrencyPage(Wizard* tqparent, const char* name = 0);
+ CurrencyPage(Wizard* parent, const char* name = 0);
void enterPage(void);
KMyMoneyWizardPage* nextPage(void) const;
};
@@ -92,7 +92,7 @@ class AccountPage : public KAccountPageDecl, public WizardPage<Wizard>
Q_OBJECT
TQ_OBJECT
public:
- AccountPage(Wizard* tqparent, const char* name = 0);
+ AccountPage(Wizard* parent, const char* name = 0);
KMyMoneyWizardPage* nextPage(void) const;
virtual bool isComplete(void) const;
@@ -108,7 +108,7 @@ class CategoriesPage : public Accounts, public WizardPage<Wizard>
Q_OBJECT
TQ_OBJECT
public:
- CategoriesPage(Wizard* tqparent, const char* name = 0);
+ CategoriesPage(Wizard* parent, const char* name = 0);
KMyMoneyWizardPage* nextPage(void) const;
TQValueList<MyMoneyTemplate> selectedTemplates(void) const;
};
@@ -123,7 +123,7 @@ class PreferencePage : public KPreferencePageDecl, public WizardPage<Wizard>
Q_OBJECT
TQ_OBJECT
public:
- PreferencePage(Wizard* tqparent, const char* name = 0);
+ PreferencePage(Wizard* parent, const char* name = 0);
KMyMoneyWizardPage* nextPage(void) const;
};
@@ -137,7 +137,7 @@ class FilePage : public KFilePageDecl, public WizardPage<Wizard>
Q_OBJECT
TQ_OBJECT
public:
- FilePage(Wizard* tqparent, const char* name = 0);
+ FilePage(Wizard* parent, const char* name = 0);
virtual bool isComplete(void) const;
};
diff --git a/kmymoney2/wizards/wizardpages/accounts.cpp b/kmymoney2/wizards/wizardpages/accounts.cpp
index 21c80ad..cca16d8 100644
--- a/kmymoney2/wizards/wizardpages/accounts.cpp
+++ b/kmymoney2/wizards/wizardpages/accounts.cpp
@@ -31,8 +31,8 @@
#include "accounts.h"
-Accounts::Accounts(TQWidget* tqparent, const char* name) :
- AccountsDecl(tqparent, name)
+Accounts::Accounts(TQWidget* parent, const char* name) :
+ AccountsDecl(parent, name)
{
}
diff --git a/kmymoney2/wizards/wizardpages/accounts.h b/kmymoney2/wizards/wizardpages/accounts.h
index 0c36c31..8e75b5f 100644
--- a/kmymoney2/wizards/wizardpages/accounts.h
+++ b/kmymoney2/wizards/wizardpages/accounts.h
@@ -34,7 +34,7 @@ class Accounts : public AccountsDecl
Q_OBJECT
TQ_OBJECT
public:
- Accounts(TQWidget* tqparent = 0, const char* name = 0);
+ Accounts(TQWidget* parent = 0, const char* name = 0);
private:
};
diff --git a/kmymoney2/wizards/wizardpages/currency.cpp b/kmymoney2/wizards/wizardpages/currency.cpp
index d824f01..cf645ab 100644
--- a/kmymoney2/wizards/wizardpages/currency.cpp
+++ b/kmymoney2/wizards/wizardpages/currency.cpp
@@ -29,8 +29,8 @@
#include "currency.h"
-Currency::Currency(TQWidget* tqparent, const char* name) :
- CurrencyDecl(tqparent, name)
+Currency::Currency(TQWidget* parent, const char* name) :
+ CurrencyDecl(parent, name)
{
m_currencyList->setAllColumnsShowFocus(true);
m_currencyList->setMultiSelection(false);
diff --git a/kmymoney2/wizards/wizardpages/currency.h b/kmymoney2/wizards/wizardpages/currency.h
index d202f35..265059a 100644
--- a/kmymoney2/wizards/wizardpages/currency.h
+++ b/kmymoney2/wizards/wizardpages/currency.h
@@ -37,7 +37,7 @@ class Currency : public CurrencyDecl
Q_OBJECT
TQ_OBJECT
public:
- Currency(TQWidget* tqparent = 0, const char* name = 0);
+ Currency(TQWidget* parent = 0, const char* name = 0);
TQListViewItem* insertCurrency(const MyMoneySecurity& sec);
void selectCurrency(const MyMoneySecurity& sec);
TQString selectedCurrency(void) const;
diff --git a/kmymoney2/wizards/wizardpages/userinfo.cpp b/kmymoney2/wizards/wizardpages/userinfo.cpp
index 01d5e69..5eebf2a 100644
--- a/kmymoney2/wizards/wizardpages/userinfo.cpp
+++ b/kmymoney2/wizards/wizardpages/userinfo.cpp
@@ -30,8 +30,8 @@
#include "userinfo.h"
#include <kmymoney/mymoneypayee.h>
-UserInfo::UserInfo(TQWidget* tqparent, const char* name) :
- UserInfoDecl(tqparent, name)
+UserInfo::UserInfo(TQWidget* parent, const char* name) :
+ UserInfoDecl(parent, name)
{
m_userNameEdit->setFocus();
}
diff --git a/kmymoney2/wizards/wizardpages/userinfo.h b/kmymoney2/wizards/wizardpages/userinfo.h
index 9168bf9..430cad4 100644
--- a/kmymoney2/wizards/wizardpages/userinfo.h
+++ b/kmymoney2/wizards/wizardpages/userinfo.h
@@ -35,7 +35,7 @@ class UserInfo : public UserInfoDecl
Q_OBJECT
TQ_OBJECT
public:
- UserInfo(TQWidget* tqparent = 0, const char* name = 0);
+ UserInfo(TQWidget* parent = 0, const char* name = 0);
MyMoneyPayee user(void) const;
private: