fly/flightgear
1
0
Fork 0
Code Activity

Add-ons: whitespace-strip every leaf node contents in addon-metadata.xml files

Browse source 
All nodes were already stripped except <version>, <min-FG-version> and
<max-FG-version>; these are the ones affected by this change.
This commit is contained in:
Florent Rougon 2017-12-21 08:14:18 +01:00
parent ec349c6ac5
commit ccfb0d78ae
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Add-ons/Addon.cxx
View file

@ -370,7 +370,7 @@ Addon Addon::fromAddonDir(const SGPath& addonPath)
"no /addon/version node found in add-on metadata file '" + "no /addon/version node found in add-on metadata file '" +
metadataFile.utf8Str() + "'"); metadataFile.utf8Str() + "'");
} }
AddonVersion addonVersion(versionNode->getStringValue()); AddonVersion addonVersion(strutils::strip(versionNode->getStringValue()));
string addonAuthors; string addonAuthors;
SGPropertyNode *authorsNode = addonNode->getChild("authors"); SGPropertyNode *authorsNode = addonNode->getChild("authors");
@ -413,13 +413,13 @@ Addon Addon::fromAddonDir(const SGPath& addonPath)
string addonMinFGVersionRequired; string addonMinFGVersionRequired;
SGPropertyNode *minNode = addonNode->getChild("min-FG-version"); SGPropertyNode *minNode = addonNode->getChild("min-FG-version");
if (minNode != nullptr) { if (minNode != nullptr) {
addonMinFGVersionRequired = minNode->getStringValue(); addonMinFGVersionRequired = strutils::strip(minNode->getStringValue());
} }
string addonMaxFGVersionRequired; string addonMaxFGVersionRequired;
SGPropertyNode *maxNode = addonNode->getChild("max-FG-version"); SGPropertyNode *maxNode = addonNode->getChild("max-FG-version");
if (maxNode != nullptr) { if (maxNode != nullptr) {
addonMaxFGVersionRequired = maxNode->getStringValue(); addonMaxFGVersionRequired = strutils::strip(maxNode->getStringValue());
} }
string addonHomePage, addonDownloadUrl, addonSupportUrl, addonCodeRepoUrl; string addonHomePage, addonDownloadUrl, addonSupportUrl, addonCodeRepoUrl;