Trim enum strings of leading/tailing whitespace

mavlink · Sep 23, 2024 · a1ca9ce · a1ca9ce
1 parent ad472f0
commit a1ca9ce
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/FactSystem/FactMetaData.cc b/src/FactSystem/FactMetaData.cc
@@ -1464,10 +1464,16 @@ bool FactMetaData::_parseEnum(const QJsonObject& jsonObject, DefineMap_t defineM
     QString jsonStrings = jsonObject.value(_enumStringsJsonKey).toString();
     QString defineMapStrings = defineMap.value(jsonStrings, jsonStrings);
     rgDescriptions = defineMapStrings.split(",", Qt::SkipEmptyParts);
+    for (auto& desc: rgDescriptions) {
+        desc = desc.trimmed();
+    }
 
     QString jsonValues = jsonObject.value(_enumValuesJsonKey).toString();
     QString defineMapValues = defineMap.value(jsonValues, jsonValues);
     rgValues = defineMapValues.split(",", Qt::SkipEmptyParts);
+    for (auto& value: rgValues) {
+        value = value.trimmed();
+    }
 
     if (rgDescriptions.count() != rgValues.count()) {
         errorString = QStringLiteral("Enum strings/values count mismatch - strings: '%1'[%2,%3] values: '%4'[%5,%6]").arg(defineMapStrings).arg(rgDescriptions.count()).arg(defineMapStrings.contains(",")).arg(defineMapValues).arg(rgValues.count()).arg(defineMapValues.contains(","));