last works ...

Classes/x-saherelm.xea.class.mq5

@@ -22,7 +22,6 @@
 //
 // Imports ...
 #include <Generic/HashMap.mqh>
-#include "../Classes/x-saherelm.base.class.mq5"
 #include "../Classes/x-saherelm.xalert.class.mq5"
 #include "../Classes/x-saherelm.xtrade.class.mq5"
 
@@ -2133,7 +2132,7 @@ private:
 //
 // Class Definition ...
 
-class XSCBaseEA : public XSCBase
+class XSCBaseEA : public XSCBaseAlert
 {
     //
     // Public ...
@@ -2245,18 +2244,6 @@ public:
             mTrader.AddOnTradeStateChangedEventHandler(mOnTradeStateChangedHandler);
         }
 
-        //
-        // Instantiate Alert Class ...
-        mAlert = new XSCAlert(
-            GetTag(),
-            enableAlerts,
-            logAlerts,
-            terminalAlerts,
-            mailAlerts,
-            pushAlerts
-            //
-        );
-
         //
         // Instantiate XPositionTracker Class ...
         mPositionTracker = new XSCPositionTracker();
@@ -2276,7 +2263,6 @@ public:
     {
         //
         delete mTrader;
-        delete mAlert;
         delete mPositionTracker;
     }
 
@@ -2426,126 +2412,6 @@ public:
         return result;
     }
 
-    //
-    // Alert ...
-
-    //
-    bool GetLogAlerts()
-    {
-        return mAlert.GetLogAlerts();
-    }
-
-    //
-    void SetLogAlerts(bool value)
-    {
-        mAlert.SetLogAlerts(value);
-    }
-
-    //
-    bool GetEnableAlerts()
-    {
-        return mAlert.GetEnableAlerts();
-    }
-
-    //
-    void SetEnableAlerts(bool value)
-    {
-        mAlert.SetEnableAlerts(value);
-    }
-
-    //
-    bool GetPushAlerts()
-    {
-        return mAlert.GetPushAlerts();
-    }
-
-    //
-    void SetPushAlerts(bool value)
-    {
-        mAlert.SetPushAlerts(value);
-    }
-
-    //
-    bool GetMailAlerts()
-    {
-        return mAlert.GetMailAlerts();
-    }
-
-    //
-    void SetMailAlerts(bool value)
-    {
-        mAlert.SetMailAlerts(value);
-    }
-
-    //
-    bool GetTerminalAlerts()
-    {
-        return mAlert.GetTerminalAlerts();
-    }
-
-    //
-    void SetTerminalAlerts(bool value)
-    {
-        mAlert.SetTerminalAlerts(value);
-    }
-
-    //
-    void SetAlertPrefix(string value)
-    {
-        mAlert.SetPrefix(value);
-    }
-
-    //
-    // Event Listeners ...
-    void AddOnSignalEventHandler(TOnSignal listener)
-    {
-        //
-        Add(
-            listener,
-            mOnSignalEventHandlers
-            //
-        );
-    }
-
-    //
-    // Alert Functions ...
-
-    //
-    // Logging an Alert ...
-    void LogAlert(string message)
-    {
-        mAlert.LogAlert(message);
-    }
-
-    //
-    // Terminal Alert ...
-    void TerminalAlert(string message)
-    {
-        mAlert.TerminalAlert(message);
-    }
-
-    //
-    // Mail Alert ...
-    void MailAlert(string message)
-    {
-        mAlert.MailAlert(message);
-    }
-
-    //
-    // Send Push Notification ...
-    void PushAlert(string message)
-    {
-        mAlert.PushAlert(message);
-    }
-
-    //
-    // Send an Alert by Handling all Different Specified
-    // type's of Alert's if they are Enabled ...
-    void Alert(string message)
-    {
-        mAlert.Alert(message);
-    }
-
     //
     // Overrides ...
 
@@ -2933,7 +2799,6 @@ protected:
     //
     // Trade Class Instance ...
     XSCTrade *mTrader;
-    XSCAlert *mAlert;
     XSCPositionTracker *mPositionTracker;
 
     //