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

8 files changed, 79 insertions, 79 deletions

diff --git a/kmymoney2/converter/mymoneygncreader.cpp b/kmymoney2/converter/mymoneygncreader.cpp
index 4d2d71d..bfd6911 100644
--- a/kmymoney2/converter/mymoneygncreader.cpp
+++ b/kmymoney2/converter/mymoneygncreader.cpp
@@ -487,7 +487,7 @@ GncAccount::GncAccount () {
   m_subElementList = subEls;
   m_dataElementListCount = END_Account_DELS;
   static const TQString dataEls[] = {"act:id", "act:name", "act:description",
-                                    "act:type", "act:tqparent"};
+                                    "act:type", "act:parent"};
   m_dataElementList = dataEls;
   static const unsigned int anonClasses[] = {ASIS, NXTACC, SUPPRESS, ASIS, ASIS};
   m_anonClassList = anonClasses;
@@ -958,7 +958,7 @@ bool XmlReader::endElement( const TQString&, const TQString&, const TQString&elN
     m_co->resetDataPtr(); // so we don't get extraneous data loaded into the variables
     if (elName == m_co->getElName()) { // check if this is the end of the current object
       if (pMain->gncdebug) m_co->debugDump(); // dump the object data (temp)
-      // call the terminate routine, pop the stack, and advise the tqparent that it's done
+      // call the terminate routine, pop the stack, and advise the parent that it's done
       m_co->terminate();
       GncObject *temp = m_co;
       m_os.pop();
@@ -1201,8 +1201,8 @@ void MyMoneyGncReader::convertAccount (const GncAccount* gac) {
     m_currencyCount[gac->commodity()->id()]++;
   }
 
-  acc.setParentAccountId (gac->tqparent().utf8());
-  // now determine the account type and its tqparent id
+  acc.setParentAccountId (gac->parent().utf8());
+  // now determine the account type and its parent id
   /* This list taken from
 # Feb 2006: A RELAX NG Compact schema for gnucash "v2" XML files.
 # Copyright (C) 2006 Joshua Sled <jsled@asynchronous.org>
@@ -1251,7 +1251,7 @@ void MyMoneyGncReader::convertAccount (const GncAccount* gac) {
         i18n("Current importer does not recognize GnuCash account type %1").tqarg(gac->type());
     throw new MYMONEYEXCEPTION (em);
   }
-  // if no tqparent account is present, assign to one of our standard accounts
+  // if no parent account is present, assign to one of our standard accounts
   if ((acc.parentAccountId().isEmpty()) || (acc.parentAccountId() == m_rootId)) {
     switch (acc.accountGroup()) {
     case MyMoneyAccount::Asset: acc.setParentAccountId (m_storage->asset().id()); break;
@@ -1310,7 +1310,7 @@ void MyMoneyGncReader::convertAccount (const GncAccount* gac) {
   m_storage->addAccount(acc);
   m_mapIds[gac->id().utf8()] = acc.id(); // to link gnucash id to ours for tx posting
 
-  if (gncdebug) qDebug("Gnucash account %s has id of %s, type of %s, tqparent is %s",
+  if (gncdebug) qDebug("Gnucash account %s has id of %s, type of %s, parent is %s",
                          gac->id().latin1(), acc.id().data(),
                          KMyMoneyUtils::accountTypeToString(acc.accountType()).latin1(), acc.parentAccountId().data());
 
@@ -1906,7 +1906,7 @@ void MyMoneyGncReader::terminate () {
   for (stocks = m_stockList.begin(); stocks != m_stockList.end(); ++stocks) {
     checkInvestmentOption (*stocks);
   }
-  // Next step is to walk the list and assign the tqparent/child relationship between the objects.
+  // Next step is to walk the list and assign the parent/child relationship between the objects.
   unsigned int i = 0;
   signalProgress (0, m_accountCount, i18n ("Reorganizing accounts..."));
   TQValueList<MyMoneyAccount> list;
@@ -1936,17 +1936,17 @@ void MyMoneyGncReader::terminate () {
     } else if ((*acc).parentAccountId() == m_rootId) {
       if (gncdebug) qDebug("Account id %s is a child of root", (*acc).id().data());
     } else {
-      // it is not under one of the main accounts, so find gnucash tqparent
+      // it is not under one of the main accounts, so find gnucash parent
       TQString parentKey = (*acc).parentAccountId();
-      if (gncdebug) qDebug ("acc %s, tqparent %s", (*acc).id().data(),
+      if (gncdebug) qDebug ("acc %s, parent %s", (*acc).id().data(),
                               (*acc).parentAccountId().data());
       map_accountIds::Iterator id = m_mapIds.find(parentKey);
       if (id != m_mapIds.end()) {
-        if (gncdebug) qDebug("Setting account id %s's tqparent account id to %s",
+        if (gncdebug) qDebug("Setting account id %s's parent account id to %s",
                                (*acc).id().data(), id.data().data());
-        MyMoneyAccount tqparent = m_storage->account(id.data());
-        tqparent = checkConsistency (tqparent, (*acc));
-        m_storage->addAccount (tqparent, (*acc));
+        MyMoneyAccount parent = m_storage->account(id.data());
+        parent = checkConsistency (parent, (*acc));
+        m_storage->addAccount (parent, (*acc));
       } else {
         throw new MYMONEYEXCEPTION ("terminate() could not find account id");
       }
@@ -2173,40 +2173,40 @@ TQDate MyMoneyGncReader::incrDate (TQDate lastDate, unsigned char interval, unsi
   PASS
 }
 //********************************* checkConsistency **********************************
-MyMoneyAccount MyMoneyGncReader::checkConsistency (MyMoneyAccount& tqparent, MyMoneyAccount& child) {
+MyMoneyAccount MyMoneyGncReader::checkConsistency (MyMoneyAccount& parent, MyMoneyAccount& child) {
   TRY
   // gnucash is flexible/weird enough to allow various inconsistencies
   // these are a couple I found in my file, no doubt more will be discovered
   if ((child.accountType() == MyMoneyAccount::Investment) &&
-      (tqparent.accountType() != MyMoneyAccount::Asset)) {
+      (parent.accountType() != MyMoneyAccount::Asset)) {
     postMessage ("CC", 1, child.name().latin1());
     return m_storage->asset();
   }
   if ((child.accountType() == MyMoneyAccount::Income) &&
-      (tqparent.accountType() != MyMoneyAccount::Income)) {
+      (parent.accountType() != MyMoneyAccount::Income)) {
     postMessage ("CC", 2, child.name().latin1());
     return m_storage->income();
   }
   if ((child.accountType() == MyMoneyAccount::Expense) &&
-      (tqparent.accountType() != MyMoneyAccount::Expense)) {
+      (parent.accountType() != MyMoneyAccount::Expense)) {
     postMessage ("CC", 3, child.name().latin1());
     return m_storage->expense();
   }
-  return (tqparent);
+  return (parent);
   PASS
 }
 //*********************************** checkInvestmentOption *************************
 void MyMoneyGncReader::checkInvestmentOption (TQString stockId) {
   // implement the investment option for stock accounts
-  // first check whether the tqparent account (gnucash id) is actually an
+  // first check whether the parent account (gnucash id) is actually an
   // investment account. if it is, no further action is needed
   MyMoneyAccount stockAcc = m_storage->account (m_mapIds[stockId.utf8()]);
-  MyMoneyAccount tqparent;
+  MyMoneyAccount parent;
   TQString parentKey = stockAcc.parentAccountId();
   map_accountIds::Iterator id = m_mapIds.find (parentKey);
   if (id != m_mapIds.end()) {
-    tqparent = m_storage->account (id.data());
-    if (tqparent.accountType() == MyMoneyAccount::Investment) return ;
+    parent = m_storage->account (id.data());
+    if (parent.accountType() == MyMoneyAccount::Investment) return ;
   }
   // so now, check the investment option requested by the user
   // option 0 creates a separate investment account for each stock account
@@ -2214,10 +2214,10 @@ void MyMoneyGncReader::checkInvestmentOption (TQString stockId) {
     MyMoneyAccount invAcc (stockAcc);
     invAcc.setAccountType (MyMoneyAccount::Investment);
     invAcc.setCurrencyId (TQString("")); // we don't know what currency it is!!
-    invAcc.setParentAccountId (parentKey); // intersperse it between old tqparent and child stock acct
+    invAcc.setParentAccountId (parentKey); // intersperse it between old parent and child stock acct
     m_storage->addAccount (invAcc);
     m_mapIds [invAcc.id()] = invAcc.id(); // so stock account gets parented (again) to investment account later
-    if (gncdebug) qDebug ("Created investment account %s as id %s, tqparent %s", invAcc.name().data(), invAcc.id().data(),
+    if (gncdebug) qDebug ("Created investment account %s as id %s, parent %s", invAcc.name().data(), invAcc.id().data(),
                             invAcc.parentAccountId().data());
     if (gncdebug) qDebug ("Setting stock %s, id %s, as child of %s", stockAcc.name().data(), stockAcc.id().data(), invAcc.id().data());
     stockAcc.setParentAccountId (invAcc.id());
@@ -2240,7 +2240,7 @@ void MyMoneyGncReader::checkInvestmentOption (TQString stockId) {
       singleInvAcc.setParentAccountId (m_storage->asset().id());
       m_storage->addAccount (singleInvAcc);
       m_mapIds [singleInvAcc.id()] = singleInvAcc.id(); // so stock account gets parented (again) to investment account later
-      if (gncdebug) qDebug ("Created investment account %s as id %s, tqparent %s, reparenting stock",
+      if (gncdebug) qDebug ("Created investment account %s as id %s, parent %s, reparenting stock",
                               singleInvAcc.name().data(), singleInvAcc.id().data(), singleInvAcc.parentAccountId().data());
       singleInvAccId = singleInvAcc.id();
     } else { // the account has already been created
@@ -2265,9 +2265,9 @@ void MyMoneyGncReader::checkInvestmentOption (TQString stockId) {
     }
     //if (accList.isEmpty()) qFatal ("No available accounts");
     bool ok = false;
-    while (!ok) { // keep going till we have a valid investment tqparent
+    while (!ok) { // keep going till we have a valid investment parent
       TQString invAccName = TQInputDialog::getItem (
-                             PACKAGE, i18n("Select tqparent investment account or enter new name. Stock %1").tqarg(stockAcc.name ()),
+                             PACKAGE, i18n("Select parent investment account or enter new name. Stock %1").tqarg(stockAcc.name ()),
                              accList, lastSelected, true, &ok);
       if (ok) {
         lastSelected = accList.findIndex (invAccName); // preserve selection for next time
diff --git a/kmymoney2/converter/mymoneygncreader.h b/kmymoney2/converter/mymoneygncreader.h
index fcda8ea..b34abf7 100644
--- a/kmymoney2/converter/mymoneygncreader.h
+++ b/kmymoney2/converter/mymoneygncreader.h
@@ -96,14 +96,14 @@ element name which started the current object. If so, the object's terminate()
 function is called. If the object represents a similar KMM object, this will
 normally result in a call to a conversion routine in the main
 (MyMoneyGncReader) class to convert the data to native format and place it in
-storage. The stack is then popped, and the tqparent (now current) object notified
+storage. The stack is then popped, and the parent (now current) object notified
 by a call to its endSubEl() function. Again depending on the type of object,
 this will either delete the instance, or save it in its own storage for later
 processing.
 For example, a GncSplit object makes little sense outside the context of its
 transaction, so will be saved by the transaction. A GncTransaction object on the
 other hand will be converted, along with its attendant splits, and then deleted
-by its tqparent.
+by its parent.
 
 Since at any one time an object will only be processing either a subobject or a
 data element, a single object variable, m_state, is used to determine the actual
@@ -419,7 +419,7 @@ protected:
   TQString name () const { return (var(NAME));};
   TQString desc () const { return (var(DESC));};
   TQString type () const { return (var(TYPE));};
-  TQString tqparent () const { return (var(PARENT));};
+  TQString parent () const { return (var(PARENT));};
 private:
   // subsidiary objects/elements
   enum AccountSubEls {CMDTY, KVP, LOTS, END_Account_SELS };
@@ -895,7 +895,7 @@ private:
   TQString createPayee (const TQString&); // create a payee and return it's id
   TQString createOrphanAccount (const TQString&); // create unknown account and return the id
   TQDate incrDate (TQDate lastDate, unsigned char interval, unsigned int intervalCount); // for date calculations
-  MyMoneyAccount checkConsistency (MyMoneyAccount& tqparent, MyMoneyAccount& child); // gnucash is sometimes TOO flexible
+  MyMoneyAccount checkConsistency (MyMoneyAccount& parent, MyMoneyAccount& child); // gnucash is sometimes TOO flexible
   void checkInvestmentOption (TQString stockId); // implement user investment option
   void getPriceSource (MyMoneySecurity stock, TQString gncSource);
 #endif // _GNCFILEANON
diff --git a/kmymoney2/converter/mymoneyqifreader.cpp b/kmymoney2/converter/mymoneyqifreader.cpp
index 74513c7..809d71c 100644
--- a/kmymoney2/converter/mymoneyqifreader.cpp
+++ b/kmymoney2/converter/mymoneyqifreader.cpp
@@ -1929,7 +1929,7 @@ TQString MyMoneyQifReader::checkCategory(const TQString& name, const MyMoneyMone
 
   if(!name.isEmpty()) {
     // The category might be constructed with an arbitraty depth (number of
-    // colon delimited fields). We try to find a tqparent account within this
+    // colon delimited fields). We try to find a parent account within this
     // hierarchy by searching the following sequence:
     //
     //    aaaa:bbbb:cccc:ddddd
@@ -1942,39 +1942,39 @@ TQString MyMoneyQifReader::checkCategory(const TQString& name, const MyMoneyMone
 
     account.setName(name);
     TQString accName;      // part to be created (right side in above list)
-    TQString tqparent(name); // a possible tqparent part (left side in above list)
+    TQString parent(name); // a possible parent part (left side in above list)
     do {
-      accountId = file->categoryToAccount(tqparent);
+      accountId = file->categoryToAccount(parent);
       if(accountId.isEmpty()) {
         found = false;
         // prepare next step
         if(!accName.isEmpty())
           accName.prepend(':');
-        accName.prepend(tqparent.section(':', -1));
+        accName.prepend(parent.section(':', -1));
         account.setName(accName);
-        tqparent = tqparent.section(':', 0, -2);
+        parent = parent.section(':', 0, -2);
       } else if(!accName.isEmpty()) {
         account.setParentAccountId(accountId);
       }
     }
-    while(!tqparent.isEmpty() && accountId.isEmpty());
+    while(!parent.isEmpty() && accountId.isEmpty());
 
     // if we did not find the category, we create it
     if(!found) {
-      MyMoneyAccount tqparent;
+      MyMoneyAccount parent;
       if(account.parentAccountId().isEmpty()) {
         if(!value.isNegative() && value2.isNegative())
-          tqparent = file->income();
+          parent = file->income();
         else
-          tqparent = file->expense();
+          parent = file->expense();
       } else {
-        tqparent = file->account(account.parentAccountId());
+        parent = file->account(account.parentAccountId());
       }
       account.setAccountType((!value.isNegative() && value2.isNegative()) ? MyMoneyAccount::Income : MyMoneyAccount::Expense);
       MyMoneyAccount brokerage;
-      // clear out the tqparent id, because createAccount() does not like that
+      // clear out the parent id, because createAccount() does not like that
       account.setParentAccountId(TQString());
-      kmymoney2->createAccount(account, tqparent, brokerage, MyMoneyMoney());
+      kmymoney2->createAccount(account, parent, brokerage, MyMoneyMoney());
       accountId = account.id();
     }
   }
@@ -2049,7 +2049,7 @@ TQString MyMoneyQifReader::processAccountEntry(bool resetAccountId)
       parentAccount = acc;
       qDebug("We still need to create the stock account in MyMoneyQifReader::processAccountEntry()");
     } else {
-      // setup tqparent according the type of the account
+      // setup parent according the type of the account
       switch(account.accountGroup()) {
         case MyMoneyAccount::Asset:
         default:
diff --git a/kmymoney2/converter/mymoneystatementreader.cpp b/kmymoney2/converter/mymoneystatementreader.cpp
index 2a59ad8..6595033 100644
--- a/kmymoney2/converter/mymoneystatementreader.cpp
+++ b/kmymoney2/converter/mymoneystatementreader.cpp
@@ -87,7 +87,7 @@ class MyMoneyStatementReader::Private
     bool                           m_skipCategoryMatching;
   private:
     void scanCategories(TQString& id, const MyMoneyAccount& invAcc, const MyMoneyAccount& parentAccount, const TQString& defaultName);
-    TQString nameToId(const TQString&name, MyMoneyAccount& tqparent);
+    TQString nameToId(const TQString&name, MyMoneyAccount& parent);
   private:
     TQString                        m_feeId;
     TQString                        m_interestId;
@@ -107,30 +107,30 @@ const TQString& MyMoneyStatementReader::Private::interestId(const MyMoneyAccount
   return m_interestId;
 }
 
-TQString MyMoneyStatementReader::Private::nameToId(const TQString&name, MyMoneyAccount& tqparent)
+TQString MyMoneyStatementReader::Private::nameToId(const TQString&name, MyMoneyAccount& parent)
 {
   MyMoneyFile* file = MyMoneyFile::instance();
   MyMoneyAccount acc = file->accountByName(name);
     // if it does not exist, we have to create it
   if(acc.id().isEmpty()) {
     acc.setName( name );
-    acc.setAccountType( tqparent.accountType() );
-    acc.setCurrencyId(tqparent.currencyId());
-    file->addAccount(acc, tqparent);
+    acc.setAccountType( parent.accountType() );
+    acc.setCurrencyId(parent.currencyId());
+    file->addAccount(acc, parent);
   }
   return acc.id();
 }
 
 TQString MyMoneyStatementReader::Private::interestId(const TQString& name)
 {
-  MyMoneyAccount tqparent = MyMoneyFile::instance()->income();
-  return nameToId(name, tqparent);
+  MyMoneyAccount parent = MyMoneyFile::instance()->income();
+  return nameToId(name, parent);
 }
 
 TQString MyMoneyStatementReader::Private::feeId(const TQString& name)
 {
-  MyMoneyAccount tqparent = MyMoneyFile::instance()->expense();
-  return nameToId(name, tqparent);
+  MyMoneyAccount parent = MyMoneyFile::instance()->expense();
+  return nameToId(name, parent);
 }
 
 
@@ -146,11 +146,11 @@ void MyMoneyStatementReader::Private::scanCategories(TQString& id, const MyMoney
     MyMoneyAccount acc = file->accountByName(defaultName);
     // if it does not exist, we have to create it
     if(acc.id().isEmpty()) {
-      MyMoneyAccount tqparent = parentAccount;
+      MyMoneyAccount parent = parentAccount;
       acc.setName( defaultName );
-      acc.setAccountType( tqparent.accountType() );
-      acc.setCurrencyId(tqparent.currencyId());
-      file->addAccount(acc, tqparent);
+      acc.setAccountType( parent.accountType() );
+      acc.setCurrencyId(parent.currencyId());
+      file->addAccount(acc, parent);
     }
     id = acc.id();
   }
@@ -912,7 +912,7 @@ void MyMoneyStatementReader::processTransactionEntry(const MyMoneyStatement::Tra
         payee.setMatchData(MyMoneyPayee::matchName, true, TQStringList());
         if (m_askPayeeCategory) {
           // We use a TQGuardedPtr because the dialog may get deleted
-          // during exec() if the tqparent of the dialog gets deleted.
+          // during exec() if the parent of the dialog gets deleted.
           // In that case the guarded ptr will reset to 0.
           TQGuardedPtr<KDialogBase> dialog = new KDialogBase(
               "Default Category for Payee",
diff --git a/kmymoney2/converter/mymoneytemplate.cpp b/kmymoney2/converter/mymoneytemplate.cpp
index 1a8860b..bf70d0a 100644
--- a/kmymoney2/converter/mymoneytemplate.cpp
+++ b/kmymoney2/converter/mymoneytemplate.cpp
@@ -148,14 +148,14 @@ bool MyMoneyTemplate::loadDescription(void)
   return validMask == validHeader;
 }
 
-bool MyMoneyTemplate::hierarchy(TQMap<TQString, TQListViewItem*>& list, const TQString& tqparent, TQDomNode account)
+bool MyMoneyTemplate::hierarchy(TQMap<TQString, TQListViewItem*>& list, const TQString& parent, TQDomNode account)
 {
   bool rc = true;
   while(rc == true && !account.isNull()) {
     if(account.isElement()) {
       TQDomElement accountElement = account.toElement();
       if(accountElement.tagName() == "account") {
-        TQString name = TQString("%1:%2").tqarg(tqparent).tqarg(accountElement.attribute("name"));
+        TQString name = TQString("%1:%2").tqarg(parent).tqarg(accountElement.attribute("name"));
         list[name] = 0;
         hierarchy(list, name, account.firstChild());
       }
@@ -219,22 +219,22 @@ bool MyMoneyTemplate::importTemplate(void(*callback)(int, int, const TQString&))
     if(childElement.tagName() == "account"
     && childElement.attribute("name") == "") {
       ++m_accountsRead;
-      MyMoneyAccount tqparent;
+      MyMoneyAccount parent;
       switch(childElement.attribute("type").toUInt()) {
         case MyMoneyAccount::Asset:
-          tqparent = file->asset();
+          parent = file->asset();
           break;
         case MyMoneyAccount::Liability:
-          tqparent = file->liability();
+          parent = file->liability();
           break;
         case MyMoneyAccount::Income:
-          tqparent = file->income();
+          parent = file->income();
           break;
         case MyMoneyAccount::Expense:
-          tqparent = file->expense();
+          parent = file->expense();
           break;
         case MyMoneyAccount::Equity:
-          tqparent = file->equity();
+          parent = file->equity();
           break;
 
         default:
@@ -243,7 +243,7 @@ bool MyMoneyTemplate::importTemplate(void(*callback)(int, int, const TQString&))
       }
 
       if(rc == true) {
-        rc = createAccounts(tqparent, childElement.firstChild());
+        rc = createAccounts(parent, childElement.firstChild());
       }
     } else {
       rc = false;
@@ -254,7 +254,7 @@ bool MyMoneyTemplate::importTemplate(void(*callback)(int, int, const TQString&))
   return rc;
 }
 
-bool MyMoneyTemplate::createAccounts(MyMoneyAccount& tqparent, TQDomNode account)
+bool MyMoneyTemplate::createAccounts(MyMoneyAccount& parent, TQDomNode account)
 {
   bool rc = true;
   while(rc == true && !account.isNull()) {
@@ -266,8 +266,8 @@ bool MyMoneyTemplate::createAccounts(MyMoneyAccount& tqparent, TQDomNode account
         TQValueList<MyMoneyAccount> subAccountList;
         TQValueList<MyMoneyAccount>::ConstIterator it;
         it = subAccountList.end();
-        if(!tqparent.accountList().isEmpty()) {
-          MyMoneyFile::instance()->accountList(subAccountList, tqparent.accountList());
+        if(!parent.accountList().isEmpty()) {
+          MyMoneyFile::instance()->accountList(subAccountList, parent.accountList());
           for(it = subAccountList.begin(); it != subAccountList.end(); ++it) {
             if((*it).name() == accountElement.attribute("name")) {
               acc = *it;
@@ -281,7 +281,7 @@ bool MyMoneyTemplate::createAccounts(MyMoneyAccount& tqparent, TQDomNode account
           acc.setAccountType(static_cast<MyMoneyAccount::_accountTypeE>(accountElement.attribute("type").toUInt()));
           setFlags(acc, account.firstChild());
           try {
-            MyMoneyFile::instance()->addAccount(acc, tqparent);
+            MyMoneyFile::instance()->addAccount(acc, parent);
           } catch(MyMoneyException *e) {
             delete e;
           }
@@ -355,10 +355,10 @@ bool MyMoneyTemplate::exportTemplate(void(*callback)(int, int, const TQString&))
   return true;
 }
 
-bool MyMoneyTemplate::addAccountStructure(TQDomElement& tqparent, const MyMoneyAccount& acc)
+bool MyMoneyTemplate::addAccountStructure(TQDomElement& parent, const MyMoneyAccount& acc)
 {
   TQDomElement account = m_doc.createElement("account");
-  tqparent.appendChild(account);
+  parent.appendChild(account);
 
   if(MyMoneyFile::instance()->isStandardAccount(acc.id()))
     account.setAttribute(TQString("name"), TQString());
diff --git a/kmymoney2/converter/mymoneytemplate.h b/kmymoney2/converter/mymoneytemplate.h
index 352fd4e..ed96150 100644
--- a/kmymoney2/converter/mymoneytemplate.h
+++ b/kmymoney2/converter/mymoneytemplate.h
@@ -66,11 +66,11 @@ public:
 
 protected:
   bool loadDescription(void);
-  bool createAccounts(MyMoneyAccount& tqparent, TQDomNode account);
+  bool createAccounts(MyMoneyAccount& parent, TQDomNode account);
   bool setFlags(MyMoneyAccount& acc, TQDomNode flags);
   bool saveToLocalFile(TQFile* qfile);
-  bool addAccountStructure(TQDomElement& tqparent, const MyMoneyAccount& acc);
-  bool hierarchy(TQMap<TQString, TQListViewItem*>& list, const TQString& tqparent, TQDomNode account);
+  bool addAccountStructure(TQDomElement& parent, const MyMoneyAccount& acc);
+  bool hierarchy(TQMap<TQString, TQListViewItem*>& list, const TQString& parent, TQDomNode account);
 
   /**
     * This method is used to update the progress information. It
diff --git a/kmymoney2/converter/webpricequote.cpp b/kmymoney2/converter/webpricequote.cpp
index d1fd158..1560967 100644
--- a/kmymoney2/converter/webpricequote.cpp
+++ b/kmymoney2/converter/webpricequote.cpp
@@ -1010,8 +1010,8 @@ TQDate MyMoneyDateFormat::convertString(const TQString& _in, bool _strict, unsig
 // Unit test helpers
 //
 
-convertertest::QuoteReceiver::QuoteReceiver(WebPriceQuote* q, TQObject* tqparent, const char *name) :
-  TQObject(tqparent,name)
+convertertest::QuoteReceiver::QuoteReceiver(WebPriceQuote* q, TQObject* parent, const char *name) :
+  TQObject(parent,name)
 {
   connect(q,TQT_SIGNAL(quote(const TQString&,const TQDate&, const double&)),
     this,TQT_SLOT(slotGetQuote(const TQString&,const TQDate&, const double&)));
diff --git a/kmymoney2/converter/webpricequote.h b/kmymoney2/converter/webpricequote.h
index ba8146b..ada7684 100644
--- a/kmymoney2/converter/webpricequote.h
+++ b/kmymoney2/converter/webpricequote.h
@@ -235,7 +235,7 @@ class QuoteReceiver : public TQObject
 Q_OBJECT
   TQ_OBJECT
 public:
-    QuoteReceiver(WebPriceQuote* q, TQObject *tqparent = 0, const char *name = 0);
+    QuoteReceiver(WebPriceQuote* q, TQObject *parent = 0, const char *name = 0);
     ~QuoteReceiver();
 public slots:
   void slotGetQuote(const TQString&,const TQDate&, const double&);