Refactor: move 1.x excerpt reading code into read114

Author: cbjeukendrup

src/engraving/rw/read114/read114.cpp

@@ -2916,7 +2916,7 @@ muse::Ret Read114::readScoreFile(Score* score, XmlReader& e, ReadInOutData* out)
             }
         } else if (tag == "Excerpt") {
             Excerpt* ex = new Excerpt(masterScore);
-            read400::TRead::read(ex, e, ctx);
+            readExcerpt(ex, e, ctx);
             masterScore->m_excerpts.push_back(ex);
         } else if (tag == "Beam") {
             Beam* beam = Factory::createBeam(masterScore->dummy()->system());
@@ -3176,6 +3176,26 @@ muse::Ret Read114::readScoreFile(Score* score, XmlReader& e, ReadInOutData* out)
     return muse::make_ok();
 }
 
+void Read114::readExcerpt(Excerpt* item, XmlReader& e, ReadContext&)
+{
+    const std::vector<Part*>& pl = item->masterScore()->parts();
+    std::vector<Part*> parts;
+    while (e.readNextStartElement()) {
+        const AsciiStringView tag = e.name();
+        if (tag == "name" || tag == "title") {
+            item->setName(e.readText().trimmed());
+        } else if (tag == "part") {
+            size_t partIdx = static_cast<size_t>(e.readInt());
+            if (partIdx >= pl.size()) {
+                LOGD("Excerpt::read: bad part index");
+            } else {
+                parts.push_back(pl.at(partIdx));
+            }
+        }
+    }
+    item->setParts(parts);
+}
+
 bool Read114::pasteStaff(XmlReader&, Segment*, staff_idx_t, Fraction)
 {
     UNREACHABLE;

src/engraving/rw/read114/read114.h

@@ -24,6 +24,10 @@
 
 #include "../ireader.h"
 
+namespace mu::engraving {
+class Excerpt;
+}
+
 namespace mu::engraving::read400  {
 class ReadContext;
 }
@@ -47,5 +51,7 @@ class Read114 : public rw::IReader
 
 private:
     void doReadItem(EngravingItem* item, XmlReader& xml) override;
+
+    void readExcerpt(Excerpt* ex, XmlReader& e, read400::ReadContext& ctx);
 };
 }

src/engraving/rw/read400/tread.cpp

@@ -1328,26 +1328,6 @@ void TRead::read(FiguredBassItem* i, XmlReader& e, ReadContext& ctx)
     }
 }
 
-void TRead::read(Excerpt* item, XmlReader& e, ReadContext&)
-{
-    const std::vector<Part*>& pl = item->masterScore()->parts();
-    std::vector<Part*> parts;
-    while (e.readNextStartElement()) {
-        const AsciiStringView tag = e.name();
-        if (tag == "name" || tag == "title") {
-            item->setName(e.readText().trimmed());
-        } else if (tag == "part") {
-            size_t partIdx = static_cast<size_t>(e.readInt());
-            if (partIdx >= pl.size()) {
-                LOGD("Excerpt::read: bad part index");
-            } else {
-                parts.push_back(pl.at(partIdx));
-            }
-        }
-    }
-    item->setParts(parts);
-}
-
 void TRead::read(Fermata* f, XmlReader& e, ReadContext& ctx)
 {
     while (e.readNextStartElement()) {

src/engraving/rw/read400/tread.h

@@ -65,8 +65,6 @@ class ChordRest;
 class ChordLine;
 class Clef;
 
-class Excerpt;
-
 class FiguredBass;
 class FiguredBassItem;
 class Fingering;
@@ -208,7 +206,6 @@ class TRead
     static void read(ChordLine* l, XmlReader& xml, ReadContext& ctx);
     static void read(Clef* c, XmlReader& xml, ReadContext& ctx);
 
-    static void read(Excerpt* item, XmlReader& xml, ReadContext& ctx);
     static void read(Expression* item, XmlReader& xml, ReadContext& ctx);
 
     static void read(Fermata* f, XmlReader& xml, ReadContext& ctx);