summaryrefslogtreecommitdiffstats
path: root/kmymoney2/mymoney
diff options
context:
space:
mode:
Diffstat (limited to 'kmymoney2/mymoney')
-rw-r--r--kmymoney2/mymoney/mymoneyaccount.cpp10
-rw-r--r--kmymoney2/mymoney/mymoneyaccount.h14
-rw-r--r--kmymoney2/mymoney/mymoneyaccounttest.cpp12
-rw-r--r--kmymoney2/mymoney/mymoneybudget.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneybudget.h6
-rw-r--r--kmymoney2/mymoney/mymoneyfile.cpp126
-rw-r--r--kmymoney2/mymoney/mymoneyfile.h16
-rw-r--r--kmymoney2/mymoney/mymoneyfiletest.cpp46
-rw-r--r--kmymoney2/mymoney/mymoneyfiletest.h2
-rw-r--r--kmymoney2/mymoney/mymoneyfinancialcalculator.cpp40
-rw-r--r--kmymoney2/mymoney/mymoneyfinancialcalculator.h2
-rw-r--r--kmymoney2/mymoney/mymoneyfinancialcalculatortest.cpp14
-rw-r--r--kmymoney2/mymoney/mymoneyinstitution.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneyinstitution.h2
-rw-r--r--kmymoney2/mymoney/mymoneyinvesttransaction.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneyinvesttransaction.h2
-rw-r--r--kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneykeyvaluecontainer.h6
-rw-r--r--kmymoney2/mymoney/mymoneyobject.h6
-rw-r--r--kmymoney2/mymoney/mymoneypayee.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneypayee.h2
-rw-r--r--kmymoney2/mymoney/mymoneypayeetest.cpp14
-rw-r--r--kmymoney2/mymoney/mymoneyreport.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneyreport.h8
-rw-r--r--kmymoney2/mymoney/mymoneyscheduled.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneyscheduled.h2
-rw-r--r--kmymoney2/mymoney/mymoneysecurity.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneysecurity.h2
-rw-r--r--kmymoney2/mymoney/mymoneysplit.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneysplit.h2
-rw-r--r--kmymoney2/mymoney/mymoneytransaction.cpp4
-rw-r--r--kmymoney2/mymoney/mymoneytransaction.h2
-rw-r--r--kmymoney2/mymoney/mymoneyutils.h2
-rw-r--r--kmymoney2/mymoney/storage/imymoneyserialize.h6
-rw-r--r--kmymoney2/mymoney/storage/imymoneystorage.h10
-rw-r--r--kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp58
-rw-r--r--kmymoney2/mymoney/storage/mymoneydatabasemgr.h10
-rw-r--r--kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp18
-rw-r--r--kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp56
-rw-r--r--kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h14
-rw-r--r--kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp18
-rw-r--r--kmymoney2/mymoney/storage/mymoneystoragedump.cpp4
-rw-r--r--kmymoney2/mymoney/storage/mymoneystoragexml.cpp12
43 files changed, 292 insertions, 292 deletions
diff --git a/kmymoney2/mymoney/mymoneyaccount.cpp b/kmymoney2/mymoney/mymoneyaccount.cpp
index b41e04a..5d74e62 100644
--- a/kmymoney2/mymoney/mymoneyaccount.cpp
+++ b/kmymoney2/mymoney/mymoneyaccount.cpp
@@ -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.parentAccountId().data());
+ // qDebug("Account %s has id of %s, type of %d, parent is %s.", acc.name().data(), id.data(), type, acc.parentAccountId().data());
// Process any Sub-Account information found inside the account entry.
m_accountList.clear();
@@ -168,9 +168,9 @@ void MyMoneyAccount::setLastReconciliationDate(const TQDate& date)
m_lastReconciliationDate = date;
}
-void MyMoneyAccount::setParentAccountId(const TQString& tqparent)
+void MyMoneyAccount::setParentAccountId(const TQString& parent)
{
- m_parentAccount = tqparent;
+ m_parentAccount = parent;
}
void MyMoneyAccount::setAccountType(const accountTypeE type)
@@ -475,7 +475,7 @@ int MyMoneyAccountLoan::interestCompounding(void) const
return value("compoundingFrequency").toInt();
}
-void MyMoneyAccount::writeXML(TQDomDocument& document, TQDomElement& tqparent) const
+void MyMoneyAccount::writeXML(TQDomDocument& document, TQDomElement& parent) const
{
TQDomElement el = document.createElement("ACCOUNT");
@@ -529,7 +529,7 @@ void MyMoneyAccount::writeXML(TQDomDocument& document, TQDomElement& tqparent) c
//Add in Key-Value Pairs for accounts.
MyMoneyKeyValueContainer::writeXML(document, el);
- tqparent.appendChild(el);
+ parent.appendChild(el);
}
bool MyMoneyAccount::hasReferenceTo(const TQString& id) const
diff --git a/kmymoney2/mymoney/mymoneyaccount.h b/kmymoney2/mymoney/mymoneyaccount.h
index 69b015d..968cadb 100644
--- a/kmymoney2/mymoney/mymoneyaccount.h
+++ b/kmymoney2/mymoney/mymoneyaccount.h
@@ -233,8 +233,8 @@ public:
const TQDate& lastModified(void) const { return m_lastModified; }
/**
- * This method is used to return the ID of the tqparent account
- * @return TQString with the ID of the tqparent of this account
+ * This method is used to return the ID of the parent account
+ * @return TQString with the ID of the parent of this account
*/
const TQString& parentAccountId(void) const { return m_parentAccount; };
@@ -334,10 +334,10 @@ public:
void setAccountType(const accountTypeE type);
/**
- * This method is used to set a new tqparent account id
- * @param tqparent TQString reference to new tqparent account
+ * This method is used to set a new parent account id
+ * @param parent TQString reference to new parent account
*/
- void setParentAccountId(const TQString& tqparent);
+ void setParentAccountId(const TQString& parent);
/**
* This method is used to update m_lastModified to the current date
@@ -364,7 +364,7 @@ public:
*/
void setCurrencyId(const TQString& id);
- void writeXML(TQDomDocument& document, TQDomElement& tqparent) const;
+ void writeXML(TQDomDocument& document, TQDomElement& parent) const;
/**
* This method checks if a reference to the given object exists. It returns,
@@ -594,7 +594,7 @@ private:
TQStringList m_accountList;
/**
- * This member contains the ID of the tqparent account
+ * This member contains the ID of the parent account
*/
TQString m_parentAccount;
diff --git a/kmymoney2/mymoney/mymoneyaccounttest.cpp b/kmymoney2/mymoney/mymoneyaccounttest.cpp
index 151dcc1..a7c55af 100644
--- a/kmymoney2/mymoney/mymoneyaccounttest.cpp
+++ b/kmymoney2/mymoney/mymoneyaccounttest.cpp
@@ -45,7 +45,7 @@ void MyMoneyAccountTest::testEmptyConstructor() {
void MyMoneyAccountTest::testConstructor() {
TQString id = "A000001";
TQString institutionid = "B000001";
- TQString tqparent = "Parent";
+ TQString parent = "Parent";
MyMoneyAccount r;
MyMoneySplit s;
r.setAccountType(MyMoneyAccount::Asset);
@@ -53,7 +53,7 @@ void MyMoneyAccountTest::testConstructor() {
r.setLastModified(TQDate::tqcurrentDate());
r.setDescription("Desc");
r.setNumber("465500");
- r.setParentAccountId(tqparent);
+ r.setParentAccountId(parent);
r.setValue(TQString("key"), "value");
s.setShares(MyMoneyMoney(1,1));
r.adjustBalance(s);
@@ -105,7 +105,7 @@ void MyMoneyAccountTest::testSetFunctions() {
void MyMoneyAccountTest::testCopyConstructor() {
TQString id = "A000001";
TQString institutionid = "B000001";
- TQString tqparent = "ParentAccount";
+ TQString parent = "ParentAccount";
MyMoneyAccount r;
r.setAccountType(MyMoneyAccount::Expense);
r.setOpeningDate(TQDate::tqcurrentDate());
@@ -114,7 +114,7 @@ void MyMoneyAccountTest::testCopyConstructor() {
r.setInstitutionId("Inst1");
r.setDescription("Desc1");
r.setNumber("Number");
- r.setParentAccountId(tqparent);
+ r.setParentAccountId(parent);
r.setValue("Key", "Value");
MyMoneyAccount a(id, r);
@@ -274,7 +274,7 @@ void MyMoneyAccountTest::testEquality()
void MyMoneyAccountTest::testWriteXML() {
TQString id = "A000001";
TQString institutionid = "B000001";
- TQString tqparent = "Parent";
+ TQString parent = "Parent";
MyMoneyAccount r;
r.setAccountType(MyMoneyAccount::Asset);
@@ -283,7 +283,7 @@ void MyMoneyAccountTest::testWriteXML() {
r.setDescription("Desc");
r.setName("AccountName");
r.setNumber("465500");
- r.setParentAccountId(tqparent);
+ r.setParentAccountId(parent);
r.setInstitutionId(institutionid);
r.setValue(TQString("key"), "value");
r.addAccountId("A000002");
diff --git a/kmymoney2/mymoney/mymoneybudget.cpp b/kmymoney2/mymoney/mymoneybudget.cpp
index 55cd6cc..491a97d 100644
--- a/kmymoney2/mymoney/mymoneybudget.cpp
+++ b/kmymoney2/mymoney/mymoneybudget.cpp
@@ -289,11 +289,11 @@ bool MyMoneyBudget::read(const TQDomElement& e)
return result;
}
-void MyMoneyBudget::writeXML(TQDomDocument& document, TQDomElement& tqparent) const
+void MyMoneyBudget::writeXML(TQDomDocument& document, TQDomElement& parent) const
{
TQDomElement el = document.createElement("BUDGET");
write(el,&document);
- tqparent.appendChild(el);
+ parent.appendChild(el);
}
bool MyMoneyBudget::hasReferenceTo(const TQString& id) const
diff --git a/kmymoney2/mymoney/mymoneybudget.h b/kmymoney2/mymoney/mymoneybudget.h
index deb9b19..485d1a2 100644
--- a/kmymoney2/mymoney/mymoneybudget.h
+++ b/kmymoney2/mymoney/mymoneybudget.h
@@ -220,13 +220,13 @@ public:
/**
* This method creates a TQDomElement for the @p document
- * under the tqparent node @p tqparent. (This version overwrites the
+ * under the parent node @p parent. (This version overwrites the
* MMObject base class.)
*
* @param document reference to TQDomDocument
- * @param tqparent reference to TQDomElement tqparent node
+ * @param parent reference to TQDomElement parent node
*/
- virtual void writeXML(TQDomDocument& document, TQDomElement& tqparent) const;
+ virtual void writeXML(TQDomDocument& document, TQDomElement& parent) const;
/**
* This method checks if a reference to the given object exists. It returns,
diff --git a/kmymoney2/mymoney/mymoneyfile.cpp b/kmymoney2/mymoney/mymoneyfile.cpp
index 4b354ef..c36c163 100644
--- a/kmymoney2/mymoney/mymoneyfile.cpp
+++ b/kmymoney2/mymoney/mymoneyfile.cpp
@@ -175,7 +175,7 @@ void MyMoneyFile::addInstitution(MyMoneyInstitution& institution)
{
// perform some checks to see that the institution stuff is OK. For
// now we assume that the institution must have a name, the ID is not set
- // and it does not have a tqparent (MyMoneyFile).
+ // and it does not have a parent (MyMoneyFile).
if(institution.name().length() == 0
|| institution.id().length() != 0)
@@ -318,7 +318,7 @@ void MyMoneyFile::modifyAccount(const MyMoneyAccount& _account)
addNotification(account.id());
}
-void MyMoneyFile::reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqparent)
+void MyMoneyFile::reparentAccount(MyMoneyAccount &account, MyMoneyAccount& parent)
{
checkTransaction(__PRETTY_FUNCTION__);
@@ -326,27 +326,27 @@ void MyMoneyFile::reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqpar
if(isStandardAccount(account.id()))
throw new MYMONEYEXCEPTION("Unable to reparent the standard account groups");
- if(account.accountGroup() == tqparent.accountGroup()
- || (account.accountType() == MyMoneyAccount::Income && tqparent.accountType() == MyMoneyAccount::Expense)
- || (account.accountType() == MyMoneyAccount::Expense && tqparent.accountType() == MyMoneyAccount::Income)) {
+ if(account.accountGroup() == parent.accountGroup()
+ || (account.accountType() == MyMoneyAccount::Income && parent.accountType() == MyMoneyAccount::Expense)
+ || (account.accountType() == MyMoneyAccount::Expense && parent.accountType() == MyMoneyAccount::Income)) {
- if(account.isInvest() && tqparent.accountType() != MyMoneyAccount::Investment)
+ if(account.isInvest() && parent.accountType() != MyMoneyAccount::Investment)
throw new MYMONEYEXCEPTION("Unable to reparent Stock to non-investment account");
- if(tqparent.accountType() == MyMoneyAccount::Investment && !account.isInvest())
+ if(parent.accountType() == MyMoneyAccount::Investment && !account.isInvest())
throw new MYMONEYEXCEPTION("Unable to reparent non-stock to investment account");
// clear all changed objects from cache
MyMoneyNotifier notifier(this);
- // keep a notification of the current tqparent
+ // keep a notification of the current parent
addNotification(account.parentAccountId());
- m_storage->reparentAccount(account, tqparent);
+ m_storage->reparentAccount(account, parent);
- // and also keep one for the account itself and the new tqparent
+ // and also keep one for the account itself and the new parent
addNotification(account.id());
- addNotification(tqparent.id());
+ addNotification(parent.id());
} else
throw new MYMONEYEXCEPTION("Unable to reparent to different account type");
@@ -429,14 +429,14 @@ void MyMoneyFile::removeAccount(const MyMoneyAccount& account)
{
checkTransaction(__PRETTY_FUNCTION__);
- MyMoneyAccount tqparent;
+ MyMoneyAccount parent;
MyMoneyAccount acc;
MyMoneyInstitution institution;
- // check that the account and its tqparent exist
+ // check that the account and its parent exist
// this will throw an exception if the id is unknown
acc = MyMoneyFile::account(account.id());
- tqparent = MyMoneyFile::account(account.parentAccountId());
+ parent = MyMoneyFile::account(account.parentAccountId());
if(!acc.institutionId().isEmpty())
institution = MyMoneyFile::institution(acc.institutionId());
@@ -455,8 +455,8 @@ void MyMoneyFile::removeAccount(const MyMoneyAccount& account)
TQStringList::ConstIterator it;
for(it = acc.accountList().begin(); it != acc.accountList().end(); ++it)
addNotification(*it);
- // don't forget the tqparent and a possible institution
- addNotification(tqparent.id());
+ // don't forget the parent and a possible institution
+ addNotification(parent.id());
addNotification(account.institutionId());
if(!institution.id().isEmpty()) {
@@ -542,7 +542,7 @@ void MyMoneyFile::removeInstitution(const MyMoneyInstitution& institution)
addNotification(institution.id(), false);
}
-void MyMoneyFile::addAccount(MyMoneyAccount& account, MyMoneyAccount& tqparent)
+void MyMoneyFile::addAccount(MyMoneyAccount& account, MyMoneyAccount& parent)
{
checkTransaction(__PRETTY_FUNCTION__);
@@ -550,7 +550,7 @@ void MyMoneyFile::addAccount(MyMoneyAccount& account, MyMoneyAccount& tqparent)
// perform some checks to see that the account stuff is OK. For
// now we assume that the account must have a name, has no
- // transaction and sub-accounts and tqparent account
+ // transaction and sub-accounts and parent account
// it's own ID is not set and it does not have a pointer to (MyMoneyFile)
if(account.name().length() == 0)
@@ -563,15 +563,15 @@ void MyMoneyFile::addAccount(MyMoneyAccount& account, MyMoneyAccount& tqparent)
throw new MYMONEYEXCEPTION("New account must have no sub-accounts");
if(!account.parentAccountId().isEmpty())
- throw new MYMONEYEXCEPTION("New account must have no tqparent-id");
+ throw new MYMONEYEXCEPTION("New account must have no parent-id");
if(account.accountType() == MyMoneyAccount::UnknownAccountType)
throw new MYMONEYEXCEPTION("Account has invalid type");
- // make sure, that the tqparent account exists
+ // make sure, that the parent account exists
// if not, an exception is thrown. If it exists,
// get a copy of the current data
- MyMoneyAccount acc = MyMoneyFile::account(tqparent.id());
+ MyMoneyAccount acc = MyMoneyFile::account(parent.id());
#if 0
// TODO: remove the following code as we now can have multiple accounts
@@ -589,22 +589,22 @@ void MyMoneyFile::addAccount(MyMoneyAccount& account, MyMoneyAccount& tqparent)
}
#endif
- // FIXME: make sure, that the tqparent has the same type
+ // FIXME: make sure, that the parent has the same type
// I left it out here because I don't know, if there is
// a tight coupling between e.g. checking accounts and the
// class asset. It certainly does not make sense to create an
// expense account under an income account. Maybe it does, I don't know.
- // We enforce, that a stock account can never be a tqparent and
- // that the tqparent for a stock account must be an investment. Also,
- // an investment cannot have another investment account as it's tqparent
- if(tqparent.isInvest())
- throw new MYMONEYEXCEPTION("Stock account cannot be tqparent account");
+ // We enforce, that a stock account can never be a parent and
+ // that the parent for a stock account must be an investment. Also,
+ // an investment cannot have another investment account as it's parent
+ if(parent.isInvest())
+ throw new MYMONEYEXCEPTION("Stock account cannot be parent account");
- if(account.isInvest() && tqparent.accountType() != MyMoneyAccount::Investment)
- throw new MYMONEYEXCEPTION("Stock account must have investment account as tqparent ");
+ if(account.isInvest() && parent.accountType() != MyMoneyAccount::Investment)
+ throw new MYMONEYEXCEPTION("Stock account must have investment account as parent ");
- if(!account.isInvest() && tqparent.accountType() == MyMoneyAccount::Investment)
+ if(!account.isInvest() && parent.accountType() == MyMoneyAccount::Investment)
throw new MYMONEYEXCEPTION("Investment account can only have stock accounts as tqchildren");
// clear all changed objects from cache
@@ -622,10 +622,10 @@ void MyMoneyFile::addAccount(MyMoneyAccount& account, MyMoneyAccount& tqparent)
account.setOpeningDate(TQDate::tqcurrentDate());
}
- account.setParentAccountId(tqparent.id());
+ account.setParentAccountId(parent.id());
m_storage->addAccount(account);
- m_storage->addAccount(tqparent, account);
+ m_storage->addAccount(parent, account);
if(account.institutionId().length() != 0) {
institution.addAccountId(account.id());
@@ -634,7 +634,7 @@ void MyMoneyFile::addAccount(MyMoneyAccount& account, MyMoneyAccount& tqparent)
}
d->m_cache.preloadAccount(account);
- addNotification(tqparent.id());
+ addNotification(parent.id());
}
MyMoneyTransaction MyMoneyFile::createOpeningBalanceTransaction(const MyMoneyAccount& acc, const MyMoneyMoney& balance)
@@ -793,8 +793,8 @@ const MyMoneyAccount MyMoneyFile::createOpeningBalanceAccount(const MyMoneySecur
acc.setAccountType(MyMoneyAccount::Equity);
acc.setCurrencyId(security.id());
- MyMoneyAccount tqparent = equity();
- this->addAccount(acc, tqparent);
+ MyMoneyAccount parent = equity();
+ this->addAccount(acc, parent);
return acc;
}
@@ -1351,7 +1351,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void)
TQMap<TQString, bool> interestAccounts;
- MyMoneyAccount tqparent;
+ MyMoneyAccount parent;
MyMoneyAccount child;
MyMoneyAccount toplevel;
@@ -1408,14 +1408,14 @@ const TQStringList MyMoneyFile::consistencyCheck(void)
try {
bool dropOut = false;
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
+ parent = account(parentId);
+ if(parent.id() == (*it_a).id()) {
+ // parent loops, so we need to re-parent to toplevel account
+ // find parent account in our list
problemCount++;
TQValueList<MyMoneyAccount>::Iterator it_b;
for(it_b = list.begin(); it_b != list.end(); ++it_b) {
- if((*it_b).id() == tqparent.id()) {
+ if((*it_b).id() == parent.id()) {
if(problemAccount != (*it_a).name()) {
problemAccount = (*it_a).name();
rc << i18n("* Problem with account '%1'").tqarg(problemAccount);
@@ -1432,51 +1432,51 @@ const TQStringList MyMoneyFile::consistencyCheck(void)
}
}
}
- parentId = tqparent.parentAccountId();
+ parentId = parent.parentAccountId();
}
} catch(MyMoneyException *e) {
- // if we don't know about a tqparent, we catch it later
+ // if we don't know about a parent, we catch it later
delete e;
}
- // check that the tqparent exists
+ // check that the parent exists
parentId = (*it_a).parentAccountId();
try {
- tqparent = account(parentId);
- if((*it_a).accountGroup() != tqparent.accountGroup()) {
+ parent = account(parentId);
+ if((*it_a).accountGroup() != parent.accountGroup()) {
problemCount++;
if(problemAccount != (*it_a).name()) {
problemAccount = (*it_a).name();
rc << i18n("* Problem with account '%1'").tqarg(problemAccount);
}
- // the tqparent belongs to a different group, so we reconnect to the
+ // the parent belongs to a different group, so we reconnect to the
// master group account (asset, liability, etc) to which this account
// should belong and update it in the engine.
- rc << i18n(" * Parent account '%1' belongs to a different group.").tqarg(tqparent.name());
- rc << i18n(" New tqparent account is the top level account '%1'.").tqarg(toplevel.name());
+ rc << i18n(" * Parent account '%1' belongs to a different group.").tqarg(parent.name());
+ rc << i18n(" New parent account is the top level account '%1'.").tqarg(toplevel.name());
(*it_a).setParentAccountId(toplevel.id());
// make sure to rebuild the sub-accounts of the top account
// and the one we removed this account from
if(accountRebuild.contains(toplevel.id()) == 0)
accountRebuild << toplevel.id();
- if(accountRebuild.contains(tqparent.id()) == 0)
- accountRebuild << tqparent.id();
- } else if(!tqparent.accountList().contains((*it_a).id())) {
+ if(accountRebuild.contains(parent.id()) == 0)
+ accountRebuild << parent.id();
+ } else if(!parent.accountList().contains((*it_a).id())) {
problemCount++;
if(problemAccount != (*it_a).name()) {
problemAccount = (*it_a).name();
rc << i18n("* Problem with account '%1'").tqarg(problemAccount);
}
- // tqparent exists, but does not have a reference to the account
- rc << i18n(" * Parent account '%1' does not contain '%2' as sub-account.").tqarg(tqparent.name(), problemAccount);
- if(accountRebuild.contains(tqparent.id()) == 0)
- accountRebuild << tqparent.id();
+ // parent exists, but does not have a reference to the account
+ rc << i18n(" * Parent account '%1' does not contain '%2' as sub-account.").tqarg(parent.name(), problemAccount);
+ if(accountRebuild.contains(parent.id()) == 0)
+ accountRebuild << parent.id();
}
} catch(MyMoneyException *e) {
delete e;
- // apparently, the tqparent does not exist anymore. we reconnect to the
+ // apparently, the parent 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,8 +1484,8 @@ 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(parentId);
- rc << i18n(" New tqparent account is the top level account '%1'.").tqarg(toplevel.name());
+ rc << i18n(" * The parent with id %1 does not exist anymore.").tqarg(parentId);
+ rc << i18n(" New parent account is the top level account '%1'.").tqarg(toplevel.name());
(*it_a).setParentAccountId(toplevel.id());
addNotification((*it_a).id());
@@ -1777,7 +1777,7 @@ TQString MyMoneyFile::createCategory(const MyMoneyAccount& base, const TQString&
{
checkTransaction(__PRETTY_FUNCTION__);
- MyMoneyAccount tqparent = base;
+ MyMoneyAccount parent = base;
TQString categoryText;
if(base.id() != expense().id() && base.id() != income().id())
@@ -1802,7 +1802,7 @@ TQString MyMoneyFile::createCategory(const MyMoneyAccount& base, const TQString&
{
TQString categoryId = categoryToAccount(categoryText);
if (categoryId.isEmpty())
- addAccount(categoryAccount, tqparent);
+ addAccount(categoryAccount, parent);
else
{
categoryAccount = account(categoryId);
@@ -1812,13 +1812,13 @@ TQString MyMoneyFile::createCategory(const MyMoneyAccount& base, const TQString&
{
qDebug("Unable to add account %s, %s, %s: %s",
categoryAccount.name().latin1(),
- tqparent.name().latin1(),
+ parent.name().latin1(),
categoryText.latin1(),
e->what().latin1());
delete e;
}
- tqparent = categoryAccount;
+ parent = categoryAccount;
}
return categoryToAccount(name);
diff --git a/kmymoney2/mymoney/mymoneyfile.h b/kmymoney2/mymoney/mymoneyfile.h
index f697267..410115d 100644
--- a/kmymoney2/mymoney/mymoneyfile.h
+++ b/kmymoney2/mymoney/mymoneyfile.h
@@ -402,15 +402,15 @@ public:
* b) the account must not have an id assigned
* c) the transaction list must be empty
* d) the account must not have any sub-ordinate accounts
- * e) the account must have no tqparent account
+ * e) the account must have no parent account
* f) the account must not have any reference to a MyMoneyFile object
*
* An exception will be thrown upon error conditions.
*
* @param account The complete account information in a MyMoneyAccount object
- * @param tqparent The complete account information of the tqparent account
+ * @param parent The complete account information of the parent account
*/
- void addAccount(MyMoneyAccount& account, MyMoneyAccount& tqparent);
+ void addAccount(MyMoneyAccount& account, MyMoneyAccount& parent);
/**
* Modifies an already existing account in the file global account pool.
@@ -427,9 +427,9 @@ public:
* An exception will be thrown upon error conditions.
*
* @param account MyMoneyAccount reference to account to be re-parented
- * @param tqparent MyMoneyAccount reference to new tqparent account
+ * @param parent MyMoneyAccount reference to new parent account
*/
- void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqparent);
+ void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& parent);
/**
* moves splits from one account to another
@@ -772,11 +772,11 @@ public:
TQString nameToAccount(const TQString& name) const;
/**
- * This method is used to extract the tqparent part of an account hierarchy
+ * This method is used to extract the parent part of an account hierarchy
* name who's parts are seperated by MyMoneyAccount::AccountSeperator.
*
* @param name full account name
- * @return tqparent name (full account name excluding the last part)
+ * @return parent name (full account name excluding the last part)
*/
TQString parentName(const TQString& name) const;
@@ -967,7 +967,7 @@ public:
* already exist. e.g if name = Bills:Credit Card and
* base = expense(), Bills will first be checked to see if
* it exists and created if not. Credit Card will then
- * be created with Bills as it's tqparent. The Credit Card account
+ * be created with Bills as it's parent. The Credit Card account
* will have it's id returned.
*
* @param base The base account (expense or income)
diff --git a/kmymoney2/mymoney/mymoneyfiletest.cpp b/kmymoney2/mymoney/mymoneyfiletest.cpp
index 4d10c56..431debb 100644
--- a/kmymoney2/mymoney/mymoneyfiletest.cpp
+++ b/kmymoney2/mymoney/mymoneyfiletest.cpp
@@ -380,8 +380,8 @@ void MyMoneyFileTest::testAddAccounts() {
MyMoneyFileTransaction ft;
try {
- MyMoneyAccount tqparent = m->asset();
- m->addAccount(a, tqparent);
+ MyMoneyAccount parent = m->asset();
+ m->addAccount(a, parent);
ft.commit();
CPPUNIT_ASSERT(m->accountCount() == 6);
CPPUNIT_ASSERT(a.parentAccountId() == "AStd::Asset");
@@ -403,8 +403,8 @@ void MyMoneyFileTest::testAddAccounts() {
// try to add this account again, should not work
ft.restart();
try {
- MyMoneyAccount tqparent = m->asset();
- m->addAccount(a, tqparent);
+ MyMoneyAccount parent = m->asset();
+ m->addAccount(a, parent);
CPPUNIT_FAIL("Expecting exception!");
} catch(MyMoneyException *e) {
ft.commit();
@@ -434,8 +434,8 @@ void MyMoneyFileTest::testAddAccounts() {
b.setInstitutionId(institution.id());
ft.restart();
try {
- MyMoneyAccount tqparent = m->asset();
- m->addAccount(b, tqparent);
+ MyMoneyAccount parent = m->asset();
+ m->addAccount(b, parent);
ft.commit();
CPPUNIT_ASSERT(m->dirty() == true);
CPPUNIT_ASSERT(b.id() == "A000002");
@@ -646,7 +646,7 @@ void MyMoneyFileTest::testRemoveAccountTree() {
delete e;
}
- // make sure that tqchildren are re-parented to tqparent account
+ // make sure that tqchildren are re-parented to parent account
try {
a = m->account("A000001");
CPPUNIT_ASSERT(a.parentAccountId() == m->asset().id());
@@ -690,9 +690,9 @@ void MyMoneyFileTest::testAddTransaction () {
MyMoneyFileTransaction ft;
try {
- MyMoneyAccount tqparent = m->expense();
- m->addAccount(exp1, tqparent);
- m->addAccount(exp2, tqparent);
+ MyMoneyAccount parent = m->expense();
+ m->addAccount(exp1, parent);
+ m->addAccount(exp2, parent);
ft.commit();
} catch(MyMoneyException *e) {
delete e;
@@ -1281,8 +1281,8 @@ void MyMoneyFileTest::testAddEquityAccount() {
MyMoneyFileTransaction ft;
try {
- MyMoneyAccount tqparent = m->asset();
- m->addAccount(i, tqparent);
+ MyMoneyAccount parent = m->asset();
+ m->addAccount(i, parent);
ft.commit();
} catch(MyMoneyException *e) {
unexpectedException(e);
@@ -1337,7 +1337,7 @@ void MyMoneyFileTest::testAddEquityAccount() {
void MyMoneyFileTest::testReparentEquity() {
testAddEquityAccount();
testAddEquityAccount();
- MyMoneyAccount tqparent;
+ MyMoneyAccount parent;
// check the bad cases
TQValueList<MyMoneyAccount::accountTypeE> list;
@@ -1349,25 +1349,25 @@ void MyMoneyFileTest::testReparentEquity() {
list << MyMoneyAccount::Asset;
list << MyMoneyAccount::AssetLoan;
list << MyMoneyAccount::Currency;
- tqparent = m->asset();
- testReparentEquity(list, tqparent);
+ parent = m->asset();
+ testReparentEquity(list, parent);
list.clear();
list << MyMoneyAccount::CreditCard;
list << MyMoneyAccount::Loan;
list << MyMoneyAccount::Liability;
- tqparent = m->liability();
- testReparentEquity(list, tqparent);
+ parent = m->liability();
+ testReparentEquity(list, parent);
list.clear();
list << MyMoneyAccount::Income;
- tqparent = m->income();
- testReparentEquity(list, tqparent);
+ parent = m->income();
+ testReparentEquity(list, parent);
list.clear();
list << MyMoneyAccount::Expense;
- tqparent = m->expense();
- testReparentEquity(list, tqparent);
+ parent = m->expense();
+ testReparentEquity(list, parent);
// now check the good case
MyMoneyAccount stock = m->account("A000002");
@@ -1381,7 +1381,7 @@ void MyMoneyFileTest::testReparentEquity() {
}
}
-void MyMoneyFileTest::testReparentEquity(TQValueList<MyMoneyAccount::accountTypeE>& list, MyMoneyAccount& tqparent)
+void MyMoneyFileTest::testReparentEquity(TQValueList<MyMoneyAccount::accountTypeE>& list, MyMoneyAccount& parent)
{
MyMoneyAccount a;
MyMoneyAccount stock = m->account("A000002");
@@ -1392,7 +1392,7 @@ void MyMoneyFileTest::testReparentEquity(TQValueList<MyMoneyAccount::accountType
a.setName(TQString("Testaccount %1").tqarg(*it));
a.setAccountType(*it);
try {
- m->addAccount(a, tqparent);
+ m->addAccount(a, parent);
char msg[100];
m->reparentAccount(stock, a);
sprintf(msg, "Can reparent stock to non-investment type %d account", *it);
diff --git a/kmymoney2/mymoney/mymoneyfiletest.h b/kmymoney2/mymoney/mymoneyfiletest.h
index da39a28..917f1f4 100644
--- a/kmymoney2/mymoney/mymoneyfiletest.h
+++ b/kmymoney2/mymoney/mymoneyfiletest.h
@@ -116,7 +116,7 @@ public:
void testHasAccount();
void testAddEquityAccount();
void testReparentEquity();
- void testReparentEquity(TQValueList<MyMoneyAccount::accountTypeE>& list, MyMoneyAccount& tqparent);
+ void testReparentEquity(TQValueList<MyMoneyAccount::accountTypeE>& list, MyMoneyAccount& parent);
void testBaseCurrency();
void testOpeningBalanceNoBase();
void testOpeningBalance();
diff --git a/kmymoney2/mymoney/mymoneyfinancialcalculator.cpp b/kmymoney2/mymoney/mymoneyfinancialcalculator.cpp
index 33d5855..d6686a6 100644
--- a/kmymoney2/mymoney/mymoneyfinancialcalculator.cpp
+++ b/kmymoney2/mymoney/mymoneyfinancialcalculator.cpp
@@ -86,8 +86,8 @@ MyMoneyFinancialCalculator::MyMoneyFinancialCalculator()
setPmt(0.0);
setFv(0.0);
- // clear the tqmask
- m_tqmask = 0;
+ // clear the mask
+ m_mask = 0;
}
MyMoneyFinancialCalculator::~MyMoneyFinancialCalculator()
@@ -122,38 +122,38 @@ void MyMoneyFinancialCalculator::setDisc(const bool disc)
void MyMoneyFinancialCalculator::setIr(const FCALC_DOUBLE ir)
{
m_ir = ir;
- m_tqmask |= IR_SET;
+ m_mask |= IR_SET;
}
void MyMoneyFinancialCalculator::setPv(const FCALC_DOUBLE pv)
{
m_pv = pv;
- m_tqmask |= PV_SET;
+ m_mask |= PV_SET;
}
void MyMoneyFinancialCalculator::setPmt(const FCALC_DOUBLE pmt)
{
m_pmt = pmt;
- m_tqmask |= PMT_SET;
+ m_mask |= PMT_SET;
}
void MyMoneyFinancialCalculator::setNpp(const FCALC_DOUBLE npp)
{
m_npp = npp;
- m_tqmask |= NPP_SET;
+ m_mask |= NPP_SET;
}
void MyMoneyFinancialCalculator::setFv(const FCALC_DOUBLE fv)
{
m_fv = fv;
- m_tqmask |= FV_SET;
+ m_mask |= FV_SET;
}
FCALC_DOUBLE MyMoneyFinancialCalculator::numPayments(void)
{
- const unsigned short tqmask = PV_SET | IR_SET | PMT_SET | FV_SET;
+ const unsigned short mask = PV_SET | IR_SET | PMT_SET | FV_SET;
- if((m_tqmask & tqmask) != tqmask)
+ if((m_mask & mask) != mask)
throw new MYMONEYEXCEPTION("Not all parameters set for calculation of numPayments");
FCALC_DOUBLE eint = eff_int();
@@ -162,15 +162,15 @@ FCALC_DOUBLE MyMoneyFinancialCalculator::numPayments(void)
CC = (CC - m_fv) / (CC + m_pv);
m_npp = (CC > 0.0) ? logl (CC) / logl (eint +1.0) : 0.0;
- m_tqmask |= NPP_SET;
+ m_mask |= NPP_SET;
return m_npp;
}
FCALC_DOUBLE MyMoneyFinancialCalculator::payment(void)
{
- const unsigned short tqmask = PV_SET | IR_SET | NPP_SET | FV_SET;
+ const unsigned short mask = PV_SET | IR_SET | NPP_SET | FV_SET;
- if((m_tqmask & tqmask) != tqmask)
+ if((m_mask & mask) != mask)
throw new MYMONEYEXCEPTION("Not all parameters set for calculation of payment");
FCALC_DOUBLE eint = eff_int();
@@ -180,15 +180,15 @@ FCALC_DOUBLE MyMoneyFinancialCalculator::payment(void)
m_pmt = -rnd((m_fv + m_pv * (AA + 1.0)) / (AA * BB));
//m_pmt = -floorl((m_fv + m_pv * (AA + 1.0)) / (AA * BB));
- m_tqmask |= PMT_SET;
+ m_mask |= PMT_SET;
return m_pmt;
}
FCALC_DOUBLE MyMoneyFinancialCalculator::presentValue(void)
{
- const unsigned short tqmask = PMT_SET | IR_SET | NPP_SET | FV_SET;
+ const unsigned short mask = PMT_SET | IR_SET | NPP_SET | FV_SET;
- if((m_tqmask & tqmask) != tqmask)
+ if((m_mask & mask) != mask)
throw new MYMONEYEXCEPTION("Not all parameters set for calculation of payment");
FCALC_DOUBLE eint = eff_int();
@@ -197,15 +197,15 @@ FCALC_DOUBLE MyMoneyFinancialCalculator::presentValue(void)
m_pv = rnd(-(m_fv + (AA * CC)) / (AA + 1.0));
- m_tqmask |= PV_SET;
+ m_mask |= PV_SET;
return m_pv;
}
FCALC_DOUBLE MyMoneyFinancialCalculator::futureValue(void)
{
- const unsigned short tqmask = PMT_SET | IR_SET | NPP_SET | PV_SET;
+ const unsigned short mask = PMT_SET | IR_SET | NPP_SET | PV_SET;
- if((m_tqmask & tqmask) != tqmask)
+ if((m_mask & mask) != mask)
throw new MYMONEYEXCEPTION("Not all parameters set for calculation of payment");
FCALC_DOUBLE eint = eff_int();
@@ -213,7 +213,7 @@ FCALC_DOUBLE MyMoneyFinancialCalculator::futureValue(void)
FCALC_DOUBLE CC = _Cx(eint);
m_fv = rnd(-(m_pv + AA * (m_pv + CC)));
- m_tqmask |= FV_SET;
+ m_mask |= FV_SET;
return m_fv;
}
@@ -260,7 +260,7 @@ FCALC_DOUBLE MyMoneyFinancialCalculator::interestRate(void)
}
while (ri);
}
- m_tqmask |= IR_SET;
+ m_mask |= IR_SET;
m_ir = rnd(nom_int(eint) * 100.0);
return m_ir;
}
diff --git a/kmymoney2/mymoney/mymoneyfinancialcalculator.h b/kmymoney2/mymoney/mymoneyfinancialcalculator.h
index 8bc7033..c603d12 100644
--- a/kmymoney2/mymoney/mymoneyfinancialcalculator.h
+++ b/kmymoney2/mymoney/mymoneyfinancialcalculator.h
@@ -306,7 +306,7 @@ private:
bool m_bep; // beginning/end of period payment flag
bool m_disc; // discrete/continous compounding flag
- unsigned short m_tqmask; // available value tqmask
+ unsigned short m_mask; // available value mask
#define PV_SET 0x0001
#define IR_SET 0x0002
#define PMT_SET 0x0004
diff --git a/kmymoney2/mymoney/mymoneyfinancialcalculatortest.cpp b/kmymoney2/mymoney/mymoneyfinancialcalculatortest.cpp
index aae78ab..fa5b1a3 100644
--- a/kmymoney2/mymoney/mymoneyfinancialcalculatortest.cpp
+++ b/kmymoney2/mymoney/mymoneyfinancialcalculatortest.cpp
@@ -41,7 +41,7 @@ void MyMoneyFinancialCalculatorTest::testEmptyConstructor() {
CPPUNIT_ASSERT(m->m_prec == 2);
CPPUNIT_ASSERT(m->m_bep == false);
CPPUNIT_ASSERT(m->m_disc == true);
- CPPUNIT_ASSERT(m->m_tqmask == 0);
+ CPPUNIT_ASSERT(m->m_mask == 0);
}
void MyMoneyFinancialCalculatorTest::testSetPrec() {
@@ -52,7 +52,7 @@ void MyMoneyFinancialCalculatorTest::testSetPrec() {
void MyMoneyFinancialCalculatorTest::testSetNpp() {
m->setNpp(20);
CPPUNIT_ASSERT(m->m_npp == 20);
- CPPUNIT_ASSERT(m->m_tqmask == NPP_SET);
+ CPPUNIT_ASSERT(m->m_mask == NPP_SET);
}
void MyMoneyFinancialCalculatorTest::testSetPF() {
@@ -86,25 +86,25 @@ void MyMoneyFinancialCalculatorTest::testSetDisc() {
void MyMoneyFinancialCalculatorTest::testSetIr() {
m->setIr(12.3);
CPPUNIT_ASSERT(m->m_ir == 12.3);
- CPPUNIT_ASSERT(m->m_tqmask == IR_SET);
+ CPPUNIT_ASSERT(m->m_mask == IR_SET);
}
void MyMoneyFinancialCalculatorTest::testSetPv() {
m->setPv(23.4);
CPPUNIT_ASSERT(m->m_pv == 23.4);
- CPPUNIT_ASSERT(m->m_tqmask == PV_SET);
+ CPPUNIT_ASSERT(m->m_mask == PV_SET);
}
void MyMoneyFinancialCalculatorTest::testSetPmt() {
m->setPmt(34.5);
CPPUNIT_ASSERT(m->m_pmt == 34.5);
- CPPUNIT_ASSERT(m->m_tqmask == PMT_SET);
+ CPPUNIT_ASSERT(m->m_mask == PMT_SET);
}
void MyMoneyFinancialCalculatorTest::testSetFv() {
m->setFv(45.6);
CPPUNIT_ASSERT(m->m_fv == 45.6);
- CPPUNIT_ASSERT(m->m_tqmask == FV_SET);
+ CPPUNIT_ASSERT(m->m_mask == FV_SET);
}
void MyMoneyFinancialCalculatorTest::testCombinedSet() {
@@ -114,7 +114,7 @@ void MyMoneyFinancialCalculatorTest::testCombinedSet() {
m->setPmt(34.5);
m->setFv(45.6);
- CPPUNIT_ASSERT(m->m_tqmask == (NPP_SET | PV_SET | IR_SET | PMT_SET | FV_SET));
+ CPPUNIT_ASSERT(m->m_mask == (NPP_SET | PV_SET | IR_SET | PMT_SET | FV_SET));
}
void MyMoneyFinancialCalculatorTest::testNumPayments() {
diff --git a/kmymoney2/mymoney/mymoneyinstitution.cpp b/kmymoney2/mymoney/mymoneyinstitution.cpp
index d66d9df..6e5b102 100644
--- a/kmymoney2/mymoney/mymoneyinstitution.cpp
+++ b/kmymoney2/mymoney/mymoneyinstitution.cpp
@@ -138,7 +138,7 @@ bool MyMoneyInstitution::operator == (const MyMoneyInstitution& right) const
return false;
}
-void MyMoneyInstitution::writeXML(TQDomDocument& document, TQDomElement& tqparent) const
+void MyMoneyInstitution::writeXML(TQDomDocument& document, TQDomElement& parent) const
{
TQDomElement el = document.createElement("INSTITUTION");
@@ -167,7 +167,7 @@ void MyMoneyInstitution::writeXML(TQDomDocument& document, TQDomElement& tqparen
//Add in Key-Value Pairs for institutions.
MyMoneyKeyValueContainer::writeXML(document, el);
- tqparent.appendChild(el);
+ parent.appendChild(el);
}
bool MyMoneyInstitution::hasReferenceTo(const TQString& /* id */) const
diff --git a/kmymoney2/mymoney/mymoneyinstitution.h b/kmymoney2/mymoney/mymoneyinstitution.h
index 47d9321..b4c1cf1 100644
--- a/kmymoney2/mymoney/mymoneyinstitution.h
+++ b/kmymoney2/mymoney/mymoneyinstitution.h
@@ -141,7 +141,7 @@ public:
bool operator == (const MyMoneyInstitution&) const;
bool operator < (const MyMoneyInstitution& right) const;
- void writeXML(TQDomDocument& document, TQDomElement& tqparent) const;
+ void writeXML(TQDomDocument& document, TQDomElement& parent) const;
/**
* This method checks if a reference to the given object exists. It returns,
diff --git a/kmymoney2/mymoney/mymoneyinvesttransaction.cpp b/kmymoney2/mymoney/mymoneyinvesttransaction.cpp
index 89bef92..675e746 100644
--- a/kmymoney2/mymoney/mymoneyinvesttransaction.cpp
+++ b/kmymoney2/mymoney/mymoneyinvesttransaction.cpp
@@ -23,10 +23,10 @@
#include "mymoneyinvesttransaction.h"
#if 0
-MyMoneyInvestTransaction::MyMoneyInvestTransaction(MyMoneyAccount *tqparent, const long id, transactionMethod method, const TQString& number, const TQString& memo,
+MyMoneyInvestTransaction::MyMoneyInvestTransaction(MyMoneyAccount *parent, const long id, transactionMethod method, const TQString& number, const TQString& memo,
const MyMoneyMoney& amount, const TQDate& date, const TQString& categoryMajor, const TQString& categoryMinor, const TQString& atmName,
const TQString& fromTo, const TQString& bankFrom, const TQString& bankTo, stateE state)
- : MyMoneyTransaction(tqparent, id, method, number, memo, amount, date, categoryMajor, categoryMinor, atmName, fromTo, bankFrom, bankTo, state)
+ : MyMoneyTransaction(parent, id, method, number, memo, amount, date, categoryMajor, categoryMinor, atmName, fromTo, bankFrom, bankTo, state)
{
}
diff --git a/kmymoney2/mymoney/mymoneyinvesttransaction.h b/kmymoney2/mymoney/mymoneyinvesttransaction.h
index e414b3a..ee09456 100644
--- a/kmymoney2/mymoney/mymoneyinvesttransaction.h
+++ b/kmymoney2/mymoney/mymoneyinvesttransaction.h
@@ -33,7 +33,7 @@
class MyMoneyInvestTransaction : public MyMoneyTransaction {
public:
MyMoneyInvestTransaction();
- MyMoneyInvestTransaction(MyMoneyAccount *tqparent, const long id, transactionMethod method, const TQString& number, const TQString& memo,
+ MyMoneyInvestTransaction(MyMoneyAccount *parent, const long id, transactionMethod method, const TQString& number, const TQString& memo,
const MyMoneyMoney& amount, const TQDate& date, const TQString& categoryMajor, const TQString& categoryMinor, const TQString& atmName,
const TQString& fromTo, const TQString& bankFrom, const TQString& bankTo, stateE state);
~MyMoneyInvestTransaction();
diff --git a/kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp b/kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp
index 9e047d5..22fa1ac 100644
--- a/kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp
+++ b/kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp
@@ -101,7 +101,7 @@ bool MyMoneyKeyValueContainer::operator == (const MyMoneyKeyValueContainer& righ
return (it_a == m_kvp.end() && it_b == right.m_kvp.end());
}
-void MyMoneyKeyValueContainer::writeXML(TQDomDocument& document, TQDomElement& tqparent) const
+void MyMoneyKeyValueContainer::writeXML(TQDomDocument& document, TQDomElement& parent) const
{
if(m_kvp.count() != 0) {
TQDomElement el = document.createElement("KEYVALUEPAIRS");
@@ -115,6 +115,6 @@ void MyMoneyKeyValueContainer::writeXML(TQDomDocument& document, TQDomElement& t
el.appendChild(pair);
}
- tqparent.appendChild(el);
+ parent.appendChild(el);
}
}
diff --git a/kmymoney2/mymoney/mymoneykeyvaluecontainer.h b/kmymoney2/mymoney/mymoneykeyvaluecontainer.h
index 42169d5..9be002e 100644
--- a/kmymoney2/mymoney/mymoneykeyvaluecontainer.h
+++ b/kmymoney2/mymoney/mymoneykeyvaluecontainer.h
@@ -122,12 +122,12 @@ public:
/**
* This method creates a TQDomElement for the @p document
- * under the tqparent node @p tqparent.
+ * under the parent node @p parent.
*
* @param document reference to TQDomDocument
- * @param tqparent reference to TQDomElement tqparent node
+ * @param parent reference to TQDomElement parent node
*/
- void writeXML(TQDomDocument& document, TQDomElement& tqparent) const;
+ void writeXML(TQDomDocument& document, TQDomElement& parent) const;
private:
/**
diff --git a/kmymoney2/mymoney/mymoneyobject.h b/kmymoney2/mymoney/mymoneyobject.h
index 854bf4d..cd8d43d 100644
--- a/kmymoney2/mymoney/mymoneyobject.h
+++ b/kmymoney2/mymoney/mymoneyobject.h
@@ -78,12 +78,12 @@ public:
/**
* This method creates a TQDomElement for the @p document
- * under the tqparent node @p tqparent.
+ * under the parent node @p parent.
*
* @param document reference to TQDomDocument
- * @param tqparent reference to TQDomElement tqparent node
+ * @param parent reference to TQDomElement parent node
*/
- virtual void writeXML(TQDomDocument& document, TQDomElement& tqparent) const = 0;
+ virtual void writeXML(TQDomDocument& document, TQDomElement& parent) const = 0;
bool operator == (const MyMoneyObject& right) const;
diff --git a/kmymoney2/mymoney/mymoneypayee.cpp b/kmymoney2/mymoney/mymoneypayee.cpp
index 7023e51..b2eab64 100644
--- a/kmymoney2/mymoney/mymoneypayee.cpp
+++ b/kmymoney2/mymoney/mymoneypayee.cpp
@@ -131,7 +131,7 @@ bool MyMoneyPayee::operator == (const MyMoneyPayee& right) const
((m_defaultAccountId.length() == 0 && right.m_defaultAccountId.length() == 0) || m_defaultAccountId == right.m_defaultAccountId) );
}
-void MyMoneyPayee::writeXML(TQDomDocument& document, TQDomElement& tqparent) const
+void MyMoneyPayee::writeXML(TQDomDocument& document, TQDomElement& parent) const
{
TQDomElement el = document.createElement("PAYEE");
@@ -164,7 +164,7 @@ void MyMoneyPayee::writeXML(TQDomDocument& document, TQDomElement& tqparent) con
el.appendChild(address);
- tqparent.appendChild(el);
+ parent.appendChild(el);
}
bool MyMoneyPayee::hasReferenceTo(const TQString& id) const
diff --git a/kmymoney2/mymoney/mymoneypayee.h b/kmymoney2/mymoney/mymoneypayee.h
index b1d2fce..f8112d4 100644
--- a/kmymoney2/mymoney/mymoneypayee.h
+++ b/kmymoney2/mymoney/mymoneypayee.h
@@ -184,7 +184,7 @@ public:
// Equality operator
bool operator == (const MyMoneyPayee &) const;
- void writeXML(TQDomDocument& document, TQDomElement& tqparent) const;
+ void writeXML(TQDomDocument& document, TQDomElement& parent) const;
/**
* This method checks if a reference to the given object exists. It returns,
diff --git a/kmymoney2/mymoney/mymoneypayeetest.cpp b/kmymoney2/mymoney/mymoneypayeetest.cpp
index 124cc65..0dad126 100644
--- a/kmymoney2/mymoney/mymoneypayeetest.cpp
+++ b/kmymoney2/mymoney/mymoneypayeetest.cpp
@@ -27,20 +27,20 @@ void MyMoneyPayeeTest::tearDown () {
void MyMoneyPayeeTest::testXml(){
TQDomDocument doc;
- TQDomElement tqparent = doc.createElement("Test");
- doc.appendChild(tqparent);
+ TQDomElement parent = doc.createElement("Test");
+ doc.appendChild(parent);
MyMoneyPayee payee1;
payee1.m_id = "some random id";//if the ID isn't set, w ethrow an exception
- payee1.writeXML(doc,tqparent);
+ payee1.writeXML(doc,parent);
TQString temp1 = "Account1";
payee1.setDefaultAccountId(temp1);
- payee1.writeXML(doc,tqparent);
+ payee1.writeXML(doc,parent);
TQString temp2 = "Account2";
payee1.setDefaultAccountId(temp2);
- payee1.writeXML(doc,tqparent);
+ payee1.writeXML(doc,parent);
payee1.setDefaultAccountId();
- payee1.writeXML(doc,tqparent);
- TQDomElement el = tqparent.firstChild().toElement();
+ payee1.writeXML(doc,parent);
+ TQDomElement el = parent.firstChild().toElement();
CPPUNIT_ASSERT(!el.isNull());
MyMoneyPayee payee2(el);
CPPUNIT_ASSERT(!payee2.defaultAccountEnabled());
diff --git a/kmymoney2/mymoney/mymoneyreport.cpp b/kmymoney2/mymoney/mymoneyreport.cpp
index 4fd4b79..2904ed5 100644
--- a/kmymoney2/mymoney/mymoneyreport.cpp
+++ b/kmymoney2/mymoney/mymoneyreport.cpp
@@ -765,11 +765,11 @@ bool MyMoneyReport::read ( const TQDomElement& e )
return result;
}
-void MyMoneyReport::writeXML ( TQDomDocument& document, TQDomElement& tqparent ) const
+void MyMoneyReport::writeXML ( TQDomDocument& document, TQDomElement& parent ) const
{
TQDomElement el = document.createElement ( "REPORT" );
write ( el, &document, false );
- tqparent.appendChild ( el );
+ parent.appendChild ( el );
}
bool MyMoneyReport::hasReferenceTo ( const TQString& id ) const
diff --git a/kmymoney2/mymoney/mymoneyreport.h b/kmymoney2/mymoney/mymoneyreport.h
index f7e38ea..a04573f 100644
--- a/kmymoney2/mymoney/mymoneyreport.h
+++ b/kmymoney2/mymoney/mymoneyreport.h
@@ -64,7 +64,7 @@ public:
enum EReportType { eNoReport = 0, ePivotTable, eQueryTable, eInfoTable };
enum EColumnType { eNoColumns = 0, eDays = 1, eMonths = 1, eBiMonths = 2, eQuarters = 3, eWeeks = 7, eYears = 12 };
- // if you add bits to this bittqmask, start with the value currently assigned to eTQCend and update its value afterwards
+ // if you add bits to this bitmask, start with the value currently assigned to eTQCend and update its value afterwards
// also don't forget to add column names to kQueryColumnsText in mymoneyreport.cpp
enum EQueryColumns { eTQCnone = 0x0, eTQCbegin = 0x1, eTQCnumber = 0x1, eTQCpayee = 0x2, eTQCcategory = 0x4, eTQCmemo = 0x8, eTQCaccount = 0x10, eTQCreconciled = 0x20, eTQCaction = 0x40, eTQCshares = 0x80, eTQCprice = 0x100, eTQCperformance = 0x200, eTQCloan = 0x400, eTQCbalance = 0x800, eTQCend = 0x1000 };
@@ -314,13 +314,13 @@ public:
/**
* This method creates a TQDomElement for the @p document
- * under the tqparent node @p tqparent. (This version overwrites the
+ * under the parent node @p parent. (This version overwrites the
* MMObject base class.)
*
* @param document reference to TQDomDocument
- * @param tqparent reference to TQDomElement tqparent node
+ * @param parent reference to TQDomElement parent node
*/
- virtual void writeXML(TQDomDocument& document, TQDomElement& tqparent) const;
+ virtual void writeXML(TQDomDocument& document, TQDomElement& parent) const;
/**
* This method checks if a reference to the given object exists. It returns,
diff --git a/kmymoney2/mymoney/mymoneyscheduled.cpp b/kmymoney2/mymoney/mymoneyscheduled.cpp
index b7e5633..594bc69 100644
--- a/kmymoney2/mymoney/mymoneyscheduled.cpp
+++ b/kmymoney2/mymoney/mymoneyscheduled.cpp
@@ -747,7 +747,7 @@ void MyMoneySchedule::fixDate(TQDate& date) const
}
}
-void MyMoneySchedule::writeXML(TQDomDocument& document, TQDomElement& tqparent) const
+void MyMoneySchedule::writeXML(TQDomDocument& document, TQDomElement& parent) const
{
TQDomElement el = document.createElement("SCHEDULED_TX");
@@ -779,7 +779,7 @@ void MyMoneySchedule::writeXML(TQDomDocument& document, TQDomElement& tqparent)
//store the transaction data for this task.
m_transaction.writeXML(document, el);
- tqparent.appendChild(el);
+ parent.appendChild(el);
}
bool MyMoneySchedule::hasReferenceTo(const TQString& id) const
diff --git a/kmymoney2/mymoney/mymoneyscheduled.h b/kmymoney2/mymoney/mymoneyscheduled.h
index cc92b1d..cf5cb07 100644
--- a/kmymoney2/mymoney/mymoneyscheduled.h
+++ b/kmymoney2/mymoney/mymoneyscheduled.h
@@ -465,7 +465,7 @@ public:
void recordPayment(const TQDate&);
TQValueList<TQDate> recordedPayments(void) const { return m_recordedPayments; }
- void writeXML(TQDomDocument& document, TQDomElement& tqparent) const;
+ void writeXML(TQDomDocument& document, TQDomElement& parent) const;
/**
* This method checks if a reference to the given object exists. It returns,
diff --git a/kmymoney2/mymoney/mymoneysecurity.cpp b/kmymoney2/mymoney/mymoneysecurity.cpp
index 27a1352..027441c 100644
--- a/kmymoney2/mymoney/mymoneysecurity.cpp
+++ b/kmymoney2/mymoney/mymoneysecurity.cpp
@@ -123,7 +123,7 @@ bool MyMoneySecurity::hasReferenceTo(const TQString& id) const
return (id == m_tradingCurrency);
}
-void MyMoneySecurity::writeXML(TQDomDocument& document, TQDomElement& tqparent) const
+void MyMoneySecurity::writeXML(TQDomDocument& document, TQDomElement& parent) const
{
TQDomElement el;
if(isCurrency())
@@ -148,7 +148,7 @@ void MyMoneySecurity::writeXML(TQDomDocument& document, TQDomElement& tqparent)
//Add in Key-Value Pairs for securities.
MyMoneyKeyValueContainer::writeXML(document, el);
- tqparent.appendChild(el);
+ parent.appendChild(el);
}
TQString MyMoneySecurity::securityTypeToString(const eSECURITYTYPE securityType)
diff --git a/kmymoney2/mymoney/mymoneysecurity.h b/kmymoney2/mymoney/mymoneysecurity.h
index fa49cb8..4013a45 100644
--- a/kmymoney2/mymoney/mymoneysecurity.h
+++ b/kmymoney2/mymoney/mymoneysecurity.h
@@ -111,7 +111,7 @@ public:
void setPartsPerUnit(const int ppu) { m_partsPerUnit = ppu; };
void setSmallestCashFraction(const int sf) { m_smallestCashFraction = sf; };
- void writeXML(TQDomDocument& document, TQDomElement& tqparent) const;
+ void writeXML(TQDomDocument& document, TQDomElement& parent) const;
/**
* This method checks if a reference to the given object exists. It returns,
diff --git a/kmymoney2/mymoney/mymoneysplit.cpp b/kmymoney2/mymoney/mymoneysplit.cpp
index 8c00d89..64d5123 100644
--- a/kmymoney2/mymoney/mymoneysplit.cpp
+++ b/kmymoney2/mymoney/mymoneysplit.cpp
@@ -194,7 +194,7 @@ MyMoneyMoney MyMoneySplit::price(void) const
return MyMoneyMoney(1,1);
}
-void MyMoneySplit::writeXML(TQDomDocument& document, TQDomElement& tqparent) const
+void MyMoneySplit::writeXML(TQDomDocument& document, TQDomElement& parent) const
{
TQDomElement el = document.createElement("SPLIT");
@@ -217,7 +217,7 @@ void MyMoneySplit::writeXML(TQDomDocument& document, TQDomElement& tqparent) con
MyMoneyKeyValueContainer::writeXML(document, el);
- tqparent.appendChild(el);
+ parent.appendChild(el);
}
bool MyMoneySplit::hasReferenceTo(const TQString& id) const
diff --git a/kmymoney2/mymoney/mymoneysplit.h b/kmymoney2/mymoney/mymoneysplit.h
index de7c849..b300aa1 100644
--- a/kmymoney2/mymoney/mymoneysplit.h
+++ b/kmymoney2/mymoney/mymoneysplit.h
@@ -98,7 +98,7 @@ public:
bool operator == (const MyMoneySplit&) const;
- void writeXML(TQDomDocument& document, TQDomElement& tqparent) const;
+ void writeXML(TQDomDocument& document, TQDomElement& parent) const;
/**
* This method checks if a reference to the given object exists. It returns,
diff --git a/kmymoney2/mymoney/mymoneytransaction.cpp b/kmymoney2/mymoney/mymoneytransaction.cpp
index f586da4..79f4fd9 100644
--- a/kmymoney2/mymoney/mymoneytransaction.cpp
+++ b/kmymoney2/mymoney/mymoneytransaction.cpp
@@ -408,7 +408,7 @@ bool MyMoneyTransaction::isDuplicate(const MyMoneyTransaction& r) const
return rc;
}
-void MyMoneyTransaction::writeXML(TQDomDocument& document, TQDomElement& tqparent) const
+void MyMoneyTransaction::writeXML(TQDomDocument& document, TQDomElement& parent) const
{
TQDomElement el = document.createElement("TRANSACTION");
@@ -428,7 +428,7 @@ void MyMoneyTransaction::writeXML(TQDomDocument& document, TQDomElement& tqparen
MyMoneyKeyValueContainer::writeXML(document, el);
- tqparent.appendChild(el);
+ parent.appendChild(el);
}
bool MyMoneyTransaction::hasReferenceTo(const TQString& id) const
diff --git a/kmymoney2/mymoney/mymoneytransaction.h b/kmymoney2/mymoney/mymoneytransaction.h
index 21c28ea..6787c1d 100644
--- a/kmymoney2/mymoney/mymoneytransaction.h
+++ b/kmymoney2/mymoney/mymoneytransaction.h
@@ -241,7 +241,7 @@ public:
*/
static const TQString firstSplitID(void);
- void writeXML(TQDomDocument& document, TQDomElement& tqparent) const;
+ void writeXML(TQDomDocument& document, TQDomElement& parent) const;
/**
* This method checks if a reference to the given object exists. It returns,
diff --git a/kmymoney2/mymoney/mymoneyutils.h b/kmymoney2/mymoney/mymoneyutils.h
index ce0eb42..9e111d6 100644
--- a/kmymoney2/mymoney/mymoneyutils.h
+++ b/kmymoney2/mymoney/mymoneyutils.h
@@ -81,7 +81,7 @@ public:
/**
* This method allows to trace a printf like formatted text
*
- * @param format format tqmask
+ * @param format format mask
*/
void printf(const char *format, ...) const __attribute__ ((format (__printf__, 2, 3)));
diff --git a/kmymoney2/mymoney/storage/imymoneyserialize.h b/kmymoney2/mymoney/storage/imymoneyserialize.h
index c900687..dc37edd 100644
--- a/kmymoney2/mymoney/storage/imymoneyserialize.h
+++ b/kmymoney2/mymoney/storage/imymoneyserialize.h
@@ -194,12 +194,12 @@ public:
/**
* This method is used to add one account as sub-ordinate to another
- * (tqparent) account. The objects that are passed will be modified
+ * (parent) account. The objects that are passed will be modified
* accordingly.
*
* An exception will be thrown upon error conditions.
*
- * @param tqparent tqparent account the account should be added to
+ * @param parent parent account the account should be added to
* @param account the account to be added
*
* @deprecated This method is only provided as long as we provide
@@ -207,7 +207,7 @@ public:
* this compatability mode this method will disappear from
* this interface!
*/
- virtual void addAccount(MyMoneyAccount& tqparent, MyMoneyAccount& account) = 0;
+ virtual void addAccount(MyMoneyAccount& parent, MyMoneyAccount& account) = 0;
/**
* This method is used to create a new payee
diff --git a/kmymoney2/mymoney/storage/imymoneystorage.h b/kmymoney2/mymoney/storage/imymoneystorage.h
index cac0e45..02e53c2 100644
--- a/kmymoney2/mymoney/storage/imymoneystorage.h
+++ b/kmymoney2/mymoney/storage/imymoneystorage.h
@@ -135,15 +135,15 @@ public:
/**
* This method is used to add one account as sub-ordinate to another
- * (tqparent) account. The objects that are passed will be modified
+ * (parent) account. The objects that are passed will be modified
* accordingly.
*
* An exception will be thrown upon error conditions.
*
- * @param tqparent tqparent account the account should be added to
+ * @param parent parent account the account should be added to
* @param account the account to be added
*/
- virtual void addAccount(MyMoneyAccount& tqparent, MyMoneyAccount& account) = 0;
+ virtual void addAccount(MyMoneyAccount& parent, MyMoneyAccount& account) = 0;
/**
* This method is used to create a new payee
@@ -375,9 +375,9 @@ public:
* An exception will be thrown upon error conditions.
*
* @param account MyMoneyAccount reference to account to be re-parented
- * @param tqparent MyMoneyAccount reference to new tqparent account
+ * @param parent MyMoneyAccount reference to new parent account
*/
- virtual void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqparent) = 0;
+ virtual void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& parent) = 0;
/**
* This method is used to remove a transaction from the transaction
diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp b/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp
index 8bafce8..a80d5af 100644
--- a/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp
+++ b/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp
@@ -104,21 +104,21 @@ void MyMoneyDatabaseMgr::addAccount(MyMoneyAccount& account)
}
}
-void MyMoneyDatabaseMgr::addAccount(MyMoneyAccount& tqparent, MyMoneyAccount& account)
+void MyMoneyDatabaseMgr::addAccount(MyMoneyAccount& parent, MyMoneyAccount& account)
{
TQMap<TQString, MyMoneyAccount> accountList;
TQStringList accountIdList;
TQMap<TQString, MyMoneyAccount>::ConstIterator theParent;
TQMap<TQString, MyMoneyAccount>::ConstIterator theChild;
- accountIdList << tqparent.id() << account.id();
+ accountIdList << parent.id() << account.id();
startTransaction();
accountList = m_sql->fetchAccounts(accountIdList, true);
- theParent = accountList.find(tqparent.id());
+ theParent = accountList.find(parent.id());
if(theParent == accountList.end()) {
- TQString msg = "Unknown tqparent account '";
- msg += tqparent.id() + "'";
+ TQString msg = "Unknown parent account '";
+ msg += parent.id() + "'";
throw new MYMONEYEXCEPTION(msg);
}
@@ -131,16 +131,16 @@ void MyMoneyDatabaseMgr::addAccount(MyMoneyAccount& tqparent, MyMoneyAccount& ac
MyMoneyAccount acc = *theParent;
acc.addAccountId(account.id());
- tqparent = acc;
+ parent = acc;
acc = *theChild;
- acc.setParentAccountId(tqparent.id());
+ acc.setParentAccountId(parent.id());
account = acc;
//FIXME: MyMoneyBalanceCacheItem balance;
//FIXME: m_balanceCache[account.id()] = balance;
- m_sql->modifyAccount(tqparent);
+ m_sql->modifyAccount(parent);
m_sql->modifyAccount(account);
commitTransaction();
}
@@ -648,9 +648,9 @@ void MyMoneyDatabaseMgr::modifyTransaction(const MyMoneyTransaction& transaction
m_sql->modifyTransaction(transaction);
}
-void MyMoneyDatabaseMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqparent)
+void MyMoneyDatabaseMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccount& parent)
{
- if(account.accountType() == MyMoneyAccount::Stock && tqparent.accountType() != MyMoneyAccount::Investment)
+ if(account.accountType() == MyMoneyAccount::Stock && parent.accountType() != MyMoneyAccount::Investment)
throw new MYMONEYEXCEPTION("Cannot move a stock acocunt into a non-investment account");
TQStringList accountIdList;
@@ -660,9 +660,9 @@ void MyMoneyDatabaseMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccount
// verify that accounts exist. If one does not,
// an exception is thrown
- accountIdList << account.id() << tqparent.id();
+ accountIdList << account.id() << parent.id();
MyMoneyDatabaseMgr::account(account.id());
- MyMoneyDatabaseMgr::account(tqparent.id());
+ MyMoneyDatabaseMgr::account(parent.id());
if(!account.parentAccountId().isEmpty()) {
accountIdList << account.parentAccountId();
@@ -676,7 +676,7 @@ void MyMoneyDatabaseMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccount
oldParent = accountList.find(account.parentAccountId());
}
- newParent = accountList.find(tqparent.id());
+ newParent = accountList.find(parent.id());
childAccount = accountList.find(account.id());
MyMoneyAccount acc;
@@ -686,13 +686,13 @@ void MyMoneyDatabaseMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccount
m_sql->modifyAccount(acc);
}
- tqparent = (*newParent);
- tqparent.addAccountId(account.id());
+ parent = (*newParent);
+ parent.addAccountId(account.id());
account = (*childAccount);
- account.setParentAccountId(tqparent.id());
+ account.setParentAccountId(parent.id());
- m_sql->modifyAccount(tqparent);
+ m_sql->modifyAccount(parent);
m_sql->modifyAccount(account);
commitTransaction();
}
@@ -787,12 +787,12 @@ void MyMoneyDatabaseMgr::transactionList(TQValueList<TQPair<MyMoneyTransaction,
void MyMoneyDatabaseMgr::removeAccount(const MyMoneyAccount& account)
{
- MyMoneyAccount tqparent;
+ MyMoneyAccount parent;
- // check that the account and it's tqparent exist
+ // check that the account and it's parent exist
// this will throw an exception if the id is unknown
MyMoneyDatabaseMgr::account(account.id());
- tqparent = MyMoneyDatabaseMgr::account(account.parentAccountId());
+ parent = MyMoneyDatabaseMgr::account(account.parentAccountId());
// check that it's not one of the standard account groups
if(isStandardAccount(account.id()))
@@ -802,7 +802,7 @@ void MyMoneyDatabaseMgr::removeAccount(const MyMoneyAccount& account)
throw new MYMONEYEXCEPTION("Unable to remove account with active splits");
}
- // re-tqparent all sub-ordinate accounts to the tqparent of the account
+ // re-parent all sub-ordinate accounts to the parent of the account
// to be deleted. First round check that all accounts exist, second
// round do the re-parenting.
TQStringList::ConstIterator it;
@@ -814,7 +814,7 @@ void MyMoneyDatabaseMgr::removeAccount(const MyMoneyAccount& account)
// thrown and we would not make it until here.
TQStringList accountIdList;
- accountIdList << tqparent.id() << account.id();
+ accountIdList << parent.id() << account.id();
startTransaction();
TQMap<TQString, MyMoneyAccount> accountList = m_sql->fetchAccounts(accountIdList, true);
@@ -827,9 +827,9 @@ void MyMoneyDatabaseMgr::removeAccount(const MyMoneyAccount& account)
if(it_a == accountList.end())
throw new MYMONEYEXCEPTION("Internal error: account not found in list");
- it_p = accountList.find(tqparent.id());
+ it_p = accountList.find(parent.id());
if(it_p == accountList.end())
- throw new MYMONEYEXCEPTION("Internal error: tqparent account not found in list");
+ throw new MYMONEYEXCEPTION("Internal error: parent account not found in list");
if(!account.institutionId().isEmpty())
throw new MYMONEYEXCEPTION("Cannot remove account still attached to an institution");
@@ -848,19 +848,19 @@ void MyMoneyDatabaseMgr::removeAccount(const MyMoneyAccount& account)
if((*it_a).accountList().count() > 0) {
for(it = (*it_a).accountList().begin(); it != (*it_a).accountList().end(); ++it) {
MyMoneyAccount acc(MyMoneyDatabaseMgr::account(*it));
- reparentAccount(acc, tqparent);//, false);
+ reparentAccount(acc, parent);//, false);
}
}
- // remove account from tqparent's list
- tqparent.removeAccountId(account.id());
- m_sql->modifyAccount(tqparent);
+ // remove account from parent's list
+ parent.removeAccountId(account.id());
+ m_sql->modifyAccount(parent);
// remove account from the global account pool
//m_accountList.remove(account.id());
// remove from balance list
//FIXME: m_balanceCache.remove(account.id());
-//FIXME: invalidateBalanceCache(tqparent.id());
+//FIXME: invalidateBalanceCache(parent.id());
m_sql->removeAccount(account);
}
diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgr.h b/kmymoney2/mymoney/storage/mymoneydatabasemgr.h
index e146a70..5135ca4 100644
--- a/kmymoney2/mymoney/storage/mymoneydatabasemgr.h
+++ b/kmymoney2/mymoney/storage/mymoneydatabasemgr.h
@@ -82,15 +82,15 @@ public:
/**
* This method is used to add one account as sub-ordinate to another
- * (tqparent) account. The objects that are passed will be modified
+ * (parent) account. The objects that are passed will be modified
* accordingly.
*
* An exception will be thrown upon error conditions.
*
- * @param tqparent tqparent account the account should be added to
+ * @param parent parent account the account should be added to
* @param account the account to be added
*/
- virtual void addAccount(MyMoneyAccount& tqparent, MyMoneyAccount& account);
+ virtual void addAccount(MyMoneyAccount& parent, MyMoneyAccount& account);
/**
* This method is used to create a new payee
@@ -325,9 +325,9 @@ public:
* An exception will be thrown upon error conditions.
*
* @param account MyMoneyAccount reference to account to be re-parented
- * @param tqparent MyMoneyAccount reference to new tqparent account
+ * @param parent MyMoneyAccount reference to new parent account
*/
- virtual void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqparent);
+ virtual void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& parent);
/**
* This method is used to remove a transaction from the transaction
diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp b/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp
index 8886447..0591e2d 100644
--- a/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp
+++ b/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp
@@ -449,7 +449,7 @@ void MyMoneyDatabaseMgrTest::testModifyAccount() {
delete e;
}
- // use different tqparent
+ // use different parent
a.setParentAccountId("A000002");
try {
m->modifyAccount(c);
@@ -535,18 +535,18 @@ void MyMoneyDatabaseMgrTest::testReparentAccount() {
CPPUNIT_ASSERT(in.id() == "A000005");
CPPUNIT_ASSERT(ch.id() == "A000006");
- MyMoneyAccount tqparent = m->expense();
+ MyMoneyAccount parent = m->expense();
- m->addAccount(tqparent, ex1);
+ m->addAccount(parent, ex1);
m->addAccount(ex1, ex2);
- m->addAccount(tqparent, ex3);
- m->addAccount(tqparent, ex4);
+ m->addAccount(parent, ex3);
+ m->addAccount(parent, ex4);
- tqparent = m->income();
- m->addAccount(tqparent, in);
+ parent = m->income();
+ m->addAccount(parent, in);
- tqparent = m->asset();
- m->addAccount(tqparent, ch);
+ parent = m->asset();
+ m->addAccount(parent, ch);
MyMoneyFile::instance()->preloadCache();
CPPUNIT_ASSERT(m->expense().accountCount() == 3);
diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp
index efc88b7..ef4c3a9 100644
--- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp
+++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp
@@ -248,15 +248,15 @@ const TQValueList<MyMoneyPayee> MyMoneySeqAccessMgr::payeeList(void) const
}
-void MyMoneySeqAccessMgr::addAccount(MyMoneyAccount& tqparent, MyMoneyAccount& account)
+void MyMoneySeqAccessMgr::addAccount(MyMoneyAccount& parent, MyMoneyAccount& account)
{
TQMap<TQString, MyMoneyAccount>::ConstIterator theParent;
TQMap<TQString, MyMoneyAccount>::ConstIterator theChild;
- theParent = m_accountList.find(tqparent.id());
+ theParent = m_accountList.find(parent.id());
if(theParent == m_accountList.end()) {
- TQString msg = "Unknown tqparent account '";
- msg += tqparent.id() + "'";
+ TQString msg = "Unknown parent account '";
+ msg += parent.id() + "'";
throw new MYMONEYEXCEPTION(msg);
}
@@ -270,10 +270,10 @@ void MyMoneySeqAccessMgr::addAccount(MyMoneyAccount& tqparent, MyMoneyAccount& a
MyMoneyAccount acc = *theParent;
acc.addAccountId(account.id());
m_accountList.modify(acc.id(), acc);
- tqparent = acc;
+ parent = acc;
acc = *theChild;
- acc.setParentAccountId(tqparent.id());
+ acc.setParentAccountId(parent.id());
m_accountList.modify(acc.id(), acc);
account = acc;
@@ -591,12 +591,12 @@ void MyMoneySeqAccessMgr::modifyTransaction(const MyMoneyTransaction& transactio
m_transactionKeys.modify(transaction.id(), newKey);
}
-void MyMoneySeqAccessMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqparent)
+void MyMoneySeqAccessMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccount& parent)
{
- reparentAccount(account, tqparent, true);
+ reparentAccount(account, parent, true);
}
-void MyMoneySeqAccessMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqparent, const bool /* sendNotification */)
+void MyMoneySeqAccessMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccount& parent, const bool /* sendNotification */)
{
TQMap<TQString, MyMoneyAccount>::ConstIterator oldParent;
TQMap<TQString, MyMoneyAccount>::ConstIterator newParent;
@@ -605,16 +605,16 @@ void MyMoneySeqAccessMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccoun
// verify that accounts exist. If one does not,
// an exception is thrown
MyMoneySeqAccessMgr::account(account.id());
- MyMoneySeqAccessMgr::account(tqparent.id());
+ MyMoneySeqAccessMgr::account(parent.id());
if(!account.parentAccountId().isEmpty()) {
MyMoneySeqAccessMgr::account(account.parentAccountId());
oldParent = m_accountList.find(account.parentAccountId());
}
- if(account.accountType() == MyMoneyAccount::Stock && tqparent.accountType() != MyMoneyAccount::Investment)
+ if(account.accountType() == MyMoneyAccount::Stock && parent.accountType() != MyMoneyAccount::Investment)
throw new MYMONEYEXCEPTION("Cannot move a stock acocunt into a non-investment account");
- newParent = m_accountList.find(tqparent.id());
+ newParent = m_accountList.find(parent.id());
childAccount = m_accountList.find(account.id());
MyMoneyAccount acc;
@@ -624,16 +624,16 @@ void MyMoneySeqAccessMgr::reparentAccount(MyMoneyAccount &account, MyMoneyAccoun
m_accountList.modify(acc.id(), acc);
}
- tqparent = (*newParent);
- tqparent.addAccountId(account.id());
- m_accountList.modify(tqparent.id(), tqparent);
+ parent = (*newParent);
+ parent.addAccountId(account.id());
+ m_accountList.modify(parent.id(), parent);
account = (*childAccount);
- account.setParentAccountId(tqparent.id());
+ account.setParentAccountId(parent.id());
m_accountList.modify(account.id(), account);
#if 0
- // make sure the type is the same as the new tqparent. This does not work for stock and investment
+ // make sure the type is the same as the new parent. This does not work for stock and investment
if(account.accountType() != MyMoneyAccount::Stock && account.accountType() != MyMoneyAccount::Investment)
(*childAccount).setAccountType((*newParent).accountType());
#endif
@@ -677,12 +677,12 @@ void MyMoneySeqAccessMgr::removeTransaction(const MyMoneyTransaction& transactio
void MyMoneySeqAccessMgr::removeAccount(const MyMoneyAccount& account)
{
- MyMoneyAccount tqparent;
+ MyMoneyAccount parent;
- // check that the account and it's tqparent exist
+ // check that the account and it's parent exist
// this will throw an exception if the id is unknown
MyMoneySeqAccessMgr::account(account.id());
- tqparent = MyMoneySeqAccessMgr::account(account.parentAccountId());
+ parent = MyMoneySeqAccessMgr::account(account.parentAccountId());
// check that it's not one of the standard account groups
if(isStandardAccount(account.id()))
@@ -692,7 +692,7 @@ void MyMoneySeqAccessMgr::removeAccount(const MyMoneyAccount& account)
throw new MYMONEYEXCEPTION("Unable to remove account with active splits");
}
- // re-tqparent all sub-ordinate accounts to the tqparent of the account
+ // re-parent all sub-ordinate accounts to the parent of the account
// to be deleted. First round check that all accounts exist, second
// round do the re-parenting.
TQStringList::ConstIterator it;
@@ -712,9 +712,9 @@ void MyMoneySeqAccessMgr::removeAccount(const MyMoneyAccount& account)
if(it_a == m_accountList.end())
throw new MYMONEYEXCEPTION("Internal error: account not found in list");
- it_p = m_accountList.find(tqparent.id());
+ it_p = m_accountList.find(parent.id());
if(it_p == m_accountList.end())
- throw new MYMONEYEXCEPTION("Internal error: tqparent account not found in list");
+ throw new MYMONEYEXCEPTION("Internal error: parent account not found in list");
if(!account.institutionId().isEmpty())
throw new MYMONEYEXCEPTION("Cannot remove account still attached to an institution");
@@ -736,19 +736,19 @@ void MyMoneySeqAccessMgr::removeAccount(const MyMoneyAccount& account)
while((*it_a).accountList().count() > 0) {
it = (*it_a).accountList().begin();
MyMoneyAccount acc(MyMoneySeqAccessMgr::account(*it));
- reparentAccount(acc, tqparent, false);
+ reparentAccount(acc, parent, false);
}
}
- // remove account from tqparent's list
- tqparent.removeAccountId(account.id());
- m_accountList.modify(tqparent.id(), tqparent);
+ // remove account from parent's list
+ parent.removeAccountId(account.id());
+ m_accountList.modify(parent.id(), parent);
// remove account from the global account pool
m_accountList.remove(account.id());
// remove from balance list
m_balanceCache.remove(account.id());
- invalidateBalanceCache(tqparent.id());
+ invalidateBalanceCache(parent.id());
}
}
diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h
index f570d92..0aebe23 100644
--- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h
+++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h
@@ -219,13 +219,13 @@ public:
/**
* This method is used to add one account as sub-ordinate to another
- * (tqparent) account. The objects passed as arguments will be modified
+ * (parent) account. The objects passed as arguments will be modified
* accordingly.
*
- * @param tqparent tqparent account the account should be added to
+ * @param parent parent account the account should be added to
* @param account the account to be added
*/
- void addAccount(MyMoneyAccount& tqparent, MyMoneyAccount& account);
+ void addAccount(MyMoneyAccount& parent, MyMoneyAccount& account);
/**
* Adds an institution to the storage. A
@@ -291,9 +291,9 @@ public:
* An exception will be thrown upon error conditions.
*
* @param account MyMoneyAccount reference to account to be re-parented
- * @param tqparent MyMoneyAccount reference to new tqparent account
+ * @param parent MyMoneyAccount reference to new parent account
*/
- void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqparent);
+ void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& parent);
/**
* This method is used to remove a transaction from the transaction
@@ -1212,11 +1212,11 @@ private:
* An exception will be thrown upon error conditions.
*
* @param account MyMoneyAccount reference to account to be re-parented
- * @param tqparent MyMoneyAccount reference to new tqparent account
+ * @param parent MyMoneyAccount reference to new parent account
* @param sendNotification if true, notifications with the ids
* of all modified objects are send
*/
- void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& tqparent, const bool sendNotification);
+ void reparentAccount(MyMoneyAccount &account, MyMoneyAccount& parent, const bool sendNotification);
/**
* This method will close a database and log the use roff
*/
diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp b/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp
index c4505e3..94d98f5 100644
--- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp
+++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp
@@ -383,7 +383,7 @@ void MyMoneySeqAccessMgrTest::testModifyAccount() {
delete e;
}
- // use different tqparent
+ // use different parent
a.setParentAccountId("A000002");
try {
m->modifyAccount(c);
@@ -460,18 +460,18 @@ void MyMoneySeqAccessMgrTest::testReparentAccount() {
CPPUNIT_ASSERT(in.id() == "A000005");
CPPUNIT_ASSERT(ch.id() == "A000006");
- MyMoneyAccount tqparent = m->expense();
+ MyMoneyAccount parent = m->expense();
- m->addAccount(tqparent, ex1);
+ m->addAccount(parent, ex1);
m->addAccount(ex1, ex2);
- m->addAccount(tqparent, ex3);
- m->addAccount(tqparent, ex4);
+ m->addAccount(parent, ex3);
+ m->addAccount(parent, ex4);
- tqparent = m->income();
- m->addAccount(tqparent, in);
+ parent = m->income();
+ m->addAccount(parent, in);
- tqparent = m->asset();
- m->addAccount(tqparent, ch);
+ parent = m->asset();
+ m->addAccount(parent, ch);
CPPUNIT_ASSERT(m->expense().accountCount() == 3);
CPPUNIT_ASSERT(m->account(ex1.id()).accountCount() == 1);
diff --git a/kmymoney2/mymoney/storage/mymoneystoragedump.cpp b/kmymoney2/mymoney/storage/mymoneystoragedump.cpp
index 8dd022a..73521b0 100644
--- a/kmymoney2/mymoney/storage/mymoneystoragedump.cpp
+++ b/kmymoney2/mymoney/storage/mymoneystoragedump.cpp
@@ -162,8 +162,8 @@ void MyMoneyStorageDump::writeStream(TQDataStream& _s, IMyMoneySerialize* _stora
}
s << " Parent = " << (*it_a).parentAccountId();
if(!(*it_a).parentAccountId().isEmpty()) {
- MyMoneyAccount tqparent = storage->account((*it_a).parentAccountId());
- s << " (" << tqparent.name() << ")";
+ MyMoneyAccount parent = storage->account((*it_a).parentAccountId());
+ s << " (" << parent.name() << ")";
} else {
s << "n/a";
}
diff --git a/kmymoney2/mymoney/storage/mymoneystoragexml.cpp b/kmymoney2/mymoney/storage/mymoneystoragexml.cpp
index 6290962..6c4cdcc 100644
--- a/kmymoney2/mymoney/storage/mymoneystoragexml.cpp
+++ b/kmymoney2/mymoney/storage/mymoneystoragexml.cpp
@@ -738,32 +738,32 @@ void MyMoneyStorageXML::writeCurrencies(TQDomElement& currencies)
}
}
-void MyMoneyStorageXML::writeReports(TQDomElement& tqparent)
+void MyMoneyStorageXML::writeReports(TQDomElement& parent)
{
const TQValueList<MyMoneyReport> list = m_storage->reportList();
TQValueList<MyMoneyReport>::ConstIterator it;
- tqparent.setAttribute("count", list.count());
+ parent.setAttribute("count", list.count());
signalProgress(0, list.count(), i18n("Saving reports..."));
unsigned i = 0;
for(it = list.begin(); it != list.end(); ++it)
{
- (*it).writeXML(*m_doc, tqparent);
+ (*it).writeXML(*m_doc, parent);
signalProgress(++i, 0);
}
}
-void MyMoneyStorageXML::writeBudgets(TQDomElement& tqparent)
+void MyMoneyStorageXML::writeBudgets(TQDomElement& parent)
{
const TQValueList<MyMoneyBudget> list = m_storage->budgetList();
TQValueList<MyMoneyBudget>::ConstIterator it;
- tqparent.setAttribute("count", list.count());
+ parent.setAttribute("count", list.count());
signalProgress(0, list.count(), i18n("Saving budgets..."));
unsigned i = 0;
for(it = list.begin(); it != list.end(); ++it)
{
- writeBudget(tqparent, (*it));
+ writeBudget(parent, (*it));
signalProgress(++i, 0);
}
}