atiran/porymap
3
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Removing optional

Browse source 
- C++11 compliance: there's no optional, so use invalid enum value instead.
This commit is contained in:
tustin2121 2022-09-01 13:29:05 -04:00
parent 09a590e01a
commit d97ed4b64f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/config.cpp
View file

@ -59,11 +59,11 @@ const QMap<ProjectFilePath, std::pair<QString, QString>> defaultPaths = {
{ProjectFilePath::path_initial_facing_table, { "path_initial_facing_table", "src/event_object_movement.c"}}, {ProjectFilePath::path_initial_facing_table, { "path_initial_facing_table", "src/event_object_movement.c"}},
}; };
std::optional<ProjectFilePath> reverseDefaultPaths(QString str) { ProjectFilePath reverseDefaultPaths(QString str) {
for (auto it = defaultPaths.constKeyValueBegin(); it != defaultPaths.constKeyValueEnd(); ++it) { for (auto it = defaultPaths.constKeyValueBegin(); it != defaultPaths.constKeyValueEnd(); ++it) {
if ((*it).second.first == str) return (*it).first; if ((*it).second.first == str) return (*it).first;
} }
return std::nullopt; return static_cast<ProjectFilePath>(-1);
} }
@ -561,8 +561,8 @@ void ProjectConfig::parseConfigKeyValue(QString key, QString value) {
#endif #endif
} else if (key.startsWith("path/")) { } else if (key.startsWith("path/")) {
auto k = reverseDefaultPaths(key.mid(5)); auto k = reverseDefaultPaths(key.mid(5));
if (k.has_value()) { if (k != static_cast<ProjectFilePath>(-1)) {
this->filePaths[k.value()] = value; this->filePaths[k] = value;
} else { } else {
logWarn(QString("Invalid config key found in config file %1: '%2'").arg(this->getConfigFilepath()).arg(key)); logWarn(QString("Invalid config key found in config file %1: '%2'").arg(this->getConfigFilepath()).arg(key));
} }