From 32a127d2e0c0a624d12cf9570905fec264554550 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Sat, 1 Mar 2025 16:06:32 +0000 Subject: Avoid the use of ConvToStr in string concatenation. This function calls INSP_FORMAT in most cases nowadays so we may as well just call that manually. --- src/configparser.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/configparser.cpp') diff --git a/src/configparser.cpp b/src/configparser.cpp index 457840b71..25f97b727 100644 --- a/src/configparser.cpp +++ b/src/configparser.cpp @@ -348,7 +348,7 @@ FilePosition::FilePosition(const std::string& Name, unsigned long Line, unsigned std::string FilePosition::str() const { - return name + ":" + ConvToStr(line) + ":" + ConvToStr(column); + return INSP_FORMAT("{}:{}:{}", name, line, column); } void ParseStack::DoInclude(const std::shared_ptr& tag, int flags) @@ -588,7 +588,7 @@ std::string ConfigTag::getString(const std::string& key, const std::string& def, if (res.length() < minlen || res.length() > maxlen) { - LogMalformed(key, res, def, "not between " + ConvToStr(minlen) + " and " + ConvToStr(maxlen) + " characters in length"); + LogMalformed(key, res, def, INSP_FORMAT("not between {} and {} characters in length", minlen, maxlen)); return def; } return res; @@ -629,7 +629,7 @@ namespace default: num = def; - tag->LogMalformed(key, val, ConvToStr(def), "contains an invalid magnitude specifier (" + ConvToStr(*tail) +")"); + tag->LogMalformed(key, val, ConvToStr(def), INSP_FORMAT("contains an invalid magnitude specifier ({})", *tail)); return; } } @@ -649,7 +649,7 @@ namespace if (num >= min && num <= max) return; - tag->LogMalformed(key, ConvToStr(num), ConvToStr(def), "not between " + ConvToStr(min) + " and " + ConvToStr(max)); + tag->LogMalformed(key, ConvToStr(num), ConvToStr(def), INSP_FORMAT("not between {} and {}", min, max)); num = def; } } -- cgit v1.3.1-10-gc9f91