From: <gua...@us...> - 2012-02-15 06:09:40
|
Revision: 1802 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1802&view=rev Author: guanlisheng Date: 2012-02-15 06:09:34 +0000 (Wed, 15 Feb 2012) Log Message: ----------- cleanup Modified Paths: -------------- trunk/mmex/src/mmtransaction.cpp trunk/mmex/src/mmtransaction.h Modified: trunk/mmex/src/mmtransaction.cpp =================================================================== --- trunk/mmex/src/mmtransaction.cpp 2012-02-15 05:32:36 UTC (rev 1801) +++ trunk/mmex/src/mmtransaction.cpp 2012-02-15 06:09:34 UTC (rev 1802) @@ -144,28 +144,28 @@ db_(core->db_), isInited_(false), updateRequired_(false) - { - date_ = mmGetStorageStringAsDate(q1.GetString(wxT("TRANSDATE"))); - transNum_ = q1.GetString(wxT("TRANSACTIONNUMBER")); - status_ = q1.GetString(wxT("STATUS")); - notes_ = q1.GetString(wxT("NOTES")); - transType_ = q1.GetString(wxT("TRANSCODE")); - accountID_ = q1.GetInt(wxT("ACCOUNTID")); - toAccountID_ = q1.GetInt(wxT("TOACCOUNTID")); - payee_ = core->getPayeeSharedPtr(q1.GetInt(wxT("PAYEEID"))); - amt_ = q1.GetDouble(wxT("TRANSAMOUNT")); - toAmt_ = q1.GetDouble(wxT("TOTRANSAMOUNT")); - category_ = core->getCategorySharedPtr(q1.GetInt(wxT("CATEGID")), q1.GetInt(wxT("SUBCATEGID"))); - - boost::shared_ptr<mmCurrency> pCurrencyPtr = core->accountList_.getCurrencyWeakPtr(accountID_).lock(); - wxASSERT(pCurrencyPtr); +{ + date_ = mmGetStorageStringAsDate(q1.GetString(wxT("TRANSDATE"))); + transNum_ = q1.GetString(wxT("TRANSACTIONNUMBER")); + status_ = q1.GetString(wxT("STATUS")); + notes_ = q1.GetString(wxT("NOTES")); + transType_ = q1.GetString(wxT("TRANSCODE")); + accountID_ = q1.GetInt(wxT("ACCOUNTID")); + toAccountID_ = q1.GetInt(wxT("TOACCOUNTID")); + payee_ = core->getPayeeSharedPtr(q1.GetInt(wxT("PAYEEID"))); + amt_ = q1.GetDouble(wxT("TRANSAMOUNT")); + toAmt_ = q1.GetDouble(wxT("TOTRANSAMOUNT")); + category_ = core->getCategorySharedPtr(q1.GetInt(wxT("CATEGID")), q1.GetInt(wxT("SUBCATEGID"))); - splitEntries_ = boost::shared_ptr<mmSplitTransactionEntries>(new mmSplitTransactionEntries()); - getSplitTransactions(core, splitEntries_.get()); + boost::shared_ptr<mmCurrency> pCurrencyPtr = core->accountList_.getCurrencyWeakPtr(accountID_).lock(); + wxASSERT(pCurrencyPtr); - updateAllData(core, accountID_, pCurrencyPtr); - } + splitEntries_ = boost::shared_ptr<mmSplitTransactionEntries>(new mmSplitTransactionEntries()); + getSplitTransactions(core, splitEntries_.get()); + updateAllData(core, accountID_, pCurrencyPtr); +} + void mmBankTransaction::updateAllData(mmCoreDB* core, int accountID, boost::shared_ptr<mmCurrency> currencyPtr, @@ -611,11 +611,9 @@ mmOptions::instance().databaseUpdated_ = true; } -boost::shared_ptr<mmBankTransaction> mmBankTransactionList::getBankTransactionPtr -(int accountID, int transactionID) const +boost::shared_ptr<mmBankTransaction> mmBankTransactionList::getBankTransactionPtr(int accountID, int transactionID) const { - std::vector< boost::shared_ptr<mmBankTransaction> >::const_iterator i; - for (i = transactions_.begin(); i!= transactions_.end(); ++ i) + for (const_iterator i = transactions_.begin(); i!= transactions_.end(); ++ i) { boost::shared_ptr<mmBankTransaction> pBankTransaction = *i; if (pBankTransaction) @@ -633,11 +631,9 @@ return boost::shared_ptr<mmBankTransaction> (); } -boost::shared_ptr<mmBankTransaction> mmBankTransactionList::getBankTransactionPtr -(int transactionID) const +boost::shared_ptr<mmBankTransaction> mmBankTransactionList::getBankTransactionPtr(int transactionID) const { - std::vector< boost::shared_ptr<mmBankTransaction> >::const_iterator i; - for (i = transactions_.begin(); i!= transactions_.end(); ++ i) + for (const_iterator i = transactions_.begin(); i!= transactions_.end(); ++ i) { boost::shared_ptr<mmBankTransaction> pBankTransaction = *i; if (pBankTransaction) @@ -656,8 +652,7 @@ void mmBankTransactionList::updateAllTransactions() { // We need to update all transactions incase of errors when loading - std::vector< boost::shared_ptr<mmBankTransaction> >::const_iterator i; - for (i = transactions_.begin(); i != transactions_.end(); i++ ) + for (const_iterator i = transactions_.begin(); i != transactions_.end(); i++ ) { boost::shared_ptr<mmBankTransaction> pBankTransaction = *i; if (pBankTransaction && pBankTransaction->updateRequired_) @@ -673,8 +668,7 @@ int subCategID) { // We need to update all transactions incase of errors when loading - std::vector< boost::shared_ptr<mmBankTransaction> >::const_iterator i; - for (i = transactions_.begin(); i != transactions_.end(); i++ ) + for (const_iterator i = transactions_.begin(); i != transactions_.end(); i++ ) { boost::shared_ptr<mmBankTransaction> pBankTransaction = *i; if (pBankTransaction && (pBankTransaction->categID_ == categID) @@ -705,8 +699,7 @@ int mmBankTransactionList::updateAllTransactionsForPayee(mmCoreDB* core, int payeeID) { // We need to update all transactions incase of errors when loading - std::vector< boost::shared_ptr<mmBankTransaction> >::const_iterator i; - for (i = transactions_.begin(); i != transactions_.end(); i++ ) + for (const_iterator i = transactions_.begin(); i != transactions_.end(); i++ ) { boost::shared_ptr<mmBankTransaction> pBankTransaction = *i; if (pBankTransaction && (pBankTransaction->payeeID_ == payeeID)) @@ -727,8 +720,7 @@ void mmBankTransactionList::getExpensesIncome(int accountID, double& expenses, double& income, bool ignoreDate, const wxDateTime &dtBegin, const wxDateTime &dtEnd, bool ignoreFuture) const { - std::vector< boost::shared_ptr<mmBankTransaction> >::const_iterator i; - for (i = transactions_.begin(); i != transactions_.end(); i++ ) + for (const_iterator i = transactions_.begin(); i != transactions_.end(); i++ ) { boost::shared_ptr<const mmBankTransaction> pBankTransaction = *i; if (pBankTransaction) @@ -771,9 +763,7 @@ void mmBankTransactionList::getTransactionStats(int accountID, int& number, bool ignoreDate, const wxDateTime &dtBegin, const wxDateTime &dtEnd, bool ignoreFuture) const { - std::vector<boost::shared_ptr<mmBankTransaction> >::const_iterator i; - - for (i = transactions_.begin(); i != transactions_.end(); ++i) + for (const_iterator i = transactions_.begin(); i != transactions_.end(); ++i) { boost::shared_ptr<const mmBankTransaction> pBankTransaction = *i; @@ -815,8 +805,7 @@ const wxDateTime &dtBegin, const wxDateTime &dtEnd, bool ignoreFuture) const { double amt = 0.0; - std::vector< boost::shared_ptr<mmBankTransaction> >::const_iterator i; - for (i = transactions_.begin(); i != transactions_.end(); i++ ) + for (const_iterator i = transactions_.begin(); i != transactions_.end(); i++ ) { boost::shared_ptr<const mmBankTransaction> pBankTransaction = *i; if (pBankTransaction) @@ -870,10 +859,7 @@ { double amt = 0.0; - for (std::vector<boost::shared_ptr<mmBankTransaction> >::const_iterator i = transactions_.begin(); - i != transactions_.end(); - i++ - ) + for (const_iterator i = transactions_.begin(); i != transactions_.end(); i++) { boost::shared_ptr<const mmBankTransaction> pBankTransaction = *i; @@ -931,8 +917,7 @@ { double balance = 0.0; wxDateTime now = wxDateTime::Now(); - std::vector< boost::shared_ptr<mmBankTransaction> >::const_iterator i; - for (i = transactions_.begin(); i != transactions_.end(); i++ ) + for (const_iterator i = transactions_.begin(); i != transactions_.end(); i++ ) { boost::shared_ptr<mmBankTransaction> pBankTransaction = *i; if (pBankTransaction) @@ -978,8 +963,7 @@ { wxDateTime now = wxDateTime::Now(); double convRate = mmDBWrapper::getCurrencyBaseConvRate(db_.get(), accountID); - std::vector< boost::shared_ptr<mmBankTransaction> >::const_iterator i; - for (i = transactions_.begin(); i != transactions_.end(); i++ ) + for (const_iterator i = transactions_.begin(); i != transactions_.end(); i++ ) { boost::shared_ptr<mmBankTransaction> pBankTransaction = *i; if (pBankTransaction) @@ -1030,8 +1014,7 @@ double mmBankTransactionList::getReconciledBalance(int accountID, bool ignoreFuture) const { double balance = 0.0; - std::vector< boost::shared_ptr<mmBankTransaction> >::const_iterator i; - for (i = transactions_.begin(); i != transactions_.end(); i++ ) + for (const_iterator i = transactions_.begin(); i != transactions_.end(); i++ ) { boost::shared_ptr<mmBankTransaction> pBankTransaction = *i; if (pBankTransaction) @@ -1077,8 +1060,7 @@ int mmBankTransactionList::countFollowupTransactions() const { int numFollowup = 0; - std::vector< boost::shared_ptr<mmBankTransaction> >::const_iterator i; - for (i = transactions_.begin(); i != transactions_.end(); i++ ) + for (const_iterator i = transactions_.begin(); i != transactions_.end(); i++ ) { boost::shared_ptr<mmBankTransaction> pBankTransaction = *i; if (pBankTransaction) Modified: trunk/mmex/src/mmtransaction.h =================================================================== --- trunk/mmex/src/mmtransaction.h 2012-02-15 05:32:36 UTC (rev 1801) +++ trunk/mmex/src/mmtransaction.h 2012-02-15 06:09:34 UTC (rev 1802) @@ -174,6 +174,7 @@ int updateAllTransactionsForPayee(mmCoreDB* core, int payeeID); /* Data */ + typedef std::vector< boost::shared_ptr<mmBankTransaction> >::const_iterator const_iterator; std::vector< boost::shared_ptr<mmBankTransaction> > transactions_; private: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |