From 9144b252775aef8a1a1718f26a6677a67973c604 Mon Sep 17 00:00:00 2001
From: werner <ws@wschweer.de>
Date: Mon, 4 Jul 2016 09:27:43 +0200
Subject: [PATCH] fix #117061 concert pitch button doesn't do anything

---
 libmscore/score.cpp  |  4 ++--
 libmscore/undo.cpp   | 22 ----------------------
 libmscore/undo.h     | 14 --------------
 mscore/exportxml.cpp |  2 +-
 mscore/musescore.cpp |  8 +++++---
 5 files changed, 8 insertions(+), 42 deletions(-)

diff --git a/libmscore/score.cpp b/libmscore/score.cpp
index 959b055ff5..aec7a59d76 100644
--- a/libmscore/score.cpp
+++ b/libmscore/score.cpp
@@ -2314,7 +2314,7 @@ void Score::sortStaves(QList<int>& dst)
 
 void Score::cmdConcertPitchChanged(bool flag, bool /*useDoubleSharpsFlats*/)
       {
-      undo(new ChangeConcertPitch(this, flag));       // change style flag
+      undo(new ChangeStyleVal(this, StyleIdx::concertPitch, flag));       // change style flag
 
       for (Staff* staff : _staves) {
             if (staff->staffType()->group() == StaffGroup::PERCUSSION)
@@ -2337,7 +2337,7 @@ void Score::cmdConcertPitchChanged(bool flag, bool /*useDoubleSharpsFlats*/)
                   if (!flag)
                         interval.flip();
                   for (Element* e : segment->annotations()) {
-                        if ((e->type() != Element::Type::HARMONY) || (e->track() < startTrack) || (e->track() >= endTrack))
+                        if (!e->isHarmony() || (e->track() < startTrack) || (e->track() >= endTrack))
                               continue;
                         Harmony* h  = toHarmony(e);
                         int rootTpc = transposeTpc(h->rootTpc(), interval, true);
diff --git a/libmscore/undo.cpp b/libmscore/undo.cpp
index 42d907d2bd..861c98a724 100644
--- a/libmscore/undo.cpp
+++ b/libmscore/undo.cpp
@@ -1619,28 +1619,6 @@ const char* RemoveElement::name() const
       return buffer;
       }
 
-//---------------------------------------------------------
-//   ChangeConcertPitch
-//---------------------------------------------------------
-
-ChangeConcertPitch::ChangeConcertPitch(Score* s, bool v)
-      {
-      score = s;
-      val   = v;
-      }
-
-//---------------------------------------------------------
-//   flip
-//---------------------------------------------------------
-
-void ChangeConcertPitch::flip()
-      {
-      int oval = int(score->styleB(StyleIdx::concertPitch));
-      score->style()->set(StyleIdx::concertPitch, val);
-      score->setLayoutAll();
-      val = oval;
-      }
-
 //---------------------------------------------------------
 //   InsertPart
 //---------------------------------------------------------
diff --git a/libmscore/undo.h b/libmscore/undo.h
index dab6e858a1..23465e0692 100644
--- a/libmscore/undo.h
+++ b/libmscore/undo.h
@@ -546,20 +546,6 @@ class RemoveElement : public UndoCommand {
       virtual const char* name() const override;
       };
 
-//---------------------------------------------------------
-//   ChangeConcertPitch
-//---------------------------------------------------------
-
-class ChangeConcertPitch : public UndoCommand {
-      Score* score;
-      bool val;
-      void flip();
-
-   public:
-      ChangeConcertPitch(Score* s, bool val);
-      UNDO_NAME("ChangeConcertPitch")
-      };
-
 //---------------------------------------------------------
 //   EditText
 //---------------------------------------------------------
diff --git a/mscore/exportxml.cpp b/mscore/exportxml.cpp
index ff634d23df..e047e82bdc 100644
--- a/mscore/exportxml.cpp
+++ b/mscore/exportxml.cpp
@@ -4948,7 +4948,7 @@ void ExportMusicXml::write(QIODevice* dev)
       bool concertPitch = score()->styleB(StyleIdx::concertPitch);
       if (concertPitch) {
             score()->startCmd();
-            score()->undo(new ChangeConcertPitch(score(), false));
+            score()->undo(new ChangeStyleVal(score(), StyleIdx::concertPitch, false));
             score()->doLayout();    // this is only allowed in a cmd context to not corrupt the undo/redo stack
             }
 
diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
index 33d05ea042..d38bb79e9e 100644
--- a/mscore/musescore.cpp
+++ b/mscore/musescore.cpp
@@ -741,7 +741,9 @@ MuseScore::MuseScore()
 
       cpitchTools = addToolBar("");
       cpitchTools->setObjectName("pitch-tools");
-      cpitchTools->addWidget(new AccessibleToolButton( cpitchTools, getAction("concert-pitch")));
+      a = getAction("concert-pitch");
+      a->setCheckable(true);
+      cpitchTools->addWidget(new AccessibleToolButton(cpitchTools, a));
 
       //-------------------------------
       //    Image Capture Tool Bar
@@ -1287,9 +1289,9 @@ void MuseScore::retranslate(bool firstStart)
       viewModeCombo->setItemText(viewModeCombo->findData(int(LayoutMode::PAGE)), tr("Page View"));
       viewModeCombo->setItemText(viewModeCombo->findData(int(LayoutMode::LINE)), tr("Continuous View"));
       viewModeCombo->setItemText(viewModeCombo->findData(int(LayoutMode::SYSTEM)), tr("Single Page"));
-      
+
       showMidiImportButton->setText(tr("Show MIDI import panel"));
-      
+
       Shortcut::retranslate();
       if (!firstStart && Workspace::currentWorkspace->readOnly()) {
             changeWorkspace(Workspace::currentWorkspace);