Merge with develop

--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-09-25 10:50:38 +02:00
commit 881e5457ac

View file

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