1 files changed, 18 insertions, 18 deletions

diff --git a/kmymoney2/mymoney/mymoneyreport.cpp b/kmymoney2/mymoney/mymoneyreport.cpp
index 4cd667b..4fd4b79 100644
--- a/kmymoney2/mymoney/mymoneyreport.cpp
+++ b/kmymoney2/mymoney/mymoneyreport.cpp
@@ -253,7 +253,7 @@ bool MyMoneyReport::accountGroups(TQValueList<MyMoneyAccount::accountTypeE>& lis
 void MyMoneyReport::addAccountGroup ( MyMoneyAccount::accountTypeE type )
 {
   if ( !m_accountGroups.isEmpty() && type != MyMoneyAccount::UnknownAccountType ) {
-    if ( m_accountGroups.tqcontains ( type ) )
+    if ( m_accountGroups.contains ( type ) )
       return;
   }
   m_accountGroupFilter = true;
@@ -265,7 +265,7 @@ bool MyMoneyReport::includesAccountGroup( MyMoneyAccount::accountTypeE type ) co
 {
   bool result = ( ! m_accountGroupFilter )
                 || ( isIncludingTransfers() && m_rowType == MyMoneyReport::eExpenseIncome )
-                || m_accountGroups.tqcontains ( type );
+                || m_accountGroups.contains ( type );
 
   return result;
 }
@@ -572,11 +572,11 @@ bool MyMoneyReport::read ( const TQDomElement& e )
     "REPORT" == e.tagName()
     &&
     (
-      ( e.attribute ( "type" ).tqfind ( "pivottable 1." ) == 0 )
+      ( e.attribute ( "type" ).find ( "pivottable 1." ) == 0 )
       ||
-      ( e.attribute ( "type" ).tqfind ( "querytable 1." ) == 0 )
+      ( e.attribute ( "type" ).find ( "querytable 1." ) == 0 )
       ||
-      ( e.attribute ( "type" ).tqfind ( "infotable 1." ) == 0 )
+      ( e.attribute ( "type" ).find ( "infotable 1." ) == 0 )
     )
   )
   {
@@ -588,11 +588,11 @@ bool MyMoneyReport::read ( const TQDomElement& e )
     m_comment = e.attribute ( "comment", "Extremely old report" );
 
     //set report type
-    if(!e.attribute ( "type" ).tqfind ( "pivottable" )) {
+    if(!e.attribute ( "type" ).find ( "pivottable" )) {
       m_reportType = MyMoneyReport::ePivotTable;
-    } else if(!e.attribute ( "type" ).tqfind ( "querytable" )) {
+    } else if(!e.attribute ( "type" ).find ( "querytable" )) {
       m_reportType = MyMoneyReport::eQueryTable;
-    } else if(!e.attribute ( "type" ).tqfind ( "infotable" )) {
+    } else if(!e.attribute ( "type" ).find ( "infotable" )) {
       m_reportType = MyMoneyReport::eInfoTable;
     } else {
       m_reportType = MyMoneyReport::eNoReport;
@@ -607,7 +607,7 @@ bool MyMoneyReport::read ( const TQDomElement& e )
     //check for reports with older settings which didn't have the detail attribute
     if ( e.hasAttribute ( "detail" ) )
     {
-      i = kDetailLevelText.tqfindIndex ( e.attribute ( "detail", "all" ) );
+      i = kDetailLevelText.findIndex ( e.attribute ( "detail", "all" ) );
       if ( i != -1 )
         m_detailLevel = static_cast<EDetailLevel> ( i );
     } else if ( e.attribute ( "showsubaccounts", "0" ).toUInt() ) {
@@ -639,7 +639,7 @@ bool MyMoneyReport::read ( const TQDomElement& e )
 
     //only load chart data if it is a pivot table
     if ( m_reportType == ePivotTable ) {
-      i = kChartTypeText.tqfindIndex ( e.attribute ( "charttype" ) );
+      i = kChartTypeText.findIndex ( e.attribute ( "charttype" ) );
 
       if ( i != -1 )
         m_chartType = static_cast<EChartType> ( i );
@@ -667,13 +667,13 @@ bool MyMoneyReport::read ( const TQDomElement& e )
     i = datelockstr.toUInt ( &ok );
     if ( !ok )
     {
-      i = kDateLockText.tqfindIndex ( datelockstr );
+      i = kDateLockText.findIndex ( datelockstr );
       if ( i == -1 )
         i = userDefined;
     }
     setDateFilter ( static_cast<dateOptionE> ( i ) );
 
-    i = kRowTypeText.tqfindIndex ( e.attribute ( "rowtype", "expenseincome" ) );
+    i = kRowTypeText.findIndex ( e.attribute ( "rowtype", "expenseincome" ) );
     if ( i != -1 )
     {
       setRowType ( static_cast<ERowType> ( i ) );
@@ -687,7 +687,7 @@ bool MyMoneyReport::read ( const TQDomElement& e )
     if ( e.hasAttribute ( "showrowtotals" ) )
       m_showRowTotals = e.attribute ( "showrowtotals" ).toUInt();
 
-    i = kColumnTypeText.tqfindIndex ( e.attribute ( "columntype", "months" ) );
+    i = kColumnTypeText.findIndex ( e.attribute ( "columntype", "months" ) );
     if ( i != -1 )
       setColumnType ( static_cast<EColumnType> ( i ) );
 
@@ -696,7 +696,7 @@ bool MyMoneyReport::read ( const TQDomElement& e )
     TQStringList::const_iterator it_column = columns.begin();
     while ( it_column != columns.end() )
     {
-      i = kQueryColumnsText.tqfindIndex ( *it_column );
+      i = kQueryColumnsText.findIndex ( *it_column );
       if ( i > 0 )
         qc |= ( 1 << ( i - 1 ) );
 
@@ -714,13 +714,13 @@ bool MyMoneyReport::read ( const TQDomElement& e )
       }
       if ( "TYPE" == c.tagName() && c.hasAttribute ( "type" ) )
       {
-        i = kTypeText.tqfindIndex ( c.attribute ( "type" ) );
+        i = kTypeText.findIndex ( c.attribute ( "type" ) );
         if ( i != -1 )
           addType ( i );
       }
       if ( "STATE" == c.tagName() && c.hasAttribute ( "state" ) )
       {
-        i = kStateText.tqfindIndex ( c.attribute ( "state" ) );
+        i = kStateText.findIndex ( c.attribute ( "state" ) );
         if ( i != -1 )
           addState ( i );
       }
@@ -755,7 +755,7 @@ bool MyMoneyReport::read ( const TQDomElement& e )
       }
       if ( "ACCOUNTGROUP" == c.tagName() && c.hasAttribute ( "group" ) )
       {
-        i = kAccountTypeText.tqfindIndex ( c.attribute ( "group" ) );
+        i = kAccountTypeText.findIndex ( c.attribute ( "group" ) );
         if ( i != -1 )
           addAccountGroup ( static_cast<MyMoneyAccount::accountTypeE> ( i ) );
       }
@@ -781,7 +781,7 @@ bool MyMoneyReport::hasReferenceTo ( const TQString& id ) const
   categories ( list );
   payees ( list );
 
-  return ( list.tqcontains ( id ) > 0 );
+  return ( list.contains ( id ) > 0 );
 }
 
 // vim:cin:si:ai:et:ts=2:sw=2: