summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface
diff options
context:
space:
mode:
authormitaclaw <140017135+mitaclaw@users.noreply.github.com>2024-09-22 00:24:21 -0700
committermitaclaw <140017135+mitaclaw@users.noreply.github.com>2024-09-22 21:09:36 -0700
commit5f906736863f35a7018aaa11a7cac408229c21cf (patch)
tree5449078c9489852efa511803cd06e3e8bc5c7728 /Source/Core/InputCommon/ControllerInterface
parentde67c4c93bd15846f68df4006dd2c93fba5720d2 (diff)
StringUtil: Remove `JoinStrings`
With 12 uses of `JoinStrings` in the codebase vs 36 uses of `fmt::join`, fmtlib's range adapter for string concatenation with delimiters is clearly the preferred option.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/MappingCommon.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/MappingCommon.cpp b/Source/Core/InputCommon/ControllerInterface/MappingCommon.cpp
index 56bab1a981..4acee6a970 100644
--- a/Source/Core/InputCommon/ControllerInterface/MappingCommon.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/MappingCommon.cpp
@@ -9,6 +9,7 @@
#include <vector>
#include <fmt/format.h>
+#include <fmt/ranges.h>
#include "Common/StringUtil.h"
#include "InputCommon/ControllerInterface/CoreDevice.h"
@@ -96,12 +97,12 @@ BuildExpression(const std::vector<ciface::Core::DeviceContainer::InputDetection>
if (is_hotkey)
{
- alternations.push_back(fmt::format("@({})", JoinStrings(alternation, "+")));
+ alternations.push_back(fmt::format("@({})", fmt::join(alternation, "+")));
}
else
{
std::sort(alternation.begin(), alternation.end());
- alternations.push_back(JoinStrings(alternation, "&"));
+ alternations.push_back(fmt::to_string(fmt::join(alternation, "&")));
}
};
@@ -130,7 +131,7 @@ BuildExpression(const std::vector<ciface::Core::DeviceContainer::InputDetection>
std::sort(alternations.begin(), alternations.end());
alternations.erase(std::unique(alternations.begin(), alternations.end()), alternations.end());
- return JoinStrings(alternations, "|");
+ return fmt::to_string(fmt::join(alternations, "|"));
}
void RemoveSpuriousTriggerCombinations(