rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kmymoney@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

10 files changed, 103 insertions, 103 deletions

diff --git a/kmymoney2/mymoney/storage/imymoneyserialize.h b/kmymoney2/mymoney/storage/imymoneyserialize.h
index c900687..dc37edd 100644
--- a/kmymoney2/mymoney/storage/imymoneyserialize.h
+++ b/kmymoney2/mymoney/storage/imymoneyserialize.h
@@ -194,12 +194,12 @@ public:
 
   /**
     * This method is used to add one account as sub-ordinate to another
-    * (tqparent) account. The objects that are passed will be modified
+    * (parent) account. The objects that are passed will be modified
     * accordingly.
     *
     * An exception will be thrown upon error conditions.
     *
-    * @param tqparent tqparent account the account should be added to
+    * @param parent parent account the account should be added to
     * @param account the account to be added
     *
     * @deprecated This method is only provided as long as we provide
@@ -207,7 +207,7 @@ public:
     *             this compatability mode this method will disappear from
     *             this interface!
     */
-  virtual void addAccount(MyMoneyAccount& tqparent, MyMoneyAccount& account) = 0;
+  virtual void addAccount(MyMoneyAccount& parent, MyMoneyAccount& account) = 0;
 
   /**
     * This method is used to create a new payee
diff --git a/kmymoney2/mymoney/storage/imymoneystorage.h b/kmymoney2/mymoney/storage/imymoneystorage.h
index cac0e45..02e53c2 100644
--- a/kmymoney2/mymoney/storage/imymoneystorage.h
+++ b/kmymoney2/mymoney/storage/imymoneystorage.h
@@ -135,15 +135,15 @@ public:
 
   /**
     * This method is used to add one account as sub-ordinate to another
-    * (tqparent) account. The objects that are passed will be modified
+    * (parent) account. The objects that are passed will be modified
     * accordingly.
     *
     * An exception will be thrown upon error conditions.
     *
-    * @param tqparent tqparent account the account should be added to
+    * @param parent parent account the account should be added to
     * @param account the account to be added
     */
-  virtual void addAccount(MyMoneyAccount& tqparent, MyMoneyAccount& account) = 0;
+  virtual void addAccount(MyMoneyAccount& parent, MyMoneyAccount& account) = 0;
 
   /**
     * This method is used to create a new payee
@@ -375,9 +375,9 @@ public:
     * An exception will be thrown upon error conditions.
     *
     * @param account MyMoneyAccount reference to account to be re-parented
-    * @param tqparent  MyMoneyAccount reference to new tqparent account
+    * @param parent  MyMoneyAccount reference to new parent account
     */
