Skip to content
Permalink
Browse files

Simplify how parseElement splits element string (#9726)

  • Loading branch information
pyrollo committed Apr 25, 2020
1 parent cee3c5e commit 6cc5c7cbb489a429009e769a958f07da33a9d2ca
Showing with 4 additions and 16 deletions.
  1. +4 −16 src/gui/guiFormSpecMenu.cpp
@@ -2668,24 +2668,12 @@ void GUIFormSpecMenu::parseElement(parserData* data, const std::string &element)
if (parseVersionDirect(element))
return;

std::vector<std::string> parts = split(element,'[');

// ugly workaround to keep compatibility
if (parts.size() > 2) {
if (trim(parts[0]) == "image") {
for (unsigned int i=2;i< parts.size(); i++) {
parts[1] += "[" + parts[i];
}
}
else { return; }
}

if (parts.size() < 2) {
size_t pos = element.find('[');
if (pos == std::string::npos)
return;
}

std::string type = trim(parts[0]);
std::string description = trim(parts[1]);
std::string type = trim(element.substr(0, pos));
std::string description = element.substr(pos+1);

if (type == "container") {
parseContainer(data, description);

0 comments on commit 6cc5c7c

Please sign in to comment.
You can’t perform that action at this time.