Merge pull request #30741 from juli27/fixPropertyValueTypes

engraving: Fix various property value type mismatches

Author: cbjeukendrup

src/engraving/dom/ambitus.cpp

@@ -359,9 +359,9 @@ PropertyValue Ambitus::getProperty(Pid propertyId) const
     case Pid::HEAD_GROUP:
         return noteHeadGroup();
     case Pid::HEAD_TYPE:
-        return int(noteHeadType());
+        return noteHeadType();
     case Pid::MIRROR_HEAD:
-        return int(direction());
+        return direction();
     case Pid::GHOST:                         // recycled property = _hasLine
         return hasLine();
     case Pid::LINE_WIDTH:
@@ -440,9 +440,9 @@ PropertyValue Ambitus::propertyDefault(Pid id) const
     case Pid::HEAD_GROUP:
         return NOTEHEADGROUP_DEFAULT;
     case Pid::HEAD_TYPE:
-        return int(NOTEHEADTYPE_DEFAULT);
+        return NOTEHEADTYPE_DEFAULT;
     case Pid::MIRROR_HEAD:
-        return int(DIRECTION_DEFAULT);
+        return DIRECTION_DEFAULT;
     case Pid::GHOST:
         return HASLINE_DEFAULT;
     case Pid::LINE_WIDTH:

src/engraving/dom/articulation.cpp

@@ -293,7 +293,7 @@ PropertyValue Articulation::getProperty(Pid propertyId) const
     case Pid::DIRECTION:           return PropertyValue::fromValue<DirectionV>(direction());
     case Pid::ARTICULATION_ANCHOR: return int(anchor());
     case Pid::ORNAMENT_STYLE:      return ornamentStyle();
-    case Pid::PLAY:                return bool(playArticulation());
+    case Pid::PLAY:                return playArticulation();
     default:
         return EngravingItem::getProperty(propertyId);
     }

src/engraving/dom/barline.cpp

@@ -787,9 +787,9 @@ PropertyValue BarLine::getProperty(Pid id) const
     case Pid::BARLINE_SPAN:
         return spanStaff();
     case Pid::BARLINE_SPAN_FROM:
-        return int(spanFrom());
+        return spanFrom();
     case Pid::BARLINE_SPAN_TO:
-        return int(spanTo());
+        return spanTo();
     case Pid::BARLINE_SHOW_TIPS:
         return showTips();
     default:

src/engraving/dom/bend.cpp

@@ -155,7 +155,7 @@ PropertyValue Bend::getProperty(Pid id) const
     case Pid::FONT_STYLE:
         return int(m_fontStyle);
     case Pid::PLAY:
-        return bool(playBend());
+        return playBend();
     case Pid::LINE_WIDTH:
         return m_lineWidth;
     case Pid::BEND_TYPE:

src/engraving/dom/bracket.cpp

