1 files changed, 25 insertions, 25 deletions

diff --git a/kmymoney2/kmymoney2.cpp b/kmymoney2/kmymoney2.cpp
index d058367..f9e3bf9 100644
--- a/kmymoney2/kmymoney2.cpp
+++ b/kmymoney2/kmymoney2.cpp
@@ -333,7 +333,7 @@ void KMyMoney2App::initActions(void)
   // *************
   // The Edit menu
   // *************
-  new KAction(i18n("Find transaction..."), "transaction_tqfind", KShortcut("Ctrl+F"), TQT_TQOBJECT(this), TQT_SLOT(slotFindTransaction()), actionCollection(), "edit_find_transaction");
+  new KAction(i18n("Find transaction..."), "transaction_find", KShortcut("Ctrl+F"), TQT_TQOBJECT(this), TQT_SLOT(slotFindTransaction()), actionCollection(), "edit_find_transaction");
 
   // *************
   // The View menu
@@ -1090,11 +1090,11 @@ bool KMyMoney2App::slotFileSaveAs(void)
       if(fields[0] != RECOVER_KEY_ID) {
         // replace parenthesis in name field with brackets
         TQString name = fields[1];
-        name.tqreplace('(', "[");
-        name.tqreplace(')', "]");
+        name.replace('(', "[");
+        name.replace(')', "]");
         name = TQString("%1 (0x%2)").tqarg(name).tqarg(fields[0]);
         m_saveEncrypted->insertItem(name);
-        if(name.tqcontains(KMyMoneyGlobalSettings::gpgRecipient())) {
+        if(name.contains(KMyMoneyGlobalSettings::gpgRecipient())) {
           m_saveEncrypted->setCurrentItem(name);
         }
       }
@@ -1128,13 +1128,13 @@ bool KMyMoney2App::slotFileSaveAs(void)
   // end of copy
 
       // find last . delimiter
-      int nLoc = newName.tqfindRev('.');
+      int nLoc = newName.findRev('.');
       if(nLoc != -1)
       {
         TQString strExt, strTemp;
         strTemp = newName.left(nLoc + 1);
         strExt = newName.right(newName.length() - (nLoc + 1));
-        if((strExt.tqfind("kmy", 0, FALSE) == -1) && (strExt.tqfind("xml", 0, FALSE) == -1))
+        if((strExt.find("kmy", 0, FALSE) == -1) && (strExt.find("xml", 0, FALSE) == -1))
         {
 
           strTemp.append("kmy");
@@ -1487,13 +1487,13 @@ void KMyMoney2App::slotSaveAccountTemplates(void)
   if(!newName.isEmpty())
   {
     // find last . delimiter
-    int nLoc = newName.tqfindRev('.');
+    int nLoc = newName.findRev('.');
     if(nLoc != -1)
     {
       TQString strExt, strTemp;
       strTemp = newName.left(nLoc + 1);
       strExt = newName.right(newName.length() - (nLoc + 1));
-      if((strExt.tqfind("kmt", 0, FALSE) == -1))
+      if((strExt.find("kmt", 0, FALSE) == -1))
       {
         strTemp.append("kmt");
         //append to make complete file name
@@ -2258,7 +2258,7 @@ const MyMoneyAccount& KMyMoney2App::findAccount(const MyMoneyAccount& acc, const
       int pos;
       // check for ':' in the name and use it as separator for a hierarchy
       TQString name = acc.name();
-      while((pos = name.tqfind(MyMoneyFile::AccountSeperator)) != -1) {
+      while((pos = name.find(MyMoneyFile::AccountSeperator)) != -1) {
         TQString part = name.left(pos);
         TQString remainder = name.mid(pos+1);
         const MyMoneyAccount& existingAccount = file->subAccountByName(parentAccount, part);
@@ -2297,7 +2297,7 @@ void KMyMoney2App::createAccount(MyMoneyAccount& newAccount, MyMoneyAccount& par
   {
     int pos;
     // check for ':' in the name and use it as separator for a hierarchy
-    while((pos = newAccount.name().tqfind(MyMoneyFile::AccountSeperator)) != -1) {
+    while((pos = newAccount.name().find(MyMoneyFile::AccountSeperator)) != -1) {
       TQString part = newAccount.name().left(pos);
       TQString remainder = newAccount.name().mid(pos+1);
       const MyMoneyAccount& existingAccount = file->subAccountByName(parentAccount, part);
@@ -2984,7 +2984,7 @@ void KMyMoney2App::slotAccountEdit(void)
           // if we have an online provider for this account, we need to check
           // that we have the corresponding plugin. If that exists, we ask it
           // to provide an additional tab for the account editor.
-          it_plugin = m_onlinePlugins.tqfind(kvp["provider"]);
+          it_plugin = m_onlinePlugins.find(kvp["provider"]);
           if(it_plugin != m_onlinePlugins.end()) {
             TQString name;
             TQWidget *w = 0;
@@ -3103,7 +3103,7 @@ void KMyMoney2App::slotAccountReconcileStart(void)
               MyMoneySchedule sch(*(it_sch));
 
               // and enter it if it is not on the skip list
-              if(skipMap.tqfind((*it_sch).id()) == skipMap.end()) {
+              if(skipMap.find((*it_sch).id()) == skipMap.end()) {
                 rc = enterSchedule(sch, false, true);
                 if(rc == KMyMoneyUtils::Ignore) {
                   skipMap[(*it_sch).id()] = true;
@@ -3850,7 +3850,7 @@ void KMyMoney2App::slotPayeeDelete(void)
   TQValueList<MyMoneyPayee> remainingPayees = file->payeeList();
   TQValueList<MyMoneyPayee>::iterator it_p;
   for(it_p = remainingPayees.begin(); it_p != remainingPayees.end(); ) {
-    if(m_selectedPayees.tqfind(*it_p) != m_selectedPayees.end()) {
+    if(m_selectedPayees.find(*it_p) != m_selectedPayees.end()) {
       it_p = remainingPayees.erase(it_p);
     } else {
       ++it_p;
@@ -4001,7 +4001,7 @@ void KMyMoney2App::slotPayeeDelete(void)
           }
           if(it_k == payeeNames.end())
             payeeNames << TQRegExp::escape(*it_n);
-        } else if(payeeNames.tqcontains(*it_n) == 0)
+        } else if(payeeNames.contains(*it_n) == 0)
           payeeNames << TQRegExp::escape(*it_n);
       }
 
@@ -5362,7 +5362,7 @@ void KMyMoney2App::slotUpdateActions(void)
   for(it_a = accList.begin(); (it_p == m_onlinePlugins.end()) && (it_a != accList.end()); ++it_a) {
     if ( !(*it_a).onlineBankingSettings().value("provider").isEmpty() ) {
       // check if provider is available
-      it_p = m_onlinePlugins.tqfind((*it_a).onlineBankingSettings().value("provider"));
+      it_p = m_onlinePlugins.find((*it_a).onlineBankingSettings().value("provider"));
       if(it_p != m_onlinePlugins.end()) {
         TQStringList protocols;
         (*it_p)->protocols(protocols);
@@ -5407,7 +5407,7 @@ void KMyMoney2App::slotUpdateActions(void)
             action("account_online_unmap")->setEnabled(true);
             // check if provider is available
             TQMap<TQString, KMyMoneyPlugin::OnlinePlugin*>::const_iterator it_p;
-            it_p = m_onlinePlugins.tqfind(m_selectedAccount.onlineBankingSettings().value("provider"));
+            it_p = m_onlinePlugins.find(m_selectedAccount.onlineBankingSettings().value("provider"));
             if(it_p != m_onlinePlugins.end()) {
               TQStringList protocols;
               (*it_p)->protocols(protocols);
@@ -5566,7 +5566,7 @@ void KMyMoney2App::slotSelectTransactions(const KMyMoneyRegister::SelectedTransa
           if(!payee.name().isEmpty()) {
             m_payeeGoto = payee.id();
             TQString name = payee.name();
-            name.tqreplace(TQRegExp("&(?!&)"), "&&");
+            name.replace(TQRegExp("&(?!&)"), "&&");
             action("transaction_goto_payee")->setText(i18n("Goto '%1'").tqarg(name));
           }
         } catch(MyMoneyException *e) {
@@ -5588,7 +5588,7 @@ void KMyMoney2App::slotSelectTransactions(const KMyMoneyRegister::SelectedTransa
               }
               m_accountGoto = acc.id();
               TQString name = acc.name();
-              name.tqreplace(TQRegExp("&(?!&)"), "&&");
+              name.replace(TQRegExp("&(?!&)"), "&&");
               action("transaction_goto_account")->setText(i18n("Goto '%1'").tqarg(name));
               break;
             }
@@ -5828,7 +5828,7 @@ const TQValueList<TQCString> KMyMoney2App::instanceList(void) const
     // skip over myself
     if((*it) == kapp->dcopClient()->appId())
       continue;
-    if((*it).tqfind("kmymoney-") == 0) {
+    if((*it).find("kmymoney-") == 0) {
       list += (*it);
     }
   }
@@ -6002,7 +6002,7 @@ const MyMoneyAccount& KMyMoney2App::account(const TQString& key, const TQString&
   TQValueList<MyMoneyAccount> accList;
   for(it_a = list.begin(); it_a != list.end(); ++it_a) {
     const TQString& id = (*it_a).onlineBankingSettings().value(key);
-    if(id.tqcontains(value)) {
+    if(id.contains(value)) {
       accList << MyMoneyFile::instance()->account((*it_a).id());
     }
     if(id == value) {
@@ -6072,7 +6072,7 @@ void KMyMoney2App::slotAccountMapOnline(void)
     return;
 
   // check if user tries to map a brokerageAccount
-  if(m_selectedAccount.name().tqcontains(i18n(" (Brokerage)"))) {
+  if(m_selectedAccount.name().contains(i18n(" (Brokerage)"))) {
     if(KMessageBox::warningContinueCancel(this, i18n("You try to map a brokerage account to an online account. This is usually not advisable. In general, the investment account should be mapped to the online account. Please cancel if you intended to map the investment account, continue otherwise"), i18n("Mapping brokerage account")) == KMessageBox::Cancel) {
       return;
     }
@@ -6108,7 +6108,7 @@ void KMyMoney2App::slotAccountMapOnline(void)
     return;
 
   // find the provider
-  it_p = m_onlinePlugins.tqfind(provider);
+  it_p = m_onlinePlugins.find(provider);
   if(it_p != m_onlinePlugins.end()) {
     // plugin found, call it
     MyMoneyKeyValueContainer settings;
@@ -6141,7 +6141,7 @@ void KMyMoney2App::slotAccountUpdateOnlineAll(void)
   // provider is not currently present
   for(it_a = accList.begin(); it_a != accList.end();) {
     if ((*it_a).onlineBankingSettings().value("provider").isEmpty()
-    || m_onlinePlugins.tqfind((*it_a).onlineBankingSettings().value("provider")) == m_onlinePlugins.end() ) {
+    || m_onlinePlugins.find((*it_a).onlineBankingSettings().value("provider")) == m_onlinePlugins.end() ) {
       it_a = accList.remove(it_a);
     } else
       ++it_a;
@@ -6150,7 +6150,7 @@ void KMyMoney2App::slotAccountUpdateOnlineAll(void)
   // now work on the remaining list of accounts
   int cnt = accList.count() - 1;
   for(it_a = accList.begin(); it_a != accList.end(); ++it_a) {
-    it_p = m_onlinePlugins.tqfind((*it_a).onlineBankingSettings().value("provider"));
+    it_p = m_onlinePlugins.find((*it_a).onlineBankingSettings().value("provider"));
     (*it_p)->updateAccount(*it_a, cnt != 0);
     --cnt;
   }
@@ -6172,7 +6172,7 @@ void KMyMoney2App::slotAccountUpdateOnline(void)
 
   // find the provider
   TQMap<TQString, KMyMoneyPlugin::OnlinePlugin*>::const_iterator it_p;
-  it_p = m_onlinePlugins.tqfind(m_selectedAccount.onlineBankingSettings().value("provider"));
+  it_p = m_onlinePlugins.find(m_selectedAccount.onlineBankingSettings().value("provider"));
   if(it_p != m_onlinePlugins.end()) {
     // plugin found, call it
     d->m_collectingStatements = true;