Merge pull request #31831 from kryksyh/refactor_context_inject

Added missing context injects

Author: kryksyh

src/appshell/qml/MuseScore/AppShell/welcomedialogmodel.cpp

@@ -26,6 +26,7 @@
 using namespace mu::appshell;
 
 WelcomeDialogModel::WelcomeDialogModel()
+    : muse::Injectable(muse::iocCtxForQmlObject(this))
 {
 }
 

src/braille/qml/MuseScore/Braille/braillemodel.cpp

@@ -26,7 +26,7 @@ using namespace mu::braille;
 using namespace mu::notation;
 
 BrailleModel::BrailleModel(QObject* parent)
-    : QObject(parent)
+    : QObject(parent), muse::Injectable(muse::iocCtxForQmlObject(this))
 {
 }
 

src/engraving/api/v1/qmlpluginapi.cpp

@@ -234,7 +234,7 @@ void PluginAPI::setup(QQmlEngine* e)
 }
 
 PluginAPI::PluginAPI(QQuickItem* parent)
-    : QQuickItem(parent)
+    : QQuickItem(parent), muse::Injectable(muse::iocCtxForQmlObject(this))
 {
     setRequiresScore(true); // by default plugins require a score to work
 }

src/framework/audio/common/iaudiothreadsecurer.h

@@ -29,7 +29,7 @@
 #include "global/modularity/imoduleinterface.h"
 
 namespace muse::audio {
-class IAudioThreadSecurer : MODULE_EXPORT_INTERFACE
+class IAudioThreadSecurer : MODULE_GLOBAL_EXPORT_INTERFACE
 {
     INTERFACE_ID(IAudioThreadSecurer)
 public:

src/framework/global/modularity/ioccontext.cpp

@@ -38,7 +38,8 @@ muse::Injectable::GetContext muse::iocCtxForQmlObject(const QObject* o)
             engine = qmlEngine(p);
         }
 
-        IF_ASSERT_FAILED(engine) {
+        if (!engine) {
+            LOGW() << "Engine is not set for QML Object: " << o->metaObject()->className();
             return modularity::ContextPtr();
         }
 

src/framework/global/thirdparty/kors_modularity/modularity/injectable.h

@@ -13,7 +13,7 @@ class Injectable
 
     using GetContext = std::function<modularity::ContextPtr ()>;
 
-    Injectable(const modularity::ContextPtr& ctx = nullptr)
+    Injectable(const modularity::ContextPtr& ctx)
         : m_ctx(ctx) {}
 
     Injectable(const Injectable* inj)

src/framework/network/internal/networkmanager.h

@@ -35,7 +35,7 @@ class QNetworkRequest;
 class QNetworkReply;
 
 namespace muse::network {
-class NetworkManager : public QObject, public INetworkManager, public Injectable, public async::Asyncable
+class NetworkManager : public QObject, public INetworkManager, public async::Asyncable
 {
     Q_OBJECT
 

src/framework/ui/qml/Muse/Ui/windowsmodel.cpp

@@ -27,7 +27,7 @@
 using namespace muse::ui;
 
 WindowsModel::WindowsModel(QObject* parent)
-    : QObject(parent)
+    : QObject(parent), muse::Injectable(muse::iocCtxForQmlObject(this))
 {
 }
 

src/framework/uicomponents/qml/Muse/UiComponents/toolbaritem.cpp

@@ -30,12 +30,12 @@ using namespace muse::uicomponents;
 using namespace muse::ui;
 
 ToolBarItem::ToolBarItem(QObject* parent)
-    : QObject(parent)
+    : QObject(parent), Injectable(iocCtxForQmlObject(this))
 {
 }
 
 ToolBarItem::ToolBarItem(const UiAction& action, ToolBarItemType::Type type, QObject* parent)
-    : QObject(parent)
+    : QObject(parent), Injectable(iocCtxForQmlObject(this))
 {
     m_id = QString::fromStdString(action.code);
     m_action = action;

src/framework/vst/internal/fx/vstfxresolver.h

@@ -30,11 +30,13 @@
 #include "../../ivstmodulesrepository.h"
 
 namespace muse::vst {
-class VstFxResolver : public audio::fx::AbstractFxResolver
+class VstFxResolver : public audio::fx::AbstractFxResolver, public muse::Injectable
 {
-    muse::Inject<IVstModulesRepository> pluginModulesRepo;
-    muse::Inject<IVstInstancesRegister> instancesRegister;
+    muse::Inject<IVstModulesRepository> pluginModulesRepo { this };
+    muse::Inject<IVstInstancesRegister> instancesRegister { this };
 public:
+    VstFxResolver(const muse::modularity::ContextPtr& ctx)
+        : muse::Injectable(ctx) {}
     // IFxResolver::IResolver interface
     audio::AudioResourceMetaList resolveResources() const override;
     void refresh() override;