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

kmymoney2/converter/mymoneygncreader.cpp

@@ -1252,7 +1252,7 @@ void MyMoneyGncReader::convertAccount (const GncAccount* gac) {
     throw new MYMONEYEXCEPTION (em);
   }
   // if no tqparent account is present, assign to one of our standard accounts
-  if ((acc.tqparentAccountId().isEmpty()) || (acc.tqparentAccountId() == m_rootId)) {
+  if ((acc.parentAccountId().isEmpty()) || (acc.parentAccountId() == m_rootId)) {
     switch (acc.accountGroup()) {
     case MyMoneyAccount::Asset: acc.setParentAccountId (m_storage->asset().id()); break;
     case MyMoneyAccount::Liability: acc.setParentAccountId (m_storage->liability().id()); break;
@@ -1312,7 +1312,7 @@ void MyMoneyGncReader::convertAccount (const GncAccount* gac) {
 
   if (gncdebug) qDebug("Gnucash account %s has id of %s, type of %s, tqparent is %s",
                          gac->id().latin1(), acc.id().data(),
-                         KMyMoneyUtils::accountTypeToString(acc.accountType()).latin1(), acc.tqparentAccountId().data());
+                         KMyMoneyUtils::accountTypeToString(acc.accountType()).latin1(), acc.parentAccountId().data());
 
   signalProgress (++m_accountCount, 0);
   return ;
@@ -1913,34 +1913,34 @@ void MyMoneyGncReader::terminate () {
   TQValueList<MyMoneyAccount>::Iterator acc;
   m_storage->accountList(list);
   for (acc = list.begin(); acc != list.end(); ++acc) {
-    if ((*acc).tqparentAccountId() == m_storage->asset().id()) {
+    if ((*acc).parentAccountId() == m_storage->asset().id()) {
       MyMoneyAccount assets = m_storage->asset();
       m_storage->addAccount(assets, (*acc));
       if (gncdebug) qDebug("Account id %s is a child of the main asset account", (*acc).id().data());
-    } else if ((*acc).tqparentAccountId() == m_storage->liability().id()) {
+    } else if ((*acc).parentAccountId() == m_storage->liability().id()) {
       MyMoneyAccount liabilities = m_storage->liability();
       m_storage->addAccount(liabilities, (*acc));
       if (gncdebug) qDebug("Account id %s is a child of the main liability account", (*acc).id().data());
-    } else if ((*acc).tqparentAccountId() == m_storage->income().id()) {
+    } else if ((*acc).parentAccountId() == m_storage->income().id()) {
       MyMoneyAccount incomes = m_storage->income();
       m_storage->addAccount(incomes, (*acc));
       if (gncdebug) qDebug("Account id %s is a child of the main income account", (*acc).id().data());
-    } else if ((*acc).tqparentAccountId() == m_storage->expense().id()) {
+    } else if ((*acc).parentAccountId() == m_storage->expense().id()) {
       MyMoneyAccount expenses = m_storage->expense();
       m_storage->addAccount(expenses, (*acc));
       if (gncdebug) qDebug("Account id %s is a child of the main expense account", (*acc).id().data());
-    } else if ((*acc).tqparentAccountId() == m_storage->equity().id()) {
+    } else if ((*acc).parentAccountId() == m_storage->equity().id()) {
       MyMoneyAccount equity = m_storage->equity();
       m_storage->addAccount(equity, (*acc));
       if (gncdebug) qDebug("Account id %s is a child of the main equity account", (*acc).id().data());
-    } else if ((*acc).tqparentAccountId() == m_rootId) {
+    } 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
-      TQString tqparentKey = (*acc).tqparentAccountId();
+      TQString parentKey = (*acc).parentAccountId();
       if (gncdebug) qDebug ("acc %s, tqparent %s", (*acc).id().data(),
-                              (*acc).tqparentAccountId().data());
+                              (*acc).parentAccountId().data());
-      map_accountIds::Iterator id = m_mapIds.tqfind(tqparentKey);
+      map_accountIds::Iterator id = m_mapIds.tqfind(parentKey);
       if (id != m_mapIds.end()) {
         if (gncdebug) qDebug("Setting account id %s's tqparent account id to %s",
                                (*acc).id().data(), id.data().data());
@@ -2202,8 +2202,8 @@ void MyMoneyGncReader::checkInvestmentOption (TQString stockId) {
   // investment account. if it is, no further action is needed
   MyMoneyAccount stockAcc = m_storage->account (m_mapIds[stockId.utf8()]);
   MyMoneyAccount tqparent;
-  TQString tqparentKey = stockAcc.tqparentAccountId();
+  TQString parentKey = stockAcc.parentAccountId();
-  map_accountIds::Iterator id = m_mapIds.tqfind (tqparentKey);
+  map_accountIds::Iterator id = m_mapIds.tqfind (parentKey);
   if (id != m_mapIds.end()) {
     tqparent = m_storage->account (id.data());
     if (tqparent.accountType() == MyMoneyAccount::Investment) return ;
@@ -2214,11 +2214,11 @@ 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 (tqparentKey); // intersperse it between old tqparent and child stock acct
+    invAcc.setParentAccountId (parentKey); // intersperse it between old tqparent and child stock acct
     m_storage->addAccount (invAcc);
-    m_mapIds [invAcc.id()] = invAcc.id(); // so stock account gets tqparented (again) to investment account later
+    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(),
-                            invAcc.tqparentAccountId().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());
     m_storage->addAccount(invAcc, stockAcc);
@@ -2239,9 +2239,9 @@ void MyMoneyGncReader::checkInvestmentOption (TQString stockId) {
       singleInvAcc.setCurrencyId (TQString(""));
       singleInvAcc.setParentAccountId (m_storage->asset().id());
       m_storage->addAccount (singleInvAcc);
-      m_mapIds [singleInvAcc.id()] = singleInvAcc.id(); // so stock account gets tqparented (again) to investment account later
+      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",
-                              singleInvAcc.name().data(), singleInvAcc.id().data(), singleInvAcc.tqparentAccountId().data());
+                              singleInvAcc.name().data(), singleInvAcc.id().data(), singleInvAcc.parentAccountId().data());
       singleInvAccId = singleInvAcc.id();
     } else { // the account has already been created
       singleInvAcc = m_storage->account (singleInvAccId);
@@ -2318,7 +2318,7 @@ void MyMoneyGncReader::checkInvestmentOption (TQString stockId) {
         }
       } // end if ok - user pressed Cancel
     } // end while !ok
-    m_mapIds [invAcc.id()] = invAcc.id(); // so stock account gets tqparented (again) to investment account later
+    m_mapIds [invAcc.id()] = invAcc.id(); // so stock account gets parented (again) to investment account later
     m_storage->addAccount(invAcc, stockAcc);
   } else { // investment option != 0, 1, 2
     qFatal ("Invalid investment option %d", m_investmentOption);

kmymoney2/converter/mymoneyqifprofile.cpp

@@ -394,20 +394,20 @@ TQString MyMoneyQifProfile::date(const TQDate& datein) const
   const char* format = m_dateFormat.latin1();
   TQString buffer;
   TQChar delim;
-  int tqmaskLen;
+  int maskLen;
-  char tqmaskChar;
+  char maskChar;
 
   while(*format) {
     switch(*format) {
       case '%':
-        tqmaskLen = 0;
+        maskLen = 0;
-        tqmaskChar = *++format;
+        maskChar = *++format;
-        while(*format && *format == tqmaskChar) {
+        while(*format && *format == maskChar) {
-          ++tqmaskLen;
+          ++maskLen;
           ++format;
         }
 
-        switch(tqmaskChar) {
+        switch(maskChar) {
           case 'd':
             if(delim)
               buffer += delim;
@@ -417,14 +417,14 @@ TQString MyMoneyQifProfile::date(const TQDate& datein) const
           case 'm':
             if(delim)
               buffer += delim;
-            if(tqmaskLen == 3)
+            if(maskLen == 3)
               buffer += KGlobal::locale()->calendar()->monthName(datein.month(), datein.year(), true);
             else
               buffer += TQString::number(datein.month()).rightJustify(2, '0');
             break;
 
           case 'y':
-            if(tqmaskLen == 2) {
+            if(maskLen == 2) {
               buffer += twoDigitYear(delim, datein.year());
             } else {
               if(delim)

kmymoney2/converter/mymoneyqifreader.cpp

@@ -870,13 +870,13 @@ void MyMoneyQifReader::processCategoryEntry(void)
   account.setName(extractLine('N'));
   account.setDescription(extractLine('D'));
 
-  MyMoneyAccount tqparentAccount;
+  MyMoneyAccount parentAccount;
   if(!extractLine('I').isEmpty()) {
     account.setAccountType(MyMoneyAccount::Income);
-    tqparentAccount = file->income();
+    parentAccount = file->income();
   } else if(!extractLine('E').isEmpty()) {
     account.setAccountType(MyMoneyAccount::Expense);
-    tqparentAccount = file->expense();
+    parentAccount = file->expense();
   }
 
   // check if we can find the account already in the file
@@ -886,7 +886,7 @@ void MyMoneyQifReader::processCategoryEntry(void)
   if(acc.id().isEmpty()) {
     MyMoneyAccount brokerage;
     MyMoneyMoney balance;
-    kmymoney2->createAccount(account, tqparentAccount, brokerage, balance);
+    kmymoney2->createAccount(account, parentAccount, brokerage, balance);
   }
 }
 
@@ -1962,13 +1962,13 @@ TQString MyMoneyQifReader::checkCategory(const TQString& name, const MyMoneyMone
     // if we did not find the category, we create it
     if(!found) {
       MyMoneyAccount tqparent;
-      if(account.tqparentAccountId().isEmpty()) {
+      if(account.parentAccountId().isEmpty()) {
         if(!value.isNegative() && value2.isNegative())
           tqparent = file->income();
         else
           tqparent = file->expense();
       } else {
-        tqparent = file->account(account.tqparentAccountId());
+        tqparent = file->account(account.parentAccountId());
       }
       account.setAccountType((!value.isNegative() && value2.isNegative()) ? MyMoneyAccount::Income : MyMoneyAccount::Expense);
       MyMoneyAccount brokerage;
@@ -2036,7 +2036,7 @@ TQString MyMoneyQifReader::processAccountEntry(bool resetAccountId)
     if(account.accountType() == MyMoneyAccount::UnknownAccountType)
       account.setAccountType(MyMoneyAccount::Checkings);
 
-    MyMoneyAccount tqparentAccount;
+    MyMoneyAccount parentAccount;
     MyMoneyAccount brokerage;
     MyMoneyMoney balance;
     // in case it's a stock account, we need to setup a fix investment account
@@ -2044,22 +2044,22 @@ TQString MyMoneyQifReader::processAccountEntry(bool resetAccountId)
       acc.setName(i18n("%1 (Investment)").tqarg(account.name()));    // use the same name for the investment account
       acc.setDescription(i18n("Autogenerated by TQIF importer from type Mutual account entry"));
       acc.setAccountType(MyMoneyAccount::Investment);
-      tqparentAccount = file->asset();
+      parentAccount = file->asset();
-      kmymoney2->createAccount(acc, tqparentAccount, brokerage, MyMoneyMoney());
+      kmymoney2->createAccount(acc, parentAccount, brokerage, MyMoneyMoney());
-      tqparentAccount = acc;
+      parentAccount = acc;
       qDebug("We still need to create the stock account in MyMoneyQifReader::processAccountEntry()");
     } else {
       // setup tqparent according the type of the account
       switch(account.accountGroup()) {
         case MyMoneyAccount::Asset:
         default:
-          tqparentAccount = file->asset();
+          parentAccount = file->asset();
           break;
         case MyMoneyAccount::Liability:
-          tqparentAccount = file->liability();
+          parentAccount = file->liability();
           break;
         case MyMoneyAccount::Equity:
-          tqparentAccount = file->equity();
+          parentAccount = file->equity();
           break;
       }
     }
@@ -2071,7 +2071,7 @@ TQString MyMoneyQifReader::processAccountEntry(bool resetAccountId)
       brokerage.setAccountType(MyMoneyAccount::Checkings);
       brokerage.setCurrencyId(MyMoneyFile::instance()->baseCurrency().id());
     }
-    kmymoney2->createAccount(account, tqparentAccount, brokerage, balance);
+    kmymoney2->createAccount(account, parentAccount, brokerage, balance);
     acc = account;
     // qDebug("Account created");
   } else {

kmymoney2/converter/mymoneystatementreader.cpp

@@ -86,7 +86,7 @@ class MyMoneyStatementReader::Private
     TQMap<TQString, MyMoneySecurity> securitiesByName;
     bool                           m_skipCategoryMatching;
   private:
-    void scanCategories(TQString& id, const MyMoneyAccount& invAcc, const MyMoneyAccount& tqparentAccount, const TQString& defaultName);
+    void scanCategories(TQString& id, const MyMoneyAccount& invAcc, const MyMoneyAccount& parentAccount, const TQString& defaultName);
     TQString nameToId(const TQString&name, MyMoneyAccount& tqparent);
   private:
     TQString                        m_feeId;
@@ -134,7 +134,7 @@ TQString MyMoneyStatementReader::Private::feeId(const TQString& name)
 }
 
 
-void MyMoneyStatementReader::Private::scanCategories(TQString& id, const MyMoneyAccount& invAcc, const MyMoneyAccount& tqparentAccount, const TQString& defaultName)
+void MyMoneyStatementReader::Private::scanCategories(TQString& id, const MyMoneyAccount& invAcc, const MyMoneyAccount& parentAccount, const TQString& defaultName)
 {
   if(!scannedCategories) {
     KMyMoneyUtils::previouslyUsedCategories(invAcc.id(), m_feeId, m_interestId);
@@ -146,7 +146,7 @@ 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 = tqparentAccount;
+      MyMoneyAccount tqparent = parentAccount;
       acc.setName( defaultName );
       acc.setAccountType( tqparent.accountType() );
       acc.setCurrencyId(tqparent.currencyId());

kmymoney2/dialogs/investactivities.cpp

@@ -182,13 +182,13 @@ void Buy::showWidgets(void) const
 {
   KMyMoneyCategory* cat;
   cat = dynamic_cast<KMyMoneyCategory*>(haveWidget("fee-account"));
-  cat->tqparentWidget()->show();
+  cat->parentWidget()->show();
   cat = dynamic_cast<KMyMoneyCategory*>(haveWidget("interest-account"));
-  cat->tqparentWidget()->show();
+  cat->parentWidget()->show();
   kMyMoneyEdit* shareEdit = dynamic_cast<kMyMoneyEdit*>(haveWidget("shares"));
   shareEdit->show();
   shareEdit->setPrecision(MyMoneyMoney::denomToPrec(m_parent->security().smallestAccountFraction()));
-  cat->tqparentWidget()->show();
+  cat->parentWidget()->show();
   haveWidget("asset-account")->show();
   haveWidget("price")->show();
   haveWidget("total")->show();
@@ -271,9 +271,9 @@ void Sell::showWidgets(void) const
 {
   KMyMoneyCategory* cat;
   cat = dynamic_cast<KMyMoneyCategory*>(haveWidget("interest-account"));
-  cat->tqparentWidget()->show();
+  cat->parentWidget()->show();
   cat = dynamic_cast<KMyMoneyCategory*>(haveWidget("fee-account"));
-  cat->tqparentWidget()->show();
+  cat->parentWidget()->show();
   kMyMoneyEdit* shareEdit = dynamic_cast<kMyMoneyEdit*>(haveWidget("shares"));
   shareEdit->show();
   shareEdit->setPrecision(MyMoneyMoney::denomToPrec(m_parent->security().smallestAccountFraction()));
@@ -360,7 +360,7 @@ void Div::showWidgets(void) const
 {
   KMyMoneyCategory* cat;
   cat = dynamic_cast<KMyMoneyCategory*>(haveWidget("interest-account"));
-  cat->tqparentWidget()->show();
+  cat->parentWidget()->show();
   haveWidget("asset-account")->show();
   haveWidget("total")->show();
 
@@ -413,9 +413,9 @@ void Reinvest::showWidgets(void) const
 {
   KMyMoneyCategory* cat;
   cat = dynamic_cast<KMyMoneyCategory*>(haveWidget("interest-account"));
-  cat->tqparentWidget()->show();
+  cat->parentWidget()->show();
   cat = dynamic_cast<KMyMoneyCategory*>(haveWidget("fee-account"));
-  cat->tqparentWidget()->show();
+  cat->parentWidget()->show();
   kMyMoneyEdit* shareEdit = dynamic_cast<kMyMoneyEdit*>(haveWidget("shares"));
   shareEdit->show();
   shareEdit->setPrecision(MyMoneyMoney::denomToPrec(m_parent->security().smallestAccountFraction()));

kmymoney2/dialogs/investtransactioneditor.cpp

@@ -801,10 +801,10 @@ void InvestTransactionEditor::slotUpdateActivity(MyMoneySplit::investTransaction
 
   KMyMoneyCategory* cat;
 
-  // hide all dynamic widgets (make sure to use the tqparentWidget for the
+  // hide all dynamic widgets (make sure to use the parentWidget for the
   // category widgets)
-  haveWidget("interest-account")->tqparentWidget()->hide();
+  haveWidget("interest-account")->parentWidget()->hide();
-  haveWidget("fee-account")->tqparentWidget()->hide();
+  haveWidget("fee-account")->parentWidget()->hide();
 
   TQStringList dynwidgets;
   dynwidgets << "total-label" << "asset-label" << "fee-label" << "fee-amount-label" << "interest-label" << "interest-amount-label" << "price-label" << "shares-label";
@@ -833,11 +833,11 @@ void InvestTransactionEditor::slotUpdateActivity(MyMoneySplit::investTransaction
   d->m_activity->preloadAssetAccount();
 
   cat = dynamic_cast<KMyMoneyCategory*>(haveWidget("interest-account"));
-  if(cat->tqparentWidget()->isVisible())
+  if(cat->parentWidget()->isVisible())
     slotUpdateInterestVisibility(cat->currentText());
 
   cat = dynamic_cast<KMyMoneyCategory*>(haveWidget("fee-account"));
-  if(cat->tqparentWidget()->isVisible())
+  if(cat->parentWidget()->isVisible())
     slotUpdateFeeVisibility(cat->currentText());
 }
 
@@ -854,7 +854,7 @@ InvestTransactionEditor::priceModeE InvestTransactionEditor::priceMode(void) con
   while(!accId.isEmpty() && mode == 0) {
     MyMoneyAccount acc = MyMoneyFile::instance()->account(accId);
     if(acc.value("priceMode").isEmpty())
-      accId = acc.tqparentAccountId();
+      accId = acc.parentAccountId();
     else
       mode = static_cast<priceModeE>(acc.value("priceMode").toInt());
   }

kmymoney2/dialogs/kaccountselectdlgdecl.ui

@@ -214,5 +214,5 @@
 <includes>
     <include location="global" impldecl="in implementation">kmymoney/kmymoneycategory.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/kbackupdlgdecl.ui

@@ -206,5 +206,5 @@ Click OK to perform the backup. If your system does not use an automounter, make
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/kcategoryreassigndlgdecl.ui

@@ -174,5 +174,5 @@
 <includes>
     <include location="global" impldecl="in implementation">kmymoney/kmymoneycategory.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/kconfirmmanualenterdlgdecl.ui

@@ -156,5 +156,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/kcurrencycalculator.cpp

@@ -51,7 +51,7 @@
 
 #include "../kmymoneyutils.h"
 
-bool KCurrencyCalculator::setupSplitPrice(MyMoneyMoney& shares, const MyMoneyTransaction& t, const MyMoneySplit& s, const TQMap<TQString, MyMoneyMoney>& priceInfo, TQWidget* tqparentWidget)
+bool KCurrencyCalculator::setupSplitPrice(MyMoneyMoney& shares, const MyMoneyTransaction& t, const MyMoneySplit& s, const TQMap<TQString, MyMoneyMoney>& priceInfo, TQWidget* parentWidget)
 {
   bool rc = true;
   MyMoneyFile* file = MyMoneyFile::instance();
@@ -95,7 +95,7 @@ bool KCurrencyCalculator::setupSplitPrice(MyMoneyMoney& shares, const MyMoneyTra
                               toValue,
                               t.postDate(),
                               fract,
-                              tqparentWidget, "currencyCalculator");
+                              parentWidget, "currencyCalculator");
 
       if(calc.exec() == TQDialog::Rejected) {
         rc = false;

kmymoney2/dialogs/kcurrencycalculator.h

@@ -66,7 +66,7 @@ public:
 
   void setupPriceEditor(void);
 
-  static bool setupSplitPrice(MyMoneyMoney& shares, const MyMoneyTransaction& t, const MyMoneySplit& s, const TQMap<TQString, MyMoneyMoney>& priceInfo, TQWidget* tqparentWidget);
+  static bool setupSplitPrice(MyMoneyMoney& shares, const MyMoneyTransaction& t, const MyMoneySplit& s, const TQMap<TQString, MyMoneyMoney>& priceInfo, TQWidget* parentWidget);
 
 protected:
   void updateExample(const MyMoneyMoney& price);

kmymoney2/dialogs/kcurrencycalculatordecl.ui

@@ -414,5 +414,5 @@ xx</string>
     <include location="global" impldecl="in implementation">kmymoney/kmymoneydateinput.h</include>
     <include location="global" impldecl="in implementation">kmymoney/kmymoneyedit.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/kcurrencyeditdlgdecl.ui

@@ -300,5 +300,5 @@
         <data format="PNG" length="1114">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042149444154789c8d95c18b1c4514c67fbb29e5b54ea05b26da1d36b08d096e8b11261871837bc8e282ac7ac82187e049a317e32d37110992bf42123c694eea414c0e0bf1b0ec6c402139485a54e8810c54c10e741146fa110bd643f74c12bd642e4d75f77cf5d5ef7dafdfc2ce7087d9eff32fdfdff74e5114104011e489d6e952cce5cfbe5998692dec0c77b87aedd3fddd9f2b3efce02291082209aa3504685022e4ffd7a000a82a765c515615ce95acae659c3f7765c100ec6e575cf8f822e991025f3b6a6f890c484f181ccfc1583428f5d4e2fe84da039aa04121b40eb32483a0ec6e5bce9f8385d36fa7fb9b1b17c8f31cbfe7a95c45be94520c72b2141a1caa160d1666e24ea94aa11ee7685054159d2ada34d41387c40dc63b8844f0b5c73a4bb19cb3f9de001f2aac1fa23aa209168c004224902e29d22ff1e38abbdb275055c4800610233867311a1491847a62c98f66ac6f14d8e99072f22daa15b68a8108424d6422e24c88e3966fbce4c9d786945b27f0be0103ed13c16004d59a2c4d58df28a87548e9aee2274ab95d60c7193c9a0281fc959ae2a4450364a9e2572c7a2b43438374ef2dd2154012d050514dbec7396578a3130d9d6850066f0ad9d186f2d78cdbbb799b0a202f2c48d3aebbb418310240b112637588574bf54b8efaa4fd9b691dacbf5b305813542bae63a9eee4c4694d967b5494eca8c7ef0933bdc5d90e6a2caa0e3f013b7adce9fa5b03d637561113a30106a71d18c5fd9677058338ad01e91c0b8b743b880182ce19cd9c0e5e2b583fbdda565d3d04cfedad180942133af201b2bc3588e111c680068f489780ce69b192b279768088524f2b3458ea694d3de99a4323bc976ed34eb86b98c51993f6be10f77240c99685cd731991f1582df15aa15a213d583f5313a7806988fb8a0640e336359d9e9933568bf44062214ba19e2a7652a13d8b068ff596b807182189234e9da9f1ceb78c81b28c3ac6fe21e306c58e41d5118952acd6a0c2f56b9e6a5c72f346cdcd6b19a3bf8010010d714f89533b674c90c7189b598eab12a45fb5c75b8253672b863fbcccf5af93b6904119fe9851bf5153ac3a746ae7b9d5698c1dc58f313e70e4707ce9d84bafa2f79fc23fb8c7c1438ef04031a2642fee21060ec69ee47020796ecaa12313ccd333d1b67935047acf2be3bb11aa010dbe656cc755dbe3b772084a7ebc6d5711253b593dfcc0cc8fcd3cafda455512c7f200ec56cbfac0f1d7d34b7fdf0f98fd88a92a7e9cb0e70cc933c0b38a2c823ea0bd76c70c016adb67f47bc2a117a6d40abeea33fa23c2fb867edfb413e4a34fded94ffb3991c46dc7754cd3634ad2af490b857f5a5137126a97e02a8120a485235b6a28ef80bd077ee2b9f2d54fed04595dcbd8ddb6c4bd87334c10cadb2064e856177e7864e669fbe1df154a0142839f7ad2e5b6880bff1da66eece78e315d959f609da670f98befe6c3f45fb42672c9acff7f660000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/keditequityentrydecl.ui

@@ -302,5 +302,5 @@
         <data format="PNG" length="826">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000030149444154789cb59531681b5718c77f0e377c070e3c810a3a70e0041eac51852e0a19e45134830a1d9a4c69a04bc8928e990a693a640e1d0c8642b08742321894c1507991b484c890902bb8701a047760c3bd21701fe4201dde49b6a41a32b8df72dcbbeffdbefffbbfefbd5b1b0c07cce266ebe667ae2006c3c1dada0cdc3be87d6e6c35b0d692a409d9c7ec8b20d65ae29398d19b1114e7e3de4ce98b3f5e10dc0053cf0951b4506496e1b964bf7ce6c585d9054c62d01d617ca48be0596553cf496d8f2c8b01c5f795fc93904e85ec4c01a152857a5d9175d0b2805c872080f18595ccc1499a10a225d4e2fbc2877786fe81253ab6c04c8d106e09db5d43ab0d146e5c64d1a23938fb98a185cea1c33eecfd9eba49eb427dcb201e245365f2b7b2fb5b4a3a31dcb927178afe07d86901df870fefa4842aed6f6b74ba42e52b4014d580e1eb9cbd9d94de7e4aad16d2f9be02d805f0b5e532f927a1ffcacea1777f122a8105b164a7c25faf323a5d9f1f1fd600e1e5bec59e2d4b5c7ef5209d0ad17b8b31864e57c0b3e0815ac3ee33253ab664a770ff5185d1a1cb8d2267d3e58aa1dc7d2508cbe597d0e74fdd269aaaf0f52d414c4ea3e9762c996869e42560d7a72e41c4799a2586e74f95e8d8151481fa86efbe7b3398ac58b1a2b8527589f15451ad303ac2293542ad6648a796278f13a27185e4c4754310facb98c53a79e19a3fdc1426ff28c3d7399d1f7cb25343eb96106cf83c790ce9c4f2eb831855c55485663327992eb6dc8a6259874ed700b0b793323cccb9ffa842b30d6133e3e75fea989ac15a8b16ca76b746b0b92278d919774c5b6d48a78697fb29bbcf52468742a32120909c24e899ce67beed5be2db01e22d1e9485bb620e47f9ee9e606a21bd3f5d3744c7e7c54d55e87443867d8b554515ac5db4620e8e4f62263170fd1cdee90aad7640141992891b0f367c9adfe4049bb07d3b7022bd8c687c0978f46684ee084150b65ac1fcca94591b7a90a496e4c095164fb016a2b192a497795cc0f84817aebe25f7bf70ccc54a575c555c03f78ffa5fc0570d1f0c076bff0232285a0901e2257b0000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/keditscheduledlg.cpp

@@ -76,7 +76,7 @@ KEditScheduleDlg::KEditScheduleDlg(const MyMoneySchedule& schedule, TQWidget *tq
 
   // make sure, we have a tabbar with the form
   // insert it after the horizontal line
-  m_paymentInformationLayout->insertWidget(2, m_form->tabBar(m_form->tqparentWidget()));
+  m_paymentInformationLayout->insertWidget(2, m_form->tabBar(m_form->parentWidget()));
 
   // we never need to see the register
   m_register->hide();
@@ -396,7 +396,7 @@ bool KEditScheduleDlg::focusNextPrevChild(bool next)
   w = tqApp->tqfocusWidget();
   while(w && d->m_tabOrderWidgets.tqfind(w) == -1) {
     // qDebug("'%s' not in list, use tqparent", w->className());
-    w = w->tqparentWidget();
+    w = w->parentWidget();
   }
   // if(w) qDebug("tab order is at '%s'", w->className());
   currentWidget = d->m_tabOrderWidgets.current();

kmymoney2/dialogs/keditscheduledlgdecl.ui

@@ -531,5 +531,5 @@
 <includes>
     <include location="global" impldecl="in implementation">kmymoney/kmymoneydateinput.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/kendingbalancedlgdecl.ui

@@ -981,5 +981,5 @@ All information you have entered into this wizard will be shown and all transact
     <include location="global" impldecl="in implementation">kmymoney/kmymoneyedit.h</include>
     <include location="global" impldecl="in implementation">kmymoney/kmymoneycategory.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/kenterscheduledlg.cpp

@@ -76,7 +76,7 @@ KEnterScheduleDlg::KEnterScheduleDlg(TQWidget *tqparent, const MyMoneySchedule&
   buttonSkip->setHidden(true);
 
   // make sure, we have a tabbar with the form
-  KMyMoneyTransactionForm::TabBar* tabbar = m_form->tabBar(m_form->tqparentWidget());
+  KMyMoneyTransactionForm::TabBar* tabbar = m_form->tabBar(m_form->parentWidget());
 
   // we never need to see the register
   m_register->hide();
@@ -292,7 +292,7 @@ bool KEnterScheduleDlg::focusNextPrevChild(bool next)
   w = tqApp->tqfocusWidget();
   while(w && d->m_tabOrderWidgets.tqfind(w) == -1) {
     // qDebug("'%s' not in list, use tqparent", w->className());
-    w = w->tqparentWidget();
+    w = w->parentWidget();
   }
   // if(w) qDebug("tab order is at '%s'", w->className());
   currentWidget = d->m_tabOrderWidgets.current();

kmymoney2/dialogs/kenterscheduledlgdecl.ui

@@ -326,5 +326,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/kequitypriceupdatedlgdecl.ui

@@ -175,5 +175,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/kexportdlgdecl.ui

@@ -503,5 +503,5 @@ You can choose the file's path, the account and the format of the QIF file (prof
         <data format="XPM.GZ" length="3368">789c9595c94eeb581086f73c4544ed50ab6eecd889ad562f1802843961a6d58b632764228c616cf5bb77f9d45fe75e11165c4c703e55d55fc319f8b152bb38daafadfc587a9abbf9b8ac9523f7585be93fcf66ef7ffff3d7bf4bcb715c93df2891d7f21f4bcb5cd4cadac1ddedc003fd02ddf9af16274075ffe3b91738f33c01276aa722b0b753ec390b7c0cce107f092e238d7fa838aa578fe713b0c5bf1aabdddd8033e49f1923be052e11df31867dc77366fe1c81cdbeab1c5b3d4d30f2d351c571dd988fc196ffda731e43cf811b98a79b06d6fa5e8c11ff1458e775054ec0dd8a1b91f9731d9ca9dd0d9513d35ff79c9b9dc7c68ddcdbf7c125ecefca16cf7e9e4994987dcfb34b73d86363e41f559cc6691ff93f8c119f2a3723b5bb8931faffc91abf691cabfd0e9c42ffd21876bf9ea90bf946c6a9f37ca66cf16e0c463fb46a8cf95e0456bb3346be3ad8fa3d34463fcf153763b33b678cf853e516e6415bc688bf31567fde04a7e8cffcd13ffbf56f4afea6ef971265f157bdd218f9d7c0e8878fc0a88ffdfe6f355a51abe1b9ad9c59ff0781fd7e62afdf2a5a79abf0f63765f377857123f2f67bb0e5f3e7256bb4f24cf3ed83fbcad4530efe99e722373e5476981faf05d679ad1aa3fe0b63ad8737c0982fed19c33ea8384ff2284f3c1f283b9be746609dc79bb19e37877837403d3bca458cf3531a23de9fdfbc147fed673bb0d6f7688cfc5960cdd737c6bc87caa2affe8dc09aefc338d17e3be026f291b1fad318ecb0bf38b0f677628cf5f1f7ab4b4c8f7363d4731b58eb2763d43f02231f9f0656bd8631f44cdfe6d535c67afaf9b8d245aef43c05a7e04439c44f8d511f2b9736cf79609d0ff44b9bd719d8ea7b0763fdd89f8742ea6beabfed73e53206df05d6fbecd618e7f311dc84ff0bd82993df7f453fd81f02abdecc58f737a56087fbf3d518f14f81f5bed17afb7dac07b58dd19fbfcfcab418383d3f73e550df36d8fa7f0eacfa57ca03ccbb3b67928ffbc6435eaf10ef92fb3ce06b1e7ef18c78cc138d80bee329dff08c6ff98eeff9811ff989e7fcecdf2ffcca6ffcfed39f0bf93610ef0f5ee5355ee70d6ef3266fc9df6deec8b3c3bbbcf7497f5fb40ff8503c8eb8cb3d6fedf1b1d0099f4accd927fd219f7bef0bf1eaf1255f719d23ff3de606279c7ed26f4addeba25629b738e39c98881c891695d45fd4a7016fd075e54d431ad1980f684253bae11ecde896ee16f41fe95e6c0f9c55def4484f92ab4573afd1a6e785fa5f65264ebc72effd22b1aff446eff421d60b5a5dd09fd39af8af134b254fbe8f8836a84d958aa3ad85fab765de3dea48979b555db4237ebbb447fbf23ea0c3c5fa799b643ea2d595ba7ba2bd2b9e0f744c27dca0d32feaef5029fe056f499767744e173413cb842ee98aea5fe877a4d7a85a577aa148a6b94fb1ecb3091d5183924ffa234a659f9c4ae61b8e6cffd2896837a945d9c2fa8e650fcadea2bc72e3b69399b842a2afe41eebbb81bbfea43f7143d983a91b714a776e4cab74e89f3a6db9899bba9b4ffadf7c82fe6ff857e7f7f7f425e25b39baf3e5fffe5cfa1fdc4beba0</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/kfindtransactiondlgdecl.ui

@@ -1102,5 +1102,5 @@
     <include location="global" impldecl="in implementation">kmymoney/kmymoneyedit.h</include>
     <include location="global" impldecl="in implementation">kmymoney/kmymoneycategory.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/kgncimportoptionsdlgdecl.ui

@@ -379,5 +379,5 @@
 <Q_SLOTS>
     <slot access="protected">slotHelp()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/kgncpricesourcedlgdecl.ui

@@ -244,5 +244,5 @@
         <slot>close()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/kimportdlgdecl.ui

@@ -242,5 +242,5 @@ Please enter the path to the QIF file or select it by clicking on the Browse but
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/kloadtemplatedlgdecl.ui

@@ -105,5 +105,5 @@
 <includes>
     <include location="global" impldecl="in implementation">kmymoney/kaccounttemplateselector.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui

@@ -354,5 +354,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/kmymoneypricedlgdecl.ui

@@ -216,5 +216,5 @@
     <tabstop>m_onlineQuoteButton</tabstop>
     <tabstop>m_closeButton</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/knewaccountdlg.cpp

@@ -349,7 +349,7 @@ KNewAccountDlg::KNewAccountDlg(const MyMoneyAccount& account, bool isEditing, bo
     delete e;
   }
 
-  initParentWidget(account.tqparentAccountId(), account.id());
+  initParentWidget(account.parentAccountId(), account.id());
   if(m_account.isInvest())
     m_qlistviewParentAccounts->setEnabled(false);
 
@@ -476,7 +476,7 @@ void KNewAccountDlg::okClicked()
     return;
   }
 
-  MyMoneyAccount tqparent = tqparentAccount();
+  MyMoneyAccount tqparent = parentAccount();
   if (tqparent.name().length() == 0)
   {
     KMessageBox::error(this, i18n("Please select a tqparent account."));
@@ -676,7 +676,7 @@ const MyMoneyAccount& KNewAccountDlg::account(void)
   return m_account;
 }
 
-const MyMoneyAccount& KNewAccountDlg::tqparentAccount(void)
+const MyMoneyAccount& KNewAccountDlg::parentAccount(void)
 {
   if (!m_bSelectedParentAccount)
   {
@@ -710,7 +710,7 @@ const MyMoneyAccount& KNewAccountDlg::tqparentAccount(void)
   return m_parentAccount;
 }
 
-void KNewAccountDlg::initParentWidget(TQString tqparentId, const TQString& accountId)
+void KNewAccountDlg::initParentWidget(TQString parentId, const TQString& accountId)
 {
   MyMoneyFile *file = MyMoneyFile::instance();
 
@@ -726,15 +726,15 @@ void KNewAccountDlg::initParentWidget(TQString tqparentId, const TQString& accou
   // Determine the tqparent account
   try
   {
-    m_parentAccount = file->account(tqparentId);
+    m_parentAccount = file->account(parentId);
   }
   catch (MyMoneyException *e)
   {
     m_bSelectedParentAccount = false;
     m_parentAccount = MyMoneyAccount();
     if(m_account.accountType() != MyMoneyAccount::UnknownAccountType) {
-      tqparentAccount();
+      parentAccount();
-      tqparentId = m_parentAccount.id();
+      parentId = m_parentAccount.id();
     }
     delete e;
   }
@@ -759,10 +759,10 @@ void KNewAccountDlg::initParentWidget(TQString tqparentId, const TQString& accou
 
         if(m_parentAccount.id().isEmpty()) {
           m_parentAccount = assetAccount;
-          tqparentId = m_parentAccount.id();
+          parentId = m_parentAccount.id();
         }
 
-        if (tqparentId == assetAccount.id())
+        if (parentId == assetAccount.id())
           m_parentItem = assetTopLevelAccount;
 
         assetTopLevelAccount->setOpen(true);
@@ -777,7 +777,7 @@ void KNewAccountDlg::initParentWidget(TQString tqparentId, const TQString& accou
 
           KMyMoneyAccountTreeBaseItem *accountItem = new KMyMoneyAccountTreeItem(assetTopLevelAccount, acc);
 
-          if(tqparentId == acc.id()) {
+          if(parentId == acc.id()) {
             m_parentItem = accountItem;
           } else if(accountId == acc.id()) {
             if(m_isEditing)
@@ -788,7 +788,7 @@ void KNewAccountDlg::initParentWidget(TQString tqparentId, const TQString& accou
           TQStringList subAccounts = acc.accountList();
           if (subAccounts.count() >= 1)
           {
-            showSubAccounts(subAccounts, accountItem, tqparentId, acc.id());
+            showSubAccounts(subAccounts, accountItem, parentId, acc.id());
           }
         }
       }
@@ -799,10 +799,10 @@ void KNewAccountDlg::initParentWidget(TQString tqparentId, const TQString& accou
 
         if(m_parentAccount.id().isEmpty()) {
           m_parentAccount = liabilityAccount;
-          tqparentId = m_parentAccount.id();
+          parentId = m_parentAccount.id();
         }
 
-        if (tqparentId == liabilityAccount.id())
+        if (parentId == liabilityAccount.id())
           m_parentItem = liabilityTopLevelAccount;
 
         liabilityTopLevelAccount->setOpen(true);
@@ -817,7 +817,7 @@ void KNewAccountDlg::initParentWidget(TQString tqparentId, const TQString& accou
 
           KMyMoneyAccountTreeBaseItem *accountItem = new KMyMoneyAccountTreeItem(liabilityTopLevelAccount, acc);
 
-          if(tqparentId == acc.id()) {
+          if(parentId == acc.id()) {
             m_parentItem = accountItem;
           } else if(accountId == acc.id()) {
             if(m_isEditing)
@@ -828,7 +828,7 @@ void KNewAccountDlg::initParentWidget(TQString tqparentId, const TQString& accou
           TQStringList subAccounts = acc.accountList();
           if (subAccounts.count() >= 1)
           {
-            showSubAccounts(subAccounts, accountItem, tqparentId, acc.id());
+            showSubAccounts(subAccounts, accountItem, parentId, acc.id());
           }
         }
       }
@@ -842,10 +842,10 @@ void KNewAccountDlg::initParentWidget(TQString tqparentId, const TQString& accou
 
         if(m_parentAccount.id().isEmpty()) {
           m_parentAccount = incomeAccount;
-          tqparentId = m_parentAccount.id();
+          parentId = m_parentAccount.id();
         }
 
-        if (tqparentId == incomeAccount.id())
+        if (parentId == incomeAccount.id())
           m_parentItem = incomeTopLevelAccount;
 
         incomeTopLevelAccount->setOpen(true);
@@ -858,7 +858,7 @@ void KNewAccountDlg::initParentWidget(TQString tqparentId, const TQString& accou
               file->account(*it));
 
           TQString id = file->account(*it).id();
-          if(tqparentId == id) {
+          if(parentId == id) {
             m_parentItem = accountItem;
           } else if(accountId == id) {
             if(m_isEditing)
@@ -869,7 +869,7 @@ void KNewAccountDlg::initParentWidget(TQString tqparentId, const TQString& accou
           TQStringList subAccounts = file->account(*it).accountList();
           if (subAccounts.count() >= 1)
           {
-            showSubAccounts(subAccounts, accountItem, tqparentId, accountId);
+            showSubAccounts(subAccounts, accountItem, parentId, accountId);
           }
         }
       }
@@ -881,10 +881,10 @@ void KNewAccountDlg::initParentWidget(TQString tqparentId, const TQString& accou
 
         if(m_parentAccount.id().isEmpty()) {
           m_parentAccount = expenseAccount;
-          tqparentId = m_parentAccount.id();
+          parentId = m_parentAccount.id();
         }
 
-        if (tqparentId == expenseAccount.id())
+        if (parentId == expenseAccount.id())
           m_parentItem = expenseTopLevelAccount;
 
         expenseTopLevelAccount->setOpen(true);
@@ -897,7 +897,7 @@ void KNewAccountDlg::initParentWidget(TQString tqparentId, const TQString& accou
               file->account(*it));
 
           TQString id = file->account(*it).id();
-          if(tqparentId == id) {
+          if(parentId == id) {
             m_parentItem = accountItem;
           } else if(accountId == id) {
             if(m_isEditing)
@@ -908,7 +908,7 @@ void KNewAccountDlg::initParentWidget(TQString tqparentId, const TQString& accou
           TQStringList subAccounts = file->account(*it).accountList();
           if (subAccounts.count() >= 1)
           {
-            showSubAccounts(subAccounts, accountItem, tqparentId, accountId);
+            showSubAccounts(subAccounts, accountItem, parentId, accountId);
           }
         }
       }
@@ -932,18 +932,18 @@ void KNewAccountDlg::initParentWidget(TQString tqparentId, const TQString& accou
   m_qlistviewParentAccounts->setEnabled(true);
 }
 
-void KNewAccountDlg::showSubAccounts(TQStringList accounts, KMyMoneyAccountTreeBaseItem *tqparentItem,
+void KNewAccountDlg::showSubAccounts(TQStringList accounts, KMyMoneyAccountTreeBaseItem *parentItem,
-                                     const TQString& tqparentId, const TQString& accountId)
+                                     const TQString& parentId, const TQString& accountId)
 {
   MyMoneyFile *file = MyMoneyFile::instance();
 
   for ( TQStringList::ConstIterator it = accounts.begin(); it != accounts.end(); ++it )
   {
-    KMyMoneyAccountTreeBaseItem *accountItem  = new KMyMoneyAccountTreeItem(tqparentItem,
+    KMyMoneyAccountTreeBaseItem *accountItem  = new KMyMoneyAccountTreeItem(parentItem,
           file->account(*it));
 
     TQString id = file->account(*it).id();
-    if(tqparentId == id) {
+    if(parentId == id) {
       m_parentItem = accountItem;
     } else if(accountId == id) {
       if(m_isEditing)
@@ -954,7 +954,7 @@ void KNewAccountDlg::showSubAccounts(TQStringList accounts, KMyMoneyAccountTreeB
     TQStringList subAccounts = file->account(*it).accountList();
     if (subAccounts.count() >= 1)
     {
-      showSubAccounts(subAccounts, accountItem, tqparentId, accountId);
+      showSubAccounts(subAccounts, accountItem, parentId, accountId);
     }
   }
 }
@@ -1094,25 +1094,25 @@ void KNewAccountDlg::slotAccountTypeChanged(const TQString& typeStr)
   try {
     oldType = m_account.accountType();
     if(oldType != type) {
-      TQString tqparentId;
+      TQString parentId;
       switch(MyMoneyAccount::accountGroup(type)) {
         case MyMoneyAccount::Asset:
-          tqparentId = file->asset().id();
+          parentId = file->asset().id();
           break;
         case MyMoneyAccount::Liability:
-          tqparentId = file->liability().id();
+          parentId = file->liability().id();
           break;
         case MyMoneyAccount::Expense:
-          tqparentId = file->expense().id();
+          parentId = file->expense().id();
           break;
         case MyMoneyAccount::Income:
-          tqparentId = file->income().id();
+          parentId = file->income().id();
           break;
         default:
           qWarning("Unknown account group in KNewAccountDlg::slotAccountTypeChanged()");
           break;
       }
-      initParentWidget(tqparentId, TQString());
+      initParentWidget(parentId, TQString());
       m_account.setAccountType(type);
     }
   } catch(MyMoneyException *e) {

kmymoney2/dialogs/knewaccountdlg.h

@@ -65,8 +65,8 @@ private:
   int m_idPropMaxCredit;
   int m_idPropMinBalance;
 
-  void initParentWidget(TQString tqparentId, const TQString& accountId);
+  void initParentWidget(TQString parentId, const TQString& accountId);
-  void showSubAccounts(TQStringList accounts, KMyMoneyAccountTreeBaseItem *tqparentItem, const TQString& tqparentId, const TQString& accountId);
+  void showSubAccounts(TQStringList accounts, KMyMoneyAccountTreeBaseItem *parentItem, const TQString& parentId, const TQString& accountId);
   void loadVatAccounts(void);
   void storeKVP(const TQString& key, kMyMoneyEdit* widget);
   void storeKVP(const TQString& key, KLineEdit* widget);
@@ -101,7 +101,7 @@ public:
   /**
     * This method returns the tqparent account of the edited account object.
     */
-  const MyMoneyAccount& tqparentAccount(void);
+  const MyMoneyAccount& parentAccount(void);
 
   void setOpeningBalance(const MyMoneyMoney& balance);
 

kmymoney2/dialogs/knewaccountdlgdecl.ui

@@ -1045,5 +1045,5 @@
     <include location="global" impldecl="in implementation">kmymoney/kmymoneyedit.h</include>
     <include location="global" impldecl="in implementation">kmymoney/kmymoneycategory.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/knewbankdlgdecl.ui

@@ -264,5 +264,5 @@
 </widget>
 <tabstops>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/knewbudgetdlgdecl.ui

@@ -167,7 +167,7 @@
     <slot>m_pbOk_clicked()</slot>
     <slot>m_pbCancel_clicked()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 
 
 

kmymoney2/dialogs/knewequityentrydecl.ui

@@ -232,5 +232,5 @@
     <tabstop>btnOK</tabstop>
     <tabstop>btnCancel</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/knewfiledlgdecl.ui

@@ -324,5 +324,5 @@ your KMyMoney file.</string>
     <tabstop>okBtn</tabstop>
     <tabstop>cancelBtn</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/knewinvestmentwizard.cpp

@@ -232,7 +232,7 @@ void KNewInvestmentWizard::slotHelp(void)
   kapp->invokeHelp("details.investments.newinvestmentwizard");
 }
 
-void KNewInvestmentWizard::createObjects(const TQString& tqparentId)
+void KNewInvestmentWizard::createObjects(const TQString& parentId)
 {
   MyMoneyFile* file = MyMoneyFile::instance();
 
@@ -299,7 +299,7 @@ void KNewInvestmentWizard::createObjects(const TQString& tqparentId)
       }
 
       if(m_account.id().isEmpty()) {
-        MyMoneyAccount tqparent = file->account(tqparentId);
+        MyMoneyAccount tqparent = file->account(parentId);
         file->addAccount(m_account, tqparent);
       } else
         file->modifyAccount(m_account);

kmymoney2/dialogs/knewinvestmentwizard.h

@@ -68,9 +68,9 @@ public:
     * creates all necessary objects for the investment or updates
     * them.
     *
-    * @param tqparentId id of tqparent account for the investment
+    * @param parentId id of tqparent account for the investment
     */
-  void createObjects(const TQString& tqparentId);
+  void createObjects(const TQString& parentId);
 
   const MyMoneyAccount& account(void) const { return m_account; }
 

kmymoney2/dialogs/knewinvestmentwizarddecl.ui

@@ -592,5 +592,5 @@
     <include location="global" impldecl="in implementation">kmymoney/kmymoneyedit.h</include>
     <include location="global" impldecl="in implementation">kmymoney/kmymoneycategory.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/knewloanwizarddecl.ui

@@ -5498,5 +5498,5 @@ This page summarizes the data you entered. If you need to modify anything, pleas
     <include location="global" impldecl="in implementation">kmymoney/kmymoneyedit.h</include>
     <include location="global" impldecl="in implementation">kmymoney/kmymoneycategory.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/konlinequoteconfigurationdecl.ui

@@ -195,5 +195,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/kpayeereassigndlgdecl.ui

@@ -182,5 +182,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/kplugindlg.ui

@@ -150,5 +150,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/kreconciledlgdecl.ui

@@ -705,5 +705,5 @@ Your account is balanced when the Difference is Zero.  Click on the Finish butto
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/ksecuritylisteditordecl.ui

@@ -258,5 +258,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/kselectdatabasedlgdecl.ui

@@ -246,5 +246,5 @@ As always, please make sure you have adequate backups of your data.</font>
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/kselecttransactionsdlgdecl.ui

@@ -170,5 +170,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/ksortoptiondlg.ui

@@ -128,5 +128,5 @@
 <includes>
     <include location="global" impldecl="in implementation">kmymoney/transactionsortoption.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/ksplitcorrectiondlg.ui

@@ -241,5 +241,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/ksplittransactiondlgdecl.ui

@@ -420,5 +420,5 @@
         <data format="PNG" length="256">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000c749444154388dad55db1184200c4c180bb81a28c73aad811228c356f42b3792db3cc0db2fc724bb7901dc7b270f27ed17fa5fa9b117b7cd90211f4ba0ac906a7f1453b4d30ca917bb590681552af23f69bfc4ffa71519d2c8f62546ea5ea03738b1c18c33a4d156f0d13f43b61952e4af6d6e8fb3a408f080448419a433d6486d85052fdba892a295f5d45785cd8c51a9d6de6a814a8d2131da51f98e7a3b64ec9da04a8db53d43be3c3c0b22cacf17e4cdb5a931649ceddf34b190cf0aa019f03f1fd3e7457f03b5a66c9ed26e86130000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/kupdatestockpricedlgdecl.ui

@@ -253,7 +253,7 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">kmymoney/kmymoneydateinput.h</include>
 </includes>

kmymoney2/dialogs/mymoneyqifprofileeditordecl.ui

@@ -901,5 +901,5 @@
     <tabstop>m_editInputFilterLocation</tabstop>
     <tabstop>m_editOutputFilterLocation</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/settings/ksettingscolorsdecl.ui

@@ -402,5 +402,5 @@
         <slot>setDisabled(bool)</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/settings/ksettingsfontsdecl.ui

@@ -127,5 +127,5 @@
         <slot>setDisabled(bool)</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/settings/ksettingsforecastdecl.ui

@@ -264,5 +264,5 @@
         </spacer>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui

@@ -645,5 +645,5 @@ You can use <b>View/Show all accounts</b> to temporarily show hidden
 <includes>
     <include location="global" impldecl="in implementation">kmymoney/kmymoneydateinput.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/settings/ksettingsgpg.cpp

@@ -149,7 +149,7 @@ void KSettingsGpg::show(void)
   for(TQStringList::iterator it = keyList.begin(); it != keyList.end(); ++it) {
     TQStringList fields = TQStringList::split(":", *it);
     if(fields[0] != RECOVER_KEY_ID_FULL) {
-      // replace tqparenthesis in name field with brackets
+      // replace parenthesis in name field with brackets
       TQString name = fields[1];
       name.tqreplace('(', "[");
       name.tqreplace(')', "]");

kmymoney2/dialogs/settings/ksettingsgpgdecl.ui

@@ -234,5 +234,5 @@ This mechanism is provided for the case that you have lost your key and cannot a
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/settings/ksettingshomedecl.ui

@@ -227,5 +227,5 @@ Use the buttons and checkboxes to customize the tqlayout of the home page.</stri
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui

@@ -230,5 +230,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/settings/ksettingsregisterdecl.ui

@@ -548,5 +548,5 @@ Selecting 0% will list all transactions.</string>
 <includes>
     <include location="global" impldecl="in implementation">kmymoney/transactionsortoption.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/settings/ksettingsschedulesdecl.ui

@@ -141,5 +141,5 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/dialogs/transactioneditor.cpp

@@ -519,7 +519,7 @@ bool TransactionEditor::enterTransactions(TQString& newId, bool askForSchedule,
   MyMoneyFile* file = MyMoneyFile::instance();
 
   // make sure to run through all stuff that is tied to 'focusout events'.
-  m_regForm->tqparentWidget()->setFocus();
+  m_regForm->parentWidget()->setFocus();
   TQApplication::eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 10);
 
   // we don't need to update our widgets anymore, so we just disconnect the signal

kmymoney2/kmymoney2.cpp

@@ -1088,7 +1088,7 @@ bool KMyMoney2App::slotFileSaveAs(void)
     for(TQStringList::iterator it = keyList.begin(); it != keyList.end(); ++it) {
       TQStringList fields = TQStringList::split(":", *it);
       if(fields[0] != RECOVER_KEY_ID) {
-        // replace tqparenthesis in name field with brackets
+        // replace parenthesis in name field with brackets
         TQString name = fields[1];
         name.tqreplace('(', "[");
         name.tqreplace(')', "]");
@@ -2235,25 +2235,25 @@ const MyMoneyAccount& KMyMoney2App::findAccount(const MyMoneyAccount& acc, const
   static MyMoneyAccount nullAccount;
 
   MyMoneyFile* file = MyMoneyFile::instance();
-  TQValueList<MyMoneyAccount> tqparents;
+  TQValueList<MyMoneyAccount> parents;
   try {
     // search by id
     if(!acc.id().isEmpty()) {
       return file->account(acc.id());
     }
-    // collect the tqparents. in case tqparent does not have an id, we scan the all top-level accounts
+    // collect the parents. in case tqparent does not have an id, we scan the all top-level accounts
     if(tqparent.id().isEmpty()) {
-      tqparents << file->asset();
+      parents << file->asset();
-      tqparents << file->liability();
+      parents << file->liability();
-      tqparents << file->income();
+      parents << file->income();
-      tqparents << file->expense();
+      parents << file->expense();
-      tqparents << file->equity();
+      parents << file->equity();
     } else {
-      tqparents << tqparent;
+      parents << tqparent;
     }
     TQValueList<MyMoneyAccount>::const_iterator it_p;
-    for(it_p = tqparents.begin(); it_p != tqparents.end(); ++it_p) {
+    for(it_p = parents.begin(); it_p != parents.end(); ++it_p) {
-      MyMoneyAccount tqparentAccount = *it_p;
+      MyMoneyAccount parentAccount = *it_p;
       // search by name (allow hierarchy)
       int pos;
       // check for ':' in the name and use it as separator for a hierarchy
@@ -2261,14 +2261,14 @@ const MyMoneyAccount& KMyMoney2App::findAccount(const MyMoneyAccount& acc, const
       while((pos = name.tqfind(MyMoneyFile::AccountSeperator)) != -1) {
         TQString part = name.left(pos);
         TQString remainder = name.mid(pos+1);
-        const MyMoneyAccount& existingAccount = file->subAccountByName(tqparentAccount, part);
+        const MyMoneyAccount& existingAccount = file->subAccountByName(parentAccount, part);
         if(existingAccount.id().isEmpty()) {
           return existingAccount;
         }
-        tqparentAccount = existingAccount;
+        parentAccount = existingAccount;
         name = remainder;
       }
-      const MyMoneyAccount& existingAccount = file->subAccountByName(tqparentAccount, name);
+      const MyMoneyAccount& existingAccount = file->subAccountByName(parentAccount, name);
       if(!existingAccount.id().isEmpty()) {
         if(acc.accountType() != MyMoneyAccount::UnknownAccountType) {
           if(acc.accountType() != existingAccount.accountType())
@@ -2284,7 +2284,7 @@ const MyMoneyAccount& KMyMoney2App::findAccount(const MyMoneyAccount& acc, const
   return nullAccount;
 }
 
-void KMyMoney2App::createAccount(MyMoneyAccount& newAccount, MyMoneyAccount& tqparentAccount, MyMoneyAccount& brokerageAccount, MyMoneyMoney openingBal)
+void KMyMoney2App::createAccount(MyMoneyAccount& newAccount, MyMoneyAccount& parentAccount, MyMoneyAccount& brokerageAccount, MyMoneyMoney openingBal)
 {
   MyMoneyFile* file = MyMoneyFile::instance();
 
@@ -2300,14 +2300,14 @@ void KMyMoney2App::createAccount(MyMoneyAccount& newAccount, MyMoneyAccount& tqp
     while((pos = newAccount.name().tqfind(MyMoneyFile::AccountSeperator)) != -1) {
       TQString part = newAccount.name().left(pos);
       TQString remainder = newAccount.name().mid(pos+1);
-      const MyMoneyAccount& existingAccount = file->subAccountByName(tqparentAccount, part);
+      const MyMoneyAccount& existingAccount = file->subAccountByName(parentAccount, part);
       if(existingAccount.id().isEmpty()) {
         newAccount.setName(part);
 
-        file->addAccount(newAccount, tqparentAccount);
+        file->addAccount(newAccount, parentAccount);
-        tqparentAccount = newAccount;
+        parentAccount = newAccount;
       } else {
-        tqparentAccount = existingAccount;
+        parentAccount = existingAccount;
       }
       newAccount.setParentAccountId(TQString());  // make sure, there's no tqparent
       newAccount.clearId();                       // and no id set for adding
@@ -2336,7 +2336,7 @@ void KMyMoney2App::createAccount(MyMoneyAccount& newAccount, MyMoneyAccount& tqp
         return;
     }
 
-    file->addAccount(newAccount, tqparentAccount);
+    file->addAccount(newAccount, parentAccount);
 
     // in case of a loan account, we add the initial payment
     if((newAccount.accountType() == MyMoneyAccount::Loan
@@ -2371,7 +2371,7 @@ void KMyMoney2App::createAccount(MyMoneyAccount& newAccount, MyMoneyAccount& tqp
     // a brokerage account
     } else if(newAccount.accountType() == MyMoneyAccount::Investment
             && !brokerageAccount.name().isEmpty()) {
-      file->addAccount(brokerageAccount, tqparentAccount);
+      file->addAccount(brokerageAccount, parentAccount);
 
       // set a link from the investment account to the brokerage account
       file->modifyAccount(newAccount);
@@ -2450,11 +2450,11 @@ void KMyMoney2App::createCategory(MyMoneyAccount& account, const MyMoneyAccount&
   KNewAccountDlg dialog(account, false, true, 0, 0, i18n("Create a new Category"));
 
   if(dialog.exec() == TQDialog::Accepted) {
-    MyMoneyAccount tqparentAccount, brokerageAccount;
+    MyMoneyAccount parentAccount, brokerageAccount;
     account = dialog.account();
-    tqparentAccount = dialog.tqparentAccount();
+    parentAccount = dialog.parentAccount();
 
-    createAccount(account, tqparentAccount, brokerageAccount, MyMoneyMoney(0,1));
+    createAccount(account, parentAccount, brokerageAccount, MyMoneyMoney(0,1));
   }
 }
 
@@ -2483,7 +2483,7 @@ void KMyMoney2App::slotAccountNew(MyMoneyAccount& account)
       MyMoneyFile* file = MyMoneyFile::instance();
       try {
         // create the account
-        MyMoneyAccount tqparent = wizard->tqparentAccount();
+        MyMoneyAccount tqparent = wizard->parentAccount();
         file->addAccount(acc, tqparent);
 
         // tell the wizard about the account id which it
@@ -2845,13 +2845,13 @@ void KMyMoney2App::slotAccountDelete(void)
       }
       // case B - we have some subcategories, maybe the user does not want to
       //          delete them all, but just the category itself?
-      MyMoneyAccount tqparentAccount = file->account(m_selectedAccount.tqparentAccountId());
+      MyMoneyAccount parentAccount = file->account(m_selectedAccount.parentAccountId());
 
       TQStringList accountsToRetqparent;
       int result = KMessageBox::questionYesNoCancel(this, TQString("<qt>")+
           i18n("Do you want to delete category <b>%1</b> with all its sub-categories or only "
                "the category itself? If you only delete the category itself, all its sub-categories "
-               "will be made sub-categories of <b>%2</b>.").tqarg(m_selectedAccount.name()).tqarg(tqparentAccount.name())+TQString("</qt>"),
+               "will be made sub-categories of <b>%2</b>.").tqarg(m_selectedAccount.name()).tqarg(parentAccount.name())+TQString("</qt>"),
           TQString(),
           KGuiItem(i18n("Delete all")),
           KGuiItem(i18n("Just the category")));
@@ -2885,13 +2885,13 @@ void KMyMoney2App::slotAccountDelete(void)
       }
       if (!accountsToRetqparent.isEmpty() && need_confirmation) {
         if (KMessageBox::questionYesNo(this, TQString("<p>")+i18n("Some sub-categories of category <b>%1</b> cannot "
-          "be deleted, because they are still used. They will be made sub-categories of <b>%2</b>. Proceed?").tqarg(m_selectedAccount.name()).tqarg(tqparentAccount.name())) != KMessageBox::Yes) {
+          "be deleted, because they are still used. They will be made sub-categories of <b>%2</b>. Proceed?").tqarg(m_selectedAccount.name()).tqarg(parentAccount.name())) != KMessageBox::Yes) {
           return; // user gets wet feet...
         }
       }
       // all good, now first reparent selected sub-categories
       try {
-        MyMoneyAccount tqparent = file->account(m_selectedAccount.tqparentAccountId());
+        MyMoneyAccount tqparent = file->account(m_selectedAccount.parentAccountId());
         for (TQStringList::const_iterator it = accountsToRetqparent.begin(); it != accountsToRetqparent.end(); ++it) {
           MyMoneyAccount child = file->account(*it);
           file->reparentAccount(child, tqparent);
@@ -2998,7 +2998,7 @@ void KMyMoney2App::slotAccountEdit(void)
             MyMoneyFileTransaction ft;
 
             MyMoneyAccount account = dlg.account();
-            MyMoneyAccount tqparent = dlg.tqparentAccount();
+            MyMoneyAccount tqparent = dlg.parentAccount();
             if(it_plugin != m_onlinePlugins.end()) {
               account.setOnlineBankingSettings((*it_plugin)->onlineBankingSettings(account.onlineBankingSettings()));
             }
@@ -3009,7 +3009,7 @@ void KMyMoney2App::slotAccountEdit(void)
 
             // we need to modify first, as reparent would override all other changes
             file->modifyAccount(account);
-            if(account.tqparentAccountId() != tqparent.id()) {
+            if(account.parentAccountId() != tqparent.id()) {
               file->reparentAccount(account, tqparent);
             }
             if(!tid.isEmpty() && dlg.openingBalance().isZero()) {
@@ -3388,7 +3388,7 @@ void KMyMoney2App::slotAccountReopen(void)
     while(a.isClosed()) {
       a.setClosed(false);
       file->modifyAccount(a);
-      a = file->account(a.tqparentAccountId());
+      a = file->account(a.parentAccountId());
     }
     ft.commit();
   } catch(MyMoneyException* e) {
@@ -3396,7 +3396,7 @@ void KMyMoney2App::slotAccountReopen(void)
   }
 }
 
-void KMyMoney2App::slotRetqparentAccount(const MyMoneyAccount& _src, const MyMoneyInstitution& _dst)
+void KMyMoney2App::slotReparentAccount(const MyMoneyAccount& _src, const MyMoneyInstitution& _dst)
 {
   MyMoneyAccount src(_src);
   src.setInstitutionId(_dst.id());
@@ -3410,7 +3410,7 @@ void KMyMoney2App::slotRetqparentAccount(const MyMoneyAccount& _src, const MyMon
   }
 }
 
-void KMyMoney2App::slotRetqparentAccount(const MyMoneyAccount& _src, const MyMoneyAccount& _dst)
+void KMyMoney2App::slotReparentAccount(const MyMoneyAccount& _src, const MyMoneyAccount& _dst)
 {
   MyMoneyAccount src(_src);
   MyMoneyAccount dst(_dst);
@@ -5584,7 +5584,7 @@ void KMyMoney2App::slotSelectTransactions(const KMyMoneyRegister::SelectedTransa
             if(!acc.isIncomeExpense()) {
               // for stock accounts we show the portfolio account
               if(acc.isInvest()) {
-                acc = MyMoneyFile::instance()->account(acc.tqparentAccountId());
+                acc = MyMoneyFile::instance()->account(acc.parentAccountId());
               }
               m_accountGoto = acc.id();
               TQString name = acc.name();

kmymoney2/kmymoney2.h

@@ -539,7 +539,7 @@ public:
 
   const MyMoneyAccount& findAccount(const MyMoneyAccount& acc, const MyMoneyAccount& tqparent) const;
 
-  void createAccount(MyMoneyAccount& newAccount, MyMoneyAccount& tqparentAccount, MyMoneyAccount& brokerageAccount, MyMoneyMoney openingBal);
+  void createAccount(MyMoneyAccount& newAccount, MyMoneyAccount& parentAccount, MyMoneyAccount& brokerageAccount, MyMoneyMoney openingBal);
 
 k_dcop:
   // Note: Don't use e.g. filename(void) but use filename() because
@@ -860,7 +860,7 @@ public slots:
     * @param src account to be reparented
     * @param dest new tqparent
     */
-  void slotRetqparentAccount(const MyMoneyAccount& src, const MyMoneyAccount& dest);
+  void slotReparentAccount(const MyMoneyAccount& src, const MyMoneyAccount& dest);
 
   /**
     * This slot reparents account @p src to be a held at institution @p dest
@@ -868,7 +868,7 @@ public slots:
     * @param src account to be reparented
     * @param dest new tqparent institution
     */
-  void slotRetqparentAccount(const MyMoneyAccount& src, const MyMoneyInstitution& dest);
+  void slotReparentAccount(const MyMoneyAccount& src, const MyMoneyInstitution& dest);
 
   /**
     * This slot creates a transaction report for the selected account

kmymoney2/mymoney/mymoneyaccount.cpp

@@ -64,7 +64,7 @@ MyMoneyAccount::MyMoneyAccount(const TQDomElement& node) :
 
   // qDebug("Reading information for account %s", acc.name().data());
 
-  setParentAccountId(TQStringEmpty(node.attribute("tqparentaccount")));
+  setParentAccountId(TQStringEmpty(node.attribute("parentaccount")));
   setLastModified(stringToDate(TQStringEmpty(node.attribute("lastmodified"))));
   setLastReconciliationDate(stringToDate(TQStringEmpty(node.attribute("lastreconciled"))));
 
@@ -105,7 +105,7 @@ MyMoneyAccount::MyMoneyAccount(const TQDomElement& node) :
   setDescription(node.attribute("description"));
 
   m_id = TQStringEmpty(node.attribute("id"));
-  // qDebug("Account %s has id of %s, type of %d, tqparent is %s.", acc.name().data(), id.data(), type, acc.tqparentAccountId().data());
+  // qDebug("Account %s has id of %s, type of %d, tqparent is %s.", acc.name().data(), id.data(), type, acc.parentAccountId().data());
 
   //  Process any Sub-Account information found inside the account entry.
   m_accountList.clear();
@@ -481,7 +481,7 @@ void MyMoneyAccount::writeXML(TQDomDocument& document, TQDomElement& tqparent) c
 
   writeBaseXML(document, el);
 
-  el.setAttribute("tqparentaccount", tqparentAccountId());
+  el.setAttribute("parentaccount", parentAccountId());
   el.setAttribute("lastreconciled", dateToString(lastReconciliationDate()));
   el.setAttribute("lastmodified", dateToString(lastModified()));
   el.setAttribute("institution", institutionId());

kmymoney2/mymoney/mymoneyaccount.h

@@ -234,7 +234,7 @@ public:
     * This method is used to return the ID of the tqparent account
     * @return TQString with the ID of the tqparent of this account
     */
-  const TQString& tqparentAccountId(void) const { return m_parentAccount; };
+  const TQString& parentAccountId(void) const { return m_parentAccount; };
 
   /**
     * This method returns the list of the account id's of

kmymoney2/mymoney/mymoneyaccounttest.cpp

@@ -70,7 +70,7 @@ void MyMoneyAccountTest::testConstructor() {
 	CPPUNIT_ASSERT(a.number() == "465500");
 	CPPUNIT_ASSERT(a.description() == "Desc");
 	CPPUNIT_ASSERT(a.accountList().count() == 0);
-	CPPUNIT_ASSERT(a.tqparentAccountId() == "Parent");
+	CPPUNIT_ASSERT(a.parentAccountId() == "Parent");
 	CPPUNIT_ASSERT(a.balance() == MyMoneyMoney(1,1));
 
 	TQMap<TQString, TQString> copy;
@@ -129,7 +129,7 @@ void MyMoneyAccountTest::testCopyConstructor() {
 	CPPUNIT_ASSERT(b.openingDate() == TQDate::tqcurrentDate());
 	CPPUNIT_ASSERT(b.description() == "Desc1");
 	CPPUNIT_ASSERT(b.number() == "Number");
-	CPPUNIT_ASSERT(b.tqparentAccountId() == "ParentAccount");
+	CPPUNIT_ASSERT(b.parentAccountId() == "ParentAccount");
 
 	CPPUNIT_ASSERT(b.value("Key") == "Value");
 }
@@ -300,7 +300,7 @@ void MyMoneyAccountTest::testWriteXML() {
 	TQString ref = TQString(
 		"<!DOCTYPE TEST>\n"
 		"<ACCOUNT-CONTAINER>\n"
-		" <ACCOUNT tqparentaccount=\"Parent\" lastmodified=\"%1\" lastreconciled=\"\" institution=\"B000001\" number=\"465500\" opened=\"%2\" type=\"9\" id=\"A000001\" name=\"AccountName\" description=\"Desc\" >\n"
+		" <ACCOUNT parentaccount=\"Parent\" lastmodified=\"%1\" lastreconciled=\"\" institution=\"B000001\" number=\"465500\" opened=\"%2\" type=\"9\" id=\"A000001\" name=\"AccountName\" description=\"Desc\" >\n"
 		"  <SUBACCOUNTS>\n"
 		"   <SUBACCOUNT id=\"A000002\" />\n"
 		"  </SUBACCOUNTS>\n"
@@ -319,7 +319,7 @@ void MyMoneyAccountTest::testReadXML() {
 	TQString ref_ok = TQString(
 		"<!DOCTYPE TEST>\n"
 		"<ACCOUNT-CONTAINER>\n"
-		" <ACCOUNT tqparentaccount=\"Parent\" lastmodified=\"%1\" lastreconciled=\"\" institution=\"B000001\" number=\"465500\" opened=\"%2\" type=\"9\" id=\"A000001\" name=\"AccountName\" description=\"Desc\" >\n"
+		" <ACCOUNT parentaccount=\"Parent\" lastmodified=\"%1\" lastreconciled=\"\" institution=\"B000001\" number=\"465500\" opened=\"%2\" type=\"9\" id=\"A000001\" name=\"AccountName\" description=\"Desc\" >\n"
 		"  <SUBACCOUNTS>\n"
 		"   <SUBACCOUNT id=\"A000002\" />\n"
 		"   <SUBACCOUNT id=\"A000003\" />\n"
@@ -335,7 +335,7 @@ void MyMoneyAccountTest::testReadXML() {
 	TQString ref_false = TQString(
 		"<!DOCTYPE TEST>\n"
 		"<ACCOUNT-CONTAINER>\n"
-		" <KACCOUNT tqparentaccount=\"Parent\" lastmodified=\"%1\" lastreconciled=\"\" institution=\"B000001\" number=\"465500\" opened=\"%2\" type=\"9\" id=\"A000001\" name=\"AccountName\" description=\"Desc\" >\n"
+		" <KACCOUNT parentaccount=\"Parent\" lastmodified=\"%1\" lastreconciled=\"\" institution=\"B000001\" number=\"465500\" opened=\"%2\" type=\"9\" id=\"A000001\" name=\"AccountName\" description=\"Desc\" >\n"
 		"  <SUBACCOUNTS>\n"
 		"   <SUBACCOUNT id=\"A000002\" />\n"
 		"   <SUBACCOUNT id=\"A000003\" />\n"

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) {
+      while(!isStandardAccount(parentId) && !dropOut) {
-        tqparent = account(tqparentId);
+        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();
+    parentId = (*it_a).parentAccountId();
-    if(accountRebuild.tqcontains(tqparentId)) {
+    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;
         }

kmymoney2/mymoney/mymoneyfile.h

@@ -422,11 +422,11 @@ public:
   void modifyAccount(const MyMoneyAccount& account);
 
   /**
-    * 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);
@@ -778,7 +778,7 @@ public:
     * @param name full account name
     * @return tqparent name (full account name excluding the last part)
     */
-  TQString tqparentName(const TQString& name) const;
+  TQString parentName(const TQString& name) const;
 
   /**
     * This method is used to create a new payee

kmymoney2/mymoney/mymoneyfiletest.cpp

@@ -384,7 +384,7 @@ void MyMoneyFileTest::testAddAccounts() {
                 m->addAccount(a, tqparent);
                 ft.commit();
                 CPPUNIT_ASSERT(m->accountCount() == 6);
-                CPPUNIT_ASSERT(a.tqparentAccountId() == "AStd::Asset");
+                CPPUNIT_ASSERT(a.parentAccountId() == "AStd::Asset");
                 CPPUNIT_ASSERT(a.id() == "A000001");
                 CPPUNIT_ASSERT(a.institutionId() == "I000001");
                 CPPUNIT_ASSERT(m->dirty() == true);
@@ -439,7 +439,7 @@ void MyMoneyFileTest::testAddAccounts() {
                 ft.commit();
                 CPPUNIT_ASSERT(m->dirty() == true);
                 CPPUNIT_ASSERT(b.id() == "A000002");
-                CPPUNIT_ASSERT(b.tqparentAccountId() == "AStd::Asset");
+                CPPUNIT_ASSERT(b.parentAccountId() == "AStd::Asset");
                 CPPUNIT_ASSERT(m->accountCount() == 7);
 
                 institution = m->institution("I000001");
@@ -534,24 +534,24 @@ void MyMoneyFileTest::testModifyAccount() {
         }
 }
 
-void MyMoneyFileTest::testRetqparentAccount() {
+void MyMoneyFileTest::testReparentAccount() {
         testAddAccounts();
         storage->m_dirty = false;
 
         MyMoneyAccount p = m->account("A000001");
         MyMoneyAccount q = m->account("A000002");
-        MyMoneyAccount o = m->account(p.tqparentAccountId());
+        MyMoneyAccount o = m->account(p.parentAccountId());
 
         // make A000001 a child of A000002
         MyMoneyFileTransaction ft;
         try {
-                CPPUNIT_ASSERT(p.tqparentAccountId() != q.id());
+                CPPUNIT_ASSERT(p.parentAccountId() != q.id());
                 CPPUNIT_ASSERT(o.accountCount() == 2);
                 CPPUNIT_ASSERT(q.accountCount() == 0);
                 m->reparentAccount(p, q);
                 ft.commit();
                 CPPUNIT_ASSERT(m->dirty() == true);
-                CPPUNIT_ASSERT(p.tqparentAccountId() == q.id());
+                CPPUNIT_ASSERT(p.parentAccountId() == q.id());
                 CPPUNIT_ASSERT(q.accountCount() == 1);
                 CPPUNIT_ASSERT(q.id() == "A000002");
                 CPPUNIT_ASSERT(p.id() == "A000001");
@@ -624,7 +624,7 @@ void MyMoneyFileTest::testRemoveAccount() {
 }
 
 void MyMoneyFileTest::testRemoveAccountTree() {
-        testRetqparentAccount();
+        testReparentAccount();
         MyMoneyAccount a = m->account("A000002");
 
         MyMoneyFileTransaction ft;
@@ -646,10 +646,10 @@ void MyMoneyFileTest::testRemoveAccountTree() {
                 delete e;
         }
 
-        // make sure that tqchildren are re-tqparented to tqparent account
+        // make sure that tqchildren are re-parented to tqparent account
         try {
                 a = m->account("A000001");
-                CPPUNIT_ASSERT(a.tqparentAccountId() == m->asset().id());
+                CPPUNIT_ASSERT(a.parentAccountId() == m->asset().id());
         } catch(MyMoneyException *e) {
                 delete e;
                 CPPUNIT_FAIL("Unexpected exception!");
@@ -1219,7 +1219,7 @@ void MyMoneyFileTest::testAttachStorage() {
 
 
 void MyMoneyFileTest::testAccount2Category() {
-        testRetqparentAccount();
+        testReparentAccount();
         CPPUNIT_ASSERT(m->accountToCategory("A000001") == "Account2:Account1");
         CPPUNIT_ASSERT(m->accountToCategory("A000002") == "Account2");
 }
@@ -1265,7 +1265,7 @@ void MyMoneyFileTest::testHasAccount() {
                 m->addAccount(a, b);
                 ft.commit();
                 CPPUNIT_ASSERT(m->accountCount() == 8);
-                CPPUNIT_ASSERT(a.tqparentAccountId() == "A000001");
+                CPPUNIT_ASSERT(a.parentAccountId() == "A000001");
                 CPPUNIT_ASSERT(m->hasAccount("A000001", "Account3") == true);
                 CPPUNIT_ASSERT(m->hasAccount("A000001", "Account2") == false);
                 CPPUNIT_ASSERT(m->hasAccount("A000002", "Account3") == false);
@@ -1334,7 +1334,7 @@ void MyMoneyFileTest::testAddEquityAccount() {
         }
 }
 
-void MyMoneyFileTest::testRetqparentEquity() {
+void MyMoneyFileTest::testReparentEquity() {
         testAddEquityAccount();
         testAddEquityAccount();
         MyMoneyAccount tqparent;
@@ -1350,24 +1350,24 @@ void MyMoneyFileTest::testRetqparentEquity() {
         list << MyMoneyAccount::AssetLoan;
         list << MyMoneyAccount::Currency;
         tqparent = m->asset();
-        testRetqparentEquity(list, tqparent);
+        testReparentEquity(list, tqparent);
 
         list.clear();
         list << MyMoneyAccount::CreditCard;
         list << MyMoneyAccount::Loan;
         list << MyMoneyAccount::Liability;
         tqparent = m->liability();
-        testRetqparentEquity(list, tqparent);
+        testReparentEquity(list, tqparent);
 
         list.clear();
         list << MyMoneyAccount::Income;
         tqparent = m->income();
-        testRetqparentEquity(list, tqparent);
+        testReparentEquity(list, tqparent);
 
         list.clear();
         list << MyMoneyAccount::Expense;
         tqparent = m->expense();
-        testRetqparentEquity(list, tqparent);
+        testReparentEquity(list, tqparent);
 
         // now check the good case
         MyMoneyAccount stock = m->account("A000002");
@@ -1381,7 +1381,7 @@ void MyMoneyFileTest::testRetqparentEquity() {
         }
 }
 
-void MyMoneyFileTest::testRetqparentEquity(TQValueList<MyMoneyAccount::accountTypeE>& list, MyMoneyAccount& tqparent)
+void MyMoneyFileTest::testReparentEquity(TQValueList<MyMoneyAccount::accountTypeE>& list, MyMoneyAccount& tqparent)
 {
         MyMoneyAccount a;
         MyMoneyAccount stock = m->account("A000002");
@@ -1488,7 +1488,7 @@ void MyMoneyFileTest::testOpeningBalance(void)
 
         try {
                 openingAcc = m->openingBalanceAccount(m->baseCurrency());
-                CPPUNIT_ASSERT(openingAcc.tqparentAccountId() == m->equity().id());
+                CPPUNIT_ASSERT(openingAcc.parentAccountId() == m->equity().id());
                 CPPUNIT_ASSERT(openingAcc.name() == MyMoneyFile::OpeningBalancesPrefix);
                 CPPUNIT_ASSERT(openingAcc.openingDate() == TQDate::tqcurrentDate());
         } catch(MyMoneyException *e) {
@@ -1507,7 +1507,7 @@ void MyMoneyFileTest::testOpeningBalance(void)
         TQString refName = TQString("%1 (%2)").tqarg(MyMoneyFile::OpeningBalancesPrefix).tqarg("USD");
         try {
                 openingAcc = m->openingBalanceAccount(second);
-                CPPUNIT_ASSERT(openingAcc.tqparentAccountId() == m->equity().id());
+                CPPUNIT_ASSERT(openingAcc.parentAccountId() == m->equity().id());
                 CPPUNIT_ASSERT(openingAcc.name() == refName);
                 CPPUNIT_ASSERT(openingAcc.openingDate() == TQDate::tqcurrentDate());
         } catch(MyMoneyException *e) {

kmymoney2/mymoney/mymoneyfiletest.h

@@ -40,7 +40,7 @@ class MyMoneyFileTest : public CppUnit::TestFixture  {
 	CPPUNIT_TEST(testAddAccounts);
 	CPPUNIT_TEST(testModifyAccount);
 	CPPUNIT_TEST(testModifyStdAccount);
-	CPPUNIT_TEST(testRetqparentAccount);
+	CPPUNIT_TEST(testReparentAccount);
 	CPPUNIT_TEST(testRemoveAccount);
 	CPPUNIT_TEST(testRemoveAccountTree);
 	CPPUNIT_TEST(testAccountListRetrieval);
@@ -63,7 +63,7 @@ class MyMoneyFileTest : public CppUnit::TestFixture  {
 	CPPUNIT_TEST(testAttachedStorage);
 	CPPUNIT_TEST(testHasAccount);
 	CPPUNIT_TEST(testAddEquityAccount);
-	CPPUNIT_TEST(testRetqparentEquity);
+	CPPUNIT_TEST(testReparentEquity);
 	CPPUNIT_TEST(testBaseCurrency);
 	CPPUNIT_TEST(testOpeningBalanceNoBase);
 	CPPUNIT_TEST(testOpeningBalance);
@@ -92,7 +92,7 @@ public:
 	void testAddAccounts();
 	void testModifyAccount();
 	void testModifyStdAccount();
-	void testRetqparentAccount();
+	void testReparentAccount();
 	void testRemoveAccount();
 	void testRemoveAccountTree();
 	void testAccountListRetrieval ();
@@ -115,8 +115,8 @@ public:
 	void testAttachedStorage();
 	void testHasAccount();
 	void testAddEquityAccount();
-	void testRetqparentEquity();
+	void testReparentEquity();
-	void testRetqparentEquity(TQValueList<MyMoneyAccount::accountTypeE>& list, MyMoneyAccount& tqparent);
+	void testReparentEquity(TQValueList<MyMoneyAccount::accountTypeE>& list, MyMoneyAccount& tqparent);
 	void testBaseCurrency();
 	void testOpeningBalanceNoBase();
 	void testOpeningBalance();

kmymoney2/mymoney/mymoneyforecast.cpp

@@ -134,8 +134,8 @@ void MyMoneyForecast::pastTransactions()
         //workaround for stock accounts which have faulty opening dates
         TQDate openingDate;
         if(acc.accountType() == MyMoneyAccount::Stock) {
-          MyMoneyAccount tqparentAccount = file->account(acc.tqparentAccountId());
+          MyMoneyAccount parentAccount = file->account(acc.parentAccountId());
-          openingDate = tqparentAccount.openingDate();
+          openingDate = parentAccount.openingDate();
         } else {
           openingDate = acc.openingDate();
         }
@@ -234,8 +234,8 @@ void MyMoneyForecast::calculateAccountTrendList()
 
       TQDate openingDate;
       if(acc.accountType() == MyMoneyAccount::Stock) {
-        MyMoneyAccount tqparentAccount = file->account(acc.tqparentAccountId());
+        MyMoneyAccount parentAccount = file->account(acc.parentAccountId());
-        openingDate = tqparentAccount.openingDate();
+        openingDate = parentAccount.openingDate();
       } else {
         openingDate = acc.openingDate();
       }
@@ -1206,8 +1206,8 @@ void MyMoneyForecast::setStartingBalance(const MyMoneyAccount &acc)
     //FIXME workaround for stock opening dates
     TQDate openingDate;
     if(acc.accountType() == MyMoneyAccount::Stock) {
-      MyMoneyAccount tqparentAccount = file->account(acc.tqparentAccountId());
+      MyMoneyAccount parentAccount = file->account(acc.parentAccountId());
-      openingDate = tqparentAccount.openingDate();
+      openingDate = parentAccount.openingDate();
     } else {
       openingDate = acc.openingDate();
     }

kmymoney2/mymoney/mymoneyreport.h

@@ -296,7 +296,7 @@ public:
     * @param doc The document which we can use to create new sub-elements
     *              if needed
     * @param anonymous Whether the sensitive parts of the report should be
-    *              tqmasked
+    *              masked
     */
   void write(TQDomElement& e, TQDomDocument *doc, bool anonymous=false) const;
 

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;

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()) {
+  if(!account.parentAccountId().isEmpty()) {
-    accountIdList << account.tqparentAccountId();
+    accountIdList << account.parentAccountId();
   }
 
   startTransaction();
   TQMap<TQString, MyMoneyAccount> accountList = m_sql->fetchAccounts(accountIdList, true);
 
-  if(!account.tqparentAccountId().isEmpty()) {
+  if(!account.parentAccountId().isEmpty()) {
-    MyMoneyDatabaseMgr::account(account.tqparentAccountId());
+    MyMoneyDatabaseMgr::account(account.parentAccountId());
-    oldParent = accountList.tqfind(account.tqparentAccountId());
+    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);
   }

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

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

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

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()) {
+  if(!account.parentAccountId().isEmpty()) {
-    MyMoneySeqAccessMgr::account(account.tqparentAccountId());
+    MyMoneySeqAccessMgr::account(account.parentAccountId());
-    oldParent = m_accountList.tqfind(account.tqparentAccountId());
+    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;

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

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;

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

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();
+    s << "  Parent = " << (*it_a).parentAccountId();
-    if(!(*it_a).tqparentAccountId().isEmpty()) {
+    if(!(*it_a).parentAccountId().isEmpty()) {
-      MyMoneyAccount tqparent = storage->account((*it_a).tqparentAccountId());
+      MyMoneyAccount tqparent = storage->account((*it_a).parentAccountId());
       s << " (" << tqparent.name() << ")";
     } else {
       s << "n/a";

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

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 {

kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlgdecl.ui

@@ -105,5 +105,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupdecl.ui

@@ -484,5 +484,5 @@
     <tabstop>m_listFi</tabstop>
     <tabstop>m_listAccount</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/plugins/ofximport/dialogs/konlinebankingstatusdecl.ui

@@ -479,5 +479,5 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/plugins/ofximport/ofxpartner.cpp

@@ -235,7 +235,7 @@ OfxFiServiceInfo ServiceInfo(const TQString& fipid)
 
   KURL guidFile(TQString("%1fipid-%2.xml").tqarg(directory).tqarg(fipid));
 
-  // Aptqparently at some point in time, for VER=6 msn returned an online URL
+  // Apparently at some point in time, for VER=6 msn returned an online URL
   // to a static error page (http://moneycentral.msn.com/cust404.htm).
   // Increasing to VER=9 solved the problem. This may happen again in the
   // future.

kmymoney2/reports/pivottable.cpp

@@ -780,7 +780,7 @@ MyMoneyMoney PivotTable::cellBalance(const TQString& outergroup, const ReportAcc
     row = newrow;
   }
 
-  // ensure the row already exists (and its tqparental hierarchy)
+  // ensure the row already exists (and its parental hierarchy)
   createRow( outergroup, row, true );
 
   // Determine the inner group from the top-most tqparent account
@@ -879,7 +879,7 @@ void PivotTable::calculateBudgetMapping( void )
           }
           do
           {
-            id = file->account ( id ).tqparentAccountId();
+            id = file->account ( id ).parentAccountId();
             if ( budget.tqcontains ( id ) )
             {
               if ( budget.account ( id ).budgetSubaccounts() )
@@ -1245,7 +1245,7 @@ void PivotTable::assignCell( const TQString& outergroup, const ReportAccount& _r
     row = newrow;
   }
 
-  // ensure the row already exists (and its tqparental hierarchy)
+  // ensure the row already exists (and its parental hierarchy)
   createRow( outergroup, row, true );
 
   // Determine the inner group from the top-most tqparent account

kmymoney2/reports/pivottable.h

@@ -207,7 +207,7 @@ protected:
     * in the user's hierarchy and the account where the budget is held for it.
     * This is needed because the user can budget on a given account for that
     * account and all its descendants.  Also if NO budget is placed on the
-    * account or any of its tqparents, the account is not included in the map.
+    * account or any of its parents, the account is not included in the map.
     */
     void calculateBudgetMapping( void );
 

kmymoney2/reports/reportaccount.cpp

@@ -74,20 +74,20 @@ void ReportAccount::calculateAccountHierarchy( void )
 
   MyMoneyFile* file = MyMoneyFile::instance();
   TQString resultid = id();
-  TQString tqparentid = tqparentAccountId();
+  TQString parentid = parentAccountId();
 
 #ifdef DEBUG_HIDE_SENSITIVE
   m_nameHierarchy.prepend(file->account(resultid).id());
 #else
   m_nameHierarchy.prepend(file->account(resultid).name());
 #endif
-  while (!file->isStandardAccount(tqparentid))
+  while (!file->isStandardAccount(parentid))
   {
     // take on the identity of our tqparent
-    resultid = tqparentid;
+    resultid = parentid;
 
     // and try again
-    tqparentid = file->account(resultid).tqparentAccountId();
+    parentid = file->account(resultid).parentAccountId();
 #ifdef DEBUG_HIDE_SENSITIVE
     m_nameHierarchy.prepend(file->account(resultid).id());
 #else
@@ -307,7 +307,7 @@ unsigned ReportAccount::hierarchyDepth( void ) const
 
 ReportAccount ReportAccount::tqparent( void ) const
 {
-  return ReportAccount( tqparentAccountId() );
+  return ReportAccount( parentAccountId() );
 }
 
 ReportAccount ReportAccount::topParent( void ) const
@@ -316,15 +316,15 @@ ReportAccount ReportAccount::topParent( void ) const
 
   MyMoneyFile* file = MyMoneyFile::instance();
   TQString resultid = id();
-  TQString tqparentid = tqparentAccountId();
+  TQString parentid = parentAccountId();
 
-  while (!file->isStandardAccount(tqparentid))
+  while (!file->isStandardAccount(parentid))
   {
     // take on the identity of our tqparent
-    resultid = tqparentid;
+    resultid = parentid;
 
     // and try again
-    tqparentid = file->account(resultid).tqparentAccountId();
+    parentid = file->account(resultid).parentAccountId();
   }
 
   return ReportAccount( resultid );

kmymoney2/views/kaccountsview.cpp

@@ -75,8 +75,8 @@ KAccountsView::KAccountsView(TQWidget *tqparent, const char *name) :
 {
   // create the searchline widget
   // and insert it into the existing tqlayout
-  m_searchWidget = new KListViewSearchLineWidget(m_accountTree, m_accountTree->tqparentWidget());
+  m_searchWidget = new KListViewSearchLineWidget(m_accountTree, m_accountTree->parentWidget());
-  TQVBoxLayout* tqlayout = dynamic_cast<TQVBoxLayout*>(m_accountTree->tqparentWidget()->tqlayout());
+  TQVBoxLayout* tqlayout = dynamic_cast<TQVBoxLayout*>(m_accountTree->parentWidget()->tqlayout());
   if(tqlayout) {
     tqlayout->insertWidget(0, m_searchWidget);
   }

kmymoney2/views/kaccountsviewdecl.ui

@@ -203,5 +203,5 @@
 <includes>
     <include location="global" impldecl="in implementation">kmymoney/kmymoneyaccounttree.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/views/kbudgetviewdecl.ui

@@ -348,5 +348,5 @@
     <include location="global" impldecl="in implementation">kmymoney/kmymoneyedit.h</include>
     <include location="global" impldecl="in implementation">kmymoney/kbudgetvalues.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/views/kcategoriesview.cpp

@@ -54,8 +54,8 @@ KCategoriesView::KCategoriesView(TQWidget *tqparent, const char *name ) :
 {
   // create the searchline widget
   // and insert it into the existing tqlayout
-  m_searchWidget = new KListViewSearchLineWidget(m_accountTree, m_accountTree->tqparentWidget());
+  m_searchWidget = new KListViewSearchLineWidget(m_accountTree, m_accountTree->parentWidget());
-  TQVBoxLayout* tqlayout = dynamic_cast<TQVBoxLayout*>(m_accountTree->tqparentWidget()->tqlayout());
+  TQVBoxLayout* tqlayout = dynamic_cast<TQVBoxLayout*>(m_accountTree->parentWidget()->tqlayout());
   if(tqlayout) {
     tqlayout->insertWidget(0, m_searchWidget);
   }

kmymoney2/views/kcategoriesviewdecl.ui

@@ -152,5 +152,5 @@
 <includes>
     <include location="global" impldecl="in implementation">kmymoney/kmymoneyaccounttree.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/views/kforecastview.cpp

@@ -589,7 +589,7 @@ bool KForecastView::includeAccount(MyMoneyForecast& forecast, const MyMoneyAccou
   return false;
 }
 
-void KForecastView::loadAccounts(MyMoneyForecast& forecast, const MyMoneyAccount& account, KMyMoneyAccountTreeForecastItem* tqparentItem, int forecastType )
+void KForecastView::loadAccounts(MyMoneyForecast& forecast, const MyMoneyAccount& account, KMyMoneyAccountTreeForecastItem* parentItem, int forecastType )
 {
   TQMap<TQString, TQString> nameIdx;
   TQStringList accList;
@@ -630,7 +630,7 @@ void KForecastView::loadAccounts(MyMoneyForecast& forecast, const MyMoneyAccount
     //get prices
     TQValueList<MyMoneyPrice> prices = getAccountPrices(subAccount);
 
-    forecastItem = new KMyMoneyAccountTreeForecastItem( tqparentItem, subAccount, forecast, prices, currency, static_cast<KMyMoneyAccountTreeForecastItem::EForecastViewType>(forecastType) );
+    forecastItem = new KMyMoneyAccountTreeForecastItem( parentItem, subAccount, forecast, prices, currency, static_cast<KMyMoneyAccountTreeForecastItem::EForecastViewType>(forecastType) );
     forecastItem->setOpen(true);
 
     loadAccounts(forecast, subAccount, forecastItem, forecastType);

kmymoney2/views/kforecastview.h

@@ -123,7 +123,7 @@ private:
   void addIncomeExpenseRows(const MyMoneyForecast& forecast);
   void addTotalRow(KMyMoneyAccountTreeForecast* forecastList, const MyMoneyForecast& forecast);
   bool includeAccount(MyMoneyForecast& forecast, const MyMoneyAccount& acc);
-  void loadAccounts(MyMoneyForecast& forecast, const MyMoneyAccount& account, KMyMoneyAccountTreeForecastItem* tqparentItem, int forecastType);
+  void loadAccounts(MyMoneyForecast& forecast, const MyMoneyAccount& account, KMyMoneyAccountTreeForecastItem* parentItem, int forecastType);
 
   bool                                m_needReload[MaxViewTabs];
   KMyMoneyAccountTreeForecastItem*    m_totalItem;

kmymoney2/views/kforecastviewdecl.ui

@@ -610,5 +610,5 @@
         </sizepolicy>
     </customwidget>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/views/kgloballedgerview.cpp

@@ -103,7 +103,7 @@ bool MousePressFilter::isChildOf( TQWidget* child, TQWidget *tqparent )
     // if it is a child of our own
     if(dynamic_cast<KPassivePopup*>(child))
       return true;
-    child = child->tqparentWidget();
+    child = child->parentWidget();
   }
   return false;
 }
@@ -946,7 +946,7 @@ bool KGlobalLedgerView::slotSelectAccount(const TQString& id, const TQString& tr
         // if a stock account is selected, we show the
         // the corresponding tqparent (investment) account
         if(m_account.isInvest()) {
-          m_account = MyMoneyFile::instance()->account(m_account.tqparentAccountId());
+          m_account = MyMoneyFile::instance()->account(m_account.parentAccountId());
         }
         m_newAccountLoaded = true;
         slotLoadView();
@@ -1210,7 +1210,7 @@ bool KGlobalLedgerView::focusNextPrevChild(bool next)
     w = tqApp->tqfocusWidget();
     while(w && m_tabOrderWidgets.tqfind(w) == -1) {
       // qDebug("'%s' not in list, use tqparent", w->className());
-      w = w->tqparentWidget();
+      w = w->parentWidget();
     }
     // if(w) qDebug("tab order is at '%s'", w->className());
     currentWidget = m_tabOrderWidgets.current();

kmymoney2/views/khomeview.h

@@ -143,7 +143,7 @@ private:
   MyMoneyMoney forecastPaymentBalance(const MyMoneyAccount& acc, const MyMoneyMoney& payment, TQDate& paymentDate);
 
   KHTMLPart*      m_part;
-  TQVBoxLayout*    m_qvboxtqlayoutPage;
+  TQVBoxLayout*    m_qvboxlayoutPage;
   TQString         m_filename;
   bool            m_showAllSchedules;
   bool            m_needReload;

kmymoney2/views/kinstitutionsview.cpp

@@ -133,7 +133,7 @@ void KInstitutionsView::loadAccounts(void)
   TQMap<TQString, MyMoneyAccount>::iterator it_am;
   for(it_am = m_accountMap.begin(); it_am != m_accountMap.end(); ++it_am) {
     if((*it_am).isInvest()) {
-      (*it_am).setInstitutionId(m_accountMap[(*it_am).tqparentAccountId()].institutionId());
+      (*it_am).setInstitutionId(m_accountMap[(*it_am).parentAccountId()].institutionId());
     }
   }
 

kmymoney2/views/kinstitutionsviewdecl.ui

@@ -81,5 +81,5 @@
 <includes>
     <include location="global" impldecl="in implementation">kmymoney/kmymoneyaccounttree.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/views/kinvestmentview.cpp

@@ -217,7 +217,7 @@ bool KInvestmentView::slotSelectAccount(const TQString& id, const TQString& tran
         // if a stock account is selected, we show the
         // the corresponding tqparent (investment) account
         if(d->m_account.isInvest()) {
-          d->m_account = MyMoneyFile::instance()->account(d->m_account.tqparentAccountId());
+          d->m_account = MyMoneyFile::instance()->account(d->m_account.parentAccountId());
         }
         // TODO if we don't have an investment account, then we should switch to the ledger view
         d->m_newAccountLoaded = true;

kmymoney2/views/kinvestmentviewdecl.ui

@@ -82,5 +82,5 @@
 <includes>
     <include location="global" impldecl="in implementation">kmymoney/kmymoneyaccountcombo.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/views/kmymoneyview.cpp

@@ -155,7 +155,7 @@ KMyMoneyView::KMyMoneyView(TQWidget *tqparent, const char *name)
   connect(m_institutionsView, TQT_SIGNAL(openContextMenu(const MyMoneyObject&)), kmymoney2, TQT_SLOT(slotShowInstitutionContextMenu(const MyMoneyObject&)));
   connect(m_institutionsView, TQT_SIGNAL(openObject(const MyMoneyObject&)), kmymoney2, TQT_SLOT(slotInstitutionEdit(const MyMoneyObject&)));
   connect(m_institutionsView, TQT_SIGNAL(openObject(const MyMoneyObject&)), kmymoney2, TQT_SLOT(slotAccountOpen(const MyMoneyObject&)));
-  connect(m_institutionsView, TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyInstitution&)), kmymoney2, TQT_SLOT(slotRetqparentAccount(const MyMoneyAccount&, const MyMoneyInstitution&)));
+  connect(m_institutionsView, TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyInstitution&)), kmymoney2, TQT_SLOT(slotReparentAccount(const MyMoneyAccount&, const MyMoneyInstitution&)));
   connect(this, TQT_SIGNAL(reconciliationStarts(const MyMoneyAccount&, const TQDate&, const MyMoneyMoney&)), m_institutionsView, TQT_SLOT(slotReconcileAccount(const MyMoneyAccount&, const TQDate&, const MyMoneyMoney&)));
 
   // Page 2
@@ -168,7 +168,7 @@ KMyMoneyView::KMyMoneyView(TQWidget *tqparent, const char *name)
   connect(m_accountsView, TQT_SIGNAL(selectObject(const MyMoneyObject&)), kmymoney2, TQT_SLOT(slotSelectInvestment(const MyMoneyObject&)));
   connect(m_accountsView, TQT_SIGNAL(openContextMenu(const MyMoneyObject&)), kmymoney2, TQT_SLOT(slotShowAccountContextMenu(const MyMoneyObject&)));
   connect(m_accountsView, TQT_SIGNAL(openObject(const MyMoneyObject&)), kmymoney2, TQT_SLOT(slotAccountOpen(const MyMoneyObject&)));
-  connect(m_accountsView, TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyAccount&)), kmymoney2, TQT_SLOT(slotRetqparentAccount(const MyMoneyAccount&, const MyMoneyAccount&)));
+  connect(m_accountsView, TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyAccount&)), kmymoney2, TQT_SLOT(slotReparentAccount(const MyMoneyAccount&, const MyMoneyAccount&)));
   connect(this, TQT_SIGNAL(kmmFilePlugin(unsigned int)), m_accountsView, TQT_SLOT(slotUpdateIconPos(unsigned int)));
   connect(this, TQT_SIGNAL(reconciliationStarts(const MyMoneyAccount&, const TQDate&, const MyMoneyMoney&)), m_accountsView, TQT_SLOT(slotReconcileAccount(const MyMoneyAccount&, const TQDate&, const MyMoneyMoney&)));
 
@@ -193,7 +193,7 @@ KMyMoneyView::KMyMoneyView(TQWidget *tqparent, const char *name)
   connect(m_categoriesView, TQT_SIGNAL(selectObject(const MyMoneyObject&)), kmymoney2, TQT_SLOT(slotSelectInstitution(const MyMoneyObject&)));
   connect(m_categoriesView, TQT_SIGNAL(openContextMenu(const MyMoneyObject&)), kmymoney2, TQT_SLOT(slotShowAccountContextMenu(const MyMoneyObject&)));
   connect(m_categoriesView, TQT_SIGNAL(openObject(const MyMoneyObject&)), kmymoney2, TQT_SLOT(slotAccountOpen(const MyMoneyObject&)));
-  connect(m_categoriesView, TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyAccount&)), kmymoney2, TQT_SLOT(slotRetqparentAccount(const MyMoneyAccount&, const MyMoneyAccount&)));
+  connect(m_categoriesView, TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyAccount&)), kmymoney2, TQT_SLOT(slotReparentAccount(const MyMoneyAccount&, const MyMoneyAccount&)));
 
   // Page 5
   m_payeesViewFrame = addVBoxPage( i18n("Payees"), i18n("Payees"),
@@ -460,7 +460,7 @@ void KMyMoneyView::slotLedgerSelected(const TQString& _accId, const TQString& tr
     case MyMoneyAccount::Stock:
       // if a stock account is selected, we show the
       // the corresponding tqparent (investment) account
-      acc = MyMoneyFile::instance()->account(acc.tqparentAccountId());
+      acc = MyMoneyFile::instance()->account(acc.parentAccountId());
       accId = acc.id();
       // tricky fall through here
 
@@ -1788,7 +1788,7 @@ void KMyMoneyView::fixFile_0(void)
     // this account. Need to move it to asset() first, because otherwise
     // MyMoneyFile::reparent would act as NOP.
     if(equityListEmpty && (*it_a).accountType() == MyMoneyAccount::Equity) {
-      if((*it_a).tqparentAccountId() == equity.id()) {
+      if((*it_a).parentAccountId() == equity.id()) {
         MyMoneyAccount acc = *it_a;
         // tricky, force tqparent account to be empty so that we really
         // can re-tqparent it

kmymoney2/views/kpayeesviewdecl.ui

@@ -662,5 +662,5 @@ new transactions with this payee</string>
 <includes>
     <include location="local" impldecl="in declaration">../widgets/kmymoneyaccountcombo.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/views/kscheduledviewdecl.ui

@@ -157,5 +157,5 @@
         <data format="PNG" length="824">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000002ff49444154388db59531681c4714863f992dde820cb370815b50600f54e8ca0ba43970712a8fb838438a3895634813d238a5ab80e314ae4d0a812060a4226017c27221c8a9da6b8c4fe0e00d28b0571cec82043b85611f78c12966efa4bb8bc085f29a6567df7cef9f7fdeccaec571cc2cbaddee47ae21e2385e5b9b815f1ebcfcd8de6a63ad25cb338af7c52741acb5a4a729a3d723a82ec6bd99d267bf3f23fc1c4cab2442d14a915986e792fdfa59569766573049417784f1b12e8267954dab24b78714450a28beaf941f847c2a14e70a0841035a2d45d641eb027213c210c69756320767794684d6508bef0befde1a860796e4c402333542b4256c0f0cdd1e50b97191458be6e0e27d81563a87c643d8fb2d7793d685d696413cc8a6cae46f65f7d79c7c62b87b4f2e15fd0fb0d302be0fefde4a0d557a5f35e90f84e0334014d590f855c9de4ecee17e4eb319d1ff3a00ec02f8c67299f283307c61e7d06fbf1782d082588a33e1cf1705fd81cf773f3601e1f9bec59e2f4b5c7ef5209f0ac95f16630cfd818067c103b586dd274a726229cee0fe8380d191cb4d1267d3d58aa1de7d258ceae5d7d0a78fdd269a86f0c52d414c49bbe3762c9b686de41560d7a72e41c4795a6486a78f95e4c4151481d686efbe7b3398ac58b1a23868b8c474aaa8068c8e714a8dd06c1af2a9e5d1c38c641c909dba6e08237f19b358a7ac5cf3479bc2e41f257e55d2ffc6a73833746f09e186cfa387904f2cbffc90a2aa9886d0e99464d3c5965b512cebd01f1800f67672e2a392fb0f023a3d883a053ffddcc2340dd65ab452b6074dc2cd15c1cbceb863daed413e353cdfcfd97d92333a12da6d0181ec3443cf753ef3cdd092de0e116ff1a02cdc157338ca9d7b8269461cfee1ba2139b9286e1a427f10110f2d561555b076d18a39383d4d99a4c0cd0b787f20747b214962c8266e3cdcf0e97c59126ec2f6edd089f40a92f115e0d1eb11ba238461dd6a15f32b53666de841965bb203575a3cc15a48c64a965fe57105e3635db8fa96dcffc431172b5d715d7103dc3fea7f015f373c8ee3b57f0135105a0fae7717960000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/widgets/kaccounttemplateselectordecl.ui

@@ -184,5 +184,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/widgets/kbudgetvaluesdecl.ui

@@ -396,5 +396,5 @@
 <includes>
     <include location="global" impldecl="in implementation">kmymoney/kmymoneyedit.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/widgets/klistviewsearchline.cpp

@@ -365,7 +365,7 @@ void KListViewSearchLine::checkItemParentsNotVisible()
  *
  *  \p item  The list view item to start showing / hiding items at. Typically, this is the first child of another item, or the
  *              the first child of the list view.
- *  \p highestHiddenParent  The highest (closest to root) ancestor of \p item which is hidden. If 0, all tqparents of
+ *  \p highestHiddenParent  The highest (closest to root) ancestor of \p item which is hidden. If 0, all parents of
  *                           \p item must be visible.
  *  \return \c true if an item which should be visible is found, \c false if all items found should be hidden. If this function
  *             returns true and \p highestHiddenParent was not 0, highestHiddenParent will have been shown.

kmymoney2/widgets/klistviewsearchline.h

@@ -81,7 +81,7 @@ public:
     TQValueList<int> searchColumns() const;
 
     /**
-     * If this is true (the default) then the tqparents of matched items will also
+     * If this is true (the default) then the parents of matched items will also
      * be shown.
      *
      * @see setKeepParentsVisible()
@@ -114,7 +114,7 @@ public slots:
      * a tqparent or ancesestor of an item is does not match the search then it
      * will be hidden and as such so too will any tqchildren that match.
      *
-     * If this is set to true (the default) then the tqparents of matching items
+     * If this is set to true (the default) then the parents of matching items
      * will be shown.
      *
      * @see keepParentsVisible

kmymoney2/widgets/kmymoneyaccounttreebase.cpp

@@ -188,7 +188,7 @@ bool KMyMoneyAccountTreeBase::dropAccountOnAccount(const MyMoneyAccount& accFrom
   // it does not make sense to reparent an account to oneself
   // or to reparent it to it's current tqparent
   if(accTo.id() != accFrom.id()
-  && accFrom.tqparentAccountId() != accTo.id()) {
+  && accFrom.parentAccountId() != accTo.id()) {
     // Moving within a group is generally ok
     rc = accTo.accountGroup() == accFrom.accountGroup();
 

kmymoney2/widgets/kmymoneyaccounttreebase.h

@@ -411,7 +411,7 @@ public:
     * by @p item.
     *
     * @param item pointer to other KMyMoneyAccountTreeItem that
-    *        should be checked for tqparent/grand-tqparenthood of this
+    *        should be checked for tqparent/grand-parenthood of this
     *        object
     * @retval true @p this object is a decendant of @p item
     * @retval false @p this object is no decendant of @p item

kmymoney2/widgets/kmymoneycategory.cpp

@@ -84,7 +84,7 @@ KMyMoneyCategory::KMyMoneyCategory(TQWidget* tqparent, const char * name, bool s
 KMyMoneyCategory::~KMyMoneyCategory()
 {
   // make sure to wipe out the frame, button and tqlayout
-  if(d->frame && !d->frame->tqparentWidget())
+  if(d->frame && !d->frame->parentWidget())
     d->frame->deleteLater();
 
   delete d;

kmymoney2/widgets/kmymoneycategory.h

@@ -69,10 +69,10 @@ public:
     * TQFrame. It also adds a KPushButton with the "Split" icon to the right of the
     * input field. In this case it is important not to use the pointer to this widget
     * but it's tqparent when placing the object in a TQLayout, TQTable or some such. The
-    * tqparent widget (the TQFrame in this case) can be extracted with the tqparentWidget()
+    * tqparent widget (the TQFrame in this case) can be extracted with the parentWidget()
     * method.
     *
-    * Retqparenting is handled by the object transparently for both cases.
+    * Reparenting is handled by the object transparently for both cases.
     *
     * Standard usage example (no split button):
     *
@@ -88,8 +88,8 @@ public:
     * @code
     * KMyMoneyCategory* category = new KMyMoneyCategory(0, 0, true);
     * category->reparent(newParent);
-    * tqlayout->addWidget(category->tqparentWidget());
+    * tqlayout->addWidget(category->parentWidget());
-    * table->setCellWidget(category->tqparentWidget());
+    * table->setCellWidget(category->parentWidget());
     * @endcode
     */
   KMyMoneyCategory(TQWidget* tqparent = 0, const char* name = 0, bool splitButton = false);

kmymoney2/widgets/kmymoneycombo.cpp

@@ -310,7 +310,7 @@ TQSize KMyMoneyCombo::tqsizeHint() const
   return KComboBox::tqsizeHint();
 
   // I wanted to use the code below to adjust the size of the combo box
-  // according to the largest item in the selector list. Aptqparently that
+  // according to the largest item in the selector list. Apparently that
   // does not work too well in the enter and edit schedule dialog for
   // the category combo box. So we just use the standard implementation for now.
 #if 0

kmymoney2/widgets/kmymoneydateinput.cpp

@@ -56,7 +56,7 @@ bool KMyMoneyDateEdit::event(TQEvent* e)
   // across the TQDateEdit::event(FocusOutEvent)
   bool rc;
 
-  kMyMoneyDateInput* p = dynamic_cast<kMyMoneyDateInput*>(tqparentWidget());
+  kMyMoneyDateInput* p = dynamic_cast<kMyMoneyDateInput*>(parentWidget());
   if(e->type() == TQEvent::FocusOut && p) {
     TQDate d = p->date();
     rc = TQDateEdit::event(e);

kmymoney2/widgets/kmymoneygpgconfigdecl.ui

@@ -193,5 +193,5 @@ This mechanism is provided for the case that you have lost your key and cannot a
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/widgets/kmymoneyonlinequoteconfigdecl.ui

@@ -227,5 +227,5 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/widgets/kmymoneyreportconfigtab1decl.ui

@@ -119,5 +119,5 @@
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/widgets/kmymoneyreportconfigtab2decl.ui

@@ -278,5 +278,5 @@
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/widgets/kmymoneyreportconfigtab3decl.ui

@@ -433,5 +433,5 @@
         <slot>setDisabled(bool)</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/widgets/kmymoneyreportconfigtabchartdecl.ui

@@ -210,5 +210,5 @@
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/widgets/kmymoneyreportcontroldecl.ui

@@ -146,5 +146,5 @@
             </widget>
         </hbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/widgets/kmymoneywizard.h

@@ -507,7 +507,7 @@ private:
   void selectStep(unsigned int step);
 
   /*
-   * The tqlayouts
+   * The layouts
    */
   TQVBoxLayout*          m_wizardLayout;
   TQVBoxLayout*          m_stepLayout;

kmymoney2/widgets/kschedulebriefwidget.ui

@@ -347,5 +347,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/widgets/register.cpp

@@ -1952,7 +1952,7 @@ void Register::removeEditWidgets(TQMap<TQString, TQWidget*>& editWidgets)
   // remove pointers from map
   TQMap<TQString, TQWidget*>::iterator it;
   for(it = editWidgets.begin(); it != editWidgets.end(); ) {
-    if((*it)->tqparentWidget() == this) {
+    if((*it)->parentWidget() == this) {
       editWidgets.remove(it);
       it = editWidgets.begin();
     } else

kmymoney2/widgets/registersearchline.cpp

@@ -72,8 +72,8 @@ void RegisterSearchLine::init(Register *reg)
   d->reg = reg;
   connect(this, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(queueSearch(const TQString&)));
 
-  TQLabel* label = new TQLabel(i18n("label for status combo", "Stat&us"), tqparentWidget());
+  TQLabel* label = new TQLabel(i18n("label for status combo", "Stat&us"), parentWidget());
-  d->combo = new TQComboBox(tqparentWidget());
+  d->combo = new TQComboBox(parentWidget());
   // don't change the order of the following lines unless updating
   // the case labels in RegisterSearchLine::itemMatches() at the same time
   d->combo->insertItem(SmallIcon("run"), i18n("Any status"));

kmymoney2/widgets/transaction.cpp

@@ -1212,7 +1212,7 @@ void StdTransaction::arrangeWidgetsInForm(TQMap<TQString, TQWidget*>& editWidget
   arrangeWidget(m_form, 0, ValueColumn1, editWidgets["account"]);
   arrangeWidget(m_form, 1, LabelColumn1, editWidgets["cashflow"]);
   arrangeWidget(m_form, 1, ValueColumn1, editWidgets["payee"]);
-  arrangeWidget(m_form, 2, ValueColumn1, editWidgets["category"]->tqparentWidget());
+  arrangeWidget(m_form, 2, ValueColumn1, editWidgets["category"]->parentWidget());
   arrangeWidget(m_form, 3, ValueColumn1, editWidgets["memo"]);
   if(haveNumberField()) {
     arrangeWidget(m_form, 1, LabelColumn2, editWidgets["number-label"]);
@@ -1298,7 +1298,7 @@ void StdTransaction::arrangeWidgetsInRegister(TQMap<TQString, TQWidget*>& editWi
   arrangeWidget(m_parent, m_startRow + 0, DateColumn, editWidgets["postdate"]);
   arrangeWidget(m_parent, m_startRow + 1, DateColumn, editWidgets["status"]);
   arrangeWidget(m_parent, m_startRow + 0, DetailColumn, editWidgets["payee"]);
-  arrangeWidget(m_parent, m_startRow + 1, DetailColumn, editWidgets["category"]->tqparentWidget());
+  arrangeWidget(m_parent, m_startRow + 1, DetailColumn, editWidgets["category"]->parentWidget());
   arrangeWidget(m_parent, m_startRow + 2, DetailColumn, editWidgets["memo"]);
   arrangeWidget(m_parent, m_startRow + 0, PaymentColumn, editWidgets["payment"]);
   arrangeWidget(m_parent, m_startRow + 0, DepositColumn, editWidgets["deposit"]);
@@ -1890,9 +1890,9 @@ void InvestTransaction::arrangeWidgetsInForm(TQMap<TQString, TQWidget*>& editWid
   arrangeWidget(m_form, 1, ValueColumn2, editWidgets["shares"]);
   arrangeWidget(m_form, 2, ValueColumn1, editWidgets["asset-account"]);
   arrangeWidget(m_form, 2, ValueColumn2, editWidgets["price"]);
-  arrangeWidget(m_form, 3, ValueColumn1, editWidgets["fee-account"]->tqparentWidget());
+  arrangeWidget(m_form, 3, ValueColumn1, editWidgets["fee-account"]->parentWidget());
   arrangeWidget(m_form, 3, ValueColumn2, editWidgets["fee-amount"]);
-  arrangeWidget(m_form, 4, ValueColumn1, editWidgets["interest-account"]->tqparentWidget());
+  arrangeWidget(m_form, 4, ValueColumn1, editWidgets["interest-account"]->parentWidget());
   arrangeWidget(m_form, 4, ValueColumn2, editWidgets["interest-amount"]);
   arrangeWidget(m_form, 5, ValueColumn1, editWidgets["memo"]);
   arrangeWidget(m_form, 5, ValueColumn2, editWidgets["total"]);
@@ -1990,8 +1990,8 @@ void InvestTransaction::arrangeWidgetsInRegister(TQMap<TQString, TQWidget*>& edi
   arrangeWidget(m_parent, m_startRow + 0, SecurityColumn, editWidgets["security"]);
   arrangeWidget(m_parent, m_startRow + 0, DetailColumn, editWidgets["activity"]);
   arrangeWidget(m_parent, m_startRow + 1, DetailColumn, editWidgets["asset-account"]);
-  arrangeWidget(m_parent, m_startRow + 2, DetailColumn, editWidgets["interest-account"]->tqparentWidget());
+  arrangeWidget(m_parent, m_startRow + 2, DetailColumn, editWidgets["interest-account"]->parentWidget());
-  arrangeWidget(m_parent, m_startRow + 3, DetailColumn, editWidgets["fee-account"]->tqparentWidget());
+  arrangeWidget(m_parent, m_startRow + 3, DetailColumn, editWidgets["fee-account"]->parentWidget());
   arrangeWidget(m_parent, m_startRow + 4, DetailColumn, editWidgets["memo"]);
   arrangeWidget(m_parent, m_startRow + 0, QuantityColumn, editWidgets["shares"]);
   arrangeWidget(m_parent, m_startRow + 0, PriceColumn, editWidgets["price"]);

kmymoney2/widgets/transactionform.cpp

@@ -441,7 +441,7 @@ void TransactionForm::removeEditWidgets(TQMap<TQString, TQWidget*>& editWidgets)
 {
   TQMap<TQString, TQWidget*>::iterator it;
   for(it = editWidgets.begin(); it != editWidgets.end(); ) {
-    if((*it)->tqparentWidget() == this) {
+    if((*it)->parentWidget() == this) {
       editWidgets.remove(it);
       it = editWidgets.begin();
     } else

kmymoney2/widgets/transactionsortoption.ui

@@ -283,5 +283,5 @@
     <function access="protected" specifier="non virtual" returnType="TQListViewItem *">addEntry( KListView * p, TQListViewItem * after, int idx )</function>
     <function specifier="non virtual" returnType="TQString">settings( void ) const</function>
 </functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/wizards/newaccountwizard/kaccountsummarypagedecl.ui

@@ -76,5 +76,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/wizards/newaccountwizard/kaccounttypepagedecl.ui

@@ -289,5 +289,5 @@ Use the liability account type to manage any type of liability except amortizati
     <include location="global" impldecl="in implementation">kmymoney/kmymoneydateinput.h</include>
     <include location="global" impldecl="in implementation">kmymoney/kmymoneyedit.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/wizards/newaccountwizard/kbrokeragepagedecl.ui

@@ -171,5 +171,5 @@
 <includes>
     <include location="global" impldecl="in implementation">kmymoney/kmymoneycurrencyselector.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/wizards/newaccountwizard/kgeneralloaninfopagedecl.ui

@@ -359,5 +359,5 @@ Enter the due date of the first payment in the current year</string>
     <include location="global" impldecl="in implementation">kmymoney/kmymoneyedit.h</include>
     <include location="global" impldecl="in implementation">kmymoney/kmymoneycategory.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/wizards/newaccountwizard/khierarchypagedecl.ui

@@ -78,5 +78,5 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/wizards/newaccountwizard/kinstitutionpagedecl.ui

@@ -152,5 +152,5 @@ KMyMoney keeps this field only for documentation purposes and does not use it ot
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/wizards/newaccountwizard/kloandetailspagedecl.ui

@@ -289,5 +289,5 @@
     <include location="global" impldecl="in implementation">kmymoney/kmymoneyedit.h</include>
     <include location="global" impldecl="in implementation">kmymoney/kmymoneycategory.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/wizards/newaccountwizard/kloanpaymentpagedecl.ui

@@ -185,5 +185,5 @@
     <include location="global" impldecl="in implementation">kmymoney/kmymoneyedit.h</include>
     <include location="global" impldecl="in implementation">kmymoney/kmymoneycategory.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/wizards/newaccountwizard/kloanpayoutpagedecl.ui

@@ -199,5 +199,5 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a
     <include location="global" impldecl="in implementation">kmymoney/kmymoneyedit.h</include>
     <include location="global" impldecl="in implementation">kmymoney/kmymoneycategory.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/wizards/newaccountwizard/kloanschedulepagedecl.ui

@@ -161,5 +161,5 @@ If you selected to record all payments this date has already been supplied. If y
     <include location="global" impldecl="in implementation">kmymoney/kmymoneyedit.h</include>
     <include location="global" impldecl="in implementation">kmymoney/kmymoneycategory.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp

@@ -202,13 +202,13 @@ MyMoneyTransaction NewAccountWizard::Wizard::payoutTransaction(void)
   return t;
 }
 
-const MyMoneyAccount& NewAccountWizard::Wizard::tqparentAccount(void)
+const MyMoneyAccount& NewAccountWizard::Wizard::parentAccount(void)
 {
   return m_accountTypePage->allowsParentAccount()
-         ? m_hierarchyPage->tqparentAccount()
+         ? m_hierarchyPage->parentAccount()
          : ( m_accountTypePage->accountType() == MyMoneyAccount::Loan
-           ? m_generalLoanInfoPage->tqparentAccount()
+           ? m_generalLoanInfoPage->parentAccount()
-           : m_accountTypePage->tqparentAccount() );
+           : m_accountTypePage->parentAccount() );
 }
 
 MyMoneyAccount NewAccountWizard::Wizard::brokerageAccount(void) const
@@ -604,7 +604,7 @@ void AccountTypePage::setAccount(const MyMoneyAccount& acc)
   m_accountName->setText(acc.name());
 }
 
-const MyMoneyAccount& AccountTypePage::tqparentAccount(void)
+const MyMoneyAccount& AccountTypePage::parentAccount(void)
 {
   switch(accountType()) {
     case MyMoneyAccount::CreditCard:
@@ -828,7 +828,7 @@ bool GeneralLoanInfoPage::isComplete(void) const
   return rc;
 }
 
-const MyMoneyAccount& GeneralLoanInfoPage::tqparentAccount(void)
+const MyMoneyAccount& GeneralLoanInfoPage::parentAccount(void)
 {
   return ( m_loanDirection->currentItem() == 0 )
          ? MyMoneyFile::instance()->liability()
@@ -1483,7 +1483,7 @@ void HierarchyPage::enterPage(void)
   // - if the type has changed
   // - - clear the list
   // - - populate the account list (also occurs first time we come here)
-  MyMoneyAccount topAccount = m_wizard->m_accountTypePage->tqparentAccount();
+  MyMoneyAccount topAccount = m_wizard->m_accountTypePage->parentAccount();
 
   // If the list was not populated with this top account we populate it now
   if ( &m_topAccount == NULL || m_topAccount.id() != topAccount.id())
@@ -1558,7 +1558,7 @@ KMyMoneyWizardPage* HierarchyPage::nextPage(void) const
   return m_wizard->m_accountSummaryPage;
 }
 
-const MyMoneyAccount& HierarchyPage::tqparentAccount(void)
+const MyMoneyAccount& HierarchyPage::parentAccount(void)
 {
   // TODO
   // Instead of returning the Parent Account we can simply
@@ -1599,7 +1599,7 @@ void AccountSummaryPage::enterPage(void)
   p = new KListViewItem(group, i18n("Name"), acc.name());
   if(!acc.isLoan())
     p = new KListViewItem(group, p, i18n("Subaccount of"),
-                          m_wizard->tqparentAccount().name());
+                          m_wizard->parentAccount().name());
   if(acc.accountType() == MyMoneyAccount::AssetLoan)
     p = new KListViewItem(group, p, i18n("Type"), i18n("Loan"));
   else

kmymoney2/wizards/newaccountwizard/knewaccountwizard.h

@@ -88,7 +88,7 @@ public:
     * @note For now it's either fixed as Asset or Liability. We will provide
     * user selected tqparent accounts later.
     */
-  const MyMoneyAccount& tqparentAccount(void);
+  const MyMoneyAccount& parentAccount(void);
 
   /**
    * Returns information about the schedule. If the returned value

kmymoney2/wizards/newaccountwizard/knewaccountwizard_p.h

@@ -101,7 +101,7 @@ public:
   TQWidget* initialFocusWidget(void) const { return m_accountName; }
 
   MyMoneyAccount::accountTypeE accountType(void) const;
-  const MyMoneyAccount& tqparentAccount(void);
+  const MyMoneyAccount& parentAccount(void);
   bool allowsParentAccount(void) const;
   const MyMoneySecurity& currency(void) const;
 
@@ -163,7 +163,7 @@ public:
   KMyMoneyWizardPage* nextPage(void) const;
   virtual bool isComplete(void) const;
   void enterPage(void);
-  const MyMoneyAccount& tqparentAccount(void);
+  const MyMoneyAccount& parentAccount(void);
 
   TQWidget* initialFocusWidget(void) const { return m_loanDirection; }
 
@@ -308,7 +308,7 @@ public:
   void enterPage(void);
   KMyMoneyWizardPage* nextPage(void) const;
   TQWidget* initialFocusWidget(void) const { return m_qlistviewParentAccounts; }
-  const MyMoneyAccount& tqparentAccount(void);
+  const MyMoneyAccount& parentAccount(void);
 
 private:
   KMyMoneyAccountTreeItem* buildAccountTree

kmymoney2/wizards/newaccountwizard/kschedulepagedecl.ui

@@ -188,5 +188,5 @@ from account</string>
     <include location="global" impldecl="in implementation">kmymoney/kmymoneyedit.h</include>
     <include location="global" impldecl="in implementation">kmymoney/kmymoneycategory.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/wizards/newuserwizard/kaccountpagedecl.ui

@@ -268,5 +268,5 @@
     <include location="global" impldecl="in implementation">kmymoney/kmymoneydateinput.h</include>
     <include location="global" impldecl="in implementation">kmymoney/kmymoneyedit.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/wizards/newuserwizard/kcurrencypagedecl.ui

@@ -78,5 +78,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/wizards/newuserwizard/kfilepagedecl.ui

@@ -82,5 +82,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/wizards/newuserwizard/kgeneralpagedecl.ui

@@ -254,5 +254,5 @@ This information will be seen and used only by you. The information is used to p
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/wizards/newuserwizard/kintropagedecl.ui

@@ -62,5 +62,5 @@ On the next few pages you will be guided through the steps necessary to setup th
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/wizards/newuserwizard/kpasswordpagedecl.ui

@@ -29,5 +29,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/wizards/newuserwizard/kpreferencepagedecl.ui

@@ -92,5 +92,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/wizards/wizardpages/accountsdecl.ui

@@ -53,5 +53,5 @@
 <includes>
     <include location="global" impldecl="in implementation">kmymoney/kaccounttemplateselector.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/wizards/wizardpages/currencydecl.ui

@@ -92,5 +92,5 @@
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

kmymoney2/wizards/wizardpages/userinfodecl.ui

@@ -221,5 +221,5 @@
     <tabstop>m_loadAddressButton</tabstop>
     <tabstop>kActiveLabel1</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>

libkdchart/KDChartCustomBox.h

@@ -216,7 +216,7 @@ public:
                       uint data3rd = 0,
                       uint deltaAlign = KDCHART_AlignAuto,
                       bool deltaScaleGlobal = true,
-                      int tqparentAxis = -1 )
+                      int parentAxis = -1 )
         : _rotation( 0 ),
           _fontSize( fontSize ),
           _fontScaleGlobal( fontScaleGlobal ),
@@ -235,7 +235,7 @@ public:
           _deltaAlign( deltaAlign ),
           _deltaScaleGlobal( deltaScaleGlobal ),
           _anchorBeingCalculated( false ),
-          _parentAxisArea(  tqparentAxis )
+          _parentAxisArea(  parentAxis )
     {
         _content.deepCopy( &content );
     }
@@ -338,7 +338,7 @@ public:
                       uint data3rd = 0,
                       uint deltaAlign = KDCHART_AlignAuto,
                       bool deltaScaleGlobal = true,
-                      int tqparentAxis = -1 )
+                      int parentAxis = -1 )
         : _rotation( rotation ),
           _fontSize( fontSize ),
           _fontScaleGlobal( fontScaleGlobal ),
@@ -357,7 +357,7 @@ public:
           _deltaAlign( deltaAlign ),
           _deltaScaleGlobal( deltaScaleGlobal ),
           _anchorBeingCalculated( false ),
-          _parentAxisArea(  tqparentAxis )
+          _parentAxisArea(  parentAxis )
     {
         _content.deepCopy( &content );
     }
@@ -974,13 +974,13 @@ protected:
         return _anchorBeingCalculated;
     }
 
-    void setParentAxisArea( int tqparentAxis ) const
+    void setParentAxisArea( int parentAxis ) const
     {
         KDChartCustomBox* that = const_cast<KDChartCustomBox*>(this);
-        that->_parentAxisArea = tqparentAxis;
+        that->_parentAxisArea = parentAxis;
     }
 
-    int tqparentAxisArea() const
+    int parentAxisArea() const
     {
         return _parentAxisArea;
     }

libkdchart/KDChartEnums.h

@@ -77,7 +77,7 @@ public:
       \param type the text tqlayout policy to convert
       \return the string representation of the text tqlayout policy enum
       */
-    static TQString tqlayoutPolicyToString( TextLayoutPolicy type ) {
+    static TQString layoutPolicyToString( TextLayoutPolicy type ) {
         switch( type ) {
             case LayoutJustOverwrite:
                 return "JustOverwrite";

libkdchart/KDChartPainter.cpp

@@ -1140,13 +1140,13 @@ TQRect KDChartPainter::calculateAreaRect( bool & allCustomBoxes,
                                                              break;
 
         default: {
-                     uint tqmaskBASE = KDChartEnums::AreaBASEMask & area;
+                     uint maskBASE = KDChartEnums::AreaBASEMask & area;
-                     pos = area - tqmaskBASE;
+                     pos = area - maskBASE;
-                     if ( KDChartEnums::AreaAxisBASE == tqmaskBASE ) {
+                     if ( KDChartEnums::AreaAxisBASE == maskBASE ) {
                          rect = params()->axisParams( pos ).axisTrueAreaRect();
-                     } else if ( KDChartEnums::AreaHdFtBASE == tqmaskBASE ) {
+                     } else if ( KDChartEnums::AreaHdFtBASE == maskBASE ) {
                          rect = params()->headerFooterRect( pos );
-                     } else if ( KDChartEnums::AreaCustomBoxesBASE == tqmaskBASE ) {
+                     } else if ( KDChartEnums::AreaCustomBoxesBASE == maskBASE ) {
                          const KDChartCustomBox * box = params()->customBox( pos );
                          if( box ) {
                              rect = box->trueRect( calculateAnchor( *box, regions ),
@@ -2011,10 +2011,10 @@ void KDChartPainter::calculateAllAxesRects(
              for( idx = 0; idx <= params()->maxCustomBoxIdx(); ++idx ) {
                  const KDChartCustomBox * box = params()->customBox( idx );
                  if (  box )
-                     if ( box->tqparentAxisArea() == KDChartAxisParams::AxisPosBottom
+                     if ( box->parentAxisArea() == KDChartAxisParams::AxisPosBottom
-                          || box->tqparentAxisArea() == KDChartAxisParams::AxisPosLeft
+                          || box->parentAxisArea() == KDChartAxisParams::AxisPosLeft
-                          || box->tqparentAxisArea() == KDChartAxisParams::AxisPosTop
+                          || box->parentAxisArea() == KDChartAxisParams::AxisPosTop
-                          || box->tqparentAxisArea() == KDChartAxisParams::AxisPosRight )
+                          || box->parentAxisArea() == KDChartAxisParams::AxisPosRight )
                       boxSize = box->trueRect(TQPoint( 0,0 ), _areaWidthP1000, _areaHeightP1000 ).height();
              }
 

libkdchart/KDChartParams.cpp

@@ -1041,7 +1041,7 @@ calculation of appropriate rotation for each data value.  Rotation
 will be performed around the internal <b>tqalignment point</b> of the
 text -- specified by \c negativeAlign (or \c positiveAlign, resp.).
 
-\param tqlayoutPolicy The way to handle too narrow space conflicts:
+\param layoutPolicy The way to handle too narrow space conflicts:
 what to do if a data text covers a neighboring data text (or a
         neighboring data area, resp.).
 

libkdchart/KDChartParams_io.cpp

@@ -923,7 +923,7 @@ TQDomDocument KDChartParams::saveXML( bool withPI ) const
 
         KDXML::createStringNode( doc, dataValuesSettings1Element,
                 "LayoutPolicy",
-                KDChartEnums::tqlayoutPolicyToString( _printDataValuesSettings._dataValuesLayoutPolicy ) );
+                KDChartEnums::layoutPolicyToString( _printDataValuesSettings._dataValuesLayoutPolicy ) );
 
         KDXML::createBoolNode( doc, dataValuesSettings1Element, "ShowInfinite",
                                _printDataValuesSettings._dataValuesShowInfinite );
@@ -983,7 +983,7 @@ TQDomDocument KDChartParams::saveXML( bool withPI ) const
 
         KDXML::createStringNode( doc, dataValuesSettings2Element,
                 "LayoutPolicy",
-                KDChartEnums::tqlayoutPolicyToString( _printDataValuesSettings2._dataValuesLayoutPolicy ) );
+                KDChartEnums::layoutPolicyToString( _printDataValuesSettings2._dataValuesLayoutPolicy ) );
 
         KDXML::createBoolNode( doc, dataValuesSettings2Element, "ShowInfinite",
                                _printDataValuesSettings2._dataValuesShowInfinite );