From 8274550eeded349d8f024aac9a3cd19acfca0930 Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Sat, 20 Feb 2021 22:09:56 +0100
Subject: [PATCH] Fix loading of JS plugins

---
 libnymea-core/integrations/scriptintegrationplugin.cpp | 7 +------
 libnymea-core/integrations/scriptintegrationplugin.h   | 2 --
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/libnymea-core/integrations/scriptintegrationplugin.cpp b/libnymea-core/integrations/scriptintegrationplugin.cpp
index 6f6c18d9..b6dd4025 100644
--- a/libnymea-core/integrations/scriptintegrationplugin.cpp
+++ b/libnymea-core/integrations/scriptintegrationplugin.cpp
@@ -81,7 +81,7 @@ bool ScriptIntegrationPlugin::loadScript(const QString &fileName)
         dbg << spacer << "^";
         return false;
     }
-    m_metaData = QJsonObject::fromVariantMap(jsonDoc.toVariant().toMap());
+    setMetaData(QJsonObject::fromVariantMap(jsonDoc.toVariant().toMap()));
 
     m_engine = new QQmlEngine(this);
     m_engine->installExtensions(QJSEngine::AllExtensions);
@@ -98,11 +98,6 @@ bool ScriptIntegrationPlugin::loadScript(const QString &fileName)
     return true;
 }
 
-QJsonObject ScriptIntegrationPlugin::metaData() const
-{
-    return m_metaData;
-}
-
 void ScriptIntegrationPlugin::init()
 {
     //Couldn't find an non-qml way to register abstract classes in the JS engine as qRegisterMetatype doesn't deal so well with abstract classes
diff --git a/libnymea-core/integrations/scriptintegrationplugin.h b/libnymea-core/integrations/scriptintegrationplugin.h
index 5eb58da6..83526247 100644
--- a/libnymea-core/integrations/scriptintegrationplugin.h
+++ b/libnymea-core/integrations/scriptintegrationplugin.h
@@ -171,7 +171,6 @@ public:
     explicit ScriptIntegrationPlugin(QObject *parent = nullptr);
 
     bool loadScript(const QString &fileName);
-    QJsonObject metaData() const;
 
     void init() override;
     void startMonitoringAutoThings() override;
@@ -185,7 +184,6 @@ public:
 
 private:
     QQmlEngine *m_engine = nullptr;
-    QJsonObject m_metaData;
     QJSValue m_pluginImport;
     QHash<Thing*, ScriptThing*> m_things;
 };