From: <gua...@us...> - 2013-10-06 06:04:47
|
Revision: 4742 http://sourceforge.net/p/moneymanagerex/code/4742 Author: guanlisheng Date: 2013-10-06 06:04:44 +0000 (Sun, 06 Oct 2013) Log Message: ----------- cleanup categoryList_ Modified Paths: -------------- trunk/src/mmex.cpp Modified: trunk/src/mmex.cpp =================================================================== --- trunk/src/mmex.cpp 2013-10-06 05:58:43 UTC (rev 4741) +++ trunk/src/mmex.cpp 2013-10-06 06:04:44 UTC (rev 4742) @@ -908,9 +908,11 @@ th.toAmt_ = q1.TOTRANSAMOUNT; th.notes_ = q1.NOTES; th.categID_ = q1.CATEGID; - th.categoryStr_ = m_core.get()->categoryList_.GetCategoryName(th.categID_); + Model_Category::Data* category = Model_Category::instance().get(q1.CATEGID); + th.categoryStr_ = category->CATEGNAME; th.subcategID_ = q1.SUBCATEGID; - th.subcategoryStr_ = m_core.get()->categoryList_.GetSubCategoryName(th.categID_, th.subcategID_); + Model_Subcategory::Data* sub_category = Model_Subcategory::instance().get(q1.SUBCATEGID); + th.subcategoryStr_ = Model_Category::full_name(category, sub_category); // DeMultiplex the Auto Executable fields from the db entry: REPEATS int repeats = q1.REPEATS; @@ -994,7 +996,7 @@ tran.notes_ = th.notes_; tran.categID_ = th.categID_; tran.subcategID_ = th.subcategID_; - tran.fullCatStr_ = m_core->categoryList_.GetFullCategoryString(th.categID_, th.subcategID_); + tran.fullCatStr_ = Model_Category::full_name(category, sub_category); tran.date_ = th.nextOccurDate_; tran.toAmt_ = th.toAmt_; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |