diff --git a/fluid/sfont.cpp b/fluid/sfont.cpp index f1a9dcc2c373d..31c6071c5d404 100644 --- a/fluid/sfont.cpp +++ b/fluid/sfont.cpp @@ -784,7 +784,7 @@ bool SFont::load() } f.close(); /* sort preset list by bank, preset # */ - qSort(presets.begin(), presets.end(), preset_compare); + std::sort(presets.begin(), presets.end(), preset_compare); return true; } diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp index 629252b85250b..30d4af27c80ca 100644 --- a/libmscore/layout.cpp +++ b/libmscore/layout.cpp @@ -220,7 +220,7 @@ void Score::layoutChords1(Segment* segment, int staffIdx) // layout upstem noteheads if (upVoices > 1) { - qSort(upStemNotes.begin(), upStemNotes.end(), + std::sort(upStemNotes.begin(), upStemNotes.end(), [](Note* n1, const Note* n2) ->bool {return n1->line() > n2->line(); } ); } if (upVoices) { @@ -230,7 +230,7 @@ void Score::layoutChords1(Segment* segment, int staffIdx) // layout downstem noteheads if (downVoices > 1) { - qSort(downStemNotes.begin(), downStemNotes.end(), + std::sort(downStemNotes.begin(), downStemNotes.end(), [](Note* n1, const Note* n2) ->bool {return n1->line() > n2->line(); } ); } if (downVoices) { @@ -347,7 +347,7 @@ void Score::layoutChords1(Segment* segment, int staffIdx) else break; } - qSort(overlapNotes.begin(), overlapNotes.end(), + std::sort(overlapNotes.begin(), overlapNotes.end(), [](Note* n1, const Note* n2) ->bool {return n1->line() > n2->line(); } ); // determine nature of overlap @@ -565,7 +565,7 @@ void Score::layoutChords1(Segment* segment, int staffIdx) if (downVoices) notes.insert(notes.end(), downStemNotes.begin(), downStemNotes.end()); if (upVoices + downVoices > 1) - qSort(notes.begin(), notes.end(), + std::sort(notes.begin(), notes.end(), [](Note* n1, const Note* n2) ->bool {return n1->line() > n2->line(); } ); layoutChords3(notes, staff, segment); } @@ -1082,7 +1082,7 @@ void Score::layoutChords3(std::vector& notes, const Staff* staff, Segment } nAcc = umi.size(); if (nAcc > 1) - qSort(umi); + std::sort(umi.begin(), umi.end()); // lay out columns for (int i = 0; i < nColumns; ++i) { diff --git a/libmscore/mscoreview.cpp b/libmscore/mscoreview.cpp index 0606f44dfc8b8..262961012bd7b 100644 --- a/libmscore/mscoreview.cpp +++ b/libmscore/mscoreview.cpp @@ -74,7 +74,7 @@ const QList MuseScoreView::elementsAt(const QPointF& p) Page* page = point2page(p); if (page) { el = page->items(p - page->pos()); - qSort(el.begin(), el.end(), elementLower); + std::sort(el.begin(), el.end(), elementLower); } return el; } diff --git a/libmscore/tuplet.cpp b/libmscore/tuplet.cpp index 7b78532e8ec8f..86e05ad553e81 100644 --- a/libmscore/tuplet.cpp +++ b/libmscore/tuplet.cpp @@ -1018,7 +1018,7 @@ static bool tickGreater(const DurationElement* a, const DurationElement* b) void Tuplet::sortElements() { - qSort(_elements.begin(), _elements.end(), tickGreater); + std::sort(_elements.begin(), _elements.end(), tickGreater); } //--------------------------------------------------------- diff --git a/midi/midifile.cpp b/midi/midifile.cpp index f6910b79e05f6..08d7b9f0ebc15 100644 --- a/midi/midifile.cpp +++ b/midi/midifile.cpp @@ -901,7 +901,7 @@ void MidiFile::separateChannel() int nn = channel.size(); if (nn <= 1) continue; - qSort(channel); + std::sort(channel.begin(), channel.end()); // -- split -- // insert additional tracks, assign to them found channels for (int ii = 1; ii < nn; ++ii) { diff --git a/mscore/importmidi/importmidi_chord.cpp b/mscore/importmidi/importmidi_chord.cpp index 2aa70aabeccf0..eb25b75f96667 100644 --- a/mscore/importmidi/importmidi_chord.cpp +++ b/mscore/importmidi/importmidi_chord.cpp @@ -410,7 +410,7 @@ void sortNotesByPitch(std::multimap &chords) for (auto &chordEvent: chords) { // in each chord sort notes by pitches auto ¬es = chordEvent.second.notes; - qSort(notes.begin(), notes.end(), pitchSort); + std::sort(notes.begin(), notes.end(), pitchSort); } } @@ -426,7 +426,7 @@ void sortNotesByLength(std::multimap &chords) for (auto &chordEvent: chords) { // in each chord sort notes by lengths auto ¬es = chordEvent.second.notes; - qSort(notes.begin(), notes.end(), lenSort); + std::sort(notes.begin(), notes.end(), lenSort); } } diff --git a/mscore/importmidi/importmidi_panel.cpp b/mscore/importmidi/importmidi_panel.cpp index bb226067ebfec..7cacada3a3f49 100644 --- a/mscore/importmidi/importmidi_panel.cpp +++ b/mscore/importmidi/importmidi_panel.cpp @@ -143,7 +143,7 @@ void ImportMidiPanel::fillCharsetList() _ui->comboBoxCharset->clear(); QList charsets = QTextCodec::availableCodecs(); - qSort(charsets.begin(), charsets.end()); + std::sort(charsets.begin(), charsets.end()); int idx = 0; int maxWidth = 0; for (const auto &charset: charsets) { diff --git a/mscore/mixer.cpp b/mscore/mixer.cpp index c118b026b06a2..fbfc6a1103eb6 100644 --- a/mscore/mixer.cpp +++ b/mscore/mixer.cpp @@ -387,7 +387,6 @@ void Mixer::updateTracks() Instrument* proxyInstr = nullptr; Channel* proxyChan = nullptr; if (!il->empty()) { - il->begin(); proxyInstr = il->begin()->second; proxyChan = proxyInstr->playbackChannel(0, _score->masterScore()); } diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp index 275dfb6777702..05da4eac89e67 100644 --- a/mscore/musescore.cpp +++ b/mscore/musescore.cpp @@ -717,7 +717,7 @@ bool MuseScore::importExtension(QString path) infoMsgBox->setTextFormat(Qt::RichText); infoMsgBox->setMinimumSize(300, 100); infoMsgBox->setMaximumSize(300, 100); - infoMsgBox->setStandardButtons(0); + infoMsgBox->setStandardButtons({}); infoMsgBox->setText(QString("

