Additional changes needed after rebasing

musescore · Nov 22, 2020 · 0777643 · 0777643
1 parent 129daed
commit 0777643
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 16 deletions.
diff --git a/libmscore/measure.cpp b/libmscore/measure.cpp
@@ -249,8 +249,8 @@ void Measure::setScore(Score* score)
 
 MStaff* Measure::mstaff(int staffIndex) const
 {
-    if (staffIndex >= 0 && staffIndex < static_cast<int>(_mstaves.size())) {
-        return _mstaves[staffIndex];
+    if (staffIndex >= 0 && staffIndex < static_cast<int>(m_mstaves.size())) {
+        return m_mstaves[staffIndex];
     }
 
     return nullptr;

diff --git a/libmscore/measure.h b/libmscore/measure.h
@@ -153,15 +153,14 @@ class Measure final : public MeasureBase
 
     System* system() const { return toSystem(parent()); }
     bool hasVoices(int staffIdx, Fraction stick, Fraction len) const;
-    bool hasVoices(int staffIdx) const { return m_mstaves[staffIdx]->hasVoices(); }
-    void setHasVoices(int staffIdx, bool v) { return m_mstaves[staffIdx]->setHasVoices(v); }
-
-    StaffLines* staffLines(int staffIdx) { return m_mstaves[staffIdx]->lines(); }
-
-    Spacer* vspacerDown(int staffIdx) const { return m_mstaves[staffIdx]->vspacerDown(); }
-    Spacer* vspacerUp(int staffIdx) const { return m_mstaves[staffIdx]->vspacerUp(); }
-    void setStaffVisible(int staffIdx, bool visible) { m_mstaves[staffIdx]->setVisible(visible); }
-    void setStaffStemless(int staffIdx, bool stemless) { m_mstaves[staffIdx]->setStemless(stemless); }
+    bool hasVoices(int staffIdx) const;
+    void setHasVoices(int staffIdx, bool v);
+
+    StaffLines* staffLines(int staffIdx);
+    Spacer* vspacerDown(int staffIdx) const;
+    Spacer* vspacerUp(int staffIdx) const;
+    void setStaffVisible(int staffIdx, bool visible);
+    void setStaffStemless(int staffIdx, bool stemless);
 #ifndef NDEBUG
     bool corrupted(int staffIdx) const { return m_mstaves[staffIdx]->corrupted(); }
     void setCorrupted(int staffIdx, bool val) { m_mstaves[staffIdx]->setCorrupted(val); }
@@ -329,9 +328,9 @@ class Measure final : public MeasureBase
     void computeMinWidth(Segment* s, qreal x, bool isSystemHeader);
 
     void readVoice(XmlReader& e, int staffIdx, bool irregular);
-    
+
     MStaff* mstaff(int staffIndex) const;
-    
+
     std::vector<MStaff*> m_mstaves;
     SegmentList m_segments;
     Measure* m_mmRest;          // multi measure rest which replaces a measure range

diff --git a/mu4/notation/internal/notationinteraction.cpp b/mu4/notation/internal/notationinteraction.cpp
@@ -799,7 +799,7 @@ bool NotationInteraction::isDropAccepted(const QPointF& pos, Qt::KeyboardModifie
     case ElementType::INSTRUMENT_CHANGE:
     case ElementType::REHEARSAL_MARK:
     case ElementType::JUMP:
-    case ElementType::REPEAT_MEASURE:
+    case ElementType::MEASURE_REPEAT:
     case ElementType::ICON:
     case ElementType::CHORD:
     case ElementType::SPACER:
@@ -951,7 +951,7 @@ bool NotationInteraction::drop(const QPointF& pos, Qt::KeyboardModifiers modifie
     case ElementType::INSTRUMENT_CHANGE:
     case ElementType::REHEARSAL_MARK:
     case ElementType::JUMP:
-    case ElementType::REPEAT_MEASURE:
+    case ElementType::MEASURE_REPEAT:
     case ElementType::ICON:
     case ElementType::NOTE:
     case ElementType::CHORD:

diff --git a/mu4/notation/view/widgets/measureproperties.cpp b/mu4/notation/view/widgets/measureproperties.cpp
@@ -21,7 +21,7 @@
 #include "libmscore/measure.h"
 #include "libmscore/sig.h"
 #include "libmscore/score.h"
-#include "libmscore/repeat.h"
+#include "libmscore/measurerepeat.h"
 #include "libmscore/undo.h"
 #include "libmscore/range.h"
 #include "notation/inotationelements.h"