From 6612bcfa1e491fbb2f441f2060f700b6ad589ffd Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 9 Jul 2011 02:23:29 +0000 Subject: Remove the tq in front of these incorrectly TQt4-converted methods/data members: tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kmymoney@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kmymoney2/mymoney/mymoneyaccount.cpp | 6 ++-- kmymoney2/mymoney/mymoneyaccount.h | 2 +- kmymoney2/mymoney/mymoneyaccounttest.cpp | 10 +++--- kmymoney2/mymoney/mymoneyfile.cpp | 36 ++++++++++---------- kmymoney2/mymoney/mymoneyfile.h | 6 ++-- kmymoney2/mymoney/mymoneyfiletest.cpp | 38 +++++++++++----------- kmymoney2/mymoney/mymoneyfiletest.h | 10 +++--- kmymoney2/mymoney/mymoneyforecast.cpp | 12 +++---- kmymoney2/mymoney/mymoneyreport.h | 2 +- kmymoney2/mymoney/storage/imymoneystorage.h | 4 +-- kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp | 32 +++++++++--------- kmymoney2/mymoney/storage/mymoneydatabasemgr.h | 4 +-- .../mymoney/storage/mymoneydatabasemgrtest.cpp | 16 ++++----- kmymoney2/mymoney/storage/mymoneydatabasemgrtest.h | 4 +-- kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp | 32 +++++++++--------- kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h | 14 ++++---- .../mymoney/storage/mymoneyseqaccessmgrtest.cpp | 12 +++---- .../mymoney/storage/mymoneyseqaccessmgrtest.h | 4 +-- kmymoney2/mymoney/storage/mymoneystoragedump.cpp | 6 ++-- kmymoney2/mymoney/storage/mymoneystoragesql.cpp | 16 ++++----- kmymoney2/mymoney/storage/mymoneystoragexml.cpp | 2 +- 21 files changed, 134 insertions(+), 134 deletions(-) (limited to 'kmymoney2/mymoney') diff --git a/kmymoney2/mymoney/mymoneyaccount.cpp b/kmymoney2/mymoney/mymoneyaccount.cpp index d0d98d1..001d17c 100644 --- a/kmymoney2/mymoney/mymoneyaccount.cpp +++ b/kmymoney2/mymoney/mymoneyaccount.cpp @@ -64,7 +64,7 @@ MyMoneyAccount::MyMoneyAccount(const TQDomElement& node) : // qDebug("Reading information for account %s", acc.name().data()); - setParentAccountId(TQStringEmpty(node.attribute("tqparentaccount"))); + setParentAccountId(TQStringEmpty(node.attribute("parentaccount"))); setLastModified(stringToDate(TQStringEmpty(node.attribute("lastmodified")))); setLastReconciliationDate(stringToDate(TQStringEmpty(node.attribute("lastreconciled")))); @@ -105,7 +105,7 @@ MyMoneyAccount::MyMoneyAccount(const TQDomElement& node) : setDescription(node.attribute("description")); m_id = TQStringEmpty(node.attribute("id")); - // qDebug("Account %s has id of %s, type of %d, tqparent is %s.", acc.name().data(), id.data(), type, acc.tqparentAccountId().data()); + // qDebug("Account %s has id of %s, type of %d, tqparent is %s.", acc.name().data(), id.data(), type, acc.parentAccountId().data()); // Process any Sub-Account information found inside the account entry. m_accountList.clear(); @@ -481,7 +481,7 @@ void MyMoneyAccount::writeXML(TQDomDocument& document, TQDomElement& tqparent) c writeBaseXML(document, el); - el.setAttribute("tqparentaccount", tqparentAccountId()); + el.setAttribute("parentaccount", parentAccountId()); el.setAttribute("lastreconciled", dateToString(lastReconciliationDate())); el.setAttribute("lastmodified", dateToString(lastModified())); el.setAttribute("institution", institutionId()); diff --git a/kmymoney2/mymoney/mymoneyaccount.h b/kmymoney2/mymoney/mymoneyaccount.h index 30e1185..b15aa7f 100644 --- a/kmymoney2/mymoney/mymoneyaccount.h +++ b/kmymoney2/mymoney/mymoneyaccount.h @@ -234,7 +234,7 @@ public: * This method is used to return the ID of the tqparent account * @return TQString with the ID of the tqparent of this account */ - const TQString& tqparentAccountId(void) const { return m_parentAccount; }; + const TQString& parentAccountId(void) const { return m_parentAccount; }; /** * This method returns the list of the account id's of diff --git a/kmymoney2/mymoney/mymoneyaccounttest.cpp b/kmymoney2/mymoney/mymoneyaccounttest.cpp index 0e1fbbf..151dcc1 100644 --- a/kmymoney2/mymoney/mymoneyaccounttest.cpp +++ b/kmymoney2/mymoney/mymoneyaccounttest.cpp @@ -70,7 +70,7 @@ void MyMoneyAccountTest::testConstructor() { CPPUNIT_ASSERT(a.number() == "465500"); CPPUNIT_ASSERT(a.description() == "Desc"); CPPUNIT_ASSERT(a.accountList().count() == 0); - CPPUNIT_ASSERT(a.tqparentAccountId() == "Parent"); + CPPUNIT_ASSERT(a.parentAccountId() == "Parent"); CPPUNIT_ASSERT(a.balance() == MyMoneyMoney(1,1)); TQMap copy; @@ -129,7 +129,7 @@ void MyMoneyAccountTest::testCopyConstructor() { CPPUNIT_ASSERT(b.openingDate() == TQDate::tqcurrentDate()); CPPUNIT_ASSERT(b.description() == "Desc1"); CPPUNIT_ASSERT(b.number() == "Number"); - CPPUNIT_ASSERT(b.tqparentAccountId() == "ParentAccount"); + CPPUNIT_ASSERT(b.parentAccountId() == "ParentAccount"); CPPUNIT_ASSERT(b.value("Key") == "Value"); } @@ -300,7 +300,7 @@ void MyMoneyAccountTest::testWriteXML() { TQString ref = TQString( "\n" "\n" - " \n" + " \n" " \n" " \n" " \n" @@ -319,7 +319,7 @@ void MyMoneyAccountTest::testReadXML() { TQString ref_ok = TQString( "\n" "\n" - " \n" + " \n" " \n" " \n" " \n" @@ -335,7 +335,7 @@ void MyMoneyAccountTest::testReadXML() { TQString ref_false = TQString( "\n" "\n" - " \n" + " \n" " \n" " \n" " \n" diff --git a/kmymoney2/mymoney/mymoneyfile.cpp b/kmymoney2/mymoney/mymoneyfile.cpp index 8707614..0e1a098 100644 --- a/kmymoney2/mymoney/mymoneyfile.cpp +++ b/kmymoney2/mymoney/mymoneyfile.cpp @@ -340,7 +340,7 @@ void MyMoneyFile::reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqpar MyMoneyNotifier notifier(this); // keep a notification of the current tqparent - addNotification(account.tqparentAccountId()); + addNotification(account.parentAccountId()); m_storage->reparentAccount(account, tqparent); @@ -436,7 +436,7 @@ void MyMoneyFile::removeAccount(const MyMoneyAccount& account) // check that the account and its tqparent exist // this will throw an exception if the id is unknown acc = MyMoneyFile::account(account.id()); - tqparent = MyMoneyFile::account(account.tqparentAccountId()); + tqparent = MyMoneyFile::account(account.parentAccountId()); if(!acc.institutionId().isEmpty()) institution = MyMoneyFile::institution(acc.institutionId()); @@ -562,7 +562,7 @@ void MyMoneyFile::addAccount(MyMoneyAccount& account, MyMoneyAccount& tqparent) if(account.accountList().count() != 0) throw new MYMONEYEXCEPTION("New account must have no sub-accounts"); - if(!account.tqparentAccountId().isEmpty()) + if(!account.parentAccountId().isEmpty()) throw new MYMONEYEXCEPTION("New account must have no tqparent-id"); if(account.accountType() == MyMoneyAccount::UnknownAccountType) @@ -1168,7 +1168,7 @@ TQString MyMoneyFile::accountToCategory(const TQString& accountId, bool includeS if(!rc.isEmpty()) rc = AccountSeperator + rc; rc = acc.name() + rc; - acc = account(acc.tqparentAccountId()); + acc = account(acc.parentAccountId()); } while(!acc.id().isEmpty() && (includeStandardAccounts || !isStandardAccount(acc.id()))); } return rc; @@ -1206,7 +1206,7 @@ TQString MyMoneyFile::nameToAccount(const TQString& name) const return id; } -TQString MyMoneyFile::tqparentName(const TQString& name) const +TQString MyMoneyFile::parentName(const TQString& name) const { return name.section(AccountSeperator, 0, -2); } @@ -1355,7 +1355,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void) MyMoneyAccount child; MyMoneyAccount toplevel; - TQString tqparentId; + TQString parentId; TQStringList rc; int problemCount = 0; @@ -1404,11 +1404,11 @@ const TQStringList MyMoneyFile::consistencyCheck(void) } // check for loops in the hierarchy - tqparentId = (*it_a).tqparentAccountId(); + parentId = (*it_a).parentAccountId(); try { bool dropOut = false; - while(!isStandardAccount(tqparentId) && !dropOut) { - tqparent = account(tqparentId); + while(!isStandardAccount(parentId) && !dropOut) { + tqparent = account(parentId); if(tqparent.id() == (*it_a).id()) { // tqparent loops, so we need to re-tqparent to toplevel account // find tqparent account in our list @@ -1420,7 +1420,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void) problemAccount = (*it_a).name(); rc << i18n("* Problem with account '%1'").tqarg(problemAccount); rc << i18n(" * Loop detected between this account and account '%2'.").tqarg((*it_b).name()); - rc << i18n(" Retqparenting account '%2' to top level account '%1'.").tqarg(toplevel.name(), (*it_a).name()); + rc << i18n(" Reparenting account '%2' to top level account '%1'.").tqarg(toplevel.name(), (*it_a).name()); (*it_a).setParentAccountId(toplevel.id()); if(accountRebuild.tqcontains(toplevel.id()) == 0) accountRebuild << toplevel.id(); @@ -1432,7 +1432,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void) } } } - tqparentId = tqparent.tqparentAccountId(); + parentId = tqparent.parentAccountId(); } } catch(MyMoneyException *e) { @@ -1441,9 +1441,9 @@ const TQStringList MyMoneyFile::consistencyCheck(void) } // check that the tqparent exists - tqparentId = (*it_a).tqparentAccountId(); + parentId = (*it_a).parentAccountId(); try { - tqparent = account(tqparentId); + tqparent = account(parentId); if((*it_a).accountGroup() != tqparent.accountGroup()) { problemCount++; if(problemAccount != (*it_a).name()) { @@ -1476,7 +1476,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void) } } catch(MyMoneyException *e) { delete e; - // aptqparently, the tqparent does not exist anymore. we reconnect to the + // apparently, the tqparent does not exist anymore. we reconnect to the // master group account (asset, liability, etc) to which this account // should belong and update it in the engine. problemCount++; @@ -1484,7 +1484,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void) problemAccount = (*it_a).name(); rc << i18n("* Problem with account '%1'").tqarg(problemAccount); } - rc << i18n(" * The tqparent with id %1 does not exist anymore.").tqarg(tqparentId); + rc << i18n(" * The tqparent with id %1 does not exist anymore.").tqarg(parentId); rc << i18n(" New tqparent account is the top level account '%1'.").tqarg(toplevel.name()); (*it_a).setParentAccountId(toplevel.id()); @@ -1552,10 +1552,10 @@ const TQStringList MyMoneyFile::consistencyCheck(void) // reconstruct the lists for(it_a = list.begin(); it_a != list.end(); ++it_a) { TQValueList::Iterator it; - tqparentId = (*it_a).tqparentAccountId(); - if(accountRebuild.tqcontains(tqparentId)) { + parentId = (*it_a).parentAccountId(); + if(accountRebuild.tqcontains(parentId)) { for(it = list.begin(); it != list.end(); ++it) { - if((*it).id() == tqparentId) { + if((*it).id() == parentId) { (*it).addAccountId((*it_a).id()); break; } diff --git a/kmymoney2/mymoney/mymoneyfile.h b/kmymoney2/mymoney/mymoneyfile.h index c59f9da..f697267 100644 --- a/kmymoney2/mymoney/mymoneyfile.h +++ b/kmymoney2/mymoney/mymoneyfile.h @@ -422,11 +422,11 @@ public: void modifyAccount(const MyMoneyAccount& account); /** - * This method re-tqparents an existing account + * This method re-parents an existing account * * An exception will be thrown upon error conditions. * - * @param account MyMoneyAccount reference to account to be re-tqparented + * @param account MyMoneyAccount reference to account to be re-parented * @param tqparent MyMoneyAccount reference to new tqparent account */ void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqparent); @@ -778,7 +778,7 @@ public: * @param name full account name * @return tqparent name (full account name excluding the last part) */ - TQString tqparentName(const TQString& name) const; + TQString parentName(const TQString& name) const; /** * This method is used to create a new payee diff --git a/kmymoney2/mymoney/mymoneyfiletest.cpp b/kmymoney2/mymoney/mymoneyfiletest.cpp index 72dd006..4d10c56 100644 --- a/kmymoney2/mymoney/mymoneyfiletest.cpp +++ b/kmymoney2/mymoney/mymoneyfiletest.cpp @@ -384,7 +384,7 @@ void MyMoneyFileTest::testAddAccounts() { m->addAccount(a, tqparent); ft.commit(); CPPUNIT_ASSERT(m->accountCount() == 6); - CPPUNIT_ASSERT(a.tqparentAccountId() == "AStd::Asset"); + CPPUNIT_ASSERT(a.parentAccountId() == "AStd::Asset"); CPPUNIT_ASSERT(a.id() == "A000001"); CPPUNIT_ASSERT(a.institutionId() == "I000001"); CPPUNIT_ASSERT(m->dirty() == true); @@ -439,7 +439,7 @@ void MyMoneyFileTest::testAddAccounts() { ft.commit(); CPPUNIT_ASSERT(m->dirty() == true); CPPUNIT_ASSERT(b.id() == "A000002"); - CPPUNIT_ASSERT(b.tqparentAccountId() == "AStd::Asset"); + CPPUNIT_ASSERT(b.parentAccountId() == "AStd::Asset"); CPPUNIT_ASSERT(m->accountCount() == 7); institution = m->institution("I000001"); @@ -534,24 +534,24 @@ void MyMoneyFileTest::testModifyAccount() { } } -void MyMoneyFileTest::testRetqparentAccount() { +void MyMoneyFileTest::testReparentAccount() { testAddAccounts(); storage->m_dirty = false; MyMoneyAccount p = m->account("A000001"); MyMoneyAccount q = m->account("A000002"); - MyMoneyAccount o = m->account(p.tqparentAccountId()); + MyMoneyAccount o = m->account(p.parentAccountId()); // make A000001 a child of A000002 MyMoneyFileTransaction ft; try { - CPPUNIT_ASSERT(p.tqparentAccountId() != q.id()); + CPPUNIT_ASSERT(p.parentAccountId() != q.id()); CPPUNIT_ASSERT(o.accountCount() == 2); CPPUNIT_ASSERT(q.accountCount() == 0); m->reparentAccount(p, q); ft.commit(); CPPUNIT_ASSERT(m->dirty() == true); - CPPUNIT_ASSERT(p.tqparentAccountId() == q.id()); + CPPUNIT_ASSERT(p.parentAccountId() == q.id()); CPPUNIT_ASSERT(q.accountCount() == 1); CPPUNIT_ASSERT(q.id() == "A000002"); CPPUNIT_ASSERT(p.id() == "A000001"); @@ -624,7 +624,7 @@ void MyMoneyFileTest::testRemoveAccount() { } void MyMoneyFileTest::testRemoveAccountTree() { - testRetqparentAccount(); + testReparentAccount(); MyMoneyAccount a = m->account("A000002"); MyMoneyFileTransaction ft; @@ -646,10 +646,10 @@ void MyMoneyFileTest::testRemoveAccountTree() { delete e; } - // make sure that tqchildren are re-tqparented to tqparent account + // make sure that tqchildren are re-parented to tqparent account try { a = m->account("A000001"); - CPPUNIT_ASSERT(a.tqparentAccountId() == m->asset().id()); + CPPUNIT_ASSERT(a.parentAccountId() == m->asset().id()); } catch(MyMoneyException *e) { delete e; CPPUNIT_FAIL("Unexpected exception!"); @@ -1219,7 +1219,7 @@ void MyMoneyFileTest::testAttachStorage() { void MyMoneyFileTest::testAccount2Category() { - testRetqparentAccount(); + testReparentAccount(); CPPUNIT_ASSERT(m->accountToCategory("A000001") == "Account2:Account1"); CPPUNIT_ASSERT(m->accountToCategory("A000002") == "Account2"); } @@ -1265,7 +1265,7 @@ void MyMoneyFileTest::testHasAccount() { m->addAccount(a, b); ft.commit(); CPPUNIT_ASSERT(m->accountCount() == 8); - CPPUNIT_ASSERT(a.tqparentAccountId() == "A000001"); + CPPUNIT_ASSERT(a.parentAccountId() == "A000001"); CPPUNIT_ASSERT(m->hasAccount("A000001", "Account3") == true); CPPUNIT_ASSERT(m->hasAccount("A000001", "Account2") == false); CPPUNIT_ASSERT(m->hasAccount("A000002", "Account3") == false); @@ -1334,7 +1334,7 @@ void MyMoneyFileTest::testAddEquityAccount() { } } -void MyMoneyFileTest::testRetqparentEquity() { +void MyMoneyFileTest::testReparentEquity() { testAddEquityAccount(); testAddEquityAccount(); MyMoneyAccount tqparent; @@ -1350,24 +1350,24 @@ void MyMoneyFileTest::testRetqparentEquity() { list << MyMoneyAccount::AssetLoan; list << MyMoneyAccount::Currency; tqparent = m->asset(); - testRetqparentEquity(list, tqparent); + testReparentEquity(list, tqparent); list.clear(); list << MyMoneyAccount::CreditCard; list << MyMoneyAccount::Loan; list << MyMoneyAccount::Liability; tqparent = m->liability(); - testRetqparentEquity(list, tqparent); + testReparentEquity(list, tqparent); list.clear(); list << MyMoneyAccount::Income; tqparent = m->income(); - testRetqparentEquity(list, tqparent); + testReparentEquity(list, tqparent); list.clear(); list << MyMoneyAccount::Expense; tqparent = m->expense(); - testRetqparentEquity(list, tqparent); + testReparentEquity(list, tqparent); // now check the good case MyMoneyAccount stock = m->account("A000002"); @@ -1381,7 +1381,7 @@ void MyMoneyFileTest::testRetqparentEquity() { } } -void MyMoneyFileTest::testRetqparentEquity(TQValueList& list, MyMoneyAccount& tqparent) +void MyMoneyFileTest::testReparentEquity(TQValueList& list, MyMoneyAccount& tqparent) { MyMoneyAccount a; MyMoneyAccount stock = m->account("A000002"); @@ -1488,7 +1488,7 @@ void MyMoneyFileTest::testOpeningBalance(void) try { openingAcc = m->openingBalanceAccount(m->baseCurrency()); - CPPUNIT_ASSERT(openingAcc.tqparentAccountId() == m->equity().id()); + CPPUNIT_ASSERT(openingAcc.parentAccountId() == m->equity().id()); CPPUNIT_ASSERT(openingAcc.name() == MyMoneyFile::OpeningBalancesPrefix); CPPUNIT_ASSERT(openingAcc.openingDate() == TQDate::tqcurrentDate()); } catch(MyMoneyException *e) { @@ -1507,7 +1507,7 @@ void MyMoneyFileTest::testOpeningBalance(void) TQString refName = TQString("%1 (%2)").tqarg(MyMoneyFile::OpeningBalancesPrefix).tqarg("USD"); try { openingAcc = m->openingBalanceAccount(second); - CPPUNIT_ASSERT(openingAcc.tqparentAccountId() == m->equity().id()); + CPPUNIT_ASSERT(openingAcc.parentAccountId() == m->equity().id()); CPPUNIT_ASSERT(openingAcc.name() == refName); CPPUNIT_ASSERT(openingAcc.openingDate() == TQDate::tqcurrentDate()); } catch(MyMoneyException *e) { diff --git a/kmymoney2/mymoney/mymoneyfiletest.h b/kmymoney2/mymoney/mymoneyfiletest.h index 133f047..da39a28 100644 --- a/kmymoney2/mymoney/mymoneyfiletest.h +++ b/kmymoney2/mymoney/mymoneyfiletest.h @@ -40,7 +40,7 @@ class MyMoneyFileTest : public CppUnit::TestFixture { CPPUNIT_TEST(testAddAccounts); CPPUNIT_TEST(testModifyAccount); CPPUNIT_TEST(testModifyStdAccount); - CPPUNIT_TEST(testRetqparentAccount); + CPPUNIT_TEST(testReparentAccount); CPPUNIT_TEST(testRemoveAccount); CPPUNIT_TEST(testRemoveAccountTree); CPPUNIT_TEST(testAccountListRetrieval); @@ -63,7 +63,7 @@ class MyMoneyFileTest : public CppUnit::TestFixture { CPPUNIT_TEST(testAttachedStorage); CPPUNIT_TEST(testHasAccount); CPPUNIT_TEST(testAddEquityAccount); - CPPUNIT_TEST(testRetqparentEquity); + CPPUNIT_TEST(testReparentEquity); CPPUNIT_TEST(testBaseCurrency); CPPUNIT_TEST(testOpeningBalanceNoBase); CPPUNIT_TEST(testOpeningBalance); @@ -92,7 +92,7 @@ public: void testAddAccounts(); void testModifyAccount(); void testModifyStdAccount(); - void testRetqparentAccount(); + void testReparentAccount(); void testRemoveAccount(); void testRemoveAccountTree(); void testAccountListRetrieval (); @@ -115,8 +115,8 @@ public: void testAttachedStorage(); void testHasAccount(); void testAddEquityAccount(); - void testRetqparentEquity(); - void testRetqparentEquity(TQValueList& list, MyMoneyAccount& tqparent); + void testReparentEquity(); + void testReparentEquity(TQValueList& list, MyMoneyAccount& tqparent); void testBaseCurrency(); void testOpeningBalanceNoBase(); void testOpeningBalance(); diff --git a/kmymoney2/mymoney/mymoneyforecast.cpp b/kmymoney2/mymoney/mymoneyforecast.cpp index 59a565d..e0a79af 100644 --- a/kmymoney2/mymoney/mymoneyforecast.cpp +++ b/kmymoney2/mymoney/mymoneyforecast.cpp @@ -134,8 +134,8 @@ void MyMoneyForecast::pastTransactions() //workaround for stock accounts which have faulty opening dates TQDate openingDate; if(acc.accountType() == MyMoneyAccount::Stock) { - MyMoneyAccount tqparentAccount = file->account(acc.tqparentAccountId()); - openingDate = tqparentAccount.openingDate(); + MyMoneyAccount parentAccount = file->account(acc.parentAccountId()); + openingDate = parentAccount.openingDate(); } else { openingDate = acc.openingDate(); } @@ -234,8 +234,8 @@ void MyMoneyForecast::calculateAccountTrendList() TQDate openingDate; if(acc.accountType() == MyMoneyAccount::Stock) { - MyMoneyAccount tqparentAccount = file->account(acc.tqparentAccountId()); - openingDate = tqparentAccount.openingDate(); + MyMoneyAccount parentAccount = file->account(acc.parentAccountId()); + openingDate = parentAccount.openingDate(); } else { openingDate = acc.openingDate(); } @@ -1206,8 +1206,8 @@ void MyMoneyForecast::setStartingBalance(const MyMoneyAccount &acc) //FIXME workaround for stock opening dates TQDate openingDate; if(acc.accountType() == MyMoneyAccount::Stock) { - MyMoneyAccount tqparentAccount = file->account(acc.tqparentAccountId()); - openingDate = tqparentAccount.openingDate(); + MyMoneyAccount parentAccount = file->account(acc.parentAccountId()); + openingDate = parentAccount.openingDate(); } else { openingDate = acc.openingDate(); } diff --git a/kmymoney2/mymoney/mymoneyreport.h b/kmymoney2/mymoney/mymoneyreport.h index a541042..fb2287e 100644 --- a/kmymoney2/mymoney/mymoneyreport.h +++ b/kmymoney2/mymoney/mymoneyreport.h @@ -296,7 +296,7 @@ public: * @param doc The document which we can use to create new sub-elements * if needed * @param anonymous Whether the sensitive parts of the report should be - * tqmasked + * masked */ void write(TQDomElement& e, TQDomDocument *doc, bool anonymous=false) const; diff --git a/kmymoney2/mymoney/storage/imymoneystorage.h b/kmymoney2/mymoney/storage/imymoneystorage.h index a4ff2af..cac0e45 100644 --- a/kmymoney2/mymoney/storage/imymoneystorage.h +++ b/kmymoney2/mymoney/storage/imymoneystorage.h @@ -370,11 +370,11 @@ public: virtual void modifyTransaction(const MyMoneyTransaction& transaction) = 0; /** - * This method re-tqparents an existing account + * This method re-parents an existing account * * An exception will be thrown upon error conditions. * - * @param account MyMoneyAccount reference to account to be re-tqparented + * @param account MyMoneyAccount reference to account to be re-parented * @param tqparent MyMoneyAccount reference to new tqparent account */ virtual void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqparent) = 0; diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp b/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp index e80feaf..d34bb83 100644 --- a/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp +++ b/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp @@ -415,7 +415,7 @@ void MyMoneyDatabaseMgr::addTransaction(MyMoneyTransaction& transaction, const b acc.adjustBalance((*it_s)); if(!skipAccountUpdate) { acc.touch(); -//FIXME: tqinvalidateBalanceCache(acc.id()); +//FIXME: invalidateBalanceCache(acc.id()); } m_sql->modifyAccount(acc); } @@ -517,7 +517,7 @@ void MyMoneyDatabaseMgr::modifyAccount(const MyMoneyAccount& account, const bool // check if the new info is based on the old one. // this is the case, when the file and the id // as well as the type are equal. - if(((*pos).tqparentAccountId() == account.tqparentAccountId() + if(((*pos).parentAccountId() == account.parentAccountId() && (*pos).accountType() == account.accountType()) || skipCheck == true) { // make sure that all the referenced objects exist @@ -533,7 +533,7 @@ void MyMoneyDatabaseMgr::modifyAccount(const MyMoneyAccount& account, const bool //m_accountList.modify(account.id(), account); // tqinvalidate cached balance -//FIXME: tqinvalidateBalanceCache(account.id()); +//FIXME: invalidateBalanceCache(account.id()); // mark file as changed m_sql->modifyAccount(account); @@ -621,7 +621,7 @@ void MyMoneyDatabaseMgr::modifyTransaction(const MyMoneyTransaction& transaction MyMoneyAccount acc = accountList[(*it_s).accountId()]; acc.adjustBalance((*it_s), true); acc.touch(); -//FIXME: tqinvalidateBalanceCache(acc.id()); +//FIXME: invalidateBalanceCache(acc.id()); //m_accountList.modify(acc.id(), acc); m_sql->modifyAccount(acc); //modifiedAccounts[(*it_s).accountId()] = true; @@ -630,7 +630,7 @@ void MyMoneyDatabaseMgr::modifyTransaction(const MyMoneyTransaction& transaction MyMoneyAccount acc = accountList[(*it_s).accountId()]; acc.adjustBalance((*it_s)); acc.touch(); -//FIXME: tqinvalidateBalanceCache(acc.id()); +//FIXME: invalidateBalanceCache(acc.id()); //m_accountList.modify(acc.id(), acc); m_sql->modifyAccount(acc); //modifiedAccounts[(*it_s).accountId()] = true; @@ -664,23 +664,23 @@ void MyMoneyDatabaseMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccount MyMoneyDatabaseMgr::account(account.id()); MyMoneyDatabaseMgr::account(tqparent.id()); - if(!account.tqparentAccountId().isEmpty()) { - accountIdList << account.tqparentAccountId(); + if(!account.parentAccountId().isEmpty()) { + accountIdList << account.parentAccountId(); } startTransaction(); TQMap accountList = m_sql->fetchAccounts(accountIdList, true); - if(!account.tqparentAccountId().isEmpty()) { - MyMoneyDatabaseMgr::account(account.tqparentAccountId()); - oldParent = accountList.tqfind(account.tqparentAccountId()); + if(!account.parentAccountId().isEmpty()) { + MyMoneyDatabaseMgr::account(account.parentAccountId()); + oldParent = accountList.tqfind(account.parentAccountId()); } newParent = accountList.tqfind(tqparent.id()); childAccount = accountList.tqfind(account.id()); MyMoneyAccount acc; - if(!account.tqparentAccountId().isEmpty()) { + if(!account.parentAccountId().isEmpty()) { acc = (*oldParent); acc.removeAccountId(account.id()); m_sql->modifyAccount(acc); @@ -729,7 +729,7 @@ void MyMoneyDatabaseMgr::removeTransaction(const MyMoneyTransaction& transaction acc.adjustBalance((*it_s), true); acc.touch(); m_sql->modifyAccount(acc); -//FIXME: tqinvalidateBalanceCache(acc.id()); +//FIXME: invalidateBalanceCache(acc.id()); } // FIXME: check if any split is frozen and throw exception @@ -792,7 +792,7 @@ void MyMoneyDatabaseMgr::removeAccount(const MyMoneyAccount& account) // check that the account and it's tqparent exist // this will throw an exception if the id is unknown MyMoneyDatabaseMgr::account(account.id()); - tqparent = MyMoneyDatabaseMgr::account(account.tqparentAccountId()); + tqparent = MyMoneyDatabaseMgr::account(account.parentAccountId()); // check that it's not one of the standard account groups if(isStandardAccount(account.id())) @@ -804,7 +804,7 @@ void MyMoneyDatabaseMgr::removeAccount(const MyMoneyAccount& account) // re-tqparent all sub-ordinate accounts to the tqparent of the account // to be deleted. First round check that all accounts exist, second - // round do the re-tqparenting. + // round do the re-parenting. TQStringList::ConstIterator it; for(it = account.accountList().begin(); it != account.accountList().end(); ++it) { MyMoneyDatabaseMgr::account(*it); @@ -842,7 +842,7 @@ void MyMoneyDatabaseMgr::removeAccount(const MyMoneyAccount& account) if((*it_a).id() == account.id() && (*it_a).accountType() == account.accountType()) { - // second round over sub-ordinate accounts: do re-tqparenting + // second round over sub-ordinate accounts: do re-parenting // but only if the list contains at least one entry // FIXME: move this logic to MyMoneyFile if((*it_a).accountList().count() > 0) { @@ -860,7 +860,7 @@ void MyMoneyDatabaseMgr::removeAccount(const MyMoneyAccount& account) // remove from balance list //FIXME: m_balanceCache.remove(account.id()); -//FIXME: tqinvalidateBalanceCache(tqparent.id()); +//FIXME: invalidateBalanceCache(tqparent.id()); m_sql->removeAccount(account); } diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgr.h b/kmymoney2/mymoney/storage/mymoneydatabasemgr.h index 1511915..e146a70 100644 --- a/kmymoney2/mymoney/storage/mymoneydatabasemgr.h +++ b/kmymoney2/mymoney/storage/mymoneydatabasemgr.h @@ -320,11 +320,11 @@ public: virtual void modifyTransaction(const MyMoneyTransaction& transaction); /** - * This method re-tqparents an existing account + * This method re-parents an existing account * * An exception will be thrown upon error conditions. * - * @param account MyMoneyAccount reference to account to be re-tqparented + * @param account MyMoneyAccount reference to account to be re-parented * @param tqparent MyMoneyAccount reference to new tqparent account */ virtual void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqparent); diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp b/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp index ae589cd..8886447 100644 --- a/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp +++ b/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp @@ -421,7 +421,7 @@ void MyMoneyDatabaseMgrTest::testModifyAccount() { try { m->modifyAccount(a); MyMoneyAccount b = m->account("A000001"); - CPPUNIT_ASSERT(b.tqparentAccountId() == a.tqparentAccountId()); + CPPUNIT_ASSERT(b.parentAccountId() == a.parentAccountId()); CPPUNIT_ASSERT(b.name() == "New account name"); } catch (MyMoneyException *e) { delete e; @@ -490,7 +490,7 @@ void MyMoneyDatabaseMgrTest::testModifyInstitution() { } } -void MyMoneyDatabaseMgrTest::testRetqparentAccount() { +void MyMoneyDatabaseMgrTest::testReparentAccount() { testAttachDb(); if (!m_canOpen) { @@ -551,7 +551,7 @@ void MyMoneyDatabaseMgrTest::testRetqparentAccount() { MyMoneyFile::instance()->preloadCache(); CPPUNIT_ASSERT(m->expense().accountCount() == 3); CPPUNIT_ASSERT(m->account(ex1.id()).accountCount() == 1); - CPPUNIT_ASSERT(ex3.tqparentAccountId() == STD_ACC_EXPENSE); + CPPUNIT_ASSERT(ex3.parentAccountId() == STD_ACC_EXPENSE); //for (int i = 0; i < 100; ++i) { m->reparentAccount(ex3, ex1); @@ -559,7 +559,7 @@ void MyMoneyDatabaseMgrTest::testRetqparentAccount() { MyMoneyFile::instance()->preloadCache(); CPPUNIT_ASSERT(m->expense().accountCount() == 2); CPPUNIT_ASSERT(m->account(ex1.id()).accountCount() == 2); - CPPUNIT_ASSERT(ex3.tqparentAccountId() == ex1.id()); + CPPUNIT_ASSERT(ex3.parentAccountId() == ex1.id()); } catch (MyMoneyException *e) { std::cout << std::endl << e->what() << std::endl; delete e; @@ -575,7 +575,7 @@ void MyMoneyDatabaseMgrTest::testAddTransactions() { return; } - testRetqparentAccount(); + testReparentAccount(); MyMoneyAccount ch; MyMoneyTransaction t1, t2; @@ -1045,7 +1045,7 @@ void MyMoneyDatabaseMgrTest::testRemoveInstitution() { } testModifyInstitution(); - testRetqparentAccount(); + testReparentAccount(); MyMoneyInstitution i; MyMoneyAccount a; @@ -1474,7 +1474,7 @@ void MyMoneyDatabaseMgrTest::testAddSchedule() { } // put some accounts in the db, so the tests don't break - testRetqparentAccount(); + testReparentAccount(); try { CPPUNIT_ASSERT(m->scheduleList().count() == 0); @@ -1648,7 +1648,7 @@ void MyMoneyDatabaseMgrTest::testScheduleList() { } // put some accounts in the db, so the tests don't break - testRetqparentAccount(); + testReparentAccount(); TQDate testDate = TQDate::tqcurrentDate(); TQDate notOverdue = testDate.addDays(2); diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.h b/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.h index d883032..8ab4b64 100644 --- a/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.h +++ b/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.h @@ -40,7 +40,7 @@ class MyMoneyDatabaseMgrTest : public CppUnit::TestFixture { CPPUNIT_TEST(testIsStandardAccount); CPPUNIT_TEST(testNewAccount); CPPUNIT_TEST(testAddNewAccount); - CPPUNIT_TEST(testRetqparentAccount); + CPPUNIT_TEST(testReparentAccount); CPPUNIT_TEST(testAddInstitution); CPPUNIT_TEST(testInstitution); CPPUNIT_TEST(testAccount2Institution); @@ -103,7 +103,7 @@ public: void testAccount2Institution(); void testModifyAccount(); void testModifyInstitution(); - void testRetqparentAccount(); + void testReparentAccount(); void testAddTransactions(); void testTransactionCount(); void testAddBudget(); diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp index 5c9abed..9977811 100644 --- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp +++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp @@ -439,7 +439,7 @@ void MyMoneySeqAccessMgr::addTransaction(MyMoneyTransaction& transaction, const acc.adjustBalance(*it_s); if(!skipAccountUpdate) { acc.touch(); - tqinvalidateBalanceCache(acc.id()); + invalidateBalanceCache(acc.id()); } m_accountList.modify(acc.id(), acc); } @@ -488,7 +488,7 @@ void MyMoneySeqAccessMgr::modifyAccount(const MyMoneyAccount& account, const boo // check if the new info is based on the old one. // this is the case, when the file and the id // as well as the type are equal. - if((((*pos).tqparentAccountId() == account.tqparentAccountId()) + if((((*pos).parentAccountId() == account.parentAccountId()) && ((*pos).accountType() == account.accountType())) || (skipCheck == true)) { // make sure that all the referenced objects exist @@ -504,7 +504,7 @@ void MyMoneySeqAccessMgr::modifyAccount(const MyMoneyAccount& account, const boo m_accountList.modify(account.id(), account); // tqinvalidate cached balance - tqinvalidateBalanceCache(account.id()); + invalidateBalanceCache(account.id()); } else throw new MYMONEYEXCEPTION("Invalid information for update"); @@ -571,14 +571,14 @@ void MyMoneySeqAccessMgr::modifyTransaction(const MyMoneyTransaction& transactio MyMoneyAccount acc = m_accountList[(*it_s).accountId()]; acc.adjustBalance(*it_s, true); // reverse the adjust operation (reverse = true) acc.touch(); - tqinvalidateBalanceCache(acc.id()); + invalidateBalanceCache(acc.id()); m_accountList.modify(acc.id(), acc); } for(it_s = transaction.splits().begin(); it_s != transaction.splits().end(); ++it_s) { MyMoneyAccount acc = m_accountList[(*it_s).accountId()]; acc.adjustBalance(*it_s); acc.touch(); - tqinvalidateBalanceCache(acc.id()); + invalidateBalanceCache(acc.id()); m_accountList.modify(acc.id(), acc); } @@ -606,9 +606,9 @@ void MyMoneySeqAccessMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccoun // an exception is thrown MyMoneySeqAccessMgr::account(account.id()); MyMoneySeqAccessMgr::account(tqparent.id()); - if(!account.tqparentAccountId().isEmpty()) { - MyMoneySeqAccessMgr::account(account.tqparentAccountId()); - oldParent = m_accountList.tqfind(account.tqparentAccountId()); + if(!account.parentAccountId().isEmpty()) { + MyMoneySeqAccessMgr::account(account.parentAccountId()); + oldParent = m_accountList.tqfind(account.parentAccountId()); } if(account.accountType() == MyMoneyAccount::Stock && tqparent.accountType() != MyMoneyAccount::Investment) @@ -618,7 +618,7 @@ void MyMoneySeqAccessMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccoun childAccount = m_accountList.tqfind(account.id()); MyMoneyAccount acc; - if(!account.tqparentAccountId().isEmpty()) { + if(!account.parentAccountId().isEmpty()) { acc = (*oldParent); acc.removeAccountId(account.id()); m_accountList.modify(acc.id(), acc); @@ -665,7 +665,7 @@ void MyMoneySeqAccessMgr::removeTransaction(const MyMoneyTransaction& transactio acc.adjustBalance(*it_s, true); // reverse = true acc.touch(); m_accountList.modify(acc.id(), acc); - tqinvalidateBalanceCache(acc.id()); + invalidateBalanceCache(acc.id()); } // FIXME: check if any split is frozen and throw exception @@ -682,7 +682,7 @@ void MyMoneySeqAccessMgr::removeAccount(const MyMoneyAccount& account) // check that the account and it's tqparent exist // this will throw an exception if the id is unknown MyMoneySeqAccessMgr::account(account.id()); - tqparent = MyMoneySeqAccessMgr::account(account.tqparentAccountId()); + tqparent = MyMoneySeqAccessMgr::account(account.parentAccountId()); // check that it's not one of the standard account groups if(isStandardAccount(account.id())) @@ -694,7 +694,7 @@ void MyMoneySeqAccessMgr::removeAccount(const MyMoneyAccount& account) // re-tqparent all sub-ordinate accounts to the tqparent of the account // to be deleted. First round check that all accounts exist, second - // round do the re-tqparenting. + // round do the re-parenting. TQStringList::ConstIterator it; for(it = account.accountList().begin(); it != account.accountList().end(); ++it) { MyMoneySeqAccessMgr::account(*it); @@ -729,7 +729,7 @@ void MyMoneySeqAccessMgr::removeAccount(const MyMoneyAccount& account) if((*it_a).id() == account.id() && (*it_a).accountType() == account.accountType()) { - // second round over sub-ordinate accounts: do re-tqparenting + // second round over sub-ordinate accounts: do re-parenting // but only if the list contains at least one entry // FIXME: move this logic to MyMoneyFile if((*it_a).accountList().count() > 0) { @@ -748,7 +748,7 @@ void MyMoneySeqAccessMgr::removeAccount(const MyMoneyAccount& account) // remove from balance list m_balanceCache.remove(account.id()); - tqinvalidateBalanceCache(tqparent.id()); + invalidateBalanceCache(tqparent.id()); } } @@ -993,13 +993,13 @@ const unsigned int MyMoneyFile::moveSplits(const TQString& oldAccount, const TQS } */ -void MyMoneySeqAccessMgr::tqinvalidateBalanceCache(const TQString& id) +void MyMoneySeqAccessMgr::invalidateBalanceCache(const TQString& id) { if(!id.isEmpty()) { try { m_balanceCache[id].valid = false; if(!isStandardAccount(id)) { - tqinvalidateBalanceCache(account(id).tqparentAccountId()); + invalidateBalanceCache(account(id).parentAccountId()); } } catch (MyMoneyException *e) { delete e; diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h index ddc2030..abca654 100644 --- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h +++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h @@ -50,7 +50,7 @@ * will be created containing the new balance value. * * @see MyMoneySeqAccessMgr::balance() and - * MyMoneySeqAccessMgr::tqinvalidateBalanceCache() for a usage example + * MyMoneySeqAccessMgr::invalidateBalanceCache() for a usage example */ class MyMoneyBalanceCacheItem { public: @@ -286,11 +286,11 @@ public: void modifyTransaction(const MyMoneyTransaction& transaction); /** - * This method re-tqparents an existing account + * This method re-parents an existing account * * An exception will be thrown upon error conditions. * - * @param account MyMoneyAccount reference to account to be re-tqparented + * @param account MyMoneyAccount reference to account to be re-parented * @param tqparent MyMoneyAccount reference to new tqparent account */ void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqparent); @@ -998,11 +998,11 @@ private: /** * This method is used to tqinvalidate the cached balance for - * the selected account and all it's tqparents. + * the selected account and all it's parents. * * @param id id of the account in question */ - void tqinvalidateBalanceCache(const TQString& id); + void invalidateBalanceCache(const TQString& id); /** * This member variable keeps the User information. @@ -1207,11 +1207,11 @@ private: /** - * This method re-tqparents an existing account + * This method re-parents an existing account * * An exception will be thrown upon error conditions. * - * @param account MyMoneyAccount reference to account to be re-tqparented + * @param account MyMoneyAccount reference to account to be re-parented * @param tqparent MyMoneyAccount reference to new tqparent account * @param sendNotification if true, notifications with the ids * of all modified objects are send diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp b/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp index 9decdce..c4505e3 100644 --- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp +++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp @@ -354,7 +354,7 @@ void MyMoneySeqAccessMgrTest::testModifyAccount() { m->commitTransaction(); m->startTransaction(); MyMoneyAccount b = m->account("A000001"); - CPPUNIT_ASSERT(b.tqparentAccountId() == a.tqparentAccountId()); + CPPUNIT_ASSERT(b.parentAccountId() == a.parentAccountId()); CPPUNIT_ASSERT(b.name() == "New account name"); CPPUNIT_ASSERT(m->dirty() == true); } catch (MyMoneyException *e) { @@ -422,7 +422,7 @@ void MyMoneySeqAccessMgrTest::testModifyInstitution() { } } -void MyMoneySeqAccessMgrTest::testRetqparentAccount() { +void MyMoneySeqAccessMgrTest::testReparentAccount() { // this one adds some accounts to the database MyMoneyAccount ex1; ex1.setAccountType(MyMoneyAccount::Expense); @@ -475,12 +475,12 @@ void MyMoneySeqAccessMgrTest::testRetqparentAccount() { CPPUNIT_ASSERT(m->expense().accountCount() == 3); CPPUNIT_ASSERT(m->account(ex1.id()).accountCount() == 1); - CPPUNIT_ASSERT(ex3.tqparentAccountId() == STD_ACC_EXPENSE); + CPPUNIT_ASSERT(ex3.parentAccountId() == STD_ACC_EXPENSE); m->reparentAccount(ex3, ex1); CPPUNIT_ASSERT(m->expense().accountCount() == 2); CPPUNIT_ASSERT(m->account(ex1.id()).accountCount() == 2); - CPPUNIT_ASSERT(ex3.tqparentAccountId() == ex1.id()); + CPPUNIT_ASSERT(ex3.parentAccountId() == ex1.id()); } catch (MyMoneyException *e) { std::cout << std::endl << e->what() << std::endl; delete e; @@ -489,7 +489,7 @@ void MyMoneySeqAccessMgrTest::testRetqparentAccount() { } void MyMoneySeqAccessMgrTest::testAddTransactions() { - testRetqparentAccount(); + testReparentAccount(); MyMoneyAccount ch; MyMoneyTransaction t1, t2; @@ -822,7 +822,7 @@ void MyMoneySeqAccessMgrTest::testRemoveUsedAccount() { void MyMoneySeqAccessMgrTest::testRemoveInstitution() { testModifyInstitution(); - testRetqparentAccount(); + testReparentAccount(); MyMoneyInstitution i; MyMoneyAccount a; diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.h b/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.h index 57f1cd6..761c651 100644 --- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.h +++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.h @@ -38,7 +38,7 @@ class MyMoneySeqAccessMgrTest : public CppUnit::TestFixture { CPPUNIT_TEST(testIsStandardAccount); CPPUNIT_TEST(testNewAccount); CPPUNIT_TEST(testAddNewAccount); - CPPUNIT_TEST(testRetqparentAccount); + CPPUNIT_TEST(testReparentAccount); CPPUNIT_TEST(testAddInstitution); CPPUNIT_TEST(testInstitution); CPPUNIT_TEST(testAccount2Institution); @@ -94,7 +94,7 @@ public: void testAccount2Institution(); void testModifyAccount(); void testModifyInstitution(); - void testRetqparentAccount(); + void testReparentAccount(); void testAddTransactions(); void testTransactionCount(); void testBalance(); diff --git a/kmymoney2/mymoney/storage/mymoneystoragedump.cpp b/kmymoney2/mymoney/storage/mymoneystoragedump.cpp index 77fa395..8dd022a 100644 --- a/kmymoney2/mymoney/storage/mymoneystoragedump.cpp +++ b/kmymoney2/mymoney/storage/mymoneystoragedump.cpp @@ -160,9 +160,9 @@ void MyMoneyStorageDump::writeStream(TQDataStream& _s, IMyMoneySerialize* _stora s << " Currency = " << storage->currency((*it_a).currencyId()).name() << "\n"; } } - s << " Parent = " << (*it_a).tqparentAccountId(); - if(!(*it_a).tqparentAccountId().isEmpty()) { - MyMoneyAccount tqparent = storage->account((*it_a).tqparentAccountId()); + s << " Parent = " << (*it_a).parentAccountId(); + if(!(*it_a).parentAccountId().isEmpty()) { + MyMoneyAccount tqparent = storage->account((*it_a).parentAccountId()); s << " (" << tqparent.name() << ")"; } else { s << "n/a"; diff --git a/kmymoney2/mymoney/storage/mymoneystoragesql.cpp b/kmymoney2/mymoney/storage/mymoneystoragesql.cpp index 12a4aa3..f479c5c 100644 --- a/kmymoney2/mymoney/storage/mymoneystoragesql.cpp +++ b/kmymoney2/mymoney/storage/mymoneystoragesql.cpp @@ -191,7 +191,7 @@ try { readFileInfo(); if (!m_logonUser.isEmpty() && (!m_override)) { m_error = TQString - (i18n("Database aptqparently in use\nOpened by %1 on %2 at %3.\nOpen anyway?")) + (i18n("Database apparently in use\nOpened by %1 on %2 at %3.\nOpen anyway?")) .tqarg(m_logonUser) .tqarg(m_logonAt.date().toString(Qt::ISODate)) .tqarg(m_logonAt.time().toString("hh.mm.ss")); @@ -1291,7 +1291,7 @@ void MyMoneyStorageSql::writeAccount(const MyMoneyAccount& acc, MyMoneySqlQuery& //MyMoneyMoney balance = m_storagePtr->balance(acc.id(), TQDate()); q.bindValue(":id", acc.id()); q.bindValue(":institutionId", acc.institutionId()); - q.bindValue(":tqparentId", acc.tqparentAccountId()); + q.bindValue(":parentId", acc.parentAccountId()); if (acc.lastReconciliationDate() == TQDate()) q.bindValue(":lastReconciled", acc.lastReconciliationDate()); else @@ -2489,7 +2489,7 @@ const TQMap MyMoneyStorageSql::fetchAccounts (const TQ MyMoneySqlQuery q(const_cast (this)); MyMoneySqlQuery sq(const_cast (this)); - TQString childQueryString = "SELECT id, tqparentId FROM kmmAccounts WHERE "; + TQString childQueryString = "SELECT id, parentId FROM kmmAccounts WHERE "; TQString queryString (t.selectAllString(false)); // Use bind variables, instead of just inserting the values in the queryString, @@ -2497,7 +2497,7 @@ const TQMap MyMoneyStorageSql::fetchAccounts (const TQ if (! idList.empty()) { kvpAccountList = idList; queryString += " WHERE id IN ("; - childQueryString += " tqparentId IN ("; + childQueryString += " parentId IN ("; for (unsigned i = 0; i < idList.count(); ++i) { queryString += " :id" + TQString::number(i) + ", "; childQueryString += ":id" + TQString::number(i) + ", "; @@ -2505,11 +2505,11 @@ const TQMap MyMoneyStorageSql::fetchAccounts (const TQ queryString = queryString.left(queryString.length() - 2) + ")"; childQueryString = childQueryString.left(childQueryString.length() - 2) + ")"; } else { - childQueryString += " NOT tqparentId IS NULL"; + childQueryString += " NOT parentId IS NULL"; } queryString += " ORDER BY id"; - childQueryString += " ORDER BY tqparentid, id"; + childQueryString += " ORDER BY parentid, id"; if (forUpdate) { queryString += " FOR UPDATE"; @@ -2539,7 +2539,7 @@ const TQMap MyMoneyStorageSql::fetchAccounts (const TQ while (ft != accEnd) { CASE(id) aid = GETCSTRING; else CASE(institutionId) acc.setInstitutionId(GETCSTRING); - else CASE(tqparentId) acc.setParentAccountId(GETCSTRING); + else CASE(parentId) acc.setParentAccountId(GETCSTRING); else CASE(lastReconciled) acc.setLastReconciliationDate(GETDATE); else CASE(lastModified) acc.setLastModified(GETDATE); else CASE(openingDate) acc.setOpeningDate(GETDATE); @@ -3911,7 +3911,7 @@ void MyMoneyDbDef::Accounts(void){ TQValueList > fields; fields.append(new MyMoneyDbColumn("id", "varchar(32)", PRIMARYKEY, NOTNULL)); fields.append(new MyMoneyDbColumn("institutionId", "varchar(32)")); - fields.append(new MyMoneyDbColumn("tqparentId", "varchar(32)")); + fields.append(new MyMoneyDbColumn("parentId", "varchar(32)")); fields.append(new MyMoneyDbDatetimeColumn("lastReconciled")); fields.append(new MyMoneyDbDatetimeColumn("lastModified")); fields.append(new MyMoneyDbColumn("openingDate", "date")); diff --git a/kmymoney2/mymoney/storage/mymoneystoragexml.cpp b/kmymoney2/mymoney/storage/mymoneystoragexml.cpp index 49e0739..e8b79fd 100644 --- a/kmymoney2/mymoney/storage/mymoneystoragexml.cpp +++ b/kmymoney2/mymoney/storage/mymoneystoragexml.cpp @@ -214,7 +214,7 @@ bool MyMoneyXmlContentHandler::endElement(const TQString& /* namespaceURI */, co bool rc = true; TQString s = qName.lower(); if(m_level) { - m_currNode = m_currNode.tqparentNode().toElement(); + m_currNode = m_currNode.parentNode().toElement(); m_level--; if(!m_level) { try { -- cgit v1.2.1