From d97ed4b64f3bca22f2ff91ffd00d6bc1d52801ab Mon Sep 17 00:00:00 2001 From: tustin2121 Date: Thu, 1 Sep 2022 13:29:05 -0400 Subject: [PATCH] Removing optional - C++11 compliance: there's no optional, so use invalid enum value instead. --- src/config.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/config.cpp b/src/config.cpp index 8cca9258..97f8ff7b 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -59,11 +59,11 @@ const QMap> defaultPaths = { {ProjectFilePath::path_initial_facing_table, { "path_initial_facing_table", "src/event_object_movement.c"}}, }; -std::optional reverseDefaultPaths(QString str) { +ProjectFilePath reverseDefaultPaths(QString str) { for (auto it = defaultPaths.constKeyValueBegin(); it != defaultPaths.constKeyValueEnd(); ++it) { if ((*it).second.first == str) return (*it).first; } - return std::nullopt; + return static_cast(-1); } @@ -561,8 +561,8 @@ void ProjectConfig::parseConfigKeyValue(QString key, QString value) { #endif } else if (key.startsWith("path/")) { auto k = reverseDefaultPaths(key.mid(5)); - if (k.has_value()) { - this->filePaths[k.value()] = value; + if (k != static_cast(-1)) { + this->filePaths[k] = value; } else { logWarn(QString("Invalid config key found in config file %1: '%2'").arg(this->getConfigFilepath()).arg(key)); }