From db4c9e3e3f9990c46a825e062ca507a7c54c041d Mon Sep 17 00:00:00 2001
From: kenorb <kenorb@users.noreply.github.com>
Date: Wed, 6 Oct 2021 14:54:43 +0100
Subject: [PATCH] Task: Moves Task to Task/ directory

---
 Action.struct.h                                |  2 +-
 Condition.struct.h                             |  2 +-
 EA.mqh                                         |  2 +-
 EA.struct.h                                    |  2 +-
 Strategy.mqh                                   |  2 +-
 Strategy.struct.h                              |  2 +-
 Task.enum.h => Task/Task.enum.h                |  0
 Task.mqh => Task/Task.h                        |  8 ++++----
 Task.struct.h => Task/Task.struct.h            |  4 ++--
 tests/TaskTest.mq4 => Task/tests/Task.test.mq4 |  2 +-
 tests/TaskTest.mq5 => Task/tests/Task.test.mq5 | 12 ++++++------
 tests/CompileTest.mq5                          |  2 +-
 12 files changed, 20 insertions(+), 20 deletions(-)
 rename Task.enum.h => Task/Task.enum.h (100%)
 rename Task.mqh => Task/Task.h (98%)
 rename Task.struct.h => Task/Task.struct.h (98%)
 rename tests/TaskTest.mq4 => Task/tests/Task.test.mq4 (97%)
 rename tests/TaskTest.mq5 => Task/tests/Task.test.mq5 (95%)

diff --git a/Action.struct.h b/Action.struct.h
index c4c2e41a6..43d13cfaa 100644
--- a/Action.struct.h
+++ b/Action.struct.h
@@ -40,7 +40,7 @@
 #include "Order.enum.h"
 #include "Serializer.mqh"
 #include "Strategy.enum.h"
-#include "Task.enum.h"
+#include "Task/Task.enum.h"
 #include "Trade.enum.h"
 
 /* Entry for Action class. */
diff --git a/Condition.struct.h b/Condition.struct.h
index ebf6b200a..ba536e9d4 100644
--- a/Condition.struct.h
+++ b/Condition.struct.h
@@ -38,7 +38,7 @@
 //#include "Market.enum.h"
 #include "Order.enum.h"
 #include "Strategy.enum.h"
-#include "Task.enum.h"
+#include "Task/Task.enum.h"
 #include "Trade.enum.h"
 
 struct ConditionEntry {
diff --git a/EA.mqh b/EA.mqh
index 8fba5ff06..31f0282ba 100644
--- a/EA.mqh
+++ b/EA.mqh
@@ -46,7 +46,7 @@
 #include "SerializerSqlite.mqh"
 #include "Strategy.mqh"
 #include "SummaryReport.mqh"
-#include "Task.mqh"
+#include "Task/Task.h"
 #include "Terminal.mqh"
 #include "Trade.mqh"
 #include "Trade/TradeSignal.h"
diff --git a/EA.struct.h b/EA.struct.h
index dbbe64063..9cde47bab 100644
--- a/EA.struct.h
+++ b/EA.struct.h
@@ -32,7 +32,7 @@
 
 // Includes.
 #include "DateTime.mqh"
-#include "Task.struct.h"
+#include "Task/Task.struct.h"
 
 /* Defines EA config parameters. */
 struct EAParams {
diff --git a/Strategy.mqh b/Strategy.mqh
index 7de9337d7..0e7df3164 100644
--- a/Strategy.mqh
+++ b/Strategy.mqh
@@ -36,7 +36,7 @@ class Trade;
 #include "Strategy.enum.h"
 #include "Strategy.struct.h"
 #include "String.mqh"
-#include "Task.mqh"
+#include "Task/Task.h"
 #include "Trade.mqh"
 
 // Defines.
diff --git a/Strategy.struct.h b/Strategy.struct.h
index b11fb2117..79ea6d588 100644
--- a/Strategy.struct.h
+++ b/Strategy.struct.h
@@ -34,7 +34,7 @@
 #include "Serializer.mqh"
 #include "Strategy.enum.h"
 #include "Strategy.struct.pricestop.h"
-#include "Task.struct.h"
+#include "Task/Task.struct.h"
 
 // Forward class declaration.
 class Strategy;
diff --git a/Task.enum.h b/Task/Task.enum.h
similarity index 100%
rename from Task.enum.h
rename to Task/Task.enum.h
diff --git a/Task.mqh b/Task/Task.h
similarity index 98%
rename from Task.mqh
rename to Task/Task.h
index 2db50c5e4..96152ec9a 100644
--- a/Task.mqh
+++ b/Task/Task.h
@@ -30,10 +30,10 @@
 #define TASK_MQH
 
 // Includes.
-#include "Action.mqh"
-#include "Condition.mqh"
-#include "DictStruct.mqh"
-#include "Refs.mqh"
+#include "../Action.mqh"
+#include "../Condition.mqh"
+#include "../DictStruct.mqh"
+#include "../Refs.mqh"
 #include "Task.enum.h"
 #include "Task.struct.h"
 
diff --git a/Task.struct.h b/Task/Task.struct.h
similarity index 98%
rename from Task.struct.h
rename to Task/Task.struct.h
index d1b7487ce..e9a4e977d 100644
--- a/Task.struct.h
+++ b/Task/Task.struct.h
@@ -31,8 +31,8 @@
 #endif
 
 // Includes.
-#include "Action.struct.h"
-#include "Condition.struct.h"
+#include "../Action.struct.h"
+#include "../Condition.struct.h"
 #include "Task.enum.h"
 
 struct TaskEntry {
diff --git a/tests/TaskTest.mq4 b/Task/tests/Task.test.mq4
similarity index 97%
rename from tests/TaskTest.mq4
rename to Task/tests/Task.test.mq4
index 9dd81f28c..3ab46d4b9 100644
--- a/tests/TaskTest.mq4
+++ b/Task/tests/Task.test.mq4
@@ -25,4 +25,4 @@
  */
 
 // Includes.
-#include "TaskTest.mq5"
+#include "Task.test.mq5"
diff --git a/tests/TaskTest.mq5 b/Task/tests/Task.test.mq5
similarity index 95%
rename from tests/TaskTest.mq5
rename to Task/tests/Task.test.mq5
index 67ebb58d3..34652fedc 100644
--- a/tests/TaskTest.mq5
+++ b/Task/tests/Task.test.mq5
@@ -28,12 +28,12 @@
 struct DataParamEntry;
 
 // Includes.
-#include "../Action.mqh"
-#include "../Chart.mqh"
-#include "../DictObject.mqh"
-#include "../EA.mqh"
-#include "../Task.mqh"
-#include "../Test.mqh"
+#include "../../Action.mqh"
+#include "../../Chart.mqh"
+#include "../../DictObject.mqh"
+#include "../../EA.mqh"
+#include "../Task.h"
+#include "../../Test.mqh"
 
 // Global variables.
 Chart *chart;
diff --git a/tests/CompileTest.mq5 b/tests/CompileTest.mq5
index ef6ceeab7..29cacc1fa 100644
--- a/tests/CompileTest.mq5
+++ b/tests/CompileTest.mq5
@@ -111,7 +111,7 @@
 #include "../String.mqh"
 #include "../SummaryReport.mqh"
 #include "../SymbolInfo.mqh"
-#include "../Task.mqh"
+#include "../Task/Task.h"
 #include "../Terminal.mqh"
 // #include "../Tester.mqh" // @removeme
 #include "../Storage/ValueStorage.h"