Merge pull request #19202 from cbjeukendrup/fix_non_unity

Fix non-unity build

Author: cbjeukendrup

src/engraving/libmscore/system.cpp

@@ -43,14 +43,12 @@
 #include "part.h"
 #include "score.h"
 #include "segment.h"
-#include "select.h"
 #include "sig.h"
 #include "spacer.h"
 #include "spanner.h"
 #include "staff.h"
 #include "system.h"
 #include "systemdivider.h"
-#include "textframe.h"
 #include "tremolo.h"
 
 #ifndef ENGRAVING_NO_ACCESSIBILITY

src/framework/audio/internal/audioconfiguration.cpp

@@ -24,9 +24,10 @@
 //TODO: remove with global clearing of Q_OS_*** defines
 #include <QtGlobal>
 
+#include "log.h"
 #include "settings.h"
 
-#include "log.h"
+#include "soundfonttypes.h"
 
 using namespace mu;
 using namespace mu::framework;
@@ -43,7 +44,7 @@ static const Settings::Key AUDIO_SAMPLE_RATE_KEY("audio", "io/sampleRate");
 
 static const Settings::Key USER_SOUNDFONTS_PATHS("midi", "application/paths/mySoundfonts");
 
-static const AudioResourceId DEFAULT_SOUND_FONT_NAME = "MS Basic";     // "GeneralUser GS v1.471.sf2"; // "MS Basic.sf3";
+static const AudioResourceId DEFAULT_SOUND_FONT_NAME = "MS Basic";
 static const AudioResourceMeta DEFAULT_AUDIO_RESOURCE_META
     = { DEFAULT_SOUND_FONT_NAME, AudioResourceType::FluidSoundfont, "Fluid", {}, false /*hasNativeEditor*/ };
 

src/framework/vst/vsttypes.h

@@ -26,6 +26,14 @@
 #include <unordered_map>
 #include <vector>
 
+#if (defined (_MSCVER) || defined (_MSC_VER))
+#pragma warning (push)
+#pragma warning (disable: 4996)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 #include "public.sdk/source/vst/hosting/module.h"
 #include "public.sdk/source/vst/hosting/plugprovider.h"
 #include "public.sdk/source/vst/hosting/hostclasses.h"
@@ -40,6 +48,12 @@
 #include "pluginterfaces/vst/ivsteditcontroller.h"
 #include "pluginterfaces/vst/ivstmidicontrollers.h"
 
+#if (defined (_MSCVER) || defined (_MSC_VER))
+#pragma warning (pop)
+#else
+#pragma GCC diagnostic pop
+#endif
+
 #include "framework/midi/miditypes.h"
 #include "io/path.h"
 #include "log.h"

src/importexport/mei/internal/meiconverter.cpp

@@ -22,33 +22,35 @@
 
 #include "meiconverter.h"
 
+#include <iostream>
+#include <sstream>
+#include <string>
+#include <valarray>
+
+#include "engraving/types/symnames.h"
+#include "engraving/types/typesconv.h"
+
 #include "libmscore/accidental.h"
 #include "libmscore/breath.h"
 #include "libmscore/dynamic.h"
-#include "libmscore/jump.h"
 #include "libmscore/fermata.h"
+#include "libmscore/hairpin.h"
 #include "libmscore/harmony.h"
+#include "libmscore/jump.h"
 #include "libmscore/marker.h"
 #include "libmscore/measure.h"
 #include "libmscore/note.h"
 #include "libmscore/ottava.h"
 #include "libmscore/part.h"
 #include "libmscore/pitchspelling.h"
+#include "libmscore/slurtie.h"
 #include "libmscore/staff.h"
 #include "libmscore/stafftype.h"
-#include "libmscore/utils.h"
 #include "libmscore/tempotext.h"
 #include "libmscore/text.h"
 #include "libmscore/textbase.h"
-#include "libmscore/tie.h"
 #include "libmscore/tuplet.h"
-#include "engraving/types/typesconv.h"
-#include "types/symnames.h"
-
-#include <iostream>
-#include <string>
-#include <sstream>
-#include <valarray>
+#include "libmscore/utils.h"
 
 using namespace mu::iex::mei;
 using namespace mu;

src/importexport/mei/internal/meiconverter.h

@@ -24,7 +24,6 @@
 #define MU_IMPORTEXPORT_MEICONVERTER_H
 
 #include "libmscore/accidental.h"
-#include "libmscore/clef.h"
 #include "libmscore/interval.h"
 #include "libmscore/timesig.h"
 #include "libmscore/volta.h"

src/importexport/mei/internal/meiexporter.cpp

@@ -22,48 +22,50 @@
 
 #include "meiexporter.h"
 
-#include "libmscore/articulation.h"
-#include "libmscore/barline.h"
+#include <random>
+
+#include "log.h"
+#include "types/datetime.h"
+
 #include "libmscore/beam.h"
 #include "libmscore/box.h"
 #include "libmscore/bracket.h"
+#include "libmscore/breath.h"
 #include "libmscore/chord.h"
 #include "libmscore/clef.h"
 #include "libmscore/dynamic.h"
 #include "libmscore/factory.h"
+#include "libmscore/fermata.h"
 #include "libmscore/hairpin.h"
+#include "libmscore/harmony.h"
 #include "libmscore/jump.h"
-#include "libmscore/key.h"
 #include "libmscore/keysig.h"
-#include "libmscore/lyrics.h"
 #include "libmscore/marker.h"
-#include "libmscore/masterscore.h"
 #include "libmscore/measure.h"
 #include "libmscore/note.h"
+#include "libmscore/ottava.h"
+#include "libmscore/page.h"
 #include "libmscore/part.h"
 #include "libmscore/rest.h"
+#include "libmscore/score.h"
 #include "libmscore/segment.h"
 #include "libmscore/sig.h"
 #include "libmscore/slur.h"
 #include "libmscore/staff.h"
+#include "libmscore/system.h"
 #include "libmscore/tempotext.h"
 #include "libmscore/text.h"
 #include "libmscore/tie.h"
 #include "libmscore/timesig.h"
-#include "libmscore/timesig.h"
 #include "libmscore/tuplet.h"
 #include "libmscore/volta.h"
 
-#include "log.h"
-
 #include "meiconverter.h"
 
 #include "thirdparty/libmei/cmn.h"
 #include "thirdparty/libmei/harmony.h"
 #include "thirdparty/libmei/shared.h"
 
-#include <random>
-
 using namespace mu::iex::mei;
 using namespace mu::engraving;
 

src/importexport/mei/internal/meiexporter.h

@@ -23,21 +23,53 @@
 #ifndef MU_IMPORTEXPORT_MEIEXPORTER_H
 #define MU_IMPORTEXPORT_MEIEXPORTER_H
 
-#include "engraving/types/fraction.h"
+#include "engraving/types/types.h"
 
 #include "modularity/ioc.h"
 #include "imeiconfiguration.h"
 