@@ -291,7 +291,7 @@ bool Bracket::setProperty(Pid id, const PropertyValue& v)
 PropertyValue Bracket::propertyDefault(Pid id) const
 {
     if (id == Pid::BRACKET_COLUMN) {
-        return 0;
+        return size_t(0);
     }
     PropertyValue v = EngravingItem::propertyDefault(id);
     if (!v.isValid()) {

src/engraving/dom/bracketItem.cpp

@@ -65,7 +65,7 @@ bool BracketItem::setProperty(Pid id, const PropertyValue& v)
         staff()->setBracketType(column(), BracketType(v.toInt())); // change bracket type global
         break;
     case Pid::BRACKET_COLUMN:
-        staff()->changeBracketColumn(column(), v.toInt());
+        staff()->changeBracketColumn(column(), v.value<size_t>());
         break;
     case Pid::BRACKET_SPAN:
         m_bracketSpan = static_cast<size_t>(v.toInt());
@@ -86,7 +86,7 @@ PropertyValue BracketItem::propertyDefault(Pid id) const
     case Pid::SYSTEM_BRACKET:
         return int(BracketType::NORMAL);
     case Pid::BRACKET_COLUMN:
-        return 0;
+        return size_t(0);
     default:
         return EngravingItem::propertyDefault(id);
     }

src/engraving/dom/chord.cpp

@@ -1548,7 +1548,6 @@ PropertyValue Chord::getProperty(Pid propertyId) const
     switch (propertyId) {
     case Pid::NO_STEM:         return noStem();
     case Pid::SHOW_STEM_SLASH: return showStemSlash();
-    case Pid::SMALL:           return isSmall();
     case Pid::STEM_DIRECTION:  return PropertyValue::fromValue<DirectionV>(stemDirection());
     case Pid::PLAY: return isChordPlayable();
     case Pid::COMBINE_VOICE: return PropertyValue::fromValue<AutoOnOff>(combineVoice());
@@ -1567,7 +1566,6 @@ PropertyValue Chord::propertyDefault(Pid propertyId) const
     switch (propertyId) {
     case Pid::NO_STEM:         return false;
     case Pid::SHOW_STEM_SLASH: return noteType() == NoteType::ACCIACCATURA;
-    case Pid::SMALL:           return false;
     case Pid::STEM_DIRECTION:  return PropertyValue::fromValue<DirectionV>(DirectionV::AUTO);
     case Pid::PLAY: return true;
     case Pid::COMBINE_VOICE: return AutoOnOff::AUTO;
@@ -1598,9 +1596,6 @@ bool Chord::setProperty(Pid propertyId, const PropertyValue& v)
     case Pid::SHOW_STEM_SLASH:
         requestShowStemSlash(v.toBool());
         break;
-    case Pid::SMALL:
-        setSmall(v.toBool());
-        break;
     case Pid::STEM_DIRECTION:
         setStemDirection(v.value<DirectionV>());
         break;

src/engraving/dom/chordrest.cpp

@@ -701,7 +701,7 @@ PropertyValue ChordRest::getProperty(Pid propertyId) const
 {
     switch (propertyId) {
     case Pid::SMALL:      return PropertyValue::fromValue(isSmall());
-    case Pid::BEAM_MODE:  return int(beamMode());
+    case Pid::BEAM_MODE:  return beamMode();
     case Pid::STAFF_MOVE: return staffMove();
     case Pid::DURATION_TYPE_WITH_DOTS: return actualDurationType().typeWithDots();
     default:              return DurationElement::getProperty(propertyId);

src/engraving/dom/clef.cpp

@@ -318,11 +318,14 @@ bool Clef::setProperty(Pid propertyId, const PropertyValue& v)
     case Pid::SMALL:
         setSmall(v.toBool());
         break;
-    case Pid::CLEF_TO_BARLINE_POS:
-        if (v.value<ClefToBarlinePosition>() != m_clefToBarlinePosition && !m_isHeader) {
-            changeClefToBarlinePos(v.value<ClefToBarlinePosition>());
+    case Pid::CLEF_TO_BARLINE_POS: {
+        const auto newClefToBlPos = v.value<ClefToBarlinePosition>();
+
+        if (newClefToBlPos != m_clefToBarlinePosition && !m_isHeader) {
+            changeClefToBarlinePos(newClefToBlPos);
         }
         break;
+    }
     case Pid::IS_HEADER:
         m_isHeader = v.toBool();
         break;

src/engraving/dom/dynamic.cpp

@@ -451,8 +451,6 @@ PropertyValue Dynamic::getProperty(Pid propertyId) const
         return m_dynamicType;
     case Pid::VELOCITY:
         return velocity();
-    case Pid::SUBTYPE:
-        return int(m_dynamicType);
     case Pid::VELO_CHANGE:
         if (isVelocityChangeAvailable()) {
             return changeInVelocity();
@@ -493,9 +491,6 @@ bool Dynamic::setProperty(Pid propertyId, const PropertyValue& v)
     case Pid::VELOCITY:
         m_velocity = v.toInt();
         break;
-    case Pid::SUBTYPE:
-        m_dynamicType = v.value<DynamicType>();
-        break;
     case Pid::VELO_CHANGE:
         if (isVelocityChangeAvailable()) {
             setChangeInVelocity(v.toInt());