speed up some commands; cleanups

libmscore/cmd.cpp

@@ -83,14 +83,8 @@ namespace Ms {
 
 void CmdState::reset()
       {
-//      refresh             = QRectF();     ///< area to update, canvas coordinates
       layoutFlags         = LayoutFlag::NO_FLAGS;
       _updateMode         = UpdateMode::DoNothing;
-//      _playNote           = false;        ///< play selected note after command
-//      _playChord          = false;        ///< play whole chord for the selected note
-//      _excerptsChanged    = false;
-//      _instrumentsChanged = false;
-//      _selectionChanged   = false;
       _startTick          = -1;
       _endTick            = -1;
       }
@@ -144,6 +138,21 @@ void Score::startCmd()
       undo(new SaveState(this));
       }
 
+//---------------------------------------------------------
+//   undoRedo
+//---------------------------------------------------------
+
+void Score::undoRedo(bool undo)
+      {
+      cmdState().reset();
+      if (undo)
+            undoStack()->undo();
+      else
+            undoStack()->redo();
+      update();
+      updateSelection();
+      }
+
 //---------------------------------------------------------
 //   endCmd
 ///   End a GUI command by (if \a undo) ending a user-visble undo
@@ -222,17 +231,6 @@ void Score::update()
             }
       }
 
-//---------------------------------------------------------
-//   endUndoRedo
-///   Common handling for ending undo or redo
-//---------------------------------------------------------
-
-void Score::endUndoRedo()
-      {
-      update();
-      updateSelection();
-      }
-
 //---------------------------------------------------------
 //   cmdAddSpanner
 //   drop VOLTA, OTTAVA, TRILL, PEDAL, DYNAMIC
@@ -272,7 +270,6 @@ void Score::cmdAddSpanner(Spanner* spanner, const QPointF& pos)
             spanner->setTick(m->tick());
             spanner->setTick2(m->endTick());
             }
-
       undoAddElement(spanner);
       select(spanner, SelectType::SINGLE, 0);
       }

libmscore/element.h

@@ -79,6 +79,8 @@ class Spacer;
 class StaffLines;
 class Ambitus;
 class Bracket;
+class InstrumentChange;
+class Text;
 
 enum class SymId;
 
@@ -673,6 +675,7 @@ class Element : public QObject, public ScoreElement {
       CONVERT(StaffLines,    STAFF_LINES)
       CONVERT(Ambitus,       AMBITUS)
       CONVERT(Bracket,       BRACKET)
+      CONVERT(InstrumentChange, INSTRUMENT_CHANGE)
 #undef CONVERT
       };
 
@@ -696,7 +699,7 @@ static inline const ChordRest* toChordRest(const Element* e) {
       }
 
 #define CONVERT(a,b) \
-static inline a* to##a(Element* e) { Q_ASSERT(e == 0 || e->type() == Element::Type::b); return (a*)e; } \
+static inline a* to##a(Element* e)             { Q_ASSERT(e == 0 || e->type() == Element::Type::b); return (a*)e; } \
 static inline const a* to##a(const Element* e) { Q_ASSERT(e == 0 || e->type() == Element::Type::b); return (const a*)e; }
 
       CONVERT(Note,          NOTE)
@@ -739,6 +742,8 @@ static inline const a* to##a(const Element* e) { Q_ASSERT(e == 0 || e->type() ==
       CONVERT(StaffLines,    STAFF_LINES)
       CONVERT(Ambitus,       AMBITUS)
       CONVERT(Bracket,       BRACKET)
+      CONVERT(InstrumentChange, INSTRUMENT_CHANGE)
+      CONVERT(Text,          TEXT)
 #undef CONVERT
 
 //---------------------------------------------------------

libmscore/measure.cpp

@@ -2293,9 +2293,7 @@ void Measure::setStartRepeatBarLine()
                   score()->undoAddElement(bl);
                   }
             else if (bl && !val) {
-                  // barline were we do not need one:
-                  if (!score()->undoRedo())                       // DEBUG
-                        score()->undoRemoveElement(bl);
+                  score()->undoRemoveElement(bl);     // barline were we do not need one
                   }
             if (bl && val && span) {
                   bl->setSpan(span);

libmscore/note.cpp

@@ -2283,7 +2283,7 @@ bool Note::setProperty(P_ID propertyId, const QVariant& v)
                         return false;
                   break;
             }
-      score()->setLayoutAll();
+      score()->setLayout(tick());
       return true;
       }