Merge pull request #826 from Jojo-Schmitz/25319-followup

Fixing issues introduced in d280091f22
This commit is contained in:
Nicolas Froment 2014-04-09 17:57:42 +02:00
commit 65899b5b94
3 changed files with 3 additions and 3 deletions

View file

@ -2650,7 +2650,7 @@ void Score::sortStaves(QList<int>& dst)
// cmdConcertPitchChanged
//---------------------------------------------------------
void Score::cmdConcertPitchChanged(bool flag, bool useDoubleSharpsFlats)
void Score::cmdConcertPitchChanged(bool flag, bool /*useDoubleSharpsFlats*/)
{
undo(new ChangeConcertPitch(this, flag)); // change style flag

View file

@ -725,7 +725,7 @@ class Score : public QObject {
void updateChannel();
void cmdTransposeStaff(int staffIdx, Interval, bool useDoubleSharpsFlats);
void cmdConcertPitchChanged(bool, bool useSharpsFlats);
void cmdConcertPitchChanged(bool, bool /*useSharpsFlats*/);
void setTempomap(TempoMap* tm);
TempoMap* tempomap() const;

View file

@ -56,7 +56,7 @@ MuseScore {
if ( i > 0 )
text.text += ",";
switch (notes[i].tpc) {
switch (notes[i].tpc1) {
case -1: text.text += qsTr("Fbb"); break;
case 0: text.text += qsTr("Cbb"); break;
case 1: text.text += qsTr("Gbb"); break;