Rename old tq methods that no longer need a unique name

16 files changed, 76 insertions, 76 deletions

diff --git a/kmymoney2/views/kaccountsviewdecl.ui b/kmymoney2/views/kaccountsviewdecl.ui
index 9b975f2..e6e2454 100644
--- a/kmymoney2/views/kaccountsviewdecl.ui
+++ b/kmymoney2/views/kaccountsviewdecl.ui
@@ -85,7 +85,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>515</width>
                                         <height>20</height>
@@ -153,7 +153,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>367</width>
                             <height>20</height>
@@ -164,7 +164,7 @@
                     <property name="name">
                         <cstring>m_totalProfitsLabel</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>150</width>
                             <height>0</height>
diff --git a/kmymoney2/views/kbudgetview.cpp b/kmymoney2/views/kbudgetview.cpp
index 9002ceb..9012927 100644
--- a/kmymoney2/views/kbudgetview.cpp
+++ b/kmymoney2/views/kbudgetview.cpp
@@ -230,7 +230,7 @@ void KBudgetView::loadBudgets(void)
   m_budgetValue->clear();
 
   // add the correct years to the drop down list
-  TQDate date = TQDate::tqcurrentDate(Qt::LocalTime);
+  TQDate date = TQDate::currentDate(Qt::LocalTime);
   int iStartYear = date.year() - m_iBudgetYearsBack;
 
   m_yearList.clear();
diff --git a/kmymoney2/views/kbudgetviewdecl.ui b/kmymoney2/views/kbudgetviewdecl.ui
index 90172ff..d593b25 100644
--- a/kmymoney2/views/kbudgetviewdecl.ui
+++ b/kmymoney2/views/kbudgetviewdecl.ui
@@ -304,7 +304,7 @@
                                             <property name="sizeType">
                                                 <enum>Expanding</enum>
                                             </property>
-                                            <property name="tqsizeHint">
+                                            <property name="sizeHint">
                                                 <size>
                                                     <width>21</width>
                                                     <height>20</height>
diff --git a/kmymoney2/views/kcategoriesviewdecl.ui b/kmymoney2/views/kcategoriesviewdecl.ui
index 019080c..9eb7df7 100644
--- a/kmymoney2/views/kcategoriesviewdecl.ui
+++ b/kmymoney2/views/kcategoriesviewdecl.ui
@@ -67,7 +67,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>515</width>
                             <height>20</height>
@@ -102,7 +102,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>310</width>
                             <height>16</height>
@@ -113,7 +113,7 @@
                     <property name="name">
                         <cstring>m_totalProfitsLabel</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>150</width>
                             <height>0</height>
diff --git a/kmymoney2/views/kforecastview.cpp b/kmymoney2/views/kforecastview.cpp
index d636ec4..42d9fad 100644
--- a/kmymoney2/views/kforecastview.cpp
+++ b/kmymoney2/views/kforecastview.cpp
@@ -68,7 +68,7 @@ KForecastView::KForecastView(TQWidget *parent, const char *name) :
   m_advancedList->setAllColumnsShowFocus(true);
 
   m_forecastChart = new KReportChartView(m_tabChart, "forecastChart" );
-  m_forecastChart->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
+  m_forecastChart->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
 
   loadForecastSettings();
 
@@ -393,8 +393,8 @@ void KForecastView::loadAdvancedView(void)
   int accountColumn = m_advancedList->addColumn(i18n("Account"), -1);
 
   //if beginning of forecast is today, set the begin day to next cycle to avoid repeating the first cycle
-  if(TQDate::tqcurrentDate() < forecast.beginForecastDate()) {
-    daysToBeginDay = TQDate::tqcurrentDate().daysTo(forecast.beginForecastDate());
+  if(TQDate::currentDate() < forecast.beginForecastDate()) {
+    daysToBeginDay = TQDate::currentDate().daysTo(forecast.beginForecastDate());
   } else {
     daysToBeginDay = forecast.accountsCycle();
   }
@@ -486,10 +486,10 @@ void KForecastView::loadBudgetView(void)
   m_budgetList->setBaseCurrency(file->baseCurrency());
 
   //get the settings from current page and calculate this year based on last year
-  TQDate historyEndDate = TQDate(TQDate::tqcurrentDate().year()-1, 12, 31);
+  TQDate historyEndDate = TQDate(TQDate::currentDate().year()-1, 12, 31);
   TQDate historyStartDate = historyEndDate.addDays(-m_accountsCycle->value() * m_forecastCycles->value());
-  TQDate forecastStartDate = TQDate(TQDate::tqcurrentDate().year(), 1, 1);
-  TQDate forecastEndDate = TQDate::tqcurrentDate().addDays(m_forecastDays->value());
+  TQDate forecastStartDate = TQDate(TQDate::currentDate().year(), 1, 1);
+  TQDate forecastEndDate = TQDate::currentDate().addDays(m_forecastDays->value());
   forecast.setHistoryMethod(m_historyMethod->selectedId());
 
   MyMoneyBudget budget;
@@ -658,7 +658,7 @@ void KForecastView::loadChartView(void)
   reportCfg.setColumnsAreDays( true );
   reportCfg.setConvertCurrency( true );
   reportCfg.setIncludingForecast( true );
-  reportCfg.setDateFilter(TQDate::tqcurrentDate(),TQDate::tqcurrentDate().addDays(m_forecastDays->value()));
+  reportCfg.setDateFilter(TQDate::currentDate(),TQDate::currentDate().addDays(m_forecastDays->value()));
 
   reports::PivotTable table(reportCfg);
 
diff --git a/kmymoney2/views/kforecastviewdecl.ui b/kmymoney2/views/kforecastviewdecl.ui
index 79aa702..ec2694b 100644
--- a/kmymoney2/views/kforecastviewdecl.ui
+++ b/kmymoney2/views/kforecastviewdecl.ui
@@ -189,7 +189,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>31</height>
@@ -312,7 +312,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>21</width>
                                     <height>6</height>
@@ -345,7 +345,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>31</width>
                                             <height>21</height>
diff --git a/kmymoney2/views/kgloballedgerview.cpp b/kmymoney2/views/kgloballedgerview.cpp
index 87f8890..38e5fd3 100644
--- a/kmymoney2/views/kgloballedgerview.cpp
+++ b/kmymoney2/views/kgloballedgerview.cpp
@@ -176,7 +176,7 @@ KGlobalLedgerView::KGlobalLedgerView(TQWidget *parent, const char *name )
   //m_toolbar->setMaximumSize(50,20);
   m_toolbar->alignItemRight(1);
 #endif
-  m_toolbar->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
+  m_toolbar->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
   tqlayout()->addWidget(m_toolbarFrame);
 
   // create the register frame
@@ -448,7 +448,7 @@ void KGlobalLedgerView::loadView(void)
       // show scheduled transactions which have a scheduled postdate
       // within the next 'period' days. In reconciliation mode, the
       // period starts on the statement date.
-      TQDate endDate = TQDate::tqcurrentDate().addDays(period);
+      TQDate endDate = TQDate::currentDate().addDays(period);
       if(isReconciliationAccount())
         endDate = reconciliationDate.addDays(period);
       TQValueList<MyMoneySchedule> scheduleList = MyMoneyFile::instance()->scheduleList(m_account.id());
@@ -464,7 +464,7 @@ void KGlobalLedgerView::loadView(void)
           // certainly be posted in the past. So we take todays date
           // as the alternative
           if(s.isOverdue())
-            t.setPostDate(TQDate::tqcurrentDate());
+            t.setPostDate(TQDate::currentDate());
           else
             t.setPostDate(s.adjustedNextDueDate());
           const TQValueList<MyMoneySplit>& splits = t.splits();
@@ -476,7 +476,7 @@ void KGlobalLedgerView::loadView(void)
           }
           // keep track of this payment locally (not in the engine)
           if(s.isOverdue())
-            s.setLastPayment(TQDate::tqcurrentDate());
+            s.setLastPayment(TQDate::currentDate());
           else
             s.setLastPayment(s.nextDueDate());
 
@@ -629,7 +629,7 @@ void KGlobalLedgerView::loadView(void)
             }
           }
 
