Merge remote-tracking branch 'remotes/TanninOne/master' into issue/356

Conflicts:
	src/downloadmanager.cpp
	src/mainwindow.cpp
	src/modinfo.cpp
	src/modinfo.h
	src/selfupdater.cpp
	src/shared/fallout3info.cpp
	src/shared/fallout3info.h
	src/shared/falloutnvinfo.cpp
	src/shared/falloutnvinfo.h
	src/shared/gameinfo.h
	src/shared/oblivioninfo.cpp
	src/shared/oblivioninfo.h
	src/shared/skyriminfo.cpp
	src/shared/skyriminfo.h

1 files changed, 7 insertions, 5 deletions

diff --git a/src/shared/gameinfo.h b/src/shared/gameinfo.h
index 9e6a35ef..a5c615cf 100644
--- a/src/shared/gameinfo.h
+++ b/src/shared/gameinfo.h
@@ -47,7 +47,7 @@ public:
 

   //**Used only in savegame which needs refactoring a lot.

   // get a list of file extensions for additional files belonging to a save game

-  virtual std::vector<std::wstring> getSavegameAttachmentExtensions() = 0;

+  virtual std::vector<std::wstring> getSavegameAttachmentExtensions() const = 0;

 

   //**USED ONLY IN HOOKDLL

   virtual std::wstring getGameDirectory() const;

@@ -58,17 +58,17 @@ public:
   static bool init(const std::wstring &moDirectory, const std::wstring &gamePath = L"");

 

   //**USED ONLY IN HOOKDLL

-  virtual std::wstring getRegPath() = 0;

+  virtual std::wstring getRegPath() const = 0;

 

   //**USED ONLY IN HOOKDLL

   // file name of this games ini file(s)

-  virtual std::vector<std::wstring> getIniFileNames() = 0;

+  virtual std::vector<std::wstring> getIniFileNames() const = 0;

 

   //**USED ONLY IN HOOKDLL

-  virtual std::wstring getReferenceDataFile() = 0;

+  virtual std::wstring getReferenceDataFile() const = 0;

 

   //**USED ONLY IN HOOKDLL

-  virtual bool rerouteToProfile(const wchar_t *fileName, const wchar_t *fullPath) = 0;

+  virtual bool rerouteToProfile(const wchar_t *fileName, const wchar_t *fullPath) const = 0;

 

 protected:

 

@@ -78,6 +78,8 @@ protected:
   const std::wstring &getMyGamesDirectory() const { return m_MyGamesDirectory; }

   void identifyMyGamesDirectory(const std::wstring &file);

 

+  bool isValidModURL(int modID, const std::wstring &url, const std::wstring &alt) const;

+

 private:

 

   static bool identifyGame(const std::wstring &searchPath);