-  virtual void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqparent) = 0;
+  virtual void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& parent) = 0;
 
   /**
     * This method is used to remove a transaction from the transaction
diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp b/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp
index 8bafce8..a80d5af 100644
--- a/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp
+++ b/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp
@@ -104,21 +104,21 @@ void MyMoneyDatabaseMgr::addAccount(MyMoneyAccount& account)
   }
 }
 
-void MyMoneyDatabaseMgr::addAccount(MyMoneyAccount& tqparent, MyMoneyAccount& account)
+void MyMoneyDatabaseMgr::addAccount(MyMoneyAccount& parent, MyMoneyAccount& account)
 {
   TQMap<TQString, MyMoneyAccount> accountList;
   TQStringList accountIdList;
   TQMap<TQString, MyMoneyAccount>::ConstIterator theParent;
   TQMap<TQString, MyMoneyAccount>::ConstIterator theChild;
 
-  accountIdList << tqparent.id() << account.id();
+  accountIdList << parent.id() << account.id();
   startTransaction();
   accountList = m_sql->fetchAccounts(accountIdList, true);
 
-  theParent = accountList.find(tqparent.id());
+  theParent = accountList.find(parent.id());
   if(theParent == accountList.end()) {
-    TQString msg = "Unknown tqparent account '";
-    msg += tqparent.id() + "'";
+    TQString msg = "Unknown parent account '";
+    msg += parent.id() + "'";
     throw new MYMONEYEXCEPTION(msg);
   }
 
@@ -131,16 +131,16 @@ void MyMoneyDatabaseMgr::addAccount(MyMoneyAccount& tqparent, MyMoneyAccount& ac
 
   MyMoneyAccount acc = *theParent;
   acc.addAccountId(account.id());
-  tqparent = acc;
+  parent = acc;
 
   acc = *theChild;
-  acc.setParentAccountId(tqparent.id());
+  acc.setParentAccountId(parent.id());
   account = acc;
 
 //FIXME:  MyMoneyBalanceCacheItem balance;
 //FIXME:  m_balanceCache[account.id()] = balance;
 
-  m_sql->modifyAccount(tqparent);
+  m_sql->modifyAccount(parent);
   m_sql->modifyAccount(account);
   commitTransaction();
 }
@@ -648,9 +648,9 @@ void MyMoneyDatabaseMgr::modifyTransaction(const MyMoneyTransaction& transaction
   m_sql->modifyTransaction(transaction);
 }
 
-void MyMoneyDatabaseMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqparent)
+void MyMoneyDatabaseMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccount& parent)
 {
-  if(account.accountType() == MyMoneyAccount::Stock && tqparent.accountType() != MyMoneyAccount::Investment)
+  if(account.accountType() == MyMoneyAccount::Stock && parent.accountType() != MyMoneyAccount::Investment)
     throw new MYMONEYEXCEPTION("Cannot move a stock acocunt into a non-investment account");
 
   TQStringList accountIdList;
@@ -660,9 +660,9 @@ void MyMoneyDatabaseMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccount
 
   // verify that accounts exist. If one does not,
   // an exception is thrown
-  accountIdList << account.id() << tqparent.id();
+  accountIdList << account.id() << parent.id();
   MyMoneyDatabaseMgr::account(account.id());
-  MyMoneyDatabaseMgr::account(tqparent.id());
+  MyMoneyDatabaseMgr::account(parent.id());
 
   if(!account.parentAccountId().isEmpty()) {
     accountIdList << account.parentAccountId();
@@ -676,7 +676,7 @@ void MyMoneyDatabaseMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccount
     oldParent = accountList.find(account.parentAccountId());
   }
 
-  newParent = accountList.find(tqparent.id());
+  newParent = accountList.find(parent.id());
   childAccount = accountList.find(account.id());
 
   MyMoneyAccount acc;
@@ -686,13 +686,13 @@ void MyMoneyDatabaseMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccount
     m_sql->modifyAccount(acc);
   }
 
-  tqparent = (*newParent);
-  tqparent.addAccountId(account.id());
+  parent = (*newParent);
+  parent.addAccountId(account.id());
 
   account = (*childAccount);
-  account.setParentAccountId(tqparent.id());
+  account.setParentAccountId(parent.id());
 
-  m_sql->modifyAccount(tqparent);
+  m_sql->modifyAccount(parent);
   m_sql->modifyAccount(account);
   commitTransaction();
 }
@@ -787,12 +787,12 @@ void MyMoneyDatabaseMgr::transactionList(TQValueList<TQPair<MyMoneyTransaction,
 
 void MyMoneyDatabaseMgr::removeAccount(const MyMoneyAccount& account)
 {
-  MyMoneyAccount tqparent;
+  MyMoneyAccount parent;
 
-  // check that the account and it's tqparent exist
+  // check that the account and it's parent exist
   // this will throw an exception if the id is unknown
   MyMoneyDatabaseMgr::account(account.id());
-  tqparent = MyMoneyDatabaseMgr::account(account.parentAccountId());
+  parent = MyMoneyDatabaseMgr::account(account.parentAccountId());
 
   // check that it's not one of the standard account groups
   if(isStandardAccount(account.id()))
@@ -802,7 +802,7 @@ void MyMoneyDatabaseMgr::removeAccount(const MyMoneyAccount& account)
     throw new MYMONEYEXCEPTION("Unable to remove account with active splits");
   }
 
-  // re-tqparent all sub-ordinate accounts to the tqparent of the account
+  // re-parent all sub-ordinate accounts to the parent of the account
   // to be deleted. First round check that all accounts exist, second
   // round do the re-parenting.
   TQStringList::ConstIterator it;
@@ -814,7 +814,7 @@ void MyMoneyDatabaseMgr::removeAccount(const MyMoneyAccount& account)
   // thrown and we would not make it until here.
 
   TQStringList accountIdList;
-  accountIdList << tqparent.id() << account.id();
+  accountIdList << parent.id() << account.id();
   startTransaction();
   TQMap<TQString, MyMoneyAccount> accountList = m_sql->fetchAccounts(accountIdList, true);
 
@@ -827,9 +827,9 @@ void MyMoneyDatabaseMgr::removeAccount(const MyMoneyAccount& account)
   if(it_a == accountList.end())
     throw new MYMONEYEXCEPTION("Internal error: account not found in list");
 
-  it_p = accountList.find(tqparent.id());
+  it_p = accountList.find(parent.id());
   if(it_p == accountList.end())
-    throw new MYMONEYEXCEPTION("Internal error: tqparent account not found in list");
+    throw new MYMONEYEXCEPTION("Internal error: parent account not found in list");
 
   if(!account.institutionId().isEmpty())
     throw new MYMONEYEXCEPTION("Cannot remove account still attached to an institution");
@@ -848,19 +848,19 @@ void MyMoneyDatabaseMgr::removeAccount(const MyMoneyAccount& account)
     if((*it_a).accountList().count() > 0) {
       for(it = (*it_a).accountList().begin(); it != (*it_a).accountList().end(); ++it) {
         MyMoneyAccount acc(MyMoneyDatabaseMgr::account(*it));
-        reparentAccount(acc, tqparent);//, false);
+        reparentAccount(acc, parent);//, false);
       }
     }
-    // remove account from tqparent's list
-    tqparent.removeAccountId(account.id());
-    m_sql->modifyAccount(tqparent);
+    // remove account from parent's list
+    parent.removeAccountId(account.id());
+    m_sql->modifyAccount(parent);
 
     // remove account from the global account pool
     //m_accountList.remove(account.id());
 
     // remove from balance list
 //FIXME:    m_balanceCache.remove(account.id());
-//FIXME:    invalidateBalanceCache(tqparent.id());
+//FIXME:    invalidateBalanceCache(parent.id());
 
     m_sql->removeAccount(account);
   }
diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgr.h b/kmymoney2/mymoney/storage/mymoneydatabasemgr.h
index e146a70..5135ca4 100644
--- a/kmymoney2/mymoney/storage/mymoneydatabasemgr.h
+++ b/kmymoney2/mymoney/storage/mymoneydatabasemgr.h
@@ -82,15 +82,15 @@ public:
 
   /**
     * This method is used to add one account as sub-ordinate to another
-    * (tqparent) account. The objects that are passed will be modified
+    * (parent) account. The objects that are passed will be modified
     * accordingly.
     *
     * An exception will be thrown upon error conditions.
     *
-    * @param tqparent tqparent account the account should be added to
+    * @param parent parent account the account should be added to
     * @param account the account to be added
     */