+#include "thirdparty/libmei/element.h"
+#include "thirdparty/libmei/shared.h"
+
 #include "thirdparty/pugixml.hpp"
 
 namespace mu::engraving {
+class Beam;
+class Breath;
+class Chord;
+class ChordRest;
+class Clef;
+class Dynamic;
+class EngravingItem;
+class Fermata;
+class Fermata;
 class Fraction;
+class Hairpin;
+class Harmony;
+class Jump;
+class Marker;
 class Measure;
+class Note;
+class Ottava;
+class Part;
+class Rest;
 class Score;
+class Segment;
+class Slur;
+class Spanner;
 class Staff;
+class TempoText;
+class TextBase;
+class TextLineBase;
+class Tie;
+class Tuplet;
+class VBox;
+class Volta;
 }
 
 namespace mu::iex::mei {
+class UIDRegister;
+
 enum layerElementCounter {
     ACCID_L = 0,
     BEAM_L,
@@ -187,7 +219,7 @@ class MeiExporter
     std::vector<int> m_layerCounterFor;
 
     /** map of abbreviations for element within layers */
-    inline static std::map<layerElementCounter, String> s_layerXmlIdMap = {
+    inline static const std::map<layerElementCounter, String> s_layerXmlIdMap = {
         { ACCID_L, u"a" },
         { BEAM_L, u"b" },
         { GRACEGRP_L, u"g" },

src/importexport/mei/internal/meiimporter.cpp

@@ -22,36 +22,43 @@
 
 #include "meiimporter.h"
 
-#include "meiconverter.h"
-
 #include "libmscore/articulation.h"
 #include "libmscore/barline.h"
+#include "libmscore/box.h"
 #include "libmscore/bracket.h"
+#include "libmscore/breath.h"
 #include "libmscore/chord.h"
 #include "libmscore/clef.h"
 #include "libmscore/dynamic.h"
 #include "libmscore/expression.h"
 #include "libmscore/factory.h"
+#include "libmscore/fermata.h"
+#include "libmscore/hairpin.h"
+#include "libmscore/harmony.h"
+#include "libmscore/jump.h"
 #include "libmscore/key.h"
 #include "libmscore/keysig.h"
 #include "libmscore/layoutbreak.h"
-#include "libmscore/lyrics.h"
-#include "libmscore/masterscore.h"
+#include "libmscore/marker.h"
 #include "libmscore/measure.h"
 #include "libmscore/note.h"
+#include "libmscore/ottava.h"
 #include "libmscore/part.h"
 #include "libmscore/playtechannotation.h"
 #include "libmscore/rest.h"
+#include "libmscore/score.h"
 #include "libmscore/segment.h"
 #include "libmscore/sig.h"
 #include "libmscore/slur.h"
 #include "libmscore/staff.h"
 #include "libmscore/stafftext.h"
+#include "libmscore/tempotext.h"
 #include "libmscore/text.h"
 #include "libmscore/textline.h"
-#include "libmscore/timesig.h"
+#include "libmscore/tie.h"
 #include "libmscore/timesig.h"
 #include "libmscore/tuplet.h"
+#include "libmscore/utils.h"
 
 #include "meiconverter.h"
 

src/importexport/mei/internal/meiimporter.h

@@ -23,22 +23,38 @@
 #ifndef MU_IMPORTEXPORT_MEIIMPORTER_H
 #define MU_IMPORTEXPORT_MEIIMPORTER_H
 
-#include "engraving/types/fraction.h"
+#include "engraving/types/types.h"
 
 #include "modularity/ioc.h"
 #include "imeiconfiguration.h"
 #include "io/ifilesystem.h"
 #include "io/path.h"
 
+#include "thirdparty/libmei/cmn.h"
+#include "thirdparty/libmei/element.h"
+#include "thirdparty/libmei/shared.h"
+
 #include "thirdparty/pugixml.hpp"
 
 namespace mu::engraving {
-class Fraction;
+class Chord;
+class ChordRest;
+class EngravingItem;
 class Measure;
+class Note;
+class Part;
 class Score;
+class Spanner;
+class Tuplet;
+class VBox;
+enum class NoteType;
+enum class TimeSigType : char;
+struct ClefTypeList;
 }
 
 namespace mu::iex::mei {
+class UIDRegister;
+
 enum GraceReading {
     GraceNone = 0,
     GraceAsGrp,
@@ -128,7 +144,7 @@ class MeiImporter
      */
     void addEndBarLineToMeasure(engraving::Measure* measure, engraving::BarLineType barLineType);
     void addLayoutBreakToMeasure(engraving::Measure* measure, engraving::LayoutBreakType layoutBreakType);
-    void addTextToTitleFrame(VBox*& vBox, const String& str, TextStyleType textStyleType);
+    void addTextToTitleFrame(engraving::VBox*& vBox, const String& str, engraving::TextStyleType textStyleType);
     void addSpannerEnds();
 
     /**
@@ -138,11 +154,11 @@ class MeiImporter
     int getVoiceIndex(int staffIdx, int layerN);
     void addLog(const std::string& msg, pugi::xml_node node);
     bool isNode(pugi::xml_node node, const String& name);
-    engraving::ChordRest* addChordRest(pugi::xml_node node, Measure* measure, int track, const libmei::Element& meiElement, int& ticks,
-                                       bool isRest);
+    engraving::ChordRest* addChordRest(pugi::xml_node node, engraving::Measure* measure, int track, const libmei::Element& meiElement,
+                                       int& ticks, bool isRest);
     bool addGraceNotesToChord(engraving::ChordRest* chordRest, bool isAfter = false);
-    engraving::EngravingItem* addAnnotation(const libmei::Element& meiElement, Measure* measure);
-    engraving::Spanner* addSpanner(const libmei::Element& meiElement, Measure* measure, pugi::xml_node node);
+    engraving::EngravingItem* addAnnotation(const libmei::Element& meiElement, engraving::Measure* measure);
+    engraving::Spanner* addSpanner(const libmei::Element& meiElement, engraving::Measure* measure, pugi::xml_node node);
     std::string xmlIdFrom(std::string dataURI);
     engraving::ChordRest* findStart(const libmei::Element& meiElement, engraving::Measure* measure);
     engraving::ChordRest* findEnd(pugi::xml_node controlNode, const engraving::ChordRest* startChordRest);
@@ -156,7 +172,7 @@ class MeiImporter
     /** The uid register */
     UIDRegister* m_uids;
 
-    Fraction m_ticks;
+    engraving::Fraction m_ticks;
     int m_lastMeasureN;
     engraving::Measure* m_lastMeasure;
 

src/importexport/mei/internal/meireader.cpp

@@ -22,12 +22,13 @@
 
 #include "meireader.h"
 
-#include "iinteractive.h"
-#include "meiimporter.h"
+#include "translation.h"
 
-#include "libmscore/masterscore.h"
 #include "engraving/engravingerrors.h"
-#include "translation.h"
+#include "engraving/libmscore/masterscore.h"
+
+#include "meiimporter.h"
+#include "meiconverter.h"
 
 using namespace mu::iex::mei;
 using namespace mu::engraving;