diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:10:39 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:10:39 -0600 |
commit | 28723595822268551d3e050c3a83bf6ca5e17dd5 (patch) | |
tree | c84224b55e09375ad246f24649df1ffc89c04d1d /kmymoney2/mymoney/mymoneytransactionfilter.cpp | |
parent | 1f9d00360b9018301630ce062d7dda0c6583edfb (diff) | |
download | kmymoney-28723595822268551d3e050c3a83bf6ca5e17dd5.tar.gz kmymoney-28723595822268551d3e050c3a83bf6ca5e17dd5.zip |
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'kmymoney2/mymoney/mymoneytransactionfilter.cpp')
-rw-r--r-- | kmymoney2/mymoney/mymoneytransactionfilter.cpp | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/kmymoney2/mymoney/mymoneytransactionfilter.cpp b/kmymoney2/mymoney/mymoneytransactionfilter.cpp index 7998051..ba3c4b6 100644 --- a/kmymoney2/mymoney/mymoneytransactionfilter.cpp +++ b/kmymoney2/mymoney/mymoneytransactionfilter.cpp @@ -711,9 +711,9 @@ bool MyMoneyTransactionFilter::translateDateRange(dateOptionE id, TQDate& start, { bool rc = true; int yr, mon, day; - yr = TQDate::tqcurrentDate().year(); - mon = TQDate::tqcurrentDate().month(); - day = TQDate::tqcurrentDate().day(); + yr = TQDate::currentDate().year(); + mon = TQDate::currentDate().month(); + day = TQDate::currentDate().day(); TQDate tmp; switch(id) { @@ -723,7 +723,7 @@ bool MyMoneyTransactionFilter::translateDateRange(dateOptionE id, TQDate& start, break; case MyMoneyTransactionFilter::asOfToday: start = TQDate(); - end = TQDate::tqcurrentDate(); + end = TQDate::currentDate(); break; case MyMoneyTransactionFilter::currentMonth: start = TQDate(yr,mon,1); @@ -735,11 +735,11 @@ bool MyMoneyTransactionFilter::translateDateRange(dateOptionE id, TQDate& start, break; case MyMoneyTransactionFilter::monthToDate: start = TQDate(yr,mon,1); - end = TQDate::tqcurrentDate(); + end = TQDate::currentDate(); break; case MyMoneyTransactionFilter::yearToDate: start = TQDate(yr,1,1); - end = TQDate::tqcurrentDate(); + end = TQDate::currentDate(); break; case MyMoneyTransactionFilter::yearToMonth: start = TQDate(yr,1,1); @@ -754,56 +754,56 @@ bool MyMoneyTransactionFilter::translateDateRange(dateOptionE id, TQDate& start, end = TQDate(yr,12,31).addYears(-1); break; case MyMoneyTransactionFilter::last7Days: - start = TQDate::tqcurrentDate().addDays(-7); - end = TQDate::tqcurrentDate(); + start = TQDate::currentDate().addDays(-7); + end = TQDate::currentDate(); break; case MyMoneyTransactionFilter::last30Days: - start = TQDate::tqcurrentDate().addDays(-30); - end = TQDate::tqcurrentDate(); + start = TQDate::currentDate().addDays(-30); + end = TQDate::currentDate(); break; case MyMoneyTransactionFilter::last3Months: - start = TQDate::tqcurrentDate().addMonths(-3); - end = TQDate::tqcurrentDate(); + start = TQDate::currentDate().addMonths(-3); + end = TQDate::currentDate(); break; case MyMoneyTransactionFilter::last6Months: - start = TQDate::tqcurrentDate().addMonths(-6); - end = TQDate::tqcurrentDate(); + start = TQDate::currentDate().addMonths(-6); + end = TQDate::currentDate(); break; case MyMoneyTransactionFilter::last11Months: start = TQDate(yr,mon,1).addMonths(-12); end = TQDate(yr,mon,1).addDays(-1); break; case MyMoneyTransactionFilter::last12Months: - start = TQDate::tqcurrentDate().addMonths(-12); - end = TQDate::tqcurrentDate(); + start = TQDate::currentDate().addMonths(-12); + end = TQDate::currentDate(); break; case MyMoneyTransactionFilter::next7Days: - start = TQDate::tqcurrentDate(); - end = TQDate::tqcurrentDate().addDays(7); + start = TQDate::currentDate(); + end = TQDate::currentDate().addDays(7); break; case MyMoneyTransactionFilter::next30Days: - start = TQDate::tqcurrentDate(); - end = TQDate::tqcurrentDate().addDays(30); + start = TQDate::currentDate(); + end = TQDate::currentDate().addDays(30); break; case MyMoneyTransactionFilter::next3Months: - start = TQDate::tqcurrentDate(); - end = TQDate::tqcurrentDate().addMonths(3); + start = TQDate::currentDate(); + end = TQDate::currentDate().addMonths(3); break; case MyMoneyTransactionFilter::next6Months: - start = TQDate::tqcurrentDate(); - end = TQDate::tqcurrentDate().addMonths(6); + start = TQDate::currentDate(); + end = TQDate::currentDate().addMonths(6); break; case MyMoneyTransactionFilter::next12Months: - start = TQDate::tqcurrentDate(); - end = TQDate::tqcurrentDate().addMonths(12); + start = TQDate::currentDate(); + end = TQDate::currentDate().addMonths(12); break; case MyMoneyTransactionFilter::userDefined: start = TQDate(); end = TQDate(); break; case MyMoneyTransactionFilter::last3ToNext3Months: - start = TQDate::tqcurrentDate().addMonths(-3); - end = TQDate::tqcurrentDate().addMonths(3); + start = TQDate::currentDate().addMonths(-3); + end = TQDate::currentDate().addMonths(3); break; case MyMoneyTransactionFilter::currentQuarter: start = TQDate(yr, mon - ((mon-1) % 3), 1); @@ -818,21 +818,21 @@ bool MyMoneyTransactionFilter::translateDateRange(dateOptionE id, TQDate& start, end = start.addMonths(3).addDays(-1); break; case MyMoneyTransactionFilter::currentFiscalYear: - start = TQDate(TQDate::tqcurrentDate().year(), fiscalYearStartMonth, fiscalYearStartDay); - if(TQDate::tqcurrentDate() < start) + start = TQDate(TQDate::currentDate().year(), fiscalYearStartMonth, fiscalYearStartDay); + if(TQDate::currentDate() < start) start = start.addYears(-1); end = start.addYears(1).addDays(-1); break; case MyMoneyTransactionFilter::lastFiscalYear: - start = TQDate(TQDate::tqcurrentDate().year(), fiscalYearStartMonth, fiscalYearStartDay); - if(TQDate::tqcurrentDate() < start) + start = TQDate(TQDate::currentDate().year(), fiscalYearStartMonth, fiscalYearStartDay); + if(TQDate::currentDate() < start) start = start.addYears(-1); start = start.addYears(-1); end = start.addYears(1).addDays(-1); break; case MyMoneyTransactionFilter::today: - start = TQDate::tqcurrentDate(); - end = TQDate::tqcurrentDate(); + start = TQDate::currentDate(); + end = TQDate::currentDate(); break; default: qFatal("Unknown date identifier %d in MyMoneyTransactionFilter::translateDateRange()", id); |