Merge pull request rism-digital#3936 from rettinghaus/develop-inline

Use inline
rettinghaus · Feb 3, 2025 · fd96914 · fd96914
2 parents f4bf7d9 + 64d68e5
commit fd96914
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 15 deletions.
diff --git 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,16 +654,11 @@ 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]*)?%");
     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());

diff --git 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);
     }
@@ -132,10 +135,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;