1 files changed, 16 insertions, 16 deletions

diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp b/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp
index e80feaf..d34bb83 100644
--- a/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp
+++ b/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp
@@ -415,7 +415,7 @@ void MyMoneyDatabaseMgr::addTransaction(MyMoneyTransaction& transaction, const b
     acc.adjustBalance((*it_s));
     if(!skipAccountUpdate) {
       acc.touch();
-//FIXME:      tqinvalidateBalanceCache(acc.id());
+//FIXME:      invalidateBalanceCache(acc.id());
     }
     m_sql->modifyAccount(acc);
   }
@@ -517,7 +517,7 @@ void MyMoneyDatabaseMgr::modifyAccount(const MyMoneyAccount& account, const bool
     // check if the new info is based on the old one.
     // this is the case, when the file and the id
     // as well as the type are equal.
-    if(((*pos).tqparentAccountId() == account.tqparentAccountId()
+    if(((*pos).parentAccountId() == account.parentAccountId()
     && (*pos).accountType() == account.accountType())
     || skipCheck == true) {
       // make sure that all the referenced objects exist
@@ -533,7 +533,7 @@ void MyMoneyDatabaseMgr::modifyAccount(const MyMoneyAccount& account, const bool
       //m_accountList.modify(account.id(), account);
 
       // tqinvalidate cached balance
-//FIXME:      tqinvalidateBalanceCache(account.id());
+//FIXME:      invalidateBalanceCache(account.id());
 
       // mark file as changed
       m_sql->modifyAccount(account);
@@ -621,7 +621,7 @@ void MyMoneyDatabaseMgr::modifyTransaction(const MyMoneyTransaction& transaction
     MyMoneyAccount acc = accountList[(*it_s).accountId()];
     acc.adjustBalance((*it_s), true);
     acc.touch();
-//FIXME:    tqinvalidateBalanceCache(acc.id());
+//FIXME:    invalidateBalanceCache(acc.id());
     //m_accountList.modify(acc.id(), acc);
     m_sql->modifyAccount(acc);
     //modifiedAccounts[(*it_s).accountId()] = true;
@@ -630,7 +630,7 @@ void MyMoneyDatabaseMgr::modifyTransaction(const MyMoneyTransaction& transaction
     MyMoneyAccount acc = accountList[(*it_s).accountId()];
     acc.adjustBalance((*it_s));
     acc.touch();
-//FIXME:    tqinvalidateBalanceCache(acc.id());
+//FIXME:    invalidateBalanceCache(acc.id());
     //m_accountList.modify(acc.id(), acc);
     m_sql->modifyAccount(acc);
     //modifiedAccounts[(*it_s).accountId()] = true;
@@ -664,23 +664,23 @@ void MyMoneyDatabaseMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccount
   MyMoneyDatabaseMgr::account(account.id());
   MyMoneyDatabaseMgr::account(tqparent.id());
 
-  if(!account.tqparentAccountId().isEmpty()) {
-    accountIdList << account.tqparentAccountId();
+  if(!account.parentAccountId().isEmpty()) {
+    accountIdList << account.parentAccountId();
   }
 
   startTransaction();
   TQMap<TQString, MyMoneyAccount> accountList = m_sql->fetchAccounts(accountIdList, true);
 
-  if(!account.tqparentAccountId().isEmpty()) {
-    MyMoneyDatabaseMgr::account(account.tqparentAccountId());
-    oldParent = accountList.tqfind(account.tqparentAccountId());
+  if(!account.parentAccountId().isEmpty()) {
+    MyMoneyDatabaseMgr::account(account.parentAccountId());
+    oldParent = accountList.tqfind(account.parentAccountId());
   }
 
   newParent = accountList.tqfind(tqparent.id());
   childAccount = accountList.tqfind(account.id());
 
   MyMoneyAccount acc;
-  if(!account.tqparentAccountId().isEmpty()) {
+  if(!account.parentAccountId().isEmpty()) {
     acc = (*oldParent);
     acc.removeAccountId(account.id());
     m_sql->modifyAccount(acc);
@@ -729,7 +729,7 @@ void MyMoneyDatabaseMgr::removeTransaction(const MyMoneyTransaction& transaction
     acc.adjustBalance((*it_s), true);
     acc.touch();
     m_sql->modifyAccount(acc);
-//FIXME:    tqinvalidateBalanceCache(acc.id());
+//FIXME:    invalidateBalanceCache(acc.id());
   }
 
   // FIXME: check if any split is frozen and throw exception
@@ -792,7 +792,7 @@ void MyMoneyDatabaseMgr::removeAccount(const MyMoneyAccount& account)
   // check that the account and it's tqparent exist
   // this will throw an exception if the id is unknown
   MyMoneyDatabaseMgr::account(account.id());
-  tqparent = MyMoneyDatabaseMgr::account(account.tqparentAccountId());
+  tqparent = MyMoneyDatabaseMgr::account(account.parentAccountId());
 
   // check that it's not one of the standard account groups
   if(isStandardAccount(account.id()))
@@ -804,7 +804,7 @@ void MyMoneyDatabaseMgr::removeAccount(const MyMoneyAccount& account)
 
   // re-tqparent all sub-ordinate accounts to the tqparent of the account
   // to be deleted. First round check that all accounts exist, second
-  // round do the re-tqparenting.
+  // round do the re-parenting.
   TQStringList::ConstIterator it;
   for(it = account.accountList().begin(); it != account.accountList().end(); ++it) {
     MyMoneyDatabaseMgr::account(*it);
@@ -842,7 +842,7 @@ void MyMoneyDatabaseMgr::removeAccount(const MyMoneyAccount& account)
   if((*it_a).id() == account.id()
   && (*it_a).accountType() == account.accountType()) {
 
-    // second round over sub-ordinate accounts: do re-tqparenting
+    // second round over sub-ordinate accounts: do re-parenting
     // but only if the list contains at least one entry
     // FIXME: move this logic to MyMoneyFile
     if((*it_a).accountList().count() > 0) {
@@ -860,7 +860,7 @@ void MyMoneyDatabaseMgr::removeAccount(const MyMoneyAccount& account)
 
     // remove from balance list
 //FIXME:    m_balanceCache.remove(account.id());
-//FIXME:    tqinvalidateBalanceCache(tqparent.id());
+//FIXME:    invalidateBalanceCache(tqparent.id());
 
     m_sql->removeAccount(account);
   }