summaryrefslogtreecommitdiffstats
path: root/kmymoney2/reports
diff options
context:
space:
mode:
Diffstat (limited to 'kmymoney2/reports')
-rw-r--r--kmymoney2/reports/kreportchartview.cpp2
-rw-r--r--kmymoney2/reports/kreportchartview.h4
-rw-r--r--kmymoney2/reports/pivottable.cpp12
-rw-r--r--kmymoney2/reports/pivottable.h2
-rw-r--r--kmymoney2/reports/pivottabletest.cpp2
-rw-r--r--kmymoney2/reports/querytable.cpp22
-rw-r--r--kmymoney2/reports/reportaccount.cpp6
-rw-r--r--kmymoney2/reports/reportaccount.h24
-rw-r--r--kmymoney2/reports/reportstestcommon.cpp4
9 files changed, 39 insertions, 39 deletions
diff --git a/kmymoney2/reports/kreportchartview.cpp b/kmymoney2/reports/kreportchartview.cpp
index c20618b..79a5b5d 100644
--- a/kmymoney2/reports/kreportchartview.cpp
+++ b/kmymoney2/reports/kreportchartview.cpp
@@ -34,7 +34,7 @@
using namespace reports;
-KReportChartView::KReportChartView( TQWidget* tqparent, const char* name ): KDChartWidget(tqparent,name)
+KReportChartView::KReportChartView( TQWidget* parent, const char* name ): KDChartWidget(parent,name)
{
// ********************************************************************
// Set KMyMoney's Chart Parameter Defaults
diff --git a/kmymoney2/reports/kreportchartview.h b/kmymoney2/reports/kreportchartview.h
index d04e291..70963f6 100644
--- a/kmymoney2/reports/kreportchartview.h
+++ b/kmymoney2/reports/kreportchartview.h
@@ -51,7 +51,7 @@ namespace reports {
class KReportChartView: public KDChartWidget
{
public:
- KReportChartView( TQWidget* tqparent, const char* name );
+ KReportChartView( TQWidget* parent, const char* name );
~KReportChartView() {}
static bool implemented(void) { return true; }
void setNewData( const KDChartTableData& newdata ) { this->setData(new KDChartTableData(newdata)); }
@@ -83,7 +83,7 @@ namespace reports {
class KReportChartView : public TQWidget
{
public:
- KReportChartView( TQWidget* tqparent, const char* name ): TQWidget(tqparent,name) {}
+ KReportChartView( TQWidget* parent, const char* name ): TQWidget(parent,name) {}
~KReportChartView() {}
static bool implemented(void) { return false; }
};
diff --git a/kmymoney2/reports/pivottable.cpp b/kmymoney2/reports/pivottable.cpp
index d39e226..bf048cb 100644
--- a/kmymoney2/reports/pivottable.cpp
+++ b/kmymoney2/reports/pivottable.cpp
@@ -783,7 +783,7 @@ MyMoneyMoney PivotTable::cellBalance(const TQString& outergroup, const ReportAcc
// ensure the row already exists (and its parental hierarchy)
createRow( outergroup, row, true );
- // Determine the inner group from the top-most tqparent account
+ // Determine the inner group from the top-most parent account
TQString innergroup( row.topParentName() );
if ( m_numColumns <= _column )
@@ -869,7 +869,7 @@ void PivotTable::calculateBudgetMapping( void )
m_budgetMap[acid] = id;
// kdDebug(2) << ReportAccount(acid).debugName() << " self-maps / type =" << budget.account(id).budgetLevel() << endl;
}
- // Otherwise, search for a tqparent account which includes sub-accounts
+ // Otherwise, search for a parent account which includes sub-accounts
else
{
//if includeBudgetActuals, include all accounts regardless of whether in budget or not
@@ -1248,7 +1248,7 @@ void PivotTable::assignCell( const TQString& outergroup, const ReportAccount& _r
// ensure the row already exists (and its parental hierarchy)
createRow( outergroup, row, true );
- // Determine the inner group from the top-most tqparent account
+ // Determine the inner group from the top-most parent account
TQString innergroup( row.topParentName() );
if ( m_numColumns <= column )
@@ -1276,7 +1276,7 @@ void PivotTable::createRow( const TQString& outergroup, const ReportAccount& row
{
DEBUG_ENTER(__PRETTY_FUNCTION__);
- // Determine the inner group from the top-most tqparent account
+ // Determine the inner group from the top-most parent account
TQString innergroup( row.topParentName() );
if ( ! m_grid.contains(outergroup) )
@@ -1297,7 +1297,7 @@ void PivotTable::createRow( const TQString& outergroup, const ReportAccount& row
m_grid[outergroup][innergroup][row] = PivotGridRowSet(m_numColumns);
if ( recursive && !row.isTopLevel() )
- createRow( outergroup, row.tqparent(), recursive );
+ createRow( outergroup, row.parent(), recursive );
}
}
@@ -1732,7 +1732,7 @@ TQString PivotTable::renderHTML( void ) const
if(!rowname.isClosed() || isUsed) {
innergroupdata += TQString("<tr class=\"row-%1\"%2><td%3 class=\"left\" style=\"text-indent: %4.0em\">%5%6</td>")
.tqarg(rownum & 0x01 ? "even" : "odd")
- .tqarg(rowname.isTopLevel() ? " id=\"toptqparent\"" : "")
+ .tqarg(rowname.isTopLevel() ? " id=\"topparent\"" : "")
.tqarg("") //.tqarg((*it_row).m_total.isZero() ? colspan : "") // colspan the distance if this row will be blank
.tqarg(rowname.hierarchyDepth() - 1)
.tqarg(rowname.name().replace(TQRegExp(" "), "&nbsp;"))
diff --git a/kmymoney2/reports/pivottable.h b/kmymoney2/reports/pivottable.h
index 5d3a8c6..8749b73 100644
--- a/kmymoney2/reports/pivottable.h
+++ b/kmymoney2/reports/pivottable.h
@@ -165,7 +165,7 @@ protected:
*
* @param outergroup The outer row group
* @param row The row itself
- * @param recursive Whether to also recursively create rows for our tqparent accounts
+ * @param recursive Whether to also recursively create rows for our parent accounts
*/
void createRow( const TQString& outergroup, const ReportAccount& row, bool recursive );
diff --git a/kmymoney2/reports/pivottabletest.cpp b/kmymoney2/reports/pivottabletest.cpp
index f5dbe12..ddee89e 100644
--- a/kmymoney2/reports/pivottabletest.cpp
+++ b/kmymoney2/reports/pivottabletest.cpp
@@ -436,7 +436,7 @@ void PivotTableTest::testMultipleCurrencies()
CPPUNIT_ASSERT(spending_f.m_grid["Expense"]["Foreign"][acCanCash][eActual][3]==(moCanTransaction*moCanPrice));
CPPUNIT_ASSERT(spending_f.m_grid["Expense"]["Foreign"][acCanCash][eActual][4]==(moCanTransaction*moCanPrice));
- // test multiple foreign currencies under a common tqparent
+ // test multiple foreign currencies under a common parent
CPPUNIT_ASSERT(spending_f.m_grid["Expense"]["Foreign"][acJpyCash][eActual][2]==(moJpyTransaction*moJpyPrice));
CPPUNIT_ASSERT(spending_f.m_grid["Expense"]["Foreign"][acJpyCash][eActual][3]==(moJpyTransaction*moJpyPrice));
CPPUNIT_ASSERT(spending_f.m_grid["Expense"]["Foreign"][acJpyCash][eActual][4]==(moJpyTransaction*moJpyPrice));
diff --git a/kmymoney2/reports/querytable.cpp b/kmymoney2/reports/querytable.cpp
index cc38a2f..8257ce3 100644
--- a/kmymoney2/reports/querytable.cpp
+++ b/kmymoney2/reports/querytable.cpp
@@ -548,8 +548,8 @@ void QueryTable::constructTransactionTable(void)
if (splitAcc.isInvest()) {
- // use the institution of the tqparent for stock accounts
- institution = splitAcc.tqparent().institutionId();
+ // use the institution of the parent for stock accounts
+ institution = splitAcc.parent().institutionId();
MyMoneyMoney shares = (*it_split).shares();
qA["action"] = (*it_split).action();
@@ -559,7 +559,7 @@ void QueryTable::constructTransactionTable(void)
if (((*it_split).action() == MyMoneySplit::ActionBuyShares) && (*it_split).shares().isNegative())
qA["action"] = "Sell";
- qA["investaccount"] = splitAcc.tqparent().name();
+ qA["investaccount"] = splitAcc.parent().name();
}
if (it_split == myBegin) {
@@ -829,9 +829,9 @@ void QueryTable::constructTransactionTable(void)
TQString institution = account.institutionId();
- // use the institution of the tqparent for stock accounts
+ // use the institution of the parent for stock accounts
if (account.isInvest())
- institution = account.tqparent().institutionId();
+ institution = account.parent().institutionId();
MyMoneyMoney startBalance, endBalance, startPrice, endPrice;
MyMoneyMoney startShares, endShares;
@@ -1148,7 +1148,7 @@ void QueryTable::constructAccountTable(void)
TQString iid = (*it_account).institutionId();
- // If an account does not have an institution, get it from the top-tqparent.
+ // If an account does not have an institution, get it from the top-parent.
if ( iid.isEmpty() && ! account.isTopLevel() )
{
ReportAccount topaccount = account.topParent();
@@ -1308,8 +1308,8 @@ void QueryTable::constructSplitsTable(void)
if (splitAcc.isInvest()) {
- // use the institution of the tqparent for stock accounts
- institution = splitAcc.tqparent().institutionId();
+ // use the institution of the parent for stock accounts
+ institution = splitAcc.parent().institutionId();
MyMoneyMoney shares = (*it_split).shares();
qA["action"] = (*it_split).action();
@@ -1319,7 +1319,7 @@ void QueryTable::constructSplitsTable(void)
if (((*it_split).action() == MyMoneySplit::ActionBuyShares) && (*it_split).shares().isNegative())
qA["action"] = "Sell";
- qA["investaccount"] = splitAcc.tqparent().name();
+ qA["investaccount"] = splitAcc.parent().name();
}
include_me = m_config.includes(splitAcc);
@@ -1461,9 +1461,9 @@ void QueryTable::constructSplitsTable(void)
TQString institution = account.institutionId();
- // use the institution of the tqparent for stock accounts
+ // use the institution of the parent for stock accounts
if (account.isInvest())
- institution = account.tqparent().institutionId();
+ institution = account.parent().institutionId();
MyMoneyMoney startBalance, endBalance, startPrice, endPrice;
MyMoneyMoney startShares, endShares;
diff --git a/kmymoney2/reports/reportaccount.cpp b/kmymoney2/reports/reportaccount.cpp
index 5f091e2..cdc8097 100644
--- a/kmymoney2/reports/reportaccount.cpp
+++ b/kmymoney2/reports/reportaccount.cpp
@@ -83,7 +83,7 @@ void ReportAccount::calculateAccountHierarchy( void )
#endif
while (!file->isStandardAccount(parentid))
{
- // take on the identity of our tqparent
+ // take on the identity of our parent
resultid = parentid;
// and try again
@@ -305,7 +305,7 @@ unsigned ReportAccount::hierarchyDepth( void ) const
return ( m_nameHierarchy.size() );
}
-ReportAccount ReportAccount::tqparent( void ) const
+ReportAccount ReportAccount::parent( void ) const
{
return ReportAccount( parentAccountId() );
}
@@ -320,7 +320,7 @@ ReportAccount ReportAccount::topParent( void ) const
while (!file->isStandardAccount(parentid))
{
- // take on the identity of our tqparent
+ // take on the identity of our parent
resultid = parentid;
// and try again
diff --git a/kmymoney2/reports/reportaccount.h b/kmymoney2/reports/reportaccount.h
index 91db6a2..e3bf663 100644
--- a/kmymoney2/reports/reportaccount.h
+++ b/kmymoney2/reports/reportaccount.h
@@ -174,39 +174,39 @@ public:
TQString debugName( void ) const;
/**
- * Whether this account is a 'top level' tqparent account. This means that
- * it's tqparent is an account class, like asset, liability, expense or income
+ * Whether this account is a 'top level' parent account. This means that
+ * it's parent is an account class, like asset, liability, expense or income
*
- * @return bool True if this account is a top level tqparent account
+ * @return bool True if this account is a top level parent account
*/
/*inline*/ bool isTopLevel( void ) const;
/**
- * Returns the name of the top level tqparent account
+ * Returns the name of the top level parent account
*
- * (See isTopLevel for a definition of 'top level tqparent')
+ * (See isTopLevel for a definition of 'top level parent')
*
- * @return TQString The name of the top level tqparent account
+ * @return TQString The name of the top level parent account
*/
/*inline*/ TQString topParentName( void ) const;
/**
- * Returns a report account containing the top tqparent account
+ * Returns a report account containing the top parent account
*
- * @return ReportAccount The account of the top tqparent
+ * @return ReportAccount The account of the top parent
*/
ReportAccount topParent( void ) const;
/**
- * Returns a report account containing the immediate tqparent account
+ * Returns a report account containing the immediate parent account
*
- * @return ReportAccount The account of the immediate tqparent
+ * @return ReportAccount The account of the immediate parent
*/
- ReportAccount tqparent( void ) const;
+ ReportAccount parent( void ) const;
/**
* Returns the number of accounts in this account's hierarchy. If this is a
- * Top Category, it returns 1. If it's tqparent is a Top Category, returns 2,
+ * Top Category, it returns 1. If it's parent is a Top Category, returns 2,
* etc.
*
* @return unsigned Hierarchy depth
diff --git a/kmymoney2/reports/reportstestcommon.cpp b/kmymoney2/reports/reportstestcommon.cpp
index 7d42abc..6783b08 100644
--- a/kmymoney2/reports/reportstestcommon.cpp
+++ b/kmymoney2/reports/reportstestcommon.cpp
@@ -244,8 +244,8 @@ TQString makeAccount( const TQString& _name, MyMoneyAccount::accountTypeE _type,
if(_taxReport)
info.setValue("Tax", "Yes");
- MyMoneyAccount tqparent = MyMoneyFile::instance()->account(_parent);
- MyMoneyFile::instance()->addAccount( info, tqparent );
+ MyMoneyAccount parent = MyMoneyFile::instance()->account(_parent);
+ MyMoneyFile::instance()->addAccount( info, parent );
// create the opening balance transaction if any
if(!_balance.isZero()) {
MyMoneySecurity sec = MyMoneyFile::instance()->currency(info.currencyId());
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-02 06:54:16 +0000