diff options
Diffstat (limited to 'kmymoney2/mymoney/mymoneyfile.cpp')
| -rw-r--r-- | kmymoney2/mymoney/mymoneyfile.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/kmymoney2/mymoney/mymoneyfile.cpp b/kmymoney2/mymoney/mymoneyfile.cpp index 0e1a098..4b354ef 100644 --- a/kmymoney2/mymoney/mymoneyfile.cpp +++ b/kmymoney2/mymoney/mymoneyfile.cpp @@ -956,7 +956,7 @@ void MyMoneyFile::accountList(TQValueList<MyMoneyAccount>& list, const TQStringL for(it = list_a.begin(); it != list_a.end(); ++it) { if(!isStandardAccount((*it).id())) { - if(idlist.tqfindIndex((*it).id()) != -1) { + if(idlist.findIndex((*it).id()) != -1) { list.append(*it); if(recursive == true) { accountList(list, (*it).accountList(), true); @@ -1422,9 +1422,9 @@ const TQStringList MyMoneyFile::consistencyCheck(void) rc << i18n(" * Loop detected between this account and account '%2'.").tqarg((*it_b).name()); rc << i18n(" Reparenting account '%2' to top level account '%1'.").tqarg(toplevel.name(), (*it_a).name()); (*it_a).setParentAccountId(toplevel.id()); - if(accountRebuild.tqcontains(toplevel.id()) == 0) + if(accountRebuild.contains(toplevel.id()) == 0) accountRebuild << toplevel.id(); - if(accountRebuild.tqcontains((*it_a).id()) == 0) + if(accountRebuild.contains((*it_a).id()) == 0) accountRebuild << (*it_a).id(); dropOut = true; break; @@ -1459,11 +1459,11 @@ const TQStringList MyMoneyFile::consistencyCheck(void) // make sure to rebuild the sub-accounts of the top account // and the one we removed this account from - if(accountRebuild.tqcontains(toplevel.id()) == 0) + if(accountRebuild.contains(toplevel.id()) == 0) accountRebuild << toplevel.id(); - if(accountRebuild.tqcontains(tqparent.id()) == 0) + if(accountRebuild.contains(tqparent.id()) == 0) accountRebuild << tqparent.id(); - } else if(!tqparent.accountList().tqcontains((*it_a).id())) { + } else if(!tqparent.accountList().contains((*it_a).id())) { problemCount++; if(problemAccount != (*it_a).name()) { problemAccount = (*it_a).name(); @@ -1471,7 +1471,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void) } // tqparent exists, but does not have a reference to the account rc << i18n(" * Parent account '%1' does not contain '%2' as sub-account.").tqarg(tqparent.name(), problemAccount); - if(accountRebuild.tqcontains(tqparent.id()) == 0) + if(accountRebuild.contains(tqparent.id()) == 0) accountRebuild << tqparent.id(); } } catch(MyMoneyException *e) { @@ -1491,7 +1491,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void) addNotification((*it_a).id()); // make sure to rebuild the sub-accounts of the top account - if(accountRebuild.tqcontains(toplevel.id()) == 0) + if(accountRebuild.contains(toplevel.id()) == 0) accountRebuild << toplevel.id(); } @@ -1508,7 +1508,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void) } rc << i18n(" * Child account with id %1 does not exist anymore.").tqarg(*it_c); rc << i18n(" The child account list will be reconstructed."); - if(accountRebuild.tqcontains((*it_a).id()) == 0) + if(accountRebuild.contains((*it_a).id()) == 0) accountRebuild << (*it_a).id(); } } @@ -1539,7 +1539,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void) // clear the affected lists for(it_a = list.begin(); it_a != list.end(); ++it_a) { - if(accountRebuild.tqcontains((*it_a).id())) { + if(accountRebuild.contains((*it_a).id())) { rc << TQString(" %1").tqarg((*it_a).name()); // clear the account list for(it_c = (*it_a).accountList().begin(); it_c != (*it_a).accountList().end();) { @@ -1553,7 +1553,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void) for(it_a = list.begin(); it_a != list.end(); ++it_a) { TQValueList<MyMoneyAccount>::Iterator it; parentId = (*it_a).parentAccountId(); - if(accountRebuild.tqcontains(parentId)) { + if(accountRebuild.contains(parentId)) { for(it = list.begin(); it != list.end(); ++it) { if((*it).id() == parentId) { (*it).addAccountId((*it_a).id()); @@ -1565,7 +1565,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void) // update the engine objects for(it_a = list.begin(); it_a != list.end(); ++it_a) { - if(accountRebuild.tqcontains((*it_a).id())) { + if(accountRebuild.contains((*it_a).id())) { try { m_storage->modifyAccount(*it_a, true); addNotification((*it_a).id()); @@ -1615,7 +1615,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void) for(it_s = t.splits().begin(); it_s != t.splits().end(); ++it_s) { bool sChanged = false; MyMoneySplit s = (*it_s); - if(payeeConversionMap.tqfind((*it_s).payeeId()) != payeeConversionMap.end()) { + if(payeeConversionMap.find((*it_s).payeeId()) != payeeConversionMap.end()) { s.setPayeeId(payeeConversionMap[s.payeeId()]); sChanged = true; rc << i18n(" * Payee id updated in split of transaction '%1'.").tqarg(t.id()); @@ -1647,7 +1647,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void) } // make sure the interest splits are marked correct as such - if(interestAccounts.tqfind(s.accountId()) != interestAccounts.end() + if(interestAccounts.find(s.accountId()) != interestAccounts.end() && s.action() != MyMoneySplit::ActionInterest) { s.setAction(MyMoneySplit::ActionInterest); sChanged = true; @@ -1675,7 +1675,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void) for(it_s = t.splits().begin(); it_s != t.splits().end(); ++it_s) { MyMoneySplit s = (*it_s); bool sChanged = false; - if(payeeConversionMap.tqfind((*it_s).payeeId()) != payeeConversionMap.end()) { + if(payeeConversionMap.find((*it_s).payeeId()) != payeeConversionMap.end()) { s.setPayeeId(payeeConversionMap[s.payeeId()]); sChanged = true; rc << i18n(" * Payee id updated in split of schedule '%1'.").tqarg((*it_sch).name()); @@ -1740,7 +1740,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void) (*it_r).payees(pList); bool rChanged = false; for(it_p = pList.begin(); it_p != pList.end(); ++it_p) { - if(payeeConversionMap.tqfind(*it_p) != payeeConversionMap.end()) { + if(payeeConversionMap.find(*it_p) != payeeConversionMap.end()) { rc << i18n(" * Payee id updated in report '%1'.").tqarg((*it_r).name()); ++problemCount; r.removeReference(*it_p); |