Merge pull request #23287 from cbjeukendrup/non_unity_and_warnings

Fix non-unity build and fix compiler warnings
musescore · Jun 18, 2024 · 2cb2296 · 2cb2296
2 parents 53d0c44 + fed4afe
commit 2cb2296
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 7 deletions.
diff --git a/src/engraving/rendering/dev/alignmentlayout.cpp b/src/engraving/rendering/dev/alignmentlayout.cpp
@@ -36,7 +36,7 @@ void AlignmentLayout::alignItems(const std::vector<EngravingItem*>& elements, co
 
  double outermostY = 0.0;
  bool firstItem = true;
- auto computeOutermostY = [&outermostY, &firstItem, &alignedItems](EngravingItem* item) {
+ auto computeOutermostY = [&outermostY, &firstItem](EngravingItem* item) {
  double curY = yOpticalCenter(item);
  if (firstItem) {
  outermostY = curY;

diff --git a/src/engraving/rendering/dev/tlayout.cpp b/src/engraving/rendering/dev/tlayout.cpp
@@ -3206,9 +3206,8 @@ void TLayout::layoutHairpinSegment(HairpinSegment* item, LayoutContext& ctx)
  }
 
  // rebase vertical offset on drag
- double rebase = 0.0;
  if (ldata->offsetChanged() != OffsetChange::NONE) {
- rebase = Autoplace::rebaseOffset(item, ldata);
+ Autoplace::rebaseOffset(item, ldata);
  }
 
  if (item->autoplace()) {

diff --git a/src/framework/update/internal/updatescenario.cpp b/src/framework/update/internal/updatescenario.cpp
@@ -34,8 +34,6 @@
 #include "defer.h"
 #include "log.h"
 
-static constexpr int AUTO_CHECK_UPDATE_INTERVAL = 1000;
-
 using namespace muse;
 using namespace muse::update;
 using namespace muse::actions;

diff --git a/src/framework/vst/internal/fx/vstfxprocessor.cpp b/src/framework/vst/internal/fx/vstfxprocessor.cpp
@@ -22,6 +22,7 @@
 
 #include "vstfxprocessor.h"
 
+using namespace muse;
 using namespace muse::vst;
 using namespace muse::audio;
 

diff --git a/src/framework/vst/internal/vstpluginmetareader.cpp b/src/framework/vst/internal/vstpluginmetareader.cpp
@@ -27,6 +27,7 @@
 
 #include "log.h"
 
+using namespace muse;
 using namespace muse::audio;
 using namespace muse::vst;
 

diff --git a/src/framework/vst/internal/vstpluginsscanner.cpp b/src/framework/vst/internal/vstpluginsscanner.cpp
@@ -26,6 +26,7 @@
 
 #include "log.h"
 
+using namespace muse;
 using namespace muse::vst;
 
 /**

diff --git a/src/importexport/mei/internal/meiimporter.cpp b/src/importexport/mei/internal/meiimporter.cpp
@@ -44,6 +44,7 @@
 #include "engraving/dom/lyrics.h"
 #include "engraving/dom/marker.h"
 #include "engraving/dom/measure.h"
+#include "engraving/dom/measurerepeat.h"
 #include "engraving/dom/note.h"
 #include "engraving/dom/ornament.h"
 #include "engraving/dom/ottava.h"

diff --git a/src/importexport/mei/internal/meiimporter.h b/src/importexport/mei/internal/meiimporter.h
@@ -133,7 +133,7 @@ class MeiImporter
  bool readFermata(pugi::xml_node fermataNode, engraving::Measure* measure);
  bool readHairpin(pugi::xml_node hairpinNode, engraving::Measure* measure);
  bool readHarm(pugi::xml_node harmNode, engraving::Measure* measure);
- bool readLv(pugi::xml_node lvNode, Measure* measure);
+ bool readLv(pugi::xml_node lvNode, engraving::Measure* measure);
  bool readMordent(pugi::xml_node mordentNode, engraving::Measure* measure);
  bool readOctave(pugi::xml_node octaveNode, engraving::Measure* measure);
  bool readOrnam(pugi::xml_node ornamNode, engraving::Measure* measure);

diff --git a/src/importexport/musicxml/internal/musicxml/importmxmlpass1.cpp b/src/importexport/musicxml/internal/musicxml/importmxmlpass1.cpp
@@ -569,6 +569,8 @@ static bool overrideTextStyleForComposer(const String& creditString)
 // addText2
 //---------------------------------------------------------
 
+static void scaleTitle(Score* score, Text* text);
+
 /**
  Add text \a strTxt to VBox \a vbx using Tid \a stl.
  Also sets Align and Yoff.

diff --git a/src/importexport/musicxml/internal/musicxml/importmxmlpass1.h b/src/importexport/musicxml/internal/musicxml/importmxmlpass1.h
@@ -115,7 +115,6 @@ void determineTupletFractionAndFullDuration(const Fraction duration, Fraction& f
 Fraction missingTupletDuration(const Fraction duration);
 bool isLikelyCreditText(const String& text, const bool caseInsensitive);
 bool isLikelySubtitleText(const String& text, const bool caseInsensitive);
-static void scaleTitle(Score* score, Text* t);
 
 //---------------------------------------------------------
 // MusicXMLParserPass1