Skip to content

Commit b4f2847

Browse files
mike-spamike-spa
committed
Code review fixes
1 parent 04579e5 commit b4f2847

File tree

13 files changed

+30
-21
lines changed

13 files changed

+30
-21
lines changed

‎src/engraving/dom/guitarbend.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -601,11 +601,11 @@ GuitarBend* GuitarBend::findPrecedingBend() const
601601
while (note->tieBack() && note->tieBack()->startNote()) {
602602
note = note->tieBack()->startNote();
603603
}
604-
GuitarBend* precedingBend = note->bendBack();
605-
if (precedingBend
606-
&& (precedingBend->bendType() == GuitarBendType::DIVE || precedingBend->bendType() == GuitarBendType::PRE_DIVE)
607-
&& precedingBend->totBendAmountIncludingPrecedingBends() == bendAmountInQuarterTones()) {
608-
return precedingBend;
604+
GuitarBend* prevBend = note->bendBack();
605+
if (prevBend
606+
&& (prevBend->bendType() == GuitarBendType::DIVE || prevBend->bendType() == GuitarBendType::PRE_DIVE)
607+
&& prevBend->totBendAmountIncludingPrecedingBends() == bendAmountInQuarterTones()) {
608+
return prevBend;
609609
}
610610
}
611611
}

‎src/engraving/rendering/score/guitarbendlayout.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ void GuitarBendLayout::layoutStandardStaff(GuitarBendSegment* item, LayoutContex
8686
if (bend->bendType() == GuitarBendType::DIP) {
8787
GuitarDiveLayout::layoutDip(item, ctx);
8888
} else if (bend->bendType() == GuitarBendType::SCOOP) {
89-
GuitarDiveLayout::layoutScoop(item, ctx);
89+
GuitarDiveLayout::layoutScoop(item);
9090
} else if (bend->bendType() == GuitarBendType::SLIGHT_BEND) {
9191
layoutSlightBend(item, ctx);
9292
} else {
@@ -759,7 +759,7 @@ void GuitarBendLayout::layoutHoldLine(GuitarBendHoldSegment* item)
759759
item->mutldata()->setSymIds(SymIdList(symsCount, symId));
760760
item->mutldata()->moveY(0.5 * item->symHeight(symId));
761761
RectF bbox = item->symBbox(symId);
762-
for (int i = 1; i < item->ldata()->symIds().size(); ++i) {
762+
for (size_t i = 1; i < item->ldata()->symIds().size(); ++i) {
763763
bbox.unite(bbox.translated(PointF(symAdvance, 0.0)));
764764
}
765765
item->mutldata()->setBbox(bbox);

‎src/engraving/rendering/score/guitardivelayout.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ void GuitarDiveLayout::layoutDiveTabStaff(GuitarBendSegment* item, LayoutContext
108108
return;
109109
}
110110
if (bend->bendType() == GuitarBendType::SCOOP) {
111-
layoutScoop(item, ctx);
111+
layoutScoop(item);
112112
return;
113113
}
114114

@@ -371,7 +371,7 @@ PointF GuitarDiveLayout::computeEndPosAboveStaff(GuitarBendSegment* item, Layout
371371
return PointF(x, 0.0);
372372
}
373373

374-
int steps = endingIdx - startingIdx;
374+
int steps = static_cast<int>(endingIdx) - static_cast<int>(startingIdx);
375375
double increment = spatium;
376376

377377
double y = item->pos().y() - steps * increment;
@@ -440,15 +440,15 @@ void GuitarDiveLayout::layoutDip(GuitarBendSegment* item, LayoutContext& ctx)
440440
bendText->setPos(PointF(vertex.x() - 0.5 * bendText->width(), bbox.top() - verticalTextPad - bendText->height()));
441441
}
442442

443-
void GuitarDiveLayout::layoutScoop(GuitarBendSegment* item, LayoutContext& ctx)
443+
void GuitarDiveLayout::layoutScoop(GuitarBendSegment* item)
444444
{
445445
GuitarBend* bend = item->guitarBend();
446446
Note* startNote = bend->startNote();
447447
IF_ASSERT_FAILED(startNote) {
448448
return;
449449
}
450450

451-
SymId scoopSym = SymId::guitarVibratoBarScoop;
451+
const SymId scoopSym = SymId::guitarVibratoBarScoop;
452452
RectF bbox = item->symBbox(scoopSym);
453453
item->setbbox(bbox);
454454

‎src/engraving/rendering/score/guitardivelayout.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@ class GuitarDiveLayout
4848
static LineSegment* findPrevHoldOrBendSegment(GuitarBendSegment* item, bool excludeFullReleaseDive = false);
4949

5050
static void layoutDip(GuitarBendSegment* item, LayoutContext& ctx);
51-
static void layoutScoop(GuitarBendSegment* item, LayoutContext& ctx);
51+
static void layoutScoop(GuitarBendSegment* item);
5252
};
5353
}

‎src/engraving/rendering/score/systemlayout.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3005,7 +3005,7 @@ void SystemLayout::centerElementsBetweenStaves(const System* system)
30053005
if (spannerSeg->isHairpinSegment() && elementShouldBeCenteredBetweenStaves(spannerSeg, system)) {
30063006
centerElementBetweenStaves(spannerSeg, system);
30073007
centeredItems.push_back(spannerSeg);
3008-
} else if (spannerSeg->isWhammyBarSegment() && whammyBarShouldBeCenteredBetweenStaved(toWhammyBarSegment(spannerSeg), system)) {
3008+
} else if (spannerSeg->isWhammyBarSegment() && whammyBarShouldBeCenteredBetweenStaves(toWhammyBarSegment(spannerSeg), system)) {
30093009
centerElementBetweenStaves(spannerSeg, system);
30103010
centeredItems.push_back(spannerSeg);
30113011
}
@@ -3135,7 +3135,7 @@ bool SystemLayout::mmRestShouldBeCenteredBetweenStaves(const MMRest* mmRest, con
31353135
return prevStaffIdx != muse::nidx && mmRest->score()->staff(prevStaffIdx)->part() == itemPart;
31363136
}
31373137

3138-
bool SystemLayout::whammyBarShouldBeCenteredBetweenStaved(const WhammyBarSegment* wbar, const System* system)
3138+
bool SystemLayout::whammyBarShouldBeCenteredBetweenStaves(const WhammyBarSegment* wbar, const System* system)
31393139
{
31403140
staff_idx_t staffIdx = wbar->staffIdx();
31413141
Staff* thisStaff = wbar->staff();

‎src/engraving/rendering/score/systemlayout.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ class SystemLayout
196196

197197
static bool elementShouldBeCenteredBetweenStaves(const EngravingItem* item, const System* system);
198198
static bool mmRestShouldBeCenteredBetweenStaves(const MMRest* mmRest, const System* system);
199-
static bool whammyBarShouldBeCenteredBetweenStaved(const WhammyBarSegment* wbar, const System* system);
199+
static bool whammyBarShouldBeCenteredBetweenStaves(const WhammyBarSegment* wbar, const System* system);
200200
static bool elementHasAnotherStackedOutside(const EngravingItem* element, const Shape& elementShape, const SkylineLine& skylineLine);
201201
static void centerElementBetweenStaves(EngravingItem* element, const System* system);
202202
static void centerMMRestBetweenStaves(MMRest* mmRest, const System* system);

‎src/engraving/rendering/score/tlayout.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6433,6 +6433,8 @@ void TLayout::layoutVibratoSegment(VibratoSegment* item, LayoutContext& ctx)
64336433
case VibratoType::VIBRATO_SAWTOOTH_WIDE:
64346434
item->symbolLine(SymId::wiggleSawtoothWide, SymId::wiggleSawtoothWide);
64356435
break;
6436+
default:
6437+
break;
64366438
}
64376439

64386440
if (item->isStyled(Pid::OFFSET)) {

‎src/engraving/rendering/single/singlelayout.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1887,6 +1887,8 @@ void SingleLayout::layout(VibratoSegment* item, const Context&)
18871887
case VibratoType::VIBRATO_SAWTOOTH_WIDE:
18881888
item->symbolLine(SymId::wiggleSawtoothWide, SymId::wiggleSawtoothWide);
18891889
break;
1890+
default:
1891+
break;
18901892
}
18911893

18921894
item->setOffset(PointF());

‎src/engraving/types/propertyvalue.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ QVariant PropertyValue::toQVariant() const
177177
case P_TYPE::CHORD_PRESET_TYPE: return static_cast<int>(value<ChordStylePreset>());
178178
case P_TYPE::LH_TAPPING_SYMBOL: return static_cast<int>(value<LHTappingSymbol>());
179179
case P_TYPE::RH_TAPPING_SYMBOL: return static_cast<int>(value<RHTappingSymbol>());
180-
case P_TYPE::VIBRATO_LINE_TYPE_TYPE: return static_cast<int>(value<VibratoType>());
180+
case P_TYPE::VIBRATO_LINE_TYPE: return static_cast<int>(value<VibratoType>());
181181
case P_TYPE::PARENTHESES_MODE: return static_cast<int>(value<ParenthesesMode>());
182182
case P_TYPE::PLAY_COUNT_PRESET: return static_cast<int>(value<RepeatPlayCountPreset>());
183183
case P_TYPE::MARKER_TYPE: return static_cast<int>(value<MarkerType>());
@@ -303,7 +303,7 @@ PropertyValue PropertyValue::fromQVariant(const QVariant& v, P_TYPE type)
303303
case P_TYPE::CHORD_PRESET_TYPE: return PropertyValue(ChordStylePreset(v.toInt()));
304304
case P_TYPE::LH_TAPPING_SYMBOL: return PropertyValue(LHTappingSymbol(v.toInt()));
305305
case P_TYPE::RH_TAPPING_SYMBOL: return PropertyValue(RHTappingSymbol(v.toInt()));
306-
case P_TYPE::VIBRATO_LINE_TYPE_TYPE: return PropertyValue(VibratoType(v.toInt()));
306+
case P_TYPE::VIBRATO_LINE_TYPE: return PropertyValue(VibratoType(v.toInt()));
307307
case P_TYPE::PARENTHESES_MODE: return PropertyValue(ParenthesesMode(v.toInt()));
308308
case P_TYPE::PLAY_COUNT_PRESET: return PropertyValue(RepeatPlayCountPreset(v.toInt()));
309309
case P_TYPE::MARKER_TYPE: return PropertyValue(MarkerType(v.toInt()));

‎src/engraving/types/propertyvalue.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ enum class P_TYPE : unsigned char {
120120

121121
LH_TAPPING_SYMBOL,
122122
RH_TAPPING_SYMBOL,
123-
VIBRATO_LINE_TYPE_TYPE,
123+
VIBRATO_LINE_TYPE,
124124

125125
VOICE_ASSIGNMENT,
126126
AUTO_ON_OFF,
@@ -345,7 +345,7 @@ class PropertyValue
345345
: m_type(P_TYPE::RH_TAPPING_SYMBOL), m_data(make_data<RHTappingSymbol>(v)) {}
346346

347347
PropertyValue(const VibratoType& v)
348-
: m_type(P_TYPE::VIBRATO_LINE_TYPE_TYPE), m_data(make_data<VibratoType>(v)) {}
348+
: m_type(P_TYPE::VIBRATO_LINE_TYPE), m_data(make_data<VibratoType>(v)) {}
349349

350350
PropertyValue(const VoiceAssignment& v)
351351
: m_type(P_TYPE::VOICE_ASSIGNMENT), m_data(make_data<VoiceAssignment>(v)) {}

0 commit comments

Comments
 (0)