1 files changed, 18 insertions, 18 deletions

diff --git a/kmymoney2/mymoney/mymoneyfile.cpp b/kmymoney2/mymoney/mymoneyfile.cpp
index 8707614..0e1a098 100644
--- a/kmymoney2/mymoney/mymoneyfile.cpp
+++ b/kmymoney2/mymoney/mymoneyfile.cpp
@@ -340,7 +340,7 @@ void MyMoneyFile::reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqpar
     MyMoneyNotifier notifier(this);
 
     // keep a notification of the current tqparent
-    addNotification(account.tqparentAccountId());
+    addNotification(account.parentAccountId());
 
     m_storage->reparentAccount(account, tqparent);
 
@@ -436,7 +436,7 @@ void MyMoneyFile::removeAccount(const MyMoneyAccount& account)
   // check that the account and its tqparent exist
   // this will throw an exception if the id is unknown
   acc = MyMoneyFile::account(account.id());
-  tqparent = MyMoneyFile::account(account.tqparentAccountId());
+  tqparent = MyMoneyFile::account(account.parentAccountId());
   if(!acc.institutionId().isEmpty())
     institution = MyMoneyFile::institution(acc.institutionId());
 
@@ -562,7 +562,7 @@ void MyMoneyFile::addAccount(MyMoneyAccount& account, MyMoneyAccount& tqparent)
   if(account.accountList().count() != 0)
     throw new MYMONEYEXCEPTION("New account must have no sub-accounts");
 
-  if(!account.tqparentAccountId().isEmpty())
+  if(!account.parentAccountId().isEmpty())
     throw new MYMONEYEXCEPTION("New account must have no tqparent-id");
 
   if(account.accountType() == MyMoneyAccount::UnknownAccountType)
@@ -1168,7 +1168,7 @@ TQString MyMoneyFile::accountToCategory(const TQString& accountId, bool includeS
       if(!rc.isEmpty())
         rc = AccountSeperator + rc;
       rc = acc.name() + rc;
-      acc = account(acc.tqparentAccountId());
+      acc = account(acc.parentAccountId());
     } while(!acc.id().isEmpty() && (includeStandardAccounts || !isStandardAccount(acc.id())));
   }
   return rc;
@@ -1206,7 +1206,7 @@ TQString MyMoneyFile::nameToAccount(const TQString& name) const
   return id;
 }
 
-TQString MyMoneyFile::tqparentName(const TQString& name) const
+TQString MyMoneyFile::parentName(const TQString& name) const
 {
   return name.section(AccountSeperator, 0, -2);
 }
@@ -1355,7 +1355,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void)
   MyMoneyAccount child;
   MyMoneyAccount toplevel;
 
-  TQString tqparentId;
+  TQString parentId;
   TQStringList rc;
 
   int problemCount = 0;
@@ -1404,11 +1404,11 @@ const TQStringList MyMoneyFile::consistencyCheck(void)
     }
 
     // check for loops in the hierarchy
-    tqparentId = (*it_a).tqparentAccountId();
+    parentId = (*it_a).parentAccountId();
     try {
       bool dropOut = false;
-      while(!isStandardAccount(tqparentId) && !dropOut) {
-        tqparent = account(tqparentId);
+      while(!isStandardAccount(parentId) && !dropOut) {
+        tqparent = account(parentId);
         if(tqparent.id() == (*it_a).id()) {
           // tqparent loops, so we need to re-tqparent to toplevel account
           // find tqparent account in our list
@@ -1420,7 +1420,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void)
                 problemAccount = (*it_a).name();
                 rc << i18n("* Problem with account '%1'").tqarg(problemAccount);
                 rc << i18n("  * Loop detected between this account and account '%2'.").tqarg((*it_b).name());
-                rc << i18n("    Retqparenting account '%2' to top level account '%1'.").tqarg(toplevel.name(), (*it_a).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)
                   accountRebuild << toplevel.id();
@@ -1432,7 +1432,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void)
             }
           }
         }
-        tqparentId = tqparent.tqparentAccountId();
+        parentId = tqparent.parentAccountId();
       }
 
     } catch(MyMoneyException *e) {
@@ -1441,9 +1441,9 @@ const TQStringList MyMoneyFile::consistencyCheck(void)
     }
 
     // check that the tqparent exists
-    tqparentId = (*it_a).tqparentAccountId();
+    parentId = (*it_a).parentAccountId();
     try {
-      tqparent = account(tqparentId);
+      tqparent = account(parentId);
       if((*it_a).accountGroup() != tqparent.accountGroup()) {
         problemCount++;
         if(problemAccount != (*it_a).name()) {
@@ -1476,7 +1476,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void)
       }
     } catch(MyMoneyException *e) {
       delete e;
-      // aptqparently, the tqparent does not exist anymore. we reconnect to the
+      // apparently, the tqparent does not exist anymore. we reconnect to the
       // master group account (asset, liability, etc) to which this account
       // should belong and update it in the engine.
       problemCount++;
@@ -1484,7 +1484,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void)
         problemAccount = (*it_a).name();
         rc << i18n("* Problem with account '%1'").tqarg(problemAccount);
       }
-      rc << i18n("  * The tqparent with id %1 does not exist anymore.").tqarg(tqparentId);
+      rc << i18n("  * The tqparent with id %1 does not exist anymore.").tqarg(parentId);
       rc << i18n("    New tqparent account is the top level account '%1'.").tqarg(toplevel.name());
       (*it_a).setParentAccountId(toplevel.id());
 
@@ -1552,10 +1552,10 @@ const TQStringList MyMoneyFile::consistencyCheck(void)
   // reconstruct the lists
   for(it_a = list.begin(); it_a != list.end(); ++it_a) {
     TQValueList<MyMoneyAccount>::Iterator it;
-    tqparentId = (*it_a).tqparentAccountId();
-    if(accountRebuild.tqcontains(tqparentId)) {
+    parentId = (*it_a).parentAccountId();
+    if(accountRebuild.tqcontains(parentId)) {
       for(it = list.begin(); it != list.end(); ++it) {
-        if((*it).id() == tqparentId) {
+        if((*it).id() == parentId) {
           (*it).addAccountId((*it_a).id());
           break;
         }