Additional changes needed after rebasing
This commit is contained in:
parent
129daede16
commit
0777643978
4 changed files with 14 additions and 15 deletions
|
@ -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;
|
||||
|
|
|
@ -153,15 +153,14 @@ public:
|
|||
|
||||
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); }
|
||||
bool hasVoices(int staffIdx) const;
|
||||
void setHasVoices(int staffIdx, bool 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); }
|
||||
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); }
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in a new issue