diff --git a/MtApi5/MqlTradeRequest.cs b/MtApi5/MqlTradeRequest.cs index 0910b769..64c0977f 100755 --- a/MtApi5/MqlTradeRequest.cs +++ b/MtApi5/MqlTradeRequest.cs @@ -1,6 +1,4 @@ using System; -using System.Linq; -using System.Text; namespace MtApi5 { @@ -8,7 +6,7 @@ namespace MtApi5 { public ENUM_TRADE_REQUEST_ACTIONS Action { get; set; } // Trade operation type public uint Magic { get; set; } // Expert Advisor ID (magic number) - public uint Order { get; set; } // Order ticket + public ulong Order { get; set; } // Order ticket public string Symbol { get; set; } // Trade symbol public double Volume { get; set; } // Requested volume for a deal in lots public double Price { get; set; } // Price diff --git a/MtApi5/MtConverters.cs b/MtApi5/MtConverters.cs index f1ed558a..73d355ee 100755 --- a/MtApi5/MtConverters.cs +++ b/MtApi5/MtConverters.cs @@ -1,13 +1,10 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using MTApiService; using System.Collections; namespace MtApi5 { - static class MtConverters + internal static class MtConverters { #region Values Converters public static Mt5Quote Parse(this MtQuote quote) @@ -17,29 +14,29 @@ namespace MtApi5 public static bool ParseResult(this string inputString, char separator, out MqlTradeResult result) { - bool retVal = false; + var retVal = false; result = null; if (string.IsNullOrEmpty(inputString) == false) { - string[] values = inputString.Split(separator); + var values = inputString.Split(separator); if (values.Length == 10) { try { retVal = int.Parse(values[0]) != 0; - uint retcode = uint.Parse(values[1]); - ulong deal = ulong.Parse(values[2]); - ulong order = ulong.Parse(values[3]); - double volume = double.Parse(values[4]); - double price = double.Parse(values[5]); - double bid = double.Parse(values[6]); - double ask = double.Parse(values[7]); - string comment = values[8]; - uint request_id = uint.Parse(values[9]); + var retcode = uint.Parse(values[1]); + var deal = ulong.Parse(values[2]); + var order = ulong.Parse(values[3]); + var volume = double.Parse(values[4]); + var price = double.Parse(values[5]); + var bid = double.Parse(values[6]); + var ask = double.Parse(values[7]); + var comment = values[8]; + var requestId = uint.Parse(values[9]); - result = new MqlTradeResult(retcode, deal, order, volume, price, bid, ask, comment, request_id); + result = new MqlTradeResult(retcode, deal, order, volume, price, bid, ask, comment, requestId); } catch (Exception) { @@ -52,28 +49,28 @@ namespace MtApi5 public static bool ParseResult(this string inputString, char separator, out MqlTradeCheckResult result) { - bool retVal = false; + var retVal = false; result = null; if (string.IsNullOrEmpty(inputString) == false) { - string[] values = inputString.Split(separator); + var values = inputString.Split(separator); if (values.Length == 10) { try { retVal = int.Parse(values[0]) != 0; - uint retcode = uint.Parse(values[1]); - double balance = double.Parse(values[2]); - double equity = double.Parse(values[3]); - double profit = double.Parse(values[4]); - double margin = double.Parse(values[5]); - double margin_free = double.Parse(values[6]); - double margin_level = double.Parse(values[7]); - string comment = values[8]; + var retcode = uint.Parse(values[1]); + var balance = double.Parse(values[2]); + var equity = double.Parse(values[3]); + var profit = double.Parse(values[4]); + var margin = double.Parse(values[5]); + var marginFree = double.Parse(values[6]); + var marginLevel = double.Parse(values[7]); + var comment = values[8]; - result = new MqlTradeCheckResult(retcode, balance, equity, profit, margin, margin_free, margin_level, comment); + result = new MqlTradeCheckResult(retcode, balance, equity, profit, margin, marginFree, marginLevel, comment); } catch (Exception) { @@ -87,7 +84,7 @@ namespace MtApi5 public static bool ParseResult(this string inputString, char separator, out double result) { - bool retVal = false; + var retVal = false; result = 0; if (string.IsNullOrEmpty(inputString) == false) @@ -113,24 +110,24 @@ namespace MtApi5 public static bool ParseResult(this string inputString, char separator, out DateTime from, out DateTime to) { - bool retVal = false; + var retVal = false; from = new DateTime(); to = new DateTime(); if (string.IsNullOrEmpty(inputString) == false) { - string[] values = inputString.Split(separator); + var values = inputString.Split(separator); if (values.Length == 3) { try { retVal = int.Parse(values[0]) != 0; - int iFrom = int.Parse(values[1]); + var iFrom = int.Parse(values[1]); from = Mt5TimeConverter.ConvertFromMtTime(iFrom); - int iTo= int.Parse(values[2]); + var iTo= int.Parse(values[2]); to = Mt5TimeConverter.ConvertFromMtTime(iTo); } catch (Exception) @@ -148,7 +145,7 @@ namespace MtApi5 if (request == null) throw new ArgumentNullException(); - int exp = Mt5TimeConverter.ConvertToMtTime(request.Expiration); + var exp = Mt5TimeConverter.ConvertToMtTime(request.Expiration); return new ArrayList { (int)request.Action, request.Magic, request.Order, request.Symbol, request.Volume , request.Price, request.Stoplimit, request.Sl, request.Tp, request.Deviation, (int)request.Type