Merge with develop

--HG--
branch : compatibility-develop
hg/compatibility-develop
kervala 8 years ago
commit 881e5457ac

@ -418,7 +418,7 @@ void CCmdArgs::displayHelp()
if (!_Description.empty())
{
printf("\n%s", _Description.c_str());
printf("\n%s\n", _Description.c_str());
}
printf("\nWhere options are:\n");
@ -443,7 +443,6 @@ void CCmdArgs::displayHelp()
if (!arg.helpName.empty())
{
syntaxes.push_back(toString("-%s <%s>", arg.shortName.c_str(), arg.helpName.c_str()));
syntaxes.push_back(toString("-%s<%s>", arg.shortName.c_str(), arg.helpName.c_str()));
}
else
{
@ -459,12 +458,6 @@ void CCmdArgs::displayHelp()
// display first syntax for long argument, --arg <value>
syntaxes.push_back(toString("--%s <%s>", arg.longName.c_str(), arg.helpName.c_str()));
}
if (!arg.helpName.empty())
{
// display second syntax for long argument, --arg=<value>
syntaxes.push_back(toString("--%s=<%s>", arg.longName.c_str(), arg.helpName.c_str()));
}
else
{
syntaxes.push_back(toString("--%s", arg.longName.c_str()));

Loading…
Cancel
Save