From: <gua...@us...> - 2013-09-17 23:38:12
|
Revision: 4504 http://sourceforge.net/p/moneymanagerex/code/4504 Author: guanlisheng Date: 2013-09-17 23:38:10 +0000 (Tue, 17 Sep 2013) Log Message: ----------- format Modified Paths: -------------- trunk/src/mmex.cpp trunk/src/model/Model.h trunk/src/model/Model_Budgetyear.h trunk/src/model/Model_Currency.h trunk/src/model/Model_Infotable.h trunk/src/model/Model_Setting.h Modified: trunk/src/mmex.cpp =================================================================== --- trunk/src/mmex.cpp 2013-09-17 23:20:00 UTC (rev 4503) +++ trunk/src/mmex.cpp 2013-09-17 23:38:10 UTC (rev 4504) @@ -153,7 +153,7 @@ app->m_setting_db = new wxSQLite3Database(); app->m_setting_db->Open(mmex::getPathUser(mmex::SETTINGS)); - Model_Setting::instance().db_ = app->m_setting_db; + Model_Setting::instance(app->m_setting_db); /* Load Colors from Database */ mmLoadColorsFromDatabase(); @@ -980,7 +980,7 @@ */ void mmGUIFrame::saveSettings() { - Model_Setting::instance().db_->Begin(); + Model_Setting::instance().Begin(); m_core->db_.get()->Begin(); if (! fileName_.IsEmpty()) { @@ -1003,7 +1003,7 @@ Model_Setting::instance().Set("SIZEW", value_w); Model_Setting::instance().Set("SIZEH", value_h); Model_Setting::instance().Set("ISMAXIMIZED", (bool)this->IsMaximized()); - Model_Setting::instance().db_->Commit(); + Model_Setting::instance().Commit(); m_core->db_.get()->Commit(); } //---------------------------------------------------------------------------- @@ -2646,9 +2646,9 @@ Model_Account::instance(m_db.get()); Model_Payee::instance(m_db.get()); Model_Checking::instance(m_db.get()); - Model_Currency::instance().db_ = m_db.get(); - Model_Budgetyear::instance().db_ = m_db.get(); - Model_Infotable::instance().db_ = m_db.get(); + Model_Currency::instance(m_db.get()); + Model_Budgetyear::instance(m_db.get()); + Model_Infotable::instance(m_db.get()); // we need to check the db whether it is the right version if (!Model_Infotable::instance().checkDBVersion()) { @@ -2676,9 +2676,9 @@ password_ = password; Model_Asset::instance(m_db.get()); Model_Stock::instance(m_db.get()); - Model_Currency::instance().db_ = m_db.get(); - Model_Budgetyear::instance().db_ = m_db.get(); - Model_Infotable::instance().db_ = m_db.get(); + Model_Currency::instance(m_db.get()); + Model_Budgetyear::instance(m_db.get()); + Model_Infotable::instance(m_db.get()); m_core.reset(new mmCoreDB(m_db)); } @@ -2688,10 +2688,10 @@ password_ = password; Model_Asset::instance(m_db.get()); Model_Stock::instance(m_db.get()); - Model_Currency::instance().db_ = m_db.get(); + Model_Currency::instance(m_db.get()); Model_Currency::instance().all(); - Model_Budgetyear::instance().db_ = m_db.get(); - Model_Infotable::instance().db_ = m_db.get(); + Model_Budgetyear::instance(m_db.get()); + Model_Infotable::instance(m_db.get()); openDataBase(fileName); m_core.reset(new mmCoreDB(m_db)); Modified: trunk/src/model/Model.h =================================================================== --- trunk/src/model/Model.h 2013-09-17 23:20:00 UTC (rev 4503) +++ trunk/src/model/Model.h 2013-09-17 23:38:10 UTC (rev 4504) @@ -54,7 +54,7 @@ date.ParseISODate(str_date); // the date in ISO 8601 format "YYYY-MM-DD". return date; } -public: +protected: wxSQLite3Database* db_; }; #endif // Modified: trunk/src/model/Model_Budgetyear.h =================================================================== --- trunk/src/model/Model_Budgetyear.h 2013-09-17 23:20:00 UTC (rev 4503) +++ trunk/src/model/Model_Budgetyear.h 2013-09-17 23:38:10 UTC (rev 4504) @@ -35,7 +35,12 @@ { return Singleton<Model_Budgetyear>::instance(); } - + static Model_Budgetyear& instance(wxSQLite3Database* db) + { + Model_Budgetyear& ins = Singleton<Model_Budgetyear>::instance(); + ins.db_ = db; + return ins; + } Data_Set all(COLUMN col = COLUMN(0), bool asc = true) { this->ensure(this->db_); Modified: trunk/src/model/Model_Currency.h =================================================================== --- trunk/src/model/Model_Currency.h 2013-09-17 23:20:00 UTC (rev 4503) +++ trunk/src/model/Model_Currency.h 2013-09-17 23:38:10 UTC (rev 4504) @@ -34,6 +34,12 @@ { return Singleton<Model_Currency>::instance(); } + static Model_Currency& instance(wxSQLite3Database* db) + { + Model_Currency& ins = Singleton<Model_Currency>::instance(); + ins.db_ = db; + return ins; + } public: Data_Set all(COLUMN col = COLUMN(0), bool asc = true) Modified: trunk/src/model/Model_Infotable.h =================================================================== --- trunk/src/model/Model_Infotable.h 2013-09-17 23:20:00 UTC (rev 4503) +++ trunk/src/model/Model_Infotable.h 2013-09-17 23:38:10 UTC (rev 4504) @@ -37,6 +37,12 @@ { return Singleton<Model_Infotable>::instance(); } + static Model_Infotable& instance(wxSQLite3Database* db) + { + Model_Infotable& ins = Singleton<Model_Infotable>::instance(); + ins.db_ = db; + return ins; + } private: Data_Set all(COLUMN col = COLUMN(0), bool asc = true) Modified: trunk/src/model/Model_Setting.h =================================================================== --- trunk/src/model/Model_Setting.h 2013-09-17 23:20:00 UTC (rev 4503) +++ trunk/src/model/Model_Setting.h 2013-09-17 23:38:10 UTC (rev 4504) @@ -35,6 +35,12 @@ { return Singleton<Model_Setting>::instance(); } + static Model_Setting& instance(wxSQLite3Database* db) + { + Model_Setting& ins = Singleton<Model_Setting>::instance(); + ins.db_ = db; + return ins; + } public: Data_Set all(COLUMN col = COLUMN(0), bool asc = true) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |