Merge pull request #31129 from juli27/removeEndElementFlush

Author: cbjeukendrup

src/engraving/dom/engravingitem.cpp

@@ -947,6 +947,7 @@ muse::ByteArray EngravingItem::mimeData(const PointF& dragOffset) const
     rw::RWRegister::writer(iocContext())->writeItem(this, xml);
 
     xml.endElement();
+    xml.flush();
     buffer.close();
     return buffer.data();
 }

src/engraving/dom/select.cpp

@@ -1125,6 +1125,7 @@ muse::ByteArray Selection::staffMimeData() const
     }
 
     xml.endElement();
+    xml.flush();
     return buffer.data();
 }
 
@@ -1312,6 +1313,7 @@ muse::ByteArray Selection::symbolListMimeData() const
     }
 
     xml.endElement();
+    xml.flush();
     buffer.close();
     return buffer.data();
 }

src/engraving/rw/write/writer.cpp

@@ -67,6 +67,7 @@ bool Writer::writeScore(Score* score, io::IODevice* device, rw::WriteInOutData*
     write(score, xml, ctx, hook);
 
     xml.endElement();
+    xml.flush();
 
     if (!inout || !inout->ctx.shouldWriteRange()) {
         //update version values for i.e. plugin access

src/engraving/tests/engraving_xml_tests.cpp

@@ -54,6 +54,7 @@ TEST_F(Engraving_XMLTests, readHTML)
         xml.writeXml(u"xmlTag", XML_TEXT_VERBOSE);
 
         xml.endElement();
+        xml.flush();
 
         EXPECT_NE(data.size(), 0);
         buf.close();

src/framework/global/serialization/xmlstreamwriter.cpp

@@ -182,7 +182,6 @@ void XmlStreamWriter::endElement()
 {
     m_impl->putLevel();
     m_impl->stream << "</" << muse::takeLast(m_impl->stack) << '>' << '\n';
-    flush();
 }
 
 // <element attr="value" />

src/framework/global/tests/xmlstreamwriter_tests.cpp

@@ -56,6 +56,7 @@ TEST_F(Global_Ser_XML, WriteRead)
         xml.endElement();
 
         xml.endElement();
+        xml.flush();
 
         EXPECT_NE(data.size(), 0);
         buf.close();

src/framework/shortcuts/internal/midiremote.cpp

@@ -202,6 +202,7 @@ bool MidiRemote::writeMidiMappings(const MidiMappingList& midiMappings) const
     }
 
     writer.endElement();
+    writer.flush();
 
     return !mappingsFile.hasError();
 }

src/framework/shortcuts/internal/shortcutsregister.cpp

@@ -368,6 +368,7 @@ bool ShortcutsRegister::writeToFile(const ShortcutList& shortcuts, const io::pat
     }
 
     writer.endElement();
+    writer.flush();
 
     return !file.hasError();
 }

src/importexport/musicxml/internal/musicxml/export/exportmusicxml.cpp

@@ -8776,6 +8776,7 @@ void ExportMusicXml::write(muse::io::IODevice* dev)
     writeParts();
 
     m_xml.endElement();
+    m_xml.flush();
 }
 
 //---------------------------------------------------------
@@ -8835,15 +8836,15 @@ static void writeMxlArchive(Score* score, muse::ZipWriter& zip, const String& fi
     muse::io::Buffer cbuf;
     cbuf.open(muse::io::IODevice::ReadWrite);
 
-    XmlWriter xml;
-    xml.setDevice(&cbuf);
+    XmlWriter xml(&cbuf);
     xml.startDocument();
     xml.startElement("container");
     xml.startElement("rootfiles");
     xml.startElement("rootfile", { { "full-path", filename } });
     xml.endElement();
     xml.endElement();
     xml.endElement();
+    xml.flush();
     cbuf.seek(0);
 
     zip.addFile("META-INF/container.xml", cbuf.data());

src/palette/internal/mimedatautils.h

@@ -35,6 +35,7 @@ QByteArray toMimeData(T* t)
     buffer.open(muse::io::IODevice::WriteOnly);
     engraving::XmlWriter xml(&buffer);
     t->write(xml, true);
+    xml.flush();
     buffer.close();
     return buffer.data().toQByteArray();
 }