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/mymoneyfiletest.cpp | 38 +++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'kmymoney2/mymoney/mymoneyfiletest.cpp') 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) { -- cgit v1.2.1