1 files changed, 8 insertions, 8 deletions

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"));