diff options
| -rw-r--r-- | kmymoney2/dialogs/kcategoryreassigndlg.cpp | 2 | ||||
| -rw-r--r-- | kmymoney2/dialogs/keditscheduledlg.cpp | 2 | ||||
| -rw-r--r-- | kmymoney2/dialogs/kmymoneysplittable.cpp | 2 | ||||
| -rw-r--r-- | kmymoney2/dialogs/knewaccountdlg.cpp | 2 | ||||
| -rw-r--r-- | kmymoney2/dialogs/knewbankdlg.cpp | 2 | ||||
| -rw-r--r-- | kmymoney2/dialogs/knewinvestmentwizard.cpp | 2 | ||||
| -rw-r--r-- | kmymoney2/dialogs/kpayeereassigndlg.cpp | 2 | ||||
| -rw-r--r-- | kmymoney2/dialogs/mymoneyqifprofileeditor.cpp | 2 | ||||
| -rw-r--r-- | kmymoney2/dialogs/tdeselectdatabasedlg.cpp | 4 | ||||
| -rw-r--r-- | kmymoney2/kmymoney2.cpp | 316 | ||||
| -rw-r--r-- | kmymoney2/widgets/kmymoneycalculator.cpp | 8 | ||||
| -rw-r--r-- | kmymoney2/widgets/kmymoneydateinput.cpp | 6 | ||||
| -rw-r--r-- | kmymoney2/widgets/kmymoneyedit.cpp | 4 | ||||
| -rw-r--r-- | kmymoney2/widgets/kmymoneywizard.cpp | 4 | ||||
| -rw-r--r-- | kmymoney2/widgets/transaction.cpp | 2 |
15 files changed, 180 insertions, 180 deletions
diff --git a/kmymoney2/dialogs/kcategoryreassigndlg.cpp b/kmymoney2/dialogs/kcategoryreassigndlg.cpp index 507c76c..e481b17 100644 --- a/kmymoney2/dialogs/kcategoryreassigndlg.cpp +++ b/kmymoney2/dialogs/kcategoryreassigndlg.cpp @@ -45,7 +45,7 @@ KCategoryReassignDlg::KCategoryReassignDlg( TQWidget* parent, const char* name) { buttonOk->setGuiItem(KStdGuiItem::ok()); buttonCancel->setGuiItem(KStdGuiItem::cancel()); - kMandatoryFieldGroup* mandatory = new kMandatoryFieldGroup(TQT_TQOBJECT(this)); + kMandatoryFieldGroup* mandatory = new kMandatoryFieldGroup(this); mandatory->add(m_category); mandatory->setOkButton(buttonOk); } diff --git a/kmymoney2/dialogs/keditscheduledlg.cpp b/kmymoney2/dialogs/keditscheduledlg.cpp index 0d6a3a1..e67e680 100644 --- a/kmymoney2/dialogs/keditscheduledlg.cpp +++ b/kmymoney2/dialogs/keditscheduledlg.cpp @@ -75,7 +75,7 @@ KEditScheduleDlg::KEditScheduleDlg(const MyMoneySchedule& schedule, TQWidget *pa buttonCancel->setGuiItem(KStdGuiItem::cancel()); buttonHelp->setGuiItem(KStdGuiItem::help()); - d->m_requiredFields = new kMandatoryFieldGroup (TQT_TQOBJECT(this)); + d->m_requiredFields = new kMandatoryFieldGroup (this); d->m_requiredFields->setOkButton(buttonOk); // button to be enabled when all fields present // make sure, we have a tabbar with the form diff --git a/kmymoney2/dialogs/kmymoneysplittable.cpp b/kmymoney2/dialogs/kmymoneysplittable.cpp index 7a5cc06..4a71553 100644 --- a/kmymoney2/dialogs/kmymoneysplittable.cpp +++ b/kmymoney2/dialogs/kmymoneysplittable.cpp @@ -957,7 +957,7 @@ void kMyMoneySplitTable::addToTabOrder(TQWidget* w) { if(w) { while(w->focusProxy()) - w = TQT_TQWIDGET(w->focusProxy()); + w = w->focusProxy(); m_tabOrderWidgets.append(w); } } diff --git a/kmymoney2/dialogs/knewaccountdlg.cpp b/kmymoney2/dialogs/knewaccountdlg.cpp index 4fe343c..4d86d4d 100644 --- a/kmymoney2/dialogs/knewaccountdlg.cpp +++ b/kmymoney2/dialogs/knewaccountdlg.cpp @@ -435,7 +435,7 @@ KNewAccountDlg::KNewAccountDlg(const MyMoneyAccount& account, bool isEditing, bo slotVatAssignmentChanged(m_vatAssignment->isChecked()); slotCheckFinished(); - kMandatoryFieldGroup* requiredFields = new kMandatoryFieldGroup (TQT_TQOBJECT(this)); + kMandatoryFieldGroup* requiredFields = new kMandatoryFieldGroup (this); requiredFields->setOkButton(createButton); // button to be enabled when all fields present requiredFields->add(accountNameEdit); diff --git a/kmymoney2/dialogs/knewbankdlg.cpp b/kmymoney2/dialogs/knewbankdlg.cpp index 136a5a8..85b0984 100644 --- a/kmymoney2/dialogs/knewbankdlg.cpp +++ b/kmymoney2/dialogs/knewbankdlg.cpp @@ -63,7 +63,7 @@ KNewBankDlg::KNewBankDlg(MyMoneyInstitution& institution, TQWidget *parent, cons connect(nameEdit, TQT_SIGNAL(textChanged ( const TQString & )), TQT_SLOT(institutionNameChanged( const TQString &))); institutionNameChanged( nameEdit->text()); - kMandatoryFieldGroup* requiredFields = new kMandatoryFieldGroup (TQT_TQOBJECT(this)); + kMandatoryFieldGroup* requiredFields = new kMandatoryFieldGroup (this); requiredFields->setOkButton(okBtn); // button to be enabled when all fields present requiredFields->add(nameEdit); } diff --git a/kmymoney2/dialogs/knewinvestmentwizard.cpp b/kmymoney2/dialogs/knewinvestmentwizard.cpp index 14da19c..e7df5f2 100644 --- a/kmymoney2/dialogs/knewinvestmentwizard.cpp +++ b/kmymoney2/dialogs/knewinvestmentwizard.cpp @@ -106,7 +106,7 @@ void KNewInvestmentWizard::init1(void) m_fraction->setPrecision(0); m_fraction->setValue(MyMoneyMoney(100, 1)); - kMyMoneyMoneyValidator* fractionValidator = new kMyMoneyMoneyValidator(1, 100000, 0, TQT_TQOBJECT(this)); + kMyMoneyMoneyValidator* fractionValidator = new kMyMoneyMoneyValidator(1, 100000, 0, this); m_fraction->setValidator(fractionValidator); // load the price mode combo diff --git a/kmymoney2/dialogs/kpayeereassigndlg.cpp b/kmymoney2/dialogs/kpayeereassigndlg.cpp index cc281f6..6b8351c 100644 --- a/kmymoney2/dialogs/kpayeereassigndlg.cpp +++ b/kmymoney2/dialogs/kpayeereassigndlg.cpp @@ -45,7 +45,7 @@ KPayeeReassignDlg::KPayeeReassignDlg( TQWidget* parent, const char* name) : { buttonOk->setGuiItem(KStdGuiItem::ok()); buttonCancel->setGuiItem(KStdGuiItem::cancel()); - kMandatoryFieldGroup* mandatory = new kMandatoryFieldGroup(TQT_TQOBJECT(this)); + kMandatoryFieldGroup* mandatory = new kMandatoryFieldGroup(this); mandatory->add(payeeCombo); mandatory->setOkButton(buttonOk); } diff --git a/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp b/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp index 4dda2df..ff56d28 100644 --- a/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp +++ b/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp @@ -402,7 +402,7 @@ void MyMoneyQifProfileEditor::slotNew(void) const TQString MyMoneyQifProfileEditor::enterName(bool& ok) { - MyMoneyQifProfileNameValidator val(TQT_TQOBJECT(this), "Validator"); + MyMoneyQifProfileNameValidator val(this, "Validator"); #if KDE_IS_VERSION(3,2,0) return KInputDialog::getText(i18n("QIF Profile Editor"), i18n("Enter new profile name"), diff --git a/kmymoney2/dialogs/tdeselectdatabasedlg.cpp b/kmymoney2/dialogs/tdeselectdatabasedlg.cpp index 59a2743..f5d6a3b 100644 --- a/kmymoney2/dialogs/tdeselectdatabasedlg.cpp +++ b/kmymoney2/dialogs/tdeselectdatabasedlg.cpp @@ -79,7 +79,7 @@ TDESelectDatabaseDlg::TDESelectDatabaseDlg(TQWidget *parent, const char *name) if (pwd != 0) textUserName->setText (TQString(pwd->pw_name)); textPassword->setText (""); - m_requiredFields = new kMandatoryFieldGroup(TQT_TQOBJECT(this)); + m_requiredFields = new kMandatoryFieldGroup(this); m_requiredFields->setOkButton(buttonOK); m_requiredFields->add(listDrivers); m_requiredFields->add(textDbName); @@ -135,7 +135,7 @@ TDESelectDatabaseDlg::TDESelectDatabaseDlg(KURL openURL, TQWidget *parent, const textPassword->setFocus(); buttonSQL->setEnabled(false); // set password as required - m_requiredFields = new kMandatoryFieldGroup(TQT_TQOBJECT(this)); + m_requiredFields = new kMandatoryFieldGroup(this); m_requiredFields->add(textPassword); m_requiredFields->setOkButton(buttonOK); diff --git a/kmymoney2/kmymoney2.cpp b/kmymoney2/kmymoney2.cpp index 7657846..7db4953 100644 --- a/kmymoney2/kmymoney2.cpp +++ b/kmymoney2/kmymoney2.cpp @@ -209,7 +209,7 @@ KMyMoney2App::KMyMoney2App(TQWidget * /*parent*/ , const char* name) : ::timetrace("create view"); myMoneyView = new KMyMoneyView(frame, "KMyMoneyView"); layout->addWidget(myMoneyView, 10); - connect(myMoneyView, TQT_SIGNAL(aboutToShowPage(TQWidget*)), TQT_TQOBJECT(this), TQT_SLOT(slotResetSelections())); + connect(myMoneyView, TQT_SIGNAL(aboutToShowPage(TQWidget*)), this, TQT_SLOT(slotResetSelections())); /////////////////////////////////////////////////////////////////// // call inits to invoke all other construction parts @@ -218,7 +218,7 @@ KMyMoney2App::KMyMoney2App(TQWidget * /*parent*/ , const char* name) : #if 0 m_pluginSignalMapper = new TQSignalMapper( this ); - connect( m_pluginSignalMapper, TQT_SIGNAL( mapped( const TQString& ) ), TQT_TQOBJECT(this), TQT_SLOT( slotPluginImport( const TQString& ) ) ); + connect( m_pluginSignalMapper, TQT_SIGNAL( mapped( const TQString& ) ), this, TQT_SLOT( slotPluginImport( const TQString& ) ) ); #endif // now initialize the plugin structure @@ -230,7 +230,7 @@ KMyMoney2App::KMyMoney2App(TQWidget * /*parent*/ , const char* name) : ::timetrace("done"); - connect(&proc,TQT_SIGNAL(processExited(TDEProcess *)),TQT_TQOBJECT(this), TQT_SLOT(slotProcessExited())); + connect(&proc,TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotProcessExited())); // force to show the home page if the file is closed connect(action("view_show_transaction_detail"), TQT_SIGNAL(toggled(bool)), myMoneyView, TQT_SLOT(slotShowTransactionDetail(bool))); @@ -244,13 +244,13 @@ KMyMoney2App::KMyMoney2App(TQWidget * /*parent*/ , const char* name) : m_autoSavePeriod = KMyMoneyGlobalSettings::autoSavePeriod(); m_autoSaveTimer = new TQTimer(this); - connect(m_autoSaveTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotAutoSave())); + connect(m_autoSaveTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAutoSave())); // make sure, we get a note when the engine changes state - connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotDataChanged())); + connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotDataChanged())); // make sure we have a balance warning object - d->m_balanceWarning = new KBalanceWarning(TQT_TQOBJECT(this)); + d->m_balanceWarning = new KBalanceWarning(this); // kickstart date change timer slotDateChanged(); @@ -288,10 +288,10 @@ void KMyMoney2App::initDynamicMenus(void) if(menu) { d->m_moveToAccountSelector = new kMyMoneyAccountSelector(menu, 0, 0, false); menu->insertItem(d->m_moveToAccountSelector); - connect(d->m_moveToAccountSelector, TQT_SIGNAL(itemSelected(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotMoveToAccount(const TQString&))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(accountSelected(const MyMoneyAccount&)), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateMoveToAccountMenu())); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(transactionsSelected(const KMyMoneyRegister::SelectedTransactions&)), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateMoveToAccountMenu())); - connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateMoveToAccountMenu())); + connect(d->m_moveToAccountSelector, TQT_SIGNAL(itemSelected(const TQString&)), this, TQT_SLOT(slotMoveToAccount(const TQString&))); + connect(this, TQT_SIGNAL(accountSelected(const MyMoneyAccount&)), this, TQT_SLOT(slotUpdateMoveToAccountMenu())); + connect(this, TQT_SIGNAL(transactionsSelected(const KMyMoneyRegister::SelectedTransactions&)), this, TQT_SLOT(slotUpdateMoveToAccountMenu())); + connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotUpdateMoveToAccountMenu())); } } @@ -302,186 +302,186 @@ void KMyMoney2App::initActions(void) // ************* // The File menu // ************* - KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), actionCollection()); - KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection()); - KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); - KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection()); - KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection()); - KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection()); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection()); - KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotPrintView()), actionCollection()); - - new TDEAction(i18n("Open database..."), "",0,TQT_TQOBJECT(this), TQT_SLOT(slotOpenDatabase()),actionCollection(),"open_database"); - new TDEAction(i18n("Save as database..."), "",0,TQT_TQOBJECT(this), TQT_SLOT(slotSaveAsDatabase()),actionCollection(),"saveas_database"); - new TDEAction(i18n("Backup..."), "backup",0,TQT_TQOBJECT(this), TQT_SLOT(slotFileBackup()),actionCollection(),"file_backup"); - new TDEAction(i18n("QIF..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotQifImport()), actionCollection(), "file_import_qif"); - new TDEAction(i18n("Gnucash..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotGncImport()), actionCollection(), "file_import_gnc"); - new TDEAction(i18n("Statement file..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStatementImport()), actionCollection(), "file_import_statement"); - - new TDEAction(i18n("Account Template..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotLoadAccountTemplates()), actionCollection(), "file_import_template"); - new TDEAction(i18n("Account Template..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAccountTemplates()), actionCollection(), "file_export_template"); - new TDEAction(i18n("QIF..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotQifExport()), actionCollection(), "file_export_qif"); - new TDEAction(i18n("Personal Data..."), "personal_data", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileViewPersonal()), actionCollection(), "view_personal_data"); + KStdAction::openNew(this, TQT_SLOT(slotFileNew()), actionCollection()); + KStdAction::open(this, TQT_SLOT(slotFileOpen()), actionCollection()); + KStdAction::openRecent(this, TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); + KStdAction::save(this, TQT_SLOT(slotFileSave()), actionCollection()); + KStdAction::saveAs(this, TQT_SLOT(slotFileSaveAs()), actionCollection()); + KStdAction::close(this, TQT_SLOT(slotFileClose()), actionCollection()); + KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection()); + KStdAction::print(this, TQT_SLOT(slotPrintView()), actionCollection()); + + new TDEAction(i18n("Open database..."), "",0,this, TQT_SLOT(slotOpenDatabase()),actionCollection(),"open_database"); + new TDEAction(i18n("Save as database..."), "",0,this, TQT_SLOT(slotSaveAsDatabase()),actionCollection(),"saveas_database"); + new TDEAction(i18n("Backup..."), "backup",0,this, TQT_SLOT(slotFileBackup()),actionCollection(),"file_backup"); + new TDEAction(i18n("QIF..."), "", 0, this, TQT_SLOT(slotQifImport()), actionCollection(), "file_import_qif"); + new TDEAction(i18n("Gnucash..."), "", 0, this, TQT_SLOT(slotGncImport()), actionCollection(), "file_import_gnc"); + new TDEAction(i18n("Statement file..."), "", 0, this, TQT_SLOT(slotStatementImport()), actionCollection(), "file_import_statement"); + + new TDEAction(i18n("Account Template..."), "", 0, this, TQT_SLOT(slotLoadAccountTemplates()), actionCollection(), "file_import_template"); + new TDEAction(i18n("Account Template..."), "", 0, this, TQT_SLOT(slotSaveAccountTemplates()), actionCollection(), "file_export_template"); + new TDEAction(i18n("QIF..."), "", 0, this, TQT_SLOT(slotQifExport()), actionCollection(), "file_export_qif"); + new TDEAction(i18n("Personal Data..."), "personal_data", 0, this, TQT_SLOT(slotFileViewPersonal()), actionCollection(), "view_personal_data"); #if KMM_DEBUG - new TDEAction(i18n("Dump Memory"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileFileInfo()), actionCollection(), "file_dump"); + new TDEAction(i18n("Dump Memory"), "", 0, this, TQT_SLOT(slotFileFileInfo()), actionCollection(), "file_dump"); #endif - new TDEAction(i18n("File-Information..."), "application-vnd.tde.info", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileInfoDialog()), actionCollection(), "view_file_info"); + new TDEAction(i18n("File-Information..."), "application-vnd.tde.info", 0, this, TQT_SLOT(slotFileInfoDialog()), actionCollection(), "view_file_info"); // ************* // The Edit menu // ************* - new TDEAction(i18n("Find transaction..."), "transaction_find", TDEShortcut("Ctrl+F"), TQT_TQOBJECT(this), TQT_SLOT(slotFindTransaction()), actionCollection(), "edit_find_transaction"); + new TDEAction(i18n("Find transaction..."), "transaction_find", TDEShortcut("Ctrl+F"), this, TQT_SLOT(slotFindTransaction()), actionCollection(), "edit_find_transaction"); // ************* // The View menu // ************* new TDEToggleAction(i18n("Show Transaction Detail"), TDEShortcut("Ctrl+T"), actionCollection(), "view_show_transaction_detail"); - new TDEToggleAction(i18n("Hide reconciled transactions"), "hide_reconciled", TDEShortcut("Ctrl+R"), TQT_TQOBJECT(this), TQT_SLOT(slotHideReconciledTransactions()), actionCollection(), "view_hide_reconciled_transactions"); - new TDEToggleAction(i18n("Hide unused categories"), "hide_categories", TDEShortcut("Ctrl+U"), TQT_TQOBJECT(this), TQT_SLOT(slotHideUnusedCategories()), actionCollection(), "view_hide_unused_categories"); - new TDEToggleAction(i18n("Show all accounts"), "", TDEShortcut("Ctrl+Shift+A"), TQT_TQOBJECT(this), TQT_SLOT(slotShowAllAccounts()), actionCollection(), "view_show_all_accounts"); + new TDEToggleAction(i18n("Hide reconciled transactions"), "hide_reconciled", TDEShortcut("Ctrl+R"), this, TQT_SLOT(slotHideReconciledTransactions()), actionCollection(), "view_hide_reconciled_transactions"); + new TDEToggleAction(i18n("Hide unused categories"), "hide_categories", TDEShortcut("Ctrl+U"), this, TQT_SLOT(slotHideUnusedCategories()), actionCollection(), "view_hide_unused_categories"); + new TDEToggleAction(i18n("Show all accounts"), "", TDEShortcut("Ctrl+Shift+A"), this, TQT_SLOT(slotShowAllAccounts()), actionCollection(), "view_show_all_accounts"); // ********************* // The institutions menu // ********************* - new TDEAction(i18n("New institution..."), "institution_add", 0, TQT_TQOBJECT(this), TQT_SLOT(slotInstitutionNew()), actionCollection(), "institution_new"); - new TDEAction(i18n("Edit institution..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotInstitutionEdit()), actionCollection(), "institution_edit"); - new TDEAction(i18n("Delete institution..."), "delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotInstitutionDelete()), actionCollection(), "institution_delete"); + new TDEAction(i18n("New institution..."), "institution_add", 0, this, TQT_SLOT(slotInstitutionNew()), actionCollection(), "institution_new"); + new TDEAction(i18n("Edit institution..."), "edit", 0, this, TQT_SLOT(slotInstitutionEdit()), actionCollection(), "institution_edit"); + new TDEAction(i18n("Delete institution..."), "delete", 0, this, TQT_SLOT(slotInstitutionDelete()), actionCollection(), "institution_delete"); // ***************** // The accounts menu // ***************** - new TDEAction(i18n("New account..."), "account_add", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountNew()), actionCollection(), "account_new"); + new TDEAction(i18n("New account..."), "account_add", 0, this, TQT_SLOT(slotAccountNew()), actionCollection(), "account_new"); // note : action "category_new" is included in this menu but defined below - new TDEAction(i18n("Open ledger"), "ledger", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountOpen()), actionCollection(), "account_open"); - new TDEAction(i18n("Reconcile..."), "reconcile", TDEShortcut("Ctrl+Shift+R"), TQT_TQOBJECT(this), TQT_SLOT(slotAccountReconcileStart()), actionCollection(), "account_reconcile"); - new TDEAction(i18n("Finish reconciliation", "Finish"), "media-skip-forward", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountReconcileFinish()), actionCollection(), "account_reconcile_finish"); - new TDEAction(i18n("Postpone reconciliation", "Postpone"), "media-playback-pause", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountReconcilePostpone()), actionCollection(), "account_reconcile_postpone"); - new TDEAction(i18n("Edit account..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountEdit()), actionCollection(), "account_edit"); - new TDEAction(i18n("Delete account..."), "delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountDelete()), actionCollection(), "account_delete"); - new TDEAction(i18n("Close account"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountClose()), actionCollection(), "account_close"); - new TDEAction(i18n("Reopen account"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountReopen()), actionCollection(), "account_reopen"); - new TDEAction(i18n("Transaction report"), "view_info", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountTransactionReport()), actionCollection(), "account_transaction_report"); + new TDEAction(i18n("Open ledger"), "ledger", 0, this, TQT_SLOT(slotAccountOpen()), actionCollection(), "account_open"); + new TDEAction(i18n("Reconcile..."), "reconcile", TDEShortcut("Ctrl+Shift+R"), this, TQT_SLOT(slotAccountReconcileStart()), actionCollection(), "account_reconcile"); + new TDEAction(i18n("Finish reconciliation", "Finish"), "media-skip-forward", 0, this, TQT_SLOT(slotAccountReconcileFinish()), actionCollection(), "account_reconcile_finish"); + new TDEAction(i18n("Postpone reconciliation", "Postpone"), "media-playback-pause", 0, this, TQT_SLOT(slotAccountReconcilePostpone()), actionCollection(), "account_reconcile_postpone"); + new TDEAction(i18n("Edit account..."), "edit", 0, this, TQT_SLOT(slotAccountEdit()), actionCollection(), "account_edit"); + new TDEAction(i18n("Delete account..."), "delete", 0, this, TQT_SLOT(slotAccountDelete()), actionCollection(), "account_delete"); + new TDEAction(i18n("Close account"), "", 0, this, TQT_SLOT(slotAccountClose()), actionCollection(), "account_close"); + new TDEAction(i18n("Reopen account"), "", 0, this, TQT_SLOT(slotAccountReopen()), actionCollection(), "account_reopen"); + new TDEAction(i18n("Transaction report"), "view_info", 0, this, TQT_SLOT(slotAccountTransactionReport()), actionCollection(), "account_transaction_report"); #ifdef HAVE_KDCHART - new TDEAction(i18n("Show balance chart..."), "application-x-kchart", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountChart()), actionCollection(), "account_chart"); + new TDEAction(i18n("Show balance chart..."), "application-x-kchart", 0, this, TQT_SLOT(slotAccountChart()), actionCollection(), "account_chart"); #endif - new TDEAction(i18n("Map to online account"), "news_subscribe", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountMapOnline()), actionCollection(), "account_online_map"); - new TDEAction(i18n("Unmap account"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountUnmapOnline()), actionCollection(), "account_online_unmap"); + new TDEAction(i18n("Map to online account"), "news_subscribe", 0, this, TQT_SLOT(slotAccountMapOnline()), actionCollection(), "account_online_map"); + new TDEAction(i18n("Unmap account"), "", 0, this, TQT_SLOT(slotAccountUnmapOnline()), actionCollection(), "account_online_unmap"); TDEActionMenu* menu = new TDEActionMenu(i18n("Update"), TQIconSet(TDEGlobal::iconLoader()->loadIcon("reload", TDEIcon::Small, TDEIcon::SizeSmall)), actionCollection(), "account_online_update_menu"); // activating the menu button is the same as selecting the current account - connect( menu, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT(slotAccountUpdateOnline())); - menu->insert(new TDEAction(i18n("Update account..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountUpdateOnline()), actionCollection(), "account_online_update")); - menu->insert(new TDEAction(i18n("Update all accounts..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountUpdateOnlineAll()), actionCollection(), "account_online_update_all")); + connect( menu, TQT_SIGNAL( activated() ), this, TQT_SLOT(slotAccountUpdateOnline())); + menu->insert(new TDEAction(i18n("Update account..."), "", 0, this, TQT_SLOT(slotAccountUpdateOnline()), actionCollection(), "account_online_update")); + menu->insert(new TDEAction(i18n("Update all accounts..."), "", 0, this, TQT_SLOT(slotAccountUpdateOnlineAll()), actionCollection(), "account_online_update_all")); // ******************* // The categories menu // ******************* - new TDEAction(i18n("New category..."), "account_add", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCategoryNew()), actionCollection(), "category_new"); - new TDEAction(i18n("Edit category..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountEdit()), actionCollection(), "category_edit"); - new TDEAction(i18n("Delete category..."), "delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccountDelete()), actionCollection(), "category_delete"); + new TDEAction(i18n("New category..."), "account_add", 0, this, TQT_SLOT(slotCategoryNew()), actionCollection(), "category_new"); + new TDEAction(i18n("Edit category..."), "edit", 0, this, TQT_SLOT(slotAccountEdit()), actionCollection(), "category_edit"); + new TDEAction(i18n("Delete category..."), "delete", 0, this, TQT_SLOT(slotAccountDelete()), actionCollection(), "category_delete"); // ************** // The tools menu // ************** - new TDEAction(i18n("QIF Profile Editor..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotQifProfileEditor()), actionCollection(), "tools_qif_editor"); - new TDEAction(i18n("Securities..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSecurityEditor()), actionCollection(), "tools_security_editor"); - new TDEAction(i18n("Currencies..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCurrencyDialog()), actionCollection(), "tools_currency_editor"); - new TDEAction(i18n("Prices..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPriceDialog()), actionCollection(), "tools_price_editor"); - new TDEAction(i18n("Update Stock and Currency Prices..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEquityPriceUpdate()), actionCollection(), "tools_update_prices"); - new TDEAction(i18n("Consistency Check"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileConsitencyCheck()), actionCollection(), "tools_consistency_check"); - new TDEAction(i18n("Performance-Test"), "fork", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPerformanceTest()), actionCollection(), "tools_performancetest"); - new TDEAction(i18n("KCalc..."), "kcalc", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToolsStartKCalc()), actionCollection(), "tools_kcalc"); + new TDEAction(i18n("QIF Profile Editor..."), "edit", 0, this, TQT_SLOT(slotQifProfileEditor()), actionCollection(), "tools_qif_editor"); + new TDEAction(i18n("Securities..."), "", 0, this, TQT_SLOT(slotSecurityEditor()), actionCollection(), "tools_security_editor"); + new TDEAction(i18n("Currencies..."), "", 0, this, TQT_SLOT(slotCurrencyDialog()), actionCollection(), "tools_currency_editor"); + new TDEAction(i18n("Prices..."), "", 0, this, TQT_SLOT(slotPriceDialog()), actionCollection(), "tools_price_editor"); + new TDEAction(i18n("Update Stock and Currency Prices..."), "", 0, this, TQT_SLOT(slotEquityPriceUpdate()), actionCollection(), "tools_update_prices"); + new TDEAction(i18n("Consistency Check"), "", 0, this, TQT_SLOT(slotFileConsitencyCheck()), actionCollection(), "tools_consistency_check"); + new TDEAction(i18n("Performance-Test"), "fork", 0, this, TQT_SLOT(slotPerformanceTest()), actionCollection(), "tools_performancetest"); + new TDEAction(i18n("KCalc..."), "kcalc", 0, this, TQT_SLOT(slotToolsStartKCalc()), actionCollection(), "tools_kcalc"); // ***************** // The settings menu // ***************** - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT( slotSettings() ), actionCollection()); - new TDEAction(i18n("Enable all messages"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEnableMessages()), actionCollection(), "settings_enable_messages"); - new TDEAction(i18n("TDE language settings..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotKDELanguageSettings()), actionCollection(), "settings_language"); + KStdAction::preferences(this, TQT_SLOT( slotSettings() ), actionCollection()); + new TDEAction(i18n("Enable all messages"), "", 0, this, TQT_SLOT(slotEnableMessages()), actionCollection(), "settings_enable_messages"); + new TDEAction(i18n("TDE language settings..."), "", 0, this, TQT_SLOT(slotKDELanguageSettings()), actionCollection(), "settings_language"); // ************* // The help menu // ************* - new TDEAction(i18n("&Show tip of the day"), "idea", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowTipOfTheDay()), actionCollection(), "help_show_tip"); + new TDEAction(i18n("&Show tip of the day"), "idea", 0, this, TQT_SLOT(slotShowTipOfTheDay()), actionCollection(), "help_show_tip"); // *************************** // Actions w/o main menu entry // *************************** - new TDEAction(i18n("New transaction button", "New"), "document-new", TQKeySequence(TQt::CTRL | TQt::Key_Insert), TQT_TQOBJECT(this), TQT_SLOT(slotTransactionsNew()), actionCollection(), "transaction_new"); + new TDEAction(i18n("New transaction button", "New"), "document-new", TQKeySequence(TQt::CTRL | TQt::Key_Insert), this, TQT_SLOT(slotTransactionsNew()), actionCollection(), "transaction_new"); // we use Return as the same shortcut for Edit and Enter. Therefore, we don't allow // to change them (The standard KDE dialog complains anyway if you want to assign // the same shortcut to two actions) - p = new TDEAction(i18n("Edit transaction button", "Edit"), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionsEdit()), actionCollection(), "transaction_edit"); + p = new TDEAction(i18n("Edit transaction button", "Edit"), "edit", 0, this, TQT_SLOT(slotTransactionsEdit()), actionCollection(), "transaction_edit"); p->setShortcutConfigurable(false); - p = new TDEAction(i18n("Enter transaction", "Enter"), "button_ok", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionsEnter()), actionCollection(), "transaction_enter"); + p = new TDEAction(i18n("Enter transaction", "Enter"), "button_ok", 0, this, TQT_SLOT(slotTransactionsEnter()), actionCollection(), "transaction_enter"); p->setShortcutConfigurable(false); - new TDEAction(i18n("Edit split button", "Edit splits"), "split_transaction", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionsEditSplits()), actionCollection(), "transaction_editsplits"); - new TDEAction(i18n("Cancel transaction edit", "Cancel"), "button_cancel", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionsCancel()), actionCollection(), "transaction_cancel"); - new TDEAction(i18n("Delete transaction", "Delete"), "delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionsDelete()), actionCollection(), "transaction_delete"); - new TDEAction(i18n("Duplicate transaction", "Duplicate"), "edit-copy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionDuplicate()), actionCollection(), "transaction_duplicate"); - - new TDEAction(i18n("Button text for match transaction", "Match"), "process-stop", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionMatch()), actionCollection(), "transaction_match"); - new TDEAction(i18n("Accept 'imported' and 'matched' transaction", "Accept"), "apply", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionsAccept()), actionCollection(), "transaction_accept"); - - new TDEAction(i18n("Toggle reconciliation flag", "Toggle"), 0, TDEShortcut("Ctrl+Space"), TQT_TQOBJECT(this), TQT_SLOT(slotToggleReconciliationFlag()), actionCollection(), "transaction_mark_toggle"); - new TDEAction(i18n("Mark transaction cleared", "Cleared"), 0, TDEShortcut("Ctrl+Alt+Space"), TQT_TQOBJECT(this), TQT_SLOT(slotMarkTransactionCleared()), actionCollection(), "transaction_mark_cleared"); - new TDEAction(i18n("Mark transaction reconciled", "Reconciled"), "", TDEShortcut("Ctrl+Shift+Space"), TQT_TQOBJECT(this), TQT_SLOT(slotMarkTransactionReconciled()), actionCollection(), "transaction_mark_reconciled"); - new TDEAction(i18n("Mark transaction not reconciled", "Not reconciled"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMarkTransactionNotReconciled()), actionCollection(), "transaction_mark_notreconciled"); - new TDEAction(i18n("Select all transactions", "Select all"), 0, TDEShortcut("Ctrl+A"), TQT_TQOBJECT(this), TQT_SIGNAL(selectAllTransactions()), actionCollection(), "transaction_select_all"); - - new TDEAction(i18n("Goto account"), "goto", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionGotoAccount()), actionCollection(), "transaction_goto_account"); - new TDEAction(i18n("Goto payee"), "goto", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionGotoPayee()), actionCollection(), "transaction_goto_payee"); - new TDEAction(i18n("Create scheduled transaction..."), "bookmark_add", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionCreateSchedule()), actionCollection(), "transaction_create_schedule"); - new TDEAction(i18n("Assign next number"), "", TDEShortcut("Ctrl+Shift+N"), TQT_TQOBJECT(this), TQT_SLOT(slotTransactionAssignNumber()), actionCollection(), "transaction_assign_number"); - new TDEAction(i18n("Combine transactions", "Combine"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTransactionCombine()), actionCollection(), "transaction_combine"); - - new TDEAction(i18n("New investment"), "document-new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotInvestmentNew()), actionCollection(), "investment_new"); - new TDEAction(i18n("Edit investment..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotInvestmentEdit()), actionCollection(), "investment_edit"); - new TDEAction(i18n("Delete investment..."), "delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotInvestmentDelete()), actionCollection(), "investment_delete"); - new TDEAction(i18n("Online price update..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOnlinePriceUpdate()), actionCollection(), "investment_online_price_update"); - new TDEAction(i18n("Manual price update..."), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotManualPriceUpdate()), actionCollection(), "investment_manual_price_update"); - - new TDEAction(i18n("New scheduled transaction..."), "document-new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotScheduleNew()), actionCollection(), "schedule_new"); - new TDEAction(i18n("Edit scheduled transaction..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotScheduleEdit()), actionCollection(), "schedule_edit"); - new TDEAction(i18n("Delete scheduled transaction..."), "delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotScheduleDelete()), actionCollection(), "schedule_delete"); - new TDEAction(i18n("Duplicate scheduled transaction"), "edit-copy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotScheduleDuplicate()), actionCollection(), "schedule_duplicate"); - new TDEAction(i18n("Enter next transaction..."), "key_enter", 0, TQT_TQOBJECT(this), TQT_SLOT(slotScheduleEnter()), actionCollection(), "schedule_enter"); - new TDEAction(i18n("Skip next transaction..."), "media-seek-forward", 0, TQT_TQOBJECT(this), TQT_SLOT(slotScheduleSkip()), actionCollection(), "schedule_skip"); - - new TDEAction(i18n("New payee"), "document-new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPayeeNew()), actionCollection(), "payee_new"); - new TDEAction(i18n("Rename payee"), "edit", 0, TQT_TQOBJECT(this), TQT_SIGNAL(payeeRename()), actionCollection(), "payee_rename"); - new TDEAction(i18n("Delete payee"), "delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPayeeDelete()), actionCollection(), "payee_delete"); - - new TDEAction(i18n("New budget"), "document-new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotBudgetNew()), actionCollection(), "budget_new"); - new TDEAction(i18n("Rename budget"), "edit", 0, TQT_TQOBJECT(this), TQT_SIGNAL(budgetRename()), actionCollection(), "budget_rename"); - new TDEAction(i18n("Delete budget"), "delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotBudgetDelete()), actionCollection(), "budget_delete"); - new TDEAction(i18n("Copy budget"), "edit-copy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotBudgetCopy()), actionCollection(), "budget_copy"); - new TDEAction(i18n("Change budget year"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotBudgetChangeYear()), actionCollection(), "budget_change_year"); - new TDEAction(i18n("Budget based on forecast", "Forecast"), "forcast", 0, TQT_TQOBJECT(this), TQT_SLOT(slotBudgetForecast()), actionCollection(), "budget_forecast"); + new TDEAction(i18n("Edit split button", "Edit splits"), "split_transaction", 0, this, TQT_SLOT(slotTransactionsEditSplits()), actionCollection(), "transaction_editsplits"); + new TDEAction(i18n("Cancel transaction edit", "Cancel"), "button_cancel", 0, this, TQT_SLOT(slotTransactionsCancel()), actionCollection(), "transaction_cancel"); + new TDEAction(i18n("Delete transaction", "Delete"), "delete", 0, this, TQT_SLOT(slotTransactionsDelete()), actionCollection(), "transaction_delete"); + new TDEAction(i18n("Duplicate transaction", "Duplicate"), "edit-copy", 0, this, TQT_SLOT(slotTransactionDuplicate()), actionCollection(), "transaction_duplicate"); + + new TDEAction(i18n("Button text for match transaction", "Match"), "process-stop", 0, this, TQT_SLOT(slotTransactionMatch()), actionCollection(), "transaction_match"); + new TDEAction(i18n("Accept 'imported' and 'matched' transaction", "Accept"), "apply", 0, this, TQT_SLOT(slotTransactionsAccept()), actionCollection(), "transaction_accept"); + + new TDEAction(i18n("Toggle reconciliation flag", "Toggle"), 0, TDEShortcut("Ctrl+Space"), this, TQT_SLOT(slotToggleReconciliationFlag()), actionCollection(), "transaction_mark_toggle"); + new TDEAction(i18n("Mark transaction cleared", "Cleared"), 0, TDEShortcut("Ctrl+Alt+Space"), this, TQT_SLOT(slotMarkTransactionCleared()), actionCollection(), "transaction_mark_cleared"); + new TDEAction(i18n("Mark transaction reconciled", "Reconciled"), "", TDEShortcut("Ctrl+Shift+Space"), this, TQT_SLOT(slotMarkTransactionReconciled()), actionCollection(), "transaction_mark_reconciled"); + new TDEAction(i18n("Mark transaction not reconciled", "Not reconciled"), "", 0, this, TQT_SLOT(slotMarkTransactionNotReconciled()), actionCollection(), "transaction_mark_notreconciled"); + new TDEAction(i18n("Select all transactions", "Select all"), 0, TDEShortcut("Ctrl+A"), this, TQT_SIGNAL(selectAllTransactions()), actionCollection(), "transaction_select_all"); + + new TDEAction(i18n("Goto account"), "goto", 0, this, TQT_SLOT(slotTransactionGotoAccount()), actionCollection(), "transaction_goto_account"); + new TDEAction(i18n("Goto payee"), "goto", 0, this, TQT_SLOT(slotTransactionGotoPayee()), actionCollection(), "transaction_goto_payee"); + new TDEAction(i18n("Create scheduled transaction..."), "bookmark_add", 0, this, TQT_SLOT(slotTransactionCreateSchedule()), actionCollection(), "transaction_create_schedule"); + new TDEAction(i18n("Assign next number"), "", TDEShortcut("Ctrl+Shift+N"), this, TQT_SLOT(slotTransactionAssignNumber()), actionCollection(), "transaction_assign_number"); + new TDEAction(i18n("Combine transactions", "Combine"), "", 0, this, TQT_SLOT(slotTransactionCombine()), actionCollection(), "transaction_combine"); + + new TDEAction(i18n("New investment"), "document-new", 0, this, TQT_SLOT(slotInvestmentNew()), actionCollection(), "investment_new"); + new TDEAction(i18n("Edit investment..."), "edit", 0, this, TQT_SLOT(slotInvestmentEdit()), actionCollection(), "investment_edit"); + new TDEAction(i18n("Delete investment..."), "delete", 0, this, TQT_SLOT(slotInvestmentDelete()), actionCollection(), "investment_delete"); + new TDEAction(i18n("Online price update..."), "", 0, this, TQT_SLOT(slotOnlinePriceUpdate()), actionCollection(), "investment_online_price_update"); + new TDEAction(i18n("Manual price update..."), "", 0, this, TQT_SLOT(slotManualPriceUpdate()), actionCollection(), "investment_manual_price_update"); + + new TDEAction(i18n("New scheduled transaction..."), "document-new", 0, this, TQT_SLOT(slotScheduleNew()), actionCollection(), "schedule_new"); + new TDEAction(i18n("Edit scheduled transaction..."), "edit", 0, this, TQT_SLOT(slotScheduleEdit()), actionCollection(), "schedule_edit"); + new TDEAction(i18n("Delete scheduled transaction..."), "delete", 0, this, TQT_SLOT(slotScheduleDelete()), actionCollection(), "schedule_delete"); + new TDEAction(i18n("Duplicate scheduled transaction"), "edit-copy", 0, this, TQT_SLOT(slotScheduleDuplicate()), actionCollection(), "schedule_duplicate"); + new TDEAction(i18n("Enter next transaction..."), "key_enter", 0, this, TQT_SLOT(slotScheduleEnter()), actionCollection(), "schedule_enter"); + new TDEAction(i18n("Skip next transaction..."), "media-seek-forward", 0, this, TQT_SLOT(slotScheduleSkip()), actionCollection(), "schedule_skip"); + + new TDEAction(i18n("New payee"), "document-new", 0, this, TQT_SLOT(slotPayeeNew()), actionCollection(), "payee_new"); + new TDEAction(i18n("Rename payee"), "edit", 0, this, TQT_SIGNAL(payeeRename()), actionCollection(), "payee_rename"); + new TDEAction(i18n("Delete payee"), "delete", 0, this, TQT_SLOT(slotPayeeDelete()), actionCollection(), "payee_delete"); + + new TDEAction(i18n("New budget"), "document-new", 0, this, TQT_SLOT(slotBudgetNew()), actionCollection(), "budget_new"); + new TDEAction(i18n("Rename budget"), "edit", 0, this, TQT_SIGNAL(budgetRename()), actionCollection(), "budget_rename"); + new TDEAction(i18n("Delete budget"), "delete", 0, this, TQT_SLOT(slotBudgetDelete()), actionCollection(), "budget_delete"); + new TDEAction(i18n("Copy budget"), "edit-copy", 0, this, TQT_SLOT(slotBudgetCopy()), actionCollection(), "budget_copy"); + new TDEAction(i18n("Change budget year"), "", 0, this, TQT_SLOT(slotBudgetChangeYear()), actionCollection(), "budget_change_year"); + new TDEAction(i18n("Budget based on forecast", "Forecast"), "forcast", 0, this, TQT_SLOT(slotBudgetForecast()), actionCollection(), "budget_forecast"); // ************************ // Currency actions // ************************ - new TDEAction(i18n("New currency"), "document-new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCurrencyNew()), actionCollection(), "currency_new"); - new TDEAction(i18n("Rename currency"), "edit", 0, TQT_TQOBJECT(this), TQT_SIGNAL(currencyRename()), actionCollection(), "currency_rename"); - new TDEAction(i18n("Delete currency"), "delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCurrencyDelete()), actionCollection(), "currency_delete"); - new TDEAction(i18n("Select as base currency"), "kmymoney2", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCurrencySetBase()), actionCollection(), "currency_setbase"); + new TDEAction(i18n("New currency"), "document-new", 0, this, TQT_SLOT(slotCurrencyNew()), actionCollection(), "currency_new"); + new TDEAction(i18n("Rename currency"), "edit", 0, this, TQT_SIGNAL(currencyRename()), actionCollection(), "currency_rename"); + new TDEAction(i18n("Delete currency"), "delete", 0, this, TQT_SLOT(slotCurrencyDelete()), actionCollection(), "currency_delete"); + new TDEAction(i18n("Select as base currency"), "kmymoney2", 0, this, TQT_SLOT(slotCurrencySetBase()), actionCollection(), "currency_setbase"); #ifdef KMM_DEBUG - new TDEAction("Test new feature", "", TDEShortcut("Ctrl+G"), TQT_TQOBJECT(this), TQT_SLOT(slotNewFeature()), actionCollection(), "new_user_wizard"); - new TDEToggleAction("Debug Traces", "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleTraces()), actionCollection(), "debug_traces"); - new TDEToggleAction("Debug Timers", "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleTimers()), actionCollection(), "debug_timers"); + new TDEAction("Test new feature", "", TDEShortcut("Ctrl+G"), this, TQT_SLOT(slotNewFeature()), actionCollection(), "new_user_wizard"); + new TDEToggleAction("Debug Traces", "", 0, this, TQT_SLOT(slotToggleTraces()), actionCollection(), "debug_traces"); + new TDEToggleAction("Debug Timers", "", 0, this, TQT_SLOT(slotToggleTimers()), actionCollection(), "debug_timers"); #endif // ************************ // Currently unused actions // ************************ #if 0 - new TDEToolBarPopupAction(i18n("View back"), "back", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowPreviousView()), actionCollection(), "go_back"); - new TDEToolBarPopupAction(i18n("View forward"), "forward", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowNextView()), actionCollection(), "go_forward"); + new TDEToolBarPopupAction(i18n("View back"), "back", 0, this, TQT_SLOT(slotShowPreviousView()), actionCollection(), "go_back"); + new TDEToolBarPopupAction(i18n("View forward"), "forward", 0, this, TQT_SLOT(slotShowNextView()), actionCollection(), "go_forward"); action("go_back")->setEnabled(false); action("go_forward")->setEnabled(false); @@ -1075,8 +1075,8 @@ bool KMyMoney2App::slotFileSaveAs(void) TQHBox* labelBox = new TQHBox(vbox); m_additionalKeyLabel = new TQLabel(i18n("Additional encryption key(s) to be used: %1").arg(m_additionalGpgKeys.count()), labelBox); m_additionalKeyButton = new KPushButton(i18n("Manage additional keys"), labelBox); - connect(m_additionalKeyButton, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotManageGpgKeys())); - connect(m_saveEncrypted, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotKeySelected(int))); + connect(m_additionalKeyButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotManageGpgKeys())); + connect(m_saveEncrypted, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotKeySelected(int))); // fill the secret key list and combo box TQStringList keyList; @@ -1109,7 +1109,7 @@ bool KMyMoney2App::slotFileSaveAs(void) TQString("%1|%2\n").arg("*.anon.xml").arg(i18n("Anonymous (Filefilter)", "Anonymous files")) + TQString("%1|%2\n").arg("*").arg(i18n("All files")), this, "filedialog", true, vbox); - connect(&dlg, TQT_SIGNAL(filterChanged(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAsFilterChanged(const TQString&))); + connect(&dlg, TQT_SIGNAL(filterChanged(const TQString&)), this, TQT_SLOT(slotFileSaveAsFilterChanged(const TQString&))); if ( !specialDir ) dlg.setSelection( prevDir ); // may also be a filename @@ -1276,7 +1276,7 @@ void KMyMoney2App::slotFileClose(void) // just create a new balance warning object delete d->m_balanceWarning; - d->m_balanceWarning = new KBalanceWarning(TQT_TQOBJECT(this)); + d->m_balanceWarning = new KBalanceWarning(this); emit fileLoaded(m_fileName); } @@ -1525,7 +1525,7 @@ void KMyMoney2App::slotQifImport(void) // remove all kmm-statement-#.txt files d->unlinkStatementXML(); - connect(m_qifReader, TQT_SIGNAL(importFinished()), TQT_TQOBJECT(this), TQT_SLOT(slotQifImportFinished())); + connect(m_qifReader, TQT_SIGNAL(importFinished()), this, TQT_SLOT(slotQifImportFinished())); m_qifReader->setURL(dlg->filename()); @@ -1774,7 +1774,7 @@ void KMyMoney2App::slotQifExport(void) if(dlg->exec()) { if(okToWriteFile(dlg->filename())) { MyMoneyQifWriter writer; - connect(&writer, TQT_SIGNAL(signalProgress(int, int)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusProgressBar(int, int))); + connect(&writer, TQT_SIGNAL(signalProgress(int, int)), this, TQT_SLOT(slotStatusProgressBar(int, int))); writer.write(dlg->filename(), dlg->profile(), dlg->accountId(), dlg->accountSelected(), dlg->categorySelected(), @@ -1830,7 +1830,7 @@ void KMyMoney2App::slotSettings(void) dlg->addPage(forecastPage, i18n("Forecast"), "forcast"); dlg->addPage(pluginsPage, i18n("Plugins"), "connect_no"); - connect(dlg, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateConfiguration())); + connect(dlg, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotUpdateConfiguration())); connect(dlg, TQT_SIGNAL(okClicked()), pluginsPage, TQT_SLOT(slotSavePlugins())); connect(dlg, TQT_SIGNAL(defaultClicked()), pluginsPage, TQT_SLOT(slotDefaultsPlugins())); @@ -2124,7 +2124,7 @@ void KMyMoney2App::slotFindTransaction(void) { if(m_searchDlg == 0) { m_searchDlg = new KFindTransactionDlg(); - connect(m_searchDlg, TQT_SIGNAL(destroyed()), TQT_TQOBJECT(this), TQT_SLOT(slotCloseSearchDialog())); + connect(m_searchDlg, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotCloseSearchDialog())); connect(m_searchDlg, TQT_SIGNAL(transactionSelected(const TQString&, const TQString&)), myMoneyView, TQT_SLOT(slotLedgerSelected(const TQString&, const TQString&))); } @@ -2467,10 +2467,10 @@ void KMyMoney2App::slotAccountNew(void) void KMyMoney2App::slotAccountNew(MyMoneyAccount& account) { NewAccountWizard::Wizard* wizard = new NewAccountWizard::Wizard(); - connect(wizard, TQT_SIGNAL(createInstitution(MyMoneyInstitution&)), TQT_TQOBJECT(this), TQT_SLOT(slotInstitutionNew(MyMoneyInstitution&))); - connect(wizard, TQT_SIGNAL(createAccount(MyMoneyAccount&)), TQT_TQOBJECT(this), TQT_SLOT(slotAccountNew(MyMoneyAccount&))); - connect(wizard, TQT_SIGNAL(createPayee(const TQString&, TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotPayeeNew(const TQString&, TQString&))); - connect(wizard, TQT_SIGNAL(createCategory(MyMoneyAccount&, const MyMoneyAccount&)), TQT_TQOBJECT(this), TQT_SLOT(slotCategoryNew(MyMoneyAccount&, const MyMoneyAccount&))); + connect(wizard, TQT_SIGNAL(createInstitution(MyMoneyInstitution&)), this, TQT_SLOT(slotInstitutionNew(MyMoneyInstitution&))); + connect(wizard, TQT_SIGNAL(createAccount(MyMoneyAccount&)), this, TQT_SLOT(slotAccountNew(MyMoneyAccount&))); + connect(wizard, TQT_SIGNAL(createPayee(const TQString&, TQString&)), this, TQT_SLOT(slotPayeeNew(const TQString&, TQString&))); + connect(wizard, TQT_SIGNAL(createCategory(MyMoneyAccount&, const MyMoneyAccount&)), this, TQT_SLOT(slotCategoryNew(MyMoneyAccount&, const MyMoneyAccount&))); wizard->setAccount(account); @@ -3038,8 +3038,8 @@ void KMyMoney2App::slotAccountEdit(void) } } else { KEditLoanWizard* wizard = new KEditLoanWizard(m_selectedAccount); - connect(wizard, TQT_SIGNAL(newCategory(MyMoneyAccount&)), TQT_TQOBJECT(this), TQT_SLOT(slotCategoryNew(MyMoneyAccount&))); - connect(wizard, TQT_SIGNAL(createPayee(const TQString&, TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotPayeeNew(const TQString&, TQString&))); + connect(wizard, TQT_SIGNAL(newCategory(MyMoneyAccount&)), this, TQT_SLOT(slotCategoryNew(MyMoneyAccount&))); + connect(wizard, TQT_SIGNAL(createPayee(const TQString&, TQString&)), this, TQT_SLOT(slotPayeeNew(const TQString&, TQString&))); if(wizard->exec() == TQDialog::Accepted) { MyMoneySchedule sch = file->schedule(m_selectedAccount.value("schedule").latin1()); if(!(m_selectedAccount == wizard->account()) @@ -3122,8 +3122,8 @@ void KMyMoney2App::slotAccountReconcileStart(void) delete m_endingBalanceDlg; m_endingBalanceDlg = new KEndingBalanceDlg(account, this); if(account.isAssetLiability()) { - connect(m_endingBalanceDlg, TQT_SIGNAL(createPayee(const TQString&, TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotPayeeNew(const TQString&, TQString&))); - connect(m_endingBalanceDlg, TQT_SIGNAL(createCategory(MyMoneyAccount&, const MyMoneyAccount&)), TQT_TQOBJECT(this), TQT_SLOT(slotCategoryNew(MyMoneyAccount&, const MyMoneyAccount&))); + connect(m_endingBalanceDlg, TQT_SIGNAL(createPayee(const TQString&, TQString&)), this, TQT_SLOT(slotPayeeNew(const TQString&, TQString&))); + connect(m_endingBalanceDlg, TQT_SIGNAL(createCategory(MyMoneyAccount&, const MyMoneyAccount&)), this, TQT_SLOT(slotCategoryNew(MyMoneyAccount&, const MyMoneyAccount&))); if(m_endingBalanceDlg->exec() == TQDialog::Accepted) { if(myMoneyView->startReconciliation(account, m_endingBalanceDlg->statementDate(), m_endingBalanceDlg->endingBalance())) { @@ -3534,8 +3534,8 @@ void KMyMoney2App::slotScheduleEdit(void) case MyMoneySchedule::TYPE_LOANPAYMENT: loan_wiz = new KEditLoanWizard(schedule.account(2)); - connect(loan_wiz, TQT_SIGNAL(newCategory(MyMoneyAccount&)), TQT_TQOBJECT(this), TQT_SLOT(slotCategoryNew(MyMoneyAccount&))); - connect(loan_wiz, TQT_SIGNAL(createPayee(const TQString&, TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotPayeeNew(const TQString&, TQString&))); + connect(loan_wiz, TQT_SIGNAL(newCategory(MyMoneyAccount&)), this, TQT_SLOT(slotCategoryNew(MyMoneyAccount&))); + connect(loan_wiz, TQT_SIGNAL(createPayee(const TQString&, TQString&)), this, TQT_SLOT(slotPayeeNew(const TQString&, TQString&))); if (loan_wiz->exec() == TQDialog::Accepted) { MyMoneyFileTransaction ft; try { @@ -4442,10 +4442,10 @@ void KMyMoney2App::slotTransactionsNew(void) payeeEdit->completion()->hide(); } if(m_transactionEditor) { - connect(m_transactionEditor, TQT_SIGNAL(statusProgress(int, int)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusProgressBar(int, int))); - connect(m_transactionEditor, TQT_SIGNAL(statusMsg(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg(const TQString&))); - connect(m_transactionEditor, TQT_SIGNAL(scheduleTransaction(const MyMoneyTransaction&, MyMoneySchedule::occurenceE)), TQT_TQOBJECT(this), TQT_SLOT(slotScheduleNew(const MyMoneyTransaction&, MyMoneySchedule::occurenceE))); - connect(m_transactionEditor, TQT_SIGNAL(transactionDataSufficient(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateActions())); + connect(m_transactionEditor, TQT_SIGNAL(statusProgress(int, int)), this, TQT_SLOT(slotStatusProgressBar(int, int))); + connect(m_transactionEditor, TQT_SIGNAL(statusMsg(const TQString&)), this, TQT_SLOT(slotStatusMsg(const TQString&))); + connect(m_transactionEditor, TQT_SIGNAL(scheduleTransaction(const MyMoneyTransaction&, MyMoneySchedule::occurenceE)), this, TQT_SLOT(slotScheduleNew(const MyMoneyTransaction&, MyMoneySchedule::occurenceE))); + connect(m_transactionEditor, TQT_SIGNAL(transactionDataSufficient(bool)), this, TQT_SLOT(slotUpdateActions())); } slotUpdateActions(); } @@ -4461,7 +4461,7 @@ void KMyMoney2App::slotTransactionsEdit(void) // as soon as we edit a transaction, we don't remember the last payee entered d->m_lastPayeeEntered = TQString(); m_transactionEditor = myMoneyView->startEdit(m_selectedTransactions); - connect(m_transactionEditor, TQT_SIGNAL(transactionDataSufficient(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateActions())); + connect(m_transactionEditor, TQT_SIGNAL(transactionDataSufficient(bool)), this, TQT_SLOT(slotUpdateActions())); slotUpdateActions(); } } @@ -5676,12 +5676,12 @@ void KMyMoney2App::slotDataChanged(void) void KMyMoney2App::slotCurrencyDialog(void) { KCurrencyEditDlg dlg(this, "Currency Editor"); - connect(&dlg, TQT_SIGNAL(selectObject(const MyMoneySecurity&)), TQT_TQOBJECT(this), TQT_SLOT(slotSelectCurrency(const MyMoneySecurity&))); - connect(&dlg, TQT_SIGNAL(openContextMenu(const MyMoneySecurity&)), TQT_TQOBJECT(this), TQT_SLOT(slotShowCurrencyContextMenu())); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(currencyRename()), &dlg, TQT_SLOT(slotStartRename())); - connect(&dlg, TQT_SIGNAL(renameCurrency(TQListViewItem*, int, const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotCurrencyRename(TQListViewItem*,int,const TQString&))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(currencyCreated(const TQString&)), &dlg, TQT_SLOT(slotSelectCurrency(const TQString&))); - connect(&dlg, TQT_SIGNAL(selectBaseCurrency(const MyMoneySecurity&)), TQT_TQOBJECT(this), TQT_SLOT(slotCurrencySetBase())); + connect(&dlg, TQT_SIGNAL(selectObject(const MyMoneySecurity&)), this, TQT_SLOT(slotSelectCurrency(const MyMoneySecurity&))); + connect(&dlg, TQT_SIGNAL(openContextMenu(const MyMoneySecurity&)), this, TQT_SLOT(slotShowCurrencyContextMenu())); + connect(this, TQT_SIGNAL(currencyRename()), &dlg, TQT_SLOT(slotStartRename())); + connect(&dlg, TQT_SIGNAL(renameCurrency(TQListViewItem*, int, const TQString&)), this, TQT_SLOT(slotCurrencyRename(TQListViewItem*,int,const TQString&))); + connect(this, TQT_SIGNAL(currencyCreated(const TQString&)), &dlg, TQT_SLOT(slotSelectCurrency(const TQString&))); + connect(&dlg, TQT_SIGNAL(selectBaseCurrency(const MyMoneySecurity&)), this, TQT_SLOT(slotCurrencySetBase())); dlg.exec(); @@ -5915,10 +5915,10 @@ void KMyMoney2App::createInterfaces(void) void KMyMoney2App::loadPlugins(void) { - d->m_pluginLoader = new KMyMoneyPlugin::PluginLoader(TQT_TQOBJECT(this)); + d->m_pluginLoader = new KMyMoneyPlugin::PluginLoader(this); - connect( d->m_pluginLoader, TQT_SIGNAL( plug(KPluginInfo*) ), TQT_TQOBJECT(this), TQT_SLOT( slotPluginPlug(KPluginInfo*) ) ); - connect( d->m_pluginLoader, TQT_SIGNAL( unplug(KPluginInfo*) ), TQT_TQOBJECT(this), TQT_SLOT( slotPluginUnplug(KPluginInfo*) ) ); + connect( d->m_pluginLoader, TQT_SIGNAL( plug(KPluginInfo*) ), this, TQT_SLOT( slotPluginPlug(KPluginInfo*) ) ); + connect( d->m_pluginLoader, TQT_SIGNAL( unplug(KPluginInfo*) ), this, TQT_SLOT( slotPluginUnplug(KPluginInfo*) ) ); d->m_pluginLoader->loadPlugins(); } @@ -5988,7 +5988,7 @@ void KMyMoney2App::slotDateChanged(void) TQDateTime dt = TQDateTime::currentDateTime(); TQDateTime nextDay( TQDate(dt.date().addDays(1)), TQTime(0, 0, 0) ); - TQTimer::singleShot(dt.secsTo(nextDay)*1000, TQT_TQOBJECT(this), TQT_SLOT(slotDateChanged())); + TQTimer::singleShot(dt.secsTo(nextDay)*1000, this, TQT_SLOT(slotDateChanged())); myMoneyView->slotRefreshViews(); } diff --git a/kmymoney2/widgets/kmymoneycalculator.cpp b/kmymoney2/widgets/kmymoneycalculator.cpp index 5222288..758f4a2 100644 --- a/kmymoney2/widgets/kmymoneycalculator.cpp +++ b/kmymoney2/widgets/kmymoneycalculator.cpp @@ -108,17 +108,17 @@ kMyMoneyCalculator::kMyMoneyCalculator(TQWidget* parent, const char *name) changeDisplay("0"); // connect the digit signals through a signal mapper - TQSignalMapper* mapper = new TQSignalMapper(TQT_TQOBJECT(this)); + TQSignalMapper* mapper = new TQSignalMapper(this); for(int i = 0; i < 10; ++i) { - mapper->setMapping(TQT_TQOBJECT(buttons[i]), i); + mapper->setMapping(buttons[i], i); connect(buttons[i], TQT_SIGNAL(clicked()), mapper, TQT_SLOT(map())); } connect(mapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(digitClicked(int))); // connect the calculation operations through another mapper - mapper = new TQSignalMapper(TQT_TQOBJECT(this)); + mapper = new TQSignalMapper(this); for(int i = PLUS; i <= EQUAL; ++i) { - mapper->setMapping(TQT_TQOBJECT(buttons[i]), i); + mapper->setMapping(buttons[i], i); connect(buttons[i], TQT_SIGNAL(clicked()), mapper, TQT_SLOT(map())); } connect(mapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(calculationClicked(int))); diff --git a/kmymoney2/widgets/kmymoneydateinput.cpp b/kmymoney2/widgets/kmymoneydateinput.cpp index 539660d..957b245 100644 --- a/kmymoney2/widgets/kmymoneydateinput.cpp +++ b/kmymoney2/widgets/kmymoneydateinput.cpp @@ -149,9 +149,9 @@ kMyMoneyDateInput::kMyMoneyDateInput(TQWidget *parent, const char *name, TQt::Al void kMyMoneyDateInput::markAsBadDate(bool bad, const TQColor& color) { if(dateEdit->focusProxy()) { - TQT_TQWIDGET(dateEdit->focusProxy())->setPaletteForegroundColor(paletteForegroundColor()); + dateEdit->focusProxy()->setPaletteForegroundColor(paletteForegroundColor()); if(bad) - TQT_TQWIDGET(dateEdit->focusProxy())->setPaletteForegroundColor(color); + dateEdit->focusProxy()->setPaletteForegroundColor(color); } } @@ -345,7 +345,7 @@ TQWidget* kMyMoneyDateInput::focusWidget(void) const { TQWidget* w = dateEdit; while(w->focusProxy()) - w = TQT_TQWIDGET(w->focusProxy()); + w = w->focusProxy(); return w; } diff --git a/kmymoney2/widgets/kmymoneyedit.cpp b/kmymoney2/widgets/kmymoneyedit.cpp index 609037e..cef4ffb 100644 --- a/kmymoney2/widgets/kmymoneyedit.cpp +++ b/kmymoney2/widgets/kmymoneyedit.cpp @@ -213,7 +213,7 @@ void kMyMoneyEdit::init(void) setFocusProxy(m_edit); // Yes, just a simple double validator ! - kMyMoneyMoneyValidator *validator = new kMyMoneyMoneyValidator(TQT_TQOBJECT(this)); + kMyMoneyMoneyValidator *validator = new kMyMoneyMoneyValidator(this); m_edit->setValidator(validator); m_edit->setAlignment(AlignRight | AlignVCenter); @@ -504,7 +504,7 @@ TQWidget* kMyMoneyEdit::focusWidget(void) const { TQWidget* w = m_edit; while(w->focusProxy()) - w = TQT_TQWIDGET(w->focusProxy()); + w = w->focusProxy(); return w; } diff --git a/kmymoney2/widgets/kmymoneywizard.cpp b/kmymoney2/widgets/kmymoneywizard.cpp index 395b329..42740fe 100644 --- a/kmymoney2/widgets/kmymoneywizard.cpp +++ b/kmymoney2/widgets/kmymoneywizard.cpp @@ -60,9 +60,9 @@ void KMyMoneyWizardPagePrivate::emitCompleteStateChanged(void) KMyMoneyWizardPage::KMyMoneyWizardPage(unsigned int step, TQWidget* widget, const char* name) : m_step(step), m_widget(widget), - d(new KMyMoneyWizardPagePrivate(TQT_TQOBJECT(widget), name)) + d(new KMyMoneyWizardPagePrivate(widget, name)) { - m_mandatoryGroup = new kMandatoryFieldGroup(TQT_TQOBJECT(widget)); + m_mandatoryGroup = new kMandatoryFieldGroup(widget); TQObject::connect(m_mandatoryGroup, TQT_SIGNAL(stateChanged()), object(), TQT_SIGNAL(completeStateChanged())); widget->hide(); } diff --git a/kmymoney2/widgets/transaction.cpp b/kmymoney2/widgets/transaction.cpp index 4327bdd..7f153ff 100644 --- a/kmymoney2/widgets/transaction.cpp +++ b/kmymoney2/widgets/transaction.cpp @@ -606,7 +606,7 @@ TQWidget* Transaction::focusWidget(TQWidget* w) const { if(w) { while(w->focusProxy()) - w = TQT_TQWIDGET(w->focusProxy()); + w = w->focusProxy(); } return w; } |