From 53c4bb868bd6e95aa6210e7b2b041eef34b1eff9 Mon Sep 17 00:00:00 2001
From: muelleki <kirill.mueller@ivt.baug.ethz.ch>
Date: Fri, 25 Jan 2013 10:05:00 +0100
Subject: [PATCH] Undo commit from muelleki/17906-chords that conflicts with
 watery/17906-midichordinput

---
 libmscore/cmd.cpp   | 6 ++----
 libmscore/input.cpp | 1 -
 libmscore/input.h   | 4 ----
 libmscore/score.cpp | 1 -
 4 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/libmscore/cmd.cpp b/libmscore/cmd.cpp
index c76306c518328..9a13a361c42d8 100644
--- 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
index 856fea999d663..dc2ea04946e15 100644
--- 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
index d8c93411e3944..6649e0eee6589 100644
--- 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
index 92b795b265c02..a60221b6081a2 100644
--- a/libmscore/score.cpp
+++ b/libmscore/score.cpp
@@ -2707,7 +2707,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);