From d0b8d2249f5e77d210002e108e50a4d4ca0d3be8 Mon Sep 17 00:00:00 2001 From: kenorb Date: Mon, 8 Aug 2022 00:57:37 +0100 Subject: [PATCH] Moves Indicator and IndicatorBase into Indicator/ --- .github/workflows/test-indicator.yml | 1 + .github/workflows/test.yml | 1 - Account/AccountMt.h | 2 +- BufferFXT.mqh | 2 +- .../Indicator.define.h | 0 .../Indicator.enum.h | 0 Indicator.mqh => Indicator/Indicator.h | 28 +++++++------- .../Indicator.struct.cache.h | 4 +- .../Indicator.struct.h | 12 +++--- .../Indicator.struct.serialize.h | 2 +- .../Indicator.struct.signal.h | 0 IndicatorBase.h => Indicator/IndicatorBase.h | 38 +++++++++---------- Indicator/IndicatorCandle.h | 2 +- Indicator/IndicatorTf.struct.h | 2 +- Indicator/IndicatorTick.h | 4 +- Indicator/IndicatorTickSource.h | 2 +- .../tests/Indicator.test.mq4 | 4 +- .../tests/Indicator.test.mq5 | 6 +-- Indicator/tests/classes/Indicators.h | 2 +- Indicators/Bitwise/Indi_Candle.mqh | 2 +- Indicators/Bitwise/Indi_Pattern.mqh | 2 +- Indicators/Indi_AC.mqh | 2 +- Indicators/Indi_AD.mqh | 2 +- Indicators/Indi_ADX.mqh | 2 +- Indicators/Indi_ADXW.mqh | 2 +- Indicators/Indi_AMA.mqh | 2 +- Indicators/Indi_AO.mqh | 2 +- Indicators/Indi_ASI.mqh | 2 +- Indicators/Indi_ATR.mqh | 2 +- Indicators/Indi_Alligator.mqh | 2 +- Indicators/Indi_AppliedPrice.mqh | 2 +- Indicators/Indi_BWMFI.mqh | 2 +- Indicators/Indi_Bands.mqh | 2 +- Indicators/Indi_BearsPower.mqh | 2 +- Indicators/Indi_BullsPower.mqh | 2 +- Indicators/Indi_CCI.mqh | 2 +- Indicators/Indi_CHO.mqh | 2 +- Indicators/Indi_CHV.mqh | 2 +- Indicators/Indi_ColorBars.mqh | 2 +- Indicators/Indi_ColorCandlesDaily.mqh | 2 +- Indicators/Indi_ColorLine.mqh | 2 +- Indicators/Indi_CustomMovingAverage.mqh | 2 +- Indicators/Indi_DEMA.mqh | 2 +- Indicators/Indi_DeMarker.mqh | 2 +- Indicators/Indi_Demo.mqh | 2 +- Indicators/Indi_DetrendedPrice.mqh | 2 +- Indicators/Indi_Drawer.mqh | 2 +- Indicators/Indi_Drawer.struct.h | 2 +- Indicators/Indi_Envelopes.mqh | 2 +- Indicators/Indi_Force.mqh | 2 +- Indicators/Indi_FractalAdaptiveMA.mqh | 2 +- Indicators/Indi_Fractals.mqh | 2 +- Indicators/Indi_Gator.mqh | 2 +- Indicators/Indi_HeikenAshi.mqh | 2 +- Indicators/Indi_Ichimoku.mqh | 2 +- Indicators/Indi_Killzones.mqh | 2 +- Indicators/Indi_MA.mqh | 2 +- Indicators/Indi_MACD.mqh | 2 +- Indicators/Indi_MFI.mqh | 2 +- Indicators/Indi_MassIndex.mqh | 2 +- Indicators/Indi_Momentum.mqh | 2 +- Indicators/Indi_OBV.mqh | 2 +- Indicators/Indi_OsMA.mqh | 2 +- Indicators/Indi_Pivot.mqh | 2 +- Indicators/Indi_PriceChannel.mqh | 2 +- Indicators/Indi_PriceFeeder.mqh | 2 +- Indicators/Indi_PriceVolumeTrend.mqh | 2 +- Indicators/Indi_RS.mqh | 2 +- Indicators/Indi_RSI.mqh | 2 +- Indicators/Indi_RVI.mqh | 2 +- Indicators/Indi_RateOfChange.mqh | 2 +- Indicators/Indi_SAR.mqh | 2 +- Indicators/Indi_StdDev.mqh | 2 +- Indicators/Indi_Stochastic.mqh | 2 +- Indicators/Indi_TEMA.mqh | 2 +- Indicators/Indi_TRIX.mqh | 2 +- Indicators/Indi_UltimateOscillator.mqh | 2 +- Indicators/Indi_VIDYA.mqh | 2 +- Indicators/Indi_VROC.mqh | 2 +- Indicators/Indi_Volumes.mqh | 2 +- Indicators/Indi_WPR.mqh | 2 +- Indicators/Indi_WilliamsAD.mqh | 2 +- Indicators/Indi_ZigZag.mqh | 2 +- Indicators/Indi_ZigZagColor.mqh | 2 +- Indicators/OHLC/Indi_OHLC.mqh | 2 +- Indicators/Price/Indi_Price.mqh | 2 +- Indicators/Special/Indi_Custom.mqh | 2 +- Indicators/Special/Indi_Math.mqh | 2 +- Math.h | 2 +- Platform.h | 2 +- Strategy.mqh | 2 +- Terminal.enum.h | 2 +- Tests.mqh | 2 +- Trade.mqh | 2 +- tests/CompileTest.mq5 | 7 ++-- tests/DrawIndicatorTest.mq5 | 2 +- tests/IndicatorsTest.mq5 | 2 +- 97 files changed, 137 insertions(+), 136 deletions(-) rename Indicator.define.h => Indicator/Indicator.define.h (100%) rename Indicator.enum.h => Indicator/Indicator.enum.h (100%) rename Indicator.mqh => Indicator/Indicator.h (98%) rename Indicator.struct.cache.h => Indicator/Indicator.struct.cache.h (99%) rename Indicator.struct.h => Indicator/Indicator.struct.h (98%) rename Indicator.struct.serialize.h => Indicator/Indicator.struct.serialize.h (99%) rename Indicator.struct.signal.h => Indicator/Indicator.struct.signal.h (100%) rename IndicatorBase.h => Indicator/IndicatorBase.h (98%) rename tests/IndicatorTest.mq4 => Indicator/tests/Indicator.test.mq4 (91%) rename tests/IndicatorTest.mq5 => Indicator/tests/Indicator.test.mq5 (95%) diff --git a/.github/workflows/test-indicator.yml b/.github/workflows/test-indicator.yml index 051dac339..28be4da5b 100644 --- a/.github/workflows/test-indicator.yml +++ b/.github/workflows/test-indicator.yml @@ -51,6 +51,7 @@ jobs: matrix: test: - IndicatorCandle.test + - Indicator.test - IndicatorTf.test - IndicatorTick.test steps: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 429685a77..e405f856c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -60,7 +60,6 @@ jobs: - DatabaseTest - DrawIndicatorTest - EATest - - IndicatorTest - IndicatorsTest - MailTest - MarketTest diff --git a/Account/AccountMt.h b/Account/AccountMt.h index c03c300f9..e01824128 100644 --- a/Account/AccountMt.h +++ b/Account/AccountMt.h @@ -33,7 +33,7 @@ class AccountMt; #include "../Chart.mqh" #include "../Convert.mqh" #include "../Data.struct.h" -#include "../Indicator.struct.h" +#include "../Indicator/Indicator.struct.h" #include "../Order.struct.h" #include "../Orders.mqh" #include "../Serializer.mqh" diff --git a/BufferFXT.mqh b/BufferFXT.mqh index dde80cfa0..1d4020c61 100644 --- a/BufferFXT.mqh +++ b/BufferFXT.mqh @@ -27,7 +27,7 @@ #include "Account/AccountMt.h" #include "Chart.mqh" #include "DictStruct.mqh" -#include "IndicatorBase.h" +#include "Indicator/IndicatorBase.h" #include "Object.mqh" // Defines. diff --git a/Indicator.define.h b/Indicator/Indicator.define.h similarity index 100% rename from Indicator.define.h rename to Indicator/Indicator.define.h diff --git a/Indicator.enum.h b/Indicator/Indicator.enum.h similarity index 100% rename from Indicator.enum.h rename to Indicator/Indicator.enum.h diff --git a/Indicator.mqh b/Indicator/Indicator.h similarity index 98% rename from Indicator.mqh rename to Indicator/Indicator.h index 31063073a..958d6faad 100644 --- a/Indicator.mqh +++ b/Indicator/Indicator.h @@ -25,11 +25,20 @@ #define INDICATOR_MQH // Includes. -#include "Array.mqh" -#include "BufferStruct.mqh" -#include "DateTime.mqh" -#include "DrawIndicator.mqh" -#include "Flags.h" +#include "../Array.mqh" +#include "../BufferStruct.mqh" +#include "../DateTime.mqh" +#include "../DrawIndicator.mqh" +#include "../Flags.h" +#include "../Math.h" +#include "../Object.mqh" +#include "../Refs.mqh" +#include "../Serializer.mqh" +#include "../SerializerCsv.mqh" +#include "../SerializerJson.mqh" +#include "../Storage/ValueStorage.h" +#include "../Storage/ValueStorage.indicator.h" +#include "../Storage/ValueStorage.native.h" #include "Indicator.define.h" #include "Indicator.enum.h" #include "Indicator.struct.cache.h" @@ -37,15 +46,6 @@ #include "Indicator.struct.serialize.h" #include "Indicator.struct.signal.h" #include "IndicatorBase.h" -#include "Math.h" -#include "Object.mqh" -#include "Refs.mqh" -#include "Serializer.mqh" -#include "SerializerCsv.mqh" -#include "SerializerJson.mqh" -#include "Storage/ValueStorage.h" -#include "Storage/ValueStorage.indicator.h" -#include "Storage/ValueStorage.native.h" #ifndef __MQL4__ // Defines global functions (for MQL4 backward compatibility). diff --git a/Indicator.struct.cache.h b/Indicator/Indicator.struct.cache.h similarity index 99% rename from Indicator.struct.cache.h rename to Indicator/Indicator.struct.cache.h index 2c4df7097..05264e24b 100644 --- a/Indicator.struct.cache.h +++ b/Indicator/Indicator.struct.cache.h @@ -31,8 +31,8 @@ #endif // Includes. -#include "Refs.mqh" -#include "Storage/ValueStorage.h" +#include "../Refs.mqh" +#include "../Storage/ValueStorage.h" /** * Holds buffers used to cache values calculated via OnCalculate methods. diff --git a/Indicator.struct.h b/Indicator/Indicator.struct.h similarity index 98% rename from Indicator.struct.h rename to Indicator/Indicator.struct.h index d6a118586..199d924de 100644 --- a/Indicator.struct.h +++ b/Indicator/Indicator.struct.h @@ -36,14 +36,14 @@ class Indicator; struct ChartParams; // Includes. -#include "Array.mqh" -#include "Chart.struct.tf.h" -#include "Data.struct.h" -#include "DateTime.struct.h" +#include "../Array.mqh" +#include "../Chart.struct.tf.h" +#include "../Data.struct.h" +#include "../DateTime.struct.h" +#include "../SerializerNode.enum.h" +#include "../Storage/ValueStorage.indicator.h" #include "Indicator.enum.h" #include "Indicator.struct.cache.h" -#include "SerializerNode.enum.h" -#include "Storage/ValueStorage.indicator.h" // Type-less value for IndicatorDataEntryValue structure. union IndicatorDataEntryTypelessValue { diff --git a/Indicator.struct.serialize.h b/Indicator/Indicator.struct.serialize.h similarity index 99% rename from Indicator.struct.serialize.h rename to Indicator/Indicator.struct.serialize.h index 75115f0ed..6d68a4d3f 100644 --- a/Indicator.struct.serialize.h +++ b/Indicator/Indicator.struct.serialize.h @@ -25,7 +25,7 @@ * Includes Indicator's struct serializers. */ -#include "Serializer.mqh" +#include "../Serializer.mqh" // Forward class declaration. class Serializer; diff --git a/Indicator.struct.signal.h b/Indicator/Indicator.struct.signal.h similarity index 100% rename from Indicator.struct.signal.h rename to Indicator/Indicator.struct.signal.h diff --git a/IndicatorBase.h b/Indicator/IndicatorBase.h similarity index 98% rename from IndicatorBase.h rename to Indicator/IndicatorBase.h index dc7697d6c..8202652d2 100644 --- a/IndicatorBase.h +++ b/Indicator/IndicatorBase.h @@ -34,31 +34,31 @@ class Chart; // Includes. -#include "Array.mqh" -#include "BufferStruct.mqh" -#include "Chart.mqh" -#include "Chart.struct.tf.h" -#include "ChartBase.h" -#include "ChartMt.h" -#include "DateTime.mqh" -#include "DrawIndicator.mqh" -#include "Flags.h" +#include "../Array.mqh" +#include "../BufferStruct.mqh" +#include "../Chart.mqh" +#include "../Chart.struct.tf.h" +#include "../ChartBase.h" +#include "../ChartMt.h" +#include "../DateTime.mqh" +#include "../DrawIndicator.mqh" +#include "../Flags.h" +#include "../Log.mqh" +#include "../Object.mqh" +#include "../Refs.mqh" +#include "../Serializer.mqh" +#include "../SerializerCsv.mqh" +#include "../SerializerJson.mqh" +#include "../Storage/ValueStorage.h" +#include "../Storage/ValueStorage.indicator.h" +#include "../Storage/ValueStorage.native.h" +#include "../Util.h" #include "Indicator.define.h" #include "Indicator.enum.h" #include "Indicator.struct.cache.h" #include "Indicator.struct.h" #include "Indicator.struct.serialize.h" #include "Indicator.struct.signal.h" -#include "Log.mqh" -#include "Object.mqh" -#include "Refs.mqh" -#include "Serializer.mqh" -#include "SerializerCsv.mqh" -#include "SerializerJson.mqh" -#include "Storage/ValueStorage.h" -#include "Storage/ValueStorage.indicator.h" -#include "Storage/ValueStorage.native.h" -#include "Util.h" /** * Class to deal with indicators. diff --git a/Indicator/IndicatorCandle.h b/Indicator/IndicatorCandle.h index 5a6a6cac8..571dc7ce9 100644 --- a/Indicator/IndicatorCandle.h +++ b/Indicator/IndicatorCandle.h @@ -32,7 +32,6 @@ // Includes. #include "../Buffer/BufferCandle.h" #include "../Candle.struct.h" -#include "../Indicator.mqh" #include "../Storage/ValueStorage.price_median.h" #include "../Storage/ValueStorage.price_typical.h" #include "../Storage/ValueStorage.price_weighted.h" @@ -40,6 +39,7 @@ #include "../Storage/ValueStorage.tick_volume.h" #include "../Storage/ValueStorage.time.h" #include "../Storage/ValueStorage.volume.h" +#include "Indicator.h" #include "TickBarCounter.h" // Indicator modes. diff --git a/Indicator/IndicatorTf.struct.h b/Indicator/IndicatorTf.struct.h index 7259d6d9b..6eb42bfb2 100644 --- a/Indicator/IndicatorTf.struct.h +++ b/Indicator/IndicatorTf.struct.h @@ -31,7 +31,7 @@ #endif // Includes. -#include "../Indicator.struct.h" +#include "Indicator.struct.h" /* Structure for IndicatorTf class parameters. */ struct IndicatorTfParams : IndicatorParams { diff --git a/Indicator/IndicatorTick.h b/Indicator/IndicatorTick.h index 7b0e88355..389243abe 100644 --- a/Indicator/IndicatorTick.h +++ b/Indicator/IndicatorTick.h @@ -31,8 +31,8 @@ // Includes. #include "../Buffer/BufferTick.h" -#include "../Indicator.mqh" -#include "../Indicator.struct.h" +#include "Indicator.h" +#include "Indicator.struct.h" // Indicator modes. enum ENUM_INDI_TICK_MODE { diff --git a/Indicator/IndicatorTickSource.h b/Indicator/IndicatorTickSource.h index 579531bbf..5d7dd9de8 100644 --- a/Indicator/IndicatorTickSource.h +++ b/Indicator/IndicatorTickSource.h @@ -26,7 +26,7 @@ #endif // Includes. -#include "../Indicator.mqh" +#include "Indicator.h" /** * Indicator to be used with IndicatorTick as a data source. diff --git a/tests/IndicatorTest.mq4 b/Indicator/tests/Indicator.test.mq4 similarity index 91% rename from tests/IndicatorTest.mq4 rename to Indicator/tests/Indicator.test.mq4 index f1bee4667..81a7da627 100644 --- a/tests/IndicatorTest.mq4 +++ b/Indicator/tests/Indicator.test.mq4 @@ -1,6 +1,6 @@ //+------------------------------------------------------------------+ //| EA31337 framework | -//| Copyright 2016-2021, EA31337 Ltd | +//| Copyright 2016-2022, EA31337 Ltd | //| https://github.com/EA31337 | //+------------------------------------------------------------------+ @@ -25,4 +25,4 @@ */ // Includes. -#include "IndicatorTest.mq5" +#include "Indicator.test.mq5" diff --git a/tests/IndicatorTest.mq5 b/Indicator/tests/Indicator.test.mq5 similarity index 95% rename from tests/IndicatorTest.mq5 rename to Indicator/tests/Indicator.test.mq5 index e837f8e92..437dfb252 100644 --- a/tests/IndicatorTest.mq5 +++ b/Indicator/tests/Indicator.test.mq5 @@ -1,6 +1,6 @@ //+------------------------------------------------------------------+ //| EA31337 framework | -//| Copyright 2016-2021, EA31337 Ltd | +//| Copyright 2016-2022, EA31337 Ltd | //| https://github.com/EA31337 | //+------------------------------------------------------------------+ @@ -25,8 +25,8 @@ */ // Includes. -#include "../Indicator.mqh" -#include "../Test.mqh" +#include "../Indicator.h" +#include "../../Test.mqh" /** * Implements OnInit(). diff --git a/Indicator/tests/classes/Indicators.h b/Indicator/tests/classes/Indicators.h index f8258b555..dbae5001a 100644 --- a/Indicator/tests/classes/Indicators.h +++ b/Indicator/tests/classes/Indicators.h @@ -30,7 +30,7 @@ #endif // Includes. -#include "../../../IndicatorBase.h" +#include "../../../Indicator/IndicatorBase.h" #include "../../../Refs.mqh" /** diff --git a/Indicators/Bitwise/Indi_Candle.mqh b/Indicators/Bitwise/Indi_Candle.mqh index cff7209e7..6553adec8 100644 --- a/Indicators/Bitwise/Indi_Candle.mqh +++ b/Indicators/Bitwise/Indi_Candle.mqh @@ -23,7 +23,7 @@ // Includes. #include "../../Bar.struct.h" #include "../../BufferStruct.mqh" -#include "../../Indicator.mqh" +#include "../../Indicator/Indicator.h" #include "../../Pattern.struct.h" #include "../../Serializer.mqh" #include "../Price/Indi_Price.mqh" diff --git a/Indicators/Bitwise/Indi_Pattern.mqh b/Indicators/Bitwise/Indi_Pattern.mqh index 4c836f3a9..e5ef6dfc8 100644 --- a/Indicators/Bitwise/Indi_Pattern.mqh +++ b/Indicators/Bitwise/Indi_Pattern.mqh @@ -23,7 +23,7 @@ // Includes. #include "../../Bar.struct.h" #include "../../BufferStruct.mqh" -#include "../../Indicator.mqh" +#include "../../Indicator/Indicator.h" #include "../../Pattern.struct.h" #include "../../Serializer.mqh" #include "../Price/Indi_Price.mqh" diff --git a/Indicators/Indi_AC.mqh b/Indicators/Indi_AC.mqh index 9041a4d4e..892d0bc1d 100644 --- a/Indicators/Indi_AC.mqh +++ b/Indicators/Indi_AC.mqh @@ -22,7 +22,7 @@ // Includes. #include "../BufferStruct.mqh" -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #ifndef __MQL4__ // Defines global functions (for MQL4 backward compability). diff --git a/Indicators/Indi_AD.mqh b/Indicators/Indi_AD.mqh index 591baa6e8..fea61bad6 100644 --- a/Indicators/Indi_AD.mqh +++ b/Indicators/Indi_AD.mqh @@ -21,7 +21,7 @@ */ // Includes. -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #ifndef __MQL4__ // Defines global functions (for MQL4 backward compability). diff --git a/Indicators/Indi_ADX.mqh b/Indicators/Indi_ADX.mqh index 73696b94a..019b98b4e 100644 --- a/Indicators/Indi_ADX.mqh +++ b/Indicators/Indi_ADX.mqh @@ -21,7 +21,7 @@ */ // Includes. -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "Price/Indi_Price.mqh" #ifndef __MQL4__ diff --git a/Indicators/Indi_ADXW.mqh b/Indicators/Indi_ADXW.mqh index 998621e09..b38d15720 100644 --- a/Indicators/Indi_ADXW.mqh +++ b/Indicators/Indi_ADXW.mqh @@ -22,7 +22,7 @@ // Includes. #include "../BufferStruct.mqh" -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "../Storage/ValueStorage.applied_price.h" #include "../Storage/ValueStorage.h" #include "../Storage/ValueStorage.spread.h" diff --git a/Indicators/Indi_AMA.mqh b/Indicators/Indi_AMA.mqh index ecad98596..4894eb283 100644 --- a/Indicators/Indi_AMA.mqh +++ b/Indicators/Indi_AMA.mqh @@ -22,7 +22,7 @@ // Includes. #include "../BufferStruct.mqh" -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "../Indicator/tests/classes/IndicatorTfDummy.h" #include "../Storage/ValueStorage.h" #include "Price/Indi_Price.mqh" diff --git a/Indicators/Indi_AO.mqh b/Indicators/Indi_AO.mqh index 60ffe3d1d..1953f89cd 100644 --- a/Indicators/Indi_AO.mqh +++ b/Indicators/Indi_AO.mqh @@ -21,7 +21,7 @@ */ // Includes. -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #ifndef __MQL4__ // Defines global functions (for MQL4 backward compability). diff --git a/Indicators/Indi_ASI.mqh b/Indicators/Indi_ASI.mqh index d280d0feb..2ba1daabc 100644 --- a/Indicators/Indi_ASI.mqh +++ b/Indicators/Indi_ASI.mqh @@ -22,7 +22,7 @@ // Includes. #include "../BufferStruct.mqh" -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "../Storage/ValueStorage.all.h" // Structs. diff --git a/Indicators/Indi_ATR.mqh b/Indicators/Indi_ATR.mqh index fc3b0684f..7ff23a6c9 100644 --- a/Indicators/Indi_ATR.mqh +++ b/Indicators/Indi_ATR.mqh @@ -21,7 +21,7 @@ */ // Includes. -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #ifndef __MQL4__ // Defines global functions (for MQL4 backward compability). diff --git a/Indicators/Indi_Alligator.mqh b/Indicators/Indi_Alligator.mqh index 8587b0650..039d6f324 100644 --- a/Indicators/Indi_Alligator.mqh +++ b/Indicators/Indi_Alligator.mqh @@ -21,7 +21,7 @@ */ // Includes. -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #ifndef __MQL4__ // Defines global functions (for MQL4 backward compability). diff --git a/Indicators/Indi_AppliedPrice.mqh b/Indicators/Indi_AppliedPrice.mqh index 3c9e2c7eb..534b948a2 100644 --- a/Indicators/Indi_AppliedPrice.mqh +++ b/Indicators/Indi_AppliedPrice.mqh @@ -22,7 +22,7 @@ // Includes. #include "../BufferStruct.mqh" -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "OHLC/Indi_OHLC.mqh" // Structs. diff --git a/Indicators/Indi_BWMFI.mqh b/Indicators/Indi_BWMFI.mqh index e3117195c..752bbe713 100644 --- a/Indicators/Indi_BWMFI.mqh +++ b/Indicators/Indi_BWMFI.mqh @@ -21,7 +21,7 @@ */ // Includes. -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #ifndef __MQL4__ // Defines global functions (for MQL4 backward compability). diff --git a/Indicators/Indi_Bands.mqh b/Indicators/Indi_Bands.mqh index f873fecaa..eebc23d9a 100644 --- a/Indicators/Indi_Bands.mqh +++ b/Indicators/Indi_Bands.mqh @@ -21,7 +21,7 @@ */ // Includes. -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "Indi_CCI.mqh" #include "Indi_Envelopes.mqh" #include "Indi_MA.mqh" diff --git a/Indicators/Indi_BearsPower.mqh b/Indicators/Indi_BearsPower.mqh index 26970847b..955f05aa0 100644 --- a/Indicators/Indi_BearsPower.mqh +++ b/Indicators/Indi_BearsPower.mqh @@ -21,7 +21,7 @@ */ // Includes. -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #ifndef __MQL4__ // Defines global functions (for MQL4 backward compability). diff --git a/Indicators/Indi_BullsPower.mqh b/Indicators/Indi_BullsPower.mqh index 933fd4aa6..72458a6f4 100644 --- a/Indicators/Indi_BullsPower.mqh +++ b/Indicators/Indi_BullsPower.mqh @@ -21,7 +21,7 @@ */ // Includes. -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #ifndef __MQL4__ // Defines global functions (for MQL4 backward compability). diff --git a/Indicators/Indi_CCI.mqh b/Indicators/Indi_CCI.mqh index 3e1777031..6d723a0e1 100644 --- a/Indicators/Indi_CCI.mqh +++ b/Indicators/Indi_CCI.mqh @@ -21,7 +21,7 @@ */ // Includes. -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "Indi_MA.mqh" #include "Indi_PriceFeeder.mqh" #include "Price/Indi_Price.mqh" diff --git a/Indicators/Indi_CHO.mqh b/Indicators/Indi_CHO.mqh index de1babe90..d0ff41fdd 100644 --- a/Indicators/Indi_CHO.mqh +++ b/Indicators/Indi_CHO.mqh @@ -22,7 +22,7 @@ // Includes. #include "../BufferStruct.mqh" -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "../Storage/ValueStorage.all.h" #include "../Util.h" #include "Indi_MA.mqh" diff --git a/Indicators/Indi_CHV.mqh b/Indicators/Indi_CHV.mqh index 2251f6420..1da755024 100644 --- a/Indicators/Indi_CHV.mqh +++ b/Indicators/Indi_CHV.mqh @@ -22,7 +22,7 @@ // Includes. #include "../BufferStruct.mqh" -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "../Storage/ValueStorage.all.h" #include "../Util.h" #include "Indi_MA.mqh" diff --git a/Indicators/Indi_ColorBars.mqh b/Indicators/Indi_ColorBars.mqh index 191b483f3..550878ef8 100644 --- a/Indicators/Indi_ColorBars.mqh +++ b/Indicators/Indi_ColorBars.mqh @@ -22,7 +22,7 @@ // Includes. #include "../BufferStruct.mqh" -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "../Storage/ValueStorage.all.h" // Structs. diff --git a/Indicators/Indi_ColorCandlesDaily.mqh b/Indicators/Indi_ColorCandlesDaily.mqh index b7c7cf52d..985209e36 100644 --- a/Indicators/Indi_ColorCandlesDaily.mqh +++ b/Indicators/Indi_ColorCandlesDaily.mqh @@ -22,7 +22,7 @@ // Includes. #include "../BufferStruct.mqh" -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "../Storage/ValueStorage.all.h" // Structs. diff --git a/Indicators/Indi_ColorLine.mqh b/Indicators/Indi_ColorLine.mqh index faaff3f18..7531a4b44 100644 --- a/Indicators/Indi_ColorLine.mqh +++ b/Indicators/Indi_ColorLine.mqh @@ -22,7 +22,7 @@ // Includes. #include "../BufferStruct.mqh" -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "../Storage/ValueStorage.all.h" #include "Indi_MA.mqh" diff --git a/Indicators/Indi_CustomMovingAverage.mqh b/Indicators/Indi_CustomMovingAverage.mqh index 2fa70ff88..f8a816dc0 100644 --- a/Indicators/Indi_CustomMovingAverage.mqh +++ b/Indicators/Indi_CustomMovingAverage.mqh @@ -22,7 +22,7 @@ // Includes. #include "../BufferStruct.mqh" -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" // Structs. struct IndiCustomMovingAverageParams : IndicatorParams { diff --git a/Indicators/Indi_DEMA.mqh b/Indicators/Indi_DEMA.mqh index e0a69b308..5386a0f57 100644 --- a/Indicators/Indi_DEMA.mqh +++ b/Indicators/Indi_DEMA.mqh @@ -27,7 +27,7 @@ // Includes. #include "../Dict.mqh" #include "../DictObject.mqh" -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "../Refs.mqh" #include "../Storage/Objects.h" #include "../Storage/ValueStorage.h" diff --git a/Indicators/Indi_DeMarker.mqh b/Indicators/Indi_DeMarker.mqh index 604966191..480981e95 100644 --- a/Indicators/Indi_DeMarker.mqh +++ b/Indicators/Indi_DeMarker.mqh @@ -21,7 +21,7 @@ */ // Includes. -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #ifndef __MQL4__ // Defines global functions (for MQL4 backward compability). diff --git a/Indicators/Indi_Demo.mqh b/Indicators/Indi_Demo.mqh index d44822b05..31e29e3ab 100644 --- a/Indicators/Indi_Demo.mqh +++ b/Indicators/Indi_Demo.mqh @@ -22,7 +22,7 @@ // Includes. #include "../BufferStruct.mqh" -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "Price/Indi_Price.mqh" /** diff --git a/Indicators/Indi_DetrendedPrice.mqh b/Indicators/Indi_DetrendedPrice.mqh index f2da9c923..460dc76a7 100644 --- a/Indicators/Indi_DetrendedPrice.mqh +++ b/Indicators/Indi_DetrendedPrice.mqh @@ -22,7 +22,7 @@ // Includes. #include "../BufferStruct.mqh" -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "Indi_MA.mqh" // Structs. diff --git a/Indicators/Indi_Drawer.mqh b/Indicators/Indi_Drawer.mqh index ec6c11d1c..80f1712b2 100644 --- a/Indicators/Indi_Drawer.mqh +++ b/Indicators/Indi_Drawer.mqh @@ -25,7 +25,7 @@ struct IndicatorParams; // Includes. #include "../DictStruct.mqh" -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "../Redis.mqh" #include "../Task/TaskAction.h" #include "Indi_Drawer.struct.h" diff --git a/Indicators/Indi_Drawer.struct.h b/Indicators/Indi_Drawer.struct.h index 43136f99a..4b2cbc287 100644 --- a/Indicators/Indi_Drawer.struct.h +++ b/Indicators/Indi_Drawer.struct.h @@ -26,7 +26,7 @@ */ // Includes. -#include "../Indicator.struct.h" +#include "../Indicator/Indicator.struct.h" // Structs. diff --git a/Indicators/Indi_Envelopes.mqh b/Indicators/Indi_Envelopes.mqh index 91c2be25a..d6fae138f 100644 --- a/Indicators/Indi_Envelopes.mqh +++ b/Indicators/Indi_Envelopes.mqh @@ -21,7 +21,7 @@ */ // Includes. -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "../Storage/Singleton.h" #include "Indi_MA.mqh" #include "Indi_PriceFeeder.mqh" diff --git a/Indicators/Indi_Force.mqh b/Indicators/Indi_Force.mqh index 7f6794db6..fb16cd679 100644 --- a/Indicators/Indi_Force.mqh +++ b/Indicators/Indi_Force.mqh @@ -32,7 +32,7 @@ */ // Includes. -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #ifndef __MQL4__ // Defines global functions (for MQL4 backward compability). diff --git a/Indicators/Indi_FractalAdaptiveMA.mqh b/Indicators/Indi_FractalAdaptiveMA.mqh index 00c5ed641..ae326916a 100644 --- a/Indicators/Indi_FractalAdaptiveMA.mqh +++ b/Indicators/Indi_FractalAdaptiveMA.mqh @@ -22,7 +22,7 @@ // Includes. #include "../BufferStruct.mqh" -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "../Storage/ValueStorage.all.h" // Structs. diff --git a/Indicators/Indi_Fractals.mqh b/Indicators/Indi_Fractals.mqh index dcfd19697..1f13a1205 100644 --- a/Indicators/Indi_Fractals.mqh +++ b/Indicators/Indi_Fractals.mqh @@ -21,7 +21,7 @@ */ // Includes. -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #ifndef __MQL4__ // Defines global functions (for MQL4 backward compability). diff --git a/Indicators/Indi_Gator.mqh b/Indicators/Indi_Gator.mqh index ca33da68f..55e94225e 100644 --- a/Indicators/Indi_Gator.mqh +++ b/Indicators/Indi_Gator.mqh @@ -28,7 +28,7 @@ */ // Includes. -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #ifndef __MQL4__ // Defines global functions (for MQL4 backward compability). diff --git a/Indicators/Indi_HeikenAshi.mqh b/Indicators/Indi_HeikenAshi.mqh index 048660b41..b305ae96f 100644 --- a/Indicators/Indi_HeikenAshi.mqh +++ b/Indicators/Indi_HeikenAshi.mqh @@ -28,7 +28,7 @@ */ // Includes. -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "../Storage/ValueStorage.all.h" // Enums. diff --git a/Indicators/Indi_Ichimoku.mqh b/Indicators/Indi_Ichimoku.mqh index 8e8058b0c..029ccd89b 100644 --- a/Indicators/Indi_Ichimoku.mqh +++ b/Indicators/Indi_Ichimoku.mqh @@ -21,7 +21,7 @@ */ // Includes. -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #ifndef __MQL4__ // Defines global functions (for MQL4 backward compability). diff --git a/Indicators/Indi_Killzones.mqh b/Indicators/Indi_Killzones.mqh index 89a891134..542ee6768 100644 --- a/Indicators/Indi_Killzones.mqh +++ b/Indicators/Indi_Killzones.mqh @@ -21,7 +21,7 @@ */ // Includes. -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "../Market.struct.h" // Defines enumerations. diff --git a/Indicators/Indi_MA.mqh b/Indicators/Indi_MA.mqh index 30aa3af74..cd227f3d9 100644 --- a/Indicators/Indi_MA.mqh +++ b/Indicators/Indi_MA.mqh @@ -27,7 +27,7 @@ // Includes. #include "../Dict.mqh" #include "../DictObject.mqh" -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "../Refs.mqh" #include "../Storage/Singleton.h" #include "../Storage/ValueStorage.h" diff --git a/Indicators/Indi_MACD.mqh b/Indicators/Indi_MACD.mqh index d5e0daf42..37361fa51 100644 --- a/Indicators/Indi_MACD.mqh +++ b/Indicators/Indi_MACD.mqh @@ -21,7 +21,7 @@ */ // Includes. -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #ifndef __MQL4__ // Defines global functions (for MQL4 backward compability). diff --git a/Indicators/Indi_MFI.mqh b/Indicators/Indi_MFI.mqh index 6b87ea67d..06b4f2a10 100644 --- a/Indicators/Indi_MFI.mqh +++ b/Indicators/Indi_MFI.mqh @@ -21,7 +21,7 @@ */ // Includes. -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #ifndef __MQL4__ // Defines global functions (for MQL4 backward compability). diff --git a/Indicators/Indi_MassIndex.mqh b/Indicators/Indi_MassIndex.mqh index aadba3563..406281866 100644 --- a/Indicators/Indi_MassIndex.mqh +++ b/Indicators/Indi_MassIndex.mqh @@ -22,7 +22,7 @@ // Includes. #include "../BufferStruct.mqh" -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "../Storage/ValueStorage.all.h" #include "Indi_MA.mqh" diff --git a/Indicators/Indi_Momentum.mqh b/Indicators/Indi_Momentum.mqh index bc696e74a..2a4029d5b 100644 --- a/Indicators/Indi_Momentum.mqh +++ b/Indicators/Indi_Momentum.mqh @@ -30,7 +30,7 @@ */ // Includes. -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "Indi_PriceFeeder.mqh" #ifndef __MQL4__ diff --git a/Indicators/Indi_OBV.mqh b/Indicators/Indi_OBV.mqh index 631e41444..ca4992191 100644 --- a/Indicators/Indi_OBV.mqh +++ b/Indicators/Indi_OBV.mqh @@ -21,7 +21,7 @@ */ // Includes. -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #ifndef __MQL4__ // Defines global functions (for MQL4 backward compability). diff --git a/Indicators/Indi_OsMA.mqh b/Indicators/Indi_OsMA.mqh index cfd48c16c..57846769b 100644 --- a/Indicators/Indi_OsMA.mqh +++ b/Indicators/Indi_OsMA.mqh @@ -21,7 +21,7 @@ */ // Includes. -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #ifndef __MQL4__ // Defines global functions (for MQL4 backward compability). diff --git a/Indicators/Indi_Pivot.mqh b/Indicators/Indi_Pivot.mqh index c7b9e659a..2698648ac 100644 --- a/Indicators/Indi_Pivot.mqh +++ b/Indicators/Indi_Pivot.mqh @@ -22,7 +22,7 @@ // Includes. #include "../Bar.struct.h" -#include "../Indicator.struct.h" +#include "../Indicator/Indicator.struct.h" #include "../Serializer.mqh" #include "Special/Indi_Math.mqh" diff --git a/Indicators/Indi_PriceChannel.mqh b/Indicators/Indi_PriceChannel.mqh index 2fce61174..5c181f63f 100644 --- a/Indicators/Indi_PriceChannel.mqh +++ b/Indicators/Indi_PriceChannel.mqh @@ -22,7 +22,7 @@ // Includes. #include "../BufferStruct.mqh" -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "Indi_ZigZag.mqh" // Structs. diff --git a/Indicators/Indi_PriceFeeder.mqh b/Indicators/Indi_PriceFeeder.mqh index 25f00d22b..ea28fb237 100644 --- a/Indicators/Indi_PriceFeeder.mqh +++ b/Indicators/Indi_PriceFeeder.mqh @@ -22,7 +22,7 @@ // Includes. #include "../BufferStruct.mqh" -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" // Structs. struct IndiPriceFeederParams : IndicatorParams { diff --git a/Indicators/Indi_PriceVolumeTrend.mqh b/Indicators/Indi_PriceVolumeTrend.mqh index ba1ed2961..781ed8ef9 100644 --- a/Indicators/Indi_PriceVolumeTrend.mqh +++ b/Indicators/Indi_PriceVolumeTrend.mqh @@ -22,7 +22,7 @@ // Includes. #include "../BufferStruct.mqh" -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "../Storage/ValueStorage.all.h" // Structs. diff --git a/Indicators/Indi_RS.mqh b/Indicators/Indi_RS.mqh index cdec53c54..515f8e125 100644 --- a/Indicators/Indi_RS.mqh +++ b/Indicators/Indi_RS.mqh @@ -22,7 +22,7 @@ // Includes. #include "../BufferStruct.mqh" -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "OHLC/Indi_OHLC.mqh" #include "Special/Indi_Math.mqh" diff --git a/Indicators/Indi_RSI.mqh b/Indicators/Indi_RSI.mqh index 12effe6ba..306be9081 100644 --- a/Indicators/Indi_RSI.mqh +++ b/Indicators/Indi_RSI.mqh @@ -22,7 +22,7 @@ // Includes. #include "../DictStruct.mqh" -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "Indi_Bands.mqh" #include "Indi_CCI.mqh" #include "Indi_Envelopes.mqh" diff --git a/Indicators/Indi_RVI.mqh b/Indicators/Indi_RVI.mqh index ee5e1cdae..e5c729914 100644 --- a/Indicators/Indi_RVI.mqh +++ b/Indicators/Indi_RVI.mqh @@ -21,7 +21,7 @@ */ // Includes. -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #ifndef __MQL4__ // Defines global functions (for MQL4 backward compability). diff --git a/Indicators/Indi_RateOfChange.mqh b/Indicators/Indi_RateOfChange.mqh index d0b32d973..8747d997f 100644 --- a/Indicators/Indi_RateOfChange.mqh +++ b/Indicators/Indi_RateOfChange.mqh @@ -22,7 +22,7 @@ // Includes. #include "../BufferStruct.mqh" -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" // Structs. struct IndiRateOfChangeParams : IndicatorParams { diff --git a/Indicators/Indi_SAR.mqh b/Indicators/Indi_SAR.mqh index 942c75591..365120e9c 100644 --- a/Indicators/Indi_SAR.mqh +++ b/Indicators/Indi_SAR.mqh @@ -21,7 +21,7 @@ */ // Includes. -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #ifndef __MQL4__ // Defines global functions (for MQL4 backward compability). diff --git a/Indicators/Indi_StdDev.mqh b/Indicators/Indi_StdDev.mqh index 3ac1b8813..84aa6ba3b 100644 --- a/Indicators/Indi_StdDev.mqh +++ b/Indicators/Indi_StdDev.mqh @@ -28,7 +28,7 @@ */ // Includes. -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "../Storage/ObjectsCache.h" #include "Indi_MA.mqh" #include "Indi_PriceFeeder.mqh" diff --git a/Indicators/Indi_Stochastic.mqh b/Indicators/Indi_Stochastic.mqh index c97984370..e53ba96fc 100644 --- a/Indicators/Indi_Stochastic.mqh +++ b/Indicators/Indi_Stochastic.mqh @@ -21,7 +21,7 @@ */ // Includes. -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #ifndef __MQL4__ // Defines global functions (for MQL4 backward compability). diff --git a/Indicators/Indi_TEMA.mqh b/Indicators/Indi_TEMA.mqh index edf3399e1..bdb3610ab 100644 --- a/Indicators/Indi_TEMA.mqh +++ b/Indicators/Indi_TEMA.mqh @@ -22,7 +22,7 @@ // Includes. #include "../BufferStruct.mqh" -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "Indi_MA.mqh" // Structs. diff --git a/Indicators/Indi_TRIX.mqh b/Indicators/Indi_TRIX.mqh index d150e6a8e..b0e188597 100644 --- a/Indicators/Indi_TRIX.mqh +++ b/Indicators/Indi_TRIX.mqh @@ -22,7 +22,7 @@ // Includes. #include "../BufferStruct.mqh" -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "Indi_MA.mqh" // Structs. diff --git a/Indicators/Indi_UltimateOscillator.mqh b/Indicators/Indi_UltimateOscillator.mqh index 35ed7b246..d981df0dd 100644 --- a/Indicators/Indi_UltimateOscillator.mqh +++ b/Indicators/Indi_UltimateOscillator.mqh @@ -22,7 +22,7 @@ // Includes. #include "../BufferStruct.mqh" -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "../Storage/ValueStorage.all.h" #include "Indi_ATR.mqh" #include "Indi_MA.mqh" diff --git a/Indicators/Indi_VIDYA.mqh b/Indicators/Indi_VIDYA.mqh index 2538f840f..c791e2a3a 100644 --- a/Indicators/Indi_VIDYA.mqh +++ b/Indicators/Indi_VIDYA.mqh @@ -22,7 +22,7 @@ // Includes. #include "../BufferStruct.mqh" -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" // Structs. struct IndiVIDYAParams : IndicatorParams { diff --git a/Indicators/Indi_VROC.mqh b/Indicators/Indi_VROC.mqh index 22160c8ad..92601ea96 100644 --- a/Indicators/Indi_VROC.mqh +++ b/Indicators/Indi_VROC.mqh @@ -22,7 +22,7 @@ // Includes. #include "../BufferStruct.mqh" -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "../Storage/ValueStorage.all.h" // Structs. diff --git a/Indicators/Indi_Volumes.mqh b/Indicators/Indi_Volumes.mqh index 7a21ad30d..d6f147e72 100644 --- a/Indicators/Indi_Volumes.mqh +++ b/Indicators/Indi_Volumes.mqh @@ -22,7 +22,7 @@ // Includes. #include "../BufferStruct.mqh" -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "../Storage/ValueStorage.all.h" // Structs. diff --git a/Indicators/Indi_WPR.mqh b/Indicators/Indi_WPR.mqh index 3366b93fe..42ef81b00 100644 --- a/Indicators/Indi_WPR.mqh +++ b/Indicators/Indi_WPR.mqh @@ -21,7 +21,7 @@ */ // Includes. -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #ifndef __MQL4__ // Defines global functions (for MQL4 backward compability). diff --git a/Indicators/Indi_WilliamsAD.mqh b/Indicators/Indi_WilliamsAD.mqh index a887ea1ac..25e624bdf 100644 --- a/Indicators/Indi_WilliamsAD.mqh +++ b/Indicators/Indi_WilliamsAD.mqh @@ -22,7 +22,7 @@ // Includes. #include "../BufferStruct.mqh" -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "../Storage/ValueStorage.all.h" // Structs. diff --git a/Indicators/Indi_ZigZag.mqh b/Indicators/Indi_ZigZag.mqh index 772cc6f0c..f816404e3 100644 --- a/Indicators/Indi_ZigZag.mqh +++ b/Indicators/Indi_ZigZag.mqh @@ -21,7 +21,7 @@ */ // Includes. -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "../Storage/ValueStorage.all.h" // Defines. diff --git a/Indicators/Indi_ZigZagColor.mqh b/Indicators/Indi_ZigZagColor.mqh index 0cfb2cd21..5645a1470 100644 --- a/Indicators/Indi_ZigZagColor.mqh +++ b/Indicators/Indi_ZigZagColor.mqh @@ -22,7 +22,7 @@ // Includes. #include "../BufferStruct.mqh" -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "../Storage/ValueStorage.all.h" #include "Indi_ZigZag.mqh" diff --git a/Indicators/OHLC/Indi_OHLC.mqh b/Indicators/OHLC/Indi_OHLC.mqh index 82c5ca8dd..bfe451d70 100644 --- a/Indicators/OHLC/Indi_OHLC.mqh +++ b/Indicators/OHLC/Indi_OHLC.mqh @@ -22,7 +22,7 @@ // Includes. #include "../../BufferStruct.mqh" -#include "../../Indicator.mqh" +#include "../../Indicator/Indicator.h" #include "../../Storage/Objects.h" // Enums. diff --git a/Indicators/Price/Indi_Price.mqh b/Indicators/Price/Indi_Price.mqh index e6fe78681..e397873e4 100644 --- a/Indicators/Price/Indi_Price.mqh +++ b/Indicators/Price/Indi_Price.mqh @@ -22,7 +22,7 @@ // Includes. #include "../../BufferStruct.mqh" -#include "../../Indicator.mqh" +#include "../../Indicator/Indicator.h" #include "../../Platform.h" #include "../../Storage/Objects.h" diff --git a/Indicators/Special/Indi_Custom.mqh b/Indicators/Special/Indi_Custom.mqh index 2cd122a82..9e2d5d62c 100644 --- a/Indicators/Special/Indi_Custom.mqh +++ b/Indicators/Special/Indi_Custom.mqh @@ -33,7 +33,7 @@ #endif // Includes. -#include "../../Indicator.mqh" +#include "../../Indicator/Indicator.h" // Structs. diff --git a/Indicators/Special/Indi_Math.mqh b/Indicators/Special/Indi_Math.mqh index 734a551bc..4869c8311 100644 --- a/Indicators/Special/Indi_Math.mqh +++ b/Indicators/Special/Indi_Math.mqh @@ -22,7 +22,7 @@ // Includes. #include "../../BufferStruct.mqh" -#include "../../Indicator.mqh" +#include "../../Indicator/Indicator.h" #include "../../Math.enum.h" enum ENUM_MATH_OP_MODE { MATH_OP_MODE_BUILTIN, MATH_OP_MODE_CUSTOM_FUNCTION }; diff --git a/Math.h b/Math.h index 691837b31..2460f7e61 100644 --- a/Math.h +++ b/Math.h @@ -27,7 +27,7 @@ // Includes. #include "Data.struct.h" -#include "Indicator.struct.h" +#include "Indicator/Indicator.struct.h" #include "Math.define.h" #include "Math.enum.h" #include "Math.extern.h" diff --git a/Platform.h b/Platform.h index bbd755349..5736fad57 100644 --- a/Platform.h +++ b/Platform.h @@ -27,7 +27,7 @@ */ #include "Flags.h" -#include "IndicatorBase.h" +#include "Indicator/IndicatorBase.h" #include "Std.h" #ifdef __MQLBUILD__ diff --git a/Strategy.mqh b/Strategy.mqh index 1e480bd1b..427d6cc75 100644 --- a/Strategy.mqh +++ b/Strategy.mqh @@ -30,7 +30,7 @@ class Trade; // Includes. #include "Data.struct.h" #include "Dict.mqh" -#include "Indicator.mqh" +#include "Indicator/Indicator.h" #include "Market.mqh" #include "Object.mqh" #include "Strategy.enum.h" diff --git a/Terminal.enum.h b/Terminal.enum.h index 6c12c13cc..574615a23 100644 --- a/Terminal.enum.h +++ b/Terminal.enum.h @@ -31,7 +31,7 @@ #endif // Includes. -#include "Indicator.define.h" +#include "Indicator/Indicator.define.h" // Defines user error enumeration. enum ENUM_USER_ERR { USER_ERR_INVALID_ARGUMENT }; diff --git a/Tests.mqh b/Tests.mqh index 55c549aa8..d4a3d3463 100644 --- a/Tests.mqh +++ b/Tests.mqh @@ -21,7 +21,7 @@ */ // Includes. -#include "Indicator.mqh" +#include "Indicator/Indicator.h" #include "Market.mqh" /** diff --git a/Trade.mqh b/Trade.mqh index 41aa0cca5..7b88f0f44 100644 --- a/Trade.mqh +++ b/Trade.mqh @@ -34,7 +34,7 @@ class Trade; #include "Chart.mqh" #include "Convert.mqh" #include "DictStruct.mqh" -#include "IndicatorBase.h" +#include "Indicator/IndicatorBase.h" #include "Math.h" #include "Object.mqh" #include "Order.mqh" diff --git a/tests/CompileTest.mq5 b/tests/CompileTest.mq5 index 63fcdbb04..97bc1cf6f 100644 --- a/tests/CompileTest.mq5 +++ b/tests/CompileTest.mq5 @@ -60,9 +60,6 @@ #include "../EA.mqh" #include "../File.mqh" #include "../ISerializable.h" -#include "../Indicator.define.h" -#include "../Indicator.mqh" -//#include "../IndicatorData.mqh" // @removeme #include "../Inet.mqh" #include "../Log.mqh" #include "../MD5.mqh" @@ -130,6 +127,10 @@ #include "../Web.mqh" // Includes indicator files. +#include "../Indicator/Indicator.define.h" +#include "../Indicator/Indicator.h" +#include "../Indicator/IndicatorBase.h" +//#include "../Indicator/IndicatorData.h" #include "../Indicators/indicators.h" /** diff --git a/tests/DrawIndicatorTest.mq5 b/tests/DrawIndicatorTest.mq5 index d2cd56dc9..943ff92e0 100644 --- a/tests/DrawIndicatorTest.mq5 +++ b/tests/DrawIndicatorTest.mq5 @@ -30,7 +30,7 @@ // Includes. #include "../DictStruct.mqh" #include "../DrawIndicator.mqh" -#include "../Indicator.struct.serialize.h" +#include "../Indicator/Indicator.struct.serialize.h" #include "../Indicators/Indi_Bands.mqh" #include "../Indicators/Indi_Demo.mqh" #include "../Indicators/Indi_MA.mqh" diff --git a/tests/IndicatorsTest.mq5 b/tests/IndicatorsTest.mq5 index a46474fb8..0c80d5c8d 100644 --- a/tests/IndicatorsTest.mq5 +++ b/tests/IndicatorsTest.mq5 @@ -35,7 +35,7 @@ struct DataParamEntry; //#include "../ChartMt.h" #include "../Dict.mqh" #include "../DictObject.mqh" -#include "../Indicator.mqh" +#include "../Indicator/Indicator.h" #include "../Indicator/tests/classes/IndicatorTfDummy.h" #include "../Indicators/Bitwise/indicators.h" #include "../Indicators/Tick/Indi_TickMt.mqh"