diff --git a/libmscore/excerpt.cpp b/libmscore/excerpt.cpp index 9c70515767dd..d829840ec7cb 100644 --- a/libmscore/excerpt.cpp +++ b/libmscore/excerpt.cpp @@ -429,7 +429,6 @@ void cloneStaves(Score* oscore, Score* score, const QList& map, QMultiMapsetRepeatCount(m->repeatCount()); nm->setRepeatStart(m->repeatStart()); nm->setRepeatEnd(m->repeatEnd()); - nm->setRepeatMeasure(m->repeatMeasure()); nm->setRepeatJump(m->repeatJump()); nm->setIrregular(m->irregular()); diff --git a/libmscore/measurebase.cpp b/libmscore/measurebase.cpp index 826d0d65416d..d677bdee2a04 100644 --- a/libmscore/measurebase.cpp +++ b/libmscore/measurebase.cpp @@ -47,7 +47,6 @@ MeasureBase::MeasureBase(const MeasureBase& m) _irregular = m._irregular; _repeatEnd = m._repeatEnd; _repeatStart = m._repeatStart; - _repeatMeasure = m._repeatMeasure; _repeatJump = m._repeatJump; for (Element* e : m._el) @@ -315,8 +314,6 @@ QVariant MeasureBase::getProperty(P_ID id) const return repeatEnd(); case P_ID::REPEAT_START: return repeatStart(); - case P_ID::REPEAT_MEASURE: - return repeatMeasure(); case P_ID::REPEAT_JUMP: return repeatJump(); default: @@ -337,9 +334,6 @@ bool MeasureBase::setProperty(P_ID id, const QVariant& value) case P_ID::REPEAT_START: setRepeatStart(value.toBool()); break; - case P_ID::REPEAT_MEASURE: - setRepeatMeasure(value.toBool()); - break; case P_ID::REPEAT_JUMP: setRepeatJump(value.toBool()); break; @@ -361,7 +355,6 @@ QVariant MeasureBase::propertyDefault(P_ID propertyId) const switch (propertyId) { case P_ID::REPEAT_END: case P_ID::REPEAT_START: - case P_ID::REPEAT_MEASURE: case P_ID::REPEAT_JUMP: return false; default: diff --git a/libmscore/measurebase.h b/libmscore/measurebase.h index 9b1194b60c6f..adcfbfca3b2f 100644 --- a/libmscore/measurebase.h +++ b/libmscore/measurebase.h @@ -83,7 +83,6 @@ class MeasureBase : public Element { bool _repeatEnd { false }; bool _repeatStart { false }; - bool _repeatMeasure { false }; bool _repeatJump { false }; bool _irregular { true }; ///< Irregular measure, do not count bool _lineBreak { false }; ///< Forced line break @@ -168,12 +167,10 @@ class MeasureBase : public Element { bool repeatEnd() const { return _repeatEnd; } bool repeatStart() const { return _repeatStart; } - bool repeatMeasure() const { return _repeatMeasure; } bool repeatJump() const { return _repeatJump; } void setRepeatEnd(bool v) { _repeatEnd = v; } void setRepeatStart(bool v) { _repeatStart = v; } - void setRepeatMeasure(bool v) { _repeatMeasure = v; } void setRepeatJump(bool v) { _repeatJump = v; } diff --git a/libmscore/property.cpp b/libmscore/property.cpp index 249e8fa2114e..4a509f22cbad 100644 --- a/libmscore/property.cpp +++ b/libmscore/property.cpp @@ -158,7 +158,6 @@ static const PropertyData propertyList[] = { { P_ID::REPEAT_END, true, 0, P_TYPE::BOOL }, { P_ID::REPEAT_START, true, 0, P_TYPE::BOOL }, - { P_ID::REPEAT_MEASURE, true, 0, P_TYPE::BOOL }, { P_ID::REPEAT_JUMP, true, 0, P_TYPE::BOOL }, { P_ID::MEASURE_NUMBER_MODE, false, "measureNumberMode", P_TYPE::INT }, diff --git a/libmscore/property.h b/libmscore/property.h index e02b77ab7c7b..8675fe208607 100644 --- a/libmscore/property.h +++ b/libmscore/property.h @@ -150,7 +150,6 @@ enum class P_ID : int { REPEAT_END, REPEAT_START, - REPEAT_MEASURE, REPEAT_JUMP, MEASURE_NUMBER_MODE, diff --git a/libmscore/segment.cpp b/libmscore/segment.cpp index e8650c365bd6..ca462a6d23a6 100644 --- a/libmscore/segment.cpp +++ b/libmscore/segment.cpp @@ -440,7 +440,6 @@ void Segment::add(Element* el) switch (el->type()) { case Element::Type::REPEAT_MEASURE: - measure()->setRepeatMeasure(true); _elist[track] = el; _empty = false; break; @@ -583,7 +582,6 @@ void Segment::remove(Element* el) break; case Element::Type::REPEAT_MEASURE: - measure()->setRepeatMeasure(false); _elist[track] = 0; break;