From 95c55e90be56485dd05f7770cbbaed395975f321 Mon Sep 17 00:00:00 2001
From: vdemydiuk <vdemydiuk@gmail.com>
Date: Mon, 19 Mar 2018 15:09:02 +0200
Subject: [PATCH] Added field ExpertHandle into class Mt5Quote

---
 MtApi5/Mt5Quote.cs     | 13 +++++++++++--
 MtApi5/MtApi5Client.cs |  8 ++++----
 MtApi5/MtConverters.cs |  4 ----
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/MtApi5/Mt5Quote.cs b/MtApi5/Mt5Quote.cs
index 5bdcb4aa..463fa9b0 100755
--- a/MtApi5/Mt5Quote.cs
+++ b/MtApi5/Mt5Quote.cs
@@ -1,16 +1,25 @@
-namespace MtApi5
+using MTApiService;
+
+namespace MtApi5
 {
     public class Mt5Quote
     {
         public string Instrument { get; }
         public double Bid { get; }
         public double Ask { get; }
+        public int ExpertHandle { get; set; }
 
-        public Mt5Quote(string instrument, double bid, double ask)
+        private Mt5Quote(string instrument, double bid, double ask)
         {
             Instrument = instrument;
             Bid = bid;
             Ask = ask;
         }
+
+        internal Mt5Quote(MtQuote quote)
+            :this(quote.Instrument, quote.Bid, quote.Ask)
+        {
+            ExpertHandle = quote.ExpertHandle;
+        }
     }
 }
diff --git a/MtApi5/MtApi5Client.cs b/MtApi5/MtApi5Client.cs
index cdfec2aa..38ee4f88 100755
--- a/MtApi5/MtApi5Client.cs
+++ b/MtApi5/MtApi5Client.cs
@@ -82,7 +82,7 @@ namespace MtApi5
         {
             var client = Client;
             var quotes = client?.GetQuotes();
-            return quotes?.Select(q => q.Convert());
+            return quotes?.Select(q => new Mt5Quote(q));
         }
 
         ///<summary>
@@ -3319,7 +3319,7 @@ namespace MtApi5
         private void _client_QuoteUpdated(MtQuote quote)
         {
             if (quote == null) return;
-            QuoteUpdate?.Invoke(this, new Mt5QuoteEventArgs(new Mt5Quote(quote.Instrument, quote.Bid, quote.Ask)));
+            QuoteUpdate?.Invoke(this, new Mt5QuoteEventArgs(new Mt5Quote(quote)));
             QuoteUpdated?.Invoke(this, quote.Instrument, quote.Bid, quote.Ask);
         }
 
@@ -3337,7 +3337,7 @@ namespace MtApi5
         {
             if (quote != null)
             {
-                QuoteRemoved?.Invoke(this, new Mt5QuoteEventArgs(new Mt5Quote(quote.Instrument, quote.Bid, quote.Ask)));
+                QuoteRemoved?.Invoke(this, new Mt5QuoteEventArgs(new Mt5Quote(quote)));
             }
         }
 
@@ -3345,7 +3345,7 @@ namespace MtApi5
         {
             if (quote != null)
             {
-                QuoteAdded?.Invoke(this, new Mt5QuoteEventArgs(new Mt5Quote(quote.Instrument, quote.Bid, quote.Ask)));
+                QuoteAdded?.Invoke(this, new Mt5QuoteEventArgs(new Mt5Quote(quote)));
             }
         }
 
diff --git a/MtApi5/MtConverters.cs b/MtApi5/MtConverters.cs
index 51eb2224..96cacfec 100755
--- a/MtApi5/MtConverters.cs
+++ b/MtApi5/MtConverters.cs
@@ -9,10 +9,6 @@ namespace MtApi5
         private static readonly MtLog Log = LogConfigurator.GetLogger(typeof(MtConverters));
 
         #region Values Converters
-        public static Mt5Quote Convert(this MtQuote quote)
-        {
-            return quote != null ? new Mt5Quote(quote.Instrument, quote.Bid, quote.Ask) : null;
-        }
 
         public static bool ParseResult(this string inputString, char separator, out double result)
         {