fix #25946

musescore · Jun 5, 2014 · 29015d4 · 29015d4
1 parent b9a8496
commit 29015d4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/libmscore/edit.cpp b/libmscore/edit.cpp
@@ -703,7 +703,7 @@ void Score::putNote(const Position& p, bool replace)
                       return;
                   // build a default NoteVal for that line
                   nval.string = string;
-                  if(p.fret != FRET_NONE)       // if a fret is given, use it
+                  if (p.fret != FRET_NONE)       // if a fret is given, use it
                         nval.fret = p.fret;
                   else {                        // if no fret, use 0 as default
                         _is.setString(line);

diff --git a/libmscore/note.h b/libmscore/note.h
@@ -73,8 +73,11 @@ enum class NoteHeadGroup : signed char {
 //---------------------------------------------------------
 
 enum class NoteHeadType : signed char {
-      HEAD_AUTO = -1, HEAD_WHOLE = 0, HEAD_HALF = 1, HEAD_QUARTER = 2,
-      HEAD_BREVIS = 3,
+      HEAD_AUTO    = -1,
+      HEAD_WHOLE   = 0,
+      HEAD_HALF    = 1,
+      HEAD_QUARTER = 2,
+      HEAD_BREVIS  = 3,
       HEAD_TYPES
       };
 
@@ -84,11 +87,11 @@ enum class NoteHeadType : signed char {
 //---------------------------------------------------------
 
 struct NoteVal {
-      int pitch = -1;
-      int tpc = Tpc::TPC_INVALID;
-      int fret = FRET_NONE;
-      int string = STRING_NONE;
-      NoteHeadGroup headGroup = NoteHeadGroup::HEAD_NORMAL;
+      int pitch               { -1 };
+      int tpc                 { Tpc::TPC_INVALID };
+      int fret                { FRET_NONE };
+      int string              { STRING_NONE };
+      NoteHeadGroup headGroup { NoteHeadGroup::HEAD_NORMAL };
 
       NoteVal() {}
       NoteVal(int p) : pitch(p) {}

diff --git a/libmscore/score.h b/libmscore/score.h
@@ -184,10 +184,10 @@ struct MidiInputEvent {
 //---------------------------------------------------------
 
 struct Position {
-      Segment* segment;
-      int staffIdx;
-      int line;
-      int fret;
+      Segment* segment { 0 };
+      int staffIdx     { -1 };
+      int line         { 0 };
+      int fret         { FRET_NONE };
       QPointF pos;
       };