ENG-34: Improve _melismaEnds handling

This updates the previous ENG-34 commit by simplifying the removeMelismaEnds function.
musescore · Jul 5, 2021 · 13770e4 · 13770e4
1 parent 871e8e1
commit 13770e4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/libmscore/chordrest.cpp b/libmscore/chordrest.cpp
@@ -1243,19 +1243,9 @@ bool ChordRest::isMelismaEnd() const
 //    No-op and return false if Lyrics not present in _melismaEnds.
 //---------------------------------------------------------
 
-bool ChordRest::removeMelismaEnd(const Lyrics* l)
+void ChordRest::removeMelismaEnd(Lyrics* const l)
       {
-      bool found = false;
-      for (std::set<Lyrics*>::iterator it = _melismaEnds.begin(); it != _melismaEnds.end(); ) {
-            if (*it == l) {
-                  it = _melismaEnds.erase(it); // Returns next iterator
-                  found = true;
-                  }
-            else {
-                  ++it;
-                  }
-            }
-      return found;
+      _melismaEnds.erase(l);
       }
 
 //---------------------------------------------------------

diff --git a/libmscore/chordrest.h b/libmscore/chordrest.h
@@ -140,7 +140,7 @@ class ChordRest : public DurationElement {
       int lastVerse(Placement) const;
       const std::set<Lyrics*>& melismaEnds() const { return _melismaEnds; }
       std::set<Lyrics*>& melismaEnds()             { return _melismaEnds; }
-      bool removeMelismaEnd(const Lyrics* l);
+      void removeMelismaEnd(Lyrics* const l);
       bool isMelismaEnd() const;
 
       virtual void add(Element*);