Code review

Author: mike-spa

src/engraving/dom/factory.cpp

@@ -294,6 +294,11 @@ EngravingItem* Factory::doCreateItem(ElementType type, EngravingItem* parent)
     case ElementType::FIGURED_BASS_ITEM:
     case ElementType::DUMMY:
     case ElementType::SYSTEM_LOCK_INDICATOR:
+    case ElementType::HAMMER_ON_PULL_OFF_SEGMENT:
+    case ElementType::HAMMER_ON_PULL_OFF_TEXT:
+    case ElementType::TAPPING_HALF_SLUR:
+    case ElementType::TAPPING_HALF_SLUR_SEGMENT:
+    case ElementType::TAPPING_TEXT:
         break;
     }
 

src/engraving/dom/tapping.h

@@ -124,6 +124,6 @@ class TappingText final : public TextBase
     TappingText(const TappingText& t);
     TappingText* clone() const override { return new TappingText(*this); }
 
-    virtual Color curColor() const;
+    Color curColor() const override;
 };
 } // namespace mu::engraving

src/engraving/rendering/score/slurtielayout.cpp

@@ -1778,27 +1778,18 @@ void SlurTieLayout::adjustOverlappingSlurs(const std::list<SpannerSegment*>& spa
     const double slurCollisionHorizOffset = 0.2 * spatium;
     const double fuzzyHorizCompare = 0.25 * spatium;
     auto compare = [fuzzyHorizCompare](double x1, double x2) { return std::abs(x1 - x2) < fuzzyHorizCompare; };
-    for (SpannerSegment* seg1 : segments) {
-        if (!seg1->isSlurSegment()) {
-            continue;
-        }
-        SlurSegment* slur1 = toSlurSegment(seg1);
-        for (SpannerSegment* seg2 : segments) {
-            if (!seg2->isSlurTieSegment() || seg1 == seg2) {
+    for (SlurSegment* slur1 : segments) {
+        for (SlurSegment* slur2 : segments) {
+            if (slur1->slur()->endChord() == slur2->slur()->startChord()
+                && compare(slur1->ups(Grip::END).p.y(), slur2->ups(Grip::START).p.y())) {
+                slur1->ups(Grip::END).p.rx() -= slurCollisionHorizOffset;
+                slur2->ups(Grip::START).p.rx() += slurCollisionHorizOffset;
+                SlurTieLayout::computeBezier(slur1);
+                SlurTieLayout::computeBezier(slur2);
                 continue;
             }
-            if (seg2->isSlurSegment()) {
-                SlurSegment* slur2 = toSlurSegment(seg2);
-                if (slur1->slur()->endChord() == slur2->slur()->startChord()
-                    && compare(slur1->ups(Grip::END).p.y(), slur2->ups(Grip::START).p.y())) {
-                    slur1->ups(Grip::END).p.rx() -= slurCollisionHorizOffset;
-                    slur2->ups(Grip::START).p.rx() += slurCollisionHorizOffset;
-                    SlurTieLayout::computeBezier(slur1);
-                    SlurTieLayout::computeBezier(slur2);
-                    continue;
-                }
-            }
-            SlurTieSegment* slurTie2 = toSlurTieSegment(seg2);
+
+            SlurTieSegment* slurTie2 = toSlurTieSegment(slur2);
 
             // slurs don't collide with themselves or slurs on other staves
             if (slur1->vStaffIdx() != slurTie2->vStaffIdx()) {