Jojo-Schmitz · Jojo-Schmitz · Oct 1, 2024
diff --git a/libmscore/CMakeLists.txt b/libmscore/CMakeLists.txt
@@ -50,7 +50,7 @@ add_library (
       harmony.h hook.h icon.h image.h imageStore.h iname.h input.h instrchange.h instrtemplate.h instrument.h interval.h
       jump.h key.h keylist.h keysig.h lasso.h layout.h layoutbreak.h ledgerline.h letring.h line.h location.h
       lyrics.h marker.h mcursor.h measure.h measurebase.h mscore.h mscoreview.h musescoreCore.h navigate.h note.h notedot.h
-      noteevent.h noteline.h ossia.h ottava.h page.h palmmute.h part.h pedal.h pitch.h pitchspelling.h pitchvalue.h
+      noteevent.h ossia.h ottava.h page.h palmmute.h part.h pedal.h pitch.h pitchspelling.h pitchvalue.h
       pos.h property.h range.h read206.h realizedharmony.h rehearsalmark.h repeat.h repeatlist.h rest.h revisions.h score.h scoreOrder.h scoreElement.h segment.h
       segmentlist.h select.h sequencer.h shadownote.h shape.h sig.h slur.h slurtie.h spacer.h spanner.h spannermap.h spatium.h
       staff.h stafflines.h staffstate.h stafftext.h stafftextbase.h stafftype.h stafftypechange.h stafftypelist.h stem.h
@@ -89,7 +89,7 @@ add_library (
       paste.cpp
       bsymbol.cpp marker.cpp jump.cpp stemslash.cpp ledgerline.cpp
       synthesizerstate.cpp mcursor.cpp groups.cpp mscoreview.cpp
-      noteline.cpp spannermap.cpp
+      spannermap.cpp
       bagpembell.cpp ambitus.cpp keylist.cpp scoreElement.cpp scoreOrder.cpp
       shape.cpp systemdivider.cpp midimapping.cpp stafflines.cpp
       sticking.cpp

diff --git a/libmscore/element.cpp b/libmscore/element.cpp
@@ -56,7 +56,6 @@
 #include "mscore.h"
 #include "notedot.h"
 #include "note.h"
-#include "noteline.h"
 #include "ossia.h"
 #include "ottava.h"
 #include "page.h"
@@ -748,7 +747,7 @@ bool Element::readProperties(XmlReader& e)
                   }
 #ifndef NDEBUG
             else {
-                  for (ScoreElement* eee : *_links) {
+                  for (ScoreElement* eee : qAsConst(*_links)) {
                         Element* ee = static_cast<Element*>(eee);
                         if (ee->type() != type()) {
                               qFatal("link %s(%d) type mismatch %s linked to %s",
@@ -1061,7 +1060,6 @@ Element* Element::create(ElementType type, Score* score)
             case ElementType::VOLTA:             return new Volta(score);
             case ElementType::OTTAVA:            return new Ottava(score);
             case ElementType::TEXTLINE:          return new TextLine(score);
-            case ElementType::NOTELINE:          return new NoteLine(score);
             case ElementType::TRILL:             return new Trill(score);
             case ElementType::LET_RING:          return new LetRing(score);
             case ElementType::VIBRATO:           return new Vibrato(score);

diff --git a/libmscore/noteline.cpp b/libmscore/noteline.cpp
diff --git a/libmscore/noteline.h b/libmscore/noteline.h
diff --git a/libmscore/scoreElement.cpp b/libmscore/scoreElement.cpp
@@ -10,15 +10,13 @@
 //  the file LICENCE.GPL
 //=============================================================================
 
-#include "scoreElement.h"
-#include "score.h"
-#include "undo.h"
-#include "xml.h"
-#include "bracket.h"
 #include "bracketItem.h"
 #include "measure.h"
-#include "spanner.h"
 #include "musescoreCore.h"
+#include "score.h"
+#include "scoreElement.h"
+#include "undo.h"
+#include "xml.h"
 
 namespace Ms {
 
@@ -114,7 +112,6 @@ static const ElementName elementNames[] = {
       { ElementType::PALM_MUTE,            "PalmMute",             QT_TRANSLATE_NOOP("elementName", "Palm Mute") },
       { ElementType::TEXTLINE,             "TextLine",             QT_TRANSLATE_NOOP("elementName", "Text Line") },
       { ElementType::TEXTLINE_BASE,        "TextLineBase",         QT_TRANSLATE_NOOP("elementName", "Text Line Base") },  // remove
-      { ElementType::NOTELINE,             "NoteLine",             QT_TRANSLATE_NOOP("elementName", "Note Line") },
       { ElementType::LYRICSLINE,           "LyricsLine",           QT_TRANSLATE_NOOP("elementName", "Melisma Line") },
       { ElementType::GLISSANDO,            "Glissando",            QT_TRANSLATE_NOOP("elementName", "Glissando") },
       { ElementType::BRACKET,              "Bracket",              QT_TRANSLATE_NOOP("elementName", "Bracket") },

diff --git a/libmscore/scoreElement.h b/libmscore/scoreElement.h
@@ -97,7 +97,6 @@ class PedalSegment;
 class LedgerLine;
 class Icon;
 class VoltaSegment;
-class NoteLine;
 class Trill;
 class TrillSegment;
 class Symbol;
@@ -323,7 +322,6 @@ class ScoreElement {
       CONVERT(LedgerLine,    LEDGER_LINE)
       CONVERT(Icon,          ICON)
       CONVERT(VoltaSegment,  VOLTA_SEGMENT)
-      CONVERT(NoteLine,      NOTELINE)
       CONVERT(Trill,         TRILL)
       CONVERT(TrillSegment,  TRILL_SEGMENT)
       CONVERT(LetRing,       LET_RING)
@@ -391,7 +389,6 @@ class ScoreElement {
       bool isTextLineBase() const {
             return isHairpin()
             || isLetRing()
-            || isNoteLine()
             || isOttava()
             || isPalmMute()
             || isPedal()
@@ -578,7 +575,6 @@ static inline const a* to##a(const ScoreElement* e) { Q_ASSERT(e == 0 || e->is##
       CONVERT(LedgerLine)
       CONVERT(Icon)
       CONVERT(VoltaSegment)
-      CONVERT(NoteLine)
       CONVERT(Trill)
       CONVERT(TrillSegment)
       CONVERT(LetRing)

diff --git a/libmscore/select.cpp b/libmscore/select.cpp
@@ -17,8 +17,9 @@
 
 #include "global/log.h"
 
-#include "mscore.h"
+#include "accidental.h"
 #include "arpeggio.h"
+#include "articulation.h"
 #include "barline.h"
 #include "beam.h"
 #include "chord.h"
@@ -31,33 +32,29 @@
 #include "fret.h"
 #include "hook.h"
 #include "input.h"
-#include "limits.h"
 #include "lyrics.h"
 #include "measure.h"
+#include "mscore.h"
 #include "note.h"
 #include "notedot.h"
 #include "page.h"
+#include "part.h"
 #include "rest.h"
 #include "score.h"
 #include "segment.h"
 #include "select.h"
 #include "sig.h"
-#include "slur.h"
+#include "staff.h"
+#include "stafftext.h"
 #include "stem.h"
 #include "stemslash.h"
-#include "tie.h"
+#include "sticking.h"
 #include "system.h"
-#include "text.h"
+#include "tie.h"
 #include "tremolo.h"
 #include "tuplet.h"
 #include "utils.h"
 #include "xml.h"
-#include "staff.h"
-#include "part.h"
-#include "accidental.h"
-#include "articulation.h"
-#include "stafftext.h"
-#include "sticking.h"
 
 namespace Ms {
 
@@ -417,7 +414,7 @@ bool SelectionFilter::canSelect(const Element* e) const
             return isFiltered(SelectionFilterType::BREATH);
       if (e->isTextBase()) // only TEXT, INSTRCHANGE and STAFFTEXT are caught here, rest are system thus not in selection
             return isFiltered(SelectionFilterType::OTHER_TEXT);
-      if (e->isSLine()) // NoteLine, Volta
+      if (e->isSLine()) // Volta
             return isFiltered(SelectionFilterType::OTHER_LINE);
       if (e->isTremolo())
             return isFiltered(SelectionFilterType::TREMOLO);
@@ -487,7 +484,7 @@ void Selection::appendChord(Chord* chord)
             if (note->accidental()) _el.append(note->accidental());
             for (Element* el : note->el())
                   appendFiltered(el);
-            for (NoteDot* dot : note->dots())
+            for (NoteDot* dot : qAsConst(note->dots()))
                   _el.append(dot);
 
             if (note->tieFor() && (note->tieFor()->endElement() != 0)) {
@@ -605,10 +602,10 @@ void Selection::updateSelectedElements()
                         }
                   if (e->isChord()) {
                         Chord* chord = toChord(e);
-                        for (Chord* graceNote : chord->graceNotes())
+                        for (Chord* graceNote : qAsConst(chord->graceNotes()))
                               if (canSelect(graceNote)) appendChord(graceNote);
                         appendChord(chord);
-                        for (Articulation* art : chord->articulations())
+                        for (Articulation* art : qAsConst(chord->articulations()))
                               appendFiltered(art);
                         }
                   else {
@@ -710,7 +707,7 @@ void Selection::dump()
             case SelState::RANGE:  qDebug("RANGE"); break;
             case SelState::LIST:   qDebug("LIST"); break;
             }
-      for (const Element* e : _el)
+      for (const Element* e : qAsConst(_el))
             qDebug("  %p %s", e, e->name());
       }
 
@@ -842,10 +839,10 @@ QByteArray Selection::staffMimeData() const
       Fraction ticks  = tickEnd() - tickStart();
       int staves = staffEnd() - staffStart();
       if (!MScore::testMode) {
-            xml.stag(QString("StaffList version=\"" MSC_VERSION "\" tick=\"%1\" len=\"%2\" staff=\"%3\" staves=\"%4\"").arg(tickStart().toString()).arg(ticks.toString()).arg(staffStart()).arg(staves));
+            xml.stag(QString("StaffList version=\"" MSC_VERSION "\" tick=\"%1\" len=\"%2\" staff=\"%3\" staves=\"%4\"").arg(tickStart().toString(), ticks.toString()).arg(staffStart(), staves));
             }
       else {
-            xml.stag(QString("StaffList version=\"2.00\" tick=\"%1\" len=\"%2\" staff=\"%3\" staves=\"%4\"").arg(tickStart().toString()).arg(ticks.toString()).arg(staffStart()).arg(staves));
+            xml.stag(QString("StaffList version=\"2.00\" tick=\"%1\" len=\"%2\" staff=\"%3\" staves=\"%4\"").arg(tickStart().toString(), ticks.toString()).arg(staffStart(), staves));
             }
       Segment* seg1 = _startSegment;
       Segment* seg2 = _endSegment;
@@ -977,7 +974,6 @@ Enabling copying of more element types requires enabling pasting in Score::paste
                   case ElementType::PEDAL:
                   case ElementType::TRILL:
                   case ElementType::TEXTLINE:
-                  case ElementType::NOTELINE:
                   case ElementType::SEGMENT:
                   case ElementType::SYSTEM:
                   case ElementType::COMPOUND:
@@ -1148,7 +1144,7 @@ std::vector<Note*> Selection::noteList(int selTrack) const
                                     continue;
                               Chord* c = toChord(e);
                               nl.insert(nl.end(), c->notes().begin(), c->notes().end());
-                              for (Chord* g : c->graceNotes()) {
+                              for (Chord* g : qAsConst(c->graceNotes())) {
                                     nl.insert(nl.end(), g->notes().begin(), g->notes().end());
                                     }
                               }

diff --git a/libmscore/types.h b/libmscore/types.h
@@ -119,7 +119,6 @@ enum class ElementType {
       PALM_MUTE,
       TEXTLINE,
       TEXTLINE_BASE,
-      NOTELINE,
       LYRICSLINE,
       GLISSANDO,
       BRACKET,