Skip to content

Commit

Permalink
fix compilation after 5433d71
Browse files Browse the repository at this point in the history
  • Loading branch information
@lasconic
lasconic committed Jan 16, 2017
1 parent 5433d71 commit c745526
Show file tree
Hide file tree
Showing 14 changed files with 73 additions and 66 deletions.
1 change: 1 addition & 0 deletions all.h
View file
Expand Up @@ -29,6 +29,7 @@
#include <fcntl.h>
#include <unistd.h>
#include <math.h>
#include <array>

#include <QtGui>
#include <QLoggingCategory>
Expand Down
3 changes: 2 additions & 1 deletion libmscore/bend.cpp
View file
Expand Up @@ -23,12 +23,13 @@ namespace Ms {
//---------------------------------------------------------
// label
//---------------------------------------------------------

#if 0
static const char* label[] = {
"", "1/4", "1/2", "3/4", "full",
"1 1/4", "1 1/2", "1 3/4", "2",
"2 1/4", "2 1/2", "2 3/4", "3"
};
#endif

//---------------------------------------------------------
// Bend
Expand Down
2 changes: 1 addition & 1 deletion libmscore/cmd.cpp
View file
Expand Up @@ -305,8 +305,8 @@ void Score::cmdAddSpanner(Spanner* spanner, int staffIdx, Segment* startSegment,
else
tick2 = endSegment->tick();
spanner->setTick2(tick2);
TextLine* tl = dynamic_cast<TextLine*>(spanner);
#if 0 // TODO
TextLine* tl = dynamic_cast<TextLine*>(spanner);
if (tl) {
StyledPropertyListIdx st;
Text* t;
Expand Down
2 changes: 1 addition & 1 deletion libmscore/glissando.cpp
View file
Expand Up @@ -65,7 +65,7 @@ void GlissandoSegment::layout()
void GlissandoSegment::draw(QPainter* painter) const
{
painter->save();
qreal _spatium = spatium();
//qreal _spatium = spatium();

QPen pen(glissando()->curColor());
pen.setWidthF(glissando()->lineWidth().val() * spatium());
Expand Down
4 changes: 2 additions & 2 deletions libmscore/harmony.cpp
View file
Expand Up @@ -1025,7 +1025,7 @@ void Harmony::layout()
}

qreal yy = 0.0;
qreal _spatium = spatium();
//qreal _spatium = spatium();

if (parent()->type() == Element::Type::SEGMENT) {
Segment* s = static_cast<Segment*>(parent());
Expand Down Expand Up @@ -1342,7 +1342,7 @@ void Harmony::render(const QList<RenderAction>& renderList, qreal& x, qreal& y,
// construct Chord Symbol
//---------------------------------------------------------

void Harmony::render(const TextStyle* st)
void Harmony::render(const TextStyle* /*st*/)
{
#if 0 // TODO
int capo = score()->styleI(StyleIdx::capoPosition);
Expand Down
2 changes: 1 addition & 1 deletion libmscore/measure.cpp
View file
Expand Up @@ -1298,7 +1298,7 @@ Element* Measure::drop(const DropData& data)
if (staffIdx < 0)
return 0;
Staff* staff = score()->staff(staffIdx);
bool fromPalette = (e->track() == -1);
//bool fromPalette = (e->track() == -1);

switch (e->type()) {
case Element::Type::MEASURE_LIST:
Expand Down
4 changes: 3 additions & 1 deletion libmscore/read206.cpp
View file
Expand Up @@ -656,7 +656,7 @@ static void readChord(Chord* chord, XmlReader& e)
//---------------------------------------------------------
// convertOldTextStyleNames
//---------------------------------------------------------

#if 0
static QString convertOldTextStyleNames(const QString& s)
{
QString rs(s);
Expand All @@ -665,6 +665,8 @@ static QString convertOldTextStyleNames(const QString& s)
rs = "Repeat Text Right";
return rs;
}
#endif


//---------------------------------------------------------
// ArticulationNames
Expand Down
82 changes: 41 additions & 41 deletions libmscore/style.cpp
View file
Expand Up @@ -1075,47 +1075,47 @@ struct StyledPropertyListName {
// must be in sync with SubStyle enumeration
//---------------------------------------------------------

static const std::array<StyledPropertyListName, int(SubStyle::SUBSTYLES)> namedStyles {
"default", &defaultStyle, SubStyle::DEFAULT,
"Title", &titleStyle, SubStyle::TITLE,
"Subtitle", &subTitleStyle, SubStyle::SUBTITLE,
"Composer", &composerStyle, SubStyle::COMPOSER,
"Lyricist", &lyricistStyle, SubStyle::POET,
"Lyrics Odd Lines", &lyricsOddStyle, SubStyle::LYRIC1,
"Lyrics Even Lines", &lyricsEvenStyle, SubStyle::LYRIC2,
"Fingering", &fingeringStyle, SubStyle::FINGERING,
"LH Guitar Fingering", &lhGuitarFingeringStyle, SubStyle::LH_GUITAR_FINGERING,
"RH Guitar Fingering", &rhGuitarFingeringStyle, SubStyle::RH_GUITAR_FINGERING,
"String Number", &stringNumberStyle, SubStyle::STRING_NUMBER,
"Instrument Name (Long)", &longInstrumentStyle, SubStyle::INSTRUMENT_LONG,
"Instrument Name (Short)", &shortInstrumentStyle, SubStyle::INSTRUMENT_SHORT,
"Instrument Name (Part)", &partInstrumentStyle, SubStyle::INSTRUMENT_EXCERPT,
"Dynamics", &dynamicsStyle, SubStyle::DYNAMICS,
"Expression", &expressionStyle, SubStyle::EXPRESSION,
"Tempo", &tempoStyle, SubStyle::TEMPO,
"Metronome", &metronomeStyle, SubStyle::METRONOME,
"Measure Number", &measureNumberStyle, SubStyle::MEASURE_NUMBER,
"Translator", &translatorStyle, SubStyle::TRANSLATOR,
"Tuplet", &tupletStyle, SubStyle::TUPLET,
"System", &systemStyle, SubStyle::SYSTEM,
"Staff", &staffStyle, SubStyle::STAFF,
"Chord Symbol", &chordSymbolStyle, SubStyle::HARMONY,
"Rehearsal Mark", &rehearsalMarkStyle, SubStyle::REHEARSAL_MARK,
"Repeat Text Left", &repeatLeftStyle, SubStyle::REPEAT_LEFT,
"Repeat Text Right", &repeatRightStyle, SubStyle::REPEAT_RIGHT,
"Volta", &voltaStyle, SubStyle::VOLTA,
"Frame", &frameStyle, SubStyle::FRAME,
"Text Line", &textLineStyle, SubStyle::TEXTLINE,
"Glissando", &glissandoStyle, SubStyle::GLISSANDO,
"Ottava", &ottavaStyle, SubStyle::OTTAVA,
"Pedal", &pedalStyle, SubStyle::PEDAL,
"Hairpin", &hairpinStyle, SubStyle::HAIRPIN,
"Bend", &bendStyle, SubStyle::BEND,
"Header", &headerStyle, SubStyle::HEADER,
"Footer", &footerStyle, SubStyle::FOOTER,
"Instrument Change", &instrumentChangeStyle, SubStyle::INSTRUMENT_CHANGE,
"Figured Bass", &figuredBassStyle, SubStyle::FIGURED_BASS
};
static const std::array<StyledPropertyListName, int(SubStyle::SUBSTYLES)> namedStyles { {
{ "default", &defaultStyle, SubStyle::DEFAULT },
{ "Title", &titleStyle, SubStyle::TITLE },
{ "Subtitle", &subTitleStyle, SubStyle::SUBTITLE },
{ "Composer", &composerStyle, SubStyle::COMPOSER },
{ "Lyricist", &lyricistStyle, SubStyle::POET },
{ "Lyrics Odd Lines", &lyricsOddStyle, SubStyle::LYRIC1 },
{ "Lyrics Even Lines", &lyricsEvenStyle, SubStyle::LYRIC2 },
{ "Fingering", &fingeringStyle, SubStyle::FINGERING },
{ "LH Guitar Fingering", &lhGuitarFingeringStyle, SubStyle::LH_GUITAR_FINGERING },
{ "RH Guitar Fingering", &rhGuitarFingeringStyle, SubStyle::RH_GUITAR_FINGERING },
{ "String Number", &stringNumberStyle, SubStyle::STRING_NUMBER },
{ "Instrument Name (Long)", &longInstrumentStyle, SubStyle::INSTRUMENT_LONG },
{ "Instrument Name (Short)", &shortInstrumentStyle, SubStyle::INSTRUMENT_SHORT },
{ "Instrument Name (Part)", &partInstrumentStyle, SubStyle::INSTRUMENT_EXCERPT },
{ "Dynamics", &dynamicsStyle, SubStyle::DYNAMICS },
{ "Expression", &expressionStyle, SubStyle::EXPRESSION },
{ "Tempo", &tempoStyle, SubStyle::TEMPO },
{ "Metronome", &metronomeStyle, SubStyle::METRONOME },
{ "Measure Number", &measureNumberStyle, SubStyle::MEASURE_NUMBER },
{ "Translator", &translatorStyle, SubStyle::TRANSLATOR },
{ "Tuplet", &tupletStyle, SubStyle::TUPLET },
{ "System", &systemStyle, SubStyle::SYSTEM },
{ "Staff", &staffStyle, SubStyle::STAFF },
{ "Chord Symbol", &chordSymbolStyle, SubStyle::HARMONY },
{ "Rehearsal Mark", &rehearsalMarkStyle, SubStyle::REHEARSAL_MARK },
{ "Repeat Text Left", &repeatLeftStyle, SubStyle::REPEAT_LEFT },
{ "Repeat Text Right", &repeatRightStyle, SubStyle::REPEAT_RIGHT },
{ "Volta", &voltaStyle, SubStyle::VOLTA },
{ "Frame", &frameStyle, SubStyle::FRAME },
{ "Text Line", &textLineStyle, SubStyle::TEXTLINE },
{ "Glissando", &glissandoStyle, SubStyle::GLISSANDO },
{ "Ottava", &ottavaStyle, SubStyle::OTTAVA },
{ "Pedal", &pedalStyle, SubStyle::PEDAL },
{ "Hairpin", &hairpinStyle, SubStyle::HAIRPIN },
{ "Bend", &bendStyle, SubStyle::BEND },
{ "Header", &headerStyle, SubStyle::HEADER },
{ "Footer", &footerStyle, SubStyle::FOOTER },
{ "Instrument Change", &instrumentChangeStyle, SubStyle::INSTRUMENT_CHANGE },
{ "Figured Bass", &figuredBassStyle, SubStyle::FIGURED_BASS }
} };

//---------------------------------------------------------
// subStyle
Expand Down
8 changes: 4 additions & 4 deletions libmscore/sym.cpp
View file
Expand Up @@ -48,7 +48,7 @@ QJsonObject ScoreFont::_glyphnamesJson;
//---------------------------------------------------------

QHash<QString, SymId> Sym::lnhash;
const std::array<const char*, int(SymId::lastSym)+1> Sym::symNames = {
const std::array<const char*, int(SymId::lastSym)+1> Sym::symNames = { {
"noSym",
"4stringTabClef",
"6stringTabClef",
Expand Down Expand Up @@ -2677,9 +2677,9 @@ const std::array<const char*, int(SymId::lastSym)+1> Sym::symNames = {
"noteLongaSquareUp",
"noteLongaSquareDown",
"space"
};
} };

const std::array<const char*, int(SymId::lastSym)+1> Sym::symUserNames = {
const std::array<const char*, int(SymId::lastSym)+1> Sym::symUserNames = { {
QT_TRANSLATE_NOOP("symUserNames", "No symbol"),
"4-string tab clef",
"6-string tab clef",
Expand Down Expand Up @@ -5314,7 +5314,7 @@ const std::array<const char*, int(SymId::lastSym)+1> Sym::symUserNames = {
"noteLongaSquareUp",
"noteLongaSquareDown",
"Space"
};
} };

//---------------------------------------------------------
// Conversion table of old symbol names (1.3)
Expand Down
6 changes: 3 additions & 3 deletions libmscore/text.cpp
View file
Expand Up @@ -2278,7 +2278,7 @@ void Text::read(XmlReader& e)
// writeProperties
//---------------------------------------------------------

void Text::writeProperties(XmlWriter& xml, bool writeText, bool writeStyle) const
void Text::writeProperties(XmlWriter& xml, bool writeText, bool /*writeStyle*/) const
{
Element::writeProperties(xml);
writeProperty(xml, P_ID::SUB_STYLE);
Expand Down Expand Up @@ -2312,7 +2312,7 @@ bool Text::readProperties(XmlReader& e)
{
const QStringRef& tag(e.name());

static const std::array<P_ID, 15> pids {
static const std::array<P_ID, 15> pids { {
P_ID::FONT_FACE,
P_ID::FONT_SIZE,
P_ID::FONT_BOLD,
Expand All @@ -2327,7 +2327,7 @@ bool Text::readProperties(XmlReader& e)
P_ID::FRAME_FG_COLOR,
P_ID::FRAME_BG_COLOR,
P_ID::FONT_SPATIUM_DEPENDENT,
};
} };

for (P_ID i :pids) {
if (readProperty(tag, e, i)) {
Expand Down
11 changes: 7 additions & 4 deletions mscore/debugger/debugger.cpp
View file
Expand Up @@ -1361,12 +1361,13 @@ void TextView::textChanged()

void TextView::setElement(Element* e)
{
#if 0
Text* te = (Text*)e;

// tb.textStyle->clear();
// for (int i = 0; i < int(TextStyleType::TEXT_STYLES); ++i)
// tb.textStyle->addItem(e->score()->textStyle(TextStyleType(i)).name());
#if 0

TextStyle ts = te->textStyle();
ShowElementBase::setElement(e);
tb.text->setPlainText(te->xmlText());
Expand Down Expand Up @@ -1396,14 +1397,15 @@ HarmonyView::HarmonyView()
// setElement
//---------------------------------------------------------

void HarmonyView::setElement(Element* e)
void HarmonyView::setElement(Element* /*e*/)
{
#if 0
Harmony* harmony = (Harmony*)e;

// tb.textStyle->clear();
// for (int i = 0; i < int(TextStyleType::TEXT_STYLES); ++i)
// tb.textStyle->addItem(e->score()->textStyle(TextStyleType(i)).name());
#if 0

const TextStyle& ts = harmony->textStyle();
ShowElementBase::setElement(e);
tb.text->setPlainText(harmony->xmlText());
Expand Down Expand Up @@ -1589,12 +1591,13 @@ DynamicView::DynamicView()

void DynamicView::setElement(Element* e)
{
#if 0
Dynamic* dynamic = (Dynamic*)e;

// tb.textStyle->clear();
// for (int i = int(TextStyleType::DEFAULT); i < int(TextStyleType::TEXT_STYLES); ++i)
// tb.textStyle->addItem(e->score()->textStyle(TextStyleType(i)).name());
#if 0

const TextStyle& ts = dynamic->textStyle();
tb.text->setPlainText(dynamic->xmlText());
tb.xoffset->setValue(ts.offset().x());
Expand Down
4 changes: 2 additions & 2 deletions mscore/harmonyedit.cpp
View file
Expand Up @@ -280,8 +280,8 @@ void HarmonyCanvas::paintEvent(QPaintEvent* event)
if (dragElement && dragElement->type() == Element::Type::FSYMBOL) {
FSymbol* sb = static_cast<FSymbol*>(dragElement);

double _spatium = 2.0 * PALETTE_SPATIUM / extraMag;
//TODO:ws const TextStyle* st = &gscore->textStyle(TextStyleType::HARMONY);
//TODO:ws double _spatium = 2.0 * PALETTE_SPATIUM / extraMag;
// const TextStyle* st = &gscore->textStyle(TextStyleType::HARMONY);
// QFont ff(st->font(_spatium * MScore::pixelRatio));
// ff.setFamily(sb->font().family());

Expand Down
5 changes: 3 additions & 2 deletions mscore/importmxmlpass1.cpp
View file
Expand Up @@ -1282,7 +1282,7 @@ void MusicXMLParserPass1::credit(CreditWordsList& credits)
// the word-font setting applies. Setting all sizes to the size specified
// gives bad results, e.g. for measure numbers, so a selection is made.
// Some tweaking may still be required.

#if 0
static bool mustSetSize(const int i)
{
return
Expand All @@ -1304,6 +1304,7 @@ static bool mustSetSize(const int i)
|| i == int(SubStyle::GLISSANDO)
|| i == int(SubStyle::INSTRUMENT_CHANGE);
}
#endif

//---------------------------------------------------------
// updateStyles
Expand All @@ -1317,7 +1318,7 @@ static void updateStyles(Score* score,
const QString& wordFamily, const QString& wordSize,
const QString& lyricFamily, const QString& lyricSize)
{
const float fWordSize = wordSize.toFloat(); // note conversion error results in value 0.0
//TODO:ws const float fWordSize = wordSize.toFloat(); // note conversion error results in value 0.0
const float fLyricSize = lyricSize.toFloat(); // but avoid comparing float with exact value later

// loop over all text styles (except the empty, always hidden, first one)
Expand Down
5 changes: 2 additions & 3 deletions mscore/importmxmlpass2.cpp
View file
Expand Up @@ -4862,21 +4862,20 @@ void MusicXMLParserPass2::harmony(const QString& partId, Measure* measure, const
// in order to work correctly, this should probably be adjusted to account for spatium
// but in any case, we don't support import relative-x/y for other elements
// no reason to do so for chord symbols
#if 0 // TODO:ws
double rx = 0.0; // 0.1 * e.attribute("relative-x", "0").toDouble();
double ry = 0.0; // -0.1 * e.attribute("relative-y", "0").toDouble();

#if 0 // TODO:ws
double styleYOff = _score->textStyle(SubStyle::HARMONY).offset().y();
OffsetType offsetType = _score->textStyle(SubStyle::HARMONY).offsetType();
if (offsetType == OffsetType::ABS) {
styleYOff = styleYOff * DPMM / _score->spatium();
}
#endif

// TODO: check correct dy handling
// previous code: double dy = -0.1 * e.attribute("default-y", QString::number(styleYOff* -10)).toDouble();
double dy = -0.1 * _e.attributes().value("default-y").toDouble();

#endif
bool printObject = _e.attributes().value("print-object") != "no";
QString printFrame = _e.attributes().value("print-frame").toString();
QString printStyle = _e.attributes().value("print-style").toString();
Expand Down

0 comments on commit c745526

Please sign in to comment.