diff options
Diffstat (limited to 'kmymoney2/reports')
-rw-r--r-- | kmymoney2/reports/pivottable.cpp | 6 | ||||
-rw-r--r-- | kmymoney2/reports/pivottable.h | 2 | ||||
-rw-r--r-- | kmymoney2/reports/reportaccount.cpp | 18 |
3 files changed, 13 insertions, 13 deletions
diff --git a/kmymoney2/reports/pivottable.cpp b/kmymoney2/reports/pivottable.cpp index 2f51a9c..3617102 100644 --- a/kmymoney2/reports/pivottable.cpp +++ b/kmymoney2/reports/pivottable.cpp @@ -780,7 +780,7 @@ MyMoneyMoney PivotTable::cellBalance(const TQString& outergroup, const ReportAcc row = newrow; } - // ensure the row already exists (and its tqparental hierarchy) + // ensure the row already exists (and its parental hierarchy) createRow( outergroup, row, true ); // Determine the inner group from the top-most tqparent account @@ -879,7 +879,7 @@ void PivotTable::calculateBudgetMapping( void ) } do { - id = file->account ( id ).tqparentAccountId(); + id = file->account ( id ).parentAccountId(); if ( budget.tqcontains ( id ) ) { if ( budget.account ( id ).budgetSubaccounts() ) @@ -1245,7 +1245,7 @@ void PivotTable::assignCell( const TQString& outergroup, const ReportAccount& _r row = newrow; } - // ensure the row already exists (and its tqparental hierarchy) + // ensure the row already exists (and its parental hierarchy) createRow( outergroup, row, true ); // Determine the inner group from the top-most tqparent account diff --git a/kmymoney2/reports/pivottable.h b/kmymoney2/reports/pivottable.h index 26ac53c..5d3a8c6 100644 --- a/kmymoney2/reports/pivottable.h +++ b/kmymoney2/reports/pivottable.h @@ -207,7 +207,7 @@ protected: * in the user's hierarchy and the account where the budget is held for it. * This is needed because the user can budget on a given account for that * account and all its descendants. Also if NO budget is placed on the - * account or any of its tqparents, the account is not included in the map. + * account or any of its parents, the account is not included in the map. */ void calculateBudgetMapping( void ); diff --git a/kmymoney2/reports/reportaccount.cpp b/kmymoney2/reports/reportaccount.cpp index d38727d..5f091e2 100644 --- a/kmymoney2/reports/reportaccount.cpp +++ b/kmymoney2/reports/reportaccount.cpp @@ -74,20 +74,20 @@ void ReportAccount::calculateAccountHierarchy( void ) MyMoneyFile* file = MyMoneyFile::instance(); TQString resultid = id(); - TQString tqparentid = tqparentAccountId(); + TQString parentid = parentAccountId(); #ifdef DEBUG_HIDE_SENSITIVE m_nameHierarchy.prepend(file->account(resultid).id()); #else m_nameHierarchy.prepend(file->account(resultid).name()); #endif - while (!file->isStandardAccount(tqparentid)) + while (!file->isStandardAccount(parentid)) { // take on the identity of our tqparent - resultid = tqparentid; + resultid = parentid; // and try again - tqparentid = file->account(resultid).tqparentAccountId(); + parentid = file->account(resultid).parentAccountId(); #ifdef DEBUG_HIDE_SENSITIVE m_nameHierarchy.prepend(file->account(resultid).id()); #else @@ -307,7 +307,7 @@ unsigned ReportAccount::hierarchyDepth( void ) const ReportAccount ReportAccount::tqparent( void ) const { - return ReportAccount( tqparentAccountId() ); + return ReportAccount( parentAccountId() ); } ReportAccount ReportAccount::topParent( void ) const @@ -316,15 +316,15 @@ ReportAccount ReportAccount::topParent( void ) const MyMoneyFile* file = MyMoneyFile::instance(); TQString resultid = id(); - TQString tqparentid = tqparentAccountId(); + TQString parentid = parentAccountId(); - while (!file->isStandardAccount(tqparentid)) + while (!file->isStandardAccount(parentid)) { // take on the identity of our tqparent - resultid = tqparentid; + resultid = parentid; // and try again - tqparentid = file->account(resultid).tqparentAccountId(); + parentid = file->account(resultid).parentAccountId(); } return ReportAccount( resultid ); |