diff options
Diffstat (limited to 'kmymoney2/mymoney/storage')
7 files changed, 31 insertions, 31 deletions
diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp b/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp index a80d5af..7cbcb6b 100644 --- a/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp +++ b/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp @@ -26,8 +26,8 @@ #define PASS } catch (MyMoneyException *e) { throw; } MyMoneyDatabaseMgr::MyMoneyDatabaseMgr() : -m_creationDate (TQDate::tqcurrentDate ()), -m_lastModificationDate (TQDate::tqcurrentDate ()), +m_creationDate (TQDate::currentDate ()), +m_lastModificationDate (TQDate::currentDate ()), m_sql (0) { } @@ -913,7 +913,7 @@ const MyMoneyMoney MyMoneyDatabaseMgr::balance(const TQString& id, const TQDate& //DEBUG TQDate date_ (date); - //if (date_ == TQDate()) date_ = TQDate::tqcurrentDate(); + //if (date_ == TQDate()) date_ = TQDate::currentDate(); // END DEBUG MyMoneyMoney result(0); @@ -1278,7 +1278,7 @@ const TQValueList<MyMoneySchedule> MyMoneyDatabaseMgr::scheduleList(const TQStri TQDate nextPayment = (*pos).nextPayment((*pos).lastPayment()); if(!nextPayment.isValid()) continue; - if(nextPayment >= TQDate::tqcurrentDate()) + if(nextPayment >= TQDate::currentDate()) continue; */ } diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp b/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp index d0d2065..cf76cb6 100644 --- a/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp +++ b/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp @@ -70,7 +70,7 @@ void MyMoneyDatabaseMgrTest::testEmptyConstructor() CPPUNIT_ASSERT(m->payeeList().count() == 0); CPPUNIT_ASSERT(m->scheduleList().count() == 0); - CPPUNIT_ASSERT(m->m_creationDate == TQDate::tqcurrentDate()); + CPPUNIT_ASSERT(m->m_creationDate == TQDate::currentDate()); } void MyMoneyDatabaseMgrTest::testCreateDb() { @@ -118,8 +118,8 @@ void MyMoneyDatabaseMgrTest::testAttachDb() { MyMoneyFile::instance()->detachStorage(); KSharedPtr <MyMoneyStorageSql> sql = m->connectToDatabase(m_url); CPPUNIT_ASSERT(sql); - int opentqStatus = sql->open(m_url, IO_ReadWrite); - CPPUNIT_ASSERT(0 == opentqStatus); + int openStatus = sql->open(m_url, IO_ReadWrite); + CPPUNIT_ASSERT(0 == openStatus); MyMoneyFile::instance()->attachStorage(m); m->startTransaction(); m_dbAttached = true; @@ -717,7 +717,7 @@ void MyMoneyDatabaseMgrTest::testAddBudget() { MyMoneyBudget budget; budget.setName("TestBudget"); - budget.setBudgetStart(TQDate::tqcurrentDate(TQt::LocalTime)); + budget.setBudgetStart(TQDate::currentDate(TQt::LocalTime)); m->addBudget(budget); @@ -773,7 +773,7 @@ void MyMoneyDatabaseMgrTest::testModifyBudget() { MyMoneyBudget budget = m->budgetByName("TestBudget"); - budget.setBudgetStart(TQDate::tqcurrentDate(TQt::LocalTime).addDays(-1)); + budget.setBudgetStart(TQDate::currentDate(TQt::LocalTime).addDays(-1)); m->modifyBudget(budget); @@ -1650,7 +1650,7 @@ void MyMoneyDatabaseMgrTest::testScheduleList() { // put some accounts in the db, so the tests don't break testReparentAccount(); - TQDate testDate = TQDate::tqcurrentDate(); + TQDate testDate = TQDate::currentDate(); TQDate notOverdue = testDate.addDays(2); TQDate overdue = testDate.addDays(-2); diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp index ef4c3a9..da9a40c 100644 --- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp +++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp @@ -44,7 +44,7 @@ MyMoneySeqAccessMgr::MyMoneySeqAccessMgr() m_nextBudgetID = 0; m_user = MyMoneyPayee(); m_dirty = false; - m_creationDate = TQDate::tqcurrentDate(); + m_creationDate = TQDate::currentDate(); // setup standard accounts MyMoneyAccount acc_l; @@ -448,7 +448,7 @@ void MyMoneySeqAccessMgr::addTransaction(MyMoneyTransaction& transaction, const void MyMoneySeqAccessMgr::touch(void) { m_dirty = true; - m_lastModificationDate = TQDate::tqcurrentDate(); + m_lastModificationDate = TQDate::currentDate(); } bool MyMoneySeqAccessMgr::hasActiveSplits(const TQString& id) const @@ -1731,7 +1731,7 @@ const MyMoneyPrice MyMoneySeqAccessMgr::price(const TQString& fromId, const TQSt // If no valid date is passed, we use today's date. if(!date.isValid()) - date = TQDate::tqcurrentDate(); + date = TQDate::currentDate(); // If the caller selected an exact entry, we can search for // it using the date as the key diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h index 0aebe23..e054613 100644 --- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h +++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h @@ -939,7 +939,7 @@ public: /** * This method retrieves a price from the price list. - * If @p date is inValid, TQDate::tqcurrentDate() is assumed. + * If @p date is inValid, TQDate::currentDate() is assumed. */ const MyMoneyPrice price(const TQString& fromId, const TQString& toId, const TQDate& date, const bool exactDate) const; diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp b/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp index 94d98f5..9c36204 100644 --- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp +++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp @@ -63,7 +63,7 @@ void MyMoneySeqAccessMgrTest::testEmptyConstructor() CPPUNIT_ASSERT(m->m_scheduleList.count() == 0); CPPUNIT_ASSERT(m->m_dirty == false); - CPPUNIT_ASSERT(m->m_creationDate == TQDate::tqcurrentDate()); + CPPUNIT_ASSERT(m->m_creationDate == TQDate::currentDate()); CPPUNIT_ASSERT(m->liability().name() == "Liability"); CPPUNIT_ASSERT(m->asset().name() == "Asset"); @@ -1302,7 +1302,7 @@ void MyMoneySeqAccessMgrTest::testRemoveSchedule() { } void MyMoneySeqAccessMgrTest::testScheduleList() { - TQDate testDate = TQDate::tqcurrentDate(); + TQDate testDate = TQDate::currentDate(); TQDate notOverdue = testDate.addDays(2); TQDate overdue = testDate.addDays(-2); diff --git a/kmymoney2/mymoney/storage/mymoneystoragesql.cpp b/kmymoney2/mymoney/storage/mymoneystoragesql.cpp index 8f6a4f3..7973519 100644 --- a/kmymoney2/mymoney/storage/mymoneystoragesql.cpp +++ b/kmymoney2/mymoney/storage/mymoneystoragesql.cpp @@ -118,7 +118,7 @@ MyMoneyStorageSql::MyMoneyStorageSql (IMyMoneySerialize *storage, const KURL& ur DBG("*** Entering MyMoneyStorageSql::MyMoneyStorageSql"); m_dbVersion = 0; m_progressCallback = 0; - m_displaytqStatus = false; + m_displayStatus = false; m_storage = storage; m_storagePtr = dynamic_cast<IMyMoneyStorage*>(storage); m_newDatabase = false; @@ -200,7 +200,7 @@ try { rc = -1; } else { m_logonUser = url.user() + "@" + url.host(); - m_logonAt = TQDateTime::tqcurrentDateTime(); + m_logonAt = TQDateTime::currentDateTime(); writeFileInfo(); } return(rc); @@ -821,7 +821,7 @@ void MyMoneyStorageSql::clean() { bool MyMoneyStorageSql::readFile(void) { DBG("*** Entering MyMoneyStorageSql::readFile"); - m_displaytqStatus = true; + m_displayStatus = true; try { readFileInfo(); readInstitutions(); @@ -860,7 +860,7 @@ bool MyMoneyStorageSql::readFile(void) { // FIXME?? if (m_mode == 0) m_storage = NULL; // make sure the progress bar is not shown any longer signalProgress(-1, -1); - m_displaytqStatus = false; + m_displayStatus = false; //MyMoneySqlQuery::traceOn(); return true; } catch (TQString& s) { @@ -876,7 +876,7 @@ bool MyMoneyStorageSql::writeFile(void) { = m_securities = m_prices = m_currencies = m_schedules = m_reports = m_kvps = m_budgets = 0; m_hiIdInstitutions = m_hiIdPayees = m_hiIdAccounts = m_hiIdTransactions = m_hiIdSchedules = m_hiIdSecurities = m_hiIdReports = m_hiIdBudgets = 0; - m_displaytqStatus = true; + m_displayStatus = true; try{ startCommitUnit(__func__); writeInstitutions (); @@ -897,7 +897,7 @@ bool MyMoneyStorageSql::writeFile(void) { endCommitUnit(__func__); // make sure the progress bar is not shown any longer signalProgress(-1, -1); - m_displaytqStatus = false; + m_displayStatus = false; return true; } catch (TQString& s) { return false; @@ -2167,7 +2167,7 @@ void MyMoneyStorageSql::writeFileInfo() { q.bindValue(":fixLevel", m_storage->fileFixVersion()); q.bindValue(":created", TQString(m_storage->creationDate().toString(Qt::ISODate))); //q.bindValue(":lastModified", m_storage->lastModificationDate().toString(Qt::ISODate)); - q.bindValue(":lastModified", TQString(TQDate::tqcurrentDate().toString(Qt::ISODate))); + q.bindValue(":lastModified", TQString(TQDate::currentDate().toString(Qt::ISODate))); q.bindValue(":baseCurrency", m_storage->pairs()["kmm-baseCurrency"]); q.bindValue(":institutions", (unsigned long long) m_institutions); q.bindValue(":accounts", (unsigned long long) m_accounts); @@ -2410,7 +2410,7 @@ void MyMoneyStorageSql::readPayees(const TQValueList<TQString> pid) { const TQMap<TQString, MyMoneyPayee> MyMoneyStorageSql::fetchPayees (const TQStringList& idList, bool /*forUpdate*/) const { DBG("*** Entering MyMoneyStorageSql::readPayees"); - if (m_displaytqStatus) { + if (m_displayStatus) { signalProgress(0, m_payees, TQObject::tr("Loading payees...")); } else { // if (m_payeeListRead) return; @@ -2472,7 +2472,7 @@ const TQMap<TQString, MyMoneyPayee> MyMoneyStorageSql::fetchPayees (const TQStri //if(id > lastId) // lastId = id; } - if (m_displaytqStatus) signalProgress(++progress, 0); + if (m_displayStatus) signalProgress(++progress, 0); } return pList; } @@ -2666,7 +2666,7 @@ void MyMoneyStorageSql::readTransactions(const MyMoneyTransactionFilter& filter) const TQMap<TQString, MyMoneyTransaction> MyMoneyStorageSql::fetchTransactions (const TQString& tidList, const TQString& dateClause, bool /*forUpdate*/) const { DBG("*** Entering MyMoneyStorageSql::readTransactions"); // if (m_transactionListRead) return; // all list already in memory - if (m_displaytqStatus) signalProgress(0, m_transactions, TQObject::tr("Loading transactions...")); + if (m_displayStatus) signalProgress(0, m_transactions, TQObject::tr("Loading transactions...")); int progress = 0; // m_payeeList.clear(); TQString whereClause; @@ -2748,7 +2748,7 @@ const TQMap<TQString, MyMoneyTransaction> MyMoneyStorageSql::fetchTransactions ( i != txMapEnd; ++i) { i.data().setPairs(kvpMap[i.data().id()].pairs()); - if (m_displaytqStatus) signalProgress(++progress, 0); + if (m_displayStatus) signalProgress(++progress, 0); } if ((tidList.isEmpty()) && (dateClause.isEmpty())) { @@ -3245,7 +3245,7 @@ const MyMoneyPrice MyMoneyStorageSql::fetchSinglePrice (const TQString& fromIdL TQDate date (date_); if(!date.isValid()) - date = TQDate::tqcurrentDate(); + date = TQDate::currentDate(); q.bindValue(":fromId", fromIdList); q.bindValue(":toId", toIdList); @@ -4131,9 +4131,9 @@ const TQString MyMoneyDbDef::generateSQL (const TQString& driver) const { replace = TQString::number (MyMoneyFile::instance()->storage()->currentFixVersion()); if ((*fit)->name() == "created") - replace = TQDate::tqcurrentDate().toString(Qt::ISODate); + replace = TQDate::currentDate().toString(Qt::ISODate); if ((*fit)->name() == "lastModified") - replace = TQDate::tqcurrentDate().toString(Qt::ISODate); + replace = TQDate::currentDate().toString(Qt::ISODate); if ((*fit)->name() == "updateInProgress") replace = enclose("N"); qs.replace(toReplace, replace); diff --git a/kmymoney2/mymoney/storage/mymoneystoragesql.h b/kmymoney2/mymoney/storage/mymoneystoragesql.h index 4250256..52db295 100644 --- a/kmymoney2/mymoney/storage/mymoneystoragesql.h +++ b/kmymoney2/mymoney/storage/mymoneystoragesql.h @@ -747,7 +747,7 @@ private: * initial data load and final write */ - bool m_displaytqStatus; + bool m_displayStatus; /** * On occasions, e.g. after a complex transaction search, or for populating a * payee popup list, it becomes necessary to load all data into memory. The |