LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

remove P_TYPE::TEXT_STYLE

Browse source
This commit is contained in:
ws 2018-04-12 18:32:30 +02:00
parent 4b145264a6
commit a39ef47ee4
3 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libmscore/property.cpp
View file

@ -179,10 +179,7 @@ static constexpr PropertyMetaData propertyList[] = {
{ Pid::SPANNER_TICKS, "spanner_ticks", true, "ticks", P_TYPE::INT },
{ Pid::SPANNER_TRACK2, "spanner_track2", true, "track2", P_TYPE::INT },
{ Pid::USER_OFF2, "user_off2", false, "userOff2", P_TYPE::POINT_SP },
{ Pid::BEGIN_TEXT_STYLE, "begin_text_style", false, "beginTextStyle", P_TYPE::TEXT_STYLE },
{ Pid::CONTINUE_TEXT_STYLE, "continue_text_style", false, "continueTextStyle", P_TYPE::TEXT_STYLE },
{ Pid::END_TEXT_STYLE, "end_text_style", false, "endTextStyle", P_TYPE::TEXT_STYLE },
{ Pid::BREAK_MMR, "break_mmr", false, "breakMultiMeasureRest", P_TYPE::BOOL },
{ Pid::REPEAT_COUNT, "repeat_count", true, "endRepeat", P_TYPE::INT },
{ Pid::USER_STRETCH, "user_stretch", false, "stretch", P_TYPE::REAL },
@ -487,7 +484,6 @@ QVariant getProperty(Pid id, XmlReader& e)
case P_TYPE::POINT_MM: // not supported
case P_TYPE::TDURATION:
case P_TYPE::SIZE_MM:
case P_TYPE::TEXT_STYLE:
case P_TYPE::INT_LIST:
return QVariant();
case P_TYPE::SUB_STYLE:

4
libmscore/property.h
View file

@ -201,10 +201,7 @@ enum class Pid {
SPANNER_TICKS,
SPANNER_TRACK2,
USER_OFF2,
BEGIN_TEXT_STYLE,
CONTINUE_TEXT_STYLE,
END_TEXT_STYLE,
BREAK_MMR,
REPEAT_COUNT,
USER_STRETCH,
@ -362,7 +359,6 @@ enum class P_TYPE : char {
TEMPO,
GROUPS,
SYMID,
TEXT_STYLE,
INT_LIST,
GLISSANDO_STYLE,
BARLINE_TYPE,

23
libmscore/xmlwriter.cpp
View file

@ -272,8 +272,27 @@ void XmlWriter::tag(Pid id, QVariant data, QVariant defaultData)
case P_TYPE::SUB_STYLE:
tag(name, subStyleName(SubStyleId(data.toInt())));
break;
default:
Q_ASSERT(false);
case P_TYPE::FRACTION:
qFatal("unknown: FRACTION");
case P_TYPE::POINT_SP:
qFatal("unknown: POINT_SP");
case P_TYPE::POINT_MM:
qFatal("unknown: POINT_MM");
case P_TYPE::SIZE_MM:
qFatal("unknown: SIZE_MM");
case P_TYPE::TDURATION:
qFatal("unknown: TDURATION");
case P_TYPE::BEAM_MODE:
qFatal("unknown: BEAM_MODE");
case P_TYPE::TEMPO:
qFatal("unknown: TEMPO");
case P_TYPE::GROUPS:
qFatal("unknown: GROUPS");
case P_TYPE::INT_LIST:
qFatal("unknown: INT_LIST");
// default:
// Q_ASSERT(false);
}
}