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

59 files changed, 111 insertions, 111 deletions

diff --git a/kmymoney2/dialogs/investactivities.cpp b/kmymoney2/dialogs/investactivities.cpp
index be0f6d1..b03548a 100644
--- a/kmymoney2/dialogs/investactivities.cpp
+++ b/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()));
diff --git a/kmymoney2/dialogs/investtransactioneditor.cpp b/kmymoney2/dialogs/investtransactioneditor.cpp
index d235ae5..e19a756 100644
--- a/kmymoney2/dialogs/investtransactioneditor.cpp
+++ b/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("fee-account")->tqparentWidget()->hide();
+  haveWidget("interest-account")->parentWidget()->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());
   }
diff --git a/kmymoney2/dialogs/kaccountselectdlgdecl.ui b/kmymoney2/dialogs/kaccountselectdlgdecl.ui
index 09b8afb..705998a 100644
--- a/kmymoney2/dialogs/kaccountselectdlgdecl.ui
+++ b/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>
diff --git a/kmymoney2/dialogs/kbackupdlgdecl.ui b/kmymoney2/dialogs/kbackupdlgdecl.ui
index ae7cce6..e0e3a7a 100644
--- a/kmymoney2/dialogs/kbackupdlgdecl.ui
+++ b/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>
diff --git a/kmymoney2/dialogs/kcategoryreassigndlgdecl.ui b/kmymoney2/dialogs/kcategoryreassigndlgdecl.ui
index be2e661..ee9faa4 100644
--- a/kmymoney2/dialogs/kcategoryreassigndlgdecl.ui
+++ b/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>
diff --git a/kmymoney2/dialogs/kconfirmmanualenterdlgdecl.ui b/kmymoney2/dialogs/kconfirmmanualenterdlgdecl.ui
index f358370..5a4b87b 100644
--- a/kmymoney2/dialogs/kconfirmmanualenterdlgdecl.ui
+++ b/kmymoney2/dialogs/kconfirmmanualenterdlgdecl.ui
@@ -156,5 +156,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmymoney2/dialogs/kcurrencycalculator.cpp b/kmymoney2/dialogs/kcurrencycalculator.cpp
index 0457a98..c27e337 100644
--- a/kmymoney2/dialogs/kcurrencycalculator.cpp
+++ b/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;
diff --git a/kmymoney2/dialogs/kcurrencycalculator.h b/kmymoney2/dialogs/kcurrencycalculator.h
index a301129..41cfed0 100644
--- a/kmymoney2/dialogs/kcurrencycalculator.h
+++ b/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);
diff --git a/kmymoney2/dialogs/kcurrencycalculatordecl.ui b/kmymoney2/dialogs/kcurrencycalculatordecl.ui
index 16a8c3f..2d17eb0 100644
--- a/kmymoney2/dialogs/kcurrencycalculatordecl.ui
+++ b/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>
diff --git a/kmymoney2/dialogs/kcurrencyeditdlgdecl.ui b/kmymoney2/dialogs/kcurrencyeditdlgdecl.ui
index 6c4a50c..cd803cb 100644
--- a/kmymoney2/dialogs/kcurrencyeditdlgdecl.ui
+++ b/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>
diff --git a/kmymoney2/dialogs/keditequityentrydecl.ui b/kmymoney2/dialogs/keditequityentrydecl.ui
index baa92c9..ce06abb 100644
--- a/kmymoney2/dialogs/keditequityentrydecl.ui
+++ b/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>
diff --git a/kmymoney2/dialogs/keditscheduledlg.cpp b/kmymoney2/dialogs/keditscheduledlg.cpp
index 559fddd..ecb9184 100644
--- a/kmymoney2/dialogs/keditscheduledlg.cpp
+++ b/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();
diff --git a/kmymoney2/dialogs/keditscheduledlgdecl.ui b/kmymoney2/dialogs/keditscheduledlgdecl.ui
index 494fa46..d3ec65c 100644
--- a/kmymoney2/dialogs/keditscheduledlgdecl.ui
+++ b/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>
diff --git a/kmymoney2/dialogs/kendingbalancedlgdecl.ui b/kmymoney2/dialogs/kendingbalancedlgdecl.ui
index ed4d921..2f67c50 100644
--- a/kmymoney2/dialogs/kendingbalancedlgdecl.ui
+++ b/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>
diff --git a/kmymoney2/dialogs/kenterscheduledlg.cpp b/kmymoney2/dialogs/kenterscheduledlg.cpp
index 47f881f..df6f893 100644
--- a/kmymoney2/dialogs/kenterscheduledlg.cpp
+++ b/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();
diff --git a/kmymoney2/dialogs/kenterscheduledlgdecl.ui b/kmymoney2/dialogs/kenterscheduledlgdecl.ui
index f81cdf8..f36e6b6 100644
--- a/kmymoney2/dialogs/kenterscheduledlgdecl.ui
+++ b/kmymoney2/dialogs/kenterscheduledlgdecl.ui
@@ -326,5 +326,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmymoney2/dialogs/kequitypriceupdatedlgdecl.ui b/kmymoney2/dialogs/kequitypriceupdatedlgdecl.ui
index 91a1fc6..e1fb0de 100644
--- a/kmymoney2/dialogs/kequitypriceupdatedlgdecl.ui
+++ b/kmymoney2/dialogs/kequitypriceupdatedlgdecl.ui
@@ -175,5 +175,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmymoney2/dialogs/kexportdlgdecl.ui b/kmymoney2/dialogs/kexportdlgdecl.ui
index 922355d..ab3ff63 100644
--- a/kmymoney2/dialogs/kexportdlgdecl.ui
+++ b/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>
diff --git a/kmymoney2/dialogs/kfindtransactiondlgdecl.ui b/kmymoney2/dialogs/kfindtransactiondlgdecl.ui
index 8887776..e2a8ee1 100644
--- a/kmymoney2/dialogs/kfindtransactiondlgdecl.ui
+++ b/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>
diff --git a/kmymoney2/dialogs/kgncimportoptionsdlgdecl.ui b/kmymoney2/dialogs/kgncimportoptionsdlgdecl.ui
index 852a19e..39e3711 100644
--- a/kmymoney2/dialogs/kgncimportoptionsdlgdecl.ui
+++ b/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>
diff --git a/kmymoney2/dialogs/kgncpricesourcedlgdecl.ui b/kmymoney2/dialogs/kgncpricesourcedlgdecl.ui
index b335268..6eb3e84 100644
--- a/kmymoney2/dialogs/kgncpricesourcedlgdecl.ui
+++ b/kmymoney2/dialogs/kgncpricesourcedlgdecl.ui
@@ -244,5 +244,5 @@
         <slot>close()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmymoney2/dialogs/kimportdlgdecl.ui b/kmymoney2/dialogs/kimportdlgdecl.ui
