Avoid copying Selection objects

This also fixes probably an error with not updating a selection in ScoreView::cmdChangeEnharmonic since the own copy was modified.
musescore · Nov 29, 2018 · aeb4919 · MarcSabatella · Dec 8, 2018 · dmitrio95
1 parent af128b5
commit aeb4919
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 17 deletions.
diff --git a/libmscore/cmd.cpp b/libmscore/cmd.cpp
@@ -2479,16 +2479,14 @@ void Score::cmdExplode()
                   lastStaff = qMin(nstaves(), srcStaff + n);
                   }
 
-            // make our own copy of selection, since pasting modifies actual selection
-            Selection srcSelection(selection());
-
+            const QByteArray mimeData(selection().mimeData());
             // copy to all destination staves
             Segment* firstCRSegment = startMeasure->tick2segment(startMeasure->tick());
             for (int i = 1; srcStaff + i < lastStaff; ++i) {
                   int track = (srcStaff + i) * VOICES;
                   ChordRest* cr = toChordRest(firstCRSegment->element(track));
                   if (cr) {
-                        XmlReader e(srcSelection.mimeData());
+                        XmlReader e(mimeData);
                         e.setPasteMode(true);
                         pasteStaff(e, cr->segment(), cr->staffIdx());
                         }

diff --git a/libmscore/edit.cpp b/libmscore/edit.cpp
@@ -1254,7 +1254,7 @@ void Score::cmdAddTie()
 
 void Score::cmdAddOttava(OttavaType type)
       {
-      Selection sel = selection();
+      const Selection& sel = selection();
       // add on each staff if possible
       if (sel.isRange() && sel.staffStart() != sel.staffEnd() - 1) {
             for (int staffIdx = sel.staffStart() ; staffIdx < sel.staffEnd(); ++staffIdx) {

diff --git a/mscore/palette.cpp b/mscore/palette.cpp
@@ -451,7 +451,7 @@ void Palette::applyPaletteElement(PaletteCell* cell, Qt::KeyboardModifiers modif
       Score* score = mscore->currentScore();
       if (score == 0)
             return;
-      Selection sel = score->selection();       // make a copy of the list
+      const Selection& sel = score->selection();       // make a copy of the list
       if (sel.isNone())
             return;
 
@@ -753,8 +753,7 @@ void Palette::mouseDoubleClickEvent(QMouseEvent* ev)
       Score* score = mscore->currentScore();
       if (score == 0)
             return;
-      Selection sel = score->selection();       // make a copy of the list
-      if (sel.isNone())
+      if (score->selection().isNone())
             return;
 
       applyPaletteElement(cellAt(i), ev->modifiers());

diff --git a/mscore/pianotools.cpp b/mscore/pianotools.cpp
@@ -184,7 +184,7 @@ void HPiano::releasePitch(int pitch)
 //   changeSelection
 //---------------------------------------------------------
 
-void HPiano::changeSelection(Selection selection)
+void HPiano::changeSelection(const Selection& selection)
       {
       for (PianoKeyItem* key : keys) {
             key->setHighlighted(false);
@@ -533,7 +533,7 @@ bool HPiano::gestureEvent(QGestureEvent *event)
 //   changeSelection
 //---------------------------------------------------------
 
-void PianoTools::changeSelection(Selection selection)
+void PianoTools::changeSelection(const Selection& selection)
       {
       _piano->changeSelection(selection);
       }

diff --git a/mscore/pianotools.h b/mscore/pianotools.h
@@ -79,7 +79,7 @@ class HPiano : public QGraphicsView {
       void pressPitch(int pitch);
       void releasePitch(int pitch);
       void clearSelection();
-      void changeSelection(Selection selection);
+      void changeSelection(const Selection& selection);
       void updateAllKeys();
       virtual QSize sizeHint() const;
 
@@ -110,7 +110,7 @@ class PianoTools : public QDockWidget {
       void releasePitch(int pitch)  { _piano->releasePitch(pitch); }
       void heartBeat(QList<const Note*> notes);
       void clearSelection();
-      void changeSelection(Selection selection);
+      void changeSelection(const Selection& selection);
       };
 
 

diff --git a/mscore/pianoview.cpp b/mscore/pianoview.cpp
@@ -937,7 +937,8 @@ void PianoView::selectNotes(int startTick, int endTick, int lowPitch, int highPi
       //score->masterScore()->cmdState().reset();      // DEBUG: should not be necessary
       score->startCmd();
 
-      Selection selection(score);
+      Selection& selection = score->selection();
+      selection.deselectAll();
 
       for (int i = 0; i < noteList.size(); ++i) {
             PianoItem* pi = noteList[i];
@@ -967,7 +968,6 @@ void PianoView::selectNotes(int startTick, int endTick, int lowPitch, int highPi
                   selection.add(pi->note());
             }
 
-      score->setSelection(selection);
       for (MuseScoreView* view : score->getViewer())
             view->updateAll();
 

diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
@@ -3308,7 +3308,7 @@ void ScoreView::cmdAddNoteLine()
 void ScoreView::cmdChangeEnharmonic(bool both)
       {
       _score->startCmd();
-      Selection selection = _score->selection();
+      Selection& selection = _score->selection();
       QList<Note*> notes = selection.uniqueNotes();
       for (Note* n : notes) {
             Staff* staff = n->staff();

diff --git a/mscore/timeline.cpp b/mscore/timeline.cpp
@@ -1726,8 +1726,8 @@ void Timeline::drawSelection()
 
       std::set<std::tuple<Measure*, int, ElementType>> meta_labels_set;
 
-      const Selection selection = _score->selection();
-      QList<Element*> el = selection.elements();
+      const Selection& selection = _score->selection();
+      const QList<Element*>& el = selection.elements();
       for (Element* element : el) {
             if (element->tick() == -1)
                   continue;