LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2813 from Jojo-Schmitz/typo

Browse source 
fix typo `checkMeasue` to `checkMeasure`
This commit is contained in:
Nicolas Froment 2016-09-14 10:01:34 +02:00 committed by GitHub
commit d4004c17e4
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libmscore/measure.cpp
View file

@ -2128,7 +2128,7 @@ void Measure::read(XmlReader& e, int staffIdx)
// with invisible rests
//---------------------------------------------------------
void Measure::checkMeasue(int staffIdx)
void Measure::checkMeasure(int staffIdx)
{
for (int track = staffIdx * VOICES + 1; track % VOICES && hasVoice(track); track++) {
Segment* seg = first();

2
libmscore/measure.h
View file

@ -142,7 +142,7 @@ class Measure : public MeasureBase {
void writeBox(Xml&) const;
void readBox(XmlReader&);
virtual bool isEditable() const override { return false; }
void checkMeasue(int idx);
void checkMeasure(int idx);
virtual void add(Element*) override;
virtual void remove(Element*) override;

2
libmscore/paste.cpp
View file

@ -438,7 +438,7 @@ PasteState Score::pasteStaff(XmlReader& e, Segment* dst, int dstStaff)
Measure* endM = tick2measureMM(dstTick + tickLen);
for (int i = dstStaff; i < endStaff; i++) {
for (Measure* m = dstM; m && m != endM->nextMeasureMM(); m = m->nextMeasureMM())
m->checkMeasue(i);
m->checkMeasure(i);
}
_selection.setRange(s1, s2, dstStaff, endStaff);
_selection.updateSelectedElements();

4
libmscore/scorefile.cpp
View file

@ -263,7 +263,7 @@ void Score::readStaff(XmlReader& e)
measure->setTimesig(f);
measure->read(e, staff);
measure->checkMeasue(staff);
measure->checkMeasure(staff);
if (!measure->isMMRest()) {
measures()->add(measure);
e.setLastMeasure(measure);
@ -306,7 +306,7 @@ void Score::readStaff(XmlReader& e)
}
e.initTick(measure->tick());
measure->read(e, staff);
measure->checkMeasue(staff);
measure->checkMeasure(staff);
if (measure->isMMRest())
measure = e.lastMeasure()->nextMeasure();
else {