index 0ebd81b..ed879b2 100644
--- a/kmymoney2/dialogs/kimportdlgdecl.ui
+++ b/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>
diff --git a/kmymoney2/dialogs/kloadtemplatedlgdecl.ui b/kmymoney2/dialogs/kloadtemplatedlgdecl.ui
index 4e9b4e9..c857cc8 100644
--- a/kmymoney2/dialogs/kloadtemplatedlgdecl.ui
+++ b/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>
diff --git a/kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui b/kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui
index 58528ed..6fd5756 100644
--- a/kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui
+++ b/kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui
@@ -354,5 +354,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmymoney2/dialogs/kmymoneypricedlgdecl.ui b/kmymoney2/dialogs/kmymoneypricedlgdecl.ui
index 424c25d..e8a4117 100644
--- a/kmymoney2/dialogs/kmymoneypricedlgdecl.ui
+++ b/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>
diff --git a/kmymoney2/dialogs/knewaccountdlg.cpp b/kmymoney2/dialogs/knewaccountdlg.cpp
index d8b0cc7..529fbf8 100644
--- a/kmymoney2/dialogs/knewaccountdlg.cpp
+++ b/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();
-      tqparentId = m_parentAccount.id();
+      parentAccount();
+      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,
-                                     const TQString& tqparentId, const TQString& accountId)
+void KNewAccountDlg::showSubAccounts(TQStringList accounts, KMyMoneyAccountTreeBaseItem *parentItem,
+                                     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) {
diff --git a/kmymoney2/dialogs/knewaccountdlg.h b/kmymoney2/dialogs/knewaccountdlg.h
index 5b6e481..a4ae636 100644
--- a/kmymoney2/dialogs/knewaccountdlg.h
+++ b/kmymoney2/dialogs/knewaccountdlg.h
@@ -65,8 +65,8 @@ private:
   int m_idPropMaxCredit;
   int m_idPropMinBalance;
 
-  void initParentWidget(TQString tqparentId, const TQString& accountId);
-  void showSubAccounts(TQStringList accounts, KMyMoneyAccountTreeBaseItem *tqparentItem, const TQString& tqparentId, const TQString& accountId);
+  void initParentWidget(TQString parentId, 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);
 
diff --git a/kmymoney2/dialogs/knewaccountdlgdecl.ui b/kmymoney2/dialogs/knewaccountdlgdecl.ui
index 5d374e7..5f42ead 100644
--- a/kmymoney2/dialogs/knewaccountdlgdecl.ui
+++ b/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>
diff --git a/kmymoney2/dialogs/knewbankdlgdecl.ui b/kmymoney2/dialogs/knewbankdlgdecl.ui
index 71d496a..28a8cc2 100644
--- a/kmymoney2/dialogs/knewbankdlgdecl.ui
+++ b/kmymoney2/dialogs/knewbankdlgdecl.ui
@@ -264,5 +264,5 @@
 </widget>
 <tabstops>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmymoney2/dialogs/knewbudgetdlgdecl.ui b/kmymoney2/dialogs/knewbudgetdlgdecl.ui
index 7a18195..bbfbad6 100644
--- a/kmymoney2/dialogs/knewbudgetdlgdecl.ui
+++ b/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"/>
 
 
 
diff --git a/kmymoney2/dialogs/knewequityentrydecl.ui b/kmymoney2/dialogs/knewequityentrydecl.ui
index 4f97f92..2fa832f 100644
--- a/kmymoney2/dialogs/knewequityentrydecl.ui
+++ b/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>
diff --git a/kmymoney2/dialogs/knewfiledlgdecl.ui b/kmymoney2/dialogs/knewfiledlgdecl.ui
index 9658fad..d0fcffa 100644
--- a/kmymoney2/dialogs/knewfiledlgdecl.ui
+++ b/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>
diff --git a/kmymoney2/dialogs/knewinvestmentwizard.cpp b/kmymoney2/dialogs/knewinvestmentwizard.cpp
index a1e2e9e..3a963f2 100644
--- a/kmymoney2/dialogs/knewinvestmentwizard.cpp
+++ b/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);
diff --git a/kmymoney2/dialogs/knewinvestmentwizard.h b/kmymoney2/dialogs/knewinvestmentwizard.h
index 8e3be09..43a3be7 100644
--- a/kmymoney2/dialogs/knewinvestmentwizard.h
+++ b/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; }
 
