From fc8f6c77bccb0cfa0674f7af432ecdf237327fdb Mon Sep 17 00:00:00 2001 From: Thomas Tanner Date: Mon, 23 Nov 2015 18:34:04 +0000 Subject: [PATCH] Remove most instances of GameInfo::getname, and transfer getDLCPlugins to the plugingame interface Also removed startDownloadNextFile as it doesn't appear to be used anywhere --- src/runner/pythonrunner.cpp | 4 +++- src/runner/uibasewrappers.h | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/runner/pythonrunner.cpp b/src/runner/pythonrunner.cpp index 33c82e9..0859548 100644 --- a/src/runner/pythonrunner.cpp +++ b/src/runner/pythonrunner.cpp @@ -749,7 +749,8 @@ BOOST_PYTHON_MODULE(mobase) bpy::class_("IDownloadManager") .def("startDownloadURLs", bpy::pure_virtual(&IDownloadManager::startDownloadURLs)) - .def("startDownloadNexusFile", bpy::pure_virtual(&IDownloadManager::startDownloadNexusFile)) + //not used? + //.def("startDownloadNexusFile", bpy::pure_virtual(&IDownloadManager::startDownloadNexusFile)) .def("downloadPath", bpy::pure_virtual(&IDownloadManager::downloadPath)) ; @@ -856,6 +857,7 @@ BOOST_PYTHON_MODULE(mobase) .def("getBinaryName", bpy::pure_virtual(&MOBase::IPluginGame::getBinaryName)) .def("getNexusName", bpy::pure_virtual(&MOBase::IPluginGame::getNexusName)) .def("getIniFiles", bpy::pure_virtual(&MOBase::IPluginGame::getIniFiles)) + .def("getDLCPlugins", bpy::pure_virtual(&MOBase::IPluginGame::getDLCPlugins)) //Plugin interface. .def("init", bpy::pure_virtual(&MOBase::IPluginGame::init)) diff --git a/src/runner/uibasewrappers.h b/src/runner/uibasewrappers.h index 7244bc3..fe2841c 100644 --- a/src/runner/uibasewrappers.h +++ b/src/runner/uibasewrappers.h @@ -233,7 +233,8 @@ struct IOrganizerWrapper: MOBase::IOrganizer, boost::python::wrapper { virtual int startDownloadURLs(const QStringList &urls) { return this->get_override("downloadURLs")(urls); } - virtual int startDownloadNexusFile(int modID, int fileID) { return this->get_override("downloadNexusFile")(modID, fileID); } + //not used + //virtual int startDownloadNexusFile(int modID, int fileID) { return this->get_override("downloadNexusFile")(modID, fileID); } virtual QString downloadPath(int id) { return this->get_override("downloadPath")(id); } }; @@ -317,6 +318,7 @@ struct IPluginGameWrapper: MOBase::IPluginGame, boost::python::wrapperget_override("getBinaryName")(); } virtual QString getNexusName() const override { return this->get_override("getNexusName")(); } virtual QStringList getIniFiles() const override { return this->get_override("getIniFiles")(); } + virtual QStringList getDLCPlugins() const override { return this->get_override("getDLCPlugins")(); } //Plugin interface. Could this bit be implemented just once? virtual bool init(MOBase::IOrganizer *moInfo) override { return this->get_override("init")(moInfo); }