From 1572c4602b4902960398f248a46e917cb05586af Mon Sep 17 00:00:00 2001 From: Nathan Miller Date: Sun, 12 May 2024 15:48:01 -0700 Subject: [PATCH] remove DesignType enum and EnumMap --- OdbDesignLib/App/RouteController.cpp | 8 ++++---- OdbDesignLib/enums.h | 11 +---------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/OdbDesignLib/App/RouteController.cpp b/OdbDesignLib/App/RouteController.cpp index f5485964..1590c14c 100644 --- a/OdbDesignLib/App/RouteController.cpp +++ b/OdbDesignLib/App/RouteController.cpp @@ -53,21 +53,21 @@ namespace Odb::Lib::App for (const auto& designName : unloadedDesignNames) { auto loaded = false; - auto designType = DesignType::FileArchive; + auto isDesign = false; if (std::find(loadedFileArchiveNames.begin(), loadedFileArchiveNames.end(), designName) != loadedFileArchiveNames.end()) { loaded = true; - designType = DesignType::FileArchive; + isDesign = false; } else if (std::find(loadedDesignNames.begin(), loadedDesignNames.end(), designName) != loadedDesignNames.end()) { loaded = true; - designType = DesignType::Design; + isDesign = true; } crow::json::wvalue design; design["name"] = designName; design["loaded"] = loaded; - design["type"] = designTypeMap.getValue(designType); + design["type"] = isDesign? "Design" : "FileArchive"; designs.push_back(design); } crow::json::wvalue jsonResponse; diff --git a/OdbDesignLib/enums.h b/OdbDesignLib/enums.h index 5f89b4c3..d91fce32 100644 --- a/OdbDesignLib/enums.h +++ b/OdbDesignLib/enums.h @@ -1,7 +1,5 @@ #pragma once -#include "EnumMap.h" - namespace Odb::Lib { enum class BoardSide @@ -34,12 +32,5 @@ namespace Odb::Lib { FileArchive, Design - }; - - static const Utils::EnumMap designTypeMap{ - { - "FileArchive", - "Design" - } - }; + }; }