-  virtual void addAccount(MyMoneyAccount& tqparent, MyMoneyAccount& account);
+  virtual void addAccount(MyMoneyAccount& parent, MyMoneyAccount& account);
 
   /**
     * This method is used to create a new payee
@@ -325,9 +325,9 @@ public:
     * An exception will be thrown upon error conditions.
     *
     * @param account MyMoneyAccount reference to account to be re-parented
-    * @param tqparent  MyMoneyAccount reference to new tqparent account
+    * @param parent  MyMoneyAccount reference to new parent account
     */
-  virtual void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqparent);
+  virtual void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& parent);
 
   /**
     * This method is used to remove a transaction from the transaction
diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp b/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp
index 8886447..0591e2d 100644
--- a/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp
+++ b/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp
@@ -449,7 +449,7 @@ void MyMoneyDatabaseMgrTest::testModifyAccount() {
     delete e;
   }
 
-  // use different tqparent
+  // use different parent
   a.setParentAccountId("A000002");
   try {
     m->modifyAccount(c);
@@ -535,18 +535,18 @@ void MyMoneyDatabaseMgrTest::testReparentAccount() {
     CPPUNIT_ASSERT(in.id() == "A000005");
     CPPUNIT_ASSERT(ch.id() == "A000006");
 
-    MyMoneyAccount tqparent = m->expense();
+    MyMoneyAccount parent = m->expense();
 
-    m->addAccount(tqparent, ex1);
+    m->addAccount(parent, ex1);
     m->addAccount(ex1, ex2);
-    m->addAccount(tqparent, ex3);
-    m->addAccount(tqparent, ex4);
+    m->addAccount(parent, ex3);
+    m->addAccount(parent, ex4);
 
-    tqparent = m->income();
-    m->addAccount(tqparent, in);
+    parent = m->income();
+    m->addAccount(parent, in);
 
-    tqparent = m->asset();
-    m->addAccount(tqparent, ch);
+    parent = m->asset();
+    m->addAccount(parent, ch);
 
     MyMoneyFile::instance()->preloadCache();
     CPPUNIT_ASSERT(m->expense().accountCount() == 3);
diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp
index efc88b7..ef4c3a9 100644
--- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp
+++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp
@@ -248,15 +248,15 @@ const TQValueList<MyMoneyPayee> MyMoneySeqAccessMgr::payeeList(void) const
 }
 
 
-void MyMoneySeqAccessMgr::addAccount(MyMoneyAccount& tqparent, MyMoneyAccount& account)
+void MyMoneySeqAccessMgr::addAccount(MyMoneyAccount& parent, MyMoneyAccount& account)
 {
   TQMap<TQString, MyMoneyAccount>::ConstIterator theParent;
   TQMap<TQString, MyMoneyAccount>::ConstIterator theChild;
 
-  theParent = m_accountList.find(tqparent.id());
+  theParent = m_accountList.find(parent.id());
   if(theParent == m_accountList.end()) {
-    TQString msg = "Unknown tqparent account '";
-    msg += tqparent.id() + "'";
+    TQString msg = "Unknown parent account '";
+    msg += parent.id() + "'";
     throw new MYMONEYEXCEPTION(msg);
   }
 
@@ -270,10 +270,10 @@ void MyMoneySeqAccessMgr::addAccount(MyMoneyAccount& tqparent, MyMoneyAccount& a
   MyMoneyAccount acc = *theParent;
   acc.addAccountId(account.id());
   m_accountList.modify(acc.id(), acc);
-  tqparent = acc;
+  parent = acc;
 
   acc = *theChild;
-  acc.setParentAccountId(tqparent.id());
+  acc.setParentAccountId(parent.id());
   m_accountList.modify(acc.id(), acc);
   account = acc;
 
@@ -591,12 +591,12 @@ void MyMoneySeqAccessMgr::modifyTransaction(const MyMoneyTransaction& transactio
   m_transactionKeys.modify(transaction.id(), newKey);
 }
 
-void MyMoneySeqAccessMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqparent)
+void MyMoneySeqAccessMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccount& parent)
 {
-  reparentAccount(account, tqparent, true);
+  reparentAccount(account, parent, true);
 }
 
-void MyMoneySeqAccessMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqparent, const bool /* sendNotification */)
+void MyMoneySeqAccessMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccount& parent, const bool /* sendNotification */)
 {
   TQMap<TQString, MyMoneyAccount>::ConstIterator oldParent;
   TQMap<TQString, MyMoneyAccount>::ConstIterator newParent;
@@ -605,16 +605,16 @@ void MyMoneySeqAccessMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccoun
   // verify that accounts exist. If one does not,
   // an exception is thrown
   MyMoneySeqAccessMgr::account(account.id());
-  MyMoneySeqAccessMgr::account(tqparent.id());
+  MyMoneySeqAccessMgr::account(parent.id());
   if(!account.parentAccountId().isEmpty()) {
     MyMoneySeqAccessMgr::account(account.parentAccountId());
     oldParent = m_accountList.find(account.parentAccountId());
   }
 
-  if(account.accountType() == MyMoneyAccount::Stock && tqparent.accountType() != MyMoneyAccount::Investment)
+  if(account.accountType() == MyMoneyAccount::Stock && parent.accountType() != MyMoneyAccount::Investment)
     throw new MYMONEYEXCEPTION("Cannot move a stock acocunt into a non-investment account");
 
-  newParent = m_accountList.find(tqparent.id());
+  newParent = m_accountList.find(parent.id());
   childAccount = m_accountList.find(account.id());
 
   MyMoneyAccount acc;
@@ -624,16 +624,16 @@ void MyMoneySeqAccessMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccoun
     m_accountList.modify(acc.id(), acc);
   }
 
