Remove EngravingObject::scanParent

Remove EngravingObject::scanChildren

Rename "all" as "includeInvisible"

Replace C-style function pointer with std::function

Makes it a lot nicer and more flexible to handle, allows to use lambda captures and avoid all the void*.

Remove "all" variable

Author: mike-spa

src/converter/internal/compat/notationmeta.cpp

@@ -307,14 +307,13 @@ QJsonObject NotationMeta::pageFormatJson(const mu::engraving::MStyle& style)
     return format;
 }
 
-static void findTextByType(void* data, mu::engraving::EngravingItem* element)
+static void findTextByType(std::pair<TextStyleType, QStringList*>* typeStringsData, mu::engraving::EngravingItem* element)
 {
     if (!element->isTextBase()) {
         return;
     }
 
     const mu::engraving::TextBase* text = toTextBase(element);
-    auto* typeStringsData = static_cast<std::pair<TextStyleType, QStringList*>*>(data);
     if (text->textStyleType() == typeStringsData->first) {
         QStringList* titleStrings = typeStringsData->second;
         Q_ASSERT(titleStrings);
@@ -336,7 +335,7 @@ QJsonObject NotationMeta::typeDataJson(mu::engraving::Score* score)
         QJsonArray typeData;
         QStringList typeTextStrings;
         std::pair<TextStyleType, QStringList*> extendedTitleData = std::make_pair(nameType.second, &typeTextStrings);
-        score->scanElements(&extendedTitleData, findTextByType);
+        score->scanElements([&](EngravingItem* item) { findTextByType(&extendedTitleData, item); });
         for (auto typeStr : typeTextStrings) {
             typeData.append(typeStr);
         }

src/converter/internal/compat/scoreelementsscanner.cpp

@@ -50,6 +50,10 @@ static bool itemAccepted(const mu::engraving::EngravingItem* item, const mu::eng
         return false;
     }
 
+    if (!item->visible() && !item->score()->isShowInvisible()) {
+        return false;
+    }
+
     if (acceptedTypes.empty()) {
         return true;
     }
@@ -95,9 +99,8 @@ static muse::String chordToNotes(const mu::engraving::Chord* chord)
     return notes.join(u" ");
 }
 
-static void addElementInfoIfNeed(void* data, mu::engraving::EngravingItem* item)
+static void addElementInfoIfNeed(ScannerData* scannerData, mu::engraving::EngravingItem* item)
 {
-    ScannerData* scannerData = static_cast<ScannerData*>(data);
     if (!itemAccepted(item, scannerData->options.acceptedTypes)) {
         return;
     }
@@ -205,7 +208,7 @@ ScoreElementScanner::InstrumentElementMap ScoreElementScanner::scanElements(mu::
     ScannerData data;
     data.options = options;
 
-    score->scanElements(&data, addElementInfoIfNeed, false);
+    score->scanElements([&](mu::engraving::EngravingItem* item) { addElementInfoIfNeed(&data, item); });
 
     return data.elements;
 }

src/engraving/devtools/engravingelementsprovider.cpp

@@ -142,48 +142,9 @@ void EngravingElementsProvider::dumpTree(const mu::engraving::EngravingItem* ite
 
 void EngravingElementsProvider::dumpTreeTree(const mu::engraving::EngravingObject* obj, int& level)
 {
-    ++level;
-    QString gap;
-    gap.fill(' ', level);
-    LOGD() << gap << obj->typeName();
-
-    for (const mu::engraving::EngravingObject* child : obj->scanChildren()) {
-        dumpTreeTree(child, level);
-    }
-
-    --level;
 }
 
 void EngravingElementsProvider::checkObjectTree(const mu::engraving::EngravingObject* obj)
 {
-    mu::engraving::EngravingObject* p1 = obj->parent();
-    mu::engraving::EngravingObject* p2 = obj->scanParent();
-    if (p1 && p2 && p1 != p2) {
-        LOGD() << "obj: " << obj->typeName();
-        LOGD() << "parents is differens, p1: " << p1->typeName() << ", p2: " << p2->typeName();
-    }
-
-    size_t ch1 = obj->children().size();
-    size_t ch2 = obj->scanChildren().size();
-    if (ch1 != ch2) {
-        LOGD() << "obj: " << obj->typeName();
-        LOGD() << "chcount is differens, ch1: " << ch1 << ", ch2: " << ch2;
-
-        LOGD() << "children1:";
-        for (size_t i = 0; i < obj->children().size(); ++i) {
-            LOGD() << i << ": " << obj->children().at(i)->typeName();
-        }
-
-        LOGD() << "children2:";
-
-        int i = 0;
-        for (const mu::engraving::EngravingObject* child : obj->scanChildren()) {
-            LOGD() << i++ << ": " << child->typeName();
-        }
-    }
-
-    for (const mu::engraving::EngravingObject* ch : obj->children()) {
-        checkObjectTree(ch);
-    }
 }
 }

src/engraving/dom/accidental.h

@@ -239,9 +239,6 @@ class Accidental final : public EngravingItem
 
     Note* note() const { return (explicitParent() && explicitParent()->isNote()) ? toNote(explicitParent()) : 0; }
 
-    // Score Tree functions
-    EngravingObject* scanParent() const override;
-
     TranslatableString subtypeUserName() const override;
     void setSubtype(const AsciiStringView& s);
     int subtype() const override { return (int)m_accidentalType; }

src/engraving/dom/ambitus.cpp

@@ -224,16 +224,15 @@ void Ambitus::setBottomTpc(int val, bool applyLogic)
 //   scanElements
 //---------------------------------------------------------
 
-void Ambitus::scanElements(void* data, void (* func)(void*, EngravingItem*), bool all)
+void Ambitus::scanElements(std::function<void(EngravingItem*)> func)
 {
-    UNUSED(all);
-    func(data, this);
+    func(this);
     if (m_topAccidental->accidentalType() != AccidentalType::NONE) {
-        func(data, m_topAccidental);
+        func(m_topAccidental);
     }
 
     if (m_bottomAccidental->accidentalType() != AccidentalType::NONE) {
-        func(data, m_bottomAccidental);
+        func(m_bottomAccidental);
     }
 }
 

src/engraving/dom/ambitus.h

@@ -53,10 +53,6 @@ class Ambitus final : public EngravingItem
 
     Ambitus* clone() const override { return new Ambitus(*this); }
 
-    // Score Tree functions
-    EngravingObject* scanParent() const override;
-    EngravingObjectList scanChildren() const override;
-
     double mag() const override;
 
     void initFrom(Ambitus* a);
@@ -94,7 +90,7 @@ class Ambitus final : public EngravingItem
 
     // re-implemented virtual functions
     PointF pagePos() const override;        // position in page coordinates
-    void scanElements(void* data, void (* func)(void*, EngravingItem*), bool all=true) override;
+    void scanElements(std::function<void(EngravingItem*)> func) override;
     void setTrack(track_idx_t val) override;
 
     String accessibleInfo() const override;

src/engraving/dom/barline.cpp

@@ -702,16 +702,11 @@ void BarLine::endDragGrip(EditData& ed)
 //   scanElements
 //---------------------------------------------------------
 
-void BarLine::scanElements(void* data, void (* func)(void*, EngravingItem*), bool all)
+void BarLine::scanElements(std::function<void(EngravingItem*)> func)
 {
-    // if no width (staff has bar lines turned off) and not all requested, do nothing
-    if (RealIsNull(width()) && !all) {
-        return;
-    }
-
-    func(data, this);
+    func(this);
     for (EngravingItem* e : m_el) {
-        e->scanElements(data, func, all);
+        e->scanElements(func);
     }
 }
 

src/engraving/dom/barline.h

@@ -87,15 +87,11 @@ class BarLine final : public EngravingItem
 
     void setParent(Segment* parent);
 
-    // Score Tree functions
-    EngravingObject* scanParent() const override;
-    EngravingObjectList scanChildren() const override;
-
     BarLine* clone() const override { return new BarLine(*this); }
     PointF canvasPos() const override;      ///< position in canvas coordinates
     PointF pagePos() const override;        ///< position in page coordinates
 
-    void scanElements(void* data, void (* func)(void*, EngravingItem*), bool all=true) override;
+    void scanElements(std::function<void(EngravingItem*)> func) override;
     void setTrack(track_idx_t t) override;
     void add(EngravingItem*) override;
     void remove(EngravingItem*) override;

src/engraving/dom/beam.h

@@ -54,9 +54,6 @@ class Beam final : public BeamBase
 public:
     ~Beam();
 
-    // Score Tree functions
-    EngravingObject* scanParent() const override;
-
     Beam* clone() const override { return new Beam(*this); }
     PointF pagePos() const override;      ///< position in page coordinates
     PointF canvasPos() const override;    ///< position in page coordinates

src/engraving/dom/box.cpp

@@ -994,6 +994,12 @@ void TBox::resetText(Text* text)
     text->setParent(this);
 }
 
+void TBox::scanElements(std::function<void(EngravingItem*)> func)
+{
+    m_text->scanElements(func);
+    Box::scanElements(func);
+}
+
 //---------------------------------------------------------
 //   drop
 //---------------------------------------------------------