Trade: Moves static method from Account to TradeHistoryStatic struct

Account.mqh

@@ -449,7 +449,7 @@ class Account {
    */
   static double CalcInitDeposit() {
     double deposit = AccountInfoDouble(ACCOUNT_BALANCE);
-    for (int i = Account::OrdersHistoryTotal() - 1; i >= 0; i--) {
+    for (int i = TradeHistoryStatic::HistoryOrdersTotal() - 1; i >= 0; i--) {
       if (!Order::TryOrderSelect(i, SELECT_BY_POS, MODE_HISTORY)) continue;
       int type = Order::OrderType();
       // Initial balance not considered.
@@ -467,18 +467,6 @@ class Account {
     return deposit;
   }
 
-  /**
-   * Returns the number of closed orders in the account history loaded into the terminal.
-   */
-  static int OrdersHistoryTotal() {
-#ifdef __MQL4__
-    return ::OrdersHistoryTotal();
-#else
-    ::HistorySelect(0, TimeCurrent());
-    return ::HistoryOrdersTotal();
-#endif
-  }
-
   /**
    * Calculate total profit.
    */

Orders.mqh

@@ -465,7 +465,7 @@ class Orders {
     last_time.sell_time = 0;
     //---
 #ifdef __MQL4__
-    int orders_total = Account::OrdersHistoryTotal();
+    int orders_total = TradeHistoryStatic::HistoryOrdersTotal();
     for (int i = orders_total - 1; i >= 0; i--) {
       if (!Order::TryOrderSelect(i, SELECT_BY_POS, MODE_HISTORY)) {
         return (false);

SummaryReport.mqh

@@ -24,6 +24,7 @@
 #include "Convert.mqh"
 #include "Orders.mqh"
 #include "Terminal.mqh"
+#include "Trade.mqh"
 
 /**
  * Class to provide a summary report.
@@ -143,7 +144,7 @@ class SummaryReport {
       int    sequence = 0, profitseqs = 0, loss_seqs = 0;
       double sequential = 0.0, prev_profit = EMPTY_VALUE, dd_pct, drawdown;
       double max_peak = init_deposit, min_peak = init_deposit, balance = init_deposit;
-      int    trades_total = Account::OrdersHistoryTotal();
+      int    trades_total = TradeHistoryStatic::HistoryOrdersTotal();
       double profit;
 
       // Initialize summaries.

Trade.mqh

@@ -64,10 +64,11 @@ class Trade {
   /**
    * Class constructor.
    */
-  Trade() : order_last(NULL) { SetName(); };
+  Trade() : order_last(NULL) { SetName(); OrdersLoadByMagic(); };
   Trade(TradeParams &_tparams, ChartParams &_cparams)
     : chart(_cparams), tparams(_tparams), order_last(NULL) {
     SetName();
+    OrdersLoadByMagic();
   };
 
   /**
@@ -435,7 +436,7 @@ CDealInfo deal;
 HistorySelect(0, TimeCurrent()); // Select history for access.
 */
 #endif
-    int _orders = Account::OrdersHistoryTotal();
+    int _orders = TradeHistoryStatic::HistoryOrdersTotal();
     for (int i = _orders - 1; i >= fmax(0, _orders - ols_orders); i--) {
 #ifdef __MQL5__
       /* @fixme: Rewrite without using CDealInfo.
@@ -591,6 +592,13 @@ HistorySelect(0, TimeCurrent()); // Select history for access.
     return _result;
   }
 
+  /**
+   * Load orders by magic number.
+   */
+  bool OrdersLoadByMagic() {
+    return true;
+  }
+
   /**
    * Returns the number of market and pending orders.
    *

Trade.struct.h

@@ -341,3 +341,20 @@ struct TradeStates {
     return SerializerNodeObject;
   }
 };
+
+// Structure for trade history static methods.
+struct TradeHistoryStatic {
+
+  /**
+   * Returns the number of closed orders in the account history loaded into the terminal.
+   */
+  static int HistoryOrdersTotal() {
+#ifdef __MQL4__
+    return ::OrdersHistoryTotal();
+#else
+    ::HistorySelect(0, ::TimeCurrent()); // @todo: Use DateTimeStatic().
+    return ::HistoryOrdersTotal();
+#endif
+  }
+
+};