1 files changed, 16 insertions, 16 deletions

diff --git a/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp b/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp
index 950200e..d7584c5 100644
--- a/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp
+++ b/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp
@@ -57,14 +57,14 @@ void KMyMoneyAccountTreeForecast::showSummary(MyMoneyForecast& forecast)
   addColumn(i18n("Current"), -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();
   }
   for(int i = 0; ((i*forecast.accountsCycle())+daysToBeginDay) <= forecast.forecastDays(); ++i) {
     int intervalDays = ((i*forecast.accountsCycle())+daysToBeginDay);
-    TQString columnName =  i18n("%1 days").tqarg(intervalDays, 0, 10);
+    TQString columnName =  i18n("%1 days").arg(intervalDays, 0, 10);
     addColumn(columnName, -1);
   }
 
@@ -84,7 +84,7 @@ void KMyMoneyAccountTreeForecast::showDetailed(MyMoneyForecast& forecast)
   addColumn(i18n("Current"), -1);
 
   for(int i = 1; i <= forecast.forecastDays(); ++i) {
-    TQDate forecastDate = TQDate::tqcurrentDate().addDays(i);
+    TQDate forecastDate = TQDate::currentDate().addDays(i);
     TQString columnName =  KGlobal::locale()->formatDate(forecastDate, true);
     addColumn(columnName, -1);
   }
@@ -103,22 +103,22 @@ void KMyMoneyAccountTreeForecast::showAdvanced(MyMoneyForecast& forecast)
   int daysToBeginDay;
   
   //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();
   }
 
   //add columns
   for(int i = 1; ((i * forecast.accountsCycle()) + daysToBeginDay) <= forecast.forecastDays(); ++i) {
-    int col = addColumn(i18n("Min Bal %1").tqarg(i), -1);
+    int col = addColumn(i18n("Min Bal %1").arg(i), -1);
     setColumnAlignment(col, TQt::AlignRight);
-    addColumn(i18n("Min Date %1").tqarg(i), -1);
+    addColumn(i18n("Min Date %1").arg(i), -1);
   }
   for(int i = 1; ((i * forecast.accountsCycle()) + daysToBeginDay) <= forecast.forecastDays(); ++i) {
-    int col = addColumn(i18n("Max Bal %1").tqarg(i), -1);
+    int col = addColumn(i18n("Max Bal %1").arg(i), -1);
     setColumnAlignment(col, TQt::AlignRight);
-    addColumn(i18n("Max Date %1").tqarg(i), -1);
+    addColumn(i18n("Max Date %1").arg(i), -1);
   }
   int col = addColumn(i18n("Average"), -1);
   setColumnAlignment(col, TQt::AlignRight);
@@ -205,8 +205,8 @@ void KMyMoneyAccountTreeForecastItem::updateSummary()
   MyMoneyFile* file = MyMoneyFile::instance();
   int daysToBeginDay;
 
-  if(TQDate::tqcurrentDate() < m_forecast.beginForecastDate()) {
-    daysToBeginDay = TQDate::tqcurrentDate().daysTo(m_forecast.beginForecastDate());
+  if(TQDate::currentDate() < m_forecast.beginForecastDate()) {
+    daysToBeginDay = TQDate::currentDate().daysTo(m_forecast.beginForecastDate());
   } else {
     daysToBeginDay = m_forecast.accountsCycle();
   }
@@ -221,7 +221,7 @@ void KMyMoneyAccountTreeForecastItem::updateSummary()
 
 
     //add current balance column
-  TQDate summaryDate = TQDate::tqcurrentDate();
+  TQDate summaryDate = TQDate::currentDate();
   amountMM = m_forecast.forecastBalance(m_account, summaryDate);
 
   //calculate the balance in base currency for the total row
@@ -231,7 +231,7 @@ void KMyMoneyAccountTreeForecastItem::updateSummary()
   it_c++;
 
     //iterate through all other columns
-  for(TQDate summaryDate = TQDate::tqcurrentDate().addDays(daysToBeginDay); summaryDate <= m_forecast.forecastEndDate();summaryDate = summaryDate.addDays(m_forecast.accountsCycle()), ++it_c) {
+  for(TQDate summaryDate = TQDate::currentDate().addDays(daysToBeginDay); summaryDate <= m_forecast.forecastEndDate();summaryDate = summaryDate.addDays(m_forecast.accountsCycle()), ++it_c) {
     amountMM = m_forecast.forecastBalance(m_account, summaryDate);
 
     //calculate the balance in base currency for the total row
@@ -263,7 +263,7 @@ void KMyMoneyAccountTreeForecastItem::updateDetailed()
 
   int it_c = 1; // iterator for the columns of the listview
 
-  for(TQDate forecastDate = TQDate::tqcurrentDate(); forecastDate <= m_forecast.forecastEndDate(); ++it_c, forecastDate = forecastDate.addDays(1)) {
+  for(TQDate forecastDate = TQDate::currentDate(); forecastDate <= m_forecast.forecastEndDate(); ++it_c, forecastDate = forecastDate.addDays(1)) {
     MyMoneyMoney amountMM = m_forecast.forecastBalance(m_account, forecastDate);
 
     //calculate the balance in base currency for the total row
@@ -329,7 +329,7 @@ void KMyMoneyAccountTreeForecastItem::adjustParentValue(int column, const MyMone
   m_values[column] += value;
   m_values[column] = m_values[column].convert(listView()->baseCurrency().smallestAccountFraction());
 
-  // if the entry has no tqchildren,
+  // if the entry has no children,
   // or it is the top entry
   // or it is currently not open
   // we need to display the value of it