-  tqparent = (*newParent);
-  tqparent.addAccountId(account.id());
-  m_accountList.modify(tqparent.id(), tqparent);
+  parent = (*newParent);
+  parent.addAccountId(account.id());
+  m_accountList.modify(parent.id(), parent);
 
   account = (*childAccount);
-  account.setParentAccountId(tqparent.id());
+  account.setParentAccountId(parent.id());
   m_accountList.modify(account.id(), account);
 
 #if 0
-  // make sure the type is the same as the new tqparent. This does not work for stock and investment
+  // make sure the type is the same as the new parent. This does not work for stock and investment
   if(account.accountType() != MyMoneyAccount::Stock && account.accountType() != MyMoneyAccount::Investment)
     (*childAccount).setAccountType((*newParent).accountType());
 #endif
@@ -677,12 +677,12 @@ void MyMoneySeqAccessMgr::removeTransaction(const MyMoneyTransaction& transactio
 
 void MyMoneySeqAccessMgr::removeAccount(const MyMoneyAccount& account)
 {
-  MyMoneyAccount tqparent;
+  MyMoneyAccount parent;
 
-  // check that the account and it's tqparent exist
+  // check that the account and it's parent exist
   // this will throw an exception if the id is unknown
   MyMoneySeqAccessMgr::account(account.id());
-  tqparent = MyMoneySeqAccessMgr::account(account.parentAccountId());
+  parent = MyMoneySeqAccessMgr::account(account.parentAccountId());
 
   // check that it's not one of the standard account groups
   if(isStandardAccount(account.id()))
@@ -692,7 +692,7 @@ void MyMoneySeqAccessMgr::removeAccount(const MyMoneyAccount& account)
     throw new MYMONEYEXCEPTION("Unable to remove account with active splits");
   }
 
-  // re-tqparent all sub-ordinate accounts to the tqparent of the account
+  // re-parent all sub-ordinate accounts to the parent of the account
   // to be deleted. First round check that all accounts exist, second
   // round do the re-parenting.
   TQStringList::ConstIterator it;
@@ -712,9 +712,9 @@ void MyMoneySeqAccessMgr::removeAccount(const MyMoneyAccount& account)
   if(it_a == m_accountList.end())
     throw new MYMONEYEXCEPTION("Internal error: account not found in list");
 
-  it_p = m_accountList.find(tqparent.id());
+  it_p = m_accountList.find(parent.id());
   if(it_p == m_accountList.end())
-    throw new MYMONEYEXCEPTION("Internal error: tqparent account not found in list");
+    throw new MYMONEYEXCEPTION("Internal error: parent account not found in list");
 
   if(!account.institutionId().isEmpty())
     throw new MYMONEYEXCEPTION("Cannot remove account still attached to an institution");
@@ -736,19 +736,19 @@ void MyMoneySeqAccessMgr::removeAccount(const MyMoneyAccount& account)
       while((*it_a).accountList().count() > 0) {
         it = (*it_a).accountList().begin();
         MyMoneyAccount acc(MyMoneySeqAccessMgr::account(*it));
-        reparentAccount(acc, tqparent, false);
+        reparentAccount(acc, parent, false);
       }
     }
