Code review

Author: mike-spa

src/engraving/dom/accidental.cpp

@@ -308,7 +308,8 @@ double Accidental::subtype2centOffset(AccidentalType st)
 
 int Accidental::line() const
 {
-    return note()->line();
+    Note* n = note();
+    return n ? n->line() : 0;
 }
 
 //---------------------------------------------------------

src/engraving/dom/accidental.h

@@ -61,8 +61,6 @@ class Accidental final : public EngravingItem
     OBJECT_ALLOCATOR(engraving, Accidental)
     DECLARE_CLASSOF(ElementType::ACCIDENTAL)
 
-    M_PROPERTY2(int, stackingOrderOffset, setStackingOrderOffset, 0)
-
 public:
 
     Accidental* clone() const override { return new Accidental(*this); }
@@ -111,7 +109,7 @@ class Accidental final : public EngravingItem
     static bool isMicrotonal(AccidentalType t) { return t > AccidentalType::FLAT3; }
     static double subtype2centOffset(AccidentalType);
 
-    int stackingOrder() const { return ldata()->stackingNumber + _stackingOrderOffset; }
+    int stackingOrder() const { return ldata()->stackingNumber + m_stackingOrderOffset; }
 
     int line() const;
 
@@ -140,6 +138,9 @@ class Accidental final : public EngravingItem
     };
     DECLARE_LAYOUTDATA_METHODS(Accidental)
 
+    int stackingOrderOffset() const { return m_stackingOrderOffset; }
+    void setStackingOrderOffset(int v) { m_stackingOrderOffset = v; }
+
 private:
 
     friend class Factory;
@@ -150,6 +151,7 @@ class Accidental final : public EngravingItem
     AccidentalBracket m_bracket = AccidentalBracket::NONE;
     AccidentalRole m_role = AccidentalRole::AUTO;
     bool m_isSmall = false;
+    int m_stackingOrderOffset = 0;
 };
 
 extern AccidentalVal sym2accidentalVal(SymId id);

src/engraving/infrastructure/shape.cpp

@@ -513,19 +513,11 @@ bool Shape::contains(const PointF& p) const
 //   intersects
 //---------------------------------------------------------
 
-bool Shape::intersects(const RectF& rr, double horClearance, double vertClearance) const
+bool Shape::intersects(const RectF& rr) const
 {
-    if (RealIsNull(horClearance) && RealIsNull(vertClearance)) {
-        for (const RectF& r : m_elements) {
-            if (r.intersects(rr)) {
-                return true;
-            }
-        }
-    } else {
-        for (const RectF& r : m_elements) {
-            if (r.intersects(rr.adjusted(-horClearance, -vertClearance, horClearance, vertClearance))) {
-                return true;
-            }
+    for (const RectF& r : m_elements) {
+        if (r.intersects(rr)) {
+            return true;
         }
     }
     return false;
@@ -535,10 +527,10 @@ bool Shape::intersects(const RectF& rr, double horClearance, double vertClearanc
 //   intersects
 //---------------------------------------------------------
 
-bool Shape::intersects(const Shape& other, double horClearance, double vertClearance) const
+bool Shape::intersects(const Shape& other) const
 {
     for (const RectF& r : other.m_elements) {
-        if (intersects(r, horClearance, vertClearance)) {
+        if (intersects(r)) {
             return true;
         }
     }

src/engraving/infrastructure/shape.h

@@ -160,8 +160,8 @@ class Shape
     double leftMostEdgeAtHeight(double yAbove, double yBelow) const;
 
     bool contains(const PointF&) const;
-    bool intersects(const RectF& rr, double horClearance = 0.0, double vertClearance = 0.0) const;
-    bool intersects(const Shape& other, double horClearance = 0.0, double vertClearance = 0.0) const;
+    bool intersects(const RectF& rr) const;
+    bool intersects(const Shape& other) const;
     bool clearsVertically(const Shape& a) const;
 
     void paint(muse::draw::Painter& painter) const;