From d0fd7766486012840a3f66fed1330eef13109604 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=C3=ABl=20Capelle?= Date: Sun, 14 Jun 2020 14:51:52 +0200 Subject: [PATCH 1/2] Change getLoadOrder() to return the load order in python. --- src/runner/gamefeatureswrappers.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/runner/gamefeatureswrappers.cpp b/src/runner/gamefeatureswrappers.cpp index f2cf344..5118c7b 100644 --- a/src/runner/gamefeatureswrappers.cpp +++ b/src/runner/gamefeatureswrappers.cpp @@ -76,7 +76,7 @@ void GamePluginsWrapper::readPluginLists(MOBase::IPluginList * pluginList) void GamePluginsWrapper::getLoadOrder(QStringList &loadOrder) { - return basicWrapperFunctionImplementation(this, "getLoadOrder", loadOrder); + loadOrder = basicWrapperFunctionImplementation(this, "getLoadOrder"); } bool GamePluginsWrapper::lightPluginsAreSupported() @@ -284,7 +284,11 @@ void registerGameFeaturesPythonConverters() bpy::class_("GamePlugins") .def("writePluginLists", bpy::pure_virtual(&GamePlugins::writePluginLists)) .def("readPluginLists", bpy::pure_virtual(&GamePlugins::readPluginLists)) - .def("getLoadOrder", bpy::pure_virtual(&GamePlugins::getLoadOrder)) + .def("getLoadOrder", +[](GamePlugins* p) { + QStringList loadOrder; + p->getLoadOrder(loadOrder); + return loadOrder; + }) .def("lightPluginsAreSupported", bpy::pure_virtual(&GamePlugins::lightPluginsAreSupported)) ; From e7ae48f633c9e3c01bc69a928c72c7b4b8609b76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=C3=ABl=20Capelle?= Date: Sun, 14 Jun 2020 15:31:21 +0200 Subject: [PATCH 2/2] Update getLoadOrder() bindings following game_features change. --- src/runner/gamefeatureswrappers.cpp | 10 +++------- src/runner/gamefeatureswrappers.h | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/runner/gamefeatureswrappers.cpp b/src/runner/gamefeatureswrappers.cpp index 5118c7b..a8e7d97 100644 --- a/src/runner/gamefeatureswrappers.cpp +++ b/src/runner/gamefeatureswrappers.cpp @@ -74,9 +74,9 @@ void GamePluginsWrapper::readPluginLists(MOBase::IPluginList * pluginList) return basicWrapperFunctionImplementation(this, "readPluginLists", boost::python::ptr(pluginList)); } -void GamePluginsWrapper::getLoadOrder(QStringList &loadOrder) +QStringList GamePluginsWrapper::getLoadOrder() { - loadOrder = basicWrapperFunctionImplementation(this, "getLoadOrder"); + return basicWrapperFunctionImplementation(this, "getLoadOrder"); } bool GamePluginsWrapper::lightPluginsAreSupported() @@ -284,11 +284,7 @@ void registerGameFeaturesPythonConverters() bpy::class_("GamePlugins") .def("writePluginLists", bpy::pure_virtual(&GamePlugins::writePluginLists)) .def("readPluginLists", bpy::pure_virtual(&GamePlugins::readPluginLists)) - .def("getLoadOrder", +[](GamePlugins* p) { - QStringList loadOrder; - p->getLoadOrder(loadOrder); - return loadOrder; - }) + .def("getLoadOrder", bpy::pure_virtual(&GamePlugins::getLoadOrder)) .def("lightPluginsAreSupported", bpy::pure_virtual(&GamePlugins::lightPluginsAreSupported)) ; diff --git a/src/runner/gamefeatureswrappers.h b/src/runner/gamefeatureswrappers.h index 542c712..606b560 100644 --- a/src/runner/gamefeatureswrappers.h +++ b/src/runner/gamefeatureswrappers.h @@ -65,7 +65,7 @@ public: virtual void writePluginLists(const MOBase::IPluginList *pluginList) override; virtual void readPluginLists(MOBase::IPluginList *pluginList) override; - virtual void getLoadOrder(QStringList &loadOrder) override; + virtual QStringList getLoadOrder() override; virtual bool lightPluginsAreSupported() override; };