-    // remove account from tqparent's list
-    tqparent.removeAccountId(account.id());
-    m_accountList.modify(tqparent.id(), tqparent);
+    // remove account from parent's list
+    parent.removeAccountId(account.id());
+    m_accountList.modify(parent.id(), parent);
 
     // remove account from the global account pool
     m_accountList.remove(account.id());
 
     // remove from balance list
     m_balanceCache.remove(account.id());
-    invalidateBalanceCache(tqparent.id());
+    invalidateBalanceCache(parent.id());
   }
 }
 
diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h
index f570d92..0aebe23 100644
--- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h
+++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h
@@ -219,13 +219,13 @@ public:
 
   /**
     * This method is used to add one account as sub-ordinate to another
-    * (tqparent) account. The objects passed as arguments will be modified
+    * (parent) account. The objects passed as arguments will be modified
     * accordingly.
     *
-    * @param tqparent tqparent account the account should be added to
+    * @param parent parent account the account should be added to
     * @param account the account to be added
     */
-  void addAccount(MyMoneyAccount& tqparent, MyMoneyAccount& account);
+  void addAccount(MyMoneyAccount& parent, MyMoneyAccount& account);
 
   /**
     * Adds an institution to the storage. A
@@ -291,9 +291,9 @@ public:
     * An exception will be thrown upon error conditions.
     *
     * @param account MyMoneyAccount reference to account to be re-parented
-    * @param tqparent  MyMoneyAccount reference to new tqparent account
+    * @param parent  MyMoneyAccount reference to new parent account
     */
-  void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqparent);
+  void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& parent);
 
   /**
     * This method is used to remove a transaction from the transaction
@@ -1212,11 +1212,11 @@ private:
     * An exception will be thrown upon error conditions.
     *
     * @param account MyMoneyAccount reference to account to be re-parented
-    * @param tqparent  MyMoneyAccount reference to new tqparent account
+    * @param parent  MyMoneyAccount reference to new parent account
     * @param sendNotification if true, notifications with the ids
     *                of all modified objects are send
     */
-  void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqparent, const bool sendNotification);
+  void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& parent, const bool sendNotification);
   /**
    * This method will close a database and log the use roff
    */
diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp b/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp
index c4505e3..94d98f5 100644
--- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp
+++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp
@@ -383,7 +383,7 @@ void MyMoneySeqAccessMgrTest::testModifyAccount() {
 		delete e;
 	}
 
-	// use different tqparent
+	// use different parent
 	a.setParentAccountId("A000002");
 	try {
 		m->modifyAccount(c);
@@ -460,18 +460,18 @@ void MyMoneySeqAccessMgrTest::testReparentAccount() {
 		CPPUNIT_ASSERT(in.id() == "A000005");
 		CPPUNIT_ASSERT(ch.id() == "A000006");
 
-		MyMoneyAccount tqparent = m->expense();
+		MyMoneyAccount parent = m->expense();
 
-		m->addAccount(tqparent, ex1);
+		m->addAccount(parent, ex1);
 		m->addAccount(ex1, ex2);
-		m->addAccount(tqparent, ex3);
-		m->addAccount(tqparent, ex4);
+		m->addAccount(parent, ex3);
+		m->addAccount(parent, ex4);
 
-		tqparent = m->income();
-		m->addAccount(tqparent, in);
+		parent = m->income();
+		m->addAccount(parent, in);
 
-		tqparent = m->asset();
-		m->addAccount(tqparent, ch);
+		parent = m->asset();
+		m->addAccount(parent, ch);
 
 		CPPUNIT_ASSERT(m->expense().accountCount() == 3);
 		CPPUNIT_ASSERT(m->account(ex1.id()).accountCount() == 1);
diff --git a/kmymoney2/mymoney/storage/mymoneystoragedump.cpp b/kmymoney2/mymoney/storage/mymoneystoragedump.cpp
index 8dd022a..73521b0 100644
--- a/kmymoney2/mymoney/storage/mymoneystoragedump.cpp
+++ b/kmymoney2/mymoney/storage/mymoneystoragedump.cpp
@@ -162,8 +162,8 @@ void MyMoneyStorageDump::writeStream(TQDataStream& _s, IMyMoneySerialize* _stora
     }
     s << "  Parent = " << (*it_a).parentAccountId();
     if(!(*it_a).parentAccountId().isEmpty()) {
-      MyMoneyAccount tqparent = storage->account((*it_a).parentAccountId());
-      s << " (" << tqparent.name() << ")";
+      MyMoneyAccount parent = storage->account((*it_a).parentAccountId());
+      s << " (" << parent.name() << ")";
     } else {
       s << "n/a";
     }
diff --git a/kmymoney2/mymoney/storage/mymoneystoragexml.cpp b/kmymoney2/mymoney/storage/mymoneystoragexml.cpp
index 6290962..6c4cdcc 100644
--- a/kmymoney2/mymoney/storage/mymoneystoragexml.cpp
+++ b/kmymoney2/mymoney/storage/mymoneystoragexml.cpp
@@ -738,32 +738,32 @@ void MyMoneyStorageXML::writeCurrencies(TQDomElement& currencies)
   }
 }
 
-void MyMoneyStorageXML::writeReports(TQDomElement& tqparent)
+void MyMoneyStorageXML::writeReports(TQDomElement& parent)
 {
   const TQValueList<MyMoneyReport> list = m_storage->reportList();
   TQValueList<MyMoneyReport>::ConstIterator it;
-  tqparent.setAttribute("count", list.count());
+  parent.setAttribute("count", list.count());
 
   signalProgress(0, list.count(), i18n("Saving reports..."));
   unsigned i = 0;
   for(it = list.begin(); it != list.end(); ++it)
   {
-    (*it).writeXML(*m_doc, tqparent);
+    (*it).writeXML(*m_doc, parent);
     signalProgress(++i, 0);
   }
 }
 
-void MyMoneyStorageXML::writeBudgets(TQDomElement& tqparent)
+void MyMoneyStorageXML::writeBudgets(TQDomElement& parent)
 {
   const TQValueList<MyMoneyBudget> list = m_storage->budgetList();
   TQValueList<MyMoneyBudget>::ConstIterator it;
-  tqparent.setAttribute("count", list.count());
+  parent.setAttribute("count", list.count());
 
   signalProgress(0, list.count(), i18n("Saving budgets..."));
   unsigned i = 0;
   for(it = list.begin(); it != list.end(); ++it)
   {
-    writeBudget(tqparent, (*it));
+    writeBudget(parent, (*it));
     signalProgress(++i, 0);
   }
 }