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

fix warnings reg. wrong order of evaluation

Browse source
This commit is contained in:
Joachim Schmitz 2014-06-17 14:38:39 +02:00
parent 3394f76c3a
commit f39e4317d9
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libmscore/chordline.cpp
View file

@ -97,7 +97,7 @@ void ChordLine::layout()
if (_chordLineType == ChordLineType::PLOP)
setPos(p.x() + note->headWidth() * .25, p.y() - note->headHeight() * .75);
if (_chordLineType == ChordLineType::SCOOP) {
qreal x = p.x() + chord()->up() ? note->headWidth() * .25 : _spatium * -.2;
qreal x = p.x() + (chord()->up() ? note->headWidth() * .25 : _spatium * -.2);
setPos(x, p.y() + note->headHeight() * .75);
}
}

2
libmscore/note.cpp
View file

@ -1125,7 +1125,7 @@ void Note::endDrag()
if (staff->isTabStaff()) {
// on TABLATURE staves, dragging a note keeps same pitch on a different string (if possible)
// determine new string of dragged note (if tablature is upside down, invert _lineOffset)
int nString = _string + staff->staffType()->upsideDown() ? -_lineOffset : _lineOffset;
int nString = _string + (staff->staffType()->upsideDown() ? -_lineOffset : _lineOffset);
_lineOffset = 0;
// get a fret number for same pitch on new string
const StringData* strData = staff->part()->instr()->stringData();

2
libmscore/range.cpp
View file

@ -437,7 +437,7 @@ bool TrackList::write(int track, Measure* measure) const
break;
// add the element in its own segment;
// but KeySig has to be at start of (current) measure
segment = m->getSegment(e, m->tick() + (e->type() == ElementType::KEYSIG) ? 0 : pos.ticks());
segment = m->getSegment(e, m->tick() + ((e->type() == ElementType::KEYSIG) ? 0 : pos.ticks()));
Element* ne = e->clone();
ne->setScore(score);
ne->setTrack(track);