diff --git a/src/framework/global/types/version.cpp b/src/framework/global/types/version.cpp index 8da036f5104e9..c57abae1d84dd 100644 --- a/src/framework/global/types/version.cpp +++ b/src/framework/global/types/version.cpp @@ -97,17 +97,17 @@ Version::Version(const mu::String& versionStr) setSuffix(versionStr.right(versionStr.size() - versionStr.indexOf(SUFFIX_DELIMITER) - 1)); } -int Version::major() const +int Version::majorVersion() const { return m_major; } -int Version::minor() const +int Version::minorVersion() const { return m_minor; } -int Version::patch() const +int Version::patchVersion() const { return m_patch; } @@ -148,15 +148,15 @@ mu::String Version::toString() bool Version::operator <(const Version& other) const { - if (m_major > other.major()) { + if (m_major > other.majorVersion()) { return false; - } else if (m_major == other.major()) { - if (m_minor > other.minor()) { + } else if (m_major == other.majorVersion()) { + if (m_minor > other.minorVersion()) { return false; - } else if (m_minor == other.minor()) { - if (m_patch > other.patch()) { + } else if (m_minor == other.minorVersion()) { + if (m_patch > other.patchVersion()) { return false; - } else if (m_patch == other.patch()) { + } else if (m_patch == other.patchVersion()) { if (m_suffix.isEmpty()) { return false; } @@ -203,9 +203,9 @@ bool Version::operator <(const Version& other) const bool Version::operator ==(const Version& other) const { - return m_major == other.major() - && m_minor == other.minor() - && m_patch == other.patch() + return m_major == other.majorVersion() + && m_minor == other.minorVersion() + && m_patch == other.patchVersion() && m_suffix == other.suffix() && m_suffixVersion == other.suffixVersion(); } diff --git a/src/framework/global/types/version.h b/src/framework/global/types/version.h index 6ed25c061b389..5f39982a458d3 100644 --- a/src/framework/global/types/version.h +++ b/src/framework/global/types/version.h @@ -31,9 +31,9 @@ class Version Version(int major, int minor = 0, int patch = 0, const String& suffix = String(), int suffixVersion = 0); Version(const String& versionStr); - int major() const; - int minor() const; - int patch() const; + int majorVersion() const; + int minorVersion() const; + int patchVersion() const; String suffix() const; int suffixVersion() const; diff --git a/src/framework/musesampler/internal/libhandler.h b/src/framework/musesampler/internal/libhandler.h index d37809112f979..8ae469204c505 100644 --- a/src/framework/musesampler/internal/libhandler.h +++ b/src/framework/musesampler/internal/libhandler.h @@ -271,7 +271,7 @@ struct MuseSamplerLibHandler // Major versions have incompatible changes; we can only support // interfaces we know about. // TODO: check when we fixed the issue with version numbers not reporting? Was this ever an issue? - if (current.major() > maximumMajorVersion) { + if (current.majorVersion() > maximumMajorVersion) { LOGE() << "MuseSampler " << current.toString() << " is not supported (too new -- update MuseScore); ignoring"; return; }