refactor: PR review cleanup

Alexays · Sep 9, 2023 · eb11b6a · eb11b6a
1 parent 2b8c92e
commit eb11b6a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git 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
@@ -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;