diff --git a/importexport/musicxml/importmxmlpass2.cpp b/importexport/musicxml/importmxmlpass2.cpp index 1084d407867c4..5f80a5f932a08 100644 --- a/importexport/musicxml/importmxmlpass2.cpp +++ b/importexport/musicxml/importmxmlpass2.cpp @@ -1418,7 +1418,7 @@ static void handleSpannerStart(SLine* new_sp, int track, QString placement, cons //qDebug("handleSpannerStart(sp %p, track %d, tick %s (%d))", new_sp, track, qPrintable(tick.print()), tick.ticks()); new_sp->setTrack(track); setSLinePlacement(new_sp, placement); - spanners[new_sp] = QPair(tick.ticks(), -1); + spanners[new_sp] = std::pair(tick.ticks(), -1); } //--------------------------------------------------------- @@ -3863,7 +3863,7 @@ double MusicXMLParserDirection::convertTextToNotes() QRegularExpression notesRegex("(?[yxeqhwW]\\.{0,2})(\\s*=)"); QString notesSubstring = notesRegex.match(_wordsText).captured("note"); - QList> noteSyms{{"q", QString("metNoteQuarterUp")}, // note4_Sym + QList> noteSyms{{"q", QString("metNoteQuarterUp")}, // note4_Sym {"e", QString("metNote8thUp")}, // note8_Sym {"h", QString("metNoteHalfUp")}, // note2_Sym {"y", QString("metNote32ndUp")}, // note32_Sym @@ -7220,7 +7220,7 @@ static void addGlissandoSlide(const Notation& notation, Note* note, gliss->setLineColor(glissandoColor); gliss->setText(glissandoText); gliss->setGlissandoType(glissandoTag == 0 ? GlissandoType::STRAIGHT : GlissandoType::WAVY); - spanners[gliss] = QPair(tick.ticks(), -1); + spanners[gliss] = std::pair(tick.ticks(), -1); // qDebug("glissando/slide=%p inserted at first tick %d", gliss, tick); } } @@ -7361,11 +7361,11 @@ static void addWavyLine(ChordRest* cr, const Fraction& tick, trill = new Trill(cr->score()); trill->setTrack(trk); if (wavyLineType == "start") { - spanners[trill] = QPair(tick.ticks(), -1); + spanners[trill] = std::pair(tick.ticks(), -1); // qDebug("trill=%p inserted at first tick %d", trill, tick); } if (wavyLineType == "startstop") { - spanners[trill] = QPair(tick.ticks(), tick.ticks() + ticks.ticks()); + spanners[trill] = std::pair(tick.ticks(), tick.ticks() + ticks.ticks()); trill = nullptr; // qDebug("trill=%p inserted at first tick %d second tick %d", trill, tick, tick); } diff --git a/importexport/musicxml/musicxml.h b/importexport/musicxml/musicxml.h index 09cda78fbb003..bc3584e341fff 100644 --- a/importexport/musicxml/musicxml.h +++ b/importexport/musicxml/musicxml.h @@ -130,7 +130,7 @@ class SlurDesc { //--------------------------------------------------------- typedef std::vector MusicXmlPartGroupList; -typedef std::map > MusicXmlSpannerMap; +typedef std::map > MusicXmlSpannerMap; } // namespace Ms #endif diff --git a/importexport/musicxml/musicxmlsupport.h b/importexport/musicxml/musicxmlsupport.h index e75c33329cb31..389e9e4fd7cf2 100644 --- a/importexport/musicxml/musicxmlsupport.h +++ b/importexport/musicxml/musicxmlsupport.h @@ -37,7 +37,7 @@ namespace Ms { List of note start/stop times in a voice in a single staff. */ -typedef QPair StartStop; +typedef std::pair StartStop; typedef std::vector StartStopList; //---------------------------------------------------------