Engraving: simplify dummy parent and eliminate m_isParentExplicitlySet

src/braille/internal/notationbraille.cpp

@@ -718,14 +718,16 @@ bool NotationBraille::addTie()
     }
 
     score()->startCmd(TranslatableString("undoableAction", "Add tie"));
-    Note* note = toNote(currentEngravingItem());
-
-    Tie* tie = Factory::createTie(score()->dummy());
-    tie->setStartNote(brailleInput()->tieStartNote());
-    tie->setEndNote(note);
-    tie->setTrack(brailleInput()->tieStartNote()->track());
-    tie->setTick(brailleInput()->tieStartNote()->chord()->segment()->tick());
-    tie->setTicks(note->chord()->segment()->tick() - brailleInput()->tieStartNote()->chord()->segment()->tick());
+
+    Note* startNote = brailleInput()->tieStartNote();
+    Note* endNote = toNote(currentEngravingItem());
+
+    Tie* tie = Factory::createTie(startNote);
+    tie->setStartNote(startNote);
+    tie->setEndNote(endNote);
+    tie->setTrack(startNote->track());
+    tie->setTick(startNote->chord()->segment()->tick());
+    tie->setTicks(endNote->chord()->segment()->tick() - startNote->chord()->segment()->tick());
     score()->undoAddElement(tie);
     score()->endCmd();
     return true;
@@ -745,7 +747,7 @@ bool NotationBraille::addSlur()
 
             score()->startCmd(TranslatableString("undoableAction", "Add slur"));
 
-            Slur* slur = Factory::createSlur(firstChordRest->measure()->system());
+            Slur* slur = Factory::createSlur(firstChordRest->score()->dummy());
             slur->setScore(firstChordRest->score());
             slur->setTick(firstChordRest->tick());
             slur->setTick2(secondChordRest->tick());
@@ -790,7 +792,7 @@ bool NotationBraille::addLongSlur()
 
             score()->startCmd(TranslatableString("undoableAction", "Add long slur"));
 
-            Slur* slur = Factory::createSlur(firstChordRest->measure()->system());
+            Slur* slur = Factory::createSlur(firstChordRest->score()->dummy());
             slur->setScore(firstChordRest->score());
             slur->setTick(firstChordRest->tick());
             slur->setTick2(secondChordRest->tick());

src/engraving/CMakeLists.txt

@@ -328,8 +328,6 @@ target_sources(engraving PRIVATE
     compat/pageformat.h
     compat/writescorehook.cpp
     compat/writescorehook.h
-    compat/dummyelement.cpp
-    compat/dummyelement.h
     compat/engravingcompat.cpp
     compat/engravingcompat.h
 

src/engraving/api/tests/score_tests.cpp

@@ -1537,7 +1537,7 @@ TEST_F(Engraving_ApiScoreTests, fretDiagramHarmonyAtDomLevel)
 {
     // [GIVEN] A score and a FretDiagram with no harmony
     MasterScore* score = compat::ScoreAccess::createMasterScore(nullptr);
-    FretDiagram* fd = Factory::createFretDiagram(score->dummy()->segment());
+    FretDiagram* fd = Factory::createFretDiagram(score->dummy());
 
     EXPECT_EQ(fd->harmony(), nullptr);
     EXPECT_EQ(fd->harmonyPlainText(), String());
@@ -1564,7 +1564,7 @@ TEST_F(Engraving_ApiScoreTests, fretDiagramHarmonyApi)
 {
     // [GIVEN] A score with a FretDiagram carrying a chord symbol
     MasterScore* domScore = compat::ScoreAccess::createMasterScore(nullptr);
-    FretDiagram* domFd = Factory::createFretDiagram(domScore->dummy()->segment());
+    FretDiagram* domFd = Factory::createFretDiagram(domScore->dummy());
     domFd->setHarmony(u"Fdim7");
 
     // Construct the wrapper through the public dispatcher so that
@@ -1615,7 +1615,7 @@ TEST_F(Engraving_ApiScoreTests, fretDiagramSetDotApi)
     // FretDiagram::dot(s) returns a placeholder Dot(fret=0) when no dot is set,
     // so we check fret values rather than vector emptiness.
     MasterScore* domScore = compat::ScoreAccess::createMasterScore(nullptr);
-    FretDiagram* domFd = Factory::createFretDiagram(domScore->dummy()->segment());
+    FretDiagram* domFd = Factory::createFretDiagram(domScore->dummy());
 
     apiv1::FretDiagram* apiFd
         = qobject_cast<apiv1::FretDiagram*>(apiv1::wrap(domFd, apiv1::Ownership::SCORE));
@@ -1658,7 +1658,7 @@ TEST_F(Engraving_ApiScoreTests, fretDiagramSetMarkerApi)
 {
     // [GIVEN] A score and an empty FretDiagram, wrapped via the API
     MasterScore* domScore = compat::ScoreAccess::createMasterScore(nullptr);
-    FretDiagram* domFd = Factory::createFretDiagram(domScore->dummy()->segment());
+    FretDiagram* domFd = Factory::createFretDiagram(domScore->dummy());
 
     apiv1::FretDiagram* apiFd
         = qobject_cast<apiv1::FretDiagram*>(apiv1::wrap(domFd, apiv1::Ownership::SCORE));
@@ -1696,7 +1696,7 @@ TEST_F(Engraving_ApiScoreTests, fretDiagramSetBarreApi)
 {
     // [GIVEN] A score and an empty FretDiagram, wrapped via the API
     MasterScore* domScore = compat::ScoreAccess::createMasterScore(nullptr);
-    FretDiagram* domFd = Factory::createFretDiagram(domScore->dummy()->segment());
+    FretDiagram* domFd = Factory::createFretDiagram(domScore->dummy());
 
     apiv1::FretDiagram* apiFd
         = qobject_cast<apiv1::FretDiagram*>(apiv1::wrap(domFd, apiv1::Ownership::SCORE));
@@ -1737,7 +1737,7 @@ TEST_F(Engraving_ApiScoreTests, fretDiagramClearApi)
 {
     // [GIVEN] A score and a FretDiagram populated with a dot and a marker
     MasterScore* domScore = compat::ScoreAccess::createMasterScore(nullptr);
-    FretDiagram* domFd = Factory::createFretDiagram(domScore->dummy()->segment());
+    FretDiagram* domFd = Factory::createFretDiagram(domScore->dummy());
     domFd->setDot(0, 3);
     domFd->setMarker(1, FretMarkerType::CROSS);
 
@@ -1780,7 +1780,7 @@ TEST_F(Engraving_ApiScoreTests, fretDiagramGettersApi)
 {
     // [GIVEN] A FretDiagram populated with known content
     MasterScore* domScore = compat::ScoreAccess::createMasterScore(nullptr);
-    FretDiagram* domFd = Factory::createFretDiagram(domScore->dummy()->segment());
+    FretDiagram* domFd = Factory::createFretDiagram(domScore->dummy());
 
     // Set a dot on string 0 fret 3, a marker on string 1, and a barre at fret 2
     domFd->setDot(0, 3);

src/engraving/api/v1/cursor.cpp

@@ -563,7 +563,6 @@ void Cursor::addTuplet(Fraction* ratio, Fraction* duration)
     m_score->changeCRlen(cr, fDuration);
 
     mu::engraving::Tuplet* tuplet = new mu::engraving::Tuplet(tupletMeasure);
-    tuplet->setOwnershipParent(tupletMeasure);
     tuplet->setTrack(track());
     tuplet->setTick(tupletTick);
     tuplet->setRatio(fRatio);

src/engraving/api/v1/score.cpp

@@ -80,7 +80,6 @@ void Score::addText(const QString& type, const QString& txt)
     }
 
     mu::engraving::Text* text = mu::engraving::Factory::createText(mb, tid);
-    text->setOwnershipParent(mb);
     text->setXmlText(txt);
     score()->undoAddElement(text);
 }

src/engraving/dom/accidental.cpp

@@ -243,7 +243,7 @@ AccidentalVal sym2accidentalVal(SymId id)
 //   Accidental
 //---------------------------------------------------------
 
-Accidental::Accidental(EngravingItem* parent)
+Accidental::Accidental(DummyParentOr<EngravingItem> parent)
     : EngravingItem(ElementType::ACCIDENTAL, parent, ElementFlag::MOVABLE)
 {
 }

src/engraving/dom/accidental.h

@@ -315,7 +315,7 @@ class Accidental final : public EngravingItem
 
     friend class Factory;
 
-    Accidental(EngravingItem* parent);
+    Accidental(DummyParentOr<EngravingItem> parent);
 
     AccidentalType m_accidentalType = AccidentalType::NONE;
     AccidentalBracket m_bracket = AccidentalBracket::NONE;

src/engraving/dom/actionicon.cpp

@@ -31,7 +31,7 @@ using namespace mu;
 using namespace muse::draw;
 using namespace mu::engraving;
 
-ActionIcon::ActionIcon(EngravingItem* parent)
+ActionIcon::ActionIcon(DummyParentOr<EngravingItem> parent)
     : EngravingItem(ElementType::ACTION_ICON, parent)
 {
     m_iconFont = Font(configuration()->iconsFontFamily(), Font::Type::Icon);

src/engraving/dom/actionicon.h

@@ -82,7 +82,7 @@ class ActionIcon final : public EngravingItem
     DECLARE_CLASSOF(ElementType::ACTION_ICON)
 
 public:
-    ActionIcon(EngravingItem* score);
+    ActionIcon(DummyParentOr<EngravingItem> score);
     ~ActionIcon() override = default;
 
     ActionIcon* clone() const override;

src/engraving/dom/ambitus.cpp

@@ -44,7 +44,7 @@ using namespace mu::engraving;
 //   Ambitus
 //---------------------------------------------------------
 
-Ambitus::Ambitus(Segment* parent)
+Ambitus::Ambitus(DummyParentOr<Segment> parent)
     : EngravingItem(ElementType::AMBITUS, parent, ElementFlag::ON_STAFF)
 {
     m_noteHeadGroup    = NOTEHEADGROUP_DEFAULT;
@@ -59,8 +59,6 @@ Ambitus::Ambitus(Segment* parent)
 
     m_topAccidental = Factory::createAccidental(this, false);
     m_bottomAccidental = Factory::createAccidental(this, false);
-    m_topAccidental->setOwnershipParent(this);
-    m_bottomAccidental->setOwnershipParent(this);
 }
 
 Ambitus::Ambitus(const Ambitus& a)

src/engraving/dom/ambitus.h

@@ -116,7 +116,7 @@ class Ambitus final : public EngravingItem
 private:
 
     friend class Factory;
-    Ambitus(Segment* parent);
+    Ambitus(DummyParentOr<Segment> parent);
     Ambitus(const Ambitus& a);
 
     void normalize();

src/engraving/dom/anchors.cpp

@@ -137,7 +137,6 @@ TimeTickAnchor* EditTimeTickAnchors::createTimeTickAnchor(Measure* measure, Frac
         TimeTickAnchor* anchor = element ? toTimeTickAnchor(element) : nullptr;
         if (!anchor) {
             anchor = Factory::createTimeTickAnchor(segment);
-            anchor->setOwnershipParent(segment);
             anchor->setTrack(track);
             segment->add(anchor);
         }
@@ -571,7 +570,7 @@ void MoveElementAnchors::rebaseOffsetOnMoveSegment(EngravingItem* element, const
  * TimeTickAnchor
  * *****************************************/
 
-TimeTickAnchor::TimeTickAnchor(Segment* parent)
+TimeTickAnchor::TimeTickAnchor(DummyParentOr<Segment> parent)
     : EngravingItem(ElementType::TIME_TICK_ANCHOR, parent,
                     ElementFlag::ON_STAFF
                     | ElementFlag::NOT_SELECTABLE

src/engraving/dom/anchors.h

@@ -65,7 +65,7 @@ class MoveElementAnchors
 
 class TimeTickAnchor : public EngravingItem
 {
-    TimeTickAnchor(Segment* parent);
+    TimeTickAnchor(DummyParentOr<Segment> parent);
     friend class Factory;
 
 public:

src/engraving/dom/arpeggio.cpp

@@ -41,7 +41,7 @@
 using namespace mu;
 using namespace mu::engraving;
 
-Arpeggio::Arpeggio(Chord* parent, ElementType type)
+Arpeggio::Arpeggio(DummyParentOr<Chord> parent, ElementType type)
     : EngravingItem(type, parent, ElementFlag::MOVABLE)
 {
     m_arpeggioType = ArpeggioType::NORMAL;
@@ -51,8 +51,9 @@ Arpeggio::Arpeggio(Chord* parent, ElementType type)
     m_playArpeggio = true;
     m_stretch = 1.0;
 
-    if (type == ElementType::ARPEGGIO) {
-        parent->setSpanArpeggio(this);
+    EngravingObject* p = parent;
+    if (type == ElementType::ARPEGGIO && p->isChord()) {
+        toChord(p)->setSpanArpeggio(this);
     }
 }
 

src/engraving/dom/arpeggio.h

@@ -117,7 +117,7 @@ class Arpeggio : public EngravingItem
 protected:
     friend class Factory;
 
-    Arpeggio(Chord* parent, ElementType type = ElementType::ARPEGGIO);
+    Arpeggio(DummyParentOr<Chord> parent, ElementType type = ElementType::ARPEGGIO);
 
 private:
     void spatiumChanged(double /*oldValue*/, double /*newValue*/) override;