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, 4 insertions, 4 deletions

diff --git a/src/shared/fallout3info.cpp b/src/shared/fallout3info.cpp
index 043a25dc..008a046c 100644
--- a/src/shared/fallout3info.cpp
+++ b/src/shared/fallout3info.cpp
@@ -63,22 +63,22 @@ std::wstring Fallout3Info::getRegPathStatic()
 }

 

 

-std::vector<std::wstring> Fallout3Info::getSavegameAttachmentExtensions()

+std::vector<std::wstring> Fallout3Info::getSavegameAttachmentExtensions() const

 {

   return std::vector<std::wstring>();

 }

 

-std::vector<std::wstring> Fallout3Info::getIniFileNames()

+std::vector<std::wstring> Fallout3Info::getIniFileNames() const

 {

   return boost::assign::list_of(L"fallout.ini")(L"falloutprefs.ini");

 }

 

-std::wstring Fallout3Info::getReferenceDataFile()

+std::wstring Fallout3Info::getReferenceDataFile() const

 {

   return L"Fallout - Meshes.bsa";

 }

 

-bool Fallout3Info::rerouteToProfile(const wchar_t *fileName, const wchar_t*)

+bool Fallout3Info::rerouteToProfile(const wchar_t *fileName, const wchar_t*) const

 {

   static LPCWSTR profileFiles[] = { L"fallout.ini", L"falloutprefs.ini", L"plugins.txt", nullptr };