diff --git a/kmymoney2/dialogs/knewinvestmentwizarddecl.ui b/kmymoney2/dialogs/knewinvestmentwizarddecl.ui
index c6936c6..5e8196f 100644
--- a/kmymoney2/dialogs/knewinvestmentwizarddecl.ui
+++ b/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>
diff --git a/kmymoney2/dialogs/knewloanwizarddecl.ui b/kmymoney2/dialogs/knewloanwizarddecl.ui
index 6a70458..19c589f 100644
--- a/kmymoney2/dialogs/knewloanwizarddecl.ui
+++ b/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>
diff --git a/kmymoney2/dialogs/konlinequoteconfigurationdecl.ui b/kmymoney2/dialogs/konlinequoteconfigurationdecl.ui
index 748d343..3d6547b 100644
--- a/kmymoney2/dialogs/konlinequoteconfigurationdecl.ui
+++ b/kmymoney2/dialogs/konlinequoteconfigurationdecl.ui
@@ -195,5 +195,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmymoney2/dialogs/kpayeereassigndlgdecl.ui b/kmymoney2/dialogs/kpayeereassigndlgdecl.ui
index 1f85b76..4b01cac 100644
--- a/kmymoney2/dialogs/kpayeereassigndlgdecl.ui
+++ b/kmymoney2/dialogs/kpayeereassigndlgdecl.ui
@@ -182,5 +182,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmymoney2/dialogs/kplugindlg.ui b/kmymoney2/dialogs/kplugindlg.ui
index 19d7f03..77b1ecb 100644
--- a/kmymoney2/dialogs/kplugindlg.ui
+++ b/kmymoney2/dialogs/kplugindlg.ui
@@ -150,5 +150,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmymoney2/dialogs/kreconciledlgdecl.ui b/kmymoney2/dialogs/kreconciledlgdecl.ui
index 9ed4dc1..9ce4dbe 100644
--- a/kmymoney2/dialogs/kreconciledlgdecl.ui
+++ b/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>
diff --git a/kmymoney2/dialogs/ksecuritylisteditordecl.ui b/kmymoney2/dialogs/ksecuritylisteditordecl.ui
index 1347cb0..da8c628 100644
--- a/kmymoney2/dialogs/ksecuritylisteditordecl.ui
+++ b/kmymoney2/dialogs/ksecuritylisteditordecl.ui
@@ -258,5 +258,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmymoney2/dialogs/kselectdatabasedlgdecl.ui b/kmymoney2/dialogs/kselectdatabasedlgdecl.ui
index 20a8dd0..4b2b31e 100644
--- a/kmymoney2/dialogs/kselectdatabasedlgdecl.ui
+++ b/kmymoney2/dialogs/kselectdatabasedlgdecl.ui
@@ -246,5 +246,5 @@ As always, please make sure you have adequate backups of your data.&lt;/font&gt;
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmymoney2/dialogs/kselecttransactionsdlgdecl.ui b/kmymoney2/dialogs/kselecttransactionsdlgdecl.ui
index a8efa2c..5697104 100644
--- a/kmymoney2/dialogs/kselecttransactionsdlgdecl.ui
+++ b/kmymoney2/dialogs/kselecttransactionsdlgdecl.ui
@@ -170,5 +170,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmymoney2/dialogs/ksortoptiondlg.ui b/kmymoney2/dialogs/ksortoptiondlg.ui
index 6ffb91a..bfc4ca7 100644
--- a/kmymoney2/dialogs/ksortoptiondlg.ui
+++ b/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>
diff --git a/kmymoney2/dialogs/ksplitcorrectiondlg.ui b/kmymoney2/dialogs/ksplitcorrectiondlg.ui
index e37789e..0f2a196 100644
--- a/kmymoney2/dialogs/ksplitcorrectiondlg.ui
+++ b/kmymoney2/dialogs/ksplitcorrectiondlg.ui
@@ -241,5 +241,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmymoney2/dialogs/ksplittransactiondlgdecl.ui b/kmymoney2/dialogs/ksplittransactiondlgdecl.ui
index 2d2f231..ecd6a90 100644
--- a/kmymoney2/dialogs/ksplittransactiondlgdecl.ui
+++ b/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>
diff --git a/kmymoney2/dialogs/kupdatestockpricedlgdecl.ui b/kmymoney2/dialogs/kupdatestockpricedlgdecl.ui
index 1e41eaa..3b1659f 100644
--- a/kmymoney2/dialogs/kupdatestockpricedlgdecl.ui
+++ b/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>
diff --git a/kmymoney2/dialogs/mymoneyqifprofileeditordecl.ui b/kmymoney2/dialogs/mymoneyqifprofileeditordecl.ui
index b88f241..8c27984 100644
--- a/kmymoney2/dialogs/mymoneyqifprofileeditordecl.ui
+++ b/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>
diff --git a/kmymoney2/dialogs/settings/ksettingscolorsdecl.ui b/kmymoney2/dialogs/settings/ksettingscolorsdecl.ui
index 98fe42b..af307ac 100644
--- a/kmymoney2/dialogs/settings/ksettingscolorsdecl.ui
+++ b/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>
diff --git a/kmymoney2/dialogs/settings/ksettingsfontsdecl.ui b/kmymoney2/dialogs/settings/ksettingsfontsdecl.ui
index 6cb100a..bffa088 100644
--- a/kmymoney2/dialogs/settings/ksettingsfontsdecl.ui
+++ b/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>
diff --git a/kmymoney2/dialogs/settings/ksettingsforecastdecl.ui b/kmymoney2/dialogs/settings/ksettingsforecastdecl.ui
index c3f90df..e70f01e 100644
--- a/kmymoney2/dialogs/settings/ksettingsforecastdecl.ui
+++ b/kmymoney2/dialogs/settings/ksettingsforecastdecl.ui
@@ -264,5 +264,5 @@
         </spacer>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui b/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui
index b851f2b..9f8adaa 100644
--- a/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui
+++ b/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui
@@ -645,5 +645,5 @@ You can use &lt;b&gt;View/Show all accounts&lt;/b&gt; 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>
diff --git a/kmymoney2/dialogs/settings/ksettingsgpg.cpp b/kmymoney2/dialogs/settings/ksettingsgpg.cpp
index 133700d..f34c2d8 100644
--- a/kmymoney2/dialogs/settings/ksettingsgpg.cpp
+++ b/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(')', "]");
diff --git a/kmymoney2/dialogs/settings/ksettingsgpgdecl.ui b/kmymoney2/dialogs/settings/ksettingsgpgdecl.ui
index 0d82e45..09f846a 100644
--- a/kmymoney2/dialogs/settings/ksettingsgpgdecl.ui
+++ b/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>
diff --git a/kmymoney2/dialogs/settings/ksettingshomedecl.ui b/kmymoney2/dialogs/settings/ksettingshomedecl.ui
index c248697..cc8eaff 100644
--- a/kmymoney2/dialogs/settings/ksettingshomedecl.ui
+++ b/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>
diff --git a/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui b/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui
index 88678ec..cc64bdb 100644
--- a/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui
+++ b/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui
@@ -230,5 +230,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmymoney2/dialogs/settings/ksettingsregisterdecl.ui b/kmymoney2/dialogs/settings/ksettingsregisterdecl.ui
index 1ad71bf..1d8f320 100644
--- a/kmymoney2/dialogs/settings/ksettingsregisterdecl.ui
+++ b/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>
diff --git a/kmymoney2/dialogs/settings/ksettingsschedulesdecl.ui b/kmymoney2/dialogs/settings/ksettingsschedulesdecl.ui
index 4f7bd28..94762cb 100644
--- a/kmymoney2/dialogs/settings/ksettingsschedulesdecl.ui
+++ b/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>
diff --git a/kmymoney2/dialogs/transactioneditor.cpp b/kmymoney2/dialogs/transactioneditor.cpp
index 91f60b8..bd73eac 100644
--- a/kmymoney2/dialogs/transactioneditor.cpp
+++ b/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