Merge pull request musescore#182 from muelleki/17906-chords-undo

Undo commit from muelleki/17906-chords that conflicts with watery/17906-...
heuchi · Jan 31, 2013 · bdf2cb1 · bdf2cb1
2 parents 062f337 + 451990a
commit bdf2cb1
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 10 deletions.
diff --git a/libmscore/cmd.cpp b/libmscore/cmd.cpp
@@ -385,12 +385,9 @@ qDebug("add pitch %d %d", pitch, addFlag);
             Note* n = addNote(chord, pitch);
             setLayoutAll(false);
             setLayout(chord->measure());
+            moveToNextInputPos();
             return n;
             }
-      if (_is.moveBeforeAdding())
-            moveToNextInputPos();
-      else
-          _is.setMoveBeforeAdding(true);
       expandVoice();
 
       // insert note
@@ -448,6 +445,7 @@ qDebug("add pitch %d %d", pitch, addFlag);
                   qDebug("addPitch: cannot find slur note");
             setLayoutAll(true);
             }
+      moveToNextInputPos();
       return note;
       }
 

diff --git a/libmscore/input.cpp b/libmscore/input.cpp
@@ -32,7 +32,6 @@ InputState::InputState() :
    _segment(0),
    _string(VISUAL_STRING_NONE),
    _repitchMode(false),
-   _moveBeforeAdding(false),
    rest(false),
    pitch(72),
    noteType(NOTE_NORMAL),

diff --git a/libmscore/input.h b/libmscore/input.h
@@ -34,7 +34,6 @@ class InputState {
       Segment*    _segment;         // current segment
       int         _string;          // visual string selected for input (TAB staves only)
       bool        _repitchMode;
-      bool        _moveBeforeAdding;
 
    public:
       bool rest;              // rest mode
@@ -71,9 +70,6 @@ class InputState {
       bool repitchMode() const            { return _repitchMode;    }
       void setRepitchMode(bool val)       { _repitchMode = val;     }
 
-      bool moveBeforeAdding() const       { return _moveBeforeAdding;    }
-      void setMoveBeforeAdding(bool val)  { _moveBeforeAdding = val;     }
-
       StaffGroup staffGroup() const;
       };
 

diff --git a/libmscore/score.cpp b/libmscore/score.cpp
@@ -2711,7 +2711,6 @@ void Score::setInputState(Element* e)
             e = static_cast<Chord*>(e)->upNote();
 
       _is.setDrumNote(-1);
-      _is.setMoveBeforeAdding(false);
 //      _is.setDrumset(0);
       if (e->type() == Element::NOTE) {
             Note* note    = static_cast<Note*>(e);