[Moneymanagerex-commits] SF.net SVN: moneymanagerex:[1688] trunk/mmex/src/reportcashflow.cpp

[<gua...@us...>]

Revision: 1688
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1688&view=rev
Author:   guanlisheng
Date:     2012-01-21 02:47:54 +0000 (Sat, 21 Jan 2012)
Log Message:
-----------
cash flow report: more changes

Modified Paths:
--------------
    trunk/mmex/src/reportcashflow.cpp

Modified: trunk/mmex/src/reportcashflow.cpp
===================================================================
--- trunk/mmex/src/reportcashflow.cpp	2012-01-21 01:33:39 UTC (rev 1687)
+++ trunk/mmex/src/reportcashflow.cpp	2012-01-21 02:47:54 UTC (rev 1688)
@@ -88,36 +88,39 @@
     std::map<wxDateTime, double> daily_balance;
           
     for (int iAdx = 0; iAdx < (int) core_->accountList_.accounts_.size(); iAdx++)
+    for (std::vector<boost::shared_ptr<mmAccount> >::const_iterator it = core_->accountList_.accounts_.begin();
+        it != core_->accountList_.accounts_.end();
+        ++ it)
     {
-		//XXX
-		if (activeBankAccounts_)
-		{
-			mmCheckingAccount* pCA = dynamic_cast<mmCheckingAccount*>(core_->accountList_.accounts_[iAdx].get());
-			if (pCA)
-			{
-				if (pCA->status_ != pCA->MMEX_Closed)
-				{
-					// Check if this account belongs in our list
-					if (accountArray_ != NULL)
-					{
-						if (wxNOT_FOUND == accountArray_->Index(pCA->accountName_)) //linear search
-							continue; // skip account
-					}
+        //XXX
+        if (activeBankAccounts_)
+        {
+            mmCheckingAccount* pCA = dynamic_cast<mmCheckingAccount*>(it->get());
+            if (pCA)
+            {
+                if (pCA->status_ != pCA->MMEX_Closed)
+                {
+                    // Check if this account belongs in our list
+                    if (accountArray_ != NULL)
+                    {
+                        if (wxNOT_FOUND == accountArray_->Index(pCA->accountName_)) //linear search
+                            continue; // skip account
+                    }
 
-					core_->bTransactionList_.getDailyBalance(pCA->accountID_, daily_balance);
+                    core_->bTransactionList_.getDailyBalance(pCA->accountID_, daily_balance);
 
-					boost::shared_ptr<mmCurrency> pCurrencyPtr = core_->accountList_.getCurrencyWeakPtr(pCA->accountID_).lock();
-					wxASSERT(pCurrencyPtr);
-					mmex::CurrencyFormatter::instance().loadSettings(*pCurrencyPtr);
-					double rate = pCurrencyPtr->baseConv_;
-					tInitialBalance += pCA->initialBalance_ * rate;
-				}
-			}
-		}
+                    boost::shared_ptr<mmCurrency> pCurrencyPtr = core_->accountList_.getCurrencyWeakPtr(pCA->accountID_).lock();
+                    wxASSERT(pCurrencyPtr);
+                    mmex::CurrencyFormatter::instance().loadSettings(*pCurrencyPtr);
+                    double rate = pCurrencyPtr->baseConv_;
+                    tInitialBalance += pCA->initialBalance_ * rate;
+                }
+            }
+        }
 
         if (activeTermAccounts_) // Add Term accounts to cashflows as well
         {
-            mmTermAccount* pTA = dynamic_cast<mmTermAccount*>(core_->accountList_.accounts_[iAdx].get());
+            mmTermAccount* pTA = dynamic_cast<mmTermAccount*>(it->get());
             if (pTA)
             {
                 if (pTA->status_ != pTA->MMEX_Closed)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.