diff --git a/kmymoney/dialogs/kbalancechartdlg.cpp b/kmymoney/dialogs/kbalancechartdlg.cpp --- a/kmymoney/dialogs/kbalancechartdlg.cpp +++ b/kmymoney/dialogs/kbalancechartdlg.cpp @@ -73,7 +73,7 @@ KReportChartView* KBalanceChartDlg::drawChart(const MyMoneyAccount& account) { MyMoneyReport reportCfg = MyMoneyReport( - MyMoneyReport::eAssetLiability, + MyMoneyReport::Row::AssetLiability, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::last3ToNext3Months, MyMoneyReport::eDetailTotal, diff --git a/kmymoney/dialogs/kreportconfigurationfilterdlg.cpp b/kmymoney/dialogs/kreportconfigurationfilterdlg.cpp --- a/kmymoney/dialogs/kreportconfigurationfilterdlg.cpp +++ b/kmymoney/dialogs/kreportconfigurationfilterdlg.cpp @@ -65,7 +65,7 @@ KReportConfigurationFilterDlg::KReportConfigurationFilterDlg( MyMoneyReport report, QWidget *parent) - : KFindTransactionDlg(parent, report.rowType() == MyMoneyReport::eAccount), + : KFindTransactionDlg(parent, report.rowType() == MyMoneyReport::Row::Account), m_tab2(0), m_tab3(0), m_tabChart(0), @@ -114,7 +114,7 @@ } else if (m_initialState.reportType() == MyMoneyReport::Report::QueryTable) { // eInvestmentHoldings is a special-case report, and you cannot configure the // rows & columns of that report. - if (m_initialState.rowType() < MyMoneyReport::eAccountByTopAccount) { + if (m_initialState.rowType() < MyMoneyReport::Row::AccountByTopAccount) { m_tab3 = new kMyMoneyReportConfigTab3Decl(m_ui->m_criteriaTab); m_tab3->setObjectName("kMyMoneyReportConfigTab3"); m_ui->m_criteriaTab->insertTab(1, m_tab3, i18n("Rows/Columns")); @@ -162,7 +162,7 @@ // modify the rowtype only if the widget is enabled if (m_tab2->findChild("m_comboRows")->isEnabled()) { - MyMoneyReport::ERowType rt[2] = { MyMoneyReport::eExpenseIncome, MyMoneyReport::eAssetLiability }; + MyMoneyReport::Row::Type rt[2] = { MyMoneyReport::Row::ExpenseIncome, MyMoneyReport::Row::AssetLiability }; m_currentState.setRowType(rt[m_tab2->findChild("m_comboRows")->currentIndex()]); } @@ -184,7 +184,7 @@ m_currentState.setIncludingUnusedAccounts(m_tab2->findChild("m_checkUnused")->isChecked()); if (m_tab2->findChild("m_comboBudget")->isEnabled()) { - m_currentState.setBudget(m_budgets[m_tab2->findChild("m_comboBudget")->currentItem()].id(), m_initialState.rowType() == MyMoneyReport::eBudgetActual); + m_currentState.setBudget(m_budgets[m_tab2->findChild("m_comboBudget")->currentItem()].id(), m_initialState.rowType() == MyMoneyReport::Row::BudgetActual); } else { m_currentState.setBudget(QString(), false); } @@ -194,7 +194,7 @@ m_currentState.setMovingAverageDays(m_tab2->findChild("m_movingAverageDays")->value()); } } else if (m_tab3) { - MyMoneyReport::ERowType rtq[8] = { MyMoneyReport::eCategory, MyMoneyReport::eTopCategory, MyMoneyReport::eTag, MyMoneyReport::ePayee, MyMoneyReport::eAccount, MyMoneyReport::eTopAccount, MyMoneyReport::eMonth, MyMoneyReport::eWeek }; + MyMoneyReport::Row::Type rtq[8] = { MyMoneyReport::Row::Category, MyMoneyReport::Row::TopCategory, MyMoneyReport::Row::Tag, MyMoneyReport::Row::Payee, MyMoneyReport::Row::Account, MyMoneyReport::Row::TopAccount, MyMoneyReport::Row::Month, MyMoneyReport::Row::Week }; m_currentState.setRowType(rtq[m_tab3->findChild("m_comboOrganizeBy")->currentIndex()]); unsigned qc = MyMoneyReport::QueryColumns::None; @@ -318,9 +318,9 @@ combo = m_tab2->findChild("m_comboRows"); switch (m_initialState.rowType()) { - case MyMoneyReport::eExpenseIncome: - case MyMoneyReport::eBudget: - case MyMoneyReport::eBudgetActual: + case MyMoneyReport::Row::ExpenseIncome: + case MyMoneyReport::Row::Budget: + case MyMoneyReport::Row::BudgetActual: combo->setCurrentItem(i18n("Income & Expenses"), false); // income / expense break; default: @@ -365,8 +365,8 @@ } //load budgets combo - if (m_initialState.rowType() == MyMoneyReport::eBudget - || m_initialState.rowType() == MyMoneyReport::eBudgetActual) { + if (m_initialState.rowType() == MyMoneyReport::Row::Budget + || m_initialState.rowType() == MyMoneyReport::Row::BudgetActual) { m_tab2->findChild("m_comboRows")->setEnabled(false); m_tab2->findChild("m_budgetFrame")->setEnabled(!m_budgets.empty()); int i = 0; @@ -393,29 +393,29 @@ } else if (m_tab3) { KComboBox *combo = m_tab3->findChild("m_comboOrganizeBy"); switch (m_initialState.rowType()) { - case MyMoneyReport::Column::NoColumns: - case MyMoneyReport::eCategory: + case MyMoneyReport::Row::NoRows: + case MyMoneyReport::Row::Category: combo->setCurrentItem(i18n("Categories"), false); break; - case MyMoneyReport::eTopCategory: + case MyMoneyReport::Row::TopCategory: combo->setCurrentItem(i18n("Top Categories"), false); break; - case MyMoneyReport::eTag: + case MyMoneyReport::Row::Tag: combo->setCurrentItem(i18n("Tags"), false); break; - case MyMoneyReport::ePayee: + case MyMoneyReport::Row::Payee: combo->setCurrentItem(i18n("Payees"), false); break; - case MyMoneyReport::eAccount: + case MyMoneyReport::Row::Account: combo->setCurrentItem(i18n("Accounts"), false); break; - case MyMoneyReport::eTopAccount: + case MyMoneyReport::Row::TopAccount: combo->setCurrentItem(i18n("Top Accounts"), false); break; - case MyMoneyReport::eMonth: + case MyMoneyReport::Row::Month: combo->setCurrentItem(i18n("Month"), false); break; - case MyMoneyReport::eWeek: + case MyMoneyReport::Row::Week: combo->setCurrentItem(i18n("Week"), false); break; default: diff --git a/kmymoney/kmymoney.cpp b/kmymoney/kmymoney.cpp --- a/kmymoney/kmymoney.cpp +++ b/kmymoney/kmymoney.cpp @@ -4289,7 +4289,7 @@ // currently selected account. if (!d->m_selectedAccount.id().isEmpty()) { MyMoneyReport report( - MyMoneyReport::eAccount, + MyMoneyReport::Row::Account, MyMoneyReport::QueryColumns::Number | MyMoneyReport::QueryColumns::Payee | MyMoneyReport::QueryColumns::Category, MyMoneyTransactionFilter::yearToDate, MyMoneyReport::eDetailAll, diff --git a/kmymoney/mymoney/mymoneyreport.h b/kmymoney/mymoney/mymoneyreport.h --- a/kmymoney/mymoney/mymoneyreport.h +++ b/kmymoney/mymoney/mymoneyreport.h @@ -56,7 +56,19 @@ { public: // When adding a new row type, be sure to add a corresponding entry in kTypeArray - enum ERowType { eNoRows = 0, eAssetLiability, eExpenseIncome, eCategory, eTopCategory, eAccount, eTag, ePayee, eMonth, eWeek, eTopAccount, eAccountByTopAccount, eEquityType, eAccountType, eInstitution, eBudget, eBudgetActual, eSchedule, eAccountInfo, eAccountLoanInfo, eAccountReconcile, eCashFlow}; + class Row { + public: + enum Type { NoRows = 0, AssetLiability, ExpenseIncome, Category, TopCategory, Account, Tag, Payee, Month, Week, TopAccount, AccountByTopAccount, EquityType, AccountType, Institution, Budget, BudgetActual, Schedule, AccountInfo, AccountLoanInfo, AccountReconcile, CashFlow}; + /** + * Return row type as string. + * + * @param type type to get string for + * @return row type converted to string + */ + static QString toString(Type type); + static const QStringList kText; + }; + class Report { public: enum Type { NoReport = 0, PivotTable, QueryTable, InfoTable }; @@ -87,13 +99,12 @@ enum EDetailLevel { eDetailNone = 0, eDetailAll, eDetailTop, eDetailGroup, eDetailTotal, eDetailEnd }; enum EChartType { eChartNone = 0, eChartLine, eChartBar, eChartPie, eChartRing, eChartStackedBar, eChartEnd }; - static const QStringList kRowTypeText; static const QStringList kDetailLevelText; static const QStringList kChartTypeText; public: MyMoneyReport(); - MyMoneyReport(ERowType _rt, unsigned _ct, dateOptionE _dl, EDetailLevel _ss, const QString& _name, const QString& _comment); + MyMoneyReport(Row::Type _rt, unsigned _ct, dateOptionE _dl, EDetailLevel _ss, const QString& _name, const QString& _comment); MyMoneyReport(const QString& id, const MyMoneyReport& right); /** @@ -113,14 +124,14 @@ Report::Type reportType() const { return m_reportType; } - ERowType rowType() const { + Row::Type rowType() const { return m_rowType; } Column::Type columnType() const { return m_columnType; } bool isRunningSum() const { - return (m_rowType == eAssetLiability); + return (m_rowType == Row::AssetLiability); } bool isConvertCurrency() const { return m_convertCurrency; @@ -229,7 +240,7 @@ void setConvertCurrency(bool _f) { m_convertCurrency = _f; } - void setRowType(ERowType _rt); + void setRowType(Row::Type _rt); void setColumnType(Column::Type _ct) { m_columnType = _ct; } @@ -507,14 +518,6 @@ */ static void setLineWidth(int width); - /** - * Return row type as string. - * - * @param type type to get string for - * @return row type converted to string - */ - static QString toString(ERowType type); - private: /** * The user-assigned name of the report @@ -565,7 +568,7 @@ /** * What sort of values should show up on the ROWS of this report */ - enum ERowType m_rowType; + Row::Type m_rowType; /** * What sort of values should show up on the COLUMNS of this report, * in the case of a 'PivotTable' report. Really this is used more as a diff --git a/kmymoney/mymoney/mymoneyreport.cpp b/kmymoney/mymoney/mymoneyreport.cpp --- a/kmymoney/mymoney/mymoneyreport.cpp +++ b/kmymoney/mymoney/mymoneyreport.cpp @@ -34,14 +34,12 @@ #include "mymoneyfile.h" #include "reportdebug.h" +const QStringList MyMoneyReport::Row::kText = QString("none,assetliability,expenseincome,category,topcategory,account,tag,payee,month,week,topaccount,topaccount-account,equitytype,accounttype,institution,budget,budgetactual,schedule,accountinfo,accountloaninfo,accountreconcile,cashflow").split(','); const MyMoneyReport::Report::Type MyMoneyReport::Report::kTypeArray[] = { NoReport, PivotTable, PivotTable, QueryTable, QueryTable, QueryTable, QueryTable, QueryTable, QueryTable, QueryTable, QueryTable, QueryTable, QueryTable, QueryTable, QueryTable, PivotTable, PivotTable, InfoTable, InfoTable, InfoTable, QueryTable, QueryTable, NoReport }; const QStringList MyMoneyReport::Column::kTypeText = QString("none,months,bimonths,quarters,4,5,6,weeks,8,9,10,11,years").split(','); // if you add names here, don't forget to update the bitmap for QueryColumns::Type // and shift the bit for QueryColumns::end one position to the left const QStringList MyMoneyReport::QueryColumns::kText = QString("none,number,payee,category,tag,memo,account,reconcileflag,action,shares,price,performance,loan,balance").split(','); - -const QStringList MyMoneyReport::kRowTypeText = QString("none,assetliability,expenseincome,category,topcategory,account,tag,payee,month,week,topaccount,topaccount-account,equitytype,accounttype,institution,budget,budgetactual,schedule,accountinfo,accountloaninfo,accountreconcile,cashflow").split(','); - const QStringList MyMoneyReport::kDetailLevelText = QString("none,all,top,group,total,invalid").split(','); const QStringList MyMoneyReport::kChartTypeText = QString("none,line,bar,pie,ring,stackedbar,invalid").split(','); @@ -51,6 +49,35 @@ const QStringList kDateLockText = QString("alldates,untiltoday,currentmonth,currentyear,monthtodate,yeartodate,yeartomonth,lastmonth,lastyear,last7days,last30days,last3months,last6months,last12months,next7days,next30days,next3months,next6months,next12months,userdefined,last3tonext3months,last11Months,currentQuarter,lastQuarter,nextQuarter,currentFiscalYear,lastFiscalYear,today,next18months").split(','); const QStringList kAccountTypeText = QString("unknown,checkings,savings,cash,creditcard,loan,certificatedep,investment,moneymarket,asset,liability,currency,income,expense,assetloan,stock,equity,invalid").split(','); +QString MyMoneyReport::Row::toString(Type type) +{ + switch(type) { + case NoRows : return "NoRows"; + case AssetLiability : return "AssetLiability"; + case ExpenseIncome : return "ExpenseIncome"; + case Category : return "Category"; + case TopCategory : return "TopCategory"; + case Account : return "Account"; + case Tag : return "Tag"; + case Payee : return "Payee"; + case Month : return "Month"; + case Week : return "Week"; + case TopAccount : return "TopAccount"; + case AccountByTopAccount: return "AccountByTopAccount"; + case EquityType : return "EquityType"; + case AccountType : return "AccountType"; + case Institution : return "Institution"; + case Budget : return "Budget"; + case BudgetActual : return "BudgetActual"; + case Schedule : return "Schedule"; + case AccountInfo : return "AccountInfo"; + case AccountLoanInfo : return "AccountLoanInfo"; + case AccountReconcile : return "AccountReconcile"; + case CashFlow : return "CashFlow"; + default : return "undefined"; + } +} + QString MyMoneyReport::Report::toString(Type type) { switch(type) { @@ -70,8 +97,8 @@ m_tax(false), m_investments(false), m_loans(false), - m_reportType(Report::kTypeArray[eExpenseIncome]), - m_rowType(eExpenseIncome), + m_reportType(Report::kTypeArray[Row::ExpenseIncome]), + m_rowType(Row::ExpenseIncome), m_columnType(Column::Months), m_columnsAreDays(false), m_queryColumns(QueryColumns::None), @@ -107,7 +134,7 @@ setId(id); } -MyMoneyReport::MyMoneyReport(ERowType _rt, unsigned _ct, dateOptionE _dl, EDetailLevel _ss, const QString& _name, const QString& _comment) : +MyMoneyReport::MyMoneyReport(Row::Type _rt, unsigned _ct, dateOptionE _dl, EDetailLevel _ss, const QString& _name, const QString& _comment) : m_name(_name), m_comment(_comment), m_detailLevel(_ss), @@ -152,17 +179,17 @@ setDateFilter(_dl); //throw exception if the type is inconsistent - if ((_rt > static_cast(sizeof(Report::kTypeArray) / sizeof(Report::kTypeArray[0]))) + if ((_rt > static_cast(sizeof(Report::kTypeArray) / sizeof(Report::kTypeArray[0]))) || (m_reportType == Report::NoReport)) throw MYMONEYEXCEPTION("Invalid report type"); //add the corresponding account groups - if (_rt == MyMoneyReport::eAssetLiability) { + if (_rt == MyMoneyReport::Row::AssetLiability) { addAccountGroup(MyMoneyAccount::Asset); addAccountGroup(MyMoneyAccount::Liability); m_showRowTotals = true; } - if (_rt == MyMoneyReport::eAccount) { + if (_rt == MyMoneyReport::Row::Account) { addAccountGroup(MyMoneyAccount::Asset); addAccountGroup(MyMoneyAccount::AssetLoan); addAccountGroup(MyMoneyAccount::Cash); @@ -178,30 +205,30 @@ addAccountGroup(MyMoneyAccount::Stock); m_showRowTotals = true; } - if (_rt == MyMoneyReport::eExpenseIncome) { + if (_rt == MyMoneyReport::Row::ExpenseIncome) { addAccountGroup(MyMoneyAccount::Expense); addAccountGroup(MyMoneyAccount::Income); m_showRowTotals = true; } //FIXME take this out once we have sorted out all issues regarding budget of assets and liabilities -- asoliverez@gmail.com - if (_rt == MyMoneyReport::eBudget || _rt == MyMoneyReport::eBudgetActual) { + if (_rt == MyMoneyReport::Row::Budget || _rt == MyMoneyReport::Row::BudgetActual) { addAccountGroup(MyMoneyAccount::Expense); addAccountGroup(MyMoneyAccount::Income); } - if (_rt == MyMoneyReport::eAccountInfo) { + if (_rt == MyMoneyReport::Row::AccountInfo) { addAccountGroup(MyMoneyAccount::Asset); addAccountGroup(MyMoneyAccount::Liability); } //cash flow reports show splits for all account groups - if (_rt == MyMoneyReport::eCashFlow) { + if (_rt == MyMoneyReport::Row::CashFlow) { addAccountGroup(MyMoneyAccount::Expense); addAccountGroup(MyMoneyAccount::Income); addAccountGroup(MyMoneyAccount::Asset); addAccountGroup(MyMoneyAccount::Liability); } #ifdef DEBUG_REPORTS QDebug dbg = qDebug(); - dbg << _name << toString(_rt) << Report::toString(m_reportType); + dbg << _name << Row::toString(_rt) << Report::toString(m_reportType); foreach(const MyMoneyAccount::accountTypeE accountType, m_accountGroups) dbg << MyMoneyAccount::accountTypeToString(accountType); if (m_accounts.size() > 0) @@ -271,19 +298,19 @@ _db = _de; } -void MyMoneyReport::setRowType(ERowType _rt) +void MyMoneyReport::setRowType(Row::Type _rt) { m_rowType = _rt; m_reportType = Report::kTypeArray[_rt]; m_accountGroupFilter = false; m_accountGroups.clear(); - if (_rt == MyMoneyReport::eAssetLiability) { + if (_rt == MyMoneyReport::Row::AssetLiability) { addAccountGroup(MyMoneyAccount::Asset); addAccountGroup(MyMoneyAccount::Liability); } - if (_rt == MyMoneyReport::eExpenseIncome) { + if (_rt == MyMoneyReport::Row::ExpenseIncome) { addAccountGroup(MyMoneyAccount::Expense); addAccountGroup(MyMoneyAccount::Income); } @@ -318,7 +345,7 @@ bool MyMoneyReport::includesAccountGroup(MyMoneyAccount::accountTypeE type) const { bool result = (! m_accountGroupFilter) - || (isIncludingTransfers() && m_rowType == MyMoneyReport::eExpenseIncome) + || (isIncludingTransfers() && m_rowType == MyMoneyReport::Row::ExpenseIncome) || m_accountGroups.contains(type); return result; @@ -343,7 +370,7 @@ result = acc.isLoan() && includesAccount(acc.id()); else if (isInvestmentsOnly()) result = acc.isInvest() && includesAccount(acc.id()); - else if (isIncludingTransfers() && m_rowType == MyMoneyReport::eExpenseIncome) + else if (isIncludingTransfers() && m_rowType == MyMoneyReport::Row::ExpenseIncome) // If transfers are included, ONLY include this account if it is NOT // included in the report itself!! result = ! includesAccount(acc.id()); @@ -379,7 +406,7 @@ e.setAttribute("tax", m_tax); e.setAttribute("investments", m_investments); e.setAttribute("loans", m_loans); - e.setAttribute("rowtype", kRowTypeText[m_rowType]); + e.setAttribute("rowtype", Row::kText[m_rowType]); e.setAttribute("datelock", kDateLockText[m_dateLock]); e.setAttribute("includeschedules", m_includeSchedules); e.setAttribute("columnsaredays", m_columnsAreDays); @@ -724,14 +751,14 @@ } setDateFilter(static_cast(i)); - i = kRowTypeText.indexOf(e.attribute("rowtype", "expenseincome")); + i = Row::kText.indexOf(e.attribute("rowtype", "expenseincome")); if (i != -1) { - setRowType(static_cast(i)); + setRowType(static_cast(i)); // recent versions of KMyMoney always showed a total column for // income/expense reports. We turn it on for backward compatibility // here. If the total column is turned off, the flag will be reset // in the next step - if (i == eExpenseIncome) + if (i == Row::ExpenseIncome) m_showRowTotals = true; } if (e.hasAttribute("showrowtotals")) @@ -837,32 +864,3 @@ { m_lineWidth = width; } - -QString MyMoneyReport::toString(ERowType type) -{ - switch(type) { - case eNoRows : return "eNoRows"; - case eAssetLiability : return "eAssetLiability"; - case eExpenseIncome : return "eExpenseIncome"; - case eCategory : return "eCategory"; - case eTopCategory : return "eTopCategory"; - case eAccount : return "eAccount"; - case eTag : return "eTag"; - case ePayee : return "ePayee"; - case eMonth : return "eMonth"; - case eWeek : return "eWeek"; - case eTopAccount : return "eTopAccount"; - case eAccountByTopAccount: return "eAccountByTopAccount"; - case eEquityType : return "eEquityType"; - case eAccountType : return "eAccountType"; - case eInstitution : return "eInstitution"; - case eBudget : return "eBudget"; - case eBudgetActual : return "eBudgetActual"; - case eSchedule : return "eSchedule"; - case eAccountInfo : return "eAccountInfo"; - case eAccountLoanInfo : return "eAccountLoanInfo"; - case eAccountReconcile : return "eAccountReconcile"; - case eCashFlow : return "eCashFlow"; - default : return "undefined"; - } -} diff --git a/kmymoney/reports/listtable.cpp b/kmymoney/reports/listtable.cpp --- a/kmymoney/reports/listtable.cpp +++ b/kmymoney/reports/listtable.cpp @@ -593,7 +593,7 @@ QString grandtotal_csv = grandtotal.formatMoney(fraction, false); //If we order by Tags don't show the Grand total as we can have multiple tags per transaction - if (m_config.rowType() != MyMoneyReport::eTag) { + if (m_config.rowType() != MyMoneyReport::Row::Tag) { result += "" "" + diff --git a/kmymoney/reports/objectinfotable.cpp b/kmymoney/reports/objectinfotable.cpp --- a/kmymoney/reports/objectinfotable.cpp +++ b/kmymoney/reports/objectinfotable.cpp @@ -72,15 +72,15 @@ void ObjectInfoTable::init() { switch (m_config.rowType()) { - case MyMoneyReport::eSchedule: + case MyMoneyReport::Row::Schedule: constructScheduleTable(); m_columns = "nextduedate,name"; break; - case MyMoneyReport::eAccountInfo: + case MyMoneyReport::Row::AccountInfo: constructAccountTable(); m_columns = "institution,type,name"; break; - case MyMoneyReport::eAccountLoanInfo: + case MyMoneyReport::Row::AccountLoanInfo: constructAccountLoanTable(); m_columns = "institution,type,name"; break; @@ -92,12 +92,12 @@ m_subtotal = "value"; switch (m_config.rowType()) { - case MyMoneyReport::eSchedule: + case MyMoneyReport::Row::Schedule: m_group = "type"; m_subtotal = "value"; break; - case MyMoneyReport::eAccountInfo: - case MyMoneyReport::eAccountLoanInfo: + case MyMoneyReport::Row::AccountInfo: + case MyMoneyReport::Row::AccountLoanInfo: m_group = "topcategory,institution"; m_subtotal = "currentbalance"; break; @@ -108,17 +108,17 @@ QString sort = m_group + ',' + m_columns + ",id,rank"; switch (m_config.rowType()) { - case MyMoneyReport::eSchedule: + case MyMoneyReport::Row::Schedule: if (m_config.detailLevel() == MyMoneyReport::eDetailAll) { m_columns = "name,payee,paymenttype,occurence,nextduedate,category"; // krazy:exclude=spelling } else { m_columns = "name,payee,paymenttype,occurence,nextduedate"; // krazy:exclude=spelling } break; - case MyMoneyReport::eAccountInfo: + case MyMoneyReport::Row::AccountInfo: m_columns = "type,name,number,description,openingdate,currencyname,balancewarning,maxbalancelimit,creditwarning,maxcreditlimit,tax,favorite"; break; - case MyMoneyReport::eAccountLoanInfo: + case MyMoneyReport::Row::AccountLoanInfo: m_columns = "type,name,number,description,openingdate,currencyname,payee,loanamount,interestrate,nextinterestchange,periodicpayment,finalpayment,favorite"; break; default: diff --git a/kmymoney/reports/pivottable.cpp b/kmymoney/reports/pivottable.cpp --- a/kmymoney/reports/pivottable.cpp +++ b/kmymoney/reports/pivottable.cpp @@ -134,7 +134,7 @@ // // Initialize outer groups of the grid // - if (m_config_f.rowType() == MyMoneyReport::eAssetLiability) { + if (m_config_f.rowType() == MyMoneyReport::Row::AssetLiability) { m_grid.insert(KMyMoneyUtils::accountTypeToString(MyMoneyAccount::Asset), PivotOuterGroup(m_numColumns)); m_grid.insert(KMyMoneyUtils::accountTypeToString(MyMoneyAccount::Liability), PivotOuterGroup(m_numColumns, PivotOuterGroup::m_kDefaultSortOrder, true /* inverted */)); } else { @@ -236,7 +236,7 @@ // whether asset & liability transactions are actually to be considered // transfers - bool al_transfers = (m_config_f.rowType() == MyMoneyReport::eExpenseIncome) && (m_config_f.isIncludingTransfers()); + bool al_transfers = (m_config_f.rowType() == MyMoneyReport::Row::ExpenseIncome) && (m_config_f.isIncludingTransfers()); //this is to store balance for loan accounts when not included in the report QMap loanBalances; @@ -1146,7 +1146,7 @@ // Outer Row Group Totals // - const bool isIncomeExpense = (m_config_f.rowType() == MyMoneyReport::eExpenseIncome); + const bool isIncomeExpense = (m_config_f.rowType() == MyMoneyReport::Row::ExpenseIncome); const bool invert_total = (*it_outergroup).m_inverted; int column = 1; while (column < m_numColumns) { @@ -1972,7 +1972,7 @@ } //run forecast - if (m_config_f.rowType() == MyMoneyReport::eAssetLiability) { //asset and liability + if (m_config_f.rowType() == MyMoneyReport::Row::AssetLiability) { //asset and liability forecast.doForecast(); } else { //income and expenses MyMoneyBudget budget; diff --git a/kmymoney/reports/pivottabletest.cpp b/kmymoney/reports/pivottabletest.cpp --- a/kmymoney/reports/pivottabletest.cpp +++ b/kmymoney/reports/pivottabletest.cpp @@ -95,7 +95,7 @@ { try { MyMoneyReport filter; - filter.setRowType(MyMoneyReport::eAssetLiability); + filter.setRowType(MyMoneyReport::Row::AssetLiability); filter.setDateFilter(QDate(2004, 1, 1), QDate(2004, 7, 1).addDays(-1)); XMLandback(filter); PivotTable networth_f(filter); @@ -120,7 +120,7 @@ // that it calculates the totals correctly. MyMoneyReport filter; - filter.setRowType(MyMoneyReport::eAssetLiability); + filter.setRowType(MyMoneyReport::Row::AssetLiability); filter.setDateFilter(QDate(2004, 1, 1), QDate(2005, 1, 1).addDays(-1)); XMLandback(filter); PivotTable networth_f(filter); @@ -136,7 +136,7 @@ // the period of the report. MyMoneyReport filter; - filter.setRowType(MyMoneyReport::eAssetLiability); + filter.setRowType(MyMoneyReport::Row::AssetLiability); filter.setDateFilter(QDate(2005, 8, 1), QDate(2005, 12, 31)); filter.setName("Net Worth Opening Prior 1"); XMLandback(filter); @@ -173,7 +173,7 @@ // so the report should be zero. MyMoneyReport filter; - filter.setRowType(MyMoneyReport::eAssetLiability); + filter.setRowType(MyMoneyReport::Row::AssetLiability); filter.setDateFilter(QDate(2004, 1, 1), QDate(2004, 2, 1).addDays(-1)); XMLandback(filter); PivotTable networth_f(filter); @@ -186,7 +186,7 @@ // test a spending report with no entries MyMoneyReport filter; - filter.setRowType(MyMoneyReport::eExpenseIncome); + filter.setRowType(MyMoneyReport::Row::ExpenseIncome); XMLandback(filter); PivotTable spending_f1(filter); QVERIFY(spending_f1.m_grid.m_total[eActual].m_total == moZero); @@ -202,7 +202,7 @@ TransactionHelper t(QDate(2004, 10, 31), MyMoneySplit::ActionWithdrawal, moSolo, acChecking, acSolo); MyMoneyReport filter; - filter.setRowType(MyMoneyReport::eExpenseIncome); + filter.setRowType(MyMoneyReport::Row::ExpenseIncome); filter.setDateFilter(QDate(2004, 9, 1), QDate(2005, 1, 1).addDays(-1)); filter.setName("Spending with Single Transaction.html"); XMLandback(filter); @@ -216,7 +216,7 @@ QVERIFY(spending_f.m_grid.m_total[eActual].m_total == (-moSolo)); filter.clear(); - filter.setRowType(MyMoneyReport::eAssetLiability); + filter.setRowType(MyMoneyReport::Row::AssetLiability); filter.setDateFilter(QDate(2004, 9, 1), QDate(2005, 1, 1).addDays(-1)); XMLandback(filter); PivotTable networth_f(filter); @@ -232,7 +232,7 @@ TransactionHelper t3(QDate(2004, 11, 7), MyMoneySplit::ActionWithdrawal, moChild, acCredit, acChild); MyMoneyReport filter; - filter.setRowType(MyMoneyReport::eExpenseIncome); + filter.setRowType(MyMoneyReport::Row::ExpenseIncome); filter.setDateFilter(QDate(2004, 9, 1), QDate(2005, 1, 1).addDays(-1)); filter.setDetailLevel(MyMoneyReport::eDetailAll); filter.setName("Spending with Sub-Account"); @@ -249,7 +249,7 @@ QVERIFY(spending_f.m_grid.m_total[eActual].m_total == (-moParent - moChild)); filter.clear(); - filter.setRowType(MyMoneyReport::eAssetLiability); + filter.setRowType(MyMoneyReport::Row::AssetLiability); filter.setDateFilter(QDate(2004, 9, 1), QDate(2005, 1, 1).addDays(-1)); filter.setName("Net Worth with Sub-Account"); XMLandback(filter); @@ -268,7 +268,7 @@ TransactionHelper t3(QDate(2004, 11, 7), MyMoneySplit::ActionWithdrawal, moChild, acCredit, acChild); MyMoneyReport filter; - filter.setRowType(MyMoneyReport::eExpenseIncome); + filter.setRowType(MyMoneyReport::Row::ExpenseIncome); filter.setDateFilter(QDate(2004, 9, 1), QDate(2005, 1, 1).addDays(-1)); filter.addCategory(acChild); filter.addCategory(acSolo); @@ -289,7 +289,7 @@ TransactionHelper t3(QDate(2004, 11, 7), MyMoneySplit::ActionWithdrawal, moChild, acCredit, acChild); MyMoneyReport filter; - filter.setRowType(MyMoneyReport::eAssetLiability); + filter.setRowType(MyMoneyReport::Row::AssetLiability); filter.setDateFilter(QDate(2004, 9, 1), QDate(2005, 1, 1).addDays(-1)); filter.addAccount(acChecking); filter.addCategory(acChild); @@ -307,7 +307,7 @@ TransactionHelper t3(QDate(2004, 11, 7), MyMoneySplit::ActionWithdrawal, moChild, acCredit, acChild); MyMoneyReport filter; - filter.setRowType(MyMoneyReport::eExpenseIncome); + filter.setRowType(MyMoneyReport::Row::ExpenseIncome); filter.setDateFilter(QDate(2004, 9, 1), QDate(2005, 1, 1).addDays(-1)); filter.addAccount(acChecking); QVERIFY(file->transactionList(filter).count() == 1); @@ -329,7 +329,7 @@ TransactionHelper t3(QDate(2004, 11, 7), MyMoneySplit::ActionWithdrawal, moChild, acCredit, acChild); MyMoneyReport filter; - filter.setRowType(MyMoneyReport::eExpenseIncome); + filter.setRowType(MyMoneyReport::Row::ExpenseIncome); filter.setDateFilter(QDate(2004, 9, 1), QDate(2005, 1, 1).addDays(-1)); filter.addAccount(acCredit); filter.addCategory(acChild); @@ -415,7 +415,7 @@ #endif MyMoneyReport filter; - filter.setRowType(MyMoneyReport::eExpenseIncome); + filter.setRowType(MyMoneyReport::Row::ExpenseIncome); filter.setDateFilter(QDate(2004, 1, 1), QDate(2005, 1, 1).addDays(-1)); filter.setDetailLevel(MyMoneyReport::eDetailAll); filter.setConvertCurrency(true); @@ -456,7 +456,7 @@ filter.setConvertCurrency(true); filter.clear(); filter.setName("Multiple currency net worth"); - filter.setRowType(MyMoneyReport::eAssetLiability); + filter.setRowType(MyMoneyReport::Row::AssetLiability); filter.setDateFilter(QDate(2004, 1, 1), QDate(2005, 1, 1).addDays(-1)); XMLandback(filter); PivotTable networth_f(filter); @@ -496,7 +496,7 @@ TransactionHelper t2(QDate(2004, 11, 7), MyMoneySplit::ActionWithdrawal, moChild, acCredit, acChild); MyMoneyReport filter; - filter.setRowType(MyMoneyReport::eExpenseIncome); + filter.setRowType(MyMoneyReport::Row::ExpenseIncome); filter.setDateFilter(QDate(2004, 1, 1), QDate(2005, 1, 1).addDays(-1)); filter.setAmountFilter(moChild, moChild); XMLandback(filter); @@ -512,7 +512,7 @@ TransactionHelper t4(QDate(2004, 11, 7), MyMoneySplit::ActionWithdrawal, moThomas, acCredit, acParent, QString(), "Thomas Baumgart"); MyMoneyReport filter; - filter.setRowType(MyMoneyReport::eExpenseIncome); + filter.setRowType(MyMoneyReport::Row::ExpenseIncome); filter.setDateFilter(QDate(2004, 1, 1), QDate(2005, 1, 1).addDays(-1)); filter.addPayee(MyMoneyFile::instance()->payeeByName("Thomas Baumgart").id()); filter.setName("Spending with Payee Filter"); @@ -531,7 +531,7 @@ TransactionHelper t4(QDate(2004, 11, 7), MyMoneySplit::ActionWithdrawal, moNoPayee, acCredit, acParent, QString(), QString()); MyMoneyReport filter; - filter.setRowType(MyMoneyReport::eExpenseIncome); + filter.setRowType(MyMoneyReport::Row::ExpenseIncome); filter.setDateFilter(QDate(2004, 1, 1), QDate(2005, 1, 1).addDays(-1)); filter.addPayee(QString()); XMLandback(filter); @@ -548,7 +548,7 @@ TransactionHelper t4(QDate(2004, 11, 7), MyMoneySplit::ActionWithdrawal, moThomas, acCredit, acParent, QString(), "Thomas Baumgart"); MyMoneyReport filter; - filter.setRowType(MyMoneyReport::eExpenseIncome); + filter.setRowType(MyMoneyReport::Row::ExpenseIncome); filter.setDateFilter(QDate(2004, 1, 1), QDate(2005, 1, 1).addDays(-1)); filter.setTextFilter(QRegExp("Thomas")); XMLandback(filter); @@ -562,7 +562,7 @@ TransactionHelper t3(QDate(2004, 11, 1), MyMoneySplit::ActionTransfer, moChild, acCredit, acChecking); MyMoneyReport filter; - filter.setRowType(MyMoneyReport::eExpenseIncome); + filter.setRowType(MyMoneyReport::Row::ExpenseIncome); filter.addType(MyMoneyTransactionFilter::payments); XMLandback(filter); PivotTable spending_f(filter); @@ -583,7 +583,7 @@ QVERIFY(spending_f3.m_grid.m_total[eActual].m_total == moZero); - filter.setRowType(MyMoneyReport::eAssetLiability); + filter.setRowType(MyMoneyReport::Row::AssetLiability); filter.setDateFilter(QDate(2004, 1, 1), QDate(2004, 12, 31)); XMLandback(filter); PivotTable networth_f4(filter); @@ -617,7 +617,7 @@ t2.update(); MyMoneyReport filter; - filter.setRowType(MyMoneyReport::eExpenseIncome); + filter.setRowType(MyMoneyReport::Row::ExpenseIncome); filter.setDateFilter(QDate(2004, 1, 1), QDate(2005, 1, 1).addDays(-1)); filter.addState(MyMoneyTransactionFilter::cleared); XMLandback(filter); @@ -678,7 +678,7 @@ t4.update(); MyMoneyReport filter; - filter.setRowType(MyMoneyReport::eExpenseIncome); + filter.setRowType(MyMoneyReport::Row::ExpenseIncome); filter.setDateFilter(QDate(2004, 1, 1), QDate(2005, 1, 1).addDays(-1)); filter.setNumberFilter("1", "3"); XMLandback(filter); @@ -701,7 +701,7 @@ TransactionHelper t3y3(QDate(2005, 9, 1), MyMoneySplit::ActionWithdrawal, moParent2, acCredit, acParent); MyMoneyReport filter; - filter.setRowType(MyMoneyReport::eExpenseIncome); + filter.setRowType(MyMoneyReport::Row::ExpenseIncome); filter.setDateFilter(QDate(), QDate(2004, 7, 1)); XMLandback(filter); PivotTable spending_f(filter); @@ -733,9 +733,9 @@ TransactionHelper t3y2(QDate(2005, 9, 1), MyMoneySplit::ActionWithdrawal, moParent2, acCredit, acParent); MyMoneyReport filter; - filter.setRowType(MyMoneyReport::eExpenseIncome); + filter.setRowType(MyMoneyReport::Row::ExpenseIncome); filter.setDateFilter(QDate(2003, 12, 31), QDate(2005, 12, 31)); - filter.setRowType(MyMoneyReport::eExpenseIncome); + filter.setRowType(MyMoneyReport::Row::ExpenseIncome); filter.setColumnType(MyMoneyReport::Column::BiMonths); XMLandback(filter); PivotTable spending_b(filter); @@ -768,7 +768,7 @@ QVERIFY(spending_q.m_grid.m_total[eActual][8] == -moParent2); QVERIFY(spending_q.m_grid.m_total[eActual][9] == moZero); - filter.setRowType(MyMoneyReport::eAssetLiability); + filter.setRowType(MyMoneyReport::Row::AssetLiability); filter.setName("Net Worth by Quarter"); XMLandback(filter); PivotTable networth_q(filter); @@ -784,7 +784,7 @@ QVERIFY(networth_q.m_grid.m_total[eActual][8] == -moParent2 - moParent1 - moSolo - moSolo - moParent - moSolo - moParent + moCheckingOpen + moCreditOpen); QVERIFY(networth_q.m_grid.m_total[eActual][9] == -moParent2 - moParent1 - moSolo - moSolo - moParent - moSolo - moParent + moCheckingOpen + moCreditOpen); - filter.setRowType(MyMoneyReport::eExpenseIncome); + filter.setRowType(MyMoneyReport::Row::ExpenseIncome); filter.setColumnType(MyMoneyReport::Column::Years); XMLandback(filter); PivotTable spending_y(filter); @@ -794,7 +794,7 @@ QVERIFY(spending_y.m_grid.m_total[eActual][3] == -moSolo - moParent); QVERIFY(spending_y.m_grid.m_total[eActual].m_total == -moSolo - moParent - moSolo - moParent - moSolo - moParent); - filter.setRowType(MyMoneyReport::eAssetLiability); + filter.setRowType(MyMoneyReport::Row::AssetLiability); XMLandback(filter); PivotTable networth_y(filter); @@ -817,7 +817,7 @@ TransactionHelper t3d3(QDate(2004, 8, 4), MyMoneySplit::ActionWithdrawal, moParent2, acCredit, acParent); filter.setDateFilter(QDate(2004, 7, 2), QDate(2004, 7, 14)); - filter.setRowType(MyMoneyReport::eExpenseIncome); + filter.setRowType(MyMoneyReport::Row::ExpenseIncome); filter.setColumnType(MyMoneyReport::Column::Months); filter.setColumnsAreDays(true); filter.setName("Spending by Days"); @@ -834,7 +834,7 @@ KGlobal::locale()->setWeekStartDay(2); filter.setDateFilter(QDate(2004, 7, 2), QDate(2004, 8, 1)); - filter.setRowType(MyMoneyReport::eExpenseIncome); + filter.setRowType(MyMoneyReport::Row::ExpenseIncome); filter.setColumnType(static_cast(7)); filter.setColumnsAreDays(true); filter.setName("Spending by Weeks"); @@ -887,7 +887,7 @@ // MyMoneyReport networth_r; - networth_r.setRowType(MyMoneyReport::eAssetLiability); + networth_r.setRowType(MyMoneyReport::Row::AssetLiability); networth_r.setDateFilter(QDate(2004, 1, 1), QDate(2004, 12, 31).addDays(-1)); XMLandback(networth_r); PivotTable networth(networth_r); @@ -940,7 +940,7 @@ BudgetHelper budget; budget += BudgetEntryHelper(QDate(2006, 1, 1), acSolo, false, MyMoneyMoney(100.0)); - MyMoneyReport report(MyMoneyReport::eBudgetActual, + MyMoneyReport report(MyMoneyReport::Row::BudgetActual, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::yearToDate, MyMoneyReport::eDetailTop, @@ -952,7 +952,7 @@ { BudgetHelper budget; budget += BudgetEntryHelper(QDate(2006, 1, 1), acParent, false, MyMoneyMoney(100.0)); - MyMoneyReport report(MyMoneyReport::eBudgetActual, + MyMoneyReport report(MyMoneyReport::Row::BudgetActual, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::yearToDate, MyMoneyReport::eDetailTop, @@ -968,7 +968,7 @@ { BudgetHelper budget; budget += BudgetEntryHelper(QDate(2006, 1, 1), acParent, true, MyMoneyMoney(100.0)); - MyMoneyReport report(MyMoneyReport::eBudgetActual, + MyMoneyReport report(MyMoneyReport::Row::BudgetActual, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::yearToDate, MyMoneyReport::eDetailTop , @@ -985,7 +985,7 @@ budget += BudgetEntryHelper(QDate(2006, 1, 1), acParent, false, MyMoneyMoney(100.0)); budget += BudgetEntryHelper(QDate(2006, 1, 1), acChild, false, MyMoneyMoney(100.0)); budget += BudgetEntryHelper(QDate(2006, 1, 1), acSecondChild, true, MyMoneyMoney(100.0)); - MyMoneyReport report(MyMoneyReport::eBudgetActual, + MyMoneyReport report(MyMoneyReport::Row::BudgetActual, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::yearToDate, MyMoneyReport::eDetailTop, @@ -1002,7 +1002,7 @@ { BudgetHelper budget; budget += BudgetEntryHelper(QDate(2006, 1, 1), acSolo, false, MyMoneyMoney(100.0)); - MyMoneyReport report(MyMoneyReport::eBudgetActual, + MyMoneyReport report(MyMoneyReport::Row::BudgetActual, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::yearToDate, MyMoneyReport::eDetailTop, @@ -1014,7 +1014,7 @@ void PivotTableTest::testHtmlEncoding() { MyMoneyReport filter; - filter.setRowType(MyMoneyReport::eAssetLiability); + filter.setRowType(MyMoneyReport::Row::AssetLiability); filter.setDateFilter(QDate(2004, 1, 1), QDate(2005, 1, 1).addDays(-1)); XMLandback(filter); PivotTable networth_f(filter); diff --git a/kmymoney/reports/querytable.cpp b/kmymoney/reports/querytable.cpp --- a/kmymoney/reports/querytable.cpp +++ b/kmymoney/reports/querytable.cpp @@ -259,27 +259,27 @@ void QueryTable::init() { switch (m_config.rowType()) { - case MyMoneyReport::eAccountByTopAccount: - case MyMoneyReport::eEquityType: - case MyMoneyReport::eAccountType: - case MyMoneyReport::eInstitution: + case MyMoneyReport::Row::AccountByTopAccount: + case MyMoneyReport::Row::EquityType: + case MyMoneyReport::Row::AccountType: + case MyMoneyReport::Row::Institution: constructAccountTable(); m_columns = "account"; break; - case MyMoneyReport::eAccount: + case MyMoneyReport::Row::Account: constructTransactionTable(); m_columns = "accountid,postdate"; break; - case MyMoneyReport::ePayee: - case MyMoneyReport::eTag: - case MyMoneyReport::eMonth: - case MyMoneyReport::eWeek: + case MyMoneyReport::Row::Payee: + case MyMoneyReport::Row::Tag: + case MyMoneyReport::Row::Month: + case MyMoneyReport::Row::Week: constructTransactionTable(); m_columns = "postdate,account"; break; - case MyMoneyReport::eCashFlow: + case MyMoneyReport::Row::CashFlow: constructSplitsTable(); m_columns = "postdate"; break; @@ -292,56 +292,56 @@ m_subtotal = "value"; switch (m_config.rowType()) { - case MyMoneyReport::eCashFlow: + case MyMoneyReport::Row::CashFlow: m_group = "categorytype,topcategory,category"; break; - case MyMoneyReport::eCategory: + case MyMoneyReport::Row::Category: m_group = "categorytype,topcategory,category"; break; - case MyMoneyReport::eTopCategory: + case MyMoneyReport::Row::TopCategory: m_group = "categorytype,topcategory"; break; - case MyMoneyReport::eTopAccount: + case MyMoneyReport::Row::TopAccount: m_group = "topaccount,account"; break; - case MyMoneyReport::eAccount: + case MyMoneyReport::Row::Account: m_group = "account"; break; - case MyMoneyReport::eAccountReconcile: + case MyMoneyReport::Row::AccountReconcile: m_group = "account,reconcileflag"; break; - case MyMoneyReport::ePayee: + case MyMoneyReport::Row::Payee: m_group = "payee"; break; - case MyMoneyReport::eTag: + case MyMoneyReport::Row::Tag: m_group = "tag"; break; - case MyMoneyReport::eMonth: + case MyMoneyReport::Row::Month: m_group = "month"; break; - case MyMoneyReport::eWeek: + case MyMoneyReport::Row::Week: m_group = "week"; break; - case MyMoneyReport::eAccountByTopAccount: + case MyMoneyReport::Row::AccountByTopAccount: m_group = "topaccount"; break; - case MyMoneyReport::eEquityType: + case MyMoneyReport::Row::EquityType: m_group = "equitytype"; break; - case MyMoneyReport::eAccountType: + case MyMoneyReport::Row::AccountType: m_group = "type"; break; - case MyMoneyReport::eInstitution: + case MyMoneyReport::Row::Institution: m_group = "institution,topaccount"; break; default: throw MYMONEYEXCEPTION("QueryTable::QueryTable(): unhandled row type"); } QString sort; switch (m_config.rowType()) { - case MyMoneyReport::eMonth: - case MyMoneyReport::eWeek: + case MyMoneyReport::Row::Month: + case MyMoneyReport::Row::Week: sort = m_group + "sort," + m_columns + ",id,rank"; break; @@ -351,10 +351,10 @@ } switch (m_config.rowType()) { - case MyMoneyReport::eAccountByTopAccount: - case MyMoneyReport::eEquityType: - case MyMoneyReport::eAccountType: - case MyMoneyReport::eInstitution: + case MyMoneyReport::Row::AccountByTopAccount: + case MyMoneyReport::Row::EquityType: + case MyMoneyReport::Row::AccountType: + case MyMoneyReport::Row::Institution: m_columns = "account"; break; @@ -415,18 +415,18 @@ bool tag_special_case = false; switch (m_config.rowType()) { - case MyMoneyReport::eCategory: - case MyMoneyReport::eTopCategory: + case MyMoneyReport::Row::Category: + case MyMoneyReport::Row::TopCategory: use_summary = false; use_transfers = false; hide_details = false; break; - case MyMoneyReport::ePayee: + case MyMoneyReport::Row::Payee: use_summary = false; use_transfers = false; hide_details = (m_config.detailLevel() == MyMoneyReport::eDetailNone); break; - case MyMoneyReport::eTag: + case MyMoneyReport::Row::Tag: use_summary = false; use_transfers = false; hide_details = (m_config.detailLevel() == MyMoneyReport::eDetailNone); @@ -843,8 +843,8 @@ // now run through our accts list and add opening and closing balances switch (m_config.rowType()) { - case MyMoneyReport::eAccount: - case MyMoneyReport::eTopAccount: + case MyMoneyReport::Row::Account: + case MyMoneyReport::Row::TopAccount: break; // case MyMoneyReport::eCategory: @@ -1474,8 +1474,8 @@ // now run through our accts list and add opening and closing balances switch (m_config.rowType()) { - case MyMoneyReport::eAccount: - case MyMoneyReport::eTopAccount: + case MyMoneyReport::Row::Account: + case MyMoneyReport::Row::TopAccount: break; // case MyMoneyReport::eCategory: diff --git a/kmymoney/reports/querytabletest.cpp b/kmymoney/reports/querytabletest.cpp --- a/kmymoney/reports/querytabletest.cpp +++ b/kmymoney/reports/querytabletest.cpp @@ -107,7 +107,7 @@ unsigned cols; MyMoneyReport filter; - filter.setRowType(MyMoneyReport::eCategory); + filter.setRowType(MyMoneyReport::Row::Category); cols = MyMoneyReport::QueryColumns::Number | MyMoneyReport::QueryColumns::Payee | MyMoneyReport::QueryColumns::Account; filter.setQueryColumns(static_cast(cols)); // filter.setName("Transactions by Category"); @@ -132,7 +132,7 @@ QVERIFY(searchHTML(html, i18nc("Total balance", "Total") + " Solo") == -(moSolo) * 3); QVERIFY(searchHTML(html, i18nc("Total balance", "Total") + " Expense") == -(moParent1 + moParent2 + moSolo + moChild) * 3); QVERIFY(searchHTML(html, i18nc("Grand total balance", "Grand Total")) == -(moParent1 + moParent2 + moSolo + moChild) * 3 + moCheckingOpen + moCreditOpen); - filter.setRowType(MyMoneyReport::eTopCategory); + filter.setRowType(MyMoneyReport::Row::TopCategory); cols = MyMoneyReport::QueryColumns::Number | MyMoneyReport::QueryColumns::Payee | MyMoneyReport::QueryColumns::Account; filter.setQueryColumns(static_cast(cols)); // filter.setName("Transactions by Top Category"); @@ -160,7 +160,7 @@ QVERIFY(searchHTML(html, i18nc("Total balance", "Total") + " Expense") == -(moParent1 + moParent2 + moSolo + moChild) * 3); QVERIFY(searchHTML(html, i18nc("Grand total balance", "Grand Total")) == -(moParent1 + moParent2 + moSolo + moChild) * 3 + moCheckingOpen + moCreditOpen); - filter.setRowType(MyMoneyReport::eAccount); + filter.setRowType(MyMoneyReport::Row::Account); filter.setName("Transactions by Account"); cols = MyMoneyReport::QueryColumns::Number | MyMoneyReport::QueryColumns::Payee | MyMoneyReport::QueryColumns::Category; filter.setQueryColumns(static_cast(cols)); // @@ -194,7 +194,7 @@ QVERIFY(searchHTML(html, i18nc("Total balance for credit card", "Total") + " Credit Card") == -(moParent1 + moParent2 + moChild) * 3 + moCreditOpen); QVERIFY(searchHTML(html, i18nc("Grand total balance", "Grand Total")) == -(moParent1 + moParent2 + moSolo + moChild) * 3 + moCheckingOpen + moCreditOpen); - filter.setRowType(MyMoneyReport::ePayee); + filter.setRowType(MyMoneyReport::Row::Payee); filter.setName("Transactions by Payee"); cols = MyMoneyReport::QueryColumns::Number | MyMoneyReport::QueryColumns::Memo | MyMoneyReport::QueryColumns::Category; filter.setQueryColumns(static_cast(cols)); // @@ -220,7 +220,7 @@ QVERIFY(searchHTML(html, i18nc("Total balance", "Total") + " Test Payee") == -(moParent1 + moParent2 + moSolo + moChild) * 3); QVERIFY(searchHTML(html, i18nc("Grand total balance", "Grand Total")) == -(moParent1 + moParent2 + moSolo + moChild) * 3 + moCheckingOpen + moCreditOpen); - filter.setRowType(MyMoneyReport::eMonth); + filter.setRowType(MyMoneyReport::Row::Month); filter.setName("Transactions by Month"); cols = MyMoneyReport::QueryColumns::Number | MyMoneyReport::QueryColumns::Payee | MyMoneyReport::QueryColumns::Category; filter.setQueryColumns(static_cast(cols)); // @@ -248,7 +248,7 @@ QVERIFY(searchHTML(html, i18nc("Total balance", "Total") + " Month of 2004-05-01") == -moParent1 + moCheckingOpen); QVERIFY(searchHTML(html, i18nc("Grand total balance", "Grand Total")) == -(moParent1 + moParent2 + moSolo + moChild) * 3 + moCheckingOpen + moCreditOpen); - filter.setRowType(MyMoneyReport::eWeek); + filter.setRowType(MyMoneyReport::Row::Week); filter.setName("Transactions by Week"); cols = MyMoneyReport::QueryColumns::Number | MyMoneyReport::QueryColumns::Payee | MyMoneyReport::QueryColumns::Category; filter.setQueryColumns(static_cast(cols)); // @@ -337,7 +337,7 @@ // MyMoneyReport filter; - filter.setRowType(MyMoneyReport::eInstitution); + filter.setRowType(MyMoneyReport::Row::Institution); filter.setName("Accounts by Institution (No transactions)"); XMLandback(filter); QueryTable qtbl_1(filter); @@ -377,7 +377,7 @@ TransactionHelper t3y2(QDate(2005, 9, 1), MyMoneySplit::ActionWithdrawal, moParent2, acCredit, acParent); TransactionHelper t4y2(QDate(2004, 11, 7), MyMoneySplit::ActionWithdrawal, moChild, acCredit, acChild); - filter.setRowType(MyMoneyReport::eInstitution); + filter.setRowType(MyMoneyReport::Row::Institution); filter.setName("Accounts by Institution (With Transactions)"); XMLandback(filter); QueryTable qtbl_2(filter); @@ -397,7 +397,7 @@ // Account TYPES // - filter.setRowType(MyMoneyReport::eAccountType); + filter.setRowType(MyMoneyReport::Row::AccountType); filter.setName("Accounts by Type"); XMLandback(filter); QueryTable qtbl_3(filter); @@ -452,7 +452,7 @@ // MyMoneyReport invtran_r( - MyMoneyReport::eTopAccount, + MyMoneyReport::Row::TopAccount, MyMoneyReport::QueryColumns::Action | MyMoneyReport::QueryColumns::Shares | MyMoneyReport::QueryColumns::Price, MyMoneyTransactionFilter::userDefined, MyMoneyReport::eDetailAll, @@ -544,7 +544,7 @@ // MyMoneyReport invhold_r( - MyMoneyReport::eAccountByTopAccount, + MyMoneyReport::Row::AccountByTopAccount, MyMoneyReport::QueryColumns::Performance, MyMoneyTransactionFilter::userDefined, MyMoneyReport::eDetailAll, @@ -613,7 +613,7 @@ MyMoneyReport filter; - filter.setRowType(MyMoneyReport::eAccount); + filter.setRowType(MyMoneyReport::Row::Account); filter.setName("Transactions by Account"); cols = MyMoneyReport::QueryColumns::Number | MyMoneyReport::QueryColumns::Payee | MyMoneyReport::QueryColumns::Category | MyMoneyReport::QueryColumns::Balance; filter.setQueryColumns(static_cast(cols)); // @@ -675,7 +675,7 @@ MyMoneyReport filter; - filter.setRowType(MyMoneyReport::eAccount); + filter.setRowType(MyMoneyReport::Row::Account); filter.setName("Transactions by Account"); cols = MyMoneyReport::QueryColumns::Number | MyMoneyReport::QueryColumns::Payee | MyMoneyReport::QueryColumns::Category | MyMoneyReport::QueryColumns::Balance; filter.setQueryColumns(static_cast(cols)); @@ -769,7 +769,7 @@ unsigned cols; MyMoneyReport filter; - filter.setRowType(MyMoneyReport::eCategory); + filter.setRowType(MyMoneyReport::Row::Category); filter.setName("Tax Transactions"); cols = MyMoneyReport::QueryColumns::Number | MyMoneyReport::QueryColumns::Payee | MyMoneyReport::QueryColumns::Account; filter.setQueryColumns(static_cast(cols)); diff --git a/kmymoney/views/kforecastview.cpp b/kmymoney/views/kforecastview.cpp --- a/kmymoney/views/kforecastview.cpp +++ b/kmymoney/views/kforecastview.cpp @@ -1008,7 +1008,7 @@ MyMoneyReport::EDetailLevel detailLevel[4] = { MyMoneyReport::eDetailAll, MyMoneyReport::eDetailTop, MyMoneyReport::eDetailGroup, MyMoneyReport::eDetailTotal }; MyMoneyReport reportCfg = MyMoneyReport( - MyMoneyReport::eAssetLiability, + MyMoneyReport::Row::AssetLiability, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::userDefined, // overridden by the setDateFilter() call below detailLevel[m_comboDetail->currentIndex()], diff --git a/kmymoney/views/khomeview.cpp b/kmymoney/views/khomeview.cpp --- a/kmymoney/views/khomeview.cpp +++ b/kmymoney/views/khomeview.cpp @@ -296,7 +296,7 @@ d->m_html += QString("
%1
\n
 
\n").arg(i18n("Net Worth Forecast")); MyMoneyReport reportCfg = MyMoneyReport( - MyMoneyReport::eAssetLiability, + MyMoneyReport::Row::AssetLiability, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::userDefined, // overridden by the setDateFilter() call below MyMoneyReport::eDetailTotal, @@ -1453,7 +1453,7 @@ //config report just like "Monthly Budgeted vs Actual MyMoneyReport reportCfg = MyMoneyReport( - MyMoneyReport::eBudgetActual, + MyMoneyReport::Row::BudgetActual, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::currentMonth, MyMoneyReport::eDetailAll, diff --git a/kmymoney/views/kreportsview.cpp b/kmymoney/views/kreportsview.cpp --- a/kmymoney/views/kreportsview.cpp +++ b/kmymoney/views/kreportsview.cpp @@ -1173,32 +1173,32 @@ ReportGroup list("Income and Expenses", i18n("Income and Expenses")); list.push_back(MyMoneyReport( - MyMoneyReport::eExpenseIncome, + MyMoneyReport::Row::ExpenseIncome, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::currentMonth, MyMoneyReport::eDetailAll, i18n("Income and Expenses This Month"), i18n("Default Report") )); list.push_back(MyMoneyReport( - MyMoneyReport::eExpenseIncome, + MyMoneyReport::Row::ExpenseIncome, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::yearToDate, MyMoneyReport::eDetailAll, i18n("Income and Expenses This Year"), i18n("Default Report") )); list.push_back(MyMoneyReport( - MyMoneyReport::eExpenseIncome, + MyMoneyReport::Row::ExpenseIncome, MyMoneyReport::Column::Years, MyMoneyTransactionFilter::allDates, MyMoneyReport::eDetailAll, i18n("Income and Expenses By Year"), i18n("Default Report") )); list.push_back(MyMoneyReport( - MyMoneyReport::eExpenseIncome, + MyMoneyReport::Row::ExpenseIncome, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::last12Months, MyMoneyReport::eDetailTop, @@ -1210,7 +1210,7 @@ list.back().setChartDataLabels(false); list.push_back(MyMoneyReport( - MyMoneyReport::eExpenseIncome, + MyMoneyReport::Row::ExpenseIncome, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::yearToDate, MyMoneyReport::eDetailGroup, @@ -1227,31 +1227,31 @@ ReportGroup list("Net Worth", i18n("Net Worth")); list.push_back(MyMoneyReport( - MyMoneyReport::eAssetLiability, + MyMoneyReport::Row::AssetLiability, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::yearToDate, MyMoneyReport::eDetailTop, i18n("Net Worth By Month"), i18n("Default Report") )); list.push_back(MyMoneyReport( - MyMoneyReport::eAssetLiability, + MyMoneyReport::Row::AssetLiability, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::today, MyMoneyReport::eDetailTop, i18n("Net Worth Today"), i18n("Default Report") )); list.push_back(MyMoneyReport( - MyMoneyReport::eAssetLiability, + MyMoneyReport::Row::AssetLiability, MyMoneyReport::Column::Years, MyMoneyTransactionFilter::allDates, MyMoneyReport::eDetailTop, i18n("Net Worth By Year"), i18n("Default Report") )); list.push_back(MyMoneyReport( - MyMoneyReport::eAssetLiability, + MyMoneyReport::Row::AssetLiability, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::next7Days, MyMoneyReport::eDetailTop, @@ -1262,7 +1262,7 @@ list.back().setColumnsAreDays(true); list.push_back(MyMoneyReport( - MyMoneyReport::eAssetLiability, + MyMoneyReport::Row::AssetLiability, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::last12Months, MyMoneyReport::eDetailTotal, @@ -1274,16 +1274,16 @@ list.back().setChartType(MyMoneyReport::eChartLine); list.push_back(MyMoneyReport( - MyMoneyReport::eInstitution, + MyMoneyReport::Row::Institution, MyMoneyReport::QueryColumns::None, MyMoneyTransactionFilter::yearToDate, MyMoneyReport::eDetailTop, i18n("Account Balances by Institution"), i18n("Default Report") )); list.push_back(MyMoneyReport( - MyMoneyReport::eAccountType, + MyMoneyReport::Row::AccountType, MyMoneyReport::QueryColumns::None, MyMoneyTransactionFilter::yearToDate, MyMoneyReport::eDetailTop, @@ -1297,65 +1297,65 @@ ReportGroup list("Transactions", i18n("Transactions")); list.push_back(MyMoneyReport( - MyMoneyReport::eAccount, + MyMoneyReport::Row::Account, MyMoneyReport::QueryColumns::Number | MyMoneyReport::QueryColumns::Payee | MyMoneyReport::QueryColumns::Category | MyMoneyReport::QueryColumns::Tag | MyMoneyReport::QueryColumns::Balance, MyMoneyTransactionFilter::yearToDate, MyMoneyReport::eDetailAll, i18n("Transactions by Account"), i18n("Default Report") )); //list.back().setConvertCurrency(false); list.push_back(MyMoneyReport( - MyMoneyReport::eCategory, + MyMoneyReport::Row::Category, MyMoneyReport::QueryColumns::Number | MyMoneyReport::QueryColumns::Payee | MyMoneyReport::QueryColumns::Account | MyMoneyReport::QueryColumns::Tag, MyMoneyTransactionFilter::yearToDate, MyMoneyReport::eDetailAll, i18n("Transactions by Category"), i18n("Default Report") )); list.push_back(MyMoneyReport( - MyMoneyReport::ePayee, + MyMoneyReport::Row::Payee, MyMoneyReport::QueryColumns::Number | MyMoneyReport::QueryColumns::Category | MyMoneyReport::QueryColumns::Tag, MyMoneyTransactionFilter::yearToDate, MyMoneyReport::eDetailAll, i18n("Transactions by Payee"), i18n("Default Report") )); list.push_back(MyMoneyReport( - MyMoneyReport::eTag, + MyMoneyReport::Row::Tag, MyMoneyReport::QueryColumns::Number | MyMoneyReport::QueryColumns::Category, MyMoneyTransactionFilter::yearToDate, MyMoneyReport::eDetailAll, i18n("Transactions by Tag"), i18n("Default Report") )); list.push_back(MyMoneyReport( - MyMoneyReport::eMonth, + MyMoneyReport::Row::Month, MyMoneyReport::QueryColumns::Number | MyMoneyReport::QueryColumns::Payee | MyMoneyReport::QueryColumns::Category | MyMoneyReport::QueryColumns::Tag, MyMoneyTransactionFilter::yearToDate, MyMoneyReport::eDetailAll, i18n("Transactions by Month"), i18n("Default Report") )); list.push_back(MyMoneyReport( - MyMoneyReport::eWeek, + MyMoneyReport::Row::Week, MyMoneyReport::QueryColumns::Number | MyMoneyReport::QueryColumns::Payee | MyMoneyReport::QueryColumns::Category | MyMoneyReport::QueryColumns::Tag, MyMoneyTransactionFilter::yearToDate, MyMoneyReport::eDetailAll, i18n("Transactions by Week"), i18n("Default Report") )); list.push_back(MyMoneyReport( - MyMoneyReport::eAccount, + MyMoneyReport::Row::Account, MyMoneyReport::QueryColumns::Loan, MyMoneyTransactionFilter::allDates, MyMoneyReport::eDetailAll, i18n("Loan Transactions"), i18n("Default Report") )); list.back().setLoansOnly(true); list.push_back(MyMoneyReport( - MyMoneyReport::eAccountReconcile, + MyMoneyReport::Row::AccountReconcile, MyMoneyReport::QueryColumns::Number | MyMoneyReport::QueryColumns::Payee | MyMoneyReport::QueryColumns::Category | MyMoneyReport::QueryColumns::Balance, MyMoneyTransactionFilter::last3Months, MyMoneyReport::eDetailAll, @@ -1367,7 +1367,7 @@ { ReportGroup list("CashFlow", i18n("Cash Flow")); list.push_back(MyMoneyReport( - MyMoneyReport::eCashFlow, + MyMoneyReport::Row::CashFlow, MyMoneyReport::QueryColumns::Number | MyMoneyReport::QueryColumns::Payee | MyMoneyReport::QueryColumns::Account, MyMoneyTransactionFilter::yearToDate, MyMoneyReport::eDetailAll, @@ -1380,7 +1380,7 @@ ReportGroup list("Investments", i18n("Investments")); list.push_back(MyMoneyReport( - MyMoneyReport::eTopAccount, + MyMoneyReport::Row::TopAccount, MyMoneyReport::QueryColumns::Action | MyMoneyReport::QueryColumns::Shares | MyMoneyReport::QueryColumns::Price, MyMoneyTransactionFilter::yearToDate, MyMoneyReport::eDetailAll, @@ -1390,7 +1390,7 @@ list.back().setInvestmentsOnly(true); list.push_back(MyMoneyReport( - MyMoneyReport::eAccountByTopAccount, + MyMoneyReport::Row::AccountByTopAccount, MyMoneyReport::QueryColumns::Shares | MyMoneyReport::QueryColumns::Price, MyMoneyTransactionFilter::yearToDate, MyMoneyReport::eDetailAll, @@ -1400,7 +1400,7 @@ list.back().setInvestmentsOnly(true); list.push_back(MyMoneyReport( - MyMoneyReport::eEquityType, + MyMoneyReport::Row::EquityType, MyMoneyReport::QueryColumns::Shares | MyMoneyReport::QueryColumns::Price, MyMoneyTransactionFilter::yearToDate, MyMoneyReport::eDetailAll, @@ -1410,7 +1410,7 @@ list.back().setInvestmentsOnly(true); list.push_back(MyMoneyReport( - MyMoneyReport::eAccountByTopAccount, + MyMoneyReport::Row::AccountByTopAccount, MyMoneyReport::QueryColumns::Performance, MyMoneyTransactionFilter::yearToDate, MyMoneyReport::eDetailAll, @@ -1420,16 +1420,16 @@ list.back().setInvestmentsOnly(true); list.push_back(MyMoneyReport( - MyMoneyReport::eEquityType, + MyMoneyReport::Row::EquityType, MyMoneyReport::QueryColumns::Performance, MyMoneyTransactionFilter::yearToDate, MyMoneyReport::eDetailAll, i18n("Investment Performance by Type"), i18n("Default Report") )); list.back().setInvestmentsOnly(true); list.push_back(MyMoneyReport( - MyMoneyReport::eAssetLiability, + MyMoneyReport::Row::AssetLiability, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::today, MyMoneyReport::eDetailAll, @@ -1442,7 +1442,7 @@ list.back().setInvestmentsOnly(true); list.push_back(MyMoneyReport( - MyMoneyReport::eAssetLiability, + MyMoneyReport::Row::AssetLiability, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::last12Months, MyMoneyReport::eDetailAll, @@ -1456,7 +1456,7 @@ list.back().setInvestmentsOnly(true); list.push_back(MyMoneyReport( - MyMoneyReport::eAssetLiability, + MyMoneyReport::Row::AssetLiability, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::last12Months, MyMoneyReport::eDetailAll, @@ -1475,7 +1475,7 @@ list.back().setSkipZero(true); list.push_back(MyMoneyReport( - MyMoneyReport::eAssetLiability, + MyMoneyReport::Row::AssetLiability, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::last12Months, MyMoneyReport::eDetailAll, @@ -1494,7 +1494,7 @@ list.back().setChartDataLabels(false); list.push_back(MyMoneyReport( - MyMoneyReport::eAssetLiability, + MyMoneyReport::Row::AssetLiability, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::last30Days, MyMoneyReport::eDetailAll, @@ -1510,7 +1510,7 @@ list.back().setMovingAverageDays(10); list.push_back(MyMoneyReport( - MyMoneyReport::eAssetLiability, + MyMoneyReport::Row::AssetLiability, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::last30Days, MyMoneyReport::eDetailAll, @@ -1531,34 +1531,34 @@ ReportGroup list("Taxes", i18n("Taxes")); list.push_back(MyMoneyReport( - MyMoneyReport::eCategory, + MyMoneyReport::Row::Category, MyMoneyReport::QueryColumns::Number | MyMoneyReport::QueryColumns::Payee | MyMoneyReport::QueryColumns::Account, MyMoneyTransactionFilter::yearToDate, MyMoneyReport::eDetailAll, i18n("Tax Transactions by Category"), i18n("Default Report") )); list.back().setTax(true); list.push_back(MyMoneyReport( - MyMoneyReport::ePayee, + MyMoneyReport::Row::Payee, MyMoneyReport::QueryColumns::Number | MyMoneyReport::QueryColumns::Category | MyMoneyReport::QueryColumns::Account, MyMoneyTransactionFilter::yearToDate, MyMoneyReport::eDetailAll, i18n("Tax Transactions by Payee"), i18n("Default Report") )); list.back().setTax(true); list.push_back(MyMoneyReport( - MyMoneyReport::eCategory, + MyMoneyReport::Row::Category, MyMoneyReport::QueryColumns::Number | MyMoneyReport::QueryColumns::Payee | MyMoneyReport::QueryColumns::Account, MyMoneyTransactionFilter::lastFiscalYear, MyMoneyReport::eDetailAll, i18n("Tax Transactions by Category Last Fiscal Year"), i18n("Default Report") )); list.back().setTax(true); list.push_back(MyMoneyReport( - MyMoneyReport::ePayee, + MyMoneyReport::Row::Payee, MyMoneyReport::QueryColumns::Number | MyMoneyReport::QueryColumns::Category | MyMoneyReport::QueryColumns::Account, MyMoneyTransactionFilter::lastFiscalYear, MyMoneyReport::eDetailAll, @@ -1572,7 +1572,7 @@ ReportGroup list("Budgeting", i18n("Budgeting")); list.push_back(MyMoneyReport( - MyMoneyReport::eBudgetActual, + MyMoneyReport::Row::BudgetActual, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::yearToDate, MyMoneyReport::eDetailAll, @@ -1583,7 +1583,7 @@ list.back().setBudget("Any", true); list.push_back(MyMoneyReport( - MyMoneyReport::eBudgetActual, + MyMoneyReport::Row::BudgetActual, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::yearToMonth, MyMoneyReport::eDetailAll, @@ -1598,7 +1598,7 @@ } list.push_back(MyMoneyReport( - MyMoneyReport::eBudgetActual, + MyMoneyReport::Row::BudgetActual, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::currentMonth, MyMoneyReport::eDetailAll, @@ -1608,7 +1608,7 @@ list.back().setBudget("Any", true); list.push_back(MyMoneyReport( - MyMoneyReport::eBudgetActual, + MyMoneyReport::Row::BudgetActual, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::currentYear, MyMoneyReport::eDetailAll, @@ -1619,7 +1619,7 @@ list.back().setShowingRowTotals(true); list.push_back(MyMoneyReport( - MyMoneyReport::eBudget, + MyMoneyReport::Row::Budget, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::currentMonth, MyMoneyReport::eDetailAll, @@ -1629,7 +1629,7 @@ list.back().setBudget("Any", false); list.push_back(MyMoneyReport( - MyMoneyReport::eBudget, + MyMoneyReport::Row::Budget, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::currentYear, MyMoneyReport::eDetailAll, @@ -1639,7 +1639,7 @@ list.back().setBudget("Any", false); list.back().setShowingRowTotals(true); list.push_back(MyMoneyReport( - MyMoneyReport::eBudgetActual, + MyMoneyReport::Row::BudgetActual, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::currentYear, MyMoneyReport::eDetailGroup, @@ -1657,7 +1657,7 @@ ReportGroup list("Forecast", i18n("Forecast")); list.push_back(MyMoneyReport( - MyMoneyReport::eAssetLiability, + MyMoneyReport::Row::AssetLiability, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::next12Months, MyMoneyReport::eDetailTop, @@ -1667,7 +1667,7 @@ list.back().setIncludingForecast(true); list.push_back(MyMoneyReport( - MyMoneyReport::eAssetLiability, + MyMoneyReport::Row::AssetLiability, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::nextQuarter, MyMoneyReport::eDetailTop, @@ -1678,7 +1678,7 @@ list.back().setIncludingForecast(true); list.push_back(MyMoneyReport( - MyMoneyReport::eExpenseIncome, + MyMoneyReport::Row::ExpenseIncome, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::currentYear, MyMoneyReport::eDetailTop, @@ -1688,7 +1688,7 @@ list.back().setIncludingForecast(true); list.push_back(MyMoneyReport( - MyMoneyReport::eAssetLiability, + MyMoneyReport::Row::AssetLiability, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::next3Months, MyMoneyReport::eDetailTotal, @@ -1706,34 +1706,34 @@ ReportGroup list("Information", i18n("General Information")); list.push_back(MyMoneyReport( - MyMoneyReport::eSchedule, + MyMoneyReport::Row::Schedule, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::next12Months, MyMoneyReport::eDetailAll, i18n("Schedule Information"), i18n("Default Report") )); list.back().setDetailLevel(MyMoneyReport::eDetailAll); list.push_back(MyMoneyReport( - MyMoneyReport::eSchedule, + MyMoneyReport::Row::Schedule, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::next12Months, MyMoneyReport::eDetailAll, i18n("Schedule Summary Information"), i18n("Default Report") )); list.back().setDetailLevel(MyMoneyReport::eDetailTop); list.push_back(MyMoneyReport( - MyMoneyReport::eAccountInfo, + MyMoneyReport::Row::AccountInfo, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::today, MyMoneyReport::eDetailAll, i18n("Account Information"), i18n("Default Report") )); list.back().setConvertCurrency(false); list.push_back(MyMoneyReport( - MyMoneyReport::eAccountLoanInfo, + MyMoneyReport::Row::AccountLoanInfo, MyMoneyReport::Column::Months, MyMoneyTransactionFilter::today, MyMoneyReport::eDetailAll,