-          if(t->transaction().postDate() > TQDate::tqcurrentDate()) {
+          if(t->transaction().postDate() > TQDate::currentDate()) {
             tracer.printf("Reducing actual balance by %s because %s/%s(%s) is in the future", (split.shares() * factor).formatMoney("", 2).data(), t->transaction().id().data(), split.id().data(), t->transaction().postDate().toString(Qt::ISODate).data());
             actBalance[split.accountId()] -= split.shares() * factor;
           }
@@ -1149,12 +1149,12 @@ TransactionEditor* KGlobalLedgerView::startEdit(const KMyMoneyRegister::Selected
 
       // Check if the editor has some preference on where to set the focus
       // If not, set the focus to the first widget in the tab order
-      TQWidget* tqfocusWidget = editor->firstWidget();
-      if(!tqfocusWidget)
-        tqfocusWidget = m_tabOrderWidgets.first();
+      TQWidget* focusWidget = editor->firstWidget();
+      if(!focusWidget)
+        focusWidget = m_tabOrderWidgets.first();
 
       // for some reason, this only works reliably if delayed a bit
-      TQTimer::singleShot(10, tqfocusWidget, TQT_SLOT(setFocus()));
+      TQTimer::singleShot(10, focusWidget, TQT_SLOT(setFocus()));
 
       // preset to 'I have no idea which type to create' for the next round.
       d->m_action = KMyMoneyRegister::ActionNone;
@@ -1207,7 +1207,7 @@ bool KGlobalLedgerView::focusNextPrevChild(bool next)
     TQWidget *w = 0;
     TQWidget *currentWidget;
 
-    w = tqApp->tqfocusWidget();
+    w = tqApp->focusWidget();
     while(w && m_tabOrderWidgets.find(w) == -1) {
       // qDebug("'%s' not in list, use parent", w->className());
       w = w->parentWidget();
diff --git a/kmymoney2/views/khomeview.cpp b/kmymoney2/views/khomeview.cpp
index ba6af3a..be92c29 100644
--- a/kmymoney2/views/khomeview.cpp
+++ b/kmymoney2/views/khomeview.cpp
@@ -311,7 +311,7 @@ void KHomeView::showNetWorthGraph(void)
   reportCfg.setColumnsAreDays( true );
   reportCfg.setConvertCurrency( true );
   reportCfg.setIncludingForecast( true );
-  reportCfg.setDateFilter(TQDate::tqcurrentDate(),TQDate::tqcurrentDate().addDays(+90));
+  reportCfg.setDateFilter(TQDate::currentDate(),TQDate::currentDate().addDays(+90));
 
   reports::PivotTable table(reportCfg);
 
@@ -383,8 +383,8 @@ void KHomeView::showPayments(void)
   schedule = file->scheduleList("", MyMoneySchedule::TYPE_ANY,
                                  MyMoneySchedule::OCCUR_ANY,
                                  MyMoneySchedule::STYPE_ANY,
-                                 TQDate::tqcurrentDate(),
-                                 TQDate::tqcurrentDate().addMonths(1));
+                                 TQDate::currentDate(),
+                                 TQDate::currentDate().addMonths(1));
   overdues = file->scheduleList("", MyMoneySchedule::TYPE_ANY,
                                  MyMoneySchedule::OCCUR_ANY,
                                  MyMoneySchedule::STYPE_ANY,
@@ -455,7 +455,7 @@ void KHomeView::showPayments(void)
       // determine number of overdue payments
       TQDate nextDate = (*it).adjustedNextDueDate();
       int cnt = 0;
-      while(nextDate.isValid() && nextDate < TQDate::tqcurrentDate()) {
+      while(nextDate.isValid() && nextDate < TQDate::currentDate()) {
         ++cnt;
         nextDate = (*it).nextPayment(nextDate);
         // for single occurence nextDate will not change, so we
@@ -486,12 +486,12 @@ void KHomeView::showPayments(void)
     TQValueList<MyMoneySchedule> todays;
     TQValueList<MyMoneySchedule>::Iterator t_it;
     for (t_it=schedule.begin(); t_it!=schedule.end();) {
-      if ((*t_it).nextDueDate() == TQDate::tqcurrentDate()) {
+      if ((*t_it).nextDueDate() == TQDate::currentDate()) {
         todays.append(*t_it);
         (*t_it).setNextDueDate((*t_it).nextPayment((*t_it).nextDueDate()));
 
-        //if nextDueDate is still tqcurrentDate then remove it from scheduled payments
-        if ((*t_it).nextDueDate() == TQDate::tqcurrentDate()) {
+        //if nextDueDate is still currentDate then remove it from scheduled payments
+        if ((*t_it).nextDueDate() == TQDate::currentDate()) {
           t_it = schedule.remove(t_it);
           continue;
         }
@@ -560,7 +560,7 @@ void KHomeView::showPayments(void)
       cnt = (m_showAllSchedules) ? -1 : 6;
       bool needMoreLess = m_showAllSchedules;
 
-      TQDate lastDate = TQDate::tqcurrentDate().addMonths(1);
+      TQDate lastDate = TQDate::currentDate().addMonths(1);
       qBubbleSort(schedule);
       do {
         it = schedule.begin();
@@ -812,7 +812,7 @@ void KHomeView::showAccountEntry(const MyMoneyAccount& acc)
     showAccountEntry(acc, value, MyMoneyMoney(), showLimit);
   } else {
     //get balance for normal accounts
-    value = file->balance(acc.id(), TQDate::tqcurrentDate());
+    value = file->balance(acc.id(), TQDate::currentDate());
 
     //if credit card or checkings account, show maximum credit
     if( acc.accountType() == MyMoneyAccount::CreditCard ||
@@ -955,7 +955,7 @@ void KHomeView::showForecast(void)
 
     int colspan = 1;
     // get begin day
-    int beginDay = TQDate::tqcurrentDate().daysTo(m_forecast.beginForecastDate());
+    int beginDay = TQDate::currentDate().daysTo(m_forecast.beginForecastDate());
     // if begin day is today skip to next cycle
     if(beginDay == 0)
       beginDay = m_forecast.accountsCycle();
@@ -1003,7 +1003,7 @@ void KHomeView::showForecast(void)
       }
 
       for (int f = beginDay; f <= m_forecast.forecastDays(); f += m_forecast.accountsCycle()) {
-        forecastBalance = m_forecast.forecastBalance(*it_account, TQDate::tqcurrentDate().addDays(f));
+        forecastBalance = m_forecast.forecastBalance(*it_account, TQDate::currentDate().addDays(f));
         TQString amount;
         amount = forecastBalance.formatMoney( *it_account, currency);
         amount.replace(" ","&nbsp;");
@@ -1268,12 +1268,12 @@ void KHomeView::showAssetsLiabilities(void)
         if( (*asset_it).accountType() == MyMoneyAccount::Investment) {
           value = investmentBalance(*asset_it);
         } else {
-          value = MyMoneyFile::instance()->balance((*asset_it).id(), TQDate::tqcurrentDate());
+          value = MyMoneyFile::instance()->balance((*asset_it).id(), TQDate::currentDate());
         }
         //calculate balance for foreign currency accounts
         if((*asset_it).currencyId() != file->baseCurrency().id()) {
           ReportAccount repAcc = ReportAccount((*asset_it).id());
-          MyMoneyMoney curPrice = repAcc.baseCurrencyPrice(TQDate::tqcurrentDate());
+          MyMoneyMoney curPrice = repAcc.baseCurrencyPrice(TQDate::currentDate());
           MyMoneyMoney baseValue = value * curPrice;
           baseValue = baseValue.convert(10000);
           netAssets += baseValue;
@@ -1294,11 +1294,11 @@ void KHomeView::showAssetsLiabilities(void)
       //write a liability account
       if(liabilities_it != nameLiabilitiesIdx.end()) {
         MyMoneyMoney value;
-        value = MyMoneyFile::instance()->balance((*liabilities_it).id(), TQDate::tqcurrentDate());
+        value = MyMoneyFile::instance()->balance((*liabilities_it).id(), TQDate::currentDate());
         //calculate balance if foreign currency
         if((*liabilities_it).currencyId() != file->baseCurrency().id()) {
           ReportAccount repAcc = ReportAccount((*liabilities_it).id());
-          MyMoneyMoney curPrice = repAcc.baseCurrencyPrice(TQDate::tqcurrentDate());
+          MyMoneyMoney curPrice = repAcc.baseCurrencyPrice(TQDate::currentDate());
           MyMoneyMoney baseValue = value * curPrice;
           baseValue = baseValue.convert(10000);
           netLiabilities += baseValue;
@@ -1518,16 +1518,16 @@ void KHomeView::doForecast(void)
 
 MyMoneyMoney KHomeView::forecastPaymentBalance(const MyMoneyAccount& acc, const MyMoneyMoney& payment, TQDate& paymentDate)
 {
-  //if paymentDate before or equal to tqcurrentDate set it to current date plus 1
+  //if paymentDate before or equal to currentDate set it to current date plus 1
   //so we get to accumulate forecast balance correctly
-  if(paymentDate <= TQDate::tqcurrentDate())
-    paymentDate = TQDate::tqcurrentDate().addDays(1);
+  if(paymentDate <= TQDate::currentDate())
+    paymentDate = TQDate::currentDate().addDays(1);
 
   //check if the account is already there
   if(m_accountList.find(acc.id()) == m_accountList.end()
      || m_accountList[acc.id()].find(paymentDate) == m_accountList[acc.id()].end())
   {
-    if(paymentDate == TQDate::tqcurrentDate()) {
+    if(paymentDate == TQDate::currentDate()) {
       m_accountList[acc.id()][paymentDate] = m_forecast.forecastBalance(acc, paymentDate);
     } else {
       m_accountList[acc.id()][paymentDate] = m_forecast.forecastBalance(acc, paymentDate.addDays(-1));
@@ -1547,8 +1547,8 @@ void KHomeView::showCashFlowSummary()
   int prec = MyMoneyMoney::denomToPrec(file->baseCurrency().smallestAccountFraction());
 
   //set start and end of month dates
-  TQDate startOfMonth = TQDate(TQDate::tqcurrentDate().year(), TQDate::tqcurrentDate().month(), 1);
-  TQDate endOfMonth = TQDate(TQDate::tqcurrentDate().year(), TQDate::tqcurrentDate().month(), TQDate::tqcurrentDate().daysInMonth());
+  TQDate startOfMonth = TQDate(TQDate::currentDate().year(), TQDate::currentDate().month(), 1);
+  TQDate endOfMonth = TQDate(TQDate::currentDate().year(), TQDate::currentDate().month(), TQDate::currentDate().daysInMonth());
 
   //Add total income and expenses for this month
   //get transactions for current month
@@ -1660,8 +1660,8 @@ void KHomeView::showCashFlowSummary()
           MyMoneyAccount acc = file->account((*it_s).accountId());
             // collect all overdues on the first day
             TQDate schedDate = nextDate;
-            if(TQDate::tqcurrentDate() >= nextDate)
-              schedDate = TQDate::tqcurrentDate().addDays(1);
+            if(TQDate::currentDate() >= nextDate)
+              schedDate = TQDate::currentDate().addDays(1);
 
             balanceMap[acc.id()] += file->balance(acc.id());
         }
@@ -1680,7 +1680,7 @@ void KHomeView::showCashFlowSummary()
 
           //convert to foreign currency if needed
           if(repSplitAcc.currencyId() != file->baseCurrency().id()) {
-            MyMoneyMoney curPrice = repSplitAcc.baseCurrencyPrice(TQDate::tqcurrentDate());
+            MyMoneyMoney curPrice = repSplitAcc.baseCurrencyPrice(TQDate::currentDate());
             value = value * curPrice;
             value = value.convert(10000);
           }
@@ -1733,11 +1733,11 @@ void KHomeView::showCashFlowSummary()
         case MyMoneyAccount::Savings:
         case MyMoneyAccount::Cash:
         {
-          MyMoneyMoney value = MyMoneyFile::instance()->balance((*account_it).id(), TQDate::tqcurrentDate());
+          MyMoneyMoney value = MyMoneyFile::instance()->balance((*account_it).id(), TQDate::currentDate());
           //calculate balance for foreign currency accounts
           if((*account_it).currencyId() != file->baseCurrency().id()) {
             ReportAccount repAcc = ReportAccount((*account_it).id());
-            MyMoneyMoney curPrice = repAcc.baseCurrencyPrice(TQDate::tqcurrentDate());
+            MyMoneyMoney curPrice = repAcc.baseCurrencyPrice(TQDate::currentDate());
             MyMoneyMoney baseValue = value * curPrice;
             liquidAssets += baseValue;
             liquidAssets = liquidAssets.convert(10000);
@@ -1750,11 +1750,11 @@ void KHomeView::showCashFlowSummary()
         case MyMoneyAccount::CreditCard:
         {
           MyMoneyMoney value;
-          value = MyMoneyFile::instance()->balance((*account_it).id(), TQDate::tqcurrentDate());
+          value = MyMoneyFile::instance()->balance((*account_it).id(), TQDate::currentDate());
           //calculate balance if foreign currency
           if((*account_it).currencyId() != file->baseCurrency().id()) {
             ReportAccount repAcc = ReportAccount((*account_it).id());
-            MyMoneyMoney curPrice = repAcc.baseCurrencyPrice(TQDate::tqcurrentDate());
+            MyMoneyMoney curPrice = repAcc.baseCurrencyPrice(TQDate::currentDate());
             MyMoneyMoney baseValue = value * curPrice;
             liquidLiabilities += baseValue;
             liquidLiabilities = liquidLiabilities.convert(10000);
diff --git a/kmymoney2/views/kinstitutionsviewdecl.ui b/kmymoney2/views/kinstitutionsviewdecl.ui
index 1134e3b..34b8a7b 100644
--- a/kmymoney2/views/kinstitutionsviewdecl.ui
+++ b/kmymoney2/views/kinstitutionsviewdecl.ui
@@ -45,7 +45,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -56,7 +56,7 @@
                     <property name="name">
                         <cstring>m_totalProfitsLabel</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>150</width>
                             <height>0</height>
diff --git a/kmymoney2/views/kinvestmentlistitem.cpp b/kmymoney2/views/kinvestmentlistitem.cpp
index b7617d8..f0f1fd3 100644
--- a/kmymoney2/views/kinvestmentlistitem.cpp
+++ b/kmymoney2/views/kinvestmentlistitem.cpp
@@ -130,7 +130,7 @@ const TQString KInvestmentListItem::calculateGain(const equity_price_history& hi
   else
   {
     bool bFoundCurrent = false, bFoundComparison = false;
-    TQDate tempDate, comparisonDate = TQDate::tqcurrentDate();
+    TQDate tempDate, comparisonDate = TQDate::currentDate();
 
     if(YTD)
     {
@@ -147,7 +147,7 @@ const TQString KInvestmentListItem::calculateGain(const equity_price_history& hi
 
     //find the current value, or closest to the current value.
     equity_price_history::ConstIterator itToday = history.end();
-    for(tempDate = TQDate::tqcurrentDate(); tempDate >= comparisonDate; )
+    for(tempDate = TQDate::currentDate(); tempDate >= comparisonDate; )
     {
       itToday = history.find(tempDate);
       if(itToday != history.end())
@@ -169,7 +169,7 @@ const TQString KInvestmentListItem::calculateGain(const equity_price_history& hi
     //should already be sorted earliest to latest.
     for(equity_price_history::ConstIterator it = history.begin(); it != history.end(); ++it)
     {
-      if(it.key() >= comparisonDate && it.key() < TQDate::tqcurrentDate())
+      if(it.key() >= comparisonDate && it.key() < TQDate::currentDate())
       {
         comparisonDate = it.key();
         comparisonValue = it.data();
diff --git a/kmymoney2/views/kinvestmentviewdecl.ui b/kmymoney2/views/kinvestmentviewdecl.ui
index 7c4a028..5c36fbc 100644
--- a/kmymoney2/views/kinvestmentviewdecl.ui
+++ b/kmymoney2/views/kinvestmentviewdecl.ui
@@ -53,7 +53,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>280</width>
                             <height>20</height>
diff --git a/kmymoney2/views/kmymoneyview.cpp b/kmymoney2/views/kmymoneyview.cpp
index eba2a82..c28bc26 100644
--- a/kmymoney2/views/kmymoneyview.cpp
+++ b/kmymoney2/views/kmymoneyview.cpp
@@ -1054,7 +1054,7 @@ void KMyMoneyView::saveToLocalFile(TQFile* qfile, IMyMoneyStorageFormat* pWriter
   ft.commit();
 
   pWriter->setProgressCallback(&KMyMoneyView::progressCallback);
-  dev->resetqStatus();
+  dev->reseStatus();
   pWriter->writeFile(dev, dynamic_cast<IMyMoneySerialize*> (MyMoneyFile::instance()->storage()));
   MyMoneyFile::instance()->blockSignals(blocked);
   if(statusDevice->status() != IO_Ok) {
diff --git a/kmymoney2/views/kpayeesview.cpp b/kmymoney2/views/kpayeesview.cpp
index 6fa22ee..87066ac 100644
--- a/kmymoney2/views/kpayeesview.cpp
+++ b/kmymoney2/views/kpayeesview.cpp
@@ -325,7 +325,7 @@ KPayeesView::KPayeesView(TQWidget *parent, const char *name ) :
   // create the searchline widget
   // and insert it into the existing tqlayout
   m_searchWidget = new KListViewSearchLineWidget(m_payeesList, this);
-  m_searchWidget->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
+  m_searchWidget->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
   KPayeesViewDeclLayout->insertWidget(0, m_searchWidget);
 
   m_splitter = new TQSplitter(this);
diff --git a/kmymoney2/views/kpayeesviewdecl.ui b/kmymoney2/views/kpayeesviewdecl.ui
index 05e8e09..a513e61 100644
--- a/kmymoney2/views/kpayeesviewdecl.ui
+++ b/kmymoney2/views/kpayeesviewdecl.ui
@@ -218,7 +218,7 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>90</width>
                                                 <height>0</height>
@@ -240,7 +240,7 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>90</width>
                                                 <height>0</height>
@@ -262,7 +262,7 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>90</width>
                                                 <height>0</height>
@@ -284,7 +284,7 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>90</width>
                                                 <height>0</height>
@@ -350,7 +350,7 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>90</width>
                                                 <height>0</height>
@@ -375,7 +375,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>21</width>
                                         <height>20</height>
@@ -516,7 +516,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -586,7 +586,7 @@ new transactions with this payee</string>
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>31</height>
@@ -632,7 +632,7 @@ new transactions with this payee</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>260</width>
                             <height>21</height>
diff --git a/kmymoney2/views/kreportsview.cpp b/kmymoney2/views/kreportsview.cpp
index 8fdcbd7..045de08 100755
--- a/kmymoney2/views/kreportsview.cpp
+++ b/kmymoney2/views/kreportsview.cpp
@@ -105,7 +105,7 @@ KReportsView::KReportTab::KReportTab(KTabWidget* parent, const MyMoneyReport& re
     m_control->buttonChart->hide();
   }
 
-  m_chartView->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
+  m_chartView->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
   m_chartView->hide();
   m_layout->addWidget( m_control ); //, 0, TQt::AlignTop );
   m_layout->addWidget( m_part->view() );
@@ -1350,7 +1350,7 @@ void KReportsView::defaultReports(TQValueList<ReportGroup>& groups)
     list.back().setShowingRowTotals(true);
     list.back().setBudget("Any",true);
     // in case we're in January, we show the last year
-    if(TQDate::tqcurrentDate().month() == 1) {
+    if(TQDate::currentDate().month() == 1) {
       list.back().setDateFilter(MyMoneyTransactionFilter::lastYear);
     }
 
diff --git a/kmymoney2/views/kscheduledviewdecl.ui b/kmymoney2/views/kscheduledviewdecl.ui
index f101b52..b505384 100644
--- a/kmymoney2/views/kscheduledviewdecl.ui
+++ b/kmymoney2/views/kscheduledviewdecl.ui
@@ -45,7 +45,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>80</width>
                             <height>20</height>