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

fix some more compilation warnings with gcc5

Browse source
This commit is contained in:
lasconic 2015-05-07 14:42:58 +02:00
parent 2342431095
commit da74238db8
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mscore/capella.cpp
View file

@ -221,7 +221,7 @@ static void processBasicDrawObj(QList<BasicDrawObj*> objects, Segment* s, int tr
Breath* b = new Breath(score);
b->setTrack(track);
b->setBreathType(3);
Segment* seg = s->measure()->getSegment(Segment::Type::Breath, s->tick() + cr ? cr->actualTicks() : 0);
Segment* seg = s->measure()->getSegment(Segment::Type::Breath, (s->tick() + cr) ? cr->actualTicks() : 0);
seg->add(b);
}
break;

2
mscore/importove.cpp
View file

@ -1827,7 +1827,7 @@ void OveToMScore::convertArticulation(
case OVE::ArticulationType::Pause :{
Breath* b = new Breath(score_);
b->setTrack(track);
Segment* seg = measure->getSegment(Segment::Type::Breath, absTick + cr ? cr->actualTicks() : 0);
Segment* seg = measure->getSegment(Segment::Type::Breath, (absTick + cr) ? cr->actualTicks() : 0);
seg->add(b);
break;
}

14
mstyle/stylehelper.cpp
View file

@ -266,7 +266,7 @@ TileSet* StyleHelper::hole(const QColor& color, qreal shade, int size, bool outl
p.setBrush( Qt::NoBrush );
p.setPen( QPen( blend, 1 ) );
p.drawEllipse( 3, 3.5, 8, 7 );
p.drawEllipse( QPointF(3, 3.5), 8, 7 );
p.setPen( Qt::NoPen );
}
@ -446,8 +446,8 @@ TileSet* StyleHelper::scrollHole(const QColor& color, Qt::Orientation orientatio
const QColor shadow( calcShadowColor(color) );
// use space for white border
const QRect r( QRect(0, 0, 15, 15) );
const QRect rect( r.adjusted(1, 0, -1, -1) );
const QRectF r( QRect(0, 0, 15, 15) );
const QRectF rect( r.adjusted(1, 0, -1, -1) );
int shadowWidth(0);
if ( smallShadow )
shadowWidth = (orientation == Qt::Horizontal) ? 2 : 1;
@ -478,7 +478,7 @@ TileSet* StyleHelper::scrollHole(const QColor& color, Qt::Orientation orientatio
l1.setColorAt(0.5, alphaColor(shadow, orientation == Qt::Horizontal ? 0.1 : 0.1));
l1.setColorAt(1.0, Qt::transparent);
p.setBrush(l1);
p.drawRoundedRect(QRect(rect.topLeft(), rect.bottomLeft() + QPoint(shadowWidth, 0)), 4.5, 4.5);
p.drawRoundedRect(QRectF(rect.topLeft(), rect.bottomLeft() + QPoint(shadowWidth, 0)), 4.5, 4.5);
// right
l1 = QLinearGradient(rect.topRight(), rect.topRight() - QPoint(shadowWidth, 0));
@ -486,14 +486,14 @@ TileSet* StyleHelper::scrollHole(const QColor& color, Qt::Orientation orientatio
l1.setColorAt(0.5, alphaColor(shadow, orientation == Qt::Horizontal ? 0.1 : 0.1));
l1.setColorAt(1.0, Qt::transparent);
p.setBrush(l1);
p.drawRoundedRect(QRect(rect.topRight() - QPoint(shadowWidth, 0), rect.bottomRight()), 4.5, 4.5);
p.drawRoundedRect(QRectF(rect.topRight() - QPoint(shadowWidth, 0), rect.bottomRight()), 4.5, 4.5);
//top
l1 = QLinearGradient(rect.topLeft(), rect.topLeft() + QPoint(0, 3));
l1.setColorAt(0.0, alphaColor(shadow, 0.3));
l1.setColorAt(1.0, Qt::transparent);
p.setBrush(l1);
p.drawRoundedRect(QRect(rect.topLeft(), rect.topRight() + QPoint(0, 3)), 4.5, 4.5);
p.drawRoundedRect(QRectF(rect.topLeft(), rect.topRight() + QPoint(0, 3)), 4.5, 4.5);
// light border
QLinearGradient borderGradient(r.topLeft() + QPoint(0, r.height() / 2 - 1), r.bottomLeft());
@ -1867,7 +1867,7 @@ TileSet* StyleHelper::dockFrame(const QColor& color, int w) {
p.setRenderHints(QPainter::Antialiasing);
p.setBrush(Qt::NoBrush);
p.translate(0.5, 0.5);
QRect rect(0.5, 0.5, w - 0.5, h - 0.);
QRectF rect(0.5, 0.5, w - 0.5, h - 0.);
QColor light = calcLightColor(color);
QColor dark = calcDarkColor(color);