From ec4945db3ef7febed6039aa340745e22e26cc12d Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Thu, 3 May 2018 22:02:06 +0100 Subject: [PATCH] Use new template for (non-pointless) uibase wrappers. --- src/runner/uibasewrappers.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/runner/uibasewrappers.h b/src/runner/uibasewrappers.h index 91da18e..024631b 100644 --- a/src/runner/uibasewrappers.h +++ b/src/runner/uibasewrappers.h @@ -443,11 +443,14 @@ struct IModListWrapper: MOBase::IModList, boost::python::wrapper { public: - virtual QString getFilename() const override { try { return this->get_override("getFilename")(); } PYCATCH }; - virtual QDateTime getCreationTime() const override { try { return this->get_override("getCreationTime")(); } PYCATCH }; - virtual QString getSaveGroupIdentifier() const override { try { return this->get_override("getSaveGroupIdentifier")(); } PYCATCH }; - virtual QStringList allFiles() const override { try { return this->get_override("allFiles")(); } PYCATCH }; - virtual bool hasScriptExtenderFile() const override { try { return this->get_override("hasScriptExtenderFile")(); } PYCATCH }; + static constexpr const char* className = "ISaveGameWrapper"; + using boost::python::wrapper::get_override; + + virtual QString getFilename() const override { return basicWrapperFunctionImplementation(this, "getFilename"); }; + virtual QDateTime getCreationTime() const override { return basicWrapperFunctionImplementation(this, "getCreationTime"); }; + virtual QString getSaveGroupIdentifier() const override { return basicWrapperFunctionImplementation(this, "getSaveGroupIdentifier"); }; + virtual QStringList allFiles() const override { return basicWrapperFunctionImplementation(this, "allFiles"); }; + virtual bool hasScriptExtenderFile() const override { return basicWrapperFunctionImplementation(this, "hasScriptExtenderFile"); }; };