Skip to content

Commit

Permalink
Rename remaining member
Browse files Browse the repository at this point in the history
  • Loading branch information
lpugin committed Jan 10, 2025
1 parent de0ca01 commit a45ffbe
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/importexport/mei/internal/meiimporter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ bool MeiImporter::read(const muse::io::path_t& path)
{
m_uids = UIDRegister::instance();
m_uids->clear();
m_hasMscoreIds = false;
m_hasMuseScoreIds = false;

m_lastMeasure = nullptr;
m_tremoloId.clear();
Expand Down Expand Up @@ -142,7 +142,7 @@ bool MeiImporter::read(const muse::io::path_t& path)
String xmlIdStr = String(xmlId.value());
if (xmlIdStr.startsWith(u"mscore-")) {
// Keep a global flag since we are going to read them only if mei@xml:id is given with LastEID
m_hasMscoreIds = true;
m_hasMuseScoreIds = true;
String valStr = xmlIdStr.remove(u"mscore-");
// The mei@xml:id store the LastEID
m_score->masterScore()->getEID()->init(valStr.toInt());
Expand Down Expand Up @@ -876,7 +876,7 @@ void MeiImporter::readXmlId(engraving::EngravingItem* item, const std::string& m
{
String xmlIdStr = String::fromStdString(meiUID);
// We have a file that has MuseScore EIDs and one on this element
if (m_hasMscoreIds && xmlIdStr.startsWith(u"mscore-")) {
if (m_hasMuseScoreIds && xmlIdStr.startsWith(u"mscore-")) {
String valStr = xmlIdStr.remove(u"mscore-");
EID eid = EID::fromStdString(valStr.toStdString());
if (!eid.isValid()) {
Expand Down
2 changes: 1 addition & 1 deletion src/importexport/mei/internal/meiimporter.h
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ class MeiImporter
UIDRegister* m_uids;

/** A flag indicating the file has MuseScore EIDs as xml:ids */
bool m_hasMscoreIds;
bool m_hasMuseScoreIds;

engraving::Fraction m_ticks;
int m_lastMeasureN;
Expand Down

0 comments on commit a45ffbe

Please sign in to comment.