Merge with branch1.2

1 files changed, 10 insertions, 4 deletions

diff --git a/src/organizerproxy.h b/src/organizerproxy.h
index cc75b939..29f8a8d1 100644
--- a/src/organizerproxy.h
+++ b/src/organizerproxy.h
@@ -7,8 +7,10 @@
 

 class OrganizerProxy : public MOBase::IOrganizer

 {

+

 public:

-  OrganizerProxy(MainWindow *window, const QString &pluginName);

+

+  OrganizerProxy(OrganizerCore *organizer, const QString &pluginName);

 

   virtual MOBase::IGameInfo &gameInfo() const;

   virtual MOBase::IModRepositoryBridge *createNexusBridge() const;

@@ -37,14 +39,18 @@ public:
   virtual MOBase::IPluginList *pluginList();

   virtual MOBase::IModList *modList();

   virtual HANDLE startApplication(const QString &executable, const QStringList &args = QStringList(), const QString &cwd = "", const QString &profile = "");

-  virtual bool waitForApplication(HANDLE handle, LPDWORD exitCode = NULL) const;

+  virtual bool waitForApplication(HANDLE handle, LPDWORD exitCode = nullptr) const;

   virtual void refreshModList(bool saveChanges);

 

   virtual bool onAboutToRun(const std::function<bool(const QString&)> &func);

-  virtual bool onModInstalled(const std::function<void (const QString &)> &func);

+  virtual bool onFinishedRun(const std::function<void (const QString&, unsigned int)> &func);

+  virtual bool onModInstalled(const std::function<void (const QString&)> &func);

+

 

 private:

-  MainWindow *m_Proxied;

+

+  OrganizerCore *m_Proxied;

+

   const QString &m_PluginName;

 

 };