From b20c015643b72abc29239809a05d75fd89cb6acb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=C3=ABl=20Capelle?= Date: Wed, 11 Nov 2020 21:00:47 +0100 Subject: [PATCH] master() returns the name of the plugin. --- src/runner/proxypluginwrappers.cpp | 6 +++--- src/runner/proxypluginwrappers.h | 4 ++-- src/runner/pythonrunner.cpp | 18 +++++++++--------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/runner/proxypluginwrappers.cpp b/src/runner/proxypluginwrappers.cpp index 860a078..e88cf37 100644 --- a/src/runner/proxypluginwrappers.cpp +++ b/src/runner/proxypluginwrappers.cpp @@ -43,9 +43,9 @@ QString class_name::localizedName() const \ return basicWrapperFunctionImplementationWithDefault(this, &class_name::localizedName_Default, "localizedName"); \ } \ \ -IPlugin* class_name::master() const \ +QString class_name::master() const \ { \ - return basicWrapperFunctionImplementationWithDefault(this, &class_name::master_Default, "master"); \ + return basicWrapperFunctionImplementationWithDefault(this, &class_name::master_Default, "master"); \ } \ \ QString class_name::author() const \ @@ -68,7 +68,7 @@ QList class_name::settings() const \ return basicWrapperFunctionImplementation>(this, "settings"); \ } \ QString class_name::localizedName_Default() const { return IPlugin::localizedName(); } \ -IPlugin* class_name::master_Default() const { return IPlugin::master(); } \ +QString class_name::master_Default() const { return IPlugin::master(); } \ BOOST_PP_EXPR_IF(include_requirements, \ QList class_name::requirements() const { \ return basicWrapperFunctionImplementationWithDefault>( \ diff --git a/src/runner/proxypluginwrappers.h b/src/runner/proxypluginwrappers.h index 8405669..46a3bf5 100644 --- a/src/runner/proxypluginwrappers.h +++ b/src/runner/proxypluginwrappers.h @@ -24,13 +24,13 @@ public: \ virtual bool init(MOBase::IOrganizer *moInfo) override; \ virtual QString name() const override; \ virtual QString localizedName() const override; \ -virtual IPlugin* master() const override; \ +virtual QString master() const override; \ virtual QString author() const override; \ virtual QString description() const override; \ virtual MOBase::VersionInfo version() const override; \ virtual QList settings() const override; \ QString localizedName_Default() const; \ -IPlugin* master_Default() const; \ +QString master_Default() const; \ BOOST_PP_EXPR_IF(include_requirements, \ virtual QList requirements() const override; \ QList requirements_Default() const;) diff --git a/src/runner/pythonrunner.cpp b/src/runner/pythonrunner.cpp index fcaff11..2200d0a 100644 --- a/src/runner/pythonrunner.cpp +++ b/src/runner/pythonrunner.cpp @@ -825,7 +825,7 @@ BOOST_PYTHON_MODULE(mobase) .def("init", bpy::pure_virtual(&MOBase::IPlugin::init), bpy::arg("organizer")) .def("name", bpy::pure_virtual(&MOBase::IPlugin::name)) .def("localizedName", &MOBase::IPlugin::localizedName, &IPluginWrapper::localizedName_Default) - .def("master", &MOBase::IPlugin::master, &IPluginWrapper::master_Default, bpy::return_value_policy()) + .def("master", &MOBase::IPlugin::master, &IPluginToolWrapper::master_Default) .def("author", bpy::pure_virtual(&MOBase::IPlugin::author)) .def("description", bpy::pure_virtual(&MOBase::IPlugin::description)) .def("version", bpy::pure_virtual(&MOBase::IPlugin::version)) @@ -835,7 +835,7 @@ BOOST_PYTHON_MODULE(mobase) bpy::class_, boost::noncopyable>("IPluginDiagnose") .def("localizedName", &MOBase::IPlugin::localizedName, &IPluginDiagnoseWrapper::localizedName_Default) - .def("master", &MOBase::IPlugin::master, &IPluginDiagnoseWrapper::master_Default, bpy::return_value_policy()) + .def("master", &MOBase::IPlugin::master, &IPluginToolWrapper::master_Default) .def("requirements", &MOBase::IPlugin::requirements, &IPluginDiagnoseWrapper::requirements_Default) .def("activeProblems", bpy::pure_virtual(&MOBase::IPluginDiagnose::activeProblems)) @@ -862,7 +862,7 @@ BOOST_PYTHON_MODULE(mobase) bpy::class_, boost::noncopyable>("IPluginFileMapper") .def("localizedName", &MOBase::IPlugin::localizedName, &IPluginFileMapperWrapper::localizedName_Default) - .def("master", &MOBase::IPlugin::master, &IPluginFileMapperWrapper::master_Default, bpy::return_value_policy()) + .def("master", &MOBase::IPlugin::master, &IPluginToolWrapper::master_Default) .def("requirements", &MOBase::IPlugin::requirements, &IPluginFileMapperWrapper::requirements_Default) .def("mappings", bpy::pure_virtual(&MOBase::IPluginFileMapper::mappings)) ; @@ -897,7 +897,7 @@ BOOST_PYTHON_MODULE(mobase) bpy::class_, boost::noncopyable>("IPluginGame") .def("localizedName", &MOBase::IPlugin::localizedName, &IPluginGameWrapper::localizedName_Default) - .def("master", &MOBase::IPlugin::master, &IPluginGameWrapper::master_Default, bpy::return_value_policy()) + .def("master", &MOBase::IPlugin::master, &IPluginToolWrapper::master_Default) .def("detectGame", bpy::pure_virtual(&MOBase::IPluginGame::detectGame)) .def("gameName", bpy::pure_virtual(&MOBase::IPluginGame::gameName)) @@ -995,7 +995,7 @@ BOOST_PYTHON_MODULE(mobase) .def("onInstallationStart", &IPluginInstaller::onInstallationStart, (bpy::arg("archive"), bpy::arg("reinstallation"), bpy::arg("current_mod"))) .def("onInstallationEnd", &IPluginInstaller::onInstallationEnd, (bpy::arg("result"), bpy::arg("new_mod"))) .def("localizedName", &MOBase::IPlugin::localizedName, &IPluginInstallerSimpleWrapper::localizedName_Default) - .def("master", &MOBase::IPlugin::master, &IPluginInstallerSimpleWrapper::master_Default, bpy::return_value_policy()) + .def("master", &MOBase::IPlugin::master, &IPluginToolWrapper::master_Default) .def("requirements", &MOBase::IPlugin::requirements, &IPluginInstallerSimpleWrapper::requirements_Default) // Note: Keeping the variant here even if we always return a tuple to be consistent with the wrapper and @@ -1013,7 +1013,7 @@ BOOST_PYTHON_MODULE(mobase) .def("onInstallationStart", &IPluginInstaller::onInstallationStart, (bpy::arg("archive"), bpy::arg("reinstallation"), bpy::arg("current_mod"))) .def("onInstallationEnd", &IPluginInstaller::onInstallationEnd, (bpy::arg("result"), bpy::arg("new_mod"))) .def("localizedName", &MOBase::IPlugin::localizedName, &IPluginInstallerCustomWrapper::localizedName_Default) - .def("master", &MOBase::IPlugin::master, &IPluginInstallerCustomWrapper::master_Default, bpy::return_value_policy()) + .def("master", &MOBase::IPlugin::master, &IPluginToolWrapper::master_Default) .def("requirements", &MOBase::IPlugin::requirements, &IPluginInstallerCustomWrapper::requirements_Default) // Needs to add both otherwize boost does not understand: @@ -1027,7 +1027,7 @@ BOOST_PYTHON_MODULE(mobase) bpy::class_, boost::noncopyable>("IPluginModPage") .def("localizedName", &MOBase::IPlugin::localizedName, &IPluginModPageWrapper::localizedName_Default) - .def("master", &MOBase::IPlugin::master, &IPluginModPageWrapper::master_Default, bpy::return_value_policy()) + .def("master", &MOBase::IPlugin::master, &IPluginToolWrapper::master_Default) .def("requirements", &MOBase::IPlugin::requirements, &IPluginModPageWrapper::requirements_Default) .def("displayName", bpy::pure_virtual(&IPluginModPage::displayName)) @@ -1041,7 +1041,7 @@ BOOST_PYTHON_MODULE(mobase) bpy::class_, boost::noncopyable>("IPluginPreview") .def("localizedName", &MOBase::IPlugin::localizedName, &IPluginPreviewWrapper::localizedName_Default) - .def("master", &MOBase::IPlugin::master, &IPluginPreviewWrapper::master_Default, bpy::return_value_policy()) + .def("master", &MOBase::IPlugin::master, &IPluginToolWrapper::master_Default) .def("requirements", &MOBase::IPlugin::requirements, &IPluginPreviewWrapper::requirements_Default) .def("supportedExtensions", bpy::pure_virtual(&IPluginPreview::supportedExtensions)) @@ -1051,7 +1051,7 @@ BOOST_PYTHON_MODULE(mobase) bpy::class_, boost::noncopyable>("IPluginTool") .def("localizedName", &MOBase::IPlugin::localizedName, &IPluginToolWrapper::localizedName_Default) - .def("master", &MOBase::IPlugin::master, &IPluginToolWrapper::master_Default, bpy::return_value_policy()) + .def("master", &MOBase::IPlugin::master, &IPluginToolWrapper::master_Default) .def("requirements", &MOBase::IPlugin::requirements, &IPluginToolWrapper::requirements_Default) .def("displayName", bpy::pure_virtual(&IPluginTool::displayName))