") + tr("Please wait, unpacking extension…") + QString("

")); //setup async run of long operations diff --git a/mscore/ove.cpp b/mscore/ove.cpp index fcf713e44009b..08bde93441805 100644 --- a/mscore/ove.cpp +++ b/mscore/ove.cpp @@ -7634,7 +7634,7 @@ void OveOrganizer::organizeContainers(int /*part*/, int /*track*/, } // shift voices - qSort(voices.begin(), voices.end()); + std::sort(voices.begin(), voices.end()); for (i = 0; i < voices.size(); ++i) { int voice = voices[i]; diff --git a/mscore/prefsdialog.cpp b/mscore/prefsdialog.cpp index 6416f80c5ee70..5faa0056bd613 100644 --- a/mscore/prefsdialog.cpp +++ b/mscore/prefsdialog.cpp @@ -528,7 +528,7 @@ void PreferenceDialog::updateValues(bool useDefaultValues) useImportStyleFile->setChecked(!styleFile.isEmpty()); QList charsets = QTextCodec::availableCodecs(); - qSort(charsets.begin(), charsets.end()); + std::sort(charsets.begin(), charsets.end()); int idx = 0; importCharsetListOve->clear(); importCharsetListGP->clear(); diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp index f5adace0a2db9..a96bbcd2b6218 100644 --- a/mscore/scoreview.cpp +++ b/mscore/scoreview.cpp @@ -4604,7 +4604,7 @@ QList ScoreView::elementsNear(QPointF p) } } if (!ll.empty()) - qSort(ll.begin(), ll.end(), elementLower); + std::sort(ll.begin(), ll.end(), elementLower); return ll; }