Plugin: WIP: Revert prior commit to only affect curScore object.

This restricts changes of wrapper ownership to CppOwnership for objects returned by the `curScore` scripting property.
musescore · Sep 11, 2019 · 61a3e78 · 61a3e78
1 parent 9b231f5
commit 61a3e78
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/mscore/plugin/api/qmlpluginapi.cpp b/mscore/plugin/api/qmlpluginapi.cpp
@@ -103,7 +103,9 @@ PluginAPI::PluginAPI(QQuickItem* parent)
 
 Score* PluginAPI::curScore() const
       {
-      return wrap<Score>(msc()->currentScore(), Ownership::SCORE);
+      Score* pscore = wrap<Score>(msc()->currentScore(), Ownership::SCORE);
+      QQmlEngine::setObjectOwnership(pscore, QQmlEngine::CppOwnership);
+      return pscore;
       }
 
 //---------------------------------------------------------

diff --git a/mscore/plugin/api/scoreelement.h b/mscore/plugin/api/scoreelement.h
@@ -125,14 +125,8 @@ Wrapper* wrap(T* t, Ownership own = Ownership::SCORE)
                   {
                   w = new Wrapper(t, own);
                   t->setPlugInWrapper(w);
-                  //@@@@@@ // All wrapper objects should belong to JavaScript code.
-                  //@@@@@@ QQmlEngine::setObjectOwnership(w, QQmlEngine::JavaScriptOwnership);
-
-				  // All ScoreElement based wrapper objects should belong to Cpp code.
-				  // When the associated MuseScore object is destroyed it will call
-                  // slot "symbiantDestroyed". That handler will set object ownership back to
-                  // the Javascript Engine.
-                  QQmlEngine::setObjectOwnership(w, QQmlEngine::CppOwnership);
+                  // All wrapper objects should belong to JavaScript code.
+                  QQmlEngine::setObjectOwnership(w, QQmlEngine::JavaScriptOwnership);
                   }
             else
                   w = static_cast<Wrapper*>(t->getPlugInWrapper());