Harmony refactor

src/engraving/dom/chordlist.cpp

@@ -1760,7 +1760,7 @@ void ChordList::read(XmlReader& e, int mscVersion)
         } else if (tag == "renderFunction") {
             readRenderList(e.readText(), renderListFunction);
         } else if (tag == "renderBase") {
-            readRenderList(e.readText(), renderListBase);
+            readRenderList(e.readText(), renderListBass);
         } else {
             e.unknown();
         }
@@ -1803,8 +1803,8 @@ void ChordList::write(XmlWriter& xml) const
     if (!renderListFunction.empty()) {
         writeRenderList(xml, renderListFunction, "renderFunction");
     }
-    if (!renderListBase.empty()) {
-        writeRenderList(xml, renderListBase, "renderBase");
+    if (!renderListBass.empty()) {
+        writeRenderList(xml, renderListBass, "renderBase");
     }
     for (const auto& p : *this) {
         const ChordDescription& cd = p.second;
@@ -1923,7 +1923,7 @@ void ChordList::unload()
     m_symbols.clear();
     fonts.clear();
     renderListRoot.clear();
-    renderListBase.clear();
+    renderListBass.clear();
     chordTokenList.clear();
     m_autoAdjust = false;
 }

src/engraving/dom/chordlist.h

@@ -277,7 +277,7 @@ class ChordList : public std::map<int, ChordDescription>
     std::list<ChordFont> fonts;
     std::list<RenderAction> renderListRoot;
     std::list<RenderAction> renderListFunction;
-    std::list<RenderAction> renderListBase;
+    std::list<RenderAction> renderListBass;
     std::list<ChordToken> chordTokenList;
     static int privateID;
 

src/engraving/dom/chordrest.cpp

@@ -287,7 +287,7 @@ EngravingItem* ChordRest::drop(EditData& data)
         if (!style().styleB(Sid::concertPitch) && !interval.isZero()) {
             interval.flip();
             int rootTpc = transposeTpc(harmony->rootTpc(), interval, true);
-            int baseTpc = transposeTpc(harmony->baseTpc(), interval, true);
+            int baseTpc = transposeTpc(harmony->bassTpc(), interval, true);
             score()->undoTransposeHarmony(harmony, rootTpc, baseTpc);
         }
         // render

src/engraving/dom/cmd.cpp

@@ -4284,7 +4284,7 @@ void Score::cmdRealizeChordSymbols(bool literal, Voicing voicing, HDuration dura
             if (!concertPitch) {
                 offset = interval.chromatic;
             }
-            notes = r.generateNotes(h->rootTpc(), h->baseTpc(),
+            notes = r.generateNotes(h->rootTpc(), h->bassTpc(),
                                     literal, voicing, offset);
         }
 

src/engraving/dom/edit.cpp

@@ -6534,7 +6534,7 @@ void Score::undoAddElement(EngravingItem* element, bool addToLinkedStaves, bool
                             interval.flip();
                         }
                         int rootTpc = transposeTpc(h->rootTpc(), interval, true);
-                        int baseTpc = transposeTpc(h->baseTpc(), interval, true);
+                        int baseTpc = transposeTpc(h->bassTpc(), interval, true);
                         score->undoTransposeHarmony(h, rootTpc, baseTpc);
                     }
                 }

src/engraving/dom/excerpt.cpp

@@ -461,7 +461,7 @@ void Excerpt::createExcerpt(Excerpt* excerpt)
                     }
                     Harmony* h  = toHarmony(e);
                     int rootTpc = mu::engraving::transposeTpc(h->rootTpc(), interval, true);
-                    int baseTpc = mu::engraving::transposeTpc(h->baseTpc(), interval, true);
+                    int baseTpc = mu::engraving::transposeTpc(h->bassTpc(), interval, true);
                     // mmrests are on by default in part
                     // if this harmony is attached to an mmrest,
                     // be sure to transpose harmony in underlying measure as well