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, 6 insertions, 10 deletions

diff --git a/src/shared/falloutnvinfo.h b/src/shared/falloutnvinfo.h
index a0bc5bd4..4bffff3f 100644
--- a/src/shared/falloutnvinfo.h
+++ b/src/shared/falloutnvinfo.h
@@ -36,22 +36,18 @@ public:
   virtual ~FalloutNVInfo() {}

 

   static std::wstring getRegPathStatic();

-  virtual std::wstring getRegPath() { return getRegPathStatic(); }

+  virtual std::wstring getRegPath() const { return getRegPathStatic(); }

 

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

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

 

   // file name of this games ini (no path)

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

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

 

-  virtual std::wstring getReferenceDataFile();

+  virtual std::wstring getReferenceDataFile() const;

 

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

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

 

-  // get a list of executables (game binary and known-to-work 3rd party tools). All of these are relative to

-  // the game directory

-  //virtual std::vector<ExecutableInfo> getExecutables();

-

-  virtual std::wstring archiveListKey() { return L"SArchiveList"; }

+  virtual std::wstring archiveListKey() const { return L"SArchiveList"; }

 

 private: