Remove old scanElements

musescore · Jul 14, 2020 · 0abf7a3 · 0abf7a3
1 parent 0a518ee
commit 0abf7a3
Show file tree

Hide file tree

Showing 46 changed files with 3 additions and 519 deletions.
diff --git a/libmscore/ambitus.cpp b/libmscore/ambitus.cpp
@@ -502,21 +502,6 @@ void Ambitus::draw(QPainter* p) const
     }
 }
 
-//---------------------------------------------------------
-//   scanElementsOld
-//---------------------------------------------------------
-
-void Ambitus::scanElementsOld(void* data, void (* func)(void*, Element*), bool /*all*/)
-{
-    func(data, this);
-    if (_topAccid.accidentalType() != AccidentalType::NONE) {
-        func(data, &_topAccid);
-    }
-    if (_bottomAccid.accidentalType() != AccidentalType::NONE) {
-        func(data, &_bottomAccid);
-    }
-}
-
 //---------------------------------------------------------
 //   noteHead
 //---------------------------------------------------------

diff --git a/libmscore/ambitus.h b/libmscore/ambitus.h
@@ -88,7 +88,6 @@ class Ambitus final : public Element
     void      layout() override;
     QPointF   pagePos() const override;        ///< position in page coordinates
     void      read(XmlReader&) override;
-    void      scanElementsOld(void* data, void (* func)(void*, Element*), bool all=true) override;
     void      setTrack(int val) override;
     void      write(XmlWriter&) const override;
     bool      readProperties(XmlReader&) override;

diff --git a/libmscore/barline.cpp b/libmscore/barline.cpp
@@ -1507,22 +1507,6 @@ Shape BarLine::shape() const
     return shape;
 }
 
-//---------------------------------------------------------
-//   scanElementsOld
-//---------------------------------------------------------
-
-void BarLine::scanElementsOld(void* data, void (* func)(void*, Element*), bool all)
-{
-    // if no width (staff has bar lines turned off) and not all requested, do nothing
-    if (width() == 0.0 && !all) {
-        return;
-    }
-    func(data, this);
-    for (Element* e : _el) {
-        e->scanElementsOld(data, func, all);
-    }
-}
-
 //---------------------------------------------------------
 //   scanElements
 //---------------------------------------------------------

diff --git a/libmscore/barline.h b/libmscore/barline.h
@@ -93,7 +93,6 @@ class BarLine final : public Element
     QPointF pagePos() const override;        ///< position in page coordinates
     void layout() override;
     void layout2();
-    void scanElementsOld(void* data, void (* func)(void*, Element*), bool all=true) override;
     void setTrack(int t) override;
     void setScore(Score* s) override;
     void add(Element*) override;

diff --git a/libmscore/bsymbol.cpp b/libmscore/bsymbol.cpp
@@ -114,18 +114,6 @@ void BSymbol::remove(Element* e)
     }
 }
 
-//---------------------------------------------------------
-//   scanElementsOld
-//---------------------------------------------------------
-
-void BSymbol::scanElementsOld(void* data, void (* func)(void*, Element*), bool all)
-{
-    func(data, this);
-    foreach (Element* e, _leafs) {
-        e->scanElementsOld(data, func, all);
-    }
-}
-
 //---------------------------------------------------------
 //   acceptDrop
 //---------------------------------------------------------

diff --git a/libmscore/bsymbol.h b/libmscore/bsymbol.h
@@ -39,7 +39,6 @@ class BSymbol : public Element
 
     virtual void add(Element*) override;
     virtual void remove(Element*) override;
-    virtual void scanElementsOld(void* data, void (* func)(void*, Element*), bool all=true) override;
     virtual bool acceptDrop(EditData&) const override;
     virtual Element* drop(EditData&) override;
     virtual void layout() override;

diff --git a/libmscore/chord.cpp b/libmscore/chord.cpp
@@ -1215,49 +1215,6 @@ qreal Chord::centerX() const
     return x;
 }
 
-//---------------------------------------------------------
-//   scanElementsOld
-//---------------------------------------------------------
-
-void Chord::scanElementsOld(void* data, void (* func)(void*, Element*), bool all)
-{
-    for (Articulation* a : _articulations) {
-        func(data, a);
-    }
-    if (_hook) {
-        func(data, _hook);
-    }
-    if (_stem) {
-        func(data, _stem);
-    }
-    if (_stemSlash) {
-        func(data, _stemSlash);
-    }
-    if (_arpeggio) {
-        func(data, _arpeggio);
-    }
-    if (_tremolo && (tremoloChordType() != TremoloChordType::TremoloSecondNote)) {
-        func(data, _tremolo);
-    }
-    const Staff* st = staff();
-    if ((st && st->showLedgerLines(tick())) || !st) {       // also for palette
-        for (LedgerLine* ll = _ledgerLines; ll; ll = ll->next()) {
-            func(data, ll);
-        }
-    }
-    size_t n = _notes.size();
-    for (size_t i = 0; i < n; ++i) {
-        _notes.at(i)->scanElementsOld(data, func, all);
-    }
-    for (Chord* chord : _graceNotes) {
-        chord->scanElementsOld(data, func, all);
-    }
-    for (Element* e : el()) {
-        e->scanElementsOld(data, func, all);
-    }
-    ChordRest::scanElementsOld(data, func, all);
-}
-
 //---------------------------------------------------------
 //   processSiblings
 //---------------------------------------------------------

diff --git a/libmscore/chord.h b/libmscore/chord.h
@@ -188,7 +188,6 @@ class Chord final : public ChordRest
     void setNoteType(NoteType t) { _noteType = t; }
     bool isGrace() const { return _noteType != NoteType::NORMAL; }
     void toGraceAfter();
-    void scanElementsOld(void* data, void (* func)(void*, Element*), bool all=true) override;
 
     void setTrack(int val) override;
 

diff --git a/libmscore/chordrest.cpp b/libmscore/chordrest.cpp
@@ -117,29 +117,6 @@ ChordRest::~ChordRest()
     }
 }
 
-//---------------------------------------------------------
-//   scanElementsOld
-//---------------------------------------------------------
-
-void ChordRest::scanElementsOld(void* data, void (* func)(void*, Element*), bool all)
-{
-    if (_beam && (_beam->elements().front() == this)
-        && !measure()->stemless(staffIdx())) {
-        _beam->scanElementsOld(data, func, all);
-    }
-    for (Lyrics* l : _lyrics) {
-        l->scanElementsOld(data, func, all);
-    }
-    DurationElement* de = this;
-    while (de->tuplet() && de->tuplet()->elements().front() == de) {
-        de->tuplet()->scanElementsOld(data, func, all);
-        de = de->tuplet();
-    }
-    if (_tabDur) {
-        func(data, _tabDur);
-    }
-}
-
 //---------------------------------------------------------
 //   writeProperties
 //---------------------------------------------------------

diff --git a/libmscore/chordrest.h b/libmscore/chordrest.h
@@ -88,7 +88,6 @@ class ChordRest : public DurationElement
     virtual void writeProperties(XmlWriter& xml) const;
     virtual bool readProperties(XmlReader&);
     virtual void readAddConnector(ConnectorInfoReader* info, bool pasteMode) override;
-    virtual void scanElementsOld(void* data, void (* func)(void*, Element*), bool all=true) override;
 
     void setBeamMode(Beam::Mode m) { _beamMode = m; }
     void undoSetBeamMode(Beam::Mode m);

diff --git a/libmscore/cmd.cpp b/libmscore/cmd.cpp
@@ -2183,7 +2183,7 @@ void Score::cmdResetNoteAndRestGroupings()
 
 //---------------------------------------------------------
 //   resetElementShapePosition
-//    For use with Score::scanElementsOld.
+//    For use with Score::scanElements.
 //    Reset positions and autoplacement for the given
 //    element.
 //---------------------------------------------------------
@@ -2208,7 +2208,7 @@ static void resetElementPosition(void*, Element* e)
 void Score::cmdResetAllPositions()
 {
     startCmd();
-    scanElementsOld(nullptr, resetElementPosition);
+    scanElements(nullptr, resetElementPosition);
     endCmd();
 }
 

diff --git a/libmscore/element.cpp b/libmscore/element.cpp
@@ -243,17 +243,6 @@ void Element::scanElements(void* data, void (* func)(void*, Element*), bool all)
     }
 }
 
-//---------------------------------------------------------
-//   scanElementsOld
-//---------------------------------------------------------
-
-void Element::scanElementsOld(void* data, void (* func)(void*, Element*), bool all)
-{
-    if (all || visible() || score()->showInvisible()) {
-        func(data, this);
-    }
-}
-
 //---------------------------------------------------------
 //   reset
 //---------------------------------------------------------

diff --git a/libmscore/element.h b/libmscore/element.h
@@ -444,7 +444,6 @@ class Element : public ScoreElement
     mutable bool itemDiscovered      { false };       ///< helper flag for bsp
 
     void scanElements(void* data, void (* func)(void*, Element*), bool all=true) override;
-    virtual void scanElementsOld(void* data, void (* func)(void*, Element*), bool all=true);
 
     virtual void reset() override;           // reset all properties & position to default
 

diff --git a/libmscore/fret.cpp b/libmscore/fret.cpp
@@ -1274,20 +1274,6 @@ Element* FretDiagram::drop(EditData& data)
     return e;
 }
 
-//---------------------------------------------------------
-//   scanElementsOld
-//---------------------------------------------------------
-
-void FretDiagram::scanElementsOld(void* data, void (* func)(void*, Element*), bool all)
-{
-    Q_UNUSED(all);
-    func(data, this);
-    // don't display harmony in palette
-    if (_harmony && !!parent()) {
-        func(data, _harmony);
-    }
-}
-
 //---------------------------------------------------------
 //   Write MusicXML
 //---------------------------------------------------------

diff --git a/libmscore/fret.h b/libmscore/fret.h
@@ -238,7 +238,6 @@ class FretDiagram final : public Element
     Element* drop(EditData&) override;
 
     void endEditDrag(EditData& editData) override;
-    void scanElementsOld(void* data, void (* func)(void*, Element*), bool all=true) override;
 
     QVariant getProperty(Pid propertyId) const override;
     bool setProperty(Pid propertyId, const QVariant&) override;

diff --git a/libmscore/glissando.cpp b/libmscore/glissando.cpp
@@ -214,21 +214,6 @@ void Glissando::scanElements(void* data, void (* func)(void*, Element*), bool al
     }
 }
 
-//---------------------------------------------------------
-//   scanElementsOld
-//---------------------------------------------------------
-
-void Glissando::scanElementsOld(void* data, void (* func)(void*, Element*), bool all)
-{
-    func(data, this);
-    // don't scan segments belonging to systems; the systems themselves will scan them
-    for (SpannerSegment* seg : spannerSegments()) {
-        if (!seg->parent() || !seg->parent()->isSystem()) {
-            seg->scanElementsOld(data, func, all);
-        }
-    }
-}
-
 //---------------------------------------------------------
 //   layout
 //---------------------------------------------------------

diff --git a/libmscore/glissando.h b/libmscore/glissando.h
@@ -75,7 +75,6 @@ class Glissando final : public SLine
     ElementType type() const override { return ElementType::GLISSANDO; }
     LineSegment* createLineSegment() override;
     void scanElements(void* data, void (* func)(void*, Element*), bool all=true) override;
-    void scanElementsOld(void* data, void (* func)(void*, Element*), bool all=true) override;
     void layout() override;
     void write(XmlWriter&) const override;
     void read(XmlReader&) override;

diff --git a/libmscore/lyrics.cpp b/libmscore/lyrics.cpp
@@ -64,19 +64,6 @@ Lyrics::~Lyrics()
     }
 }
 
-//---------------------------------------------------------
-//   scanElementsOld
-//---------------------------------------------------------
-
-void Lyrics::scanElementsOld(void* data, void (* func)(void*, Element*), bool /*all*/)
-{
-    func(data, this);
-/* DO NOT ADD EITHER THE LYRICSLINE OR THE SEGMENTS: segments are added through the system each belongs to;
-      LyricsLine is not needed, as it is internally manged.
-      if (_separator)
-            _separator->scanElementsOld(data, func, all); */
-}
-
 //---------------------------------------------------------
 //   write
 //---------------------------------------------------------

diff --git a/libmscore/lyrics.h b/libmscore/lyrics.h
@@ -65,7 +65,6 @@ class Lyrics final : public TextBase
 
     Lyrics* clone() const override { return new Lyrics(*this); }
     ElementType type() const override { return ElementType::LYRICS; }
-    void scanElementsOld(void* data, void (* func)(void*, Element*), bool all=true) override;
     bool acceptDrop(EditData&) const override;
     Element* drop(EditData&) override;
 

diff --git a/libmscore/measure.cpp b/libmscore/measure.cpp
@@ -2521,40 +2521,6 @@ void Measure::scanElements(void* data, void (* func)(void*, Element*), bool all)
     }
 }
 
-//---------------------------------------------------------
-//   scanElementsOld
-//---------------------------------------------------------
-
-void Measure::scanElementsOld(void* data, void (* func)(void*, Element*), bool all)
-{
-    MeasureBase::scanElementsOld(data, func, all);
-
-    int nstaves = score()->nstaves();
-    for (int staffIdx = 0; staffIdx < nstaves; ++staffIdx) {
-        if (!all && !(visible(staffIdx) && score()->staff(staffIdx)->show())) {
-            continue;
-        }
-        MStaff* ms = _mstaves[staffIdx];
-        func(data, ms->lines());
-        if (ms->vspacerUp()) {
-            func(data, ms->vspacerUp());
-        }
-        if (ms->vspacerDown()) {
-            func(data, ms->vspacerDown());
-        }
-        if (ms->noText()) {
-            func(data, ms->noText());
-        }
-    }
-
-    for (Segment* s = first(); s; s = s->next()) {
-        if (!s->enabled()) {
-            continue;
-        }
-        s->scanElementsOld(data, func, all);
-    }
-}
-
 //---------------------------------------------------------
 //   connectTremolo
 ///   Connect two-notes tremolo and update duration types

diff --git a/libmscore/measure.h b/libmscore/measure.h
@@ -269,7 +269,6 @@ class Measure final : public MeasureBase
     RepeatMeasure* cmdInsertRepeatMeasure(int staffIdx);
 
     void scanElements(void* data, void (* func)(void*, Element*), bool all=true) override;
-    void scanElementsOld(void* data, void (* func)(void*, Element*), bool all=true) override;
     void createVoice(int track);
     void adjustToLen(Fraction, bool appendRestsIfNecessary = true);
 

diff --git a/libmscore/measurebase.cpp b/libmscore/measurebase.cpp
@@ -91,35 +91,6 @@ MeasureBase::~MeasureBase()
     qDeleteAll(_el);
 }
 
-//---------------------------------------------------------
-//   scanElementsOld
-//---------------------------------------------------------
-
-void MeasureBase::scanElementsOld(void* data, void (* func)(void*, Element*), bool all)
-{
-    if (isMeasure()) {
-        for (Element* e : _el) {
-            if (score()->tagIsValid(e->tag())) {
-                if (e->staffIdx() >= score()->staves().size()) {
-                    qDebug("MeasureBase::scanElementsOld: bad staffIdx %d in element %s", e->staffIdx(), e->name());
-                }
-                if ((e->track() == -1) || e->systemFlag() || ((Measure*)this)->visible(e->staffIdx())) {
-                    e->scanElementsOld(data, func, all);
-                }
-            }
-        }
-    } else {
-        for (Element* e : _el) {
-            if (score()->tagIsValid(e->tag())) {
-                e->scanElementsOld(data, func, all);
-            }
-        }
-    }
-    if (isBox()) {
-        func(data, this);
-    }
-}
-
 //---------------------------------------------------------
 //   add
 ///   Add new Element \a el to MeasureBase