summaryrefslogtreecommitdiffstats
path: root/kmymoney2/reports
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:10:39 -0600
committerSlávek Banko <slavek.banko@axis.cz>2012-06-06 03:55:14 +0200
commite0d4ece30d7c0095bfdd9a81364b66fe18a0f2cb (patch)
treea38d8fbb9786006a80b3c58554377a82ddbed49c /kmymoney2/reports
parent9a28776b6c0b3446535e039d82c28519aa5a6479 (diff)
downloadkmymoney-e0d4ece30d7c0095bfdd9a81364b66fe18a0f2cb.tar.gz
kmymoney-e0d4ece30d7c0095bfdd9a81364b66fe18a0f2cb.zip
Rename old tq methods that no longer need a unique name
(cherry picked from commit 28723595822268551d3e050c3a83bf6ca5e17dd5)
Diffstat (limited to 'kmymoney2/reports')
-rw-r--r--kmymoney2/reports/kreportchartview.cpp2
-rw-r--r--kmymoney2/reports/objectinfotable.cpp8
-rw-r--r--kmymoney2/reports/pivottable.cpp20
-rw-r--r--kmymoney2/reports/querytable.cpp2
4 files changed, 16 insertions, 16 deletions
diff --git a/kmymoney2/reports/kreportchartview.cpp b/kmymoney2/reports/kreportchartview.cpp
index 79a5b5d..5fe01e3 100644
--- a/kmymoney2/reports/kreportchartview.cpp
+++ b/kmymoney2/reports/kreportchartview.cpp
@@ -95,7 +95,7 @@ KReportChartView::KReportChartView( TQWidget* parent, const char* name ): KDChar
// mouse tracking on will force the mouseMoveEvent() method to be called from TQt
label->setMouseTracking( true );
label->setFrameStyle( TQFrame::PopupPanel | TQFrame::Raised );
- label->tqsetAlignment( AlignRight );
+ label->setAlignment( AlignRight );
label->setAutoResize( true );
}
diff --git a/kmymoney2/reports/objectinfotable.cpp b/kmymoney2/reports/objectinfotable.cpp
index 37dfecc..26bdc1f 100644
--- a/kmymoney2/reports/objectinfotable.cpp
+++ b/kmymoney2/reports/objectinfotable.cpp
@@ -157,7 +157,7 @@ void ObjectInfoTable::constructScheduleTable ( void )
//convert to base currency if needed
MyMoneyMoney xr = MyMoneyMoney(1,1);
if (m_config.isConvertCurrency() && account.isForeignCurrency()) {
- xr = account.baseCurrencyPrice(TQDate::tqcurrentDate()).reduce();
+ xr = account.baseCurrencyPrice(TQDate::currentDate()).reduce();
}
// help for sort and render functions
@@ -274,7 +274,7 @@ void ObjectInfoTable::constructAccountTable ( void )
//convert to base currency if needed
if (m_config.isConvertCurrency() && account.isForeignCurrency()) {
- MyMoneyMoney xr = account.baseCurrencyPrice(TQDate::tqcurrentDate()).reduce();
+ MyMoneyMoney xr = account.baseCurrencyPrice(TQDate::currentDate()).reduce();
value = value * xr;
}
accountRow["currentbalance"] = value.toString();
@@ -306,7 +306,7 @@ void ObjectInfoTable::constructAccountLoanTable ( void )
//convert to base currency if needed
MyMoneyMoney xr = MyMoneyMoney(1,1);
if (m_config.isConvertCurrency() && account.isForeignCurrency()) {
- xr = account.baseCurrencyPrice(TQDate::tqcurrentDate()).reduce();
+ xr = account.baseCurrencyPrice(TQDate::currentDate()).reduce();
}
accountRow["rank"] = "0";
@@ -321,7 +321,7 @@ void ObjectInfoTable::constructAccountLoanTable ( void )
accountRow["currencyname"] = (file->currency(account.currencyId())).name();
accountRow["payee"] = file->payee(loan.payee()).name();
accountRow["loanamount"] = (loan.loanAmount() * xr).toString();
- accountRow["interestrate"] = (loan.interestRate(TQDate::tqcurrentDate())/MyMoneyMoney(100,1)*xr).toString();
+ accountRow["interestrate"] = (loan.interestRate(TQDate::currentDate())/MyMoneyMoney(100,1)*xr).toString();
accountRow["nextinterestchange"] = loan.nextInterestChange().toString( Qt::ISODate );
accountRow["periodicpayment"] = (loan.periodicPayment() * xr).toString();
accountRow["finalpayment"] = (loan.finalPayment() * xr).toString();
diff --git a/kmymoney2/reports/pivottable.cpp b/kmymoney2/reports/pivottable.cpp
index bf048cb..5acac5b 100644
--- a/kmymoney2/reports/pivottable.cpp
+++ b/kmymoney2/reports/pivottable.cpp
@@ -230,8 +230,8 @@ void PivotTable::init(void)
while ( it_date != paymentDates.end() )
{
//if the payment occurs in the past, enter it tomorrow
- if(TQDate::tqcurrentDate() >= *it_date) {
- tx.setPostDate(TQDate::tqcurrentDate().addDays(1));
+ if(TQDate::currentDate() >= *it_date) {
+ tx.setPostDate(TQDate::currentDate().addDays(1));
} else {
tx.setPostDate(*it_date);
}
@@ -286,8 +286,8 @@ void PivotTable::init(void)
TQDate dueDate = sched.nextDueDate();
//if the payment is overdue, use current date
- if(dueDate < TQDate::tqcurrentDate())
- dueDate = TQDate::tqcurrentDate();
+ if(dueDate < TQDate::currentDate())
+ dueDate = TQDate::currentDate();
//get the balance from the file for the date
loanBalances[splitAccount.id()] = file->balance(splitAccount.id(), dueDate.addDays(-1));
@@ -831,7 +831,7 @@ void PivotTable::calculateBudgetMapping( void )
TQValueList<MyMoneyBudget>::const_iterator budgets_it = budgets.begin();
while( budgets_it != budgets.end() ) {
//pick the first budget that matches the report start year
- if( (*budgets_it).budgetStart().year() == TQDate::tqcurrentDate().year() ) {
+ if( (*budgets_it).budgetStart().year() == TQDate::currentDate().year() ) {
budget = file->budget( (*budgets_it).id());
break;
}
@@ -2213,7 +2213,7 @@ void PivotTable::drawChart( KReportChartView& _view ) const
{
// the first column of report which represents a date in the future, or one past the
// last column if all columns are in the present day. Only relevant when accountSeries==true
- unsigned futurecolumn = columnValue(TQDate::tqcurrentDate()) - columnValue(m_beginDate) + 1;
+ unsigned futurecolumn = columnValue(TQDate::currentDate()) - columnValue(m_beginDate) + 1;
// kdDebug(2) << "futurecolumn: " << futurecolumn << endl;
// kdDebug(2) << "m_numColumns: " << m_numColumns << endl;
@@ -2335,10 +2335,10 @@ void PivotTable::calculateForecast(void)
forecast.setIncludeUnusedAccounts(true);
//setup forecast dates
- if(m_endDate > TQDate::tqcurrentDate()) {
+ if(m_endDate > TQDate::currentDate()) {
forecast.setForecastEndDate(m_endDate);
- forecast.setForecastStartDate(TQDate::tqcurrentDate());
- forecast.setForecastDays(TQDate::tqcurrentDate().daysTo(m_endDate));
+ forecast.setForecastStartDate(TQDate::currentDate());
+ forecast.setForecastDays(TQDate::currentDate().daysTo(m_endDate));
} else {
forecast.setForecastStartDate(m_beginDate);
forecast.setForecastEndDate(m_endDate);
@@ -2346,7 +2346,7 @@ void PivotTable::calculateForecast(void)
}
//adjust history dates if beginning date is before today
- if(m_beginDate < TQDate::tqcurrentDate()) {
+ if(m_beginDate < TQDate::currentDate()) {
forecast.setHistoryEndDate(m_beginDate.addDays(-1));
forecast.setHistoryStartDate(forecast.historyEndDate().addDays(-forecast.accountsCycle()*forecast.forecastCycles()));
}
diff --git a/kmymoney2/reports/querytable.cpp b/kmymoney2/reports/querytable.cpp
index 8257ce3..8f9151a 100644
--- a/kmymoney2/reports/querytable.cpp
+++ b/kmymoney2/reports/querytable.cpp
@@ -59,7 +59,7 @@ namespace reports {
//
// ****************************************************************************
-TQDate CashFlowListItem::m_sToday = TQDate::tqcurrentDate();
+TQDate CashFlowListItem::m_sToday = TQDate::currentDate();
MyMoneyMoney CashFlowListItem::NPV( double _rate ) const
{