Merge branch 'master' into new_vfs_library

Conflicts:
	src/gameinfoimpl.cpp
	src/installationmanager.cpp
	src/mainwindow.cpp
	src/organizercore.cpp
	src/organizercore.h
	src/organizerproxy.cpp
	src/organizerproxy.h
	src/savegamegamebryo.cpp
	src/savegamegamebyro.h
	src/selfupdater.h
	src/shared/fallout3info.cpp
	src/shared/fallout3info.h
	src/shared/falloutnvinfo.cpp
	src/shared/falloutnvinfo.h
	src/shared/gameinfo.cpp
	src/shared/gameinfo.h
	src/shared/oblivioninfo.cpp
	src/shared/oblivioninfo.h
	src/shared/skyriminfo.cpp
	src/shared/skyriminfo.h
	src/spawn.cpp
	src/transfersavesdialog.cpp

1 files changed, 6 insertions, 5 deletions

diff --git a/src/organizerproxy.h b/src/organizerproxy.h
index 029abcaf..02507dd7 100644
--- a/src/organizerproxy.h
+++ b/src/organizerproxy.h
@@ -12,14 +12,13 @@ public:
 

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

 

-  virtual MOBase::IGameInfo &gameInfo() const;

   virtual MOBase::IModRepositoryBridge *createNexusBridge() const;

   virtual QString profileName() const;

   virtual QString profilePath() const;

   virtual QString downloadsPath() const;

   virtual QString overwritePath() const;

   virtual MOBase::VersionInfo appVersion() const;

-  virtual MOBase::IModInterface *getMod(const QString &name);

+  virtual MOBase::IModInterface *getMod(const QString &name) const;

   virtual MOBase::IModInterface *createMod(MOBase::GuessedValue<QString> &name);

   virtual bool removeMod(MOBase::IModInterface *mod);

   virtual void modDataChanged(MOBase::IModInterface *mod);

@@ -36,9 +35,9 @@ public:
   virtual QList<FileInfo> findFileInfos(const QString &path, const std::function<bool(const FileInfo&)> &filter) const;

   virtual MOBase::IProfile *profile();

 

-  virtual MOBase::IDownloadManager *downloadManager();

-  virtual MOBase::IPluginList *pluginList();

-  virtual MOBase::IModList *modList();

+  virtual MOBase::IDownloadManager *downloadManager() const;

+  virtual MOBase::IPluginList *pluginList() const;

+  virtual MOBase::IModList *modList() const;

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

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

   virtual void refreshModList(bool saveChanges);

@@ -47,6 +46,8 @@ public:
   virtual bool onFinishedRun(const std::function<void (const QString&, unsigned int)> &func);

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

 

+  virtual MOBase::IPluginGame const *managedGame() const;

+

 private:

 

   OrganizerCore *m_Proxied;