From 3ae2fe3272782af0459e40f2605d88927fc86678 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 9 Sep 2023 12:02:56 -0500
Subject: [PATCH] refactor: PR review cleanup

---
 include/modules/hyprland/workspaces.hpp |  2 +-
 include/util/enum.hpp                   | 21 ++++++++++-----------
 src/modules/hyprland/workspaces.cpp     |  2 +-
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/include/modules/hyprland/workspaces.hpp b/include/modules/hyprland/workspaces.hpp
index 7c4d919e..14b9ba0e 100644
--- a/include/modules/hyprland/workspaces.hpp
+++ b/include/modules/hyprland/workspaces.hpp
@@ -88,7 +88,7 @@ class Workspaces : public AModule, public EventHandler {
   bool show_special_ = false;
   bool active_only_ = false;
 
-  enum SORT_METHOD { ID, NAME, NUMBER, DEFAULT };
+  enum class SORT_METHOD { ID, NAME, NUMBER, DEFAULT };
   util::EnumParser<SORT_METHOD> enum_parser_;
   SORT_METHOD sort_by_ = SORT_METHOD::DEFAULT;
   std::map<std::string, SORT_METHOD> sort_map_ = {{"ID", SORT_METHOD::ID},
diff --git a/include/util/enum.hpp b/include/util/enum.hpp
index 7ee80694..a4239bd2 100644
--- a/include/util/enum.hpp
+++ b/include/util/enum.hpp
@@ -12,20 +12,19 @@ template <typename EnumType>
 struct EnumParser {
   EnumParser() {}
 
-  EnumType sortStringToEnum(const std::string& str,
-                            const std::map<std::string, EnumType>& enumMap) {
+  EnumType parseStringToEnum(const std::string& str,
+                             const std::map<std::string, EnumType>& enumMap) {
     // Convert the input string to uppercase
-    std::string uppercaseStr;
-    for (char c : str) {
-      uppercaseStr += std::toupper(c);
-    }
+    std::string uppercaseStr = str;
+    std::transform(uppercaseStr.begin(), uppercaseStr.end(), uppercaseStr.begin(),
+                   [](unsigned char c) { return std::toupper(c); });
 
+    // Return enum match of string
     auto it = enumMap.find(uppercaseStr);
-    if (it != enumMap.end()) {
-      return it->second;
-    } else {
-      throw std::invalid_argument("Invalid string representation for enum");
-    }
+    if (it != enumMap.end()) return it->second;
+
+    // Throw error if it doesnt return
+    throw std::invalid_argument("Invalid string representation for enum");
   }
 
   ~EnumParser() = default;
diff --git a/src/modules/hyprland/workspaces.cpp b/src/modules/hyprland/workspaces.cpp
index 21a2a8f7..91da69de 100644
--- a/src/modules/hyprland/workspaces.cpp
+++ b/src/modules/hyprland/workspaces.cpp
@@ -61,7 +61,7 @@ auto Workspaces::parse_config(const Json::Value &config) -> void {
   if (config_sort_by.isString()) {
     auto sort_by_str = config_sort_by.asString();
     try {
-      sort_by_ = enum_parser_.sortStringToEnum(sort_by_str, sort_map_);
+      sort_by_ = enum_parser_.parseStringToEnum(sort_by_str, sort_map_);
     } catch (const std::invalid_argument &e) {
       // Handle the case where the string is not a valid enum representation.
       sort_by_ = SORT_METHOD::DEFAULT;