diff options
Diffstat (limited to 'kmymoney2/converter')
-rw-r--r-- | kmymoney2/converter/convertertest.cpp | 20 | ||||
-rw-r--r-- | kmymoney2/converter/mymoneygncreader.cpp | 12 | ||||
-rw-r--r-- | kmymoney2/converter/mymoneyqifreader.cpp | 8 | ||||
-rw-r--r-- | kmymoney2/converter/mymoneystatementreader.cpp | 2 | ||||
-rw-r--r-- | kmymoney2/converter/webpricequote.cpp | 6 | ||||
-rw-r--r-- | kmymoney2/converter/webpricequote.h | 4 |
6 files changed, 26 insertions, 26 deletions
diff --git a/kmymoney2/converter/convertertest.cpp b/kmymoney2/converter/convertertest.cpp index 739c6f3..bbe0ec4 100644 --- a/kmymoney2/converter/convertertest.cpp +++ b/kmymoney2/converter/convertertest.cpp @@ -112,8 +112,8 @@ void ConverterTest::testWebQuotes() CPPUNIT_ASSERT(qr.m_errors.count() == 0); // Quote date should be within the last week, or something bad is going on. - CPPUNIT_ASSERT(qr.m_date <= TQDate::tqcurrentDate()); - CPPUNIT_ASSERT(qr.m_date >= TQDate::tqcurrentDate().addDays(-7)); + CPPUNIT_ASSERT(qr.m_date <= TQDate::currentDate()); + CPPUNIT_ASSERT(qr.m_date >= TQDate::currentDate().addDays(-7)); // Quote value should at least be positive CPPUNIT_ASSERT(qr.m_price.isPositive()); @@ -123,8 +123,8 @@ void ConverterTest::testWebQuotes() // kdDebug(2) << "ConverterTest::testWebQuotes(): quote for " << q.m_symbol << " on " << qr.m_date.toString() << " is " << qr.m_price.toString() << " errors(" << qr.m_errors.count() << "): " << qr.m_errors.join(" /// ") << endl; CPPUNIT_ASSERT(qr.m_errors.count() == 0); - CPPUNIT_ASSERT(qr.m_date <= TQDate::tqcurrentDate().addDays(1)); - CPPUNIT_ASSERT(qr.m_date >= TQDate::tqcurrentDate().addDays(-7)); + CPPUNIT_ASSERT(qr.m_date <= TQDate::currentDate().addDays(1)); + CPPUNIT_ASSERT(qr.m_date >= TQDate::currentDate().addDays(-7)); CPPUNIT_ASSERT(qr.m_price.isPositive()); q.launch("EUR > USD","Yahoo Currency"); @@ -132,8 +132,8 @@ void ConverterTest::testWebQuotes() // kdDebug(2) << "ConverterTest::testWebQuotes(): quote for " << q.m_symbol << " on " << qr.m_date.toString() << " is " << qr.m_price.toString() << " errors(" << qr.m_errors.count() << "): " << qr.m_errors.join(" /// ") << endl; CPPUNIT_ASSERT(qr.m_errors.count() == 0); - CPPUNIT_ASSERT(qr.m_date <= TQDate::tqcurrentDate().addDays(1)); - CPPUNIT_ASSERT(qr.m_date >= TQDate::tqcurrentDate().addDays(-7)); + CPPUNIT_ASSERT(qr.m_date <= TQDate::currentDate().addDays(1)); + CPPUNIT_ASSERT(qr.m_date >= TQDate::currentDate().addDays(-7)); CPPUNIT_ASSERT(qr.m_price.isPositive()); q.launch("50492","Globe & Mail"); @@ -141,8 +141,8 @@ void ConverterTest::testWebQuotes() // kdDebug(2) << "ConverterTest::testWebQuotes(): quote for " << q.m_symbol << " on " << qr.m_date.toString() << " is " << qr.m_price.toString() << " errors(" << qr.m_errors.count() << "): " << qr.m_errors.join(" /// ") << endl; CPPUNIT_ASSERT(qr.m_errors.count() == 0); - CPPUNIT_ASSERT(qr.m_date <= TQDate::tqcurrentDate().addDays(1)); - CPPUNIT_ASSERT(qr.m_date >= TQDate::tqcurrentDate().addDays(-7)); + CPPUNIT_ASSERT(qr.m_date <= TQDate::currentDate().addDays(1)); + CPPUNIT_ASSERT(qr.m_date >= TQDate::currentDate().addDays(-7)); CPPUNIT_ASSERT(qr.m_price.isPositive()); q.launch("TDB647","MSN.CA"); @@ -150,8 +150,8 @@ void ConverterTest::testWebQuotes() // kdDebug(2) << "ConverterTest::testWebQuotes(): quote for " << q.m_symbol << " on " << qr.m_date.toString() << " is " << qr.m_price.toString() << " errors(" << qr.m_errors.count() << "): " << qr.m_errors.join(" /// ") << endl; CPPUNIT_ASSERT(qr.m_errors.count() == 0); - CPPUNIT_ASSERT(qr.m_date <= TQDate::tqcurrentDate().addDays(1)); - CPPUNIT_ASSERT(qr.m_date >= TQDate::tqcurrentDate().addDays(-7)); + CPPUNIT_ASSERT(qr.m_date <= TQDate::currentDate().addDays(1)); + CPPUNIT_ASSERT(qr.m_date >= TQDate::currentDate().addDays(-7)); CPPUNIT_ASSERT(qr.m_price.isPositive()); } diff --git a/kmymoney2/converter/mymoneygncreader.cpp b/kmymoney2/converter/mymoneygncreader.cpp index bfd6911..9be8003 100644 --- a/kmymoney2/converter/mymoneygncreader.cpp +++ b/kmymoney2/converter/mymoneygncreader.cpp @@ -1192,10 +1192,10 @@ void MyMoneyGncReader::convertAccount (const GncAccount* gac) { acc.setDescription(gac->desc()); - TQDate tqcurrentDate = TQDate::tqcurrentDate(); - acc.setOpeningDate(tqcurrentDate); - acc.setLastModified(tqcurrentDate); - acc.setLastReconciliationDate(tqcurrentDate); + TQDate currentDate = TQDate::currentDate(); + acc.setOpeningDate(currentDate); + acc.setLastModified(currentDate); + acc.setLastReconciliationDate(currentDate); if (gac->commodity()->isCurrency()) { acc.setCurrencyId (gac->commodity()->id().utf8()); m_currencyCount[gac->commodity()->id()]++; @@ -1717,7 +1717,7 @@ void MyMoneyGncReader::convertSchedule (const GncSchedule *gsc) { MyMoneyTransaction tx; m_suspectSchedule = false; TQDate startDate, nextDate, lastDate, endDate; // for date calculations - TQDate today = TQDate::tqcurrentDate(); + TQDate today = TQDate::currentDate(); int numOccurs, remOccurs; if (m_scheduleCount == 0) signalProgress (0, m_gncScheduleCount, i18n("Loading schedules...")); @@ -2139,7 +2139,7 @@ TQString MyMoneyGncReader::createOrphanAccount (const TQString& gncName) { acc.setName ("orphan_" + gncName); acc.setDescription (i18n("Orphan created from unknown gnucash account")); - TQDate today = TQDate::tqcurrentDate(); + TQDate today = TQDate::currentDate(); acc.setOpeningDate (today); acc.setLastModified (today); diff --git a/kmymoney2/converter/mymoneyqifreader.cpp b/kmymoney2/converter/mymoneyqifreader.cpp index 809d71c..75aca75 100644 --- a/kmymoney2/converter/mymoneyqifreader.cpp +++ b/kmymoney2/converter/mymoneyqifreader.cpp @@ -460,7 +460,7 @@ bool MyMoneyQifReader::finishImport(void) // remove the Don't ask again entries KConfig* config = KGlobal::config(); - config->setGroup(TQString::tqfromLatin1("Notification Messages")); + config->setGroup(TQString::fromLatin1("Notification Messages")); TQStringList::ConstIterator it; for(it = m_dontAskAgain.begin(); it != m_dontAskAgain.end(); ++it) { @@ -480,7 +480,7 @@ bool MyMoneyQifReader::finishImport(void) // remove the Don't ask again entries KConfig* config = KGlobal::config(); - config->setGroup(TQString::tqfromLatin1("Notification Messages")); + config->setGroup(TQString::fromLatin1("Notification Messages")); TQStringList::ConstIterator it; for(it = m_dontAskAgain.begin(); it != m_dontAskAgain.end(); ++it) { @@ -1058,7 +1058,7 @@ void MyMoneyQifReader::processTransactionEntry(void) i18n("Invalid date format")); switch(rc) { case KMessageBox::Continue: - tr.m_datePosted = (TQDate::tqcurrentDate()); + tr.m_datePosted = (TQDate::currentDate()); break; case KMessageBox::Cancel: @@ -1305,7 +1305,7 @@ void MyMoneyQifReader::processInvestmentTransactionEntry(void) i18n("Invalid date format")); switch(rc) { case KMessageBox::Continue: - tr.m_datePosted = TQDate::tqcurrentDate(); + tr.m_datePosted = TQDate::currentDate(); break; case KMessageBox::Cancel: diff --git a/kmymoney2/converter/mymoneystatementreader.cpp b/kmymoney2/converter/mymoneystatementreader.cpp index f25eed4..8f8f7d0 100644 --- a/kmymoney2/converter/mymoneystatementreader.cpp +++ b/kmymoney2/converter/mymoneystatementreader.cpp @@ -402,7 +402,7 @@ bool MyMoneyStatementReader::import(const MyMoneyStatement& s, TQStringList& mes // remove the Don't ask again entries KConfig* config = KGlobal::config(); - config->setGroup(TQString::tqfromLatin1("Notification Messages")); + config->setGroup(TQString::fromLatin1("Notification Messages")); TQStringList::ConstIterator it; for(it = m_dontAskAgain.begin(); it != m_dontAskAgain.end(); ++it) { diff --git a/kmymoney2/converter/webpricequote.cpp b/kmymoney2/converter/webpricequote.cpp index 7732e54..0fab2b9 100644 --- a/kmymoney2/converter/webpricequote.cpp +++ b/kmymoney2/converter/webpricequote.cpp @@ -382,7 +382,7 @@ void WebPriceQuote::slotParseQuote(const TQString& _quotedata) catch (MyMoneyException* e) { // emit error(i18n("Unable to parse date %1 using format %2: %3").tqarg(datestr,dateparse.format(),e->what())); - m_date = TQDate::tqcurrentDate(); + m_date = TQDate::currentDate(); gotdate = true; delete e; } @@ -1016,7 +1016,7 @@ convertertest::QuoteReceiver::QuoteReceiver(WebPriceQuote* q, TQObject* parent, connect(q,TQT_SIGNAL(quote(const TQString&,const TQDate&, const double&)), this,TQT_SLOT(slotGetQuote(const TQString&,const TQDate&, const double&))); connect(q,TQT_SIGNAL(status(const TQString&)), - this,TQT_SLOT(slottqStatus(const TQString&))); + this,TQT_SLOT(slotStatus(const TQString&))); connect(q,TQT_SIGNAL(error(const TQString&)), this,TQT_SLOT(slotError(const TQString&))); } @@ -1032,7 +1032,7 @@ void convertertest::QuoteReceiver::slotGetQuote(const TQString&,const TQDate& d, m_price = MyMoneyMoney(m); m_date = d; } -void convertertest::QuoteReceiver::slottqStatus(const TQString& msg) +void convertertest::QuoteReceiver::slotStatus(const TQString& msg) { // kdDebug(2) << "test::QuoteReceiver::slotStatus( " << msg << " )" << endl; diff --git a/kmymoney2/converter/webpricequote.h b/kmymoney2/converter/webpricequote.h index ada7684..377ba8d 100644 --- a/kmymoney2/converter/webpricequote.h +++ b/kmymoney2/converter/webpricequote.h @@ -217,7 +217,7 @@ class MyMoneyDateFormat public: MyMoneyDateFormat(const TQString& _format): m_format(_format) {} TQString convertDate(const TQDate& _in) const; - TQDate convertString(const TQString& _in, bool _strict=true, unsigned _centurymidpoint = TQDate::tqcurrentDate().year() ) const; + TQDate convertString(const TQString& _in, bool _strict=true, unsigned _centurymidpoint = TQDate::currentDate().year() ) const; const TQString& format(void) const { return m_format; } private: TQString m_format; @@ -239,7 +239,7 @@ public: ~QuoteReceiver(); public slots: void slotGetQuote(const TQString&,const TQDate&, const double&); - void slottqStatus(const TQString&); + void slotStatus(const TQString&); void slotError(const TQString&); public: TQStringList m_statuses; |