diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
commit | 7e51b6d5ddc01fc3bc69f30bc5d3933a7709dbf2 (patch) | |
tree | 6a288b084438ed144c0fbd4a34a9a22caf4d6b04 /kmymoney2/reports | |
parent | 154e6e6105157c321cbd578d238c525da419f868 (diff) | |
download | kmymoney-7e51b6d5ddc01fc3bc69f30bc5d3933a7709dbf2.tar.gz kmymoney-7e51b6d5ddc01fc3bc69f30bc5d3933a7709dbf2.zip |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kmymoney@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmymoney2/reports')
-rw-r--r-- | kmymoney2/reports/kreportchartview.cpp | 2 | ||||
-rw-r--r-- | kmymoney2/reports/listtable.cpp | 14 | ||||
-rw-r--r-- | kmymoney2/reports/pivotgrid.h | 2 | ||||
-rw-r--r-- | kmymoney2/reports/pivottable.cpp | 22 | ||||
-rw-r--r-- | kmymoney2/reports/querytabletest.cpp | 6 |
5 files changed, 23 insertions, 23 deletions
diff --git a/kmymoney2/reports/kreportchartview.cpp b/kmymoney2/reports/kreportchartview.cpp index e9c9060..c20618b 100644 --- a/kmymoney2/reports/kreportchartview.cpp +++ b/kmymoney2/reports/kreportchartview.cpp @@ -124,7 +124,7 @@ void KReportChartView::mouseMoveEvent( TQMouseEvent* event ) TQPtrListIterator < KDChartDataRegion > it( *(this->dataRegions()) ); while ( ( current = it.current() ) ) { ++it; - if ( current->tqcontains( event->pos() ) ) + if ( current->contains( event->pos() ) ) { // we found the data region that contains the mouse value = this->data()->cellVal(current->row, current->col).toDouble(); diff --git a/kmymoney2/reports/listtable.cpp b/kmymoney2/reports/listtable.cpp index 16db407..481b6b2 100644 --- a/kmymoney2/reports/listtable.cpp +++ b/kmymoney2/reports/listtable.cpp @@ -310,7 +310,7 @@ namespace reports { // this could be overridden using the "fraction" element of a row for each row. // Currently (2008-02-21) this override is not used at all (ipwizard) int fraction = file->baseCurrency().smallestAccountFraction(); - if ( ( *it_row ).tqfind ( "fraction" ) != ( *it_row ).end() ) + if ( ( *it_row ).find ( "fraction" ) != ( *it_row ).end() ) fraction = ( *it_row ) ["fraction"].toInt(); // @@ -390,7 +390,7 @@ namespace reports { // skip the opening and closing balance row, // if the balance column is not shown - if ( ( columns.tqcontains ( "balance" ) == 0 ) && ( ( *it_row ) ["rank"] == "-2" ) ) + if ( ( columns.contains ( "balance" ) == 0 ) && ( ( *it_row ) ["rank"] == "-2" ) ) continue; bool need_label = true; @@ -468,7 +468,7 @@ namespace reports { // TODO: This and the i18n headings are handled // as a set of parallel vectors. Would be much better to make a single // vector of a properties class. - if ( sharesColumns.tqcontains ( *it_column ) ) + if ( sharesColumns.contains ( *it_column ) ) { if ( data.isEmpty() ) { result += TQString ( "<td></td>" ); @@ -479,7 +479,7 @@ namespace reports { csv += "\"" + MyMoneyMoney ( data ).formatMoney ( "", 3, false ) + "\","; } } - else if ( moneyColumns.tqcontains ( *it_column ) ) + else if ( moneyColumns.contains ( *it_column ) ) { if ( data.isEmpty() ) { result += TQString ( "<td%1></td>" ) @@ -502,13 +502,13 @@ namespace reports { csv += "\"" + ( *it_row ) ["currency"] + " " + MyMoneyMoney ( data ).formatMoney ( fraction, false ) + "\","; } } - else if ( percentColumns.tqcontains ( *it_column ) ) + else if ( percentColumns.contains ( *it_column ) ) { data = ( MyMoneyMoney ( data ) * MyMoneyMoney ( 100, 1 ) ).formatMoney ( fraction ); result += TQString ( "<td>%1%</td>" ).arg ( data ); csv += data + "%,"; } - else if ( dateColumns.tqcontains ( *it_column ) ) + else if ( dateColumns.contains ( *it_column ) ) { // do this before we possibly change data csv += "\"" + data + "\","; @@ -620,7 +620,7 @@ namespace reports { MyMoneyAccount acc = MyMoneyFile::instance()->account(*it_a); if(acc.accountType() == MyMoneyAccount::Investment) { for(it_b = acc.accountList().begin(); it_b != acc.accountList().end(); ++it_b) { - if(!accountList.tqcontains(*it_b)) { + if(!accountList.contains(*it_b)) { m_config.addAccount(*it_b); } } diff --git a/kmymoney2/reports/pivotgrid.h b/kmymoney2/reports/pivotgrid.h index c067c27..3aebafd 100644 --- a/kmymoney2/reports/pivotgrid.h +++ b/kmymoney2/reports/pivotgrid.h @@ -45,7 +45,7 @@ namespace reports { * * A 'Row Pair' is two rows of money values. Each column is the SAME month. One row is the * 'actual' values for the period, the other row is the 'budgetted' values for the same - * period. For ease of implementation, a Row Pair is implemented as a Row which tqcontains + * period. For ease of implementation, a Row Pair is implemented as a Row which contains * another Row. The inherited Row is the 'actual', the contained row is the 'Budget'. * * An 'Inner Group' contains a rows for each subordinate account within a single top-level diff --git a/kmymoney2/reports/pivottable.cpp b/kmymoney2/reports/pivottable.cpp index 3617102..d39e226 100644 --- a/kmymoney2/reports/pivottable.cpp +++ b/kmymoney2/reports/pivottable.cpp @@ -282,7 +282,7 @@ void PivotTable::init(void) loanBalances[splitAccount.id()] = cellBalance(outergroup, splitAccount, column, false); } else { //if it is not in the report and also not in loanBalances, get the balance from the file - if(!loanBalances.tqcontains(splitAccount.id())) { + if(!loanBalances.contains(splitAccount.id())) { TQDate dueDate = sched.nextDueDate(); //if the payment is overdue, use current date @@ -863,7 +863,7 @@ void PivotTable::calculateBudgetMapping( void ) TQString acid = id; // If the budget contains this account outright - if ( budget.tqcontains ( id ) ) + if ( budget.contains ( id ) ) { // Add it to the mapping m_budgetMap[acid] = id; @@ -880,7 +880,7 @@ void PivotTable::calculateBudgetMapping( void ) do { id = file->account ( id ).parentAccountId(); - if ( budget.tqcontains ( id ) ) + if ( budget.contains ( id ) ) { if ( budget.account ( id ).budgetSubaccounts() ) { @@ -1279,19 +1279,19 @@ void PivotTable::createRow( const TQString& outergroup, const ReportAccount& row // Determine the inner group from the top-most tqparent account TQString innergroup( row.topParentName() ); - if ( ! m_grid.tqcontains(outergroup) ) + if ( ! m_grid.contains(outergroup) ) { DEBUG_OUTPUT(TQString("Adding group [%1]").tqarg(outergroup)); m_grid[outergroup] = PivotOuterGroup(m_numColumns); } - if ( ! m_grid[outergroup].tqcontains(innergroup) ) + if ( ! m_grid[outergroup].contains(innergroup) ) { DEBUG_OUTPUT(TQString("Adding group [%1][%2]").tqarg(outergroup).tqarg(innergroup)); m_grid[outergroup][innergroup] = PivotInnerGroup(m_numColumns); } - if ( ! m_grid[outergroup][innergroup].tqcontains(row) ) + if ( ! m_grid[outergroup][innergroup].contains(row) ) { DEBUG_OUTPUT(TQString("Adding row [%1][%2][%3]").tqarg(outergroup).tqarg(innergroup).tqarg(row.debugName())); m_grid[outergroup][innergroup][row] = PivotGridRowSet(m_numColumns); @@ -1594,7 +1594,7 @@ TQString PivotTable::renderHTML( void ) const unsigned column = 1; while ( column < m_numColumns ) - result += TQString("<th%1>%2</th>").tqarg(headerspan,TQString(m_columnHeadings[column++]).tqreplace(TQRegExp(" "),"<br>")); + result += TQString("<th%1>%2</th>").tqarg(headerspan,TQString(m_columnHeadings[column++]).replace(TQRegExp(" "),"<br>")); if ( m_config_f.isShowingRowTotals() ) result += TQString("<th%1>%2</th>").tqarg(headerspan).tqarg(i18n("Total")); @@ -1735,7 +1735,7 @@ TQString PivotTable::renderHTML( void ) const .tqarg(rowname.isTopLevel() ? " id=\"toptqparent\"" : "") .tqarg("") //.tqarg((*it_row).m_total.isZero() ? colspan : "") // colspan the distance if this row will be blank .tqarg(rowname.hierarchyDepth() - 1) - .tqarg(rowname.name().tqreplace(TQRegExp(" "), " ")) + .tqarg(rowname.name().replace(TQRegExp(" "), " ")) .tqarg((m_config_f.isConvertCurrency() || !rowname.isForeignCurrency() )?TQString():TQString(" (%1)").tqarg(rowname.currency().id())); // Don't print this row if it's going to be all zeros @@ -1791,7 +1791,7 @@ TQString PivotTable::renderHTML( void ) const .tqarg(rownum & 0x01 ? "even" : "odd") .tqarg( m_config_f.detailLevel() == MyMoneyReport::eDetailAll ? "id=\"solo\"" : "" ) .tqarg(rowname.hierarchyDepth() - 1) - .tqarg(rowname.name().tqreplace(TQRegExp(" "), " ")) + .tqarg(rowname.name().replace(TQRegExp(" "), " ")) .tqarg((m_config_f.isConvertCurrency() || !rowname.isForeignCurrency() )?TQString():TQString(" (%1)").tqarg(rowname.currency().id())); } @@ -2036,7 +2036,7 @@ void PivotTable::drawChart( KReportChartView& _view ) const { unsigned column = 1; while ( column < m_numColumns ) { - abscissaNames += TQString(m_columnHeadings[column++]).tqreplace(" ", " "); + abscissaNames += TQString(m_columnHeadings[column++]).replace(" ", " "); } } else @@ -2590,7 +2590,7 @@ void PivotTable::includeInvestmentSubAccounts() MyMoneyAccount acc = MyMoneyFile::instance()->account(*it_a); if(acc.accountType() == MyMoneyAccount::Investment) { for(it_b = acc.accountList().begin(); it_b != acc.accountList().end(); ++it_b) { - if(!accountList.tqcontains(*it_b)) { + if(!accountList.contains(*it_b)) { m_config_f.addAccount(*it_b); } } diff --git a/kmymoney2/reports/querytabletest.cpp b/kmymoney2/reports/querytabletest.cpp index 73ab69d..c0a448c 100644 --- a/kmymoney2/reports/querytabletest.cpp +++ b/kmymoney2/reports/querytabletest.cpp @@ -648,9 +648,9 @@ void QueryTableTest::testInvestment(void) //this is to make sure that the dates of closing and opening balances and the balance numbers are ok TQString openingDate = KGlobal::locale()->formatDate(TQDate(2004,1,1), true); TQString closingDate = KGlobal::locale()->formatDate(TQDate(2005,9,1), true); - CPPUNIT_ASSERT( html.tqfind(openingDate + "</td><td class=\"left\"></td><td class=\"left\">"+i18n("Opening Balance")) > 0); - CPPUNIT_ASSERT( html.tqfind(closingDate + "</td><td class=\"left\"></td><td class=\"left\">"+i18n("Closing Balance")+"</td><td class=\"left\"></td><td class=\"value\"></td><td> -702.36</td></tr>") > 0); - CPPUNIT_ASSERT( html.tqfind(closingDate + "</td><td class=\"left\"></td><td class=\"left\">"+i18n("Closing Balance")+"</td><td class=\"left\"></td><td class=\"value\"></td><td> -705.69</td></tr>") > 0); + CPPUNIT_ASSERT( html.find(openingDate + "</td><td class=\"left\"></td><td class=\"left\">"+i18n("Opening Balance")) > 0); + CPPUNIT_ASSERT( html.find(closingDate + "</td><td class=\"left\"></td><td class=\"left\">"+i18n("Closing Balance")+"</td><td class=\"left\"></td><td class=\"value\"></td><td> -702.36</td></tr>") > 0); + CPPUNIT_ASSERT( html.find(closingDate + "</td><td class=\"left\"></td><td class=\"left\">"+i18n("Closing Balance")+"</td><td class=\"left\"></td><td class=\"value\"></td><td> -705.69</td></tr>") > 0); } catch(MyMoneyException *e) |