From ee31647014b55c29b90ab582c3e55923dfeae6d7 Mon Sep 17 00:00:00 2001
From: Tannin <sherb@gmx.net>
Date: Tue, 9 Feb 2016 19:34:09 +0100
Subject: [PATCH] minor cleanup

---
 src/runner/CMakeLists.txt   |  3 ++
 src/runner/uibasewrappers.h | 62 ++++++++++++++++++-------------------
 2 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/src/runner/CMakeLists.txt b/src/runner/CMakeLists.txt
index 8585b00..cd92ade 100644
--- a/src/runner/CMakeLists.txt
+++ b/src/runner/CMakeLists.txt
@@ -46,6 +46,9 @@ TARGET_LINK_LIBRARIES(${PROJ_NAME}
                       Qt5::Widgets
                       uibase)
 
+ADD_DEFINITIONS(-DPYTHONRUNNER_LIBRARY)
+
+
 SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES COMPILE_FLAGS "/GL")
 SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/LTCG /LARGEADDRESSAWARE /OPT:REF /OPT:ICF")
 
diff --git a/src/runner/uibasewrappers.h b/src/runner/uibasewrappers.h
index 29d6e9b..b05501f 100644
--- a/src/runner/uibasewrappers.h
+++ b/src/runner/uibasewrappers.h
@@ -198,38 +198,38 @@ private:
 
 struct IOrganizerWrapper: MOBase::IOrganizer, boost::python::wrapper<MOBase::IOrganizer>
 {
-  virtual MOBase::IModRepositoryBridge *createNexusBridge() const { return this->get_override("createNexusBridge")(); }
-  virtual QString profileName() const { return this->get_override("profileName")(); }
-  virtual QString profilePath() const { return this->get_override("profilePath")(); }
-  virtual QString downloadsPath() const { return this->get_override("downloadsPath")(); }
-  virtual QString overwritePath() const { return this->get_override("overwritePath")(); }
-  virtual MOBase::VersionInfo appVersion() const { return this->get_override("appVersion")(); }
-  virtual MOBase::IModInterface *getMod(const QString &name) const { return this->get_override("getMod")(name); }
-  virtual MOBase::IModInterface *createMod(MOBase::GuessedValue<QString> &name) { return this->get_override("createMod")(name); }
-  virtual bool removeMod(MOBase::IModInterface *mod) { return this->get_override("removeMod")(mod); }
-  virtual void modDataChanged(MOBase::IModInterface *mod) { this->get_override("modDataChanged")(mod); }
-  virtual QVariant pluginSetting(const QString &pluginName, const QString &key) const { return this->get_override("pluginSetting")(pluginName, key); }
-  virtual void setPluginSetting(const QString &pluginName, const QString &key, const QVariant &value) { this->get_override("setPluginSetting")(pluginName, key, value); }
-  virtual QVariant persistent(const QString &pluginName, const QString &key, const QVariant &def = QVariant()) const { return this->get_override("persistent")(pluginName, key, def); }
-  virtual void setPersistent(const QString &pluginName, const QString &key, const QVariant &value, bool sync = true) { this->get_override("setPersistent")(pluginName, key, value, sync); }
-  virtual QString pluginDataPath() const { return this->get_override("pluginDataPath")(); }
-  virtual MOBase::IModInterface *installMod(const QString &fileName, const QString &nameSuggestion = QString()) { return this->get_override("installMod")(fileName, nameSuggestion); }
-  virtual MOBase::IDownloadManager *downloadManager() const { return this->get_override("downloadManager")(); }
-  virtual MOBase::IPluginList *pluginList() const { return this->get_override("pluginList")(); }
-  virtual MOBase::IModList *modList() const { return this->get_override("modList")(); }
-  virtual QString resolvePath(const QString &fileName) const { return this->get_override("resolvePath")(fileName); }
-  virtual QStringList listDirectories(const QString &directoryName) const { return this->get_override("listDirectories")(directoryName); }
-  virtual QStringList findFiles(const QString &path, const std::function<bool(const QString&)> &filter) const { return this->get_override("findFiles")(path, filter); }
-  virtual QStringList getFileOrigins(const QString &fileName) const { return this->get_override("getFileOrigins")(fileName); }
-  virtual QList<FileInfo> findFileInfos(const QString &path, const std::function<bool(const FileInfo&)> &filter) const { return this->get_override("findFileInfos")(path, filter); }
-  virtual HANDLE startApplication(const QString &executable, const QStringList &args = QStringList(), const QString &cwd = "", const QString &profile = "") { return this->get_override("startApplication")(executable, args, cwd, profile); }
-  virtual bool waitForApplication(HANDLE handle, LPDWORD exitCode = nullptr) const { return this->get_override("waitForApplication")(handle, exitCode); }
-  virtual void refreshModList(bool saveChanges = true) { this->get_override("refreshModList")(saveChanges); }
-  virtual bool onAboutToRun(const std::function<bool(const QString&)> &func) { return this->get_override("onAboutToRun")(func); }
-  virtual bool onFinishedRun(const std::function<void(const QString&, unsigned int)> &func) { return this->get_override("onFinishedRun")(func); }
-  virtual bool onModInstalled(const std::function<void(const QString&)> &func) { return this->get_override("onModInstalled")(func); }
+  virtual MOBase::IModRepositoryBridge *createNexusBridge() const override { return this->get_override("createNexusBridge")(); }
+  virtual QString profileName() const override { return this->get_override("profileName")(); }
+  virtual QString profilePath() const override { return this->get_override("profilePath")(); }
+  virtual QString downloadsPath() const override { return this->get_override("downloadsPath")(); }
+  virtual QString overwritePath() const override { return this->get_override("overwritePath")(); }
+  virtual MOBase::VersionInfo appVersion() const override { return this->get_override("appVersion")(); }
+  virtual MOBase::IModInterface *getMod(const QString &name) const override { return this->get_override("getMod")(name); }
+  virtual MOBase::IModInterface *createMod(MOBase::GuessedValue<QString> &name) override { return this->get_override("createMod")(name); }
+  virtual bool removeMod(MOBase::IModInterface *mod) override { return this->get_override("removeMod")(mod); }
+  virtual void modDataChanged(MOBase::IModInterface *mod) override { this->get_override("modDataChanged")(mod); }
+  virtual QVariant pluginSetting(const QString &pluginName, const QString &key) const override { return this->get_override("pluginSetting")(pluginName, key); }
+  virtual void setPluginSetting(const QString &pluginName, const QString &key, const QVariant &value) override { this->get_override("setPluginSetting")(pluginName, key, value); }
+  virtual QVariant persistent(const QString &pluginName, const QString &key, const QVariant &def = QVariant()) const override { return this->get_override("persistent")(pluginName, key, def); }
+  virtual void setPersistent(const QString &pluginName, const QString &key, const QVariant &value, bool sync = true) override { this->get_override("setPersistent")(pluginName, key, value, sync); }
+  virtual QString pluginDataPath() const override { return this->get_override("pluginDataPath")(); }
+  virtual MOBase::IModInterface *installMod(const QString &fileName, const QString &nameSuggestion = QString()) override { return this->get_override("installMod")(fileName, nameSuggestion); }
+  virtual MOBase::IDownloadManager *downloadManager() const override { return this->get_override("downloadManager")(); }
+  virtual MOBase::IPluginList *pluginList() const override { return this->get_override("pluginList")(); }
+  virtual MOBase::IModList *modList() const override { return this->get_override("modList")(); }
+  virtual QString resolvePath(const QString &fileName) const override { return this->get_override("resolvePath")(fileName); }
+  virtual QStringList listDirectories(const QString &directoryName) const override { return this->get_override("listDirectories")(directoryName); }
+  virtual QStringList findFiles(const QString &path, const std::function<bool(const QString&)> &filter) const override { return this->get_override("findFiles")(path, filter); }
+  virtual QStringList getFileOrigins(const QString &fileName) const override { return this->get_override("getFileOrigins")(fileName); }
+  virtual QList<FileInfo> findFileInfos(const QString &path, const std::function<bool(const FileInfo&)> &filter) const override { return this->get_override("findFileInfos")(path, filter); }
+  virtual HANDLE startApplication(const QString &executable, const QStringList &args = QStringList(), const QString &cwd = "", const QString &profile = "") override { return this->get_override("startApplication")(executable, args, cwd, profile); }
+  virtual bool waitForApplication(HANDLE handle, LPDWORD exitCode = nullptr) const override { return this->get_override("waitForApplication")(handle, exitCode); }
+  virtual void refreshModList(bool saveChanges = true) override { this->get_override("refreshModList")(saveChanges); }
+  virtual bool onAboutToRun(const std::function<bool(const QString&)> &func) override { return this->get_override("onAboutToRun")(func); }
+  virtual bool onFinishedRun(const std::function<void(const QString&, unsigned int)> &func) override { return this->get_override("onFinishedRun")(func); }
+  virtual bool onModInstalled(const std::function<void(const QString&)> &func) override { return this->get_override("onModInstalled")(func); }
   virtual MOBase::IProfile *profile() override { return this->get_override("profile")(); }
-  virtual MOBase::IPluginGame const *managedGame() const { return this->get_override("managedGame")(); }
+  virtual MOBase::IPluginGame const *managedGame() const override { return this->get_override("managedGame")(); }
 };
 
 struct IProfileWrapper: MOBase::IProfile, boost::python::wrapper<MOBase::IProfile>