More cleanup

Simplify z-level management
Remove unused unlinkHarmony
Remove unused resetHarmonyAlignment
Remove unused linkHarmony
Remove unused applyAlignmentToHarmony
Remove unused CommandType::FretLinkHarmony

Author: mike-spa

src/engraving/dom/fret.cpp

@@ -804,21 +804,6 @@ std::vector<String> FretDiagram::patternHarmonies(const String& pattern)
     return muse::value(s_diagramPatternToHarmoniesMap, pattern);
 }
 
-void FretDiagram::applyAlignmentToHarmony()
-{
-    if (m_harmony->propertyFlags(Pid::OFFSET) == PropertyFlags::STYLED) {
-        m_harmony->resetProperty(Pid::OFFSET);
-    }
-
-    m_harmony->setProperty(Pid::ALIGN, Align(AlignH::HCENTER, AlignV::BASELINE));
-    m_harmony->setPropertyFlags(Pid::ALIGN, PropertyFlags::UNSTYLED);
-}
-
-void FretDiagram::resetHarmonyAlignment()
-{
-    m_harmony->resetProperty(Pid::ALIGN);
-}
-
 //---------------------------------------------------------
 //   clear
 //---------------------------------------------------------
@@ -946,38 +931,6 @@ void FretDiagram::setHarmony(String harmonyText)
     triggerLayout();
 }
 
-void FretDiagram::linkHarmony(Harmony* harmony)
-{
-    m_harmony = harmony;
-
-    setParent(harmony->explicitParent());
-    harmony->setParent(this);
-
-    //! on the same lavel as diagram
-    m_harmony->setZ(z());
-
-    if (Segment* segment = this->segment()) {
-        segment->removeAnnotation(harmony);
-    }
-
-    m_harmony->setTrack(track());
-
-    applyAlignmentToHarmony();
-}
-
-void FretDiagram::unlinkHarmony()
-{
-    m_harmony->setTrack(track());
-
-    resetHarmonyAlignment();
-
-    m_harmony->setZ(-1);
-
-    segment()->add(m_harmony);
-
-    m_harmony = nullptr;
-}
-
 //---------------------------------------------------------
 //   add
 //---------------------------------------------------------
@@ -990,9 +943,6 @@ void FretDiagram::add(EngravingItem* e)
 
         m_harmony->setTrack(track());
 
-        //! on the same lavel as diagram
-        m_harmony->setZ(z());
-
         if (m_harmony->harmonyName().empty()) {
             if (s_diagramPatternToHarmoniesMap.empty()) {
                 readHarmonyToDiagramFile(HARMONY_TO_DIAGRAM_FILE_PATH);
@@ -1007,7 +957,9 @@ void FretDiagram::add(EngravingItem* e)
             }
         }
 
-        applyAlignmentToHarmony();
+        m_harmony->resetProperty(Pid::OFFSET);
+        m_harmony->setProperty(Pid::ALIGN, Align(AlignH::HCENTER, AlignV::BASELINE));
+        m_harmony->setPropertyFlags(Pid::ALIGN, PropertyFlags::UNSTYLED);
 
         e->added();
     } else {
@@ -1355,7 +1307,7 @@ FretDiagram* FretDiagram::makeFromHarmonyOrFretDiagram(const EngravingItem* harm
 
         fretDiagram->updateDiagram(harmony->plainText());
 
-        fretDiagram->linkHarmony(harmony);
+        fretDiagram->add(harmony);
     } else if (harmonyOrFretDiagram->isHarmony() && harmonyOrFretDiagram->parentItem()->isFretDiagram()) {
         fretDiagram = toFretDiagram(harmonyOrFretDiagram->parentItem())->clone();
     } else if (harmonyOrFretDiagram->isFretDiagram()) {

src/engraving/dom/fret.h

@@ -209,8 +209,6 @@ class FretDiagram final : public EngravingItem
     String harmonyText() const;
     Harmony* harmony() const { return m_harmony; }
     void setHarmony(String harmonyText);
-    void linkHarmony(Harmony* harmony);
-    void unlinkHarmony();
 
     std::vector<FretItem::Dot> dot(int s, int f = 0) const;
     FretItem::Marker marker(int s) const;
@@ -302,9 +300,6 @@ class FretDiagram final : public EngravingItem
 
     static void applyDiagramPattern(FretDiagram* diagram, const String& pattern);
 
-    void applyAlignmentToHarmony();
-    void resetHarmonyAlignment();
-
     int m_strings = 0;
     int m_frets = 0;
     int m_fretOffset = 0;

src/engraving/dom/undo.h

@@ -159,7 +159,6 @@ enum class CommandType : signed char {
     FretMarker,
     FretBarre,
     FretClear,
-    FretLinkHarmony,
     RemoveFretDiagramFromFretBox,
 
     // Harmony

src/engraving/types/types.h

@@ -128,8 +128,8 @@ enum class ElementType : unsigned char {
     REHEARSAL_MARK,
     INSTRUMENT_CHANGE,
     STAFFTYPE_CHANGE,
-    HARMONY,
     FRET_DIAGRAM,
+    HARMONY,
     HARP_DIAGRAM,
     BEND,
     TREMOLOBAR,