Code review fixes

Author: mike-spa

src/framework/draw/drawmodule.cpp

@@ -49,9 +49,7 @@ void DrawModule::registerExports()
 
     ioc()->registerExport<draw::IImageProvider>(moduleName(), new QImageProvider());
 
-    auto mainFProvider = std::make_shared<FontProvider>(iocContext());
     auto qtFProvider = std::make_shared<QFontProvider>();
-    auto fdispatcher = std::make_shared<FontProviderDispatcher>(mainFProvider, qtFProvider);
 
     m_fontsEngine = std::make_shared<FontsEngine>(iocContext());
     ioc()->registerExport<draw::IFontProvider>(moduleName(), qtFProvider);

src/framework/draw/internal/qfontprovider.cpp

@@ -27,8 +27,6 @@
 #include <QFontMetricsF>
 #include <QRawFont>
 
-#include "engraving/dom/mscore.h"
-
 using namespace muse;
 using namespace muse::draw;
 
@@ -41,11 +39,12 @@ class FontPaintDevice : public QPaintDevice
     }
 
 protected:
+    static constexpr double MU_ENGRAVING_DPI = 2540; // Same as mu::engraving::DPI. TODO: pass as parameter
     int metric(PaintDeviceMetric m) const override
     {
         switch (m) {
         case QPaintDevice::PdmDpiY:
-            return mu::engraving::DPI;
+            return MU_ENGRAVING_DPI;
         default:
             return 1;
         }

src/framework/draw/painter.cpp

@@ -24,8 +24,6 @@
 #include "types/brush.h"
 #include "types/painterpath.h"
 
-#include "engraving/dom/mscore.h"
-
 #ifndef NO_QT_SUPPORT
 #include "internal/qpainterprovider.h"
 #endif
@@ -429,8 +427,9 @@ void Painter::drawRoundedRect(const RectF& rect, double xRadius, double yRadius)
 
 void Painter::applyFontSizeScaling()
 {
+    static constexpr double MU_ENGRAVING_DPI = 2540; // Same as mu::engraving::DPI. TODO: pass as parameter.
     Font f = font();
-    double scaledPointSize = f.pointSizeF() * mu::engraving::DPI / deviceLogicalDpi();
+    double scaledPointSize = f.pointSizeF() * MU_ENGRAVING_DPI / deviceLogicalDpi();
     f.setPointSizeF(scaledPointSize);
     setFont(f);
 }

src/importexport/musicxml/internal/musicxml/import/importmusicxmlpass1.cpp

@@ -1898,8 +1898,6 @@ static double scaleText(const String& str, const Sid fontFaceSid, const double f
     const FontMetrics fm(font);
 
     const double pagePrintableWidth = style.styleV(Sid::pagePrintableWidth).value<double>() * DPI;
-    const double pageWidth = style.styleV(Sid::pageWidth).value<double>() * DPI;
-    const double pageHeight = style.styleV(Sid::pageHeight).value<double>() * DPI;
 
     double longestLine = 0.0;
     for (const String& line : str.split(u"\n")) {