move upstream-already-did-it patch
authormirabilos <tg@debian.org>
Mon, 3 Jun 2019 16:02:10 +0000 (18:02 +0200)
committermirabilos <mirabilos@evolvis.org>
Mon, 3 Jun 2019 16:02:10 +0000 (18:02 +0200)
debian/patches/experiments/statusline-concert-transposing-pitch.diff
debian/patches/series
debian/patches/upstream/note-accessibleInfo-const.diff [moved from debian/patches/experiments/note-accessibleInfo-const.diff with 92% similarity]

index 20b580f..a1335f8 100644 (file)
@@ -14,7 +14,7 @@ Forwarded: https://github.com/musescore/MuseScore/pull/5036
 
 --- a/libmscore/note.cpp
 +++ b/libmscore/note.cpp
-@@ -2652,6 +2652,13 @@ QString Note::accessibleInfo()
+@@ -2652,6 +2652,13 @@ QString Note::accessibleInfoConst() cons
              pitchName = chord()->noStem() ? tr("Beat Slash") : tr("Rhythm Slash");
        else if (staff()->isDrumStaff() && drumset)
              pitchName = qApp->translate("drumset", drumset->name(pitch()).toUtf8().constData());
index 3b5781a..a6fb492 100644 (file)
@@ -8,12 +8,12 @@ upstream/testsuite.diff
 upstream/better-batch-convert.diff
 upstream/new-manpage.diff
 upstream/mtest-fix-freetype-includes.diff
+upstream/note-accessibleInfo-const.diff
 upstream/update-AppData.diff
 debian-specific/fixup-AppData.diff
 experiments/lyrics-hyphen-max-8sp.diff
 experiments/musescore-2.1.0-qt-5.12.patch
 experiments/statusline-concert-transposing-pitch.diff
-experiments/note-accessibleInfo-const.diff
 experiments/element-barbeat.diff
 experiments/revert-restriking-patch.diff
 experiments/log-collisions.diff
@@ -1,7 +1,7 @@
 Description: Add Note::accessibleInfoConst()
 Author: mirabilos <m@mirbsd.org>
 Forwarded: not-needed
-Justification: they are all const in 3.1
+Justification: they are all already “const” in 3.1
 
 --- a/libmscore/note.cpp
 +++ b/libmscore/note.cpp
@@ -14,7 +14,7 @@ Justification: they are all const in 3.1
        {
        QString duration = chord()->durationUserName();
        QString voice = tr("Voice: %1").arg(QString::number(track() % VOICES + 1));
-@@ -2664,6 +2664,11 @@ QString Note::accessibleInfo()
+@@ -2657,6 +2657,11 @@ QString Note::accessibleInfo()
        return tr("%1; Pitch: %2; Duration: %3%4").arg(noteTypeUserName()).arg(pitchName).arg(duration).arg((chord()->isGrace() ? "" : QString("; %1").arg(voice)));
        }