1 files changed, 11 insertions, 11 deletions

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(" "), "&nbsp;"))
+                .tqarg(rowname.name().replace(TQRegExp(" "), "&nbsp;"))
                 .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(" "), "&nbsp;"))
+              .tqarg(rowname.name().replace(TQRegExp(" "), "&nbsp;"))
               .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("&nbsp;", " ");
+      abscissaNames += TQString(m_columnHeadings[column++]).replace("&nbsp;", " ");
     }
   }
   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);
             }
           }