update for properties/styles

musescore · Mar 27, 2018 · 2580eb7 · 2580eb7
1 parent ebf4e54
commit 2580eb7
Show file tree

Hide file tree

Showing 64 changed files with 591 additions and 1,414 deletions.
diff --git a/libmscore/chord.h b/libmscore/chord.h
@@ -179,7 +179,7 @@ class Chord final : public ChordRest {
       void setNoteType(NoteType t)    { _noteType = t; }
       bool isGrace() const            { return _noteType != NoteType::NORMAL; }
       void toGraceAfter();
-      virtual void scanElements(void* data, void (*func)(void*, Element*), bool all=true);
+      virtual void scanElements(void* data, void (*func)(void*, Element*), bool all=true) override;
 
       virtual void setTrack(int val) override;
 

diff --git a/libmscore/chordrest.h b/libmscore/chordrest.h
@@ -84,7 +84,7 @@ class ChordRest : public DurationElement {
 
       virtual void writeProperties(XmlWriter& xml) const;
       virtual bool readProperties(XmlReader&);
-      virtual void scanElements(void* data, void (*func)(void*, Element*), bool all=true);
+      virtual void scanElements(void* data, void (*func)(void*, Element*), bool all=true) override;
 
       void setBeamMode(Beam::Mode m)            { _beamMode = m;    }
       void undoSetBeamMode(Beam::Mode m);

diff --git a/libmscore/duration.cpp b/libmscore/duration.cpp
@@ -24,8 +24,8 @@ namespace Ms {
 //   DurationElement
 //---------------------------------------------------------
 
-DurationElement::DurationElement(Score* s)
-   : Element(s)
+DurationElement::DurationElement(Score* s, ElementFlags f)
+   : Element(s, f)
       {
       _tuplet = 0;
       }

diff --git a/libmscore/duration.h b/libmscore/duration.h
@@ -42,7 +42,7 @@ class DurationElement : public Element {
 #endif
 
    public:
-      DurationElement(Score* s);
+      DurationElement(Score* = 0, ElementFlags = ElementFlag::NOTHING);
       DurationElement(const DurationElement& e);
       ~DurationElement();
 

diff --git a/libmscore/element.cpp b/libmscore/element.cpp
@@ -483,7 +483,7 @@ void Element::writeProperties(XmlWriter& xml) const
             else
                   xml.tag("pos", pos() / score()->spatium());
             }
-      if (((track() != xml.curTrack()) || (type() == ElementType::SLUR)) && (track() != -1)) {
+      if (((track() != xml.curTrack()) || isSlur()) && (track() != -1)) {
             int t;
             t = track() + xml.trackDiff();
             xml.tag("track", t);

diff --git a/libmscore/glissando.cpp b/libmscore/glissando.cpp
@@ -474,14 +474,10 @@ void Glissando::write(XmlWriter& xml) const
       if (_showText && !_text.isEmpty())
             xml.tag("text", _text);
 
-      writeProperty(xml, P_ID::GLISS_TYPE);
-      writeProperty(xml, P_ID::PLAY);
-      writeProperty(xml, P_ID::GLISSANDO_STYLE);
-      writeProperty(xml, P_ID::FONT_FACE);
-      writeProperty(xml, P_ID::FONT_SIZE);
-      writeProperty(xml, P_ID::FONT_BOLD);
-      writeProperty(xml, P_ID::FONT_ITALIC);
-      writeProperty(xml, P_ID::FONT_UNDERLINE);
+      for (auto id : { P_ID::GLISS_TYPE, P_ID::PLAY, P_ID::GLISSANDO_STYLE, P_ID::FONT_FACE,
+         P_ID::FONT_SIZE, P_ID::FONT_BOLD, P_ID::FONT_ITALIC, P_ID::FONT_UNDERLINE} )
+            writeProperty(xml, id);
+
       SLine::writeProperties(xml);
       xml.etag();
       }
@@ -794,8 +790,6 @@ QVariant Glissando::propertyDefault(P_ID propertyId) const
       switch (propertyId) {
             case P_ID::GLISS_TYPE:
                   return int(GlissandoType::STRAIGHT);
-            case P_ID::GLISS_TEXT:
-                  return "gliss.";
             case P_ID::GLISS_SHOW_TEXT:
                   return true;
             case P_ID::GLISSANDO_STYLE:
@@ -807,6 +801,5 @@ QVariant Glissando::propertyDefault(P_ID propertyId) const
             }
       return SLine::propertyDefault(propertyId);
       }
-
 }