Refactor all new MQL5 Version Compiling Issues ...
This commit is contained in:
@@ -80,14 +80,14 @@ string GenerateSpecifiedCommonSummary(
|
||||
: "Commons:" + separator) +
|
||||
"---------------" + separator +
|
||||
"Symbol: " + mItem.symbol + separator +
|
||||
"Period: " + ToString(mItem.period) + separator +
|
||||
"Time: " + ToString(mItem.time) + separator +
|
||||
"Period: " + ToXString(mItem.period) + separator +
|
||||
"Time: " + ToXString(mItem.time) + separator +
|
||||
(includeScores
|
||||
? "---------------" + separator +
|
||||
"Scores:" + separator +
|
||||
"---------------" + separator +
|
||||
"Bullish: " + ToString(bullishScore) + separator +
|
||||
"Bearish: " + ToString(bearishScore) + separator +
|
||||
"Bullish: " + ToXString(bullishScore) + separator +
|
||||
"Bearish: " + ToXString(bearishScore) + separator +
|
||||
"---------------" + separator
|
||||
: "") +
|
||||
""
|
||||
|
||||
@@ -1388,7 +1388,7 @@ class XCAlert : public XCBase
|
||||
|
||||
//
|
||||
// Attach Time ...
|
||||
string savedMessage = ToString(TimeCurrent()) + " " + message;
|
||||
string savedMessage = ToXString(TimeCurrent()) + " " + message;
|
||||
|
||||
//
|
||||
bool has = collector.Append(
|
||||
|
||||
@@ -616,7 +616,7 @@ class XCSignalObject : public XCBaseObject
|
||||
for (int i = 0; i < targetsCount; i++)
|
||||
{
|
||||
//
|
||||
string targetName = ToString(X_TARGET) + "_" + ToString(i) + "_" + nameMD5;
|
||||
string targetName = ToString(X_TARGET) + "_" + ToXString(i) + "_" + nameMD5;
|
||||
CChartObjectTrend *mTargetTrend;
|
||||
mTargetTrend = new CChartObjectTrend();
|
||||
result = mTargetTrend.Create(
|
||||
|
||||
@@ -139,11 +139,11 @@ struct XGuard
|
||||
//
|
||||
result =
|
||||
//
|
||||
IsValid(time) &&
|
||||
IsValid(symbol) &&
|
||||
IsValid(period) &&
|
||||
IsValid(action) &&
|
||||
IsValid(provider)
|
||||
IsSpecifiedValid(time) &&
|
||||
IsSpecifiedValid(symbol) &&
|
||||
IsSpecifiedValid(period) &&
|
||||
IsSpecifiedValid(action) &&
|
||||
IsSpecifiedValid(provider)
|
||||
//
|
||||
;
|
||||
|
||||
@@ -175,6 +175,10 @@ bool IsValid(ENUM_X_GUARD_ACTIONS item)
|
||||
//
|
||||
return result;
|
||||
}
|
||||
bool IsSpecifiedValid(ENUM_X_GUARD_ACTIONS item)
|
||||
{
|
||||
return IsValid(item);
|
||||
}
|
||||
|
||||
/**
|
||||
* Add Guard to Collection ...
|
||||
@@ -1004,8 +1008,8 @@ class XCGuard : public XCBase
|
||||
//
|
||||
string message =
|
||||
"Guard Closed " +
|
||||
ToString(position.type) +
|
||||
" Position (" + ToString(position.ticket) + ") Successfully ...";
|
||||
ToXString(position.type) +
|
||||
" Position (" + ToXString(position.ticket) + ") Successfully ...";
|
||||
|
||||
//
|
||||
alert.SendAlert(message);
|
||||
@@ -1069,7 +1073,7 @@ class XCGuard : public XCBase
|
||||
//
|
||||
string message =
|
||||
"Guard Closed " +
|
||||
ToString(count) +
|
||||
ToXString(count) +
|
||||
" Positions Successfully ...";
|
||||
|
||||
//
|
||||
@@ -1134,7 +1138,7 @@ class XCGuard : public XCBase
|
||||
//
|
||||
string message =
|
||||
"Guard Closed " +
|
||||
ToString(count) +
|
||||
ToXString(count) +
|
||||
" In Lost Positions Successfully ...";
|
||||
|
||||
//
|
||||
@@ -1199,7 +1203,7 @@ class XCGuard : public XCBase
|
||||
//
|
||||
string message =
|
||||
"Guard Closed " +
|
||||
ToString(count) +
|
||||
ToXString(count) +
|
||||
" In Profit Positions Successfully ...";
|
||||
|
||||
//
|
||||
@@ -1264,7 +1268,7 @@ class XCGuard : public XCBase
|
||||
//
|
||||
string message =
|
||||
"Guard Closed " +
|
||||
ToString(count) +
|
||||
ToXString(count) +
|
||||
" Long Positions Successfully ...";
|
||||
|
||||
//
|
||||
@@ -1329,7 +1333,7 @@ class XCGuard : public XCBase
|
||||
//
|
||||
string message =
|
||||
"Guard Closed " +
|
||||
ToString(count) +
|
||||
ToXString(count) +
|
||||
" In Lost Longs Positions Successfully ...";
|
||||
|
||||
//
|
||||
@@ -1394,7 +1398,7 @@ class XCGuard : public XCBase
|
||||
//
|
||||
string message =
|
||||
"Guard Closed " +
|
||||
ToString(count) +
|
||||
ToXString(count) +
|
||||
" In Profit Longs Positions Successfully ...";
|
||||
|
||||
//
|
||||
@@ -1476,7 +1480,7 @@ class XCGuard : public XCBase
|
||||
//
|
||||
string message =
|
||||
"Guard Closed " +
|
||||
ToString(count) +
|
||||
ToXString(count) +
|
||||
" In Lost Shorts Positions Successfully ...";
|
||||
|
||||
//
|
||||
@@ -1541,7 +1545,7 @@ class XCGuard : public XCBase
|
||||
//
|
||||
string message =
|
||||
"Guard Closed " +
|
||||
ToString(count) +
|
||||
ToXString(count) +
|
||||
" In Profit Shorts Positions Successfully ...";
|
||||
|
||||
//
|
||||
@@ -1619,7 +1623,7 @@ class XCGuard : public XCBase
|
||||
);
|
||||
|
||||
//
|
||||
string comment = "Guard Partially Closed: " + ToString(volume) + " ...";
|
||||
string comment = "Guard Partially Closed: " + ToXString(volume) + " ...";
|
||||
|
||||
//
|
||||
has = trader.ClosePartial(
|
||||
@@ -1632,9 +1636,9 @@ class XCGuard : public XCBase
|
||||
//
|
||||
string message =
|
||||
"Guard Closed Partially " +
|
||||
ToString(volume) + " of " +
|
||||
ToString(position.type) +
|
||||
" Position (" + ToString(position.ticket) + ") Successfully ...";
|
||||
ToXString(volume) + " of " +
|
||||
ToXString(position.type) +
|
||||
" Position (" + ToXString(position.ticket) + ") Successfully ...";
|
||||
|
||||
//
|
||||
alert.SendAlert(message);
|
||||
@@ -1739,10 +1743,10 @@ class XCGuard : public XCBase
|
||||
//
|
||||
string message =
|
||||
"Guard Trail Stop " +
|
||||
ToString(position.type) +
|
||||
" Position (" + ToString(position.ticket) + ")" +
|
||||
" From: " + ToString(before) +
|
||||
"To: " + ToString(after) +
|
||||
ToXString(position.type) +
|
||||
" Position (" + ToXString(position.ticket) + ")" +
|
||||
" From: " + ToXString(before) +
|
||||
"To: " + ToXString(after) +
|
||||
" Successfully ...";
|
||||
|
||||
//
|
||||
@@ -1844,10 +1848,10 @@ class XCGuard : public XCBase
|
||||
//
|
||||
string message =
|
||||
"Guard Trail Target " +
|
||||
ToString(position.type) +
|
||||
" Position (" + ToString(position.ticket) + ")" +
|
||||
" From: " + ToString(before) +
|
||||
"To: " + ToString(after) +
|
||||
ToXString(position.type) +
|
||||
" Position (" + ToXString(position.ticket) + ")" +
|
||||
" From: " + ToXString(before) +
|
||||
"To: " + ToXString(after) +
|
||||
" Successfully ...";
|
||||
|
||||
//
|
||||
@@ -1980,9 +1984,9 @@ class XCGuard : public XCBase
|
||||
//
|
||||
string message =
|
||||
"Guard Hedge " +
|
||||
ToString(closedCount) +
|
||||
ToXString(closedCount) +
|
||||
" Positions by: " +
|
||||
ToString(hedgeValue) +
|
||||
ToXString(hedgeValue) +
|
||||
" Successfully ...";
|
||||
|
||||
//
|
||||
|
||||
@@ -111,7 +111,7 @@ class XCBaseHelper : public XCBase
|
||||
GetToken() +
|
||||
"[" +
|
||||
GetSymbol() + "|" +
|
||||
ToString(GetPeriod()) +
|
||||
ToXString(GetPeriod()) +
|
||||
"]"
|
||||
//
|
||||
;
|
||||
|
||||
@@ -625,8 +625,8 @@ class XCPOIDrawer : public XCBase
|
||||
{
|
||||
//
|
||||
name = "XBox_" +
|
||||
ToString(upper) + "_" +
|
||||
ToString(lower) + "_" +
|
||||
ToXString(upper) + "_" +
|
||||
ToXString(lower) + "_" +
|
||||
dateMD5;
|
||||
}
|
||||
|
||||
|
||||
@@ -1108,21 +1108,21 @@ class XCRMPanel : public XCAppDialog
|
||||
volume = NormalizeVolume(volume, _Symbol);
|
||||
|
||||
//
|
||||
string slDesc = "SL: " + ToString(sl) +
|
||||
", Risk: " + ToString(riskPoints) + " pt (" + ToString(riskPercent) + "%)" +
|
||||
", Amount: " + ToString(riskAmount) + currency;
|
||||
string slDesc = "SL: " + ToXString(sl) +
|
||||
", Risk: " + ToXString(riskPoints) + " pt (" + ToXString(riskPercent) + "%)" +
|
||||
", Amount: " + ToXString(riskAmount) + currency;
|
||||
slLine.Tooltip(slDesc);
|
||||
slLine.Description(slDesc);
|
||||
|
||||
//
|
||||
string tpDesc = "TP: " + ToString(tp) + " (" + ToString(rewardAmount) + " " + currency + ")" +
|
||||
", R2R: 1:" + ToString(riskRewardRatio);
|
||||
string tpDesc = "TP: " + ToXString(tp) + " (" + ToXString(rewardAmount) + " " + currency + ")" +
|
||||
", R2R: 1:" + ToXString(riskRewardRatio);
|
||||
tpLine.Tooltip(tpDesc);
|
||||
tpLine.Description(tpDesc);
|
||||
|
||||
//
|
||||
string entryDesc = "Entry: " + ToString(entry) +
|
||||
", Volume: " + ToString(volume);
|
||||
string entryDesc = "Entry: " + ToXString(entry) +
|
||||
", Volume: " + ToXString(volume);
|
||||
entryLine.Tooltip(entryDesc);
|
||||
entryLine.Description(entryDesc);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user