From ab50672a9ad244e9c4499aeef40b005bb6d8b77f Mon Sep 17 00:00:00 2001 From: rettinghaus Date: Sun, 2 Feb 2025 14:35:53 +0100 Subject: [PATCH 1/3] fix typo --- libmei/addons/att.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmei/addons/att.cpp b/libmei/addons/att.cpp index e754eba041..b9f4d45796 100644 --- a/libmei/addons/att.cpp +++ b/libmei/addons/att.cpp @@ -668,7 +668,7 @@ data_PERCENT_LIMITED_SIGNED Att::StrToPercentLimitedSigned(const std::string &va { static const std::regex test("(+|-)?[0-9]+(\\.?[0-9]*)?%"); if (!std::regex_match(value, test)) { - if (logWarning) LogWarning("Unsupported data.PERCENT.LIMITED.SIGNEd '%s'", value.c_str()); + if (logWarning) LogWarning("Unsupported data.PERCENT.LIMITED.SIGNED '%s'", value.c_str()); return 0; } return atof(value.substr(0, value.find("%")).c_str()); From 68fa03c097abb88f41727e48502398a1e2c456f8 Mon Sep 17 00:00:00 2001 From: rettinghaus Date: Sun, 2 Feb 2025 14:38:42 +0100 Subject: [PATCH 2/3] reuse PercentToStr --- libmei/addons/att.cpp | 10 ---------- libmei/addons/att.h | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/libmei/addons/att.cpp b/libmei/addons/att.cpp index b9f4d45796..d99e63be16 100644 --- a/libmei/addons/att.cpp +++ b/libmei/addons/att.cpp @@ -644,11 +644,6 @@ data_PERCENT Att::StrToPercent(const std::string &value, bool logWarning) const return atof(value.substr(0, value.find("%")).c_str()); } -std::string Att::PercentLimitedToStr(data_PERCENT_LIMITED data) const -{ - return DblToStr(data) + "%"; -} - data_PERCENT_LIMITED Att::StrToPercentLimited(const std::string &value, bool logWarning) const { static const std::regex test("[0-9]+(\\.?[0-9]*)?%"); @@ -659,11 +654,6 @@ data_PERCENT_LIMITED Att::StrToPercentLimited(const std::string &value, bool log return atof(value.substr(0, value.find("%")).c_str()); } -std::string Att::PercentLimitedSignedToStr(data_PERCENT_LIMITED_SIGNED data) const -{ - return DblToStr(data) + "%"; -} - data_PERCENT_LIMITED_SIGNED Att::StrToPercentLimitedSigned(const std::string &value, bool logWarning) const { static const std::regex test("(+|-)?[0-9]+(\\.?[0-9]*)?%"); diff --git a/libmei/addons/att.h b/libmei/addons/att.h index bcf7a75ca4..6b900bdda2 100644 --- a/libmei/addons/att.h +++ b/libmei/addons/att.h @@ -132,10 +132,10 @@ class Att : public AttConverterBase { std::string PercentToStr(data_PERCENT data) const; data_PERCENT StrToPercent(const std::string &value, bool logWarning = true) const; - std::string PercentLimitedToStr(data_PERCENT_LIMITED_SIGNED data) const; + inline std::string PercentLimitedToStr(data_PERCENT_LIMITED_SIGNED data) const { return PercentToStr(data); } data_PERCENT_LIMITED StrToPercentLimited(const std::string &value, bool logWarning = true) const; - std::string PercentLimitedSignedToStr(data_PERCENT_LIMITED data) const; + inline std::string PercentLimitedSignedToStr(data_PERCENT_LIMITED data) const { return PercentToStr(data); } data_PERCENT_LIMITED_SIGNED StrToPercentLimitedSigned(const std::string &value, bool logWarning = true) const; std::string PitchnameToStr(data_PITCHNAME data) const; From 64d68e5892c07c6b2e8ca2e920649c116387788d Mon Sep 17 00:00:00 2001 From: rettinghaus Date: Mon, 3 Feb 2025 14:17:18 +0100 Subject: [PATCH 3/3] use inline --- libmei/addons/att.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libmei/addons/att.h b/libmei/addons/att.h index 6b900bdda2..24f0b96908 100644 --- a/libmei/addons/att.h +++ b/libmei/addons/att.h @@ -90,8 +90,11 @@ class Att : public AttConverterBase { std::string MeasurementsignedToStr(data_MEASUREMENTSIGNED data) const; data_MEASUREMENTSIGNED StrToMeasurementsigned(const std::string &value, bool logWarning = true) const; - std::string MeasurementunsignedToStr(data_MEASUREMENTUNSIGNED data) const { return MeasurementsignedToStr(data); } - data_MEASUREMENTUNSIGNED StrToMeasurementunsigned(const std::string &value, bool logWarning = true) const + inline std::string MeasurementunsignedToStr(data_MEASUREMENTUNSIGNED data) const + { + return MeasurementsignedToStr(data); + } + inline data_MEASUREMENTUNSIGNED StrToMeasurementunsigned(const std::string &value, bool logWarning = true) const { return StrToMeasurementsigned(value, logWarning); }