From fecb0e67b23e8b83ba7fc881bb57bc48c0852d62 Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 5 Jul 2011 06:00:29 +0000 Subject: TQt4 port kmymoney This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kmymoney@1239855 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- .../dialogs/kreportconfigurationfilterdlg.cpp | 142 ++++++++++----------- 1 file changed, 71 insertions(+), 71 deletions(-) (limited to 'kmymoney2/dialogs/kreportconfigurationfilterdlg.cpp') diff --git a/kmymoney2/dialogs/kreportconfigurationfilterdlg.cpp b/kmymoney2/dialogs/kreportconfigurationfilterdlg.cpp index 949601d..d904d1a 100644 --- a/kmymoney2/dialogs/kreportconfigurationfilterdlg.cpp +++ b/kmymoney2/dialogs/kreportconfigurationfilterdlg.cpp @@ -28,22 +28,22 @@ // ---------------------------------------------------------------------------- // QT Includes -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // ---------------------------------------------------------------------------- // KDE Includes @@ -76,8 +76,8 @@ #include "../widgets/kmymoneyreportconfigtabchartdecl.h" KReportConfigurationFilterDlg::KReportConfigurationFilterDlg( - MyMoneyReport report, QWidget *parent, const char *name) - : KFindTransactionDlg(parent, name), + MyMoneyReport report, TQWidget *tqparent, const char *name) + : KFindTransactionDlg(tqparent, name), m_tab2(0), m_tab3(0), m_tabChart(0), @@ -96,13 +96,13 @@ KReportConfigurationFilterDlg::KReportConfigurationFilterDlg( // // the Ok button is always enabled - disconnect(SIGNAL(selectionEmpty(bool))); + disconnect(TQT_SIGNAL(selectionEmpty(bool))); m_searchButton->setGuiItem( KStdGuiItem::ok() ); m_searchButton->setEnabled(true); // reconnect the close button m_closeButton->disconnect(); - connect(m_closeButton, SIGNAL(clicked()), this, SLOT(reject())); + connect(m_closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); // // Add new tabs @@ -115,10 +115,10 @@ KReportConfigurationFilterDlg::KReportConfigurationFilterDlg( { m_tab2 = new kMyMoneyReportConfigTab2Decl( m_criteriaTab, "kMyMoneyReportConfigTab2" ); m_criteriaTab->insertTab( m_tab2, i18n( "Rows/Columns"), 1 ); - connect(m_tab2->m_comboRows, SIGNAL(highlighted(int)), this, SLOT(slotRowTypeChanged(int))); - connect(m_tab2->m_comboColumns, SIGNAL(activated(int)), this, SLOT(slotColumnTypeChanged(int))); + connect(m_tab2->m_comboRows, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotRowTypeChanged(int))); + connect(m_tab2->m_comboColumns, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotColumnTypeChanged(int))); //control the state of the includeTransfer check - connect(m_categoriesView, SIGNAL(stateChanged()), this, SLOT(slotUpdateCheckTransfers())); + connect(m_categoriesView, TQT_SIGNAL(stateChanged()), this, TQT_SLOT(slotUpdateCheckTransfers())); #ifdef HAVE_KDCHART m_tabChart = new kMyMoneyReportConfigTabChartDecl( m_criteriaTab, "kMyMoneyReportConfigTabChart" ); @@ -139,8 +139,8 @@ KReportConfigurationFilterDlg::KReportConfigurationFilterDlg( m_criteriaTab->showPage( m_tab1 ); m_criteriaTab->setMinimumSize( 500,200 ); - QValueList list = MyMoneyFile::instance()->budgetList(); - QValueList::const_iterator it_b; + TQValueList list = MyMoneyFile::instance()->budgetList(); + TQValueList::const_iterator it_b; for(it_b = list.begin(); it_b != list.end(); ++it_b) { m_budgets.push_back(*it_b); } @@ -201,7 +201,7 @@ void KReportConfigurationFilterDlg::slotSearch(void) if(m_tab2->m_comboBudget->isEnabled()) { m_currentState.setBudget(m_budgets[m_tab2->m_comboBudget->currentItem()].id(), m_initialState.rowType() == MyMoneyReport::eBudgetActual); } else { - m_currentState.setBudget(QString(), false); + m_currentState.setBudget(TQString(), false); } //set moving average days @@ -214,32 +214,32 @@ void KReportConfigurationFilterDlg::slotSearch(void) MyMoneyReport::ERowType rtq[7] = { MyMoneyReport::eCategory, MyMoneyReport::eTopCategory, MyMoneyReport::ePayee, MyMoneyReport::eAccount, MyMoneyReport::eTopAccount, MyMoneyReport::eMonth, MyMoneyReport::eWeek }; m_currentState.setRowType( rtq[m_tab3->m_comboOrganizeBy->currentItem()] ); - unsigned qc = MyMoneyReport::eQCnone; + unsigned qc = MyMoneyReport::eTQCnone; - if (m_currentState.queryColumns() & MyMoneyReport::eQCloan) + if (m_currentState.queryColumns() & MyMoneyReport::eTQCloan) // once a loan report, always a loan report - qc = MyMoneyReport::eQCloan; + qc = MyMoneyReport::eTQCloan; if ( m_tab3->m_checkNumber->isChecked() ) - qc |= MyMoneyReport::eQCnumber; + qc |= MyMoneyReport::eTQCnumber; if ( m_tab3->m_checkPayee->isChecked() ) - qc |= MyMoneyReport::eQCpayee; + qc |= MyMoneyReport::eTQCpayee; if ( m_tab3->m_checkCategory->isChecked() ) - qc |= MyMoneyReport::eQCcategory; + qc |= MyMoneyReport::eTQCcategory; if ( m_tab3->m_checkMemo->isChecked() ) - qc |= MyMoneyReport::eQCmemo; + qc |= MyMoneyReport::eTQCmemo; if ( m_tab3->m_checkAccount->isChecked() ) - qc |= MyMoneyReport::eQCaccount; + qc |= MyMoneyReport::eTQCaccount; if ( m_tab3->m_checkReconciled->isChecked() ) - qc |= MyMoneyReport::eQCreconciled; + qc |= MyMoneyReport::eTQCreconciled; if ( m_tab3->m_checkAction->isChecked() ) - qc |= MyMoneyReport::eQCaction; + qc |= MyMoneyReport::eTQCaction; if ( m_tab3->m_checkShares->isChecked() ) - qc |= MyMoneyReport::eQCshares; + qc |= MyMoneyReport::eTQCshares; if ( m_tab3->m_checkPrice->isChecked() ) - qc |= MyMoneyReport::eQCprice; + qc |= MyMoneyReport::eTQCprice; if( m_tab3->m_checkBalance->isChecked() ) - qc |= MyMoneyReport::eQCbalance; + qc |= MyMoneyReport::eTQCbalance; m_currentState.setQueryColumns(static_cast(qc)); @@ -373,12 +373,12 @@ void KReportConfigurationFilterDlg::slotReset(void) || m_initialState.rowType() == MyMoneyReport::eBudgetActual) { m_tab2->m_comboRows->setEnabled(false); m_tab2->m_budgetFrame->setEnabled(!m_budgets.empty()); - QValueVector::const_iterator it_b; + TQValueVector::const_iterator it_b; int i = 0; for(it_b = m_budgets.begin(); it_b != m_budgets.end(); ++it_b) { m_tab2->m_comboBudget->insertItem((*it_b).name(), i); //set the current selected item - if( (m_initialState.budget() == "Any" && (*it_b).budgetStart().year() == QDate::currentDate().year()) + if( (m_initialState.budget() == "Any" && (*it_b).budgetStart().year() == TQDate::tqcurrentDate().year()) || m_initialState.budget() == (*it_b).id()) m_tab2->m_comboBudget->setCurrentItem(i); i++; @@ -426,16 +426,16 @@ void KReportConfigurationFilterDlg::slotReset(void) } unsigned qc = m_initialState.queryColumns(); - m_tab3->m_checkNumber->setChecked(qc & MyMoneyReport::eQCnumber); - m_tab3->m_checkPayee->setChecked(qc & MyMoneyReport::eQCpayee); - m_tab3->m_checkCategory->setChecked(qc & MyMoneyReport::eQCcategory); - m_tab3->m_checkMemo->setChecked(qc & MyMoneyReport::eQCmemo); - m_tab3->m_checkAccount->setChecked(qc & MyMoneyReport::eQCaccount); - m_tab3->m_checkReconciled->setChecked(qc & MyMoneyReport::eQCreconciled); - m_tab3->m_checkAction->setChecked(qc & MyMoneyReport::eQCaction); - m_tab3->m_checkShares->setChecked(qc & MyMoneyReport::eQCshares); - m_tab3->m_checkPrice->setChecked(qc & MyMoneyReport::eQCprice); - m_tab3->m_checkBalance->setChecked(qc & MyMoneyReport::eQCbalance); + m_tab3->m_checkNumber->setChecked(qc & MyMoneyReport::eTQCnumber); + m_tab3->m_checkPayee->setChecked(qc & MyMoneyReport::eTQCpayee); + m_tab3->m_checkCategory->setChecked(qc & MyMoneyReport::eTQCcategory); + m_tab3->m_checkMemo->setChecked(qc & MyMoneyReport::eTQCmemo); + m_tab3->m_checkAccount->setChecked(qc & MyMoneyReport::eTQCaccount); + m_tab3->m_checkReconciled->setChecked(qc & MyMoneyReport::eTQCreconciled); + m_tab3->m_checkAction->setChecked(qc & MyMoneyReport::eTQCaction); + m_tab3->m_checkShares->setChecked(qc & MyMoneyReport::eTQCshares); + m_tab3->m_checkPrice->setChecked(qc & MyMoneyReport::eTQCprice); + m_tab3->m_checkBalance->setChecked(qc & MyMoneyReport::eTQCbalance); m_tab3->m_checkTax->setChecked( m_initialState.isTax() ); m_tab3->m_checkInvestments->setChecked( m_initialState.isInvestmentsOnly() ); @@ -478,7 +478,7 @@ void KReportConfigurationFilterDlg::slotReset(void) // Text Filter // - QRegExp textfilter; + TQRegExp textfilter; if ( m_initialState.textFilter(textfilter)) { m_textEdit->setText(textfilter.pattern()); @@ -503,7 +503,7 @@ void KReportConfigurationFilterDlg::slotReset(void) // Number Filter // - QString nrFrom, nrTo; + TQString nrFrom, nrTo; if ( m_initialState.numberFilter(nrFrom, nrTo) ) { if ( nrFrom == nrTo ) @@ -512,8 +512,8 @@ void KReportConfigurationFilterDlg::slotReset(void) m_nrFromEdit->setEnabled(false); m_nrToEdit->setEnabled(false); m_nrEdit->setText(nrFrom); - m_nrFromEdit->setText(QString()); - m_nrToEdit->setText(QString()); + m_nrFromEdit->setText(TQString()); + m_nrToEdit->setText(TQString()); m_nrButton->setChecked(true); m_nrRangeButton->setChecked(false); } @@ -522,7 +522,7 @@ void KReportConfigurationFilterDlg::slotReset(void) m_nrEdit->setEnabled(false); m_nrFromEdit->setEnabled(true); m_nrToEdit->setEnabled(false); - m_nrEdit->setText(QString()); + m_nrEdit->setText(TQString()); m_nrFromEdit->setText(nrFrom); m_nrToEdit->setText(nrTo); m_nrButton->setChecked(false); @@ -534,9 +534,9 @@ void KReportConfigurationFilterDlg::slotReset(void) m_nrEdit->setEnabled(true); m_nrFromEdit->setEnabled(false); m_nrToEdit->setEnabled(false); - m_nrEdit->setText(QString()); - m_nrFromEdit->setText(QString()); - m_nrToEdit->setText(QString()); + m_nrEdit->setText(TQString()); + m_nrFromEdit->setText(TQString()); + m_nrToEdit->setText(TQString()); m_nrButton->setChecked(true); m_nrRangeButton->setChecked(false); } @@ -553,9 +553,9 @@ void KReportConfigurationFilterDlg::slotReset(void) m_amountEdit->setEnabled(true); m_amountFromEdit->setEnabled(false); m_amountToEdit->setEnabled(false); - m_amountEdit->loadText(QString::number(from.toDouble())); - m_amountFromEdit->loadText(QString()); - m_amountToEdit->loadText(QString()); + m_amountEdit->loadText(TQString::number(from.toDouble())); + m_amountFromEdit->loadText(TQString()); + m_amountToEdit->loadText(TQString()); m_amountButton->setChecked(true); m_amountRangeButton->setChecked(false); } @@ -564,9 +564,9 @@ void KReportConfigurationFilterDlg::slotReset(void) m_amountEdit->setEnabled(false); m_amountFromEdit->setEnabled(true); m_amountToEdit->setEnabled(true); - m_amountEdit->loadText(QString()); - m_amountFromEdit->loadText(QString::number(from.toDouble())); - m_amountToEdit->loadText(QString::number(to.toDouble())); + m_amountEdit->loadText(TQString()); + m_amountFromEdit->loadText(TQString::number(from.toDouble())); + m_amountToEdit->loadText(TQString::number(to.toDouble())); m_amountButton->setChecked(false); m_amountRangeButton->setChecked(true); } @@ -576,9 +576,9 @@ void KReportConfigurationFilterDlg::slotReset(void) m_amountEdit->setEnabled(true); m_amountFromEdit->setEnabled(false); m_amountToEdit->setEnabled(false); - m_amountEdit->loadText(QString()); - m_amountFromEdit->loadText(QString()); - m_amountToEdit->loadText(QString()); + m_amountEdit->loadText(TQString()); + m_amountFromEdit->loadText(TQString()); + m_amountToEdit->loadText(TQString()); m_amountButton->setChecked(true); m_amountRangeButton->setChecked(false); } @@ -587,7 +587,7 @@ void KReportConfigurationFilterDlg::slotReset(void) // Payees Filter // - QStringList payees; + TQStringList payees; if ( m_initialState.payees(payees) ) { if ( payees.empty() ) @@ -609,7 +609,7 @@ void KReportConfigurationFilterDlg::slotReset(void) // Accounts Filter // - QStringList accounts; + TQStringList accounts; if ( m_initialState.accounts(accounts) ) { m_accountsView->selectAllItems(false); @@ -638,7 +638,7 @@ void KReportConfigurationFilterDlg::slotReset(void) // that's why we call it last m_initialState.updateDateFilter(); - QDate dateFrom, dateTo; + TQDate dateFrom, dateTo; if ( m_initialState.dateFilter( dateFrom, dateTo ) ) { if(m_initialState.isUserDefined()) { -- cgit v1.2.1