Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


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

12 files changed, 73 insertions, 73 deletions

diff --git a/kmymoney2/mymoney/storage/imymoneystorage.h b/kmymoney2/mymoney/storage/imymoneystorage.h
index a4ff2af..cac0e45 100644
--- a/kmymoney2/mymoney/storage/imymoneystorage.h
+++ b/kmymoney2/mymoney/storage/imymoneystorage.h
@@ -370,11 +370,11 @@ public:
   virtual void modifyTransaction(const MyMoneyTransaction& transaction) = 0;
 
   /**
-    * This method re-tqparents an existing account
+    * This method re-parents an existing account
     *
     * An exception will be thrown upon error conditions.
     *
-    * @param account MyMoneyAccount reference to account to be re-tqparented
+    * @param account MyMoneyAccount reference to account to be re-parented
     * @param tqparent  MyMoneyAccount reference to new tqparent account
     */
   virtual void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqparent) = 0;
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);
   }
diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgr.h b/kmymoney2/mymoney/storage/mymoneydatabasemgr.h
index 1511915..e146a70 100644
--- a/kmymoney2/mymoney/storage/mymoneydatabasemgr.h
+++ b/kmymoney2/mymoney/storage/mymoneydatabasemgr.h
@@ -320,11 +320,11 @@ public:
   virtual void modifyTransaction(const MyMoneyTransaction& transaction);
 
   /**
-    * This method re-tqparents an existing account
+    * This method re-parents an existing account
     *
     * An exception will be thrown upon error conditions.
     *
-    * @param account MyMoneyAccount reference to account to be re-tqparented
+    * @param account MyMoneyAccount reference to account to be re-parented
     * @param tqparent  MyMoneyAccount reference to new tqparent account
     */
   virtual void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqparent);
diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp b/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp
index ae589cd..8886447 100644
--- a/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp
+++ b/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp
@@ -421,7 +421,7 @@ void MyMoneyDatabaseMgrTest::testModifyAccount() {
   try {
     m->modifyAccount(a);
     MyMoneyAccount b = m->account("A000001");
-    CPPUNIT_ASSERT(b.tqparentAccountId() == a.tqparentAccountId());
+    CPPUNIT_ASSERT(b.parentAccountId() == a.parentAccountId());
     CPPUNIT_ASSERT(b.name() == "New account name");
   } catch (MyMoneyException *e) {
     delete e;
@@ -490,7 +490,7 @@ void MyMoneyDatabaseMgrTest::testModifyInstitution() {
   }
 }
 
-void MyMoneyDatabaseMgrTest::testRetqparentAccount() {
+void MyMoneyDatabaseMgrTest::testReparentAccount() {
   testAttachDb();
 
   if (!m_canOpen) {
@@ -551,7 +551,7 @@ void MyMoneyDatabaseMgrTest::testRetqparentAccount() {
     MyMoneyFile::instance()->preloadCache();
     CPPUNIT_ASSERT(m->expense().accountCount() == 3);
     CPPUNIT_ASSERT(m->account(ex1.id()).accountCount() == 1);
-    CPPUNIT_ASSERT(ex3.tqparentAccountId() == STD_ACC_EXPENSE);
+    CPPUNIT_ASSERT(ex3.parentAccountId() == STD_ACC_EXPENSE);
 
     //for (int i = 0; i < 100; ++i) {
       m->reparentAccount(ex3, ex1);
@@ -559,7 +559,7 @@ void MyMoneyDatabaseMgrTest::testRetqparentAccount() {
     MyMoneyFile::instance()->preloadCache();
     CPPUNIT_ASSERT(m->expense().accountCount() == 2);
     CPPUNIT_ASSERT(m->account(ex1.id()).accountCount() == 2);
-    CPPUNIT_ASSERT(ex3.tqparentAccountId() == ex1.id());
+    CPPUNIT_ASSERT(ex3.parentAccountId() == ex1.id());
   } catch (MyMoneyException *e) {
     std::cout << std::endl << e->what() << std::endl;
     delete e;
@@ -575,7 +575,7 @@ void MyMoneyDatabaseMgrTest::testAddTransactions() {
     return;
   }
 
-  testRetqparentAccount();
+  testReparentAccount();
 
   MyMoneyAccount ch;
   MyMoneyTransaction t1, t2;
@@ -1045,7 +1045,7 @@ void MyMoneyDatabaseMgrTest::testRemoveInstitution() {
   }
 
   testModifyInstitution();
-  testRetqparentAccount();
+  testReparentAccount();
 
   MyMoneyInstitution i;
   MyMoneyAccount a;
@@ -1474,7 +1474,7 @@ void MyMoneyDatabaseMgrTest::testAddSchedule() {
   }
 
   // put some accounts in the db, so the tests don't break
-  testRetqparentAccount();
+  testReparentAccount();
 
   try {
     CPPUNIT_ASSERT(m->scheduleList().count() == 0);
@@ -1648,7 +1648,7 @@ void MyMoneyDatabaseMgrTest::testScheduleList() {
   }
 
   // put some accounts in the db, so the tests don't break
-  testRetqparentAccount();
+  testReparentAccount();
 
   TQDate  testDate = TQDate::tqcurrentDate();
   TQDate  notOverdue = testDate.addDays(2);
diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.h b/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.h
index d883032..8ab4b64 100644
--- a/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.h
+++ b/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.h
@@ -40,7 +40,7 @@ class MyMoneyDatabaseMgrTest : public CppUnit::TestFixture  {
   CPPUNIT_TEST(testIsStandardAccount);
   CPPUNIT_TEST(testNewAccount);
   CPPUNIT_TEST(testAddNewAccount);
-  CPPUNIT_TEST(testRetqparentAccount);
+  CPPUNIT_TEST(testReparentAccount);
   CPPUNIT_TEST(testAddInstitution);
   CPPUNIT_TEST(testInstitution);
   CPPUNIT_TEST(testAccount2Institution);
@@ -103,7 +103,7 @@ public:
   void testAccount2Institution();
   void testModifyAccount();
   void testModifyInstitution();
-  void testRetqparentAccount();
+  void testReparentAccount();
   void testAddTransactions();
   void testTransactionCount();
   void testAddBudget();
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;
diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h
index ddc2030..abca654 100644
--- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h
+++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h
@@ -50,7 +50,7 @@
   * will be created containing the new balance value.
   *
   * @see MyMoneySeqAccessMgr::balance() and
-  *      MyMoneySeqAccessMgr::tqinvalidateBalanceCache() for a usage example
+  *      MyMoneySeqAccessMgr::invalidateBalanceCache() for a usage example
   */
 class MyMoneyBalanceCacheItem {
 public:
@@ -286,11 +286,11 @@ public:
   void modifyTransaction(const MyMoneyTransaction& transaction);
 
   /**
-    * This method re-tqparents an existing account
+    * This method re-parents an existing account
     *
     * An exception will be thrown upon error conditions.
     *
-    * @param account MyMoneyAccount reference to account to be re-tqparented
+    * @param account MyMoneyAccount reference to account to be re-parented
     * @param tqparent  MyMoneyAccount reference to new tqparent account
     */
   void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqparent);
@@ -998,11 +998,11 @@ private:
 
   /**
     * This method is used to tqinvalidate the cached balance for
-    * the selected account and all it's tqparents.
+    * the selected account and all it's parents.
     *
     * @param id id of the account in question
     */
-  void tqinvalidateBalanceCache(const TQString& id);
+  void invalidateBalanceCache(const TQString& id);
 
   /**
     * This member variable keeps the User information.
@@ -1207,11 +1207,11 @@ private:
 
 
   /**
-    * This method re-tqparents an existing account
+    * This method re-parents an existing account
     *
     * An exception will be thrown upon error conditions.
     *
-    * @param account MyMoneyAccount reference to account to be re-tqparented
+    * @param account MyMoneyAccount reference to account to be re-parented
     * @param tqparent  MyMoneyAccount reference to new tqparent account
     * @param sendNotification if true, notifications with the ids
     *                of all modified objects are send
diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp b/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp
index 9decdce..c4505e3 100644
--- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp
+++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp
@@ -354,7 +354,7 @@ void MyMoneySeqAccessMgrTest::testModifyAccount() {
 		m->commitTransaction();
 		m->startTransaction();
 		MyMoneyAccount b = m->account("A000001");
-		CPPUNIT_ASSERT(b.tqparentAccountId() == a.tqparentAccountId());
+		CPPUNIT_ASSERT(b.parentAccountId() == a.parentAccountId());
 		CPPUNIT_ASSERT(b.name() == "New account name");
 		CPPUNIT_ASSERT(m->dirty() == true);
 	} catch (MyMoneyException *e) {
@@ -422,7 +422,7 @@ void MyMoneySeqAccessMgrTest::testModifyInstitution() {
 	}
 }
 
-void MyMoneySeqAccessMgrTest::testRetqparentAccount() {
+void MyMoneySeqAccessMgrTest::testReparentAccount() {
 	// this one adds some accounts to the database
 	MyMoneyAccount ex1;
 	ex1.setAccountType(MyMoneyAccount::Expense);
@@ -475,12 +475,12 @@ void MyMoneySeqAccessMgrTest::testRetqparentAccount() {
 
 		CPPUNIT_ASSERT(m->expense().accountCount() == 3);
 		CPPUNIT_ASSERT(m->account(ex1.id()).accountCount() == 1);
-		CPPUNIT_ASSERT(ex3.tqparentAccountId() == STD_ACC_EXPENSE);
+		CPPUNIT_ASSERT(ex3.parentAccountId() == STD_ACC_EXPENSE);
 
 		m->reparentAccount(ex3, ex1);
 		CPPUNIT_ASSERT(m->expense().accountCount() == 2);
 		CPPUNIT_ASSERT(m->account(ex1.id()).accountCount() == 2);
-		CPPUNIT_ASSERT(ex3.tqparentAccountId() == ex1.id());
+		CPPUNIT_ASSERT(ex3.parentAccountId() == ex1.id());
 	} catch (MyMoneyException *e) {
 		std::cout << std::endl << e->what() << std::endl;
 		delete e;
@@ -489,7 +489,7 @@ void MyMoneySeqAccessMgrTest::testRetqparentAccount() {
 }
 
 void MyMoneySeqAccessMgrTest::testAddTransactions() {
-	testRetqparentAccount();
+	testReparentAccount();
 
 	MyMoneyAccount ch;
 	MyMoneyTransaction t1, t2;
@@ -822,7 +822,7 @@ void MyMoneySeqAccessMgrTest::testRemoveUsedAccount() {
 
 void MyMoneySeqAccessMgrTest::testRemoveInstitution() {
 	testModifyInstitution();
-	testRetqparentAccount();
+	testReparentAccount();
 
 	MyMoneyInstitution i;
 	MyMoneyAccount a;
diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.h b/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.h
index 57f1cd6..761c651 100644
--- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.h
+++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.h
@@ -38,7 +38,7 @@ class MyMoneySeqAccessMgrTest : public CppUnit::TestFixture  {
 	CPPUNIT_TEST(testIsStandardAccount);
 	CPPUNIT_TEST(testNewAccount);
 	CPPUNIT_TEST(testAddNewAccount);
-	CPPUNIT_TEST(testRetqparentAccount);
+	CPPUNIT_TEST(testReparentAccount);
 	CPPUNIT_TEST(testAddInstitution);
 	CPPUNIT_TEST(testInstitution);
 	CPPUNIT_TEST(testAccount2Institution);
@@ -94,7 +94,7 @@ public:
 	void testAccount2Institution();
 	void testModifyAccount();
 	void testModifyInstitution();
-	void testRetqparentAccount();
+	void testReparentAccount();
 	void testAddTransactions();
 	void testTransactionCount();
 	void testBalance();
diff --git a/kmymoney2/mymoney/storage/mymoneystoragedump.cpp b/kmymoney2/mymoney/storage/mymoneystoragedump.cpp
index 77fa395..8dd022a 100644
--- a/kmymoney2/mymoney/storage/mymoneystoragedump.cpp
+++ b/kmymoney2/mymoney/storage/mymoneystoragedump.cpp
@@ -160,9 +160,9 @@ void MyMoneyStorageDump::writeStream(TQDataStream& _s, IMyMoneySerialize* _stora
         s << "  Currency = " << storage->currency((*it_a).currencyId()).name() << "\n";
       }
     }
-    s << "  Parent = " << (*it_a).tqparentAccountId();
-    if(!(*it_a).tqparentAccountId().isEmpty()) {
-      MyMoneyAccount tqparent = storage->account((*it_a).tqparentAccountId());
+    s << "  Parent = " << (*it_a).parentAccountId();
+    if(!(*it_a).parentAccountId().isEmpty()) {
+      MyMoneyAccount tqparent = storage->account((*it_a).parentAccountId());
       s << " (" << tqparent.name() << ")";
     } else {
       s << "n/a";
diff --git a/kmymoney2/mymoney/storage/mymoneystoragesql.cpp b/kmymoney2/mymoney/storage/mymoneystoragesql.cpp
index 12a4aa3..f479c5c 100644
--- a/kmymoney2/mymoney/storage/mymoneystoragesql.cpp
+++ b/kmymoney2/mymoney/storage/mymoneystoragesql.cpp
@@ -191,7 +191,7 @@ try {
   readFileInfo();
   if (!m_logonUser.isEmpty() && (!m_override)) {
     m_error = TQString
-        (i18n("Database aptqparently in use\nOpened by %1 on %2 at %3.\nOpen anyway?"))
+        (i18n("Database apparently in use\nOpened by %1 on %2 at %3.\nOpen anyway?"))
         .tqarg(m_logonUser)
         .tqarg(m_logonAt.date().toString(Qt::ISODate))
         .tqarg(m_logonAt.time().toString("hh.mm.ss"));
@@ -1291,7 +1291,7 @@ void MyMoneyStorageSql::writeAccount(const MyMoneyAccount& acc, MyMoneySqlQuery&
   //MyMoneyMoney balance = m_storagePtr->balance(acc.id(), TQDate());
   q.bindValue(":id", acc.id());
   q.bindValue(":institutionId", acc.institutionId());
-  q.bindValue(":tqparentId", acc.tqparentAccountId());
+  q.bindValue(":parentId", acc.parentAccountId());
   if (acc.lastReconciliationDate() == TQDate())
     q.bindValue(":lastReconciled", acc.lastReconciliationDate());
   else
@@ -2489,7 +2489,7 @@ const TQMap<TQString, MyMoneyAccount> MyMoneyStorageSql::fetchAccounts (const TQ
   MyMoneySqlQuery q(const_cast <MyMoneyStorageSql*> (this));
   MyMoneySqlQuery sq(const_cast <MyMoneyStorageSql*> (this));
 
-  TQString childQueryString = "SELECT id, tqparentId FROM kmmAccounts WHERE ";
+  TQString childQueryString = "SELECT id, parentId FROM kmmAccounts WHERE ";
   TQString queryString (t.selectAllString(false));
 
   // Use bind variables, instead of just inserting the values in the queryString,
@@ -2497,7 +2497,7 @@ const TQMap<TQString, MyMoneyAccount> MyMoneyStorageSql::fetchAccounts (const TQ
   if (! idList.empty()) {
     kvpAccountList = idList;
     queryString += " WHERE id IN (";
-    childQueryString += " tqparentId IN (";
+    childQueryString += " parentId IN (";
     for (unsigned i = 0; i < idList.count(); ++i) {
       queryString += " :id" + TQString::number(i) + ", ";
       childQueryString += ":id" + TQString::number(i) + ", ";
@@ -2505,11 +2505,11 @@ const TQMap<TQString, MyMoneyAccount> MyMoneyStorageSql::fetchAccounts (const TQ
     queryString = queryString.left(queryString.length() - 2) + ")";
     childQueryString = childQueryString.left(childQueryString.length() - 2) + ")";
   } else {
-    childQueryString += " NOT tqparentId IS NULL";
+    childQueryString += " NOT parentId IS NULL";
   }
 
   queryString += " ORDER BY id";
-  childQueryString += " ORDER BY tqparentid, id";
+  childQueryString += " ORDER BY parentid, id";
 
   if (forUpdate) {
     queryString += " FOR UPDATE";
@@ -2539,7 +2539,7 @@ const TQMap<TQString, MyMoneyAccount> MyMoneyStorageSql::fetchAccounts (const TQ
     while (ft != accEnd) {
       CASE(id) aid = GETCSTRING;
       else CASE(institutionId) acc.setInstitutionId(GETCSTRING);
-      else CASE(tqparentId) acc.setParentAccountId(GETCSTRING);
+      else CASE(parentId) acc.setParentAccountId(GETCSTRING);
       else CASE(lastReconciled) acc.setLastReconciliationDate(GETDATE);
       else CASE(lastModified) acc.setLastModified(GETDATE);
       else CASE(openingDate) acc.setOpeningDate(GETDATE);
@@ -3911,7 +3911,7 @@ void MyMoneyDbDef::Accounts(void){
   TQValueList<KSharedPtr <MyMoneyDbColumn> > fields;
   fields.append(new MyMoneyDbColumn("id", "varchar(32)",  PRIMARYKEY, NOTNULL));
   fields.append(new MyMoneyDbColumn("institutionId", "varchar(32)"));
-  fields.append(new MyMoneyDbColumn("tqparentId", "varchar(32)"));
+  fields.append(new MyMoneyDbColumn("parentId", "varchar(32)"));
   fields.append(new MyMoneyDbDatetimeColumn("lastReconciled"));
   fields.append(new MyMoneyDbDatetimeColumn("lastModified"));
   fields.append(new MyMoneyDbColumn("openingDate", "date"));
diff --git a/kmymoney2/mymoney/storage/mymoneystoragexml.cpp b/kmymoney2/mymoney/storage/mymoneystoragexml.cpp
index 49e0739..e8b79fd 100644
--- a/kmymoney2/mymoney/storage/mymoneystoragexml.cpp
+++ b/kmymoney2/mymoney/storage/mymoneystoragexml.cpp
@@ -214,7 +214,7 @@ bool MyMoneyXmlContentHandler::endElement(const TQString& /* namespaceURI */, co
   bool rc = true;
   TQString s = qName.lower();
   if(m_level) {
-    m_currNode = m_currNode.tqparentNode().toElement();
+    m_currNode = m_currNode.parentNode().toElement();
     m_level--;
     if(!m_level) {
       try {