1 files changed, 16 insertions, 16 deletions

diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp
index 5c9abed..9977811 100644
--- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp
+++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp
@@ -439,7 +439,7 @@ void MyMoneySeqAccessMgr::addTransaction(MyMoneyTransaction& transaction, const
     acc.adjustBalance(*it_s);
     if(!skipAccountUpdate) {
       acc.touch();
-      tqinvalidateBalanceCache(acc.id());
+      invalidateBalanceCache(acc.id());
     }
     m_accountList.modify(acc.id(), acc);
   }
@@ -488,7 +488,7 @@ void MyMoneySeqAccessMgr::modifyAccount(const MyMoneyAccount& account, const boo
     // 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
@@ -504,7 +504,7 @@ void MyMoneySeqAccessMgr::modifyAccount(const MyMoneyAccount& account, const boo
       m_accountList.modify(account.id(), account);
 
       // tqinvalidate cached balance
-      tqinvalidateBalanceCache(account.id());
+      invalidateBalanceCache(account.id());
 
     } else
       throw new MYMONEYEXCEPTION("Invalid information for update");
@@ -571,14 +571,14 @@ void MyMoneySeqAccessMgr::modifyTransaction(const MyMoneyTransaction& transactio
     MyMoneyAccount acc = m_accountList[(*it_s).accountId()];
     acc.adjustBalance(*it_s, true);   // reverse the adjust operation (reverse = true)
     acc.touch();
-    tqinvalidateBalanceCache(acc.id());
+    invalidateBalanceCache(acc.id());
     m_accountList.modify(acc.id(), acc);
   }
   for(it_s = transaction.splits().begin(); it_s != transaction.splits().end(); ++it_s) {
     MyMoneyAccount acc = m_accountList[(*it_s).accountId()];
     acc.adjustBalance(*it_s);
     acc.touch();
-    tqinvalidateBalanceCache(acc.id());
+    invalidateBalanceCache(acc.id());
     m_accountList.modify(acc.id(), acc);
   }
 
@@ -606,9 +606,9 @@ void MyMoneySeqAccessMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccoun
   // an exception is thrown
   MyMoneySeqAccessMgr::account(account.id());
   MyMoneySeqAccessMgr::account(tqparent.id());
-  if(!account.tqparentAccountId().isEmpty()) {
-    MyMoneySeqAccessMgr::account(account.tqparentAccountId());
-    oldParent = m_accountList.tqfind(account.tqparentAccountId());
+  if(!account.parentAccountId().isEmpty()) {
+    MyMoneySeqAccessMgr::account(account.parentAccountId());
+    oldParent = m_accountList.tqfind(account.parentAccountId());
   }
 
   if(account.accountType() == MyMoneyAccount::Stock && tqparent.accountType() != MyMoneyAccount::Investment)
@@ -618,7 +618,7 @@ void MyMoneySeqAccessMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccoun
   childAccount = m_accountList.tqfind(account.id());
 
   MyMoneyAccount acc;
-  if(!account.tqparentAccountId().isEmpty()) {
+  if(!account.parentAccountId().isEmpty()) {
     acc = (*oldParent);
     acc.removeAccountId(account.id());
     m_accountList.modify(acc.id(), acc);
@@ -665,7 +665,7 @@ void MyMoneySeqAccessMgr::removeTransaction(const MyMoneyTransaction& transactio
     acc.adjustBalance(*it_s, true);  // reverse = true
     acc.touch();
     m_accountList.modify(acc.id(), acc);
-    tqinvalidateBalanceCache(acc.id());
+    invalidateBalanceCache(acc.id());
   }
 
   // FIXME: check if any split is frozen and throw exception
@@ -682,7 +682,7 @@ void MyMoneySeqAccessMgr::removeAccount(const MyMoneyAccount& account)
   // check that the account and it's tqparent exist
   // this will throw an exception if the id is unknown
   MyMoneySeqAccessMgr::account(account.id());
-  tqparent = MyMoneySeqAccessMgr::account(account.tqparentAccountId());
+  tqparent = MyMoneySeqAccessMgr::account(account.parentAccountId());
 
   // check that it's not one of the standard account groups
   if(isStandardAccount(account.id()))
@@ -694,7 +694,7 @@ void MyMoneySeqAccessMgr::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) {
     MyMoneySeqAccessMgr::account(*it);
@@ -729,7 +729,7 @@ void MyMoneySeqAccessMgr::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) {
@@ -748,7 +748,7 @@ void MyMoneySeqAccessMgr::removeAccount(const MyMoneyAccount& account)
 
     // remove from balance list
     m_balanceCache.remove(account.id());
-    tqinvalidateBalanceCache(tqparent.id());
+    invalidateBalanceCache(tqparent.id());
   }
 }
 
@@ -993,13 +993,13 @@ const unsigned int MyMoneyFile::moveSplits(const TQString& oldAccount, const TQS
 }
 */
 
-void MyMoneySeqAccessMgr::tqinvalidateBalanceCache(const TQString& id)
+void MyMoneySeqAccessMgr::invalidateBalanceCache(const TQString& id)
 {
   if(!id.isEmpty()) {
     try {
       m_balanceCache[id].valid = false;
       if(!isStandardAccount(id)) {
-        tqinvalidateBalanceCache(account(id).tqparentAccountId());
+        invalidateBalanceCache(account(id).parentAccountId());
       }
     } catch (MyMoneyException *e) {
       delete e;