1 files changed, 25 insertions, 25 deletions

diff --git a/kmymoney2/widgets/kmymoneyaccountselector.cpp b/kmymoney2/widgets/kmymoneyaccountselector.cpp
index 762591f..234fa16 100644
--- a/kmymoney2/widgets/kmymoneyaccountselector.cpp
+++ b/kmymoney2/widgets/kmymoneyaccountselector.cpp
@@ -136,14 +136,14 @@ TQStringList kMyMoneyAccountSelector::accountList(const  TQValueList<MyMoneyAcco
         KMyMoneyCheckListItem* it_c = dynamic_cast<KMyMoneyCheckListItem*>(it_v);
         if(it_c->type() == TQCheckListItem::CheckBox) {
           MyMoneyAccount acc = MyMoneyFile::instance()->account(it_c->id());
-          it_f = filterList.tqfind(acc.accountType());
+          it_f = filterList.find(acc.accountType());
           if(filterList.count() == 0 || it_f != filterList.end())
             list << it_c->id();
         }
       } else if(it_v->rtti() == 0) {
         KMyMoneyListViewItem* it_c = dynamic_cast<KMyMoneyListViewItem*>(it_v);
         MyMoneyAccount acc = MyMoneyFile::instance()->account(it_c->id());
-        it_f = filterList.tqfind(acc.accountType());
+        it_f = filterList.find(acc.accountType());
         if(filterList.count() == 0 || it_f != filterList.end())
           list << it_c->id();
       }
@@ -169,7 +169,7 @@ bool kMyMoneyAccountSelector::match(const TQRegExp& exp, TQListViewItem* item) c
   return exp.search(it_l->key(1, true)) != -1;
 }
 
-bool kMyMoneyAccountSelector::tqcontains(const TQString& txt) const
+bool kMyMoneyAccountSelector::contains(const TQString& txt) const
 {
   TQListViewItemIterator it(m_listView, TQListViewItemIterator::Selectable);
   TQListViewItem* it_v;
@@ -288,7 +288,7 @@ void AccountSet::addAccountType(MyMoneyAccount::accountTypeE type)
 void AccountSet::removeAccountType(MyMoneyAccount::accountTypeE type)
 {
   TQValueList<MyMoneyAccount::accountTypeE>::iterator it;
-  it = m_typeList.tqfind(type);
+  it = m_typeList.find(type);
   if(it != m_typeList.end()) {
     m_typeList.remove(it);
   }
@@ -313,30 +313,30 @@ int AccountSet::load(kMyMoneyAccountSelector* selector)
     if(list.count() > 0)
       currentId = list.first();
   }
-  if((m_typeList.tqcontains(MyMoneyAccount::Checkings)
-    + m_typeList.tqcontains(MyMoneyAccount::Savings)
-    + m_typeList.tqcontains(MyMoneyAccount::Cash)
-    + m_typeList.tqcontains(MyMoneyAccount::AssetLoan)
-    + m_typeList.tqcontains(MyMoneyAccount::CertificateDep)
-    + m_typeList.tqcontains(MyMoneyAccount::Investment)
-    + m_typeList.tqcontains(MyMoneyAccount::Stock)
-    + m_typeList.tqcontains(MyMoneyAccount::MoneyMarket)
-    + m_typeList.tqcontains(MyMoneyAccount::Asset)
-    + m_typeList.tqcontains(MyMoneyAccount::Currency)) > 0)
+  if((m_typeList.contains(MyMoneyAccount::Checkings)
+    + m_typeList.contains(MyMoneyAccount::Savings)
+    + m_typeList.contains(MyMoneyAccount::Cash)
+    + m_typeList.contains(MyMoneyAccount::AssetLoan)
+    + m_typeList.contains(MyMoneyAccount::CertificateDep)
+    + m_typeList.contains(MyMoneyAccount::Investment)
+    + m_typeList.contains(MyMoneyAccount::Stock)
+    + m_typeList.contains(MyMoneyAccount::MoneyMarket)
+    + m_typeList.contains(MyMoneyAccount::Asset)
+    + m_typeList.contains(MyMoneyAccount::Currency)) > 0)
     typeMask |= KMyMoneyUtils::asset;
 
-  if((m_typeList.tqcontains(MyMoneyAccount::CreditCard)
-    + m_typeList.tqcontains(MyMoneyAccount::Loan)
-    + m_typeList.tqcontains(MyMoneyAccount::Liability)) > 0)
+  if((m_typeList.contains(MyMoneyAccount::CreditCard)
+    + m_typeList.contains(MyMoneyAccount::Loan)
+    + m_typeList.contains(MyMoneyAccount::Liability)) > 0)
     typeMask |= KMyMoneyUtils::liability;
 
-  if((m_typeList.tqcontains(MyMoneyAccount::Income)) > 0)
+  if((m_typeList.contains(MyMoneyAccount::Income)) > 0)
     typeMask |= KMyMoneyUtils::income;
 
-  if((m_typeList.tqcontains(MyMoneyAccount::Expense)) > 0)
+  if((m_typeList.contains(MyMoneyAccount::Expense)) > 0)
     typeMask |= KMyMoneyUtils::expense;
 
-  if((m_typeList.tqcontains(MyMoneyAccount::Equity)) > 0)
+  if((m_typeList.contains(MyMoneyAccount::Equity)) > 0)
     typeMask |= KMyMoneyUtils::equity;
 
   selector->clear();
@@ -409,7 +409,7 @@ int AccountSet::load(kMyMoneyAccountSelector* selector)
           tmpKey = key + MyMoneyFile::AccountSeperator + acc.name();
           TQListViewItem* subItem = selector->newItem(item, acc.name(), tmpKey, acc.id());
           if(acc.value("PreferredAccount") == "Yes"
-             && m_typeList.tqcontains(acc.accountType())) {
+             && m_typeList.contains(acc.accountType())) {
             selector->newItem(m_favorites, acc.name(), tmpKey, acc.id());
           }
           if(acc.accountList().count() > 0) {
@@ -418,7 +418,7 @@ int AccountSet::load(kMyMoneyAccountSelector* selector)
           }
 
           //disable the item if it has been added only because a subaccount matches the type
-          if( !m_typeList.tqcontains(acc.accountType()) ) {
+          if( !m_typeList.contains(acc.accountType()) ) {
             subItem->setEnabled(false);
           }
         }
@@ -505,7 +505,7 @@ int AccountSet::loadSubAccounts(kMyMoneyAccountSelector* selector, TQListViewIte
       ++m_count;
       TQListViewItem* item = selector->newItem(tqparent, acc.name(), tmpKey, acc.id());
       if(acc.value("PreferredAccount") == "Yes"
-         && m_typeList.tqcontains(acc.accountType())) {
+         && m_typeList.contains(acc.accountType())) {
         selector->newItem(m_favorites, acc.name(), tmpKey, acc.id());
       }
       if(acc.accountList().count() > 0) {
@@ -514,7 +514,7 @@ int AccountSet::loadSubAccounts(kMyMoneyAccountSelector* selector, TQListViewIte
       }
 
       //disable the item if it has been added only because a subaccount matches the type
-      if( !m_typeList.tqcontains(acc.accountType()) ) {
+      if( !m_typeList.contains(acc.accountType()) ) {
         item->setEnabled(false);
       }
     }
@@ -524,7 +524,7 @@ int AccountSet::loadSubAccounts(kMyMoneyAccountSelector* selector, TQListViewIte
 
 bool AccountSet::includeAccount(const MyMoneyAccount& acc)
 {
-  if( m_typeList.tqcontains(acc.accountType()) )
+  if( m_typeList.contains(acc.accountType()) )
     return true;
 
   TQStringList accounts